gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-13 21:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,631 Commits 63 Branches 1,613 Tags 897 MiB
hidlamp
Commit Graph

16379 Commits

Author SHA1 Message Date
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
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
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
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
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
c286ab90f9 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 15:41:35 +00:00
leah-splitkb
0d36977f3e
Fix Helix encoder direction (#22614) 2023-12-06 02:41:02 +11:00
Ryan
17f36a21bf
Rework RGBLight driver system (#22529) 2023-12-05 22:49:14 +11:00
Joel Challis
2acb426b8e
Remove "empty" files (#22603) 2023-12-05 08:37:00 +00:00
QMK Bot
92cf493d7f Merge remote-tracking branch 'origin/master' into develop 2023-12-05 08:30:41 +00:00
Less/Rikki
229633395b
[Keyboard] eyeohdesigns/humble40 (#22421) 
Co-authored-by: joedinkle <eodkeyboards@gmail.com>
 2023-12-05 00:30:28 -08:00
Markus Knutsson
8236f59fa3
[Keyboard] Add Chameleon keyboard (#22427) 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-12-05 00:30:07 -08:00
QMK Bot
7317680904 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 08:29:41 +00:00
Dam Vu Duy
eb0ce41e78
[Keyboard] Add Coban Pad 9A (#22456) 2023-12-05 00:29:12 -08:00
QMK Bot
3208f5fd1a Merge remote-tracking branch 'origin/master' into develop 2023-12-05 08:19:55 +00:00
MakotoKurauchi
65fb7224d5
[Keyboard][Helix] enable encoder map (#22488) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-12-05 00:19:24 -08:00
QMK Bot
9e60a81263 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 07:43:42 +00:00
Leon Anavi
6fb9de6cbb
[Keyboard] Add ANAVI Arrows (#22454) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-12-04 23:43:14 -08:00
QMK Bot
05787bc381 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 07:15:25 +00:00
kopibeng
61708d60fb
Update MNK65_STM32 (#22430) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
 2023-12-04 23:14:52 -08:00
QMK Bot
158d99b738 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 05:56:48 +00:00
Wilhelm Schuster
6973d6d053
Fix AD5258 I2C address for Leopold keyboards (#22554) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-12-04 21:56:19 -08:00
QMK Bot
18aa7d1244 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 05:19:46 +00:00
Bram Inniger
b9a3bdb982
[Keyboard] Fix oled layer display order for Aurora boards (#22521) 2023-12-04 21:19:14 -08:00
QMK Bot
6537794989 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 03:54:11 +00:00
Less/Rikki
88653c53ed
[Keyboard] fruitykeeb/fruitbar/r2 (#22580) 
Co-authored-by: ojthetiny <ba6sti6@gmail.com>
 2023-12-04 19:53:42 -08:00
QMK Bot
99ab4393de Merge remote-tracking branch 'origin/master' into develop 2023-12-04 23:30:31 +00:00
Duncan Sutherland
74ae2286a6
Fix erroneous commas in info.json files (#21712) 2023-12-04 23:30:02 +00:00
QMK Bot
c9d57e9014 Merge remote-tracking branch 'origin/master' into develop 2023-12-04 18:56:04 +00:00
yuezp
525fe9be96
[Keyboard] Add TG67 (#22592) 
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
 2023-12-04 11:55:34 -07:00
zvecr
daa5afcf1d Merge remote-tracking branch 'origin/master' into develop 2023-12-04 13:58:34 +00:00
yiancar
7f67256047
Add EE-AT and move W1-AT under geonworks (#22526) 
* Add EE-AT and move W1-AT under geonworks
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-12-04 09:07:37 +00:00
yiancar
c3773587e9
Add Event Horizon Keyboard (#22515) 
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-12-04 08:57:28 +00:00
Ryan
358bc8eac8
LED drivers: refactor page selection (#22518) 2023-12-04 17:52:40 +11:00
Joel Challis
131811b3d7
Initial support for CSTM65 (#22513) 2023-12-04 03:07:14 +00:00
QMK Bot
57db82445e Merge remote-tracking branch 'origin/master' into develop 2023-12-03 01:27:23 +00:00
Tom Barnes
37c2dd7c65
Helix rev3_5rows rgbmatrix patch (#22594) 2023-12-02 17:26:53 -08:00
QMK Bot
07e2b645ab Merge remote-tracking branch 'origin/master' into develop 2023-12-01 14:06:15 +00:00
Ryan
afa0eab374
Fix a bunch of CLI warnings (#22589) 2023-12-01 14:05:46 +00:00
QMK Bot
4be3abc39e Merge remote-tracking branch 'origin/master' into develop 2023-12-01 12:08:20 +00:00
Álvaro A. Volpato
28dc7ba6a8
Fix animation range on M75H (#22586) 2023-12-01 12:07:48 +00:00
QMK Bot
e0e621ad6f Merge remote-tracking branch 'origin/master' into develop 2023-12-01 10:07:56 +00:00
yuezp
5368ddbf3d
add keyboard bestway (#22498) 
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
 2023-12-01 02:07:28 -08:00
QMK Bot
f2f99739b3 Merge remote-tracking branch 'origin/master' into develop 2023-12-01 09:04:25 +00:00
Duncan Sutherland
67559c7d06
revoke community_layouts from keebio/wtf60 (#22502) 2023-12-01 01:03:54 -08:00
QMK Bot
9b0fc99076 Merge remote-tracking branch 'origin/master' into develop 2023-11-30 22:45:50 +00:00
Jay Greco
80f91fee40
nullbitsco/snap: reduce size of bongo_reactive (#22571) 2023-11-30 15:45:21 -07:00
Ryan
2886c335a0
keycapsss/plaid_pad: switch to encoder map (#22474) 2023-11-30 10:19:17 +11:00
QMK Bot
cfbbb503a4 Merge remote-tracking branch 'origin/master' into develop 2023-11-29 07:47:35 +00:00
Álvaro A. Volpato
93127df5d4
Add Smith and Rune Magnus (#22153) 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-28 23:47:08 -08:00
QMK Bot
8d308d56e3 Merge remote-tracking branch 'origin/master' into develop 2023-11-29 07:46:44 +00:00
Álvaro A. Volpato
c8a28e8e9b
Add Magnum Ergo 1 by dark (#22139) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-28 23:46:15 -08:00
QMK Bot
e923efcd56 Merge remote-tracking branch 'origin/master' into develop 2023-11-29 03:33:32 +00:00
Joe Scotto
4228f55551
Add ScottoWing handwired keyboard (#22506) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-28 19:33:17 -08:00
Alabahuy
1e5151bf63
add tokki (#22463) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-28 19:32:58 -08:00
QMK Bot
a886d7e3dd Merge remote-tracking branch 'origin/master' into develop 2023-11-29 03:30:41 +00:00
Duncan Sutherland
3024b05cbb
cablecardesigns/phoenix: correct layout data (#22517) 2023-11-28 19:30:12 -08:00
Less/Rikki
81d601b725
refactor: projectcain/vault35 (#22558) 2023-11-28 18:24:02 -08:00
Drashna Jaelre
094357c403
Fix missed shutdown callbacks (#22549) 2023-11-27 15:39:17 +11:00
Joel Challis
1ed03f498f
Remove userspace keymaps (#22544) 2023-11-27 05:36:45 +11:00
Drashna Jaelre
3ef06aa732
Improve and Cleanup Shutdown callbacks (#21060) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2023-11-26 22:59:18 +11:00
QMK Bot
3a74fa5bf7 Merge remote-tracking branch 'origin/master' into develop 2023-11-23 05:08:37 +00:00
James Young
0379d1f59e
DC60: Fix 2u Backspace Support (#22533) 2023-11-23 05:08:07 +00:00
QMK Bot
bf0d1fde5d Merge remote-tracking branch 'origin/master' into develop 2023-11-22 22:13:48 +00:00
gskygithub
98013e25c6
[Keyboard] darkproject/kd83a_bfg_edition (#18416) 
* Add files via upload

* [keyboard]

* [Keyboard]

* Delete flash_spi.c

* Delete flash_spi.h

* Delete wb32_spi_master.c

* Delete wb32_spi_master.h

* [Keyboard]

* Resolved requested changes

* Resolved requested changes

* Changed rules.mk file accordingly.

* Resolved changes accordingly.

* Update config.h file and rules.mk file

* Removed eeprom_flash.c file

* Update default/keymap.c file

* Delete keyboards/darkproject/kd83a_bfg_edition directory

* Add keyboard

* Add keyboard

* Delete darkproject/kd83a_bfg_edition directory

* Resolved Changes

* Resolved requested changes

* keyboard

* Add keyboard

* Delete keyboard

* Add keyboard

* Delete keyboards/darkproject/kd87a_bfg_edition directory

* update keymap.c file

* update via/keymap.c, config.h and kd83a_bfg_edition.c files

* Delete keymap.c

* Update via/keymap.c, config.h and kd83a_bfg_edition.c files

* update config.h file

* update keymap.c file

* update keymap.c file

* update config.h

* update kd83a_bfg_edition.c

* Resolved requested changes.

* Delete folder which was added accidentally.

* Update keyboards/darkproject/kd83a_bfg_edition/config.h

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c

* Update keyboards/darkproject/kd83a_bfg_edition/info.json

* Update keyboards/darkproject/kd83a_bfg_edition/rules.mk

* Update keyboards/darkproject/kd83a_bfg_edition/info.json

* update info.json file

* update config.h file

* Updated requested changes

* update readme.md

* Resolved requested changes

* Update info.json file

* Delete kd83a_bfg_edition.h

* Delete readme.md in default folder

* Update info.json file

* update info.json

* Updated changes

* Updated changes

* Resolved requested changes

* Resolved requested changes
 2023-11-22 14:13:16 -08:00
Joel Challis
b35bac6afb
Remove unnecessary driver counts (#22435) 2023-11-22 21:37:32 +00:00
Joel Challis
a0a6820c1b
Migrate some dip switch config to info.json (#22437) 2023-11-23 08:33:59 +11:00
Ryan
dda6e7fb36
LED drivers: register naming cleanups (#22436) 2023-11-20 15:48:23 +00:00
Joel Challis
e279c78ba3
Enable linking of encoders to switch within layout macros (#22264) 2023-11-20 15:41:48 +00:00
QMK Bot
67a87f67a0 Merge remote-tracking branch 'origin/master' into develop 2023-11-16 16:54:46 +00:00
leyew
1e4f7aa029
[Keyboard] Add dnworks 997pt3 (#22466) 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-16 09:54:13 -07:00
QMK Bot
cc7542b917 Merge remote-tracking branch 'origin/master' into develop 2023-11-15 15:23:35 +00:00
Le Zhang
adcc4d376c
Add leonardo build target for leonardo + usb2.0 shield based projects (#22243) 2023-11-15 15:23:03 +00:00
QMK Bot
c4d3521ba6 Merge remote-tracking branch 'origin/master' into develop 2023-11-14 08:11:41 +00:00
leyew
d7b44239c2
[Keyboard] Add Eden (#22467) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-14 01:11:12 -07:00
QMK Bot
79a6419dee Merge remote-tracking branch 'origin/master' into develop 2023-11-14 01:49:49 +00:00
cole smith
44062b5056
Bs equals (#21690) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6A73@pm.me>
 2023-11-14 12:49:15 +11:00
Joel Challis
1efc79063c
Migrate some EEPROM config to info.json (#22434) 2023-11-14 09:30:19 +11:00
QMK Bot
67d2bc5b3a Merge remote-tracking branch 'origin/master' into develop 2023-11-13 02:03:27 +00:00
Duncan Sutherland
56b6b28fe9
add 68_ansi Community Layout to nebula68b (#22433) 2023-11-12 19:02:46 -07:00
Joel Challis
e884e42ce9
Generalise ADC driver source inclusion (#22448) 2023-11-12 22:30:27 +00:00
Ryan
786ebf8760
Remove requirement for keymap_steno.h include in keymaps (#22423) 
* Remove requirement for `keymap_steno.h` include in keymaps

* Add back keymap_steno.h with a note for the time being
 2023-11-12 18:25:46 +11:00
QMK Bot
b7a1004b61 Merge remote-tracking branch 'origin/master' into develop 2023-11-12 05:31:01 +00:00
John Barbero
c2326c05c0
[Keyboard] Fixes to make snes_macropad play nicer with qmk configurator (#22432) 
* [Keyboard] Change default implementation for get_layer_name_user

Will now show the layer number instead of "Unknown", since this is
what will be shown if QMK Configurator is used to compile the
firmware.

* [Keyboard] Update the layout info

This makes it look sort of like a macropad + gamepad rather than an 4x6
ortholinear keyboard.

* [Keyboard] Fix default implementation of get_layer_name_user

Based on feedback from code review the implementation was swapped in
favor of using get_u8_str. This implied a change to the argument type
from int to uint8_t, which cascaded into the existing keymaps. (This
made sense in general, since the return type of get_highest_layer is
also a uint8_t.)
 2023-11-11 22:30:31 -07:00
QMK Bot
112a51db9c Merge remote-tracking branch 'origin/master' into develop 2023-11-12 05:20:13 +00:00
Duncan Sutherland
0189c485b9
studiokestra/line_tkl: correct layout data (#22455) 
* fix `layouts` data

* add EoF
 2023-11-11 22:19:43 -07:00
QMK Bot
2f28c6df6d Merge remote-tracking branch 'origin/master' into develop 2023-11-11 19:08:55 +00:00
jonylee@hfd
935c894f83
add 5087 keyboard (#20557) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2023-11-11 11:08:26 -08:00
jack
1ddc2cbeb9
Fixup snes_macropad on develop (#22444) 2023-11-11 07:26:26 +00:00
QMK Bot
4a98466ef3 Merge remote-tracking branch 'origin/master' into develop 2023-11-10 21:39:30 +00:00
Maria
6876fbe51d
[Keyboard] Add MariOrion v2.5 (#22273) 
* Pushed MariOrion v2.5 to the branch. Prod and proto version added.

* Pushed MariOrion v2.5 to the branch. Prod and proto version added.

* Proper addition of layout options

Addition of split bs rshift tsangan layout options.

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25

* Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25

* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Updated readme.md with more information regarding make commands, and proto vs prod.

* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Amended some changes to info.json - community layouts changed from scope to array.

* Update keyboards/mariorion_v25/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Revert keyboards/gray_studio/think65/solder/solder.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Revert keyboards/gray_studio/think65/solder/solder.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Revert keyboards/gray_studio/think65/solder/solder.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25)

* Revert keyboards/gray_studio/think65/solder/solder.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25)

* Update keyboards/mariorion_v25/proto/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/rules.mk

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/proto/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/proto/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/proto/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Revert keyboards/gray_studio/think65/solder/solder.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/matrix_diagram.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/proto/mariorion_v25.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/mariorion_v25/prod/mariorion_v25.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Pushed new info.json and keymap.c files.

* Pushed new info.json and keymap.c files.

* Fixes to LED driver wrt PWM definitions with STM.

* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Committing a details update to readme.md.

* Committing a details update to readme.md.

* Update keyboards/mariorion_v25/prod/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/mariorion_v25.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Revert "Committing a details update to readme.md."

This reverts commit 068a82a1fc.

* Committing a details update to readme.md.

* Update keyboards/mariorion_v25/halconf.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/mcuconf.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/prod/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/proto/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mariorion_v25/halconf.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Production pictures replacing the standard ones in the readme.md :)

* waffle87 requests bundled:
- Licence headers added
- Codeblocked matrix_diagram.md
- Consolidated files where possible
- Removed excess from config.h

---------

Co-authored-by: toril940 <anastasialucas940@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-11-10 14:39:00 -07:00
QMK Bot
2d7746609f Merge remote-tracking branch 'origin/master' into develop 2023-11-10 16:42:45 +00:00
ploopyco
38d6e9a75a
Add Ploopy Madromys mouse (#21989) 
Added PloopyCo madromys/adept mouse
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-11-10 16:42:15 +00:00
Ryan
8136cf4bfb
LED drivers: clean up SWx/CSy pullup/down resistor config (#22381) 2023-11-10 08:39:15 +11:00
QMK Bot
6b19a99a4f Merge remote-tracking branch 'origin/master' into develop 2023-11-09 19:57:44 +00:00
temp4gh
aee2a9d696
[Keyboard] Add alpaca/wfeclipse (#22230) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-11-09 12:57:14 -07:00
QMK Bot
28c1bc9b9f Merge remote-tracking branch 'origin/master' into develop 2023-11-09 17:54:10 +00:00
gregandcin
e5b7685e7a
Update gregandcin/teaqueen (#22402) 2023-11-09 09:53:35 -08:00
QMK Bot
a28149b222 Merge remote-tracking branch 'origin/master' into develop 2023-11-09 17:53:17 +00:00
John Barbero
39d0a14258
Add SNES Macropad keyboard (#22377) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-11-09 09:52:47 -08:00
QMK Bot
2568d45969 Merge remote-tracking branch 'origin/master' into develop 2023-11-09 02:03:36 +00:00
Panos Sakkos
daabe2d8c5
Update layer state of Lily58 from 'Default' to 'Base' (#22397) 2023-11-09 02:03:07 +00:00
Joel Challis
147865cf57
Migrate some common features to generic (#22403) 2023-11-09 02:01:44 +00:00
QMK Bot
4e577cbbea Merge remote-tracking branch 'origin/master' into develop 2023-11-09 01:57:51 +00:00
Matthias Liffers
0b7dba156c
Fix indicator LED definition for Sofle RGB. (#22408) 2023-11-09 01:57:16 +00:00
QMK Bot
27b9dd0f98 Merge remote-tracking branch 'origin/master' into develop 2023-11-09 01:55:49 +00:00
John Barbero
10cdd00751
Fix corne keylog (#22420) 
* [Keyboard] Fix bug in set_keylog function

Fixes issue where some keys would not trigger the oled to output the row
and column of a pressed key (would happen with LT(...) for my keymap)

* [Keyboard] Tiny improvement to oled_render_keylog for crkbd

Added improvement suggestion I got for another keyboard
 2023-11-09 01:55:08 +00:00
QMK Bot
f56838c680 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 21:01:27 +00:00
Fredrik A. Kristiansen
72f93e7fc2
Add iso85k keyboard (#22411) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-08 13:00:48 -08:00
Jeayo Keh
75e1a0d610
[Keyboard] Rename soda/{mango,pocket} (#22151) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2023-11-08 10:45:24 -07:00
QMK Bot
96ea277381 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:44:08 +00:00
Yak
64bbeff57d
Fix Herringbone pro Layouts (#22317) 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2023-11-08 10:42:08 -07:00
Less/Rikki
5a281d1ee9
feat(mechwild/clunker): new layouts (#22342) 2023-11-08 10:41:38 -07:00
QMK Bot
6f59e18efb Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:41:02 +00:00
Kelwin0313
80708a91ef
[Keyboard] Add PCB Utopia88 (#22257) 2023-11-08 10:40:28 -07:00
QMK Bot
c1ea29b8e4 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:40:04 +00:00
ai03
ebac02a7b2
[Keyboard] Add Duet Switch Tester (#22367) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-11-08 10:39:13 -07:00
QMK Bot
2be22a1323 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 08:31:41 +00:00
Reibl János Dániel
2337cd1186
Add riblee handwired split keyboard (#22277) 2023-11-08 00:31:06 -08:00
QMK Bot
884f653906 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 02:18:54 +00:00