gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-15 14:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,955 Commits 64 Branches 1,613 Tags 1 GiB
f364242d8a
Commit Graph

29955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7b56e27a18 Merge remote-tracking branch 'origin/develop' into xap 2023-11-12 05:20:55 +00: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
4e94aeef55 Merge remote-tracking branch 'origin/develop' into xap 2023-11-11 19:09:34 +00: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
Nick Brassel
cc42bb9251
Merge remote-tracking branch 'upstream/develop' into xap 2023-11-11 22:06:56 +11:00
Less/Rikki
2e1a27da60
fix: make clicky delay silent (#21866) 2023-11-11 21:55:47 +11:00
QMK Bot
d8176fb0f2 Merge remote-tracking branch 'origin/master' into develop 2023-11-11 09:51:03 +00:00
Nick Brassel
211fbbd16d
Add qmk license-check developer-level CLI command. (#22075) 2023-11-11 20:50:33 +11:00
QMK Bot
7d34e3741c Merge remote-tracking branch 'origin/develop' into xap 2023-11-11 07:26:58 +00:00
jack
1ddc2cbeb9
Fixup snes_macropad on develop (#22444) 2023-11-11 07:26:26 +00:00
QMK Bot
2156c0e82c Merge remote-tracking branch 'origin/develop' into xap 2023-11-11 03:09:32 +00:00
Ryan
76dc52c5c8
snled27351: fix missing i2c_init() (#22446) 2023-11-11 14:09:03 +11:00
QMK Bot
93cf501223 Merge remote-tracking branch 'origin/develop' into xap 2023-11-10 21:40:36 +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
0b9ad951ff Merge remote-tracking branch 'origin/develop' into xap 2023-11-10 16:43:27 +00: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
QMK Bot
bb4fc4dd71 Merge remote-tracking branch 'origin/develop' into xap 2023-11-10 05:15:07 +00:00
Joel Challis
84df69572c
Infer LED DRIVER_COUNT from configured addresses (#22311) 2023-11-10 05:14:22 +00:00
QMK Bot
799f0eb352 Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 21:39:45 +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
ab295915cb Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 19:58:27 +00: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
9230558a44 Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 17:55:28 +00:00
QMK Bot
28c1bc9b9f Merge remote-tracking branch 'origin/master' into develop 2023-11-09 17:54:10 +00:00
QMK Bot
75f19ec720 Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 17:53:55 +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
ac1354b712 Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 02:05:22 +00: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
QMK Bot
7887a03d13 Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 02:02:21 +00:00
Joel Challis
147865cf57
Migrate some common features to generic (#22403) 2023-11-09 02:01:44 +00:00
QMK Bot
9d7193bc3a Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 01:58:18 +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
a2fb4c46a2 Merge remote-tracking branch 'origin/develop' into xap 2023-11-09 01:56: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
29302ac339 Merge remote-tracking branch 'origin/develop' into xap 2023-11-08 21:02:06 +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
QMK Bot
cd747a3d6a Merge remote-tracking branch 'origin/develop' into xap 2023-11-08 17:48:38 +00:00