gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-05 01:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,003 Commits 63 Branches 1,613 Tags 1.1 GiB
d4aa535d6e
Commit Graph

32003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
d4aa535d6e Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 22:44:16 +00:00
QMK Bot
b9e67347f1 Merge remote-tracking branch 'origin/master' into develop 2024-07-05 22:43:39 +00:00
Ryan
be967d42d2
playkbtw/pk64rgb: move RGB Matrix LED config to data driven (#24062) 2024-07-05 23:41:32 +01:00
QMK Bot
25000f69cb Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 22:26:47 +00:00
QMK Bot
c5e317aad9 Merge remote-tracking branch 'origin/master' into develop 2024-07-05 22:26:17 +00:00
dependabot[bot]
af72a58c8f
Bump JamesIves/github-pages-deploy-action from 4.6.1 to 4.6.3 (#24063) 
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.1 to 4.6.3.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases)
- [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.6.1...v4.6.3)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-07-05 23:25:48 +01:00
QMK Bot
d88eda5b37 Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 11:08:24 +00:00
Joel Challis
d0e89aecca
Align LUFA suspend logic (#24055) 2024-07-05 12:02:39 +01:00
QMK Bot
26b80c2204 Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 10:58:53 +00:00
QMK Bot
ecf5b26ff0 Merge remote-tracking branch 'origin/master' into develop 2024-07-05 10:58:17 +00:00
Ryan
9fb51cfe2b
kbdfans/baguette66: fix layout name (#24061) 2024-07-05 11:57:39 +01:00
QMK Bot
e39f31089e Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 10:56:25 +00:00
QMK Bot
4e8772b5cc Merge remote-tracking branch 'origin/master' into develop 2024-07-05 10:55:55 +00:00
ai03
6d21898c14
Add support for Equinox XL (#23695) 2024-07-05 11:55:25 +01:00
QMK Bot
4c2bb3e13e Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 06:36:17 +00:00
QMK Bot
5078ca651c Merge remote-tracking branch 'origin/master' into develop 2024-07-05 06:36:06 +00:00
Ryan
096dc672c1
kakunpc/rabbit_capture_plan: add additional layouts (#24059) 2024-07-05 16:35:48 +10:00
QMK Bot
10e2f1e29f Merge remote-tracking branch 'origin/master' into develop 2024-07-05 06:35:47 +00:00
Ryan
8e64ff574a
kakunpc/angel64: add additional layouts (#24058) 2024-07-05 16:35:35 +10:00
Ryan
5e2368984e
ash_xiix: add additional layouts (#24057) 2024-07-05 16:35:15 +10:00
QMK Bot
494e9776e8 Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 05:26:25 +00:00
QMK Bot
9dba1cadc9 Merge remote-tracking branch 'origin/master' into develop 2024-07-05 05:25:47 +00:00
Ryan
15af5d7d0d
handwired/tkk: fix layout name (#24056) 2024-07-04 23:25:00 -06:00
QMK Bot
672b51a3f2 Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 05:11:01 +00:00
QMK Bot
443d111403 Merge remote-tracking branch 'origin/master' into develop 2024-07-05 05:10:31 +00:00
Ryan
62c1787d72
dc01/arrow: fix layout name (#24025) 2024-07-05 15:10:02 +10:00
QMK Bot
f4368d6415 Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 01:36:39 +00:00
QMK Bot
777db159ac Merge remote-tracking branch 'origin/master' into develop 2024-07-05 01:36:01 +00:00
Coby Sher
8fe667a1a4
Add Sleepy Craft Studios Sleepy Keeb Split (#23844) 2024-07-04 18:35:29 -07:00
QMK Bot
c67dc8ab16 Merge remote-tracking branch 'origin/develop' into xap 2024-07-05 01:22:38 +00:00
Nick Brassel
3a711f4cfa
Allow overriding get_hardware_id(). (#24051) 2024-07-05 11:22:08 +10:00
QMK Bot
3c66714449 Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 23:55:40 +00:00
QMK Bot
cd22b8a945 Merge remote-tracking branch 'origin/master' into develop 2024-07-04 23:55:04 +00:00
Ryan
031ccd4887
salicylic_acid3/setta21: fix RGB Matrix LED config (#24041) 2024-07-05 00:49:05 +01:00
QMK Bot
5a61d09297 Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 23:45:24 +00:00
QMK Bot
41878d276e Merge remote-tracking branch 'origin/master' into develop 2024-07-04 23:44:53 +00:00
Ryan
43fc7b5a4f
kikoslab/kl90: add additional layouts (#24024) 2024-07-05 00:44:23 +01:00
QMK Bot
25371ce71a Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 19:50:58 +00:00
QMK Bot
9536b86a09 Merge remote-tracking branch 'origin/master' into develop 2024-07-04 19:50:25 +00:00
Ryan Neff
4ced8d9371
Fixes duplicate pid/vid for sofle_choc (#24030) 2024-07-04 13:49:55 -06:00
QMK Bot
28e5a6cbac Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 02:44:40 +00:00
QMK Bot
9adac59c29 Merge remote-tracking branch 'origin/master' into develop 2024-07-04 02:42:11 +00:00
Cipulot
1c6cdb8d74
[Keyboard] Addition of EC 60X (#24028) 
* Addition of EC 60X

* Update keyboards/cipulot/ec_60x/keymaps/via/keymap.c

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

* Update keyboards/cipulot/ec_60x/keymaps/default/keymap.c

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

* Update keyboards/cipulot/ec_60x/keyboard.json

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

* Update keyboards/cipulot/ec_60x/keyboard.json

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

* Update keyboards/cipulot/ec_60x/keyboard.json

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

* Update keyboards/cipulot/ec_60x/keyboard.json

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

* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"

This reverts commit 5f49ef63cd.

* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"

This reverts commit 5fb9706acd.

* revert of what was done with the layouts

* Update keyboards/cipulot/ec_60x/mcuconf.h

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>
 2024-07-03 20:42:07 -06:00
chalex
c663f5e9f3
[Keyboard] Add chlx lfn merro (#24026) 
* add previous working files to new branch

* update config files. tested via version

* update per qmk PR requested changes - 1. rename info.json -> keyboard.json, move config.h -> keyamps/via/config.h, remove rules.mk

* update photo link for pcb

* remove redundant community keymaps

* Update keyboards/chlx/lfn_merro60/keymaps/default/keymap.c

correct keycode for iso keys

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

* switch image url to source from imgur instead of github

---------

Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
 2024-07-03 20:40:24 -06:00
QMK Bot
81761e28f9 Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 02:40:09 +00:00
QMK Bot
fddd7c00fd Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 02:39:16 +00:00
QMK Bot
32ec677d8d Merge remote-tracking branch 'origin/master' into develop 2024-07-04 02:39:15 +00:00
Guanzhong Chen
977918982d
monsgeek/m5: make numlock and capslock LEDs work (#24027) 2024-07-03 20:38:38 -06:00
Will Hedges
26c114a2b4
[keyboard] added bear_face/v3 (#24032) 
* added keyboard.json, default, default_iso, and keymap READMEs
 2024-07-03 20:38:03 -06:00
QMK Bot
b84351fbec Merge remote-tracking branch 'origin/develop' into xap 2024-07-04 02:35:22 +00:00