diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
| commit | 4020674163fc80914059c4c9c3be5c0ae00bd150 (patch) | |
| tree | 6f4187d72b04d03572adf507502afbda9726d696 /keyboards/handwired/pytest | |
| parent | 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff) | |
| parent | 9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/handwired/pytest')
| -rw-r--r-- | keyboards/handwired/pytest/.noci | 0 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/basic/.noci | 0 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/basic/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/has_community/.noci | 0 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/has_community/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/has_template/.noci | 0 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/has_template/keymaps/.noci | 0 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/has_template/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/info.json | 4 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/macro/.noci | 0 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/macro/keymaps/default/keymap.json | 2 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/macro/rules.mk | 1 |
12 files changed, 4 insertions, 7 deletions
diff --git a/keyboards/handwired/pytest/.noci b/keyboards/handwired/pytest/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/pytest/.noci +++ /dev/null diff --git a/keyboards/handwired/pytest/basic/.noci b/keyboards/handwired/pytest/basic/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/pytest/basic/.noci +++ /dev/null diff --git a/keyboards/handwired/pytest/basic/rules.mk b/keyboards/handwired/pytest/basic/rules.mk index 6b42774dbf..e69de29bb2 100644 --- a/keyboards/handwired/pytest/basic/rules.mk +++ b/keyboards/handwired/pytest/basic/rules.mk @@ -1 +0,0 @@ -MCU = atmega32u4 diff --git a/keyboards/handwired/pytest/has_community/.noci b/keyboards/handwired/pytest/has_community/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/pytest/has_community/.noci +++ /dev/null diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk index 4161649cbc..051634b3a4 100644 --- a/keyboards/handwired/pytest/has_community/rules.mk +++ b/keyboards/handwired/pytest/has_community/rules.mk @@ -1,3 +1 @@ -MCU = atmega32u4 - LAYOUTS = ortho_1x1 diff --git a/keyboards/handwired/pytest/has_template/.noci b/keyboards/handwired/pytest/has_template/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/pytest/has_template/.noci +++ /dev/null diff --git a/keyboards/handwired/pytest/has_template/keymaps/.noci b/keyboards/handwired/pytest/has_template/keymaps/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/pytest/has_template/keymaps/.noci +++ /dev/null diff --git a/keyboards/handwired/pytest/has_template/rules.mk b/keyboards/handwired/pytest/has_template/rules.mk index 6b42774dbf..e69de29bb2 100644 --- a/keyboards/handwired/pytest/has_template/rules.mk +++ b/keyboards/handwired/pytest/has_template/rules.mk @@ -1 +0,0 @@ -MCU = atmega32u4 diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json index 331472762c..2ba7d34d52 100644 --- a/keyboards/handwired/pytest/info.json +++ b/keyboards/handwired/pytest/info.json @@ -6,5 +6,7 @@ "vid": "0xFEED", "pid": "0x6465", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/pytest/macro/.noci b/keyboards/handwired/pytest/macro/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/pytest/macro/.noci +++ /dev/null diff --git a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json index f319d862d8..23c371aa34 100644 --- a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json +++ b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json @@ -2,7 +2,7 @@ "keyboard": "handwired/pytest/basic", "keymap": "default_json", "layout": "LAYOUT_ortho_1x1", - "layers": [["MACRO_0"]], + "layers": [["QK_MACRO_0"]], "macros": [ [ "Hello, World!", diff --git a/keyboards/handwired/pytest/macro/rules.mk b/keyboards/handwired/pytest/macro/rules.mk index 6b42774dbf..e69de29bb2 100644 --- a/keyboards/handwired/pytest/macro/rules.mk +++ b/keyboards/handwired/pytest/macro/rules.mk @@ -1 +0,0 @@ -MCU = atmega32u4 |