Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
fauxpark 2021-09-10 17:36:17 +10:00
commit a7c972b329
106 changed files with 154 additions and 156 deletions

View File

@ -21,19 +21,19 @@
# Current options: # Current options:
# #
# AVR: # AVR:
# halfkay PJRC Teensy # halfkay PJRC Teensy
# caterina Pro Micro (Sparkfun/generic) # caterina Pro Micro (Sparkfun/generic)
# atmel-dfu Atmel factory DFU # atmel-dfu Atmel factory DFU
# lufa-dfu LUFA DFU # lufa-dfu LUFA DFU
# qmk-dfu QMK DFU (LUFA + blinkenlight) # qmk-dfu QMK DFU (LUFA + blinkenlight)
# qmk-hid QMK HID (LUFA + blinkenlight) # qmk-hid QMK HID (LUFA + blinkenlight)
# bootloadHID HIDBootFlash compatible (ATmega32A) # bootloadhid HIDBootFlash compatible (ATmega32A)
# USBasp USBaspLoader (ATmega328P) # usbasploader USBaspLoader (ATmega328P)
# ARM: # ARM:
# kiibohd Input:Club Kiibohd bootloader (only used on their boards) # kiibohd Input:Club Kiibohd bootloader (only used on their boards)
# stm32duino STM32Duino (STM32F103x8) # stm32duino STM32Duino (STM32F103x8)
# stm32-dfu STM32 USB DFU in ROM # stm32-dfu STM32 USB DFU in ROM
# apm32-dfu APM32 USB DFU in ROM # apm32-dfu APM32 USB DFU in ROM
# #
# BOOTLOADER_SIZE can still be defined manually, but it's recommended # BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list # you add any possible configuration to this list
@ -86,11 +86,11 @@ ifeq ($(strip $(BOOTLOADER)), caterina)
OPT_DEFS += -DBOOTLOADER_CATERINA OPT_DEFS += -DBOOTLOADER_CATERINA
BOOTLOADER_SIZE = 4096 BOOTLOADER_SIZE = 4096
endif endif
ifeq ($(strip $(BOOTLOADER)), bootloadHID) ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
OPT_DEFS += -DBOOTLOADER_BOOTLOADHID OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
BOOTLOADER_SIZE = 4096 BOOTLOADER_SIZE = 4096
endif endif
ifeq ($(strip $(BOOTLOADER)), USBasp) ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
OPT_DEFS += -DBOOTLOADER_USBASP OPT_DEFS += -DBOOTLOADER_USBASP
BOOTLOADER_SIZE = 4096 BOOTLOADER_SIZE = 4096
endif endif

View File

