Skip to content

Commit 1646c0f

Browse files
authored
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536) * LED Matrix: Reactive effect buffers & advanced indicators (#12588) * [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626) * [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625) * LED Matrix: Split (#12633) * [CI] Format code according to conventions (#12650) * feat: infinite timeout for leader key (#6580) * feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs * Format code according to conventions (#12680) * Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403) * Fix default ADC_RESOLUTION for ADCv3 (and ADCv4) Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers (that macro should not have been there, because ADCv3 has CFGR instead of CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS if it is defined (that name is used for ADCv3 and ADCv4). * Update ADC docs to match the actually used resolution ADC driver for ChibiOS actually uses the 10-bit resolution by default (probably to match AVR); fix the documentation accordingly. Also add both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names differ according to the ADC implementation in the particular MCU). * Fix pinToMux() for B12 and B13 on STM32F3xx Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and B13 pins were wrong. * Add support for all possible analog pins on STM32F1xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx (they are the same at least for STM32F103x8 and larger F103 devices, and also F102, F105, F107 families). Actually tested on STM32F103C8T6 (therefore pins C0...C5 were not tested). Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages, cannot be supported at the moment, because those pins are connected only to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1. * Add support for all possible analog pins on STM32F4xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are apparently the same for all F4xx devices, except some smaller devices may not have ADC3. Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested. Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices which don't have ADC3 also don't have the GPIOF port, therefore the code which refers to Fx pins does not compile. * Fix STM32F3xx ADC mux table in documentation The ADC driver documentation had some errors in the mux table for STM32F3xx. Fix this table to match the datasheet and the actual code (mux settings for B12 and B13 were also tested on a real STM32F303CCT6 chip). * Add STM32F1xx ADC pins to the documentation * Add STM32F4xx ADC pins to the documentation * Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h * eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671) * Add support for MCU = STM32F446 (#12619) * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. * Format code according to conventions (#12682) * Format code according to conventions (#12687) * Add STM32L433 and L443 support (#12063) * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers * Include L443 in compatible microcontrollers * Update config bootloader jump description * Update ChibiOS define reasoning * Update quantum/mcu_selection.mk * fix git conflict * Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) * Fix bad PR merge for #6580. (#12721) * Change RGB/LED Matrix to use a simple define for USB suspend (#12697) * [CI] Format code according to conventions (#12731) * Fixing transport's led/rgb matrix suspend state logic (#12770) * [CI] Format code according to conventions (#12772) * Fix comment parsing (#12750) * Added OLED fade out support (#12086) * fix some references to bin/qmk that slipped in (#12832) * Resolve a number of warnings in `qmk generate-api` (#12833) * New command: qmk console (#12828) * stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review * pyformat * clean up and flesh out KNOWN_BOOTLOADERS * Remove pointless SERIAL_LINK_ENABLE rules (#12846) * Make Swap Hands use PROGMEM (#12284) This converts the array that the Swap Hands feature uses to use PROGMEM, and to read from that array, as such. Since this array never changes at runtime, there is no reason to keep it in memory. Especially for AVR boards, as memory is a precious resource. * Fix another bin/qmk reference (#12856) * [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419) * Fixup build errors on `develop` branch. (#12723) * LED Matrix: Effects! (#12651) * Fix syntax error when compiling for ARM (#12866) * Remove KEYMAP and LAYOUT_kc (#12160) * alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc * Add setup, clone, and env to the list of commands we allow even with broken modules (#12868) * Rename `point_t` -> `led_point_t` (#12864) * [Keyboard] updated a vendor name / fixed minor keymap issues (#12881) * Add missing LED Matrix suspend code to suspend.c (#12878) * LED Matrix: Documentation (#12685) * Deprecate `send_unicode_hex_string()` (#12602) * Fix spelling mistake regarding LED Matrix in split_common. (#12888) * [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) * Use milc.subcommand.config instead of qmk.cli.config (#12915) * Use milc.subcommand.config instead * pyformat * remove the config test * Add function to allow repeated blinking of one layer (#12237) * Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time * Update doc * Rework rgblight blinking according to requested change * optimize storage * Fixup housekeeping from being invoked twice per loop. (#12933) * matrix: wait for row signal to go HIGH for every row (#12945) I noticed this discrepancy (last row of the matrix treated differently than the others) when optimizing the input latency of my keyboard controller, see also https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ Before this commit, when tuning the delays I noticed ghost key presses when pressing the F2 key, which is on the last row of the keyboard matrix: the dead_grave key, which is on the first row of the keyboard matrix, would be incorrectly detected as pressed. After this commit, all keyboard matrix rows are interpreted correctly. I suspect that my setup is more susceptible to this nuance than others because I use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask the problem. * ensure we do not conflict with existing keymap aliases (#12976) * Add support for up to 4 IS31FL3733 drivers (#12342) * Convert Encoder callbacks to be boolean functions (#12805) * [Keyboard] Fix Terrazzo build failure (#12977) * Do not hard set config in CPTC files (#11864) * [Keyboard] Corne - Remove legacy revision support (#12226) * [Keymap] Update to Drashna keymap and user code (based on develop) (#12936) * Add Full-duplex serial driver for ARM boards (#9842) * Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987) * Backlight: add defines for default level and breathing state (#12560) * Add dire message about LUFA mass storage bootloader (#13014) * [Keyboard] Remove redundant legacy and common headers for crkbd (#13023) Was causing compiler errors on some systems. * Fix keyboards/keymaps for boolean encoder callback changes (#12985) * `backlight.c`: include `eeprom.h` (#13024) * Add changelog for 2021-05-29 Breaking Changes merge (#12939) * Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version * Add recent develop changes * Sort recent develop changes * Remove sections for ChibiOS changes per tzarc No ChibiOS changes this round. * Add and sort recent develop changes * add notes about keyboard moves/deletions * import changelog for PR 12172 Documents the change to BOOTMAGIC_ENABLE. * update section headings * re-sort changelog * add additional note regarding Bootmagic changes * remove changelog timestamp * update dates in main Breaking Changes docs * fix broken section anchors in previous changelogs * add link to backlight/eeprom patch to changelog * highlight some more changes * link PRs from section headers * Restore standard readme * run: qmk cformat --core-only
1 parent f55e39e commit 1646c0f

File tree

1,481 files changed

+12666
-20970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,481 files changed

+12666
-20970
lines changed

.github/workflows/cli.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
with:
2424
submodules: recursive
2525
- name: Install dependencies
26-
run: pip3 install -r requirements.txt
26+
run: pip3 install -r requirements-dev.txt
2727
- name: Run tests
2828
run: bin/qmk pytest

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.eep
66
*.elf
77
*.hex
8+
*.uf2
89
*.qmk
910
!util/bootloader.hex
1011
!quantum/tools/eeprom_reset.hex

Makefile

+12-5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ $(info QMK Firmware $(QMK_VERSION))
2929
endif
3030
endif
3131

32+
# Determine which qmk cli to use
33+
ifeq (,$(shell which qmk))
34+
QMK_BIN = bin/qmk
35+
else
36+
QMK_BIN = qmk
37+
endif
38+
3239
# avoid 'Entering|Leaving directory' messages
3340
MAKEFLAGS += --no-print-directory
3441

@@ -86,8 +93,8 @@ clean:
8693

8794
.PHONY: distclean
8895
distclean: clean
89-
echo -n 'Deleting *.bin and *.hex ... '
90-
rm -f *.bin *.hex
96+
echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
97+
rm -f *.bin *.hex *.uf2
9198
echo 'done.'
9299

93100
#Compatibility with the old make variables, anything you specify directly on the command line
@@ -384,7 +391,7 @@ define PARSE_KEYMAP
384391
# Format it in bold
385392
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
386393
# Specify the variables that we are passing forward to submake
387-
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY)
394+
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
388395
# And the first part of the make command
389396
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
390397
# The message to display
@@ -501,8 +508,8 @@ endef
501508
%:
502509
# Check if we have the CMP tool installed
503510
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
504-
# Ensure that bin/qmk works.
505-
if ! bin/qmk hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
511+
# Ensure that $(QMK_BIN) works.
512+
if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
506513
# Check if the submodules are dirty, and display a warning if they are
507514
ifndef SKIP_GIT
508515
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi

