Commit Graph

24567 Commits

Author SHA1 Message Date
QMK Bot
2db4cc0f4a Merge remote-tracking branch 'origin/develop' into xap 2022-11-04 00:51:45 +00:00
Joel Challis
fb96b88842
Reduce includes for wpm header (#18949) 2022-11-04 00:50:59 +00:00
QMK Bot
8d7d7b8fc2 Merge remote-tracking branch 'origin/develop' into xap 2022-11-03 23:43:30 +00:00
Joel Challis
1249f74b31
Reduce includes for caps_word header (#18948) 2022-11-03 23:42:58 +00:00
QMK Bot
bde0a49704 Merge remote-tracking branch 'origin/develop' into xap 2022-11-03 23:01:39 +00:00
Ryan
fe18df9d41
Normalise Dynamic Macro keycodes (#18939)
* `DYN_REC_START1` -> `QK_DYNAMIC_MACRO_RECORD_START_1`

* `DYN_REC_START2` -> `QK_DYNAMIC_MACRO_RECORD_START_2`

* `DYN_MACRO_PLAY1` -> `QK_DYNAMIC_MACRO_PLAY_1`

* `DYN_MACRO_PLAY2` -> `QK_DYNAMIC_MACRO_PLAY_2`

* `DYN_REC_STOP` -> `QK_DYNAMIC_MACRO_RECORD_STOP`

* Update docs
2022-11-03 23:01:06 +00:00
QMK Bot
c099e25ad7 Merge remote-tracking branch 'origin/develop' into xap 2022-11-03 21:37:51 +00:00
Joel Challis
3de296f420
Reduce includes for crc header (#18947) 2022-11-03 21:36:58 +00:00
QMK Bot
493004561d Merge remote-tracking branch 'origin/develop' into xap 2022-11-03 20:45:06 +00:00
Joel Challis
f11a247127
Reduce includes for sequencer header (#18946) 2022-11-03 20:44:36 +00:00
QMK Bot
ec87bdc83c Merge remote-tracking branch 'origin/develop' into xap 2022-11-03 18:27:26 +00:00
Ryan
40122c28e0
Resolve info.json/rules.mk feature conflicts in three boards (#18942) 2022-11-03 18:26:18 +00:00
QMK Bot
e6d24f0e5a Merge remote-tracking branch 'origin/develop' into xap 2022-11-03 17:42:54 +00:00
Ryan
db2aa039f1
Remove more UNUSED_PINS defines (#18940) 2022-11-03 17:42:19 +00:00
QMK Bot
1c48ad58a1 Merge remote-tracking branch 'origin/develop' into xap 2022-11-01 21:35:06 +00:00
Joshua Diamond
5fb80562f1
Fix syntax error introduced in #18800 (#18933) 2022-11-01 21:34:31 +00:00
Stefan Kerkmann
1983421b7d
XAP: prevent OOB reads in config blob handler (#18926)
This fixes two bugs:

1. An invalid offset could be specified which wasn't checked to be in
   the bounds of the config blob.
2. The data_len check was incorrect as it would allow reading one byte
   past the config blob lenght.

Before the changes the following operation wouldn't fail:

Assuming we have blob of 64 bytes size and attempt a read with an
offset of 32 and data_len of 32, we actually try to read 32 bytes
starting from the 33. byte in the config blob. This reads exactly
one byte past array. Therefore we have to subtract one byte the get
the correct length.
2022-11-01 15:54:56 +00:00
Nick Brassel
d84090ec96
Bad Merge 2022-11-01 15:16:25 +11:00
Nick Brassel
478ae168d2
Merge remote-tracking branch 'upstream/develop' into xap 2022-11-01 15:13:23 +11:00
Joy Lee
9435ad19ee
Added analog support for WB32 MCU. (#18289)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-11-01 15:04:15 +11:00
Drashna Jaelre
ae5f818d5a
Simplify Keymap Config EEPROM (#18886)
* Simplify Keymap Config EEPROM

* Decrement eeconfig magic number due to eeconfig changes

* Update quantum/eeconfig.h

Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-01 01:02:43 +00:00
QMK Bot
6673985b5c Merge remote-tracking branch 'origin/develop' into xap 2022-11-01 00:36:18 +00:00
Ryan
7ebc396876
compiler.txt: ensure file exists before comparison (#18921) 2022-11-01 00:35:38 +00:00
QMK Bot
0794370d75 Merge remote-tracking branch 'origin/develop' into xap 2022-10-31 21:15:52 +00:00
Ryan
5974d989fe
Normalise Unicode keycodes (#18898)
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`

* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`

* `UC_MAC` -> `UNICODE_MODE_MACOS`

* `UC_LNX` -> `UNICODE_MODE_LINUX`

* `UC_WIN` -> `UNICODE_MODE_WINDOWS`

* `UC_BSD` -> `UNICODE_MODE_BSD`

* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`

* `UC_EMACS` -> `UNICODE_MODE_EMACS`

* `UC__COUNT` -> `UNICODE_MODE_COUNT`

* `UC_M_MA` -> `UC_MAC`

* `UC_M_LN` -> `UC_LINX`

* `UC_M_WI` -> `UC_WIN`

* `UC_M_BS` -> `UC_BSD`

* `UC_M_WC` -> `UC_WINC`

* `UC_M_EM` -> `UC_EMAC`

* Docs

* Update quantum/unicode/unicode.h
2022-10-31 21:15:12 +00:00
QMK Bot
0f091f2746 Merge remote-tracking branch 'origin/develop' into xap 2022-10-31 01:58:29 +00:00
QMK Bot
743524df32 Merge remote-tracking branch 'origin/master' into develop 2022-10-31 01:57:58 +00:00
Anton Chernenko
652b10e6a7
[Keyboard] Add Hubble keyboard (#18718)
Co-authored-by: Anton Chernenko <anton.chernenko@chaintrust.it>
2022-10-30 18:57:23 -07:00
QMK Bot
b5de2eb46a Merge remote-tracking branch 'origin/develop' into xap 2022-10-30 15:34:58 +00:00
Ryan
594dcbf66c
Properly fix elephant42 (#18908) 2022-10-30 15:34:24 +00:00
QMK Bot
2d1031613a Merge remote-tracking branch 'origin/develop' into xap 2022-10-30 05:27:31 +00:00
QMK Bot
56986e928b Merge remote-tracking branch 'origin/master' into develop 2022-10-30 05:26:59 +00:00
Joel Challis
ac4b3fd1e9
Remove duplicate key in novelkeys/nk65b (#18907) 2022-10-30 05:26:23 +00:00
QMK Bot
74897f0187 Merge remote-tracking branch 'origin/develop' into xap 2022-10-29 21:34:27 +00:00
Joel Challis
c63e2e378d
Revert "mcp23018: add return status to init (#18178)" (#18709)
This reverts commit 3fffa51554.
2022-10-29 22:33:47 +01:00
QMK Bot
b7be618173 Merge remote-tracking branch 'origin/develop' into xap 2022-10-29 20:49:47 +00:00
QMK Bot
c78dc85a1a Merge remote-tracking branch 'origin/master' into develop 2022-10-29 20:49:16 +00:00
mechlovin
078a511394
[Keyboard] Update Kay65 LED state (#18895) 2022-10-29 13:48:45 -07:00
QMK Bot
661f2d4d0e Merge remote-tracking branch 'origin/develop' into xap 2022-10-29 05:55:06 +00:00
fauxpark
9d717c85dc Merge remote-tracking branch 'upstream/master' into develop 2022-10-29 16:54:14 +11:00
Andrew Kannan
e90ff84c31
Add indicator LEDs to hoodrow G PCB (#18888) 2022-10-29 00:55:18 +01:00
Toshihiro Suzuki
bb97a78d3e
[Keymap] toshi0383 keymaps update (#18760)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-28 12:49:52 -07:00
Alabahuy
bc502348c3
[Keyboard] Add Encoder map support for rart (#18851) 2022-10-28 12:49:01 -07:00
Danny
e31fa77e9b
[Keyboard] Add Sinc Rev 1&2 Encoder Map Support (#18861) 2022-10-28 12:27:38 -07:00
QMK Bot
2c3c6c99b9 Merge remote-tracking branch 'origin/develop' into xap 2022-10-28 12:53:49 +00:00
Ryan
22be7e79ac
Normalise Auto Shift keycodes (#18892)
* Normalise Auto Shift keycodes

* Add keycode table to main list

* Add old keycodes to legacy header
2022-10-28 13:53:15 +01:00
QMK Bot
85065fa1c1 Merge remote-tracking branch 'origin/develop' into xap 2022-10-28 11:22:22 +00:00
Ryan
2ff1d85290
Normalise Autocorrect keycodes (#18893) 2022-10-28 12:21:24 +01:00
weimao
6514c25ca6
Docs: fix a typo (#18896) 2022-10-28 11:48:08 +01:00
QMK Bot
2c40a59184 Merge remote-tracking branch 'origin/develop' into xap 2022-10-27 22:51:03 +00:00