diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-09-10 17:36:17 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-09-10 17:36:17 +1000 |
| commit | a7c972b329d908d2bec683f83d9841bcbd0d6175 (patch) | |
| tree | 2aa606d68664780e0320db60bc4b18f8ddc77bd9 /data | |
| parent | c94cc1effaf0a71f62f5498b3437f22c96f18f74 (diff) | |
| parent | d5cb7de5e4ea60dce69764a627358d534af1f666 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'data')
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 2 | ||||
| -rw-r--r-- | data/templates/ps2avrgb/rules.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 78c9a8d36b..d3e664d61a 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -56,7 +56,7 @@ }, "bootloader": { "type": "string", - "enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "unknown", "USBasp", "tinyuf2"], + "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "unknown", "usbasploader", "USBasp", "tinyuf2"], }, "bootloader_instructions": { "type": "string", diff --git a/data/templates/ps2avrgb/rules.mk b/data/templates/ps2avrgb/rules.mk index 6c0b7cc231..b374eca336 100644 --- a/data/templates/ps2avrgb/rules.mk +++ b/data/templates/ps2avrgb/rules.mk @@ -2,7 +2,7 @@ MCU = atmega32a # Bootloader selection -BOOTLOADER = bootloadHID +BOOTLOADER = bootloadhid # Build Options # change yes to no to disable |