diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-15 09:15:56 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-15 09:15:56 +0000 |
| commit | 1ccfed483db38b6c3e2823f84cd3582feac444ab (patch) | |
| tree | 214ffdaf748e6ac1525e2d50a7f6c52f30e64286 /keyboards | |
| parent | c202602938e1b065e6bac394771b310fea2a3edb (diff) | |
| parent | b297a347bb288069b2ee9386813047d2a96e44fe (diff) | |
| download | qmk_firmware-1ccfed483db38b6c3e2823f84cd3582feac444ab.tar.gz qmk_firmware-1ccfed483db38b6c3e2823f84cd3582feac444ab.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/converter/adb_usb/readme.md | 12 | ||||
| -rw-r--r-- | keyboards/converter/adb_usb/rev1/rules.mk | 5 | ||||
| -rw-r--r-- | keyboards/converter/adb_usb/rev2/rules.mk | 5 | ||||
| -rw-r--r-- | keyboards/converter/adb_usb/rules.mk | 30 |
4 files changed, 25 insertions, 27 deletions
diff --git a/keyboards/converter/adb_usb/readme.md b/keyboards/converter/adb_usb/readme.md index 8de9b9ad46..2d2e3cd4e3 100644 --- a/keyboards/converter/adb_usb/readme.md +++ b/keyboards/converter/adb_usb/readme.md @@ -51,16 +51,8 @@ Keymap ------ To build the default keymap run this command: - $ make converter/adb_usb:default - -You may add your own keymap to the converter/adb_usb/keymaps directory, as you would with any other QMK-powered keyboard. - -To build your custom keymap, change the build command to: - - $ make converter/adb_usb:my_keymap - -Where 'my_keymap' is the name of your custom keymap directory. - + $ make converter/adb_usb/rev1:default # Pro Micro-based + $ make converter/adb_usb/rev2:default # Hasu 32U2 PCB Locking Caps Lock ---------------- diff --git a/keyboards/converter/adb_usb/rev1/rules.mk b/keyboards/converter/adb_usb/rev1/rules.mk new file mode 100644 index 0000000000..cf663a7ed6 --- /dev/null +++ b/keyboards/converter/adb_usb/rev1/rules.mk @@ -0,0 +1,5 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina diff --git a/keyboards/converter/adb_usb/rev2/rules.mk b/keyboards/converter/adb_usb/rev2/rules.mk new file mode 100644 index 0000000000..6ab81f6b12 --- /dev/null +++ b/keyboards/converter/adb_usb/rev2/rules.mk @@ -0,0 +1,5 @@ +# MCU name +MCU = atmega32u2 + +# Bootloader selection +BOOTLOADER = atmel-dfu diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk index 93bdbf6abf..4e4d068a70 100644 --- a/keyboards/converter/adb_usb/rules.mk +++ b/keyboards/converter/adb_usb/rules.mk @@ -1,23 +1,19 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -EXTRAKEY_ENABLE = yes -USB_HID_ENABLE = yes -BACKLIGHT_ENABLE = no -CUSTOM_MATRIX = yes +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +CUSTOM_MATRIX = yes -SRC = matrix.c adb.c led.c +SRC += matrix.c adb.c led.c -# ADB_MOUSE_ENABLE # OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE + +DEFAULT_FOLDER = converter/adb_usb/rev1 |