@ -56,7 +56,7 @@
}, },
"bootloader": { "bootloader": {
"type": "string", "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": { "bootloader_instructions": {
"type": "string", "type": "string",

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -397,8 +397,8 @@ However, this will automatically disable the legacy TMK Macros and Functions fea
* `qmk-dfu` * `qmk-dfu`
* `halfkay` * `halfkay`
* `caterina` * `caterina`
* `bootloadHID` * `bootloadhid`
* `USBasp` * `usbasploader`
## Feature Options :id=feature-options ## Feature Options :id=feature-options

View File

@ -68,31 +68,31 @@ This is a list of known bootloader devices and their USB vendor and product IDs,
The device name here is the name that appears in Zadig, and may not be what the Device Manager or QMK Toolbox displays. The device name here is the name that appears in Zadig, and may not be what the Device Manager or QMK Toolbox displays.
|Bootloader |Device Name |VID/PID |Driver | |Bootloader |Device Name |VID/PID |Driver |
|-------------|------------------------------|--------------|-------| |--------------|------------------------------|--------------|-------|
|`atmel-dfu` |ATmega16u2 DFU |`03EB:2FEF` |libusb0| |`atmel-dfu` |ATmega16u2 DFU |`03EB:2FEF` |libusb0|
|`atmel-dfu` |ATmega32U2 DFU |`03EB:2FF0` |libusb0| |`atmel-dfu` |ATmega32U2 DFU |`03EB:2FF0` |libusb0|
|`atmel-dfu` |ATm16U4 DFU V1.0.2 |`03EB:2FF3` |libusb0| |`atmel-dfu` |ATm16U4 DFU V1.0.2 |`03EB:2FF3` |libusb0|
|`atmel-dfu` |ATm32U4DFU |`03EB:2FF4` |libusb0| |`atmel-dfu` |ATm32U4DFU |`03EB:2FF4` |libusb0|
|`atmel-dfu` |*none* (AT90USB64) |`03EB:2FF9` |libusb0| |`atmel-dfu` |*none* (AT90USB64) |`03EB:2FF9` |libusb0|
|`atmel-dfu` |AT90USB128 DFU |`03EB:2FFB` |libusb0| |`atmel-dfu` |AT90USB128 DFU |`03EB:2FFB` |libusb0|
|`qmk-dfu` |(keyboard name) Bootloader |As `atmel-dfu`|libusb0| |`qmk-dfu` |(keyboard name) Bootloader |As `atmel-dfu`|libusb0|
|`halfkay` |*none* |`16C0:0478` |HidUsb | |`halfkay` |*none* |`16C0:0478` |HidUsb |
|`caterina` |Pro Micro 3.3V |`1B4F:9203` |usbser | |`caterina` |Pro Micro 3.3V |`1B4F:9203` |usbser |
|`caterina` |Pro Micro 5V |`1B4F:9205` |usbser | |`caterina` |Pro Micro 5V |`1B4F:9205` |usbser |
|`caterina` |LilyPadUSB |`1B4F:9207` |usbser | |`caterina` |LilyPadUSB |`1B4F:9207` |usbser |
|`caterina` |Pololu A-Star 32U4 Bootloader |`1FFB:0101` |usbser | |`caterina` |Pololu A-Star 32U4 Bootloader |`1FFB:0101` |usbser |
|`caterina` |Arduino Leonardo |`2341:0036` |usbser | |`caterina` |Arduino Leonardo |`2341:0036` |usbser |
|`caterina` |Arduino Micro |`2341:0037` |usbser | |`caterina` |Arduino Micro |`2341:0037` |usbser |
|`caterina` |Adafruit Feather 32u4 |`239A:000C` |usbser | |`caterina` |Adafruit Feather 32u4 |`239A:000C` |usbser |
|`caterina` |Adafruit ItsyBitsy 32u4 3V |`239A:000D` |usbser | |`caterina` |Adafruit ItsyBitsy 32u4 3V |`239A:000D` |usbser |
|`caterina` |Adafruit ItsyBitsy 32u4 5V |`239A:000E` |usbser | |`caterina` |Adafruit ItsyBitsy 32u4 5V |`239A:000E` |usbser |
|`caterina` |Arduino Leonardo |`2A03:0036` |usbser | |`caterina` |Arduino Leonardo |`2A03:0036` |usbser |
|`caterina` |Arduino Micro |`2A03:0037` |usbser | |`caterina` |Arduino Micro |`2A03:0037` |usbser |
|`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb | |`bootloadhid` |HIDBoot |`16C0:05DF` |HidUsb |
|`USBasp` |USBasp |`16C0:05DC` |libusbK| |`usbasploader`|USBasp |`16C0:05DC` |libusbK|
|`apm32-dfu` |APM32 DFU ISP Mode |`314B:0106` |WinUSB | |`apm32-dfu` |APM32 DFU ISP Mode |`314B:0106` |WinUSB |
|`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB | |`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB |
|`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB | |`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB |
|`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB | |`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB |
|`qmk-hid` |(keyboard name) Bootloader |`03EB:2067` |HidUsb | |`qmk-hid` |(keyboard name) Bootloader |`03EB:2067` |HidUsb |

View File

@ -127,7 +127,7 @@ To ensure compatibility with the USBasploader bootloader, make sure this block i
```make ```make
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
``` ```
Compatible flashers: Compatible flashers:
@ -153,13 +153,13 @@ To ensure compatibility with the bootloadHID bootloader, make sure this block is
```make ```make
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
``` ```
Compatible flashers: Compatible flashers:
* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI) * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
* [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadHID` target in QMK (recommended command line) * [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadhid` target in QMK (recommended command line)
* [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash) * [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash)
Flashing sequence: Flashing sequence:

View File

@ -15,9 +15,9 @@ General flashing sequence:
?> Using the QMK installation script, detailed [here](newbs_getting_started.md), the required bootloadHID tools should be automatically installed. ?> Using the QMK installation script, detailed [here](newbs_getting_started.md), the required bootloadHID tools should be automatically installed.
To flash via the command line, use the target `:bootloadHID` by executing the following command: To flash via the command line, use the target `:bootloadhid` by executing the following command:
make <keyboard>:<keymap>:bootloadHID make <keyboard>:<keymap>:bootloadhid
## GUI Flashing ## GUI Flashing

View File

@ -14,7 +14,7 @@ The full syntax of the `make` command is `<keyboard_folder>:<keymap>:<target>`,
The `<target>` means the following The `<target>` means the following
* If no target is given, then it's the same as `all` below * If no target is given, then it's the same as `all` below
* `all` compiles as many keyboard/revision/keymap combinations as specified. For example, `make planck/rev4:default` will generate a single .hex, while `make planck/rev4:all` will generate a hex for every keymap available to the planck. * `all` compiles as many keyboard/revision/keymap combinations as specified. For example, `make planck/rev4:default` will generate a single .hex, while `make planck/rev4:all` will generate a hex for every keymap available to the planck.
* `flash`, `dfu`, `teensy`, `avrdude`, `dfu-util`, or `bootloadHID` compile and upload the firmware to the keyboard. If the compilation fails, then nothing will be uploaded. The programmer to use depends on the keyboard. For most keyboards it's `dfu`, but for ChibiOS keyboards you should use `dfu-util`, and `teensy` for standard Teensys. To find out which command you should use for your keyboard, check the keyboard specific readme. * `flash`, `dfu`, `teensy`, `avrdude`, `dfu-util`, or `bootloadhid` compile and upload the firmware to the keyboard. If the compilation fails, then nothing will be uploaded. The programmer to use depends on the keyboard. For most keyboards it's `dfu`, but for ChibiOS keyboards you should use `dfu-util`, and `teensy` for standard Teensys. To find out which command you should use for your keyboard, check the keyboard specific readme.
Visit the [Flashing Firmware](flashing.md) guide for more details of the available bootloaders. Visit the [Flashing Firmware](flashing.md) guide for more details of the available bootloaders.
* **Note**: some operating systems need privileged access for these commands to work. This means that you may need to setup [`udev rules`](faq_build.md#linux-udev-rules) to access these without root access, or to run the command with root access (`sudo make planck/rev4:default:flash`). * **Note**: some operating systems need privileged access for these commands to work. This means that you may need to setup [`udev rules`](faq_build.md#linux-udev-rules) to access these without root access, or to run the command with root access (`sudo make planck/rev4:default:flash`).
* `clean`, cleans the build output folders to make sure that everything is built from scratch. Run this before normal compilation if you have some unexplainable problems. * `clean`, cleans the build output folders to make sure that everything is built from scratch. Run this before normal compilation if you have some unexplainable problems.

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
@ -19,4 +19,4 @@ AUDIO_ENABLE = no
FAUXCLICKY_ENABLE = no FAUXCLICKY_ENABLE = no
LAYOUTS_HAS_RGB = no LAYOUTS_HAS_RGB = no
ENCODER_ENABLE = yes ENCODER_ENABLE = yes
LEADER_ENABLE = yes LEADER_ENABLE = yes

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -5,7 +5,7 @@ SRC = matrix.c \
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega328p
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega328p
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Processor frequency # Processor frequency
F_CPU = 12000000 F_CPU = 12000000

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
@ -30,4 +30,3 @@ ENCODER_ENABLE = yes
WPM_ENABLE = yes WPM_ENABLE = yes
LTO_ENABLE = no LTO_ENABLE = no
AUTO_SHIFT_ENABLE = no AUTO_SHIFT_ENABLE = no

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Processor frequency # Processor frequency
F_CPU = 16000000 F_CPU = 16000000

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,5 +5,4 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -20,7 +20,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,4 +5,4 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
@ -16,4 +16,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
WS2812_DRIVER = i2c WS2812_DRIVER = i2c
LAYOUTS = 65_ansi_blocker 65_iso_blocker LAYOUTS = 65_ansi_blocker 65_iso_blocker

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -5,7 +5,7 @@ MCU = atmega32a
F_CPU = 16000000 F_CPU = 16000000
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega328p MCU = atmega328p
# Bootloader selection # Bootloader selection
BOOTLOADER = USBasp BOOTLOADER = usbasploader
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

View File

@ -2,7 +2,7 @@
MCU = atmega32a MCU = atmega32a
# Bootloader selection # Bootloader selection
BOOTLOADER = bootloadHID BOOTLOADER = bootloadhid
# build options # build options
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite

Some files were not shown because too many files have changed in this diff Show More