Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
64f533fa47
127
keyboards/nopunin10did/styrkatmel/keyboard.json
Normal file
127
keyboards/nopunin10did/styrkatmel/keyboard.json
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
{
|
||||||
|
"keyboard_name": "Styrka Atmel",
|
||||||
|
"manufacturer": "NoPunIn10Did",
|
||||||
|
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/styrkatmel",
|
||||||
|
"maintainer": "NoPunIn10Did",
|
||||||
|
"usb": {
|
||||||
|
"vid": "0x4E50",
|
||||||
|
"pid": "0x5341",
|
||||||
|
"device_version": "0.0.1"
|
||||||
|
},
|
||||||
|
"features": {
|
||||||
|
"backlight": false,
|
||||||
|
"bootmagic": true,
|
||||||
|
"command": false,
|
||||||
|
"console": false,
|
||||||
|
"extrakey": true,
|
||||||
|
"mousekey": true,
|
||||||
|
"nkro": true
|
||||||
|
},
|
||||||
|
"qmk": {
|
||||||
|
"locking": {
|
||||||
|
"enabled": true,
|
||||||
|
"resync": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"matrix_pins": {
|
||||||
|
"cols": ["F7", "F6", "F5", "F4", "F1", "D7", "B4", "B5", "B6"],
|
||||||
|
"rows": ["B3", "B0", "B1", "B2", "E6", "B7", "C6", "C7", "D6", "D4"]
|
||||||
|
},
|
||||||
|
"diode_direction": "COL2ROW",
|
||||||
|
"dynamic_keymap": {
|
||||||
|
"layer_count": 3
|
||||||
|
},
|
||||||
|
"indicators": {
|
||||||
|
"caps_lock": "F0"
|
||||||
|
},
|
||||||
|
"processor": "atmega32u4",
|
||||||
|
"bootloader": "atmel-dfu",
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT": {
|
||||||
|
"layout": [
|
||||||
|
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||||
|
{"matrix": [1, 0], "x": 1, "y": 0},
|
||||||
|
{"matrix": [0, 1], "x": 2.25, "y": 0},
|
||||||
|
{"matrix": [1, 1], "x": 3.25, "y": 0},
|
||||||
|
{"matrix": [0, 2], "x": 4.25, "y": 0},
|
||||||
|
{"matrix": [1, 2], "x": 5.25, "y": 0},
|
||||||
|
{"matrix": [0, 3], "x": 6.25, "y": 0},
|
||||||
|
{"matrix": [1, 3], "x": 7.25, "y": 0},
|
||||||
|
{"matrix": [0, 4], "x": 8.25, "y": 0},
|
||||||
|
{"matrix": [1, 4], "x": 9.25, "y": 0},
|
||||||
|
{"matrix": [0, 5], "x": 10.25, "y": 0},
|
||||||
|
{"matrix": [1, 5], "x": 11.25, "y": 0},
|
||||||
|
{"matrix": [0, 6], "x": 12.25, "y": 0},
|
||||||
|
{"matrix": [1, 6], "x": 13.25, "y": 0},
|
||||||
|
{"matrix": [0, 7], "x": 14.25, "y": 0},
|
||||||
|
{"matrix": [0, 8], "x": 15.25, "y": 0, "w": 2},
|
||||||
|
{"matrix": [1, 8], "x": 17.25, "y": 0},
|
||||||
|
|
||||||
|
{"matrix": [2, 0], "x": 0, "y": 1},
|
||||||
|
{"matrix": [3, 0], "x": 1, "y": 1},
|
||||||
|
{"matrix": [2, 1], "x": 2.25, "y": 1, "w":1.5},
|
||||||
|
{"matrix": [3, 1], "x": 3.75, "y": 1},
|
||||||
|
{"matrix": [2, 2], "x": 4.75, "y": 1},
|
||||||
|
{"matrix": [3, 2], "x": 5.75, "y": 1},
|
||||||
|
{"matrix": [2, 3], "x": 6.75, "y": 1},
|
||||||
|
{"matrix": [3, 3], "x": 7.75, "y": 1},
|
||||||
|
{"matrix": [2, 4], "x": 8.75, "y": 1},
|
||||||
|
{"matrix": [3, 4], "x": 9.75, "y": 1},
|
||||||
|
{"matrix": [2, 5], "x": 10.75, "y": 1},
|
||||||
|
{"matrix": [3, 5], "x": 11.75, "y": 1},
|
||||||
|
{"matrix": [2, 6], "x": 12.75, "y": 1},
|
||||||
|
{"matrix": [3, 6], "x": 13.75, "y": 1},
|
||||||
|
{"matrix": [2, 7], "x": 14.75, "y": 1},
|
||||||
|
{"matrix": [3, 8], "x": 17.25, "y": 1},
|
||||||
|
|
||||||
|
{"matrix": [4, 0], "x": 0, "y": 2},
|
||||||
|
{"matrix": [5, 0], "x": 1, "y": 2},
|
||||||
|
{"matrix": [4, 1], "x": 2.25, "y": 2, "w":1.25},
|
||||||
|
{"matrix": [5, 1], "x": 4, "y": 2},
|
||||||
|
{"matrix": [4, 2], "x": 5, "y": 2},
|
||||||
|
{"matrix": [5, 2], "x": 6, "y": 2},
|
||||||
|
{"matrix": [4, 3], "x": 7, "y": 2},
|
||||||
|
{"matrix": [5, 3], "x": 8, "y": 2},
|
||||||
|
{"matrix": [4, 4], "x": 9, "y": 2},
|
||||||
|
{"matrix": [5, 4], "x": 10, "y": 2},
|
||||||
|
{"matrix": [4, 5], "x": 11, "y": 2},
|
||||||
|
{"matrix": [5, 5], "x": 12, "y": 2},
|
||||||
|
{"matrix": [4, 6], "x": 13, "y": 2},
|
||||||
|
{"matrix": [5, 6], "x": 14, "y": 2},
|
||||||
|
{"matrix": [4, 7], "x": 15, "y": 2},
|
||||||
|
{"matrix": [4, 8], "x": 16, "y": 1, "w":1.25, "h":2},
|
||||||
|
{"matrix": [5, 8], "x": 17.25, "y": 2},
|
||||||
|
|
||||||
|
{"matrix": [6, 0], "x": 0, "y": 3},
|
||||||
|
{"matrix": [7, 0], "x": 1, "y": 3},
|
||||||
|
{"matrix": [6, 1], "x": 2.25, "y": 3, "w":1.25},
|
||||||
|
{"matrix": [7, 1], "x": 3.5, "y": 3},
|
||||||
|
{"matrix": [6, 2], "x": 4.5, "y": 3},
|
||||||
|
{"matrix": [7, 2], "x": 5.5, "y": 3},
|
||||||
|
{"matrix": [6, 3], "x": 6.5, "y": 3},
|
||||||
|
{"matrix": [7, 3], "x": 7.5, "y": 3},
|
||||||
|
{"matrix": [6, 4], "x": 8.5, "y": 3},
|
||||||
|
{"matrix": [7, 4], "x": 9.5, "y": 3},
|
||||||
|
{"matrix": [6, 5], "x": 10.5, "y": 3},
|
||||||
|
{"matrix": [7, 5], "x": 11.5, "y": 3},
|
||||||
|
{"matrix": [6, 6], "x": 12.5, "y": 3},
|
||||||
|
{"matrix": [7, 6], "x": 13.5, "y": 3},
|
||||||
|
{"matrix": [6, 7], "x": 14.5, "y": 3, "w":1.75},
|
||||||
|
{"matrix": [6, 8], "x": 16.25, "y": 3},
|
||||||
|
{"matrix": [7, 8], "x": 17.25, "y": 3},
|
||||||
|
|
||||||
|
{"matrix": [8, 0], "x": 0, "y": 4},
|
||||||
|
{"matrix": [9, 0], "x": 1, "y": 4},
|
||||||
|
{"matrix": [8, 1], "x": 2.25, "y": 4, "w":1.25},
|
||||||
|
{"matrix": [9, 1], "x": 3.5, "y": 4, "w":1.25},
|
||||||
|
{"matrix": [8, 2], "x": 4.75, "y": 4, "w":1.25},
|
||||||
|
{"matrix": [8, 4], "x": 6, "y": 4, "w":7},
|
||||||
|
{"matrix": [8, 6], "x": 12.25, "y": 4, "w":1.25},
|
||||||
|
{"matrix": [9, 6], "x": 13.5, "y": 4, "w":1.25},
|
||||||
|
{"matrix": [8, 7], "x": 15.25, "y": 4},
|
||||||
|
{"matrix": [8, 8], "x": 16.25, "y": 4},
|
||||||
|
{"matrix": [9, 8], "x": 17.25, "y": 4}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
48
keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c
Normal file
48
keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
|
||||||
|
*
|
||||||
|
* 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] = {
|
||||||
|
/* Keymap BASE: (Base Layer) Default Layer
|
||||||
|
* .-------.,---------------------------------------------------------------.
|
||||||
|
* | F1| F2||Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BkSpc |Ins|
|
||||||
|
* |---|---||---------------------------------------------------------------|
|
||||||
|
* | F3| F4||Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| |Del|
|
||||||
|
* |---|---||---------------------------------------------------------------|
|
||||||
|
* | F5| F6||CAPS | A| S| D| F| G| H| J| K| L| ;| '| \| Ent|PgU|
|
||||||
|
* |---|---||---------------------------------------------------------------|
|
||||||
|
* | F7| F8||Shft| <>| Z| X| C| V| B| N| M| ,| .| /| Shift| Up|PgD|
|
||||||
|
* |---|---||---------------------------------------------------------------|
|
||||||
|
* | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt|
|
||||||
|
* `-------'`---------------------------------------------------------------'
|
||||||
|
*/
|
||||||
|
[0] = LAYOUT(
|
||||||
|
KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
|
||||||
|
KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
|
||||||
|
KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
|
||||||
|
KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
|
||||||
|
KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
|
),
|
||||||
|
|
||||||
|
[1] = LAYOUT(
|
||||||
|
QK_BOOT, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_INS,
|
||||||
|
KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
|
||||||
|
KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
|
||||||
|
KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
|
||||||
|
KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
|
),
|
||||||
|
};
|
||||||
25
keyboards/nopunin10did/styrkatmel/readme.md
Normal file
25
keyboards/nopunin10did/styrkatmel/readme.md
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# Viktus Styrka Atmel Edition
|
||||||
|
|
||||||
|
The Viktus Styrka is a 65% + left macro block created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner).
|
||||||
|
|
||||||
|
This is a custom Atmel ISO Hotswap PCB for the Viktus Styrka designed and maintained by NoPunIn10Did.
|
||||||
|
|
||||||
|
* Firmware Maintainer: [nopunin10did](https://github.com/nopunin10did)
|
||||||
|
* Hardware Supported: Styrka
|
||||||
|
* Hardware Availability: <https://www.Viktus.Design>
|
||||||
|
|
||||||
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
|
make nopunin10did/styrkatmel:default
|
||||||
|
|
||||||
|
Flashing example for this keyboard:
|
||||||
|
|
||||||
|
make nopunin10did/styrkatmel: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).
|
||||||
|
|
||||||
|
Enter the bootloader in 3 ways:
|
||||||
|
|
||||||
|
* **Bootmagic reset**: Hold down the key at the top left in the macro columns (default: F1) and plug in the keyboard.
|
||||||
|
* **Physical reset button**: Briefly press the button on the back of the PCB.
|
||||||
|
* **Keycode in layout**: Press the key mapped to `QK_BOOT`. For the default layout, hold down the rightmost 1.25u key on the bottom row, then tap the top-left key in the macro columns.
|
||||||
@ -74,28 +74,30 @@ class Exists(FilterFunction):
|
|||||||
func_name = "exists"
|
func_name = "exists"
|
||||||
|
|
||||||
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
||||||
return self.key in target_info.data
|
return self.key in target_info.dotty
|
||||||
|
|
||||||
|
|
||||||
class Absent(FilterFunction):
|
class Absent(FilterFunction):
|
||||||
func_name = "absent"
|
func_name = "absent"
|
||||||
|
|
||||||
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
||||||
return self.key not in target_info.data
|
return self.key not in target_info.dotty
|
||||||
|
|
||||||
|
|
||||||
class Length(FilterFunction):
|
class Length(FilterFunction):
|
||||||
func_name = "length"
|
func_name = "length"
|
||||||
|
|
||||||
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
||||||
return (self.key in target_info.data and len(target_info.data[self.key]) == int(self.value))
|
info_dotty = target_info.dotty
|
||||||
|
return (self.key in info_dotty and len(info_dotty[self.key]) == int(self.value))
|
||||||
|
|
||||||
|
|
||||||
class Contains(FilterFunction):
|
class Contains(FilterFunction):
|
||||||
func_name = "contains"
|
func_name = "contains"
|
||||||
|
|
||||||
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
def apply(self, target_info: KeyboardKeymapDesc) -> bool:
|
||||||
return (self.key in target_info.data and self.value in target_info.data[self.key])
|
info_dotty = target_info.dotty
|
||||||
|
return (self.key in info_dotty and self.value in info_dotty[self.key])
|
||||||
|
|
||||||
|
|
||||||
def _get_filter_class(func_name: str, key: str, value: str) -> Optional[FilterFunction]:
|
def _get_filter_class(func_name: str, key: str, value: str) -> Optional[FilterFunction]:
|
||||||
|
|||||||
@ -347,3 +347,68 @@ def test_format_json_keymap_auto():
|
|||||||
result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_keymap.json')
|
result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_keymap.json')
|
||||||
check_returncode(result)
|
check_returncode(result)
|
||||||
assert result.stdout == '{\n "keyboard": "handwired/pytest/basic",\n "keymap": "test",\n "layers": [\n ["KC_A"]\n ],\n "layout": "LAYOUT_ortho_1x1",\n "version": 1\n}\n'
|
assert result.stdout == '{\n "keyboard": "handwired/pytest/basic",\n "keymap": "test",\n "layers": [\n ["KC_A"]\n ],\n "layout": "LAYOUT_ortho_1x1",\n "version": 1\n}\n'
|
||||||
|
|
||||||
|
|
||||||
|
def test_find_exists():
|
||||||
|
result = check_subcommand('find', '-f', 'exists(rgb_matrix.split_count)', '-p', 'rgb_matrix.split_count')
|
||||||
|
check_returncode(result)
|
||||||
|
values = [s for s in result.stdout.splitlines() if 'rgb_matrix.split_count=' in s]
|
||||||
|
assert len(values) > 0
|
||||||
|
for s in values:
|
||||||
|
assert '=None' not in s
|
||||||
|
assert '=[' in s
|
||||||
|
|
||||||
|
|
||||||
|
def test_find_absent():
|
||||||
|
result = check_subcommand('find', '-f', 'absent(rgb_matrix.split_count)', '-p', 'rgb_matrix.split_count')
|
||||||
|
check_returncode(result)
|
||||||
|
values = [s for s in result.stdout.splitlines() if 'rgb_matrix.split_count=' in s]
|
||||||
|
assert len(values) > 0
|
||||||
|
for s in values:
|
||||||
|
assert '=None' in s
|
||||||
|
assert '=[' not in s
|
||||||
|
|
||||||
|
|
||||||
|
def test_find_length():
|
||||||
|
result = check_subcommand('find', '-f', 'length(matrix_pins.cols, 6)', '-p', 'matrix_pins.cols')
|
||||||
|
check_returncode(result)
|
||||||
|
values = [s for s in result.stdout.splitlines() if 'matrix_pins.cols=' in s]
|
||||||
|
assert len(values) > 0
|
||||||
|
for s in values:
|
||||||
|
assert s.count(',') == 5
|
||||||
|
|
||||||
|
|
||||||
|
def test_find_contains():
|
||||||
|
result = check_subcommand('find', '-f', 'contains(matrix_pins.cols, B1)', '-p', 'matrix_pins.cols')
|
||||||
|
check_returncode(result)
|
||||||
|
values = [s for s in result.stdout.splitlines() if 'matrix_pins.cols=' in s]
|
||||||
|
assert len(values) > 0
|
||||||
|
for s in values:
|
||||||
|
assert "'B1'" in s
|
||||||
|
|
||||||
|
|
||||||
|
def test_find_multiple_conditions():
|
||||||
|
# this is intended to match at least 'crkbd/rev1'
|
||||||
|
result = check_subcommand(
|
||||||
|
'find', '-f', 'exists(rgb_matrix.split_count)', '-f', 'contains(matrix_pins.cols, B1)', '-f', 'length(matrix_pins.cols, 6)', '-f', 'absent(eeprom.driver)', '-f', 'ws2812.pin=D3', '-p', 'rgb_matrix.split_count', '-p', 'matrix_pins.cols', '-p',
|
||||||
|
'eeprom.driver', '-p', 'ws2812.pin'
|
||||||
|
)
|
||||||
|
check_returncode(result)
|
||||||
|
rgb_matrix_split_count_values = [s for s in result.stdout.splitlines() if 'rgb_matrix.split_count=' in s]
|
||||||
|
assert len(rgb_matrix_split_count_values) > 0
|
||||||
|
for s in rgb_matrix_split_count_values:
|
||||||
|
assert '=None' not in s
|
||||||
|
assert '=[' in s
|
||||||
|
matrix_pins_cols_values = [s for s in result.stdout.splitlines() if 'matrix_pins.cols=' in s]
|
||||||
|
assert len(matrix_pins_cols_values) > 0
|
||||||
|
for s in matrix_pins_cols_values:
|
||||||
|
assert s.count(',') == 5
|
||||||
|
assert "'B1'" in s
|
||||||
|
eeprom_driver_values = [s for s in result.stdout.splitlines() if 'eeprom.driver=' in s]
|
||||||
|
assert len(eeprom_driver_values) > 0
|
||||||
|
for s in eeprom_driver_values:
|
||||||
|
assert '=None' in s
|
||||||
|
ws2812_pin_values = [s for s in result.stdout.splitlines() if 'ws2812.pin=' in s]
|
||||||
|
assert len(ws2812_pin_values) > 0
|
||||||
|
for s in ws2812_pin_values:
|
||||||
|
assert '=D3' in s
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user