bin/qmk

+3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ def main():
2929
"""
3030
# Change to the root of our checkout
3131
os.environ['ORIG_CWD'] = os.getcwd()
32+
os.environ['DEPRECATED_BIN_QMK'] = '1'
3233
os.chdir(qmk_dir)
3334

35+
print('Warning: The bin/qmk script is being deprecated. Please install the QMK CLI: python3 -m pip install qmk', file=sys.stderr)
36+
3437
# Import the subcommands
3538
import qmk.cli # noqa
3639

bootloader.mk

+7-2
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,13 @@ ifeq ($(strip $(BOOTLOADER)), USBasp)
8989
BOOTLOADER_SIZE = 4096
9090
endif
9191
ifeq ($(strip $(BOOTLOADER)), lufa-ms)
92-
# DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!
93-
# It is extremely prone to bricking, and is only included to support existing boards.
9492
OPT_DEFS += -DBOOTLOADER_MS
9593
BOOTLOADER_SIZE = 6144
9694
FIRMWARE_FORMAT = bin
95+
$(info LUFA MASS STORAGE Bootloader selected)
96+
$(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!)
97+
$(info It is extremely prone to bricking, and is only included to support existing boards.)
98+
$(info )
9799
endif
98100
ifdef BOOTLOADER_SIZE
99101
OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
@@ -137,3 +139,6 @@ ifeq ($(strip $(BOOTLOADER)), stm32duino)
137139
DFU_ARGS = -d 1EAF:0003 -a 2 -R
138140
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
139141
endif
142+
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
143+
OPT_DEFS += -DBOOTLOADER_TINYUF2
144+
endif

build_json.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ endif
2828

2929
# Generate the keymap.c
3030
$(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
31-
bin/qmk json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)
31+
$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)

build_keyboard.mk

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ endif
1212

1313
include common.mk
1414

15+
# Set the qmk cli to use
16+
QMK_BIN ?= qmk
17+
1518
# Set the filename for the final firmware binary
1619
KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
1720
TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
@@ -97,7 +100,7 @@ MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
97100
MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
98101

99102
# Pull in rules from info.json
100-
INFO_RULES_MK = $(shell bin/qmk generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk)
103+
INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk)
101104
include $(INFO_RULES_MK)
102105

103106
# Check for keymap.json first, so we can regenerate keymap.c
@@ -295,13 +298,13 @@ endif
295298
CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
296299

297300
$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
298-
bin/qmk generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h
301+
$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h
299302

300303
$(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
301-
bin/qmk generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h
304+
$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h
302305

303306
$(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
304-
bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
307+
$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
305308

306309
generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h
307310

common_features.mk

+33-13
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,17 @@ VALID_LED_MATRIX_TYPES := IS31FL3731 custom
223223

224224
ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
225225
ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
226-
$(error LED_MATRIX_DRIVER="$(LED_MATRIX_DRIVER)" is not a valid matrix type)
227-
else
228-
BACKLIGHT_ENABLE = yes
229-
BACKLIGHT_DRIVER = custom
230-
OPT_DEFS += -DLED_MATRIX_ENABLE
231-
SRC += $(QUANTUM_DIR)/led_matrix.c
232-
SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
226+
$(error "$(LED_MATRIX_DRIVER)" is not a valid matrix type)
233227
endif
228+
OPT_DEFS += -DLED_MATRIX_ENABLE
229+
ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
230+
# ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
231+
OPT_DEFS += -DLIB8_ATTINY
232+
endif
233+
SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
234+
SRC += $(QUANTUM_DIR)/led_matrix.c
235+
SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
236+
CIE1931_CURVE := yes
234237

235238
ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731)
236239
OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
@@ -347,7 +350,11 @@ endif
347350
VALID_BACKLIGHT_TYPES := pwm timer software custom
348351

349352
BACKLIGHT_ENABLE ?= no
350-
BACKLIGHT_DRIVER ?= pwm
353+
ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
354+
BACKLIGHT_DRIVER ?= software
355+
else
356+
BACKLIGHT_DRIVER ?= pwm
357+
endif
351358
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
352359
ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
353360
$(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
@@ -422,10 +429,6 @@ ifeq ($(strip $(TERMINAL_ENABLE)), yes)
422429
OPT_DEFS += -DUSER_PRINT
423430
endif
424431

425-
ifeq ($(strip $(USB_HID_ENABLE)), yes)
426-
include $(TMK_DIR)/protocol/usb_hid.mk
427-
endif
428-
429432
ifeq ($(strip $(WPM_ENABLE)), yes)
430433
SRC += $(QUANTUM_DIR)/wpm.c
431434
OPT_DEFS += -DWPM_ENABLE
@@ -459,6 +462,23 @@ ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
459462
SRC += $(QUANTUM_DIR)/dip_switch.c
460463
endif
461464

465+
VALID_MAGIC_TYPES := yes full lite
466+
BOOTMAGIC_ENABLE ?= no
467+
ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
468+
ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
469+
$(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
470+
endif
471+
ifneq ($(strip $(BOOTMAGIC_ENABLE)), full)
472+
OPT_DEFS += -DBOOTMAGIC_LITE
473+
QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/bootmagic_lite.c
474+
else
475+
OPT_DEFS += -DBOOTMAGIC_ENABLE
476+
QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/bootmagic_full.c
477+
endif
478+
endif
479+
COMMON_VPATH += $(QUANTUM_DIR)/bootmagic
480+
QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/magic.c
481+
462482
VALID_CUSTOM_MATRIX_TYPES:= yes lite no
463483

464484
CUSTOM_MATRIX ?= no
@@ -673,4 +693,4 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
673693
# Board designers can add their own driver to $(SRC)
674694
endif
675695
endif
676-
endif
696+
endif

data/schemas/keyboard.jsonschema

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"processor": {
2727
"type": "string",
28-
"enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "STM32G431", "STM32G474", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
28+
"enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66F18", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L433", "STM32L443", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
2929
},
3030
"board": {
3131
"type": "string",
@@ -34,7 +34,7 @@
3434
},
3535
"bootloader": {
3636
"type": "string",
37-
"enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "stm32-dfu", "stm32duino", "unknown", "USBasp"]
37+
"enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "stm32-dfu", "stm32duino", "unknown", "USBasp", "tinyuf2"]
3838
},
3939
"diode_direction": {
4040
"type": "string",

docs/ChangeLog/20200829.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Four times a year QMK runs a process for merging Breaking Changes. A Breaking Ch
55

66
## Changes Requiring User Action :id=changes-requiring-user-action
77

8-
### Relocated Keyboards :id-relocated-keyboards
8+
### Relocated Keyboards :id=relocated-keyboards
99

1010
#### The Key Company project consolidation ([#9547](https://github.com/qmk/qmk_firmware/pull/9547))
1111
#### relocating boards by flehrad to flehrad/ folder ([#9635](https://github.com/qmk/qmk_firmware/pull/9635))

docs/ChangeLog/20201128.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Four times a year QMK runs a process for merging Breaking Changes. A Breaking Ch
55

66
## Changes Requiring User Action :id=changes-requiring-user-action
77

8-
### Relocated Keyboards :id-relocated-keyboards
8+
### Relocated Keyboards :id=relocated-keyboards
99

1010
#### Reduce Helix keyboard build variation ([#8669](https://github.com/qmk/qmk_firmware/pull/8669))
1111

0 commit comments

Comments
 (0)