Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Apr 3, 2023
2 parents ccc7921 + 26e0bfd commit ce58f04
Show file tree
Hide file tree
Showing 6 changed files with 325 additions and 0 deletions.
242 changes: 242 additions & 0 deletions keyboards/viktus/osav2_numpad/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
{
"manufacturer": "Viktus Design LLC",
"keyboard_name": "OSAv2 Numpad",
"maintainer": "BlindAssassin111",
"url": "https://viktus.design",
"usb": {
"device_version": "1.0.0",
"vid": "0x5644",
"pid": "0x4F4E"
},
"bootloader": "atmel-dfu",
"processor": "atmega32u4",
"features": {
"rgblight": true,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"build": {
"lto": true
},
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["F5", "F0", "D3", "D5"],
"rows": ["F1", "F4", "D4", "D7", "D6"]
},
"rgblight": {
"led_count": 9,
"pin": "C7",
"max_brightness": 191,
"animations": {
"breathing": true,
"rainbow_swirl": true,
"twinkle": true
}
},
"layouts": {
"LAYOUT_all_split": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
]
},
"LAYOUT_2u_enter": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
]
},
"LAYOUT_2u_plus_2u_enter": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1 },
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
]
},
"LAYOUT_2u_enter_2u_zero": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
]
},
"LAYOUT_2u_plus_2u_enter_2u_zero": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1 },
{ "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3 }
]
},
"LAYOUT_mirrored_2u_enter": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
]
},
"LAYOUT_mirrored_2u_plus_2u_enter": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
]
},
"LAYOUT_mirrored_2u_enter_2u_zero": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4 }
]
},
"LAYOUT_mirrored_2u_plus_2u_enter_2u_zero": {
"layout": [
{ "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1 },
{ "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
{ "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
{ "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
{ "label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3 },
{ "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
{ "label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4 },
]
}
}
}
27 changes: 27 additions & 0 deletions keyboards/viktus/osav2_numpad/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/* Copyright 2022 Viktus Design LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all_split(
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6, KC_PEQL,
KC_P1, KC_P2, KC_P3, KC_DEL,
KC_P0, KC_P0, KC_PDOT, KC_PENT
)
};
27 changes: 27 additions & 0 deletions keyboards/viktus/osav2_numpad/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/* Copyright 2022 Viktus Design LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all_split(
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6, KC_PEQL,
KC_P1, KC_P2, KC_P3, KC_DEL,
KC_P0, KC_P0, KC_PDOT, KC_PENT
)
};
1 change: 1 addition & 0 deletions keyboards/viktus/osav2_numpad/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
27 changes: 27 additions & 0 deletions keyboards/viktus/osav2_numpad/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# OSAv2 Numpad

![osav2_numpad](https://i.imgur.com/G6yNtJMh.png)

A OSAv2 Numpad in MX flavor.

- Keyboard Maintainer: BlindAssassin111
- Hardware Supported: OSAv2 Numpad PCB
- Hardware Availability: Viktus Design LLC

Make example for this keyboard (after setting up your build environment):

make viktus/osav2_numpad:default

Flashing example for this keyboard:

make viktus/osav2_numpad:default:flash

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).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
1 change: 1 addition & 0 deletions keyboards/viktus/osav2_numpad/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank

0 comments on commit ce58f04

Please sign in to comment.