gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-11 20:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,877 Commits 63 Branches 1,613 Tags 1.3 GiB
fa4c08f385
Commit Graph

16103 Commits

Author SHA1 Message Date
Wilba
1d1c407e4e
Update WT60-H1, WT60-H3 layouts (#20114) 2023-04-03 13:09:15 +10:00
QMK Bot
fb2eb12479 Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 03:07:07 +00:00
QMK Bot
4834c01f14 Merge remote-tracking branch 'origin/master' into develop 2023-04-03 03:06:30 +00:00
Torsten Schneider
9152928f02
Adding my keymap (#19964) 2023-04-03 13:05:48 +10:00
QMK Bot
078ee90bbf Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 03:01:44 +00:00
Johannes H. Jensen
68efea70b2
Add direction to dynamic_macro_record_start_user (#19689) 2023-04-03 13:01:07 +10:00
QMK Bot
8929f31c22 Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 02:57:01 +00:00
Phil Hollenback
162d6156d3
Allow a larger int for the idle timeout for urbanvanilla keymap (#19738) 2023-04-03 12:56:24 +10:00
QMK Bot
82c143d6bb Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 00:08:15 +00:00
QMK Bot
3ec37f4d55 Merge remote-tracking branch 'origin/master' into develop 2023-04-03 00:07:20 +00:00
andi4000
ac9f9f9efb
ISO-DE Keymap for Dactyl Manuform 6x7 (#19441) 2023-04-03 10:06:40 +10:00
QMK Bot
35f3776428 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 22:25:23 +00:00
QMK Bot
78e0f8dd54 Merge remote-tracking branch 'origin/master' into develop 2023-04-02 22:24:44 +00:00
HorrorTroll
d300811009
Add user horrortroll in userspace (#19769) 2023-04-03 08:24:04 +10:00
QMK Bot
ebe192428d Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 19:14:33 +00:00
Drashna Jael're
d997fe1a4a
Merge remote-tracking branch 'origin/master' into develop 2023-04-02 12:13:28 -07:00
Jay Greco
27e6e27d3a
[Keyboard] Add nullbits SNAP keyboard (#18916) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-04-02 12:12:06 -07:00
Moritz Plattner
5687fc7646
Add support for Geistmaschine Macropod (#20116) 
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
 2023-04-02 12:02:20 -06:00
Travis Reed
ebe36ea83c
[Keymap] Add dancxjo hotdox76v2 keymap (#20016) 2023-04-02 12:01:06 -06:00
cttt
6b205c3064
[Keyboard] Add Erdnuss 65 (#20202) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-04-02 11:55:20 -06:00
butterkeebs
b5d0c44690
[Keyboard] Add pocketpad (#20229) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-04-02 11:50:14 -06:00
Thomaz Peres
d0e0b9e583
[Keyboard] Add Royal Kludge RKG-68 (#20138) 2023-04-02 11:49:05 -06:00
mechlovin
b0dc99fbd8
[Keyboard] Add Mechlovin9 rev.3 (#20119) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-04-02 11:47:07 -06:00
QMK Bot
4024e779f3 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 17:25:54 +00:00
Less/Rikki
9b89ad1e7b
[keyboard] add jacky_studio/piggy60/rev2 (#20297) 2023-04-02 11:25:14 -06:00
QMK Bot
b4d3029675 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 17:24:41 +00:00
QMK Bot
203d9eb97c Merge remote-tracking branch 'origin/master' into develop 2023-04-02 17:24:05 +00:00
Raphael Mangubat
5b8dae0d61
Enable encoder mapping in VIA for Keebio KBO-5000 (#20272) 2023-04-02 11:23:26 -06:00
QMK Bot
cb49817082 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 17:10:06 +00:00
QMK Bot
822445277e Merge remote-tracking branch 'origin/master' into develop 2023-04-02 17:09:29 +00:00
Vertex-kb
fd56a2a1dc
Add angle65 (#19986) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2023-04-02 11:08:53 -06:00
QMK Bot
b6aeb6b7e2 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 09:00:45 +00:00
AuditeMarlow
12ea0e668f
[Keyboard] Add the KJ-Modify RS40 PCB (#20243) 2023-04-02 02:00:09 -07:00
QMK Bot
695f0a86ad Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:59:21 +00:00
QMK Bot
deb440f156 Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:58:45 +00:00
Alexander Kagno
be9f6e679b
[Keymap] update arkag keymap, add hitbox layout (#20271) 
Co-authored-by: Alex Kagno <alex@turncommerce.com>
 2023-04-02 01:57:54 -07:00
QMK Bot
7da8a0c0aa Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:36:17 +00:00
QMK Bot
930b3ba70d Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:35:36 +00:00
Cameron Varley
b53356f7ab
[Keyboard] Add GMMK Numpad (#20067) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-04-02 01:34:54 -07:00
QMK Bot
870f73a14a Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:29:46 +00:00
QMK Bot
c4a19c7d1b Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:28:42 +00:00
QMK Bot
8df38e18c0 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:28:19 +00:00
Albert Y
c402bac023
[Keymap] Ferris - Add split USB detection directive (#20213) 2023-04-02 01:28:00 -07:00
QMK Bot
cdcdc13ca5 Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:27:42 +00:00
Shane Dowling
a030e8094f
[Keymap] Add md40 ckrbd keymap (#19931) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-04-02 01:27:04 -07:00
QMK Bot
9c72ea4373 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 04:32:04 +00:00
Joel Challis
1fb06ee9af
Remove some use of keymap.h (#20316) 2023-04-02 05:31:22 +01:00
QMK Bot
65c09d6821 Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 18:02:22 +00:00
Drashna Jaelre
bf986579dd
Fixup Pointing device functions (#20311) 2023-04-01 19:01:46 +01:00
QMK Bot
88f59112e0 Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 02:13:59 +00:00
Ryan
9359504255
Move 66% and 68% layouts to data driven (#20293) 2023-04-01 13:13:18 +11:00
QMK Bot
8f42e096cb Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 02:10:32 +00:00
Ryan
e40b6ca3b0
Move split layouts to data driven (#20290) 2023-04-01 13:09:53 +11:00
QMK Bot
79beb1710d Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 17:27:06 +00:00
QMK Bot
5ce882d84e Merge remote-tracking branch 'origin/master' into develop 2023-03-30 17:26:20 +00:00
Alejandro Chacón
b63e388692
[Keyboard update] Fix json error (#20299) 2023-03-30 18:25:42 +01:00
QMK Bot
d256806be8 Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 01:21:39 +00:00
Ryan
647c2835e6
WS2812 driver improvements (#20262) 2023-03-30 12:21:02 +11:00
QMK Bot
10007c6bb6 Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 00:42:58 +00:00
QMK Bot
7e1e662dc7 Merge remote-tracking branch 'origin/master' into develop 2023-03-30 00:42:20 +00:00
Nick Brassel
81f3f0f3e9
Revert to hex output for kint41 (#20295) 2023-03-30 01:41:36 +01:00
QMK Bot
7182bc41ec Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 21:41:20 +00:00
Nick Brassel
c0a24671ee
Actually commit conflict resolution. 2023-03-30 08:40:35 +11:00
QMK Bot
71c1d76c6c Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 21:38:29 +00:00
Nick Brassel
836ffabc3d
Merge remote-tracking branch 'upstream/master' into develop 2023-03-30 08:37:24 +11:00
QMK Bot
a4837db456 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 20:17:05 +00:00
Less/Rikki
68a27b8e92
[jacky_studio/piggy60] move AVR PCB under rev1 (#20253) 2023-03-29 14:16:20 -06:00
Maverick0197
d0c36a7683
[Keyboard] Add KeyDeck8 (#20107) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-29 13:13:05 -07:00
4pplet
c6cc638752
[Keyboard] Add Steezy60 Rev B (#19688) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Jue Liu <youturn@Jues-MacBook-Pro.local>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Shandon Anderson <shandon@shandon.codes>
Co-authored-by: jack <0x6A73@pm.me>
Co-authored-by: jason <jrucker2004@gmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
 2023-03-29 13:10:47 -07:00
QMK Bot
2e23510313 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 19:36:13 +00:00
QMK Bot
f5e36620b2 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 19:35:25 +00:00
Sắn
621dbdf8ee
[Keyboard] Add Plaque80 (#20240) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
 2023-03-29 13:34:42 -06:00
QMK Bot
3158dabb26 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 18:48:37 +00:00
QMK Bot
3042381679 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 18:47:54 +00:00
Alejandro Chacón
896f38c52c
[Keyboard] Add alhenkb macropad (#20123) 2023-03-29 11:47:14 -07:00
QMK Bot
5358ce1e96 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 07:16:47 +00:00
Nick Brassel
f18dd488da
Fixup CI build for nack. (#20292) 2023-03-29 18:15:55 +11:00
QMK Bot
ce3246a314 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 05:02:37 +00:00
fauxpark
9602938e9e Merge remote-tracking branch 'upstream/master' into develop 2023-03-29 16:00:41 +11:00
QMK Bot
04e3e0a55f Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 04:55:13 +00:00
Ryan
4869b8061c
Move ortho & numpad layouts to data driven (#20183) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-03-29 15:54:34 +11:00
Ryan
e2630f9b40
Fix some invalid layout macros (#20256) 2023-03-29 15:51:22 +11:00
QMK Bot
b36a8e97e2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 04:48:41 +00:00
Ryan
06664e8a94
Fix layouts containing keys with multiple matrix positions (#20191) 2023-03-29 15:47:59 +11:00
QMK Bot
922b153a53 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 01:10:46 +00:00
QMK Bot
6195b4fca2 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 01:10:05 +00:00
Joel Challis
e0b1637e15
I have zero involvement with this keyboard... (#20287) 2023-03-29 02:09:26 +01:00
QMK Bot
c51fcb8057 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 16:29:41 +00:00
QMK Bot
26e60200ab Merge remote-tracking branch 'origin/master' into develop 2023-03-28 16:27:18 +00:00
takashicompany
a6b2b1ca41
Add new keyboard Tightwriter (#20136) 
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
 2023-03-28 10:24:53 -06:00
QMK Bot
7cb5dce968 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 13:34:30 +00:00
QMK Bot
379bb62aac Merge remote-tracking branch 'origin/master' into develop 2023-03-28 13:33:45 +00:00
Albert Y
02cb5db67b
Remove invalid characters (#20277) 2023-03-28 14:33:00 +01:00
QMK Bot
38c4a8e7d0 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 05:43:22 +00:00
QMK Bot
7eabf7efd1 Merge remote-tracking branch 'origin/master' into develop 2023-03-28 05:42:43 +00:00
blindassassin111
00c3946fbe
[keyboard] Correcting info.JSON for OSAv2 (#20247) 2023-03-27 23:42:04 -06:00
QMK Bot
5572a5eb99 Merge remote-tracking branch 'origin/develop' into xap 2023-03-27 19:01:46 +00:00
Joel Challis
79b0f9168e
Custom keycodes in JSON (#19925) 2023-03-27 20:01:07 +01:00
QMK Bot
ff342d78d9 Merge remote-tracking branch 'origin/develop' into xap 2023-03-26 22:57:34 +00:00
QMK Bot
66d56a9480 Merge remote-tracking branch 'origin/master' into develop 2023-03-26 22:56:50 +00:00
Nick Brassel
3ee17cd5d3
[chore] keyboards/tzarc: Alignment with clang-format. (#20265) 2023-03-26 23:56:09 +01:00
QMK Bot
eebe2e467a Merge remote-tracking branch 'origin/develop' into xap 2023-03-26 07:22:49 +00:00
Ryan
36ce81df59
Move WS2812_DRIVER to data driven (#20248) 2023-03-26 18:22:12 +11:00
QMK Bot
9ca6232eec Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 20:27:08 +00:00
QMK Bot
141d15cd12 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 20:26:13 +00:00
Andrew Kannan
153bcdcd8d
Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK (#20131) 
* Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK

* Add 65_iso_blocker community layout support
 2023-03-23 20:25:15 +00:00
QMK Bot
8c5d59e6d0 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 20:24:06 +00:00
QMK Bot
e84d1ca3e7 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 20:23:28 +00:00
blindassassin111
37ac5e68e6
[Keyboard]Viktus Minne - Topre variant (#20044) 
* Adding the Viktus Minne topre pcb variant

* Update keyboards/viktus/minne_topre/readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update rules.mk

* Moving layouts from *.h to info.json

* Removing minne_topre.h and updating others

* fixing *.c's

* Switch from int to void for ec_init

* Update info.json

* Update info.json

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-23 20:22:47 +00:00
QMK Bot
614c9cb871 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 20:21:34 +00:00
QMK Bot
1cbbe64e18 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 20:20:52 +00:00
blindassassin111
b035cd094b
[keyboard] Correcting info.JSON for Viktus Minne (#20244) 2023-03-23 14:20:12 -06:00
QMK Bot
3d8aa1aade Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 17:22:21 +00:00
Ryan
1e07ff1fb1
Fix some more missing #pragma onces (#20241) 2023-03-23 17:21:37 +00:00
QMK Bot
12757600f2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:38:43 +00:00
Ryan
ad625e7c06
Remove RGB_DI_PIN ifdefs (#20218) 2023-03-23 21:38:01 +11:00
QMK Bot
1be1e1547f Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:11:45 +00:00
QMK Bot
b72b487b4d Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:10:35 +00:00
Cipulot
15cb7ded76
EC ProX PCB (#20047) 
* Add EC Pro X

Addition of EC Pro X PCB series.
This series comprises 2 versions:
- ANSI/ISO
- JIS

The PCBs are different and are compatible only with their respective cases.

* Moved from data driven row/col def to config def

* Added project url in info.json

* Implemented proper `LAYOUT_` changes

* Removen unnecessary `.h` includes

* Removal of `"w": 1`

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Fixed keymap error in ordering

* Update keyboards/cipulot/ec_prox/jis/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Update keyboards/cipulot/ec_prox/ansi_iso/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update keyboards/cipulot/ec_prox/jis/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update rules.mk

---------

Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-23 10:09:50 +00:00
QMK Bot
825a152bea Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:08:18 +00:00
QMK Bot
c7756f5326 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:07:25 +00:00
QMK Bot
e2cad906a1 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 10:07:09 +00:00
Cipulot
5428d922a5
EC 23U PCB (#20049) 
* Add EC 23U PCB firmware

* Moved from data driven row/col def to config def

* Implemented proper LAYOUT_ changes

* Removed unnecessary `.h` includes

* Updated default thresholds

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Update readme.md

Added missing `cipulot/` in example commands.

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update rules.mk
 2023-03-23 10:06:38 +00:00
QMK Bot
17ccec4326 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:06:32 +00:00
Cipulot
3303f7ea5d
EC 60 PCB (#20050) 
* Add EC 60 PCB firmware

* Moved from data driven row/col def to config def

* Implemented proper LAYOUT_ changes

* Removed unnecessary `.h` includes

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Update readme.md

Added missing `cipulot/`in readme example commands

* Update keyboards/cipulot/ec_60/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update keyboards/cipulot/ec_60/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

---------

Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-23 10:05:49 +00:00
QMK Bot
10d0428151 Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 08:43:29 +00:00
Drashna Jael're
73f4718f16
Merge remote-tracking branch 'origin/master' into develop 2023-03-23 01:41:42 -07:00
Less/Rikki
bb4abc8a9f
[jacky_studio/piggy60] warn about incompatible PCB rev (#20232) 2023-03-23 19:18:30 +11:00
spbgzh
0e4221fdf7
[Keyboard] Fix tata80 wkl layout (#20195) 2023-03-23 00:12:38 -07:00
SHVD3x
4f374640d0
[Keyboard] Ymd09 config updates (#20124) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-22 23:52:31 -07:00
Moritz Plattner
e624ce959a
[Keyboard] Add Geistmaschine Geist (#20117) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-03-22 22:09:33 -07:00
jotix
8cd78b392f
[Keyboard] Add via support for jotanck keyboard (#20146) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-22 21:38:35 -07:00
QMK Bot
f0c2a30345 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 23:24:37 +00:00
QMK Bot
74c033eaf2 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 23:23:59 +00:00
Less/Rikki
5ace174cd3
fixup: correct filename (#20212) 2023-03-21 23:23:21 +00:00
QMK Bot
ac0cc9de38 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 20:54:23 +00:00
QMK Bot
b5cf96f1dd Merge remote-tracking branch 'origin/master' into develop 2023-03-21 20:53:44 +00:00
Jason Hazel
b1e6b3798a
Adding Bad Wings Support (#20153) 2023-03-21 20:53:06 +00:00
QMK Bot
0e5013c821 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 19:09:13 +00:00
QMK Bot
3ad2c37c08 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 19:08:27 +00:00
spbgzh
0bb9eada83
[Keyboard] update creek70 change rgb num (#20196) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-21 12:07:47 -07:00
QMK Bot
645d5bcc75 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 18:22:33 +00:00
QMK Bot
365c400ffb Merge remote-tracking branch 'origin/master' into develop 2023-03-21 18:21:38 +00:00
Ning
ac75242132
[Keyboard] Add tiny board 16 rgb keyboard (#20158) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-21 11:20:25 -07:00
QMK Bot
61bac5bc03 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 09:16:51 +00:00
Nick Brassel
a518e1e5d8
Sync activity timestamps between sides. (#20192) 
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
 2023-03-21 10:16:11 +01:00
QMK Bot
9202c67f2e Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 08:18:42 +00:00
QMK Bot
0dad14dc81 Merge remote-tracking branch 'origin/master' into develop 2023-03-21 08:18:04 +00:00
mechlovin
650a0b8ad4
[Keyboard] Olly Orion: Disable SWD and JTAG (#20169) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2023-03-21 01:17:24 -07:00
QMK Bot
63ee67eda3 Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 08:13:54 +00:00