Commit graph

26713 commits

Author SHA1 Message Date
QMK Bot
c2c78996d9 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 09:32:06 +00:00
yuezp
9c857728c6
[Keyboard] Add meetlab/kalice (#22207)
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-12 01:31:36 -08:00
casuanoob
06b9925156
Bastard Keyboards: Add support for Dilemma v2 (3x5+3) (#22185)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Charly Delay <charly@delay.gg>
2023-12-12 01:22:59 -08:00
QMK Bot
faf9c38c26 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 08:50:20 +00:00
Marek128b
1c68cd09b8
[Keyboard] add ergosplit44 v1 (#22344)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-12 00:48:59 -08:00
QMK Bot
967a6138ac Merge remote-tracking branch 'origin/master' into develop 2023-12-12 08:48:57 +00:00
jpe230
e2d6187339
[Keyboard] Add Big Knob board (#22292)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-12 00:48:24 -08:00
Coom
fb3c91375c
[Keyboard] zk3mod : added OLED (#22303)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-12 00:44:14 -08:00
Álvaro A. Volpato
1f9b653f58
[Keyboard] Add Iron180 V2 PCB support (#22314)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-12 00:41:41 -08:00
Ryan
e648155113
Rename RGBLED_NUM -> RGBLIGHT_LED_COUNT (#22570) 2023-12-12 15:30:08 +11:00
QMK Bot
3c7e9a6827 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:21:42 +00:00
TW59420
c4a2bea0e6
[Keyboard] add mmk_3 (#22569)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-12-11 19:21:09 -08:00
QMK Bot
d6f207dcd6 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:07:10 +00:00
rhmokey
ae6f6c3365
[Keyboard] add luckycat70 (#22622)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: zvecr <git@zvecr.com>
2023-12-11 19:06:42 -08:00
QMK Bot
8352f589c7 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:02:58 +00:00
Marc Nause
7ae0f7caf1
Fix compile error in VLC keymap for Anavi Macropad8 (#22644) 2023-12-11 19:02:28 -08:00
QMK Bot
dc6cf643f3 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:00:55 +00:00
yuezp
e6b53af38e
[Keyboard] Add ENTER80 (#22632)
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-11 19:00:26 -08:00
QMK Bot
e2472ee8f1 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 02:12:41 +00:00
kopibeng
432789dc22
[Keyboard] Add KLC x TGR Lena (#22629)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-11 18:12:03 -08:00
Joel Challis
4682226e20
Keymap introspection for Dip Switches (#22543) 2023-12-11 23:06:18 +00:00
QMK Bot
d85f954d30 Merge remote-tracking branch 'origin/master' into develop 2023-12-11 09:07:58 +00:00
kopibeng
ae18481f50
Add MNK60_STM32 (#22429)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-11 01:07:26 -08:00
Joel Challis
42245651e7
Align Dip Switch feature (#22625) 2023-12-08 15:57:34 +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
Ryan
24511d31b6
LED/RGB Matrix: add header for drivers (#22628) 2023-12-08 16:54:47 +11: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
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
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 b11c2970785ce41ec772689749d71a2bd0ab48e7, reversing
changes made to ed3051f94109b53eb1735882abfe7f57473bdca8.

* 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
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
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
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
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
David Hoelscher
18630b741e
Add QP support for smaller OLED displays and SSD1306 (#22358) 2023-12-06 13:06:58 +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
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
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
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
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