qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-28 12:58:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
30,158 Commits 58 Branches 1,722 Tags
d1648ed7b8895e91862a67bfc4b600bef512ac49
Commit Graph
30158 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot d1648ed7b8 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 09:23:31 +00:00
casuanoobDrashna JaelreRyanCharly Delay
 		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 6f81e22706 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 08:51:46 +00:00
QMK Bot faf9c38c26 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 08:50:20 +00:00
QMK Bot 7b8962f5d7 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 08:49:31 +00:00
Marek128bLess/RikkijackDuncan SutherlandDrashna Jaelre
 		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
jpe230andDuncan Sutherland e2d6187339 [Keyboard] Add Big Knob board (#22292) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-12-12 00:48:24 -08:00
QMK Bot 2b35ac09a4 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 08:44:46 +00:00
CoomjackRyan
 		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
QMK Bot c448480f58 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 08:42:10 +00:00
Álvaro A. VolpatoJoel ChallisDuncan Sutherland
 		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
QMK Bot a3dfae729b Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 04:30:38 +00:00
Ryan e648155113 Rename RGBLED_NUM -> RGBLIGHT_LED_COUNT (#22570) 2023-12-12 15:30:08 +11:00
QMK Bot 4ad929bb88 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 03:22:13 +00:00
QMK Bot 3c7e9a6827 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:21:42 +00:00
TW59420jackRyanDrashna JaelreJoel Challis
 		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 492b053ecb Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 03:08:31 +00:00
QMK Bot d6f207dcd6 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:07:10 +00:00
rhmokeyjackJoel Challis
 		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 de71657d39 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 03:03:36 +00: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 f22ad77426 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 03:01:26 +00:00
QMK Bot dc6cf643f3 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 03:00:55 +00:00
yuezpand“yuezp” e6b53af38e [Keyboard] Add ENTER80 (#22632) 
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
 2023-12-11 19:00:26 -08:00
QMK Bot 620891dd96 Merge remote-tracking branch 'origin/develop' into xap 2023-12-12 02:13:19 +00:00
QMK Bot e2472ee8f1 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 02:12:41 +00:00
kopibengandjack 432789dc22 [Keyboard] Add KLC x TGR Lena (#22629) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-12-11 18:12:03 -08:00
QMK Bot 94457561d6 Merge remote-tracking branch 'origin/develop' into xap 2023-12-11 23:06:58 +00:00
Joel Challis 4682226e20 Keymap introspection for Dip Switches (#22543) 2023-12-11 23:06:18 +00:00
QMK Bot ae11a0031a Merge remote-tracking branch 'origin/develop' into xap 2023-12-11 09:08:30 +00:00
QMK Bot d85f954d30 Merge remote-tracking branch 'origin/master' into develop 2023-12-11 09:07:58 +00:00
kopibengDuncan SutherlandjackDrashna Jaelre
 		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
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) 0.23.1 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
SmollChungusandDuncan Sutherland 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
CipulotandJoel Challis 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