JTM
c2f227d2a8
Function96 V2: Fixed info.json file ( #13322 )
...
Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.
2021-08-02 01:24:25 -07:00
QMK Bot
83bd56e68c
Merge remote-tracking branch 'origin/master' into develop
2021-08-02 04:28:52 +00:00
xyzz
720c676403
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.
2021-08-02 14:27:57 +10:00
Nick Brassel
ee3c138385
Merge remote-tracking branch 'upstream/master' into develop
2021-08-02 13:55:36 +10:00
a_p_u_r_o
26b62f7a6c
Fix alignment of USB out report buffer 2 -> 4 ( #13838 )
2021-08-02 00:32:26 +01:00
Drashna Jaelre
ebed2e9a81
[BUG] Fix Key Override includes ( #13831 )
...
* [BUG] Fix Key Override includes
* simplify includes
2021-08-01 16:29:23 +01:00
Jonavin
53683e8d20
fix develop branch move file ( #13832 )
...
Co-authored-by: zvecr <git@zvecr.com>
2021-08-01 22:37:59 +10:00
James Young
4b630c46fe
Duck Eagle/Viper V2 Refactor ( #13828 )
2021-07-31 13:12:49 -07:00
Drashna Jaelre
41a770ded3
[Keyboard] Fix SRC include for matrix/m20add issi driver ( #13826 )
2021-07-31 12:18:11 -07:00
James Young
851d995a7d
Merro60 Layout Macro Refactor ( #13827 )
2021-07-31 12:17:55 -07:00
James Young
1305b6d82e
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.
2021-07-31 12:16:51 -07:00
Drashna Jaelre
7bcbeffc2d
Fix compile issues due to LED changes ( #13821 )
2021-07-31 17:30:13 +01:00
slashbunny
3f5482bbb7
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
2021-07-31 16:28:09 +01:00
Joel Challis
70fb3e1aaf
__flash? ( #13799 )
2021-07-31 14:35:30 +01:00
Joel Challis
206a995ccd
Move some led drivers to common folder ( #13749 )
...
* Move some led drivers to common folder
2021-07-31 14:31:09 +01:00
James Young
954806c80f
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
2021-07-31 14:25:47 +01:00
James Young
4604b58769
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.
2021-07-31 14:23:27 +01:00
James Young
56f84774d7
Rartland: add 65_ansi and 65_iso layouts ( #13807 )
...
* add 65_ansi and 65_iso layouts
... with Community Layout support
* add block comment of layouts to rartland.h
2021-07-31 14:22:12 +01:00
peott-fr
d191ccfdc5
[Keymap] Add peott-fr Kinesis keymap ( #13812 )
2021-07-31 06:14:56 -07:00
Dasky
aeb252435d
[develop] Fix pimoroni trackball read address ( #13810 )
2021-07-31 06:12:19 -07:00
Jay Greco
56200de2eb
[Keyboard] Reduce nibble oled_status keymap size ( #13813 )
2021-07-31 06:11:11 -07:00
Drashna Jaelre
e755c5fe1f
[Keyboard] Fix RGBKB Pan Rev1 Encoder RGB handling ( #13781 )
2021-07-31 06:09:47 -07:00
Drashna Jaelre
f587ee5b5b
Update LUFA Submodule (2021-07-30) ( #13819 )
2021-07-31 06:08:44 -07:00
MakotoKurauchi
fb6c66a14b
change DIP_SWITCH_ENABLE to off ( #13815 )
2021-07-31 18:51:32 +09:00
QMK Bot
6c33290ffa
Merge remote-tracking branch 'origin/master' into develop
2021-07-31 09:47:25 +00:00
James Young
ec2f6026b9
Neito: correct key sequence in info.json ( #13808 )
2021-07-31 02:47:00 -07:00
ruro
52dad230d6
[CLI] Make qmk doctor
more lenient about system config ( #13804 )
2021-07-30 21:43:42 -07:00
QMK Bot
6d82c92476
Merge remote-tracking branch 'origin/master' into develop
2021-07-31 00:34:43 +00:00
Nick Brassel
a4c050b5ae
Fix up paths for bioi boards - parallel compilation failures due to file collisions. ( #13806 )
2021-07-31 10:34:14 +10:00
QMK Bot
7c70a90867
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 23:22:11 +00:00
Nick Brassel
b459f314ec
Explicitly state that VIA should not be enabled in the default keymap. ( #13803 )
2021-07-31 09:21:45 +10:00
QMK Bot
99fc2173a4
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 23:15:44 +00:00
Joel Challis
addb389a5e
Move ergosaurus via keymap to correct location ( #13802 )
2021-07-31 00:15:11 +01:00
QMK Bot
f1af7da9ba
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 21:00:46 +00:00
Ryan
7bfe53ee2f
Fix onekey console keymap ( #13797 )
2021-07-30 22:00:14 +01:00
Ryan
b021c2f2c5
Port new_keyboard.sh to CLI ( #13706 )
...
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-07-30 21:57:40 +01:00
QMK Bot
770a525425
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 18:45:24 +00:00
James Young
aece9ad5fa
Xelus Dharma: add info.json file ( #13796 )
2021-07-30 11:44:50 -07:00
QMK Bot
de1898e69e
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 18:18:01 +00:00
James Young
e180524c10
txuu: rename LAYOUT to LAYOUT_65_ansi_blocker_split_bs ( #13794 )
...
Renames the layout macro to be more conformant to the rest of QMK.
2021-07-30 11:17:48 -07:00
James Young
57ad8db60e
Tiger910: fix Left Control key size in info.json ( #13793 )
2021-07-30 11:17:30 -07:00
QMK Bot
d34e61a43c
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 18:17:17 +00:00
James Young
4758ea2188
Stratos: fix layout macro reference in info.json ( #13792 )
...
- change LAYOUT_60_ansi_tsangan_hhkb to LAYOUT_60_tsangan_hhkb
2021-07-30 11:16:59 -07:00
QMK Bot
70dceefa01
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 18:16:50 +00:00
James Young
069f479af4
Ristretto: fix Configurator layout data ( #13791 )
2021-07-30 11:16:37 -07:00
James Young
6af2d3a32c
X-Bows Ranger: rename LAYOUT to LAYOUT_tkl_ansi ( #13795 )
2021-07-30 11:16:18 -07:00
QMK Bot
701808372e
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 17:10:40 +00:00
Ryan
d1db008745
Onekey cleanup ( #13786 )
2021-07-30 18:10:05 +01:00
QMK Bot
3461bdad43
Merge remote-tracking branch 'origin/master' into develop
2021-07-30 17:02:12 +00:00
Matthew Dias
cfca970718
[Keyboard] Add portal 66 ( #13767 )
2021-07-30 10:01:43 -07:00