QMK Bot
86c6b0c333
Merge remote-tracking branch 'origin/develop' into xap
2022-10-19 10:30:15 +00:00
Joel Challis
fc0330a54a
Correctly build keymap.json containing additional config ( #18766 )
2022-10-19 11:29:44 +01:00
QMK Bot
7bc4c16673
Merge remote-tracking branch 'origin/develop' into xap
2022-10-19 06:18:30 +00:00
Nick Brassel
f99b9ba270
Widen the ARM Cortex-M family support. Allow USB peripheral change. ( #18767 )
2022-10-19 17:17:49 +11:00
QMK Bot
ae5125ab54
Merge remote-tracking branch 'origin/develop' into xap
2022-10-19 00:41:33 +00:00
QMK Bot
d2bc11ca67
Merge remote-tracking branch 'origin/master' into develop
2022-10-19 00:41:02 +00:00
Tyler Thrailkill
0b8fbff1cb
Adjust oled gen to fix flashing on timeout ( #18747 )
...
Fixes an issue in Ocean Dream that causes flashing after the oled screen
times out and turns off.
This occurs because writing to an OLED screen turns it on as well and we
are both writing then immediately turning the screen off, but only if
the timeout has occurred (no WPM, 30 seconds has passed).
2022-10-19 01:40:26 +01:00
QMK Bot
424a189225
Merge remote-tracking branch 'origin/develop' into xap
2022-10-18 23:28:50 +00:00
Joshua Diamond
80fdbfce5f
A little personal cleanup after #18726 and #18729 ( #18734 )
...
* A little cleanup after #18726
* Re-instate RGBLIGHT_EFFECT_STATIC_GRADIENT
* Extend to spin
2022-10-19 00:28:19 +01:00
QMK Bot
f62d8663cf
Merge remote-tracking branch 'origin/develop' into xap
2022-10-18 02:34:21 +00:00
fauxpark
803d62f78a
Merge remote-tracking branch 'upstream/master' into develop
2022-10-18 13:33:37 +11:00
mmccoyd
89dbc18161
[Keymap] manna-harbour_miryoku RESET to QK_BOOT ( #18755 )
...
Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
2022-10-18 13:23:21 +11:00
QMK Bot
16d92e1fbf
Merge remote-tracking branch 'origin/develop' into xap
2022-10-17 21:29:50 +00:00
QMK Bot
e59cb51be0
[CI] Format code according to conventions ( #18756 )
2022-10-18 08:29:19 +11:00
QMK Bot
5e40e40280
Merge remote-tracking branch 'origin/develop' into xap
2022-10-17 21:27:31 +00:00
Jamal Bouajjaj
9d4c4ceee1
4 Driver support for IS31FL3737 ( #18750 )
...
* Added 4 driver support for the IS31FL3737 LED driver
* Updated docs for IS31FL3737 to support 4 drivers
2022-10-18 08:26:58 +11:00
QMK Bot
25caa9ae4a
Merge remote-tracking branch 'origin/develop' into xap
2022-10-17 16:14:57 +00:00
QMK Bot
ae3825a3bc
Merge remote-tracking branch 'origin/master' into develop
2022-10-17 16:14:23 +00:00
jack
5fdb49b5db
Fixup handwired/kbod ( #18754 )
2022-10-17 17:13:40 +01:00
QMK Bot
ae17dae21c
Merge remote-tracking branch 'origin/develop' into xap
2022-10-17 12:46:34 +00:00
Ryan
bad8c5992b
Remove legacy sendstring keycodes ( #18749 )
2022-10-17 13:45:23 +01:00
Nick Brassel
bc56585932
Actually take into account keyboard/keymap xap specs
2022-10-17 10:16:30 +11:00
zvecr
edc14b29be
Dump lighting maps out of inline gen
2022-10-16 23:55:44 +01:00
QMK Bot
124df6e407
Merge remote-tracking branch 'origin/develop' into xap
2022-10-16 20:31:58 +00:00
QMK Bot
c57330d340
Merge remote-tracking branch 'origin/master' into develop
2022-10-16 20:31:26 +00:00
Nick Brassel
f731e2789f
Allow Fedora to update ChibiOS configs. ( #18698 )
2022-10-17 07:30:49 +11:00
zvecr
9fcab705a9
Align client/docs gen with recent changes
2022-10-16 20:24:37 +01:00
QMK Bot
e8f40517a8
Merge remote-tracking branch 'origin/develop' into xap
2022-10-16 13:15:19 +00:00
Ryan
74223c34a9
Remove legacy keycodes, part 6 ( #18740 )
...
* `KC_RSHIFT` -> `KC_RSFT`
* `KC_RCTRL` -> `KC_RCTL`
* `KC_LSHIFT` -> `KC_LSFT`
* `KC_LCTRL` -> `KC_LCTL`
2022-10-16 14:14:40 +01:00
QMK Bot
8078248db0
Merge remote-tracking branch 'origin/develop' into xap
2022-10-16 05:09:36 +00:00
Nick Brassel
39c22f5cf5
Merge remote-tracking branch 'upstream/master' into develop
2022-10-16 16:08:34 +11:00
Nick Brassel
81988cc032
Slipped through the cracks. ( #18742 )
2022-10-16 15:58:42 +11:00
QMK Bot
ae717ee515
Merge remote-tracking branch 'origin/develop' into xap
2022-10-16 02:32:21 +00:00
Jouke Witteveen
d089af8703
Mark the moonlander keyboard default music map as weak ( #18715 )
...
This allows user keymaps to set a different music map.
2022-10-16 03:31:51 +01:00
Nick Brassel
5083c618cf
qmk pytest
2022-10-16 13:25:48 +11:00
Nick Brassel
c2e95c8522
Squashed commit of the following:
...
commit d614bc5f62f3c2efc5c5cc0f38168a67681e6fb5
Author: Nick Brassel <nick@tzarc.org>
Date: Sun Oct 16 13:17:03 2022 +1100
Remove old header generator.
commit 08337b814cfcef57a1f6b41acf06b806ad4bb116
Author: Nick Brassel <nick@tzarc.org>
Date: Sat Oct 15 11:47:20 2022 +1100
Restart jinja2 generation for firmware-side output.
2022-10-16 13:19:15 +11:00
jack
8464bb91e2
Fixup work_louder/micro VIA keymap ( #18738 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-15 16:16:17 -07:00
jack
4b5ebb7248
Fixup latinpadble ( #18736 )
2022-10-15 23:24:26 +01:00
QMK Bot
67e70084ed
Merge remote-tracking branch 'origin/develop' into xap
2022-10-15 21:30:48 +00:00
Ryan
5e4b076af3
Remove legacy keycodes, part 5 ( #18710 )
...
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
2022-10-15 22:29:43 +01:00
QMK Bot
8170c65dc8
Merge remote-tracking branch 'origin/develop' into xap
2022-10-15 21:29:12 +00:00
QMK Bot
92d7964b28
Merge remote-tracking branch 'origin/master' into develop
2022-10-15 21:27:30 +00:00
QMK Bot
4c52636684
Merge remote-tracking branch 'origin/develop' into xap
2022-10-15 21:26:58 +00:00
James Young
b5e26ccb94
Y&R Studio NZ67v2 Layout Refactor ( #18724 )
...
* info.json: apply friendly formatting
* nz67v2.h: use ____ for KC_NO
* nz67v2.h: add matrix diagram
* add LAYOUT_all
Same matrix as `LAYOUT`, but physically arranged to mimic the keyboard layout.
Rotary encoder positions move from the bottom row to the top row.
* refactor keymaps to use LAYOUT_all macro
* info.json: add LAYOUT_all data
* remove LAYOUT macro
Now unused.
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_split_space
* remove dead space from layouts
Remove empty space from `LAYOUT_65_ansi_blocker` and `LAYOUT_65_ansi_blocker_split_space` layouts.
2022-10-15 22:26:56 +01:00
QMK Bot
cbf9907c78
Merge remote-tracking branch 'origin/master' into develop
2022-10-15 21:26:26 +00:00
James Young
679cbb8426
bbrfkr Dynamis Refactor ( #18733 )
...
* dynamis.h: use XXX for KC_NO
* dynamis.h: add matrix diagram
* info.json: apply friendly formatting
* refactor keymaps
- use four-space indent
- grid-align keycodes for readability
* info.json: fix LAYOUT_iso key sequence
2022-10-15 22:25:53 +01:00
QMK Bot
21620a2d82
Merge remote-tracking branch 'origin/develop' into xap
2022-10-15 21:24:10 +00:00
QMK Bot
3fe9fbf950
Merge remote-tracking branch 'origin/master' into develop
2022-10-15 21:23:33 +00:00
Reibl János Dániel
ccdd28930a
fix: Remove OLED support ( #18719 )
...
* fix: Remove OLED support
* redundant files
Co-authored-by: zvecr <git@zvecr.com>
2022-10-15 22:22:59 +01:00
QMK Bot
fb788a9822
Merge remote-tracking branch 'origin/develop' into xap
2022-10-15 21:20:56 +00:00