Merge remote-tracking branch 'origin/master' into develop
0xCB Static: fix `qmk info` and Configurator issues (#13856)
Merge remote-tracking branch 'origin/master' into develop
Function96 V2: Fixed info.json file (#13322)
Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.
Merge remote-tracking branch 'origin/master' into develop
flash_stm32: don't unlock flash if already unlocked (#13841)
On stm32f4 after reboot from DFU it was observed that the flash is
already unlocked. In that case, attempting to unlock it again causes a
data abort.
Merge remote-tracking branch 'upstream/master' into develop
Fix alignment of USB out report buffer 2 -> 4 (#13838)
[BUG] Fix Key Override includes (#13831)
* [BUG] Fix Key Override includes
* simplify includes
fix develop branch move file (#13832)
Co-authored-by: zvecr <git@zvecr.com>
Duck Eagle/Viper V2 Refactor (#13828)
[Keyboard] Fix SRC include for matrix/m20add issi driver (#13826)
Merro60 Layout Macro Refactor (#13827)
Momoka Ergo: layout macro/Configurator fix (#13825)
* momoka_ergo.h: use modified QMK 3-character notation
Renames the matrix position arguments to use QMK's K<row><column> notation, but using L or R for the left and right halves, respectively.
* physically arrange layout macro
Arrange the layout macro and keycodes to resemble the assembled keyboard.
* info.json: rebuild LAYOUT data
Fixes mispositioned keys in QMK Configurator.
Fix compile issues due to LED changes (#13821)
Update endgame keymap to work with suspend changes (#13805)
Updates the Massdrop CTRL keyboard engame keymap to work after the
changes to USB suspend in #12697
Fixes #13782
Move some led drivers to common folder (#13749)
* Move some led drivers to common folder
DP60 layout macro renames (#13811)
* info.json: apply human-friendly formatting
* rename LAYOUT_60_wkl to LAYOUT_60_ansi_tsangan_split_rshift
* rename LAYOUT_60_wkl_split_bs to LAYOUT_60_tsangan_hhkb
* info.json: remove `key_count` keys
Charue Sunsetter: layout macro fixes (#13809)
* remove K214 from LAYOUT_1065_ansi macro
Position K214 is only used by the ISO layout (as KC_NUHS); it doesn't get used here. Removing it so the layout macro matches the info.json layout data.
Also updates info.json to use human-friendly formatting.
* add layout macros
Adds:
- LAYOUT_1065_ansi_split_bs macro
- LAYOUT_1065_iso macro
- LAYOUT_1065_iso_split_bs macro
- `default_iso` keymap
* add LAYOUT_all macro
Adds LAYOUT_all macro and a `default_all` keymap.
This PCB is unusual in that the ANSI Backslash and ANSI Enter do not share their matrix positions with the Non-US Backslash or ISO Enter keys at all. This layout macro supports both the ANSI and ISO positions in one macro/keymap.