QMK Bot
413ddb1353
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 15:58:03 +00:00
Joel Challis
42245651e7
Align Dip Switch feature ( #22625 )
2023-12-08 15:57:34 +00:00
QMK Bot
08088be909
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 09:56:23 +00:00
QMK Bot
e471cb80cb
Merge remote-tracking branch 'origin/master' into develop
2023-12-08 09:55:53 +00:00
Joel Challis
0f341dfdd3
Fix TARGET when using converters ( #22591 )
2023-12-08 20:55:24 +11:00
QMK Bot
13cb6093b1
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 05:55:15 +00:00
Ryan
24511d31b6
LED/RGB Matrix: add header for drivers ( #22628 )
2023-12-08 16:54:47 +11:00
QMK Bot
413ebcecd9
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 04:37:08 +00:00
SmollChungus
2d3f2e92d8
consolidate firmware folder in smoll parent folder ( #22401 )
...
* consolidate firmware folder in smoll parent folder
* add moved keyboards to mapping
* typo fix
* typo..
* Update rules.mk
fix default folder lefty
* Update data/mappings/keyboard_aliases.hjson
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-08 04:36:38 +00:00
QMK Bot
cb8278d510
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 03:44:32 +00:00
QMK Bot
e394c06d14
Merge remote-tracking branch 'origin/master' into develop
2023-12-08 03:44:02 +00:00
spacehangover
a09fdd4190
WWA Keyboards ( #22612 )
2023-12-07 19:43:16 -08:00
QMK Bot
265ed8f04e
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 01:27:13 +00:00
Cipulot
81cedf5fa5
Add ADC support STM32L4xx and STM32G4xx series MCUs ( #22341 )
...
* Update analog.c
* Changes to remove errors in compile
* Update analog.c
Fix for RP2040 build errors
* Revert "Merge branch 'adc-add-stm32l4xx-stm32g4xx' of https://github.com/Cipulot/qmk_firmware into adc-add-stm32l4xx-stm32g4xx"
This reverts commit b11c297078
, reversing
changes made to ed3051f941
.
* Update analog.c
Attempt fix for formatting CI error
* Update platforms/chibios/drivers/analog.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update platforms/chibios/drivers/analog.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update platforms/chibios/drivers/analog.c
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
2023-12-08 01:26:44 +00:00
QMK Bot
ad9d31ae51
Merge remote-tracking branch 'origin/develop' into xap
2023-12-08 00:15:49 +00:00
QMK Bot
fc61fd9ce3
Merge remote-tracking branch 'origin/master' into develop
2023-12-08 00:15:11 +00:00
Joel Challis
897e33599e
Drop LED fixes ( #22624 )
2023-12-08 00:14:42 +00:00
QMK Bot
7875a59b2a
Merge remote-tracking branch 'origin/develop' into xap
2023-12-07 20:26:49 +00:00
QMK Bot
6f78b0daf0
Merge remote-tracking branch 'origin/master' into develop
2023-12-07 20:26:19 +00:00
jack
a4f990a431
Fixup helix/rev3_5rows ( #22623 )
2023-12-07 13:25:46 -07:00
QMK Bot
bb7d54bec2
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 17:41:03 +00:00
QMK Bot
b4dba3cfb1
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 17:40:28 +00:00
yiancar
834fb0b1fe
[Keyboard] Add Argyle ( #22607 )
...
* Argyle initial commit
* Update config.h
* Update config.h
* fixed
* Use json
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/keymaps/via/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/keymaps/iso/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update info.json
* format json
* Update keyboards/argyle/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/argyle/info.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/argyle/readme.md
Co-authored-by: Tom Barnes <barnestom@me.com>
---------
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Tom Barnes <barnestom@me.com>
2023-12-06 10:39:59 -07:00
QMK Bot
e8a27fa2b7
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 16:29:01 +00:00
QMK Bot
53c262de1b
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 16:28:29 +00:00
leah-splitkb
5ddbf60f38
Fix RGB Matrix max brightness for several splitkb.com keyboards ( #22621 )
2023-12-06 16:27:52 +00:00
QMK Bot
9163e587c3
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 13:07:35 +00:00
David Hoelscher
18630b741e
Add QP support for smaller OLED displays and SSD1306 ( #22358 )
2023-12-06 13:06:58 +00:00
QMK Bot
7a4b14da11
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 07:00:39 +00:00
QMK Bot
8ba46dcf61
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 07:00:10 +00:00
Sergey Vlasov
958215e9d6
Fix more qmk generate-api
fallout from userspace support ( #22619 )
2023-12-06 17:59:42 +11:00
QMK Bot
5f63daf2b9
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 04:56:33 +00:00
QMK Bot
4e836dd6cf
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 04:56:04 +00:00
Ryan
f1043e3a92
Fix JSON keymap URLs generated by the API ( #22618 )
2023-12-06 15:55:35 +11:00
QMK Bot
e62252fbf6
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 03:52:48 +00:00
QMK Bot
51ce4ae8ad
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 03:52:28 +00:00
Ryan
b6fbed3dc3
LED drivers: change "TWI" to "I2C" ( #22617 )
2023-12-05 19:52:18 -08:00
Less/Rikki
c7eb952198
[Keyboard] fruitykeeb/fruitbar/r1 ( #22616 )
...
Co-authored-by: Brandon Lewis <bslewis00@gmail.com>
2023-12-05 19:51:59 -08:00
QMK Bot
5365f068dc
Merge remote-tracking branch 'origin/develop' into xap
2023-12-06 03:35:40 +00:00
QMK Bot
8b022cefc5
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 03:35:11 +00:00
Ramon Imbao
6c2c211d8a
[Keyboard] Add Relapse-KB OR87 ( #22458 )
...
* Add relapsekb h87nu
* Change name
* Add missing license headers
* Apply suggestions from code review
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Remove config.h
* Update keyboards/relapsekb/or87/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-05 20:34:36 -07:00
QMK Bot
9cf3de9026
Merge remote-tracking branch 'origin/develop' into xap
2023-12-05 22:57:36 +00:00
era
11aa512c85
[Keyboard] Remove era/klein ( #22384 )
...
* Remove era/klein
era/klein is replaced by sirind/era/klein_sd
* Add an entry to data/mappings/keyboard_aliases.hjson
Add an entry to data/mappings/keyboard_aliases.hjson
2023-12-05 15:57:07 -07:00
QMK Bot
78fd58ca8b
Merge remote-tracking branch 'origin/develop' into xap
2023-12-05 22:53:22 +00:00
QMK Bot
1b56428e52
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 22:52:50 +00:00
Ivan Gromov
aa8e2065f1
[Keyboard] Add kt60HS-T ( #22413 )
...
* Create keymap.c
* Create keymap.c
* Create rules.mk
* Add files via upload
* Update keyboards/keyten/kt60hs_t/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update info.json after qmk format-json
* Update keymap.c
* Update keymap.c
* Update keymap.c
* Update keymap.c
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-05 15:52:19 -07:00
QMK Bot
497c1a1bb2
Merge remote-tracking branch 'origin/develop' into xap
2023-12-05 19:07:17 +00:00
QMK Bot
1ffb9092eb
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 19:06:44 +00:00
atti
87eaab600c
Fixed non-executable codes in the documentation ( #22600 )
2023-12-05 11:06:06 -08:00
QMK Bot
6eb0292ab7
Merge remote-tracking branch 'origin/develop' into xap
2023-12-05 15:42:05 +00:00