Skip to content

Commit ce58f04

Browse files
qmk-botqmk-bot
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents ccc7921 + 26e0bfd commit ce58f04

File tree

6 files changed

+325
-0
lines changed

6 files changed

+325
-0
lines changed

‎keyboards/viktus/osav2_numpad/info.json

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,242 @@
1+
{
2+
"manufacturer": "Viktus Design LLC",
3+
"keyboard_name": "OSAv2 Numpad",
4+
"maintainer": "BlindAssassin111",
5+
"url": "https://viktus.design",
6+
"usb": {
7+
"device_version": "1.0.0",
8+
"vid": "0x5644",
9+
"pid": "0x4F4E"
10+
},
11+
"bootloader": "atmel-dfu",
12+
"processor": "atmega32u4",
13+
"features": {
14+
"rgblight": true,
15+
"bootmagic": true,
16+
"command": false,
17+
"console": false,
18+
"extrakey": true,
19+
"mousekey": true,
20+
"nkro": true
21+
},
22+
"build": {
23+
"lto": true
24+
},
25+
"diode_direction": "COL2ROW",
26+
"matrix_pins": {
27+
"cols": ["F5", "F0", "D3", "D5"],
28+
"rows": ["F1", "F4", "D4", "D7", "D6"]
29+
},
30+
"rgblight": {
31+
"led_count": 9,
32+
"pin": "C7",
33+
"max_brightness": 191,
34+
"animations": {
35+
"breathing": true,
36+
"rainbow_swirl": true,
37+
"twinkle": true
38+
}
39+
},
40+
"layouts": {
41+
"LAYOUT_all_split": {
42+
"layout": [
43+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
44+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
45+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
46+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
47+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
48+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
49+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
50+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
51+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
52+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
53+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
54+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
55+
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
56+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
57+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
58+
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
59+
{ "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
60+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
61+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
62+
{ "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
63+
]
64+
},
65+
"LAYOUT_2u_enter": {
66+
"layout": [
67+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
68+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
69+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
70+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
71+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
72+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
73+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
74+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
75+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
76+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
77+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
78+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
79+
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
80+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
81+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
82+
{ "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
83+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
84+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
85+
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
86+
]
87+
},
88+
"LAYOUT_2u_plus_2u_enter": {
89+
"layout": [
90+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
91+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
92+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
93+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
94+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
95+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
96+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
97+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
98+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
99+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
100+
{ "label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1 },
101+
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
102+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
103+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
104+
{ "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
105+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
106+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
107+
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
108+
]
109+
},
110+
"LAYOUT_2u_enter_2u_zero": {
111+
"layout": [
112+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
113+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
114+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
115+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
116+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
117+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
118+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
119+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
120+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
121+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
122+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
123+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
124+
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
125+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
126+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
127+
{ "label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4 },
128+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
129+
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
130+
]
131+
},
132+
"LAYOUT_2u_plus_2u_enter_2u_zero": {
133+
"layout": [
134+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
135+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
136+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
137+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
138+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
139+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
140+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
141+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
142+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
143+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
144+
{ "label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1 },
145+
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
146+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
147+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
148+
{ "label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4 },
149+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
150+
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
151+
]
152+
},
153+
"LAYOUT_mirrored_2u_enter": {
154+
"layout": [
155+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
156+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
157+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
158+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
159+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
160+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
161+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
162+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
163+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
164+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
165+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
166+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
167+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
168+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
169+
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
170+
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
171+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
172+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
173+
{ "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
174+
]
175+
},
176+
"LAYOUT_mirrored_2u_plus_2u_enter": {
177+
"layout": [
178+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
179+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
180+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
181+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
182+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
183+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
184+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
185+
{ "label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1 },
186+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
187+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
188+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
189+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
190+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
191+
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
192+
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
193+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
194+
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
195+
{ "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
196+
]
197+
},
198+
"LAYOUT_mirrored_2u_enter_2u_zero": {
199+
"layout": [
200+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
201+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
202+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
203+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
204+
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
205+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
206+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
207+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
208+
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
209+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
210+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
211+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
212+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
213+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
214+
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
215+
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
216+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
217+
{ "label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4 }
218+
]
219+
},
220+
"LAYOUT_mirrored_2u_plus_2u_enter_2u_zero": {
221+
"layout": [
222+
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
223+
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
224+
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
225+
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
226+
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
227+
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
228+
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
229+
{ "label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1 },
230+
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
231+
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
232+
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
233+
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
234+
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
235+
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
236+
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
237+
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
238+
{ "label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4 },
239+
]
240+
}
241+
}
242+
}

‎keyboards/viktus/osav2_numpad/keymaps/default/keymap.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Copyright 2022 Viktus Design LLC
2+
*
3+
* This program is free software: you can redistribute it and/or modify
4+
* it under the terms of the GNU General Public License as published by
5+
* the Free Software Foundation, either version 2 of the License, or
6+
* (at your option) any later version.
7+
*
8+
* This program is distributed in the hope that it will be useful,
9+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
* GNU General Public License for more details.
12+
*
13+
* You should have received a copy of the GNU General Public License
14+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
*/
16+
17+
#include QMK_KEYBOARD_H
18+
19+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20+
[0] = LAYOUT_all_split(
21+
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
22+
KC_P7, KC_P8, KC_P9, KC_PPLS,
23+
KC_P4, KC_P5, KC_P6, KC_PEQL,
24+
KC_P1, KC_P2, KC_P3, KC_DEL,
25+
KC_P0, KC_P0, KC_PDOT, KC_PENT
26+
)
27+
};

‎keyboards/viktus/osav2_numpad/keymaps/via/keymap.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Copyright 2022 Viktus Design LLC
2+
*
3+
* This program is free software: you can redistribute it and/or modify
4+
* it under the terms of the GNU General Public License as published by
5+
* the Free Software Foundation, either version 2 of the License, or
6+
* (at your option) any later version.
7+
*
8+
* This program is distributed in the hope that it will be useful,
9+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
* GNU General Public License for more details.
12+
*
13+
* You should have received a copy of the GNU General Public License
14+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
*/
16+
17+
#include QMK_KEYBOARD_H
18+
19+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20+
[0] = LAYOUT_all_split(
21+
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
22+
KC_P7, KC_P8, KC_P9, KC_PPLS,
23+
KC_P4, KC_P5, KC_P6, KC_PEQL,
24+
KC_P1, KC_P2, KC_P3, KC_DEL,
25+
KC_P0, KC_P0, KC_PDOT, KC_PENT
26+
)
27+
};

‎keyboards/viktus/osav2_numpad/keymaps/via/rules.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VIA_ENABLE = yes

‎keyboards/viktus/osav2_numpad/readme.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# OSAv2 Numpad
2+
3+
![osav2_numpad](https://i.imgur.com/G6yNtJMh.png)
4+
5+
A OSAv2 Numpad in MX flavor.
6+
7+
- Keyboard Maintainer: BlindAssassin111
8+
- Hardware Supported: OSAv2 Numpad PCB
9+
- Hardware Availability: Viktus Design LLC
10+
11+
Make example for this keyboard (after setting up your build environment):
12+
13+
make viktus/osav2_numpad:default
14+
15+
Flashing example for this keyboard:
16+
17+
make viktus/osav2_numpad:default:flash
18+
19+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
20+
21+
## Bootloader
22+
23+
Enter the bootloader in 3 ways:
24+
25+
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
26+
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
27+
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

‎keyboards/viktus/osav2_numpad/rules.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# This file intentionally left blank

0 commit comments

Comments
 (0)