Compare commits

..

3113 Commits

Author SHA1 Message Date
Jack Humbert
92005dee35 using data/mappings for processing 2023-04-07 16:25:51 -04:00
Jack Humbert
5dd8efc7c0 chibios compiling, layout keymaps 2023-04-06 16:22:14 -04:00
Jack Humbert
cc22d67b32 some chibios experiments 2023-04-05 18:27:47 -04:00
Jack Humbert
a1cb005981 storm commit, chibios exp 2023-04-05 12:59:16 -04:00
Jack Humbert
cfde338998 generate compile_commands.json and configure clangd 2023-04-04 23:39:52 -04:00
Jack Humbert
4d1ad14596 Merge branch 'cmake-experiments' of https://github.com/qmk/qmk_firmware into cmake-experiments 2023-04-04 20:55:17 -04:00
Jack Humbert
c34f0e4998 test out compile_flags.txt 2023-04-04 20:55:10 -04:00
Jack Humbert
94d76a4f9e fix case issues 2023-04-04 16:55:03 -04:00
Jack Humbert
fe59b4e5d6 load keyboard ui through vscode 2023-04-04 16:26:44 -04:00
Jack Humbert
7093a41c6c clean-up 2023-04-04 14:19:52 -04:00
Jack Humbert
c9ca9b9875 one target one target one target 2023-04-04 13:42:50 -04:00
Jack Humbert
060c15f32b fully compiling with qmk target 2023-04-04 12:46:29 -04:00
Jack Humbert
6a960cbf05 move to single lib 2023-04-04 12:29:01 -04:00
Jack Humbert
531c37b256 closer, tasks populating targets 2023-04-04 12:07:58 -04:00
Jack Humbert
6468360ff1 example tasks 2023-04-03 23:22:59 -04:00
Jack Humbert
40a3a431ef unknown state 2023-04-03 21:02:40 -04:00
Jack Humbert
4d999378d0 more absolute keyboard/keymap support 2023-04-03 13:43:40 -04:00
Jack Humbert
2ebad0d33f basic json validator supporting most used properties. converted some regex to cmake-compatible expressions 2023-04-03 13:19:45 -04:00
Jack Humbert
d5760d02a6 some relative/abs keymap folder stuff 2023-04-02 23:46:40 -04:00
Jack Humbert
9ae271c844 capitalization matters on linux 2023-04-02 22:40:34 -04:00
Jack Humbert
4aea69ba21 start arm stuff, better keyboard folder path management 2023-04-02 16:38:37 -04:00
Jack Humbert
2031d063b5 split up functions/scripts a bit. downloads avr-gcc 2023-04-02 11:20:49 -04:00
Jack Humbert
d32724c08f refix windows compiling 2023-04-01 23:39:13 -04:00
Jack Humbert
26756d05a2 look for make independently, osx compiling 2023-04-01 23:24:46 -04:00
Jack Humbert
b45dbcd4c1 fix linux compiling 2023-04-01 23:10:44 -04:00
Jack Humbert
6fe0cd47ca multi folder targets 2023-04-01 22:04:00 -04:00
Jack Humbert
ca8596e4a8 compiling basic AVR 2023-04-01 18:03:54 -04:00
Nick Brassel
c3c401f91d [QP] Fix up delta frame boundaries (#20296) 2023-03-31 08:41:11 +11:00
Alejandro Chacón
b63e388692 [Keyboard update] Fix json error (#20299) 2023-03-30 18:25:42 +01:00
Nick Brassel
81f3f0f3e9 Revert to hex output for kint41 (#20295) 2023-03-30 01:41:36 +01: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
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
Alejandro Chacón
896f38c52c [Keyboard] Add alhenkb macropad (#20123) 2023-03-29 11:47:14 -07:00
Joel Challis
f56580404d Minify content published to API (#20285) 2023-03-29 13:01:16 +01:00
Nick Brassel
5bb8f7ae84 Add ability for qmk mass-compile to build specified targets (#20294) 2023-03-29 21:26:05 +11:00
Nick Brassel
d31d1488e8 Fixup CI command failures. (#20291) 2023-03-29 16:48:57 +11:00
Nick Brassel
6bdbf77238 Add step summary output to CI builds, with failure logs. (#20288) 2023-03-29 15:55:31 +11:00
Ryan
e2630f9b40 Fix some invalid layout macros (#20256) 2023-03-29 15:51:22 +11:00
Nick Brassel
c94241d447 CI Builds: master/develop, default/via, twice daily. (#20283) 2023-03-29 12:51:39 +11:00
Joel Challis
e0b1637e15 I have zero involvement with this keyboard... (#20287) 2023-03-29 02:09:26 +01: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
Albert Y
02cb5db67b Remove invalid characters (#20277) 2023-03-28 14:33:00 +01:00
blindassassin111
00c3946fbe [keyboard] Correcting info.JSON for OSAv2 (#20247) 2023-03-27 23:42:04 -06:00
Nick Brassel
3ee17cd5d3 [chore] keyboards/tzarc: Alignment with clang-format. (#20265) 2023-03-26 23:56:09 +01:00
Ryan
d6ce42ae5b Check for multiple matrix positions assigned to same key (#20039) 2023-03-24 13:46:42 +11:00
Pablo Martínez
67dae1222f [Documentation] Pointing device minor rewrite (#19641) 2023-03-23 22:35:02 +00:00
dependabot[bot]
8d0f97d110 Bump actions/stale from 7 to 8 (#20246)
Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-23 21:09:21 +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
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
blindassassin111
b035cd094b [keyboard] Correcting info.JSON for Viktus Minne (#20244) 2023-03-23 14:20:12 -06: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
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
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
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
Less/Rikki
5ace174cd3 fixup: correct filename (#20212) 2023-03-21 23:23:21 +00:00
Jason Hazel
b1e6b3798a Adding Bad Wings Support (#20153) 2023-03-21 20:53:06 +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
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
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
blindassassin111
0f07fcc8d4 [Keyboard] OSAv2 (#20166) 2023-03-21 01:12:21 -07:00
hulahermit
b6a636d954 [Keyboard] Add pteropus keyboard (#20147)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Chi-Han Yang <chyang@enrichtx.com>
2023-03-20 23:44:56 -07:00
Andrew Kannan
44cd8a2f88 [Keyboard] Add CannonKeys Bakeneko60 ISO Hotswap PCB (#20130) 2023-03-20 23:20:30 -07:00
Tobias Minn
f55d2cd6b6 [Keyboard] Add Kuro65 keyboard (#20122)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-20 22:30:21 -07:00
Sid Quinsaat
63af5cd50e [Keymap] for sharkby7e (#20121)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-20 22:28:54 -07:00
Agent Blu, 006
8bb7d24fba [Keyboard] Add Blu vimclutch (#20060)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-20 20:13:27 -07:00
Laneware
50b12ece13 Update lpad info.json (#20184)
Update incorrect row and col pins, now confirmed working via manual build in QMK MSYS
2023-03-19 23:19:28 +00:00
QMK Bot
c5b0e3a6a3 Format code according to conventions (#20175) 2023-03-18 18:15:26 +00:00
jack
a1a5dd6ddd Fixup kbdfans/tiger80 RGB animations (#20164) 2023-03-18 11:38:24 -06:00
Laneware
da52450152 Add Support for LPAD (#19852)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-18 11:33:20 -06:00
Dam Vu Duy
7b9d471ba0 [Keyboard] Add Coban Pad 3A (#19634) 2023-03-18 11:32:29 -06:00
toinux
319da117b7 [Keymap] crkbd toinux update (#19673) 2023-03-18 11:26:42 -06:00
Nick Brassel
f8e89a1fe4 De-parallelise CI (#20171)
* De-parallelise CI

No speed increase.

* Update .github/workflows/ci_builds.yml
2023-03-18 15:58:51 +00:00
JX
e437560144 [Keyboard] Add yandrstudio/transition80 (#19790)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-17 10:14:21 -07:00
Fabien
d026803147 [Keyboard] Fix typos in readme for Lily58 R2G (#20149) 2023-03-17 10:27:39 -06:00
blindassassin111
687b7341ed [keyboard] Viktus Minne (#19977)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-17 10:26:52 -06:00
ziptyze
0f323a45ce [Keyboard] 1upkeyboards/pi40 update (#20066) 2023-03-17 10:07:26 -06:00
Nick Brassel
1b3f7fcf7d Add qmk find command, reuse logic for qmk mass-compile. (#20139) 2023-03-16 20:35:49 +00:00
ToffeeStudio
f3f634ef67 [Keyboard] Add Blueberry (#19915)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-03-16 11:11:58 -06:00
Kyle McCreery
b2ee950d9e [Keymap] Sugarglider VIA keymap enhancement (#20140) 2023-03-16 09:58:49 -06:00
lalalademaxiya1
2f7a06cf73 Update keychron_common.c (#20055) 2023-03-16 12:30:09 +11:00
Joel Challis
7654c2a23b Update keycodes_0.0.1_basic.hjson (#20129) 2023-03-16 00:37:58 +00:00
しぐれ
012fa6dd45 [Doc] Add example to keyboard housekeeping and some minor fixes (#19968)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-15 16:55:18 -06:00
mjbogusz
54dca8cbff [Keyboard] Add Atlantis PS17 (#19952) 2023-03-15 14:30:29 -06:00
dztech
3eb04fee87 add tiger80 iso layout support (#19975)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-15 10:53:28 -06:00
Josh Hinnebusch
0996bca9e9 [Keyboard] Add hineybush/h87_g2 (#20053)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-15 10:43:06 -06:00
Conor Burns
c18d5ebd2d add new board: splaytoraid (#20052)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-15 15:53:02 +00:00
Kyle McCreery
915d7a18d7 [Keyboard] New Keyboard - Sugar Glider (#19933)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-15 15:49:14 +00:00
Nick Brassel
e62fc866db Let's use workflows to parallelise the builds. (#20120)
* Let's use workflows to parallelise the builds.

* Nofail if files aren't present.

* Formatting.
2023-03-15 08:31:10 +11:00
d-floe
c91296f001 [Keyboard] Add KP60 (#20096)
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-14 12:56:31 -07:00
Sophie Machen
99a39a1198 Update newbs_getting_started to include instructions for apple silicon (#19579)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-03-14 12:58:08 -04:00
Cipulot
4283e69ac7 RF R1 8-9Xu PCB (#20048)
Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-14 07:41:06 +00:00
Albert Y
a71e58270c Document Autocorrect callback functions (#20115) 2023-03-13 13:34:23 -06:00
Albert Y
e0bd6fac10 Move Ferris Sweep to data-driven (#20111) 2023-03-12 23:33:31 -06:00
Darkhan
a5e7390419 [keyboard] Prevent LED flicker when connecting AnnePro 2 (#19709) 2023-03-12 21:23:39 +11:00
Nick Brassel
bcfe67883e Allow for CI builds to run for 23 hours, instead of 6. (part deux) (#20095) 2023-03-12 12:55:26 +11:00
Nick Brassel
6b9dced611 Allow for CI builds to run for 23 hours, instead of 6. (#20094) 2023-03-12 01:18:49 +00:00
Andrew Kannan
042e42d1b7 Add Chimera65 Hotswap keyboard (#20038)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-11 14:04:26 -07:00
jonylee@hfd
dff9ee25e2 [Keyboard] Add k83 (#19896) 2023-03-11 10:52:35 -07:00
Dan White
6fe223b5ee Ketch LGUI/LALT key transposed on Minivan layout (#20025) 2023-03-11 10:29:20 -07:00
azhizhinov
b281d6efa2 [Keyboard] Change pierce vendor ID (#20088) 2023-03-11 10:26:47 -07:00
ebastler
36292faf94 Teleport native bugfix (changed F411CC wear levelling) (#20090)
* workaround for flash size issue

* enable mousekeys due to requests by some users
2023-03-11 16:52:45 +00:00
Nick Brassel
e8a5630c7c Yet another adventure in trying to fit things into a 32U4 (#20091) 2023-03-11 23:56:01 +11:00
Christopher Hoage
96b0baa230 [Keyboard] Add Spleeb default and custom firmware (#19481)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-10 22:33:52 -07:00
Vino Rodrigues
dbd1d3cba1 [Keyboard] Add Binpad BN009 R2 3x3 macropad (#19992)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-10 20:12:14 -08:00
azhizhinov
1d04a818d7 [Keyboard] VIA support for Pierce keyboard (#20045) 2023-03-10 19:47:03 -08:00
Andrew Kannan
df814dec7a Caerdroia Keyboard Firmware (#20036) 2023-03-10 10:57:11 -07:00
paulgali
950afdceeb Zeno pcb V0.0.4 update via + fileformatting (#20023)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-10 10:51:15 -07:00
Albert Y
7be63bb524 Move macro3 to data-driven (#20046) 2023-03-10 10:38:56 -07:00
Danny
943d0ff619 Fix incorrect matrix positions for RGB LEDs (#20082) 2023-03-10 16:08:07 +00:00
Andrew Kannan
bf4121a770 [Keyboard] Add Ortho48v2 Keyboard (#18889)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-10 02:23:53 -08:00
Kuribayashi Atsushi
24bf0dfb37 [Keyboard] Add tsubasa keyboard (#19352)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-10 01:20:37 -08:00
Paul Enrico N. Viola
3b89fb61e8 [Keyboard] update matrix pins for Polly40 (#20002) 2023-03-09 23:52:36 -08:00
Mark Stosberg
eed3eb0b1d [Keymap] add crkbd/keymaps/markstos (#19010)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-03-09 23:19:20 -08:00
frobiac
313fc4cb8f [Keyboard] frobiac custom boards and layout (#19883) 2023-03-09 23:05:20 -08:00
Budiman Jojo
62a8f41209 [Keymap] Fix the secondary keyboard not updating WPM (#20069) 2023-03-09 17:21:19 -07:00
Nick Brassel
ceb8222e57 Add CI builds for default and via keymaps (#20071) 2023-03-10 09:36:20 +11:00
Flame Soulis
17bbef5200 Keebio/KBO-5000 Encoder Misconfiguration Fix for #20073 (#20074) 2023-03-09 15:32:46 -05:00
Ryan
76fb534269 qmk info: add warning when layout is offset (#20070) 2023-03-09 20:27:04 +00:00
Anjheos
65f380c768 Adding firmware for New Proto[Typist] in-stock PCBs. (#19958)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Anjheos <Anjheos.Designs@gmail.com>
2023-03-09 12:42:09 -07:00
jack
9c79d2933c [Doc] Update PR checklist (#19988) 2023-03-08 12:58:23 -07:00
Albert Y
ec3c2b75de [Docs] Add mod-tap section header (#20041) 2023-03-08 12:36:36 -07:00
Cipulot
5e4d23c54c EC Pro 2 PCB (#19917)
* EC Pro 2 firmware by Cipulot
2023-03-08 10:43:57 +00:00
Freather
2317c768e4 [Keyboard] Teahouse Ayleen TKL (#19900)
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: jack <0x6a73@protonmail.com>
Co-authored-by: CMM.Studio Freather <50167286+frankBTHID@users.noreply.github.com>
2023-03-08 00:50:37 -08:00
Joel Challis
952b88528f Fix processing of recently added system keycodes (#20058) 2023-03-08 06:38:11 +00:00
Niles Tanner
c1664ac6e3 VIA keymap for djinn (#19881) 2023-03-08 09:50:32 +11:00
peepeetee
3d0f03f21e implement rgb matrix for momokai keyboards (#19904)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-07 14:07:47 -07:00
Olivia
25cb1c6a5a [Keymap] Smooted's BM80v2 keymap (#19873) 2023-03-07 10:29:03 -08:00
Robert Mills
8812db1d64 [Keyboard] Add Karn Keyboard (#19846)
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-07 10:13:46 -08:00
Albert Y
e6e11dfde7 Add disable git safe directory check step (#20040) 2023-03-07 01:05:34 +00:00
Dmitry Nosachev
c8237a7691 [Keyboard] Sejin EAT-1010R2 keyboard (#19809)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-06 11:39:13 -08:00
souvlakeeb
f067f42305 [Docs] Discuss layout macro (#19803)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-03-06 11:24:56 -08:00
gumorr
ca5eb9f664 [Keyboard] Add gummykey (#19695)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-06 11:17:29 -08:00
Leon Anavi
61f3f5676a keyboards/anavi: Add ANAVI Knobs 3 (#18624) 2023-03-05 18:28:01 -07:00
Joel Challis
500c4b7484 Reject VIA keys within info.json (#20026) 2023-03-06 10:07:47 +11:00
Sergey Vlasov
07b7fed122 Unbreak switchplate/southpaw_65 after #16277 (#20015)
Apparently the changes done in #16277 swapped the values read from the
PCA9555 expanders by mistake, which resulted in mixed up matrix columns.
Fix the chip and register addresses to match the original code.
2023-03-05 13:29:10 +00:00
lalalademaxiya1
77f7351991 Add Keychron Q12 (#19844)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-04 11:53:09 +11:00
Elliot Powell
127b53bd23 Add Support for Lilly58 r2g (#19862)
* Add support for lilly58 r2g by Mechboards
2023-03-03 23:04:00 +00:00
Guillermo Aguirre
95dd5738d2 Add new keymap for Preonic rev3 (#19706) 2023-03-03 15:01:22 -07:00
Nick Brassel
d1a430b348 Initial deprecation policy documentation. (#19908) 2023-03-03 14:16:32 +11:00
Nick Brassel
7ebb8c2dec Update branch names to reflect configurator's new deployment. (#19999) 2023-03-03 14:16:06 +11:00
Ryan
6fabc330e3 Check all keys have matrix positions when parsing C LAYOUT macros (#19781) 2023-03-02 10:56:45 +11:00
Albert Y
80c6fbad1c [Keyboard] Clean up contra & move to data-driven (#19973)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-03-01 10:53:31 -07:00
David Rambo
f6390892e3 [Keymap] Add davidrambo lulu keymap (#19448)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-03-01 10:49:33 -07:00
Paul Enrico N. Viola
aeb3ed64c3 added Polly40 keyboard (#19936)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-01 10:05:36 -07:00
Joel Challis
3fc9c03559 Remove all from list of animations in info.json (#19978) 2023-03-01 02:55:14 +00:00
Joel Challis
53727062db Disable safe.directory check (#19970) 2023-02-28 20:27:11 +00:00
gkeyboard
d35cdcc933 [Keyboard] Add GPAD8-2R (gpad8_2r) Macro Pad (#19914)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-28 12:24:35 -08:00
Michal S
b85a9abc96 [Keymap] sofle/keymaps/michal: rewrite (#19938) 2023-02-28 12:23:47 -08:00
studiokestra
ee90ad28e6 [Keyboard] Add FRL84 PCB. (#19942)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-28 12:22:14 -08:00
dependabot[bot]
e14254335d Bump tj-actions/changed-files from 34 to 35 (#19971)
Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 34 to 35.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v34...v35)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-28 20:10:08 +00:00
Shawn Meier
0596720f7f [Keyboard] remove non-existent method from ploopy documentation (#19957) 2023-02-28 11:15:19 -08:00
Drashna Jaelre
051401175d [Keymap] Drashna updates for 0.20.0 (#19960) 2023-02-28 11:14:48 -08:00
Joel Challis
05631b276d Flag "builddefs" as core changes (#19950) 2023-02-28 14:18:43 +00:00
Nick Brassel
bacec14073 Merge remote-tracking branch 'upstream/develop' 2023-02-28 11:22:29 +11:00
Ryan
b865b9e170 Add changelog for Leader Key refactor (#19953) 2023-02-27 20:28:15 +11:00
Nick Brassel
1d182995ed Breaking Changes 2023q1 changelog. (#19945) 2023-02-27 08:41:42 +11:00
Joel Challis
bda28fa384 Hide hex output when building uf2 (#19940) 2023-02-26 15:24:43 +11:00
Ryan
89487677e3 keebio/kbo5000: fix encoder config (#19941) 2023-02-26 15:24:24 +11:00
Ryan
7e0299117b Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-26 09:45:12 +11:00
Ryan
314f6c1ddb Move backlight config to data driven (#19910) 2023-02-26 08:37:57 +11:00
QMK Bot
ba7546a334 Merge remote-tracking branch 'origin/master' into develop 2023-02-25 06:04:23 +00:00
azhizhinov
d70e9b8659 [Keyboard] Update Reviung Vendor ID (#19928) 2023-02-25 17:03:43 +11:00
jack
9b410a9214 Remove VIA specific use of MACRO0* (#19918) 2023-02-23 18:54:01 +00:00
jack
e719f5e294 Open Use standard magic keycodes in yandrstudio keymaps (#19919) 2023-02-23 14:46:15 +00:00
Joel Challis
9f2cd9119f Reallocate user/kb keycode ranges (#19907) 2023-02-23 09:50:09 +11:00
Joel Challis
961f0b7b2d Reallocate SAFE_RANGE (#19909) 2023-02-23 09:49:07 +11:00
Ryan
ea77246865 Migrate some more layouts to data driven (#19889) 2023-02-23 09:32:18 +11:00
Ryan
3bf01bb9ed Move QMK LUFA bootloader config to data driven (#19879) 2023-02-23 09:20:23 +11:00
Nick Brassel
7f805cc779 VIA Protocol 12 + fixes (#19916)
Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
2023-02-23 09:19:00 +11:00
Joel Challis
403b0addea Align magic keycodes (#19877) 2023-02-23 08:14:29 +11:00
precondition
93f2ed3abf [Bug] Fix compilation error when defining QUICK_TAP_TERM_PER_KEY (#19893) 2023-02-22 11:03:36 -08:00
jack
24a86d5fdb Fixup cannonkeys/satisfaction75 (readd backlight.breathing_period) (#19901) 2023-02-22 16:58:29 +11:00
Joel Challis
0512e286a6 Remove magic bodges from via keymaps (#19890) 2023-02-22 01:15:18 +00:00
Ryan
26854f5940 Remove default and unused BACKLIGHT_LEVELS (#19898) 2023-02-22 01:12:42 +00:00
Ryan
499fc3b85e Add some missing #pragma onces (#19902) 2023-02-21 15:55:23 +00:00
Ryan
9c0ce80d7e Move backlight config to data driven, part 1 (#19887) 2023-02-21 12:05:40 +11:00
QMK Bot
4b69225c22 Merge remote-tracking branch 'origin/master' into develop 2023-02-20 05:43:29 +00:00
Eugenio Pastoral
2133cc1011 New keymap for GMMK2 Compact (#19430)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-19 22:42:42 -07:00
Joel Challis
7996be6db6 Refactor more KC_MISSION_CONTROL/KC_LAUNCHPAD usages (#19891) 2023-02-20 00:59:46 +00:00
zvecr
f71f7733a3 Fix date 2023-02-19 20:30:18 +00:00
zvecr
f5ccd04a5f Stub changelog 2023-02-19 20:23:01 +00:00
Ryan
330b73a2df Add license headers to all default layout keymaps (#19888) 2023-02-19 11:33:47 +00:00
Joel Challis
0152dd811d Move KC_MISSION_CONTROL/KC_LAUNCHPAD keycodes to core (#19884) 2023-02-19 18:59:50 +11:00
Ryan
e837a32b2b Move layouts for direct_pins boards to data driven (#19872) 2023-02-19 18:55:12 +11:00
QMK Bot
2222836f09 Merge remote-tracking branch 'origin/master' into develop 2023-02-19 05:42:36 +00:00
ThePanduuh
f93d72e57f [Keymap] Add encoder map to degenpad default keymap (#19880) 2023-02-18 22:41:58 -07:00
QMK Bot
3a23d0aab7 Merge remote-tracking branch 'origin/master' into develop 2023-02-19 03:14:42 +00:00
Kenny Hung (he)
08fc370621 BM40 keymap for Skewwhiffy, revamp (#19876) 2023-02-19 14:14:05 +11:00
Nick Brassel
1283863c0e Add mass-compile ability to filter by key existence. (#19885) 2023-02-18 18:04:50 -08:00
Drashna Jaelre
48a79b08cc Fix functions when NO_ACTION_TAPPING is defined (#11528) 2023-02-19 12:08:03 +11:00
QMK Bot
8f03657491 Merge remote-tracking branch 'origin/master' into develop 2023-02-18 17:38:42 +00:00
CoffeeIsLife
d2bed27414 Add mouse layer to Kprepublic BM40HSRGB Coffee layout (#19878)
Co-authored-by: Fae <faenkhauser@gmail.com>
2023-02-18 10:38:06 -07:00
fauxpark
b8b1cb04b2 Merge remote-tracking branch 'upstream/master' into develop 2023-02-19 04:35:43 +11:00
jonylee@hfd
3110a70f6f Add ac001 keyboard (#19868)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-18 10:28:56 -07:00
Paul James
59f5889e62 [Keyboard] Add LED startup sequence to Lumberjack (#19841) 2023-02-18 10:26:44 -07:00
Álvaro A. Volpato
7b5dee4064 Add caps lock indicator capabilities to M75S (#19552) 2023-02-18 10:12:44 -07:00
Joel Challis
f587a0c548 Align sequencer keycodes (#19875) 2023-02-18 15:44:36 +00:00
QMK Bot
c9cee5acca Merge remote-tracking branch 'origin/master' into develop 2023-02-18 08:14:13 +00:00
ThePanduuh
609b23af34 [Keyboard] Add Degenpad (#19812)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-18 00:13:06 -08:00
pauper
7ce71625bc [Keyboard] Brick (#19851)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Jason Chestnut <jason@Jasons-MacBook-Pro.local>
2023-02-17 21:26:43 -08:00
jack
d1420cf1d9 Fixup pegasushoof VIA keymap (#19874) 2023-02-17 11:09:36 -08:00
Ryan
86885ecbcc Fix more build failures (#19869) 2023-02-18 02:21:00 +11:00
jack
a0708b2a78 Fixup for_science (#19867) 2023-02-17 19:17:35 +11:00
Drashna Jael're
92f85ce929 Merge remote-tracking branch 'origin/master' into develop 2023-02-16 22:34:35 -08:00
Emrik Östling
92ea53aeda Added via keymap for bpiphany/pegasushoof (#19653)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-16 22:29:22 -08:00
Ryan
8d5ad26310 Fix API generation (#19866) 2023-02-17 17:19:34 +11:00
Ryan
8f6c228adb Move SOFT_SERIAL_PIN to data driven (#19863) 2023-02-17 16:40:49 +11:00
Ryan
2da0827d4f Remove matrix size defines (#19581) 2023-02-17 16:08:25 +11:00
jack
40ed20dddc Fixup durgod/dgk6x (scroll lock mis-defined as num lock) (#19864) 2023-02-17 14:58:32 +11:00
QMK Bot
17a0ccb432 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 03:19:59 +00:00
chickenman112
4a7894d98c [Keyboard] Add Ciel65 (#19847)
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
2023-02-16 20:19:13 -07:00
Ryan
43843e19b6 Clean up remaining rules.mk MCU/BOOTLOADERs (#19778)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-17 14:15:06 +11:00
Ryan
f4ba17c4a0 Move LED indicator config to data driven (#19800) 2023-02-17 13:14:29 +11:00
Ryan
d784f78bd0 Move Bootmagic config to data driven (#19860) 2023-02-17 08:49:49 +11:00
Ryan
7fad94ba2d Remove unused RGBLight defines from config.h (#19859) 2023-02-17 08:13:41 +11:00
QMK Bot
86ab1c1331 Merge remote-tracking branch 'origin/master' into develop 2023-02-16 16:31:05 +00:00
TommyZ
beb9fcb8bc [Keyboard] Add Quarkeys Z40 keyboard (#19741)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-16 09:30:24 -07:00
Joel Challis
242f51007f Fix regen script for macOS (#19857) 2023-02-16 01:00:01 +00:00
QMK Bot
5e8c0e4d5f Merge remote-tracking branch 'origin/master' into develop 2023-02-15 22:41:33 +00:00
jack
9cf58ec834 Elaborate on keyboard level encoder functionality (#19839) 2023-02-15 15:40:47 -07:00
Drashna Jaelre
a63808c23f [Bug] Fix compiliation issue for Key Overrides (#19856) 2023-02-15 21:06:10 +00:00
QMK Bot
7bd049a79a Merge remote-tracking branch 'origin/master' into develop 2023-02-15 02:46:25 +00:00
jack
e4c41b4337 Fixup work_board VIA keymap (reduce firmware size) (#19850) 2023-02-15 13:45:40 +11:00
QMK Bot
47b7b4bcff Merge remote-tracking branch 'origin/master' into develop 2023-02-14 21:12:24 +00:00
Jeayo Keh
7ae9dbca1d [Keyboard] add ‘soda/pocket’ (#19838)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-14 14:11:45 -07:00
Pascal Getreuer
7d692d64f3 Fix Layer Mod handling of with right-handed mods. (#19845) 2023-02-14 12:44:42 -08:00
Albert Y
9908ed7ecd Add swap hands status function (#19831)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-14 12:44:18 -08:00
Ryan
2cdf99ae95 Migrate DIRECT_PINS to data driven (#19826) 2023-02-14 00:39:41 -07:00
QMK Bot
0b796b91a3 Merge remote-tracking branch 'origin/master' into develop 2023-02-14 07:38:14 +00:00
spbgzh
7d0358cfeb add new keyboard creek70 (#19789) 2023-02-14 00:37:12 -07:00
QMK Bot
b5b422335a Merge remote-tracking branch 'origin/master' into develop 2023-02-14 07:17:57 +00:00
Sắn
aa9882abd6 Add Eclipse60 / tinyneko (#19379) 2023-02-14 00:17:21 -07:00
QMK Bot
0bc804e6a1 Merge remote-tracking branch 'origin/master' into develop 2023-02-14 07:14:04 +00:00
Keith Wade
999200c05a Add keaboard keyboard (#19816)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-14 00:13:27 -07:00
しぐれ
12f02dd8be [Doc]Remove depracted extension links in vscode guide (#19842) 2023-02-14 03:23:36 +00:00
Dasky
74770ac79b Merge branch 'master' into develop 2023-02-14 03:05:44 +00:00
precondition
7a099b7ea5 Update KC_NLCK and KC_SLCK in international docs (#19521) 2023-02-14 02:49:17 +00:00
Albert Y
cd91a3ced7 Update fractal attribution comment (#19832) 2023-02-13 10:58:27 -07:00
Stefan Kerkmann
e922b46a86 Update pico-sdk to 1.5.0 (#19829) 2023-02-13 15:51:51 +01:00
jack
ef881364d4 Fixup swiftrax/bumblebee (reduce firmware size) (#19834) 2023-02-13 17:11:43 +11:00
jack
37fc08af84 Remove lingering I2CD2 usages w/ RP2040 (#19833) 2023-02-13 17:10:51 +11:00
Joel Challis
896d9aa98c Add rp2040_ce and add elite-pi and helios as alias (#19830)
* add rp2040_ce and add elite-pi and helios as alias (#19628)

* fix git mishap

* Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Joel Challis <git@zvecr.com>

* Tidy docs

---------

Co-authored-by: Conor Burns <mail@conor-burns.com>
2023-02-12 23:02:05 +00:00
Nick Brassel
b8ac4dddb6 Fixup develop compiles. (#19828) 2023-02-13 08:57:23 +11:00
QMK Bot
9828f9d256 Merge remote-tracking branch 'origin/master' into develop 2023-02-12 20:10:30 +00:00
Thomas
9a654e5728 [Keyboard] Add Blue Team Pad (#19807)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-12 12:09:43 -08:00
Drashna Jaelre
b47f179a4a Make Magic handling more consistent in Action Keycode handling (#9126)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-13 04:48:14 +11:00
Joel Challis
6ceff1367d Tidy up use of keycode range helpers (#19813) 2023-02-12 17:09:34 +00:00
QMK Bot
13af265268 Merge remote-tracking branch 'origin/master' into develop 2023-02-12 17:06:22 +00:00
souvlakeeb
3f45fd4924 Fix serial_driver.md list item numbering (#19819) 2023-02-12 17:05:46 +00:00
dexter93
3ae87b1555 core: allow locking the matrix state (#18852)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-13 03:38:36 +11:00
Eric.a Gebhart
db1eeea478 Add combo hook to allow per layer combo reference layers. (#16699)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-02-13 03:31:04 +11:00
Ryan
bbf7a20b33 Refactor Leader key feature (#19632)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-13 03:19:02 +11:00
Joel Challis
d10350cd2c Restore packing of midi note keycodes (#19468) 2023-02-13 02:55:51 +11:00
fauxpark
b44e64a6bf Merge remote-tracking branch 'upstream/master' into develop 2023-02-13 00:20:19 +11:00
Sergey Vlasov
584b7cf801 Fix build failures with OPT = 0 due to inline functions (#19767)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-12 17:14:34 +11:00
Drashna Jaelre
b1f4d49c43 [Bug] Fix tri layer compiler issue if NO_ACTION_LAYER is defined (#19821) 2023-02-12 17:07:01 +11:00
jack
9c6942ea40 Remove config.h include from quantum files (#19817) 2023-02-12 02:40:16 +00:00
Ryan
0afe0e2441 Fix layout aliases for two boards (#19818) 2023-02-12 02:38:47 +00:00
jack
ab1dd0faab Fixup ek65 -- add processor & bootloader in info.json (#19815) 2023-02-12 02:01:48 +00:00
jack
78d366fca6 Reduce synthlabs/060 firmware size (#19814) 2023-02-12 01:58:30 +00:00
Drashna Jaelre
fe02abc479 [Core] Tri Layer Keys (#19795)
Co-authored-by: wilba <wilba@wilba.tech>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-12 10:23:07 +11:00
QMK Bot
4002843797 Merge remote-tracking branch 'origin/master' into develop 2023-02-11 20:38:10 +00:00
precondition
21f4375393 Update documentation for LM(layer, mod) (#19284)
* Update documentation for LM(layer, mod)

* Move LM table to caveats section
2023-02-11 20:37:30 +00:00
Joel Challis
90f3d6201a Reduce false positives in layout name validation (#19646) 2023-02-11 20:36:11 +00:00
QMK Bot
0a9d06a505 Merge remote-tracking branch 'origin/master' into develop 2023-02-11 19:08:39 +00:00
Luis Moreno
f667821ed3 [Docs] Resynchronizing Your Branch including submodules (#19268) 2023-02-11 12:07:51 -07:00
Drashna Jaelre
34bc896cf9 [Keyboard] Fix merge error with fave84 board (#19808) 2023-02-11 15:12:35 +11:00
Joel Challis
11d49d00e7 Remove matrix_init_quantum/matrix_scan_quantum (#19806) 2023-02-11 03:47:17 +00:00
Nick Brassel
9991894514 Generate encodermap output from keymap.json. (#18915)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-11 13:45:51 +11:00
QMK Bot
01593501e3 Merge remote-tracking branch 'origin/master' into develop 2023-02-10 22:41:56 +00:00
Xelus22
1504e9ca4c Fix bear65 (#19805) 2023-02-10 22:41:18 +00:00
Jouke Witteveen
3137883956 Typographic updates to source generation (#19160) 2023-02-10 22:39:13 +00:00
Joel Challis
1d0b4c8d38 Tidy up use of keycode range helpers (#19756) 2023-02-10 21:10:14 +00:00
Joel Challis
2ffdec5dc2 Move more unicode ranges to DD (#19755) 2023-02-10 21:08:54 +00:00
QMK Bot
79b364d289 Merge remote-tracking branch 'origin/master' into develop 2023-02-10 18:06:46 +00:00
Xelus22
d0702b519d [Keyboard] Update Pachi RGB Rev2 VIA custom indicators (#19788) 2023-02-10 10:06:37 -08:00
Wolf Van Herreweghe
8c3e09b950 [Keyboard] Add the Twilight by MD (#19787)
Co-authored-by: Wolf <contact@vwolf.be>
2023-02-10 10:05:57 -08:00
QMK Bot
61009c506b Merge remote-tracking branch 'origin/master' into develop 2023-02-10 17:29:34 +00:00
kpagratis
b444e82985 [Keyboard] Add Dactyl 6x5 68 keys (#18679) 2023-02-10 10:28:39 -07:00
QMK Bot
55e671a6f9 Merge remote-tracking branch 'origin/master' into develop 2023-02-10 10:40:54 +00:00
Arialdo Martini
98ed19045d [Docs] Combos example consistently uses A B keys (#19792) 2023-02-10 02:40:15 -08:00
Pablo Martínez
95671148a4 [Docs] Change defines to enums in examples (#19793) 2023-02-10 02:39:35 -08:00
fauxpark
50cd320616 Merge remote-tracking branch 'upstream/master' into develop 2023-02-10 20:19:08 +11:00
yiancar
bccf2cba6a [Keyboard] Add alas keyboard (#19717)
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: yiancar <yiancar@gmail.com>
2023-02-10 01:09:40 -08:00
FLinguenheld
3b987f4a9d [Keyboard] Flinguenheld (#19661) 2023-02-10 01:07:39 -08:00
buzzlighter1
bc3c6f0831 Update buzzlighter1 keymap (#19757)
Co-authored-by: zvecr <git@zvecr.com>
2023-02-09 21:03:56 -07:00
Wolf Van Herreweghe
25ff06c01d Move FAve 84H to data driven design + Via Custom UI (#19763)
Co-authored-by: Wolf <contact@vwolf.be>
2023-02-09 20:59:03 -07:00
lalalademaxiya1
5208361dcb Update info.json for Keychron V10 (#19791) 2023-02-09 20:54:40 -07:00
Colin Kinloch
462ab3c4d2 [Keyboard] Add CXT Studio (#19531)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Colin Kinloch <colin.kinloch@collabora.com>
2023-02-09 13:29:23 -08:00
djok0127
1b3b1427d2 [Keyboard] Add Igloo (#19678)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-09 14:10:25 -07:00
Vertex-kb
bc78474906 [Keyboard] add arc60h (#18798)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-09 13:07:44 -08:00
Juno Nguyen
cdaac25861 [Keymap] junonum: community keymap improvement (#19727)
Co-authored-by: Minh-tri Nguyen <mtngx@PigeonMac.local>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-09 13:07:00 -08:00
QMK Bot
40f0325af8 [CI] Format code according to conventions (#19794) 2023-02-09 14:04:20 -07:00
Vino Rodrigues
989f2476b6 [Keyboard] Add Binepad BNR1 v2 rotary encoder (#19770) 2023-02-09 13:01:21 -08:00
eason
9c6b8fae40 [Keyboard] Add greatsword80 (#19746)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-09 13:57:31 -07:00
Alabahuy
4eb5c6803f Fix Matrix for kamigakushi (#19775) 2023-02-09 13:56:17 -07:00
Andrew Kannan
758766820d Add Type-B firmware to QMK (#19764)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-09 13:55:26 -07:00
Katrina
e19cbe25f3 [Keyboard] Doio kb38 (#19650) 2023-02-09 12:43:22 -08:00
lalalademaxiya1
f07841cce3 [Keyboard] Added JIS version for Keychron Q2 (#19491)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-09 12:40:17 -08:00
QMK Bot
6df5d64bb9 Merge remote-tracking branch 'origin/master' into develop 2023-02-09 19:36:44 +00:00
asdfire1
41a5046e89 [Keymap] Add colemak_luna keymap for crkbd (#19708)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-09 11:36:06 -08:00
miguelelinventor
e24f9b2c0a Add Michi MCU Converter support (#19163) 2023-02-09 11:27:37 -08:00
Ryan
c67285587c Fix errors flagged by generate-api (#19784) 2023-02-09 03:34:21 +00:00
QMK Bot
b0604aca47 Merge remote-tracking branch 'origin/master' into develop 2023-02-09 03:29:51 +00:00
Less/Rikki
ff6c44db25 [keyboard] reedskeebs/alish40 (#19754)
Co-authored-by: Kyle McCreery <mccreery.kyle@gmail.com>
2023-02-08 20:29:15 -07:00
Less/Rikki
7d677cfdff implement missing layouts + DD migration for wilba_tech/wt60_d (#19777) 2023-02-08 20:10:27 -07:00
Ramon Imbao
df3c9a5401 Rename ramonimbao folder to rmi_kb (#19699)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-08 20:05:21 -07:00
Ryan
ccb6c908dd Remove SOFT_SERIAL_PIN for non-split boards (#19774)
* Remove `SOFT_SERIAL_PIN` for non-split boards

* Delete more empty config.h
2023-02-08 23:57:42 +00:00
Ryan
f9aeea64c1 Migrate MCU and BOOTLOADER to data-driven (#19529) 2023-02-08 18:41:46 +11:00
QMK Bot
3499677b6a Merge remote-tracking branch 'origin/master' into develop 2023-02-08 04:55:11 +00:00
beelzebubi
cf45a05296 [Keyboard] Add Bear65 v2 (#19578)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Tom Sennewald <tom@sennewald.me>
2023-02-07 20:54:27 -08:00
QMK Bot
c2362b4bea Merge remote-tracking branch 'origin/master' into develop 2023-02-08 04:52:31 +00:00
mechlovin
e871ddaae8 [Keyboard] Fix the underglow RGB LED (#19622)
Co-authored-by: h40 <73354045+h40io@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-07 20:51:51 -08:00
QMK Bot
6dfaedb0d4 Merge remote-tracking branch 'origin/master' into develop 2023-02-08 04:43:26 +00:00
Laneware
aa3b64db2b [Keyboard] LW75 Support (#19506)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-02-07 20:42:47 -08:00
QMK Bot
650864c27d Merge remote-tracking branch 'origin/master' into develop 2023-02-08 02:21:22 +00:00
soggywhale
a7febfbb62 changed the undefined ON and OFF parameters to thedefined constant (#19772) 2023-02-08 02:20:42 +00:00
Ryan
8d6bf19fc7 Remove unused SOFT_SERIAL_PIN from config.h (#19768) 2023-02-07 14:46:51 +00:00
QMK Bot
2202a25c35 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:10:08 +00:00
QMK Bot
5dfaf0a218 [CI] Format code according to conventions (#19765) 2023-02-07 19:09:26 +11:00
QMK Bot
c9a1804ca7 [CI] Format code according to conventions (#19766) 2023-02-07 19:09:04 +11:00
QMK Bot
7a07e4a443 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 07:54:49 +00:00
eason
4d5abe1e74 [Keyboard] Add aeroboard (#19087)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-07 00:54:10 -07:00
Ryan
11b6bb8179 Remove unused Bootmagic row/col defines from config.h (#19761) 2023-02-07 00:05:37 +00:00
Ryan
a988f8a169 Remove unused GRAVE_ESC_CTRL_OVERRIDE from config.h (#19752) 2023-02-06 02:40:23 +00:00
Ryan
f0618a1d53 Remove IS_HOST_LED_ON and migrate usages (#19753) 2023-02-06 02:36:09 +00:00
jack
d5e622b979 Remove DEBOUNCE macro usage (#19750) 2023-02-06 08:36:01 +11:00
QMK Bot
a5f36b156b Merge remote-tracking branch 'origin/master' into develop 2023-02-05 20:50:17 +00:00
Juno Nguyen
3dae56b634 [Keyboard] Add Brick (#19728) 2023-02-05 20:49:25 +00:00
Ryan
53b7dbe671 Remove unused LOCKING_SUPPORT_ENABLE from config.h (#19748) 2023-02-05 20:26:45 +00:00
Ryan
ebb512db82 Debounce defines cleanup (#19742)
* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
2023-02-03 19:19:58 +00:00
Joel Challis
fb6c9eaed4 Regen keycode_table for unit tests (#19721) 2023-02-03 05:05:45 +00:00
QMK Bot
a01a8949eb Merge remote-tracking branch 'origin/master' into develop 2023-02-03 02:15:02 +00:00
QMK Bot
17409dad54 Format code according to conventions (#19739) 2023-02-03 02:14:26 +00:00
QMK Bot
903a42f869 [CI] Format code according to conventions (#19740) 2023-02-03 13:10:32 +11:00
QMK Bot
18090062ea Merge remote-tracking branch 'origin/master' into develop 2023-02-03 02:05:26 +00:00
nendezkombet
4d09bfa076 [Keyboard] Add keebformom ortho 4x10 (#18104)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-02 19:04:47 -07:00
QMK Bot
11fc7bf0dd Merge remote-tracking branch 'origin/master' into develop 2023-02-03 01:01:13 +00:00
zhol0777
c3406eb8d7 [Keyboard] Add mkh studio bully (#19696) 2023-02-03 01:00:38 +00:00
QMK Bot
a1ecbaa45d Merge remote-tracking branch 'origin/master' into develop 2023-02-03 00:18:03 +00:00
Albert Y
87c4152738 Update handedness by define examples (#19687) 2023-02-03 00:17:05 +00:00
QMK Bot
0250de184d Merge remote-tracking branch 'origin/master' into develop 2023-02-03 00:15:41 +00:00
Kassandra Karan
8e9d109b8c Added MacOS Support for BigKnob (#19693) 2023-02-03 00:14:54 +00:00
Ryan
f20a05440e Remove unused MATRIX_HAS_GHOST from config.h (#19726) 2023-02-03 00:04:10 +00:00
QMK Bot
8c0267c0eb Merge remote-tracking branch 'origin/master' into develop 2023-02-02 21:34:50 +00:00
lalalademaxiya1
de6a6f963b [Keyboard] Add Keychron V6 (#19498)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:34:39 -08:00
lalalademaxiya1
10c3b9737f [Keyboard] Add Keychron V10 (#19504)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:34:18 -08:00
QMK Bot
007bcb2106 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 21:34:07 +00:00
lalalademaxiya1
a76e70cfff [Keyboard] Add rev_0131 for Keychron Q0 (#19547)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:33:56 -08:00
TommyZ
d3b00d9594 [Keyboard] Add Quarkeys Z67 with solder and hotswap versions (#19465)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-02-02 13:33:31 -08:00
QMK Bot
2889f62179 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 21:33:06 +00:00
Andrew Kannan
3115cdf663 [Keyboard] Add Crin (#18065)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-02 13:32:22 -08:00
QMK Bot
a6900dd5c5 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 20:15:05 +00:00
Nick Brassel
eeadbd2176 Politely ask people not to submit issues to add support for unknown keyboards. (#19737) 2023-02-03 07:14:26 +11:00
Pablo Martínez
d55b07696b Add commit info to version.h (#19542)
* Initial commit

* Fix import order

* Fix deleted code instead of debug print line

* Format

* Update lib/python/qmk/cli/generate/version_h.py

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

* Renaming

* Update lib/python/qmk/cli/generate/version_h.py

Co-authored-by: Joel Challis <git@zvecr.com>

* Update lib/python/qmk/git.py

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 18:23:27 +00:00
QMK Bot
53132ab9cf Merge remote-tracking branch 'origin/master' into develop 2023-02-02 18:18:26 +00:00
ziptyze
f7e69639b5 adding pi60 (#19431)
* updates to 1up product line

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-02 18:17:10 +00:00
jpe230
49c912f9b4 QP: Correct rotation and offset when using LVGL (#19713)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 14:31:54 +11:00
QMK Bot
7717630390 Merge remote-tracking branch 'origin/master' into develop 2023-02-01 18:55:53 +00:00
adiabatic
8dc66867e2 zweihander-macos: Update keys, add capslock (#19730)
* Update to current Scroll Lock/Power names

* Replace `'` with `⇪`
2023-02-01 18:55:12 +00:00
QMK Bot
1c772eb618 Merge remote-tracking branch 'origin/master' into develop 2023-02-01 17:27:17 +00:00
a_marmot
ca8b4b8e30 [Keyboard] Add modded Razer Orbweaver with RP2040 (#19711)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-02-01 10:26:37 -07:00
QMK Bot
0ee48d287a Merge remote-tracking branch 'origin/master' into develop 2023-02-01 14:14:10 +00:00
Patryk
252b041b97 add Mecx Labs mp1 macropad (#19064)
* add mecxlabs mp1 macropad
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-01 14:13:18 +00:00
Joel Challis
944b6107e2 Fix midi after recent refactoring (#19723) 2023-01-31 01:02:17 +00:00
Ryan
b867522f8c Clean up Force NKRO in config.h (#19718) 2023-01-30 20:45:41 +00:00
Joel Challis
d84a7351ea Strip out more of config_common (#19722) 2023-01-30 20:40:12 +00:00
Nick Brassel
f6dd8dea2e Remove usages of config_common.h from config.h files. (#19714) 2023-01-31 06:03:30 +11:00
Ryan
2d843088a2 Normalise Swap Hands keycodes (#19720) 2023-01-30 18:37:19 +00:00
QMK Bot
cc9520b7a0 Merge remote-tracking branch 'origin/master' into develop 2023-01-30 08:48:34 +00:00
Nick Brassel
e296d67146 Accumulate version.h generator flags. (#19716) 2023-01-30 08:47:46 +00:00
fauxpark
ef6505ad75 Merge remote-tracking branch 'upstream/master' into develop 2023-01-30 18:55:36 +11:00
Ryan
242b80c63f Move MIDI code out of tmk_core (#19704) 2023-01-30 18:47:50 +11:00
Joel Challis
968cc1fe7b Relocate diode direction definitions (#19715) 2023-01-30 15:10:40 +11:00
Ryan
2c878b1b16 Clean up qmk generate-autocorrect-data (#19710) 2023-01-30 03:37:02 +00:00
Wolf Van Herreweghe
328279ac59 Add base firmware for the Frog Numpad (#19698)
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-01-29 22:58:07 +00:00
yiancar
d322b4c041 [Keyboard] Baion 808 (#19690)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2023-01-29 09:59:13 -07:00
Ryan
043d8e1140 Remove deprecated Quantum keycodes (#19712) 2023-01-29 16:44:16 +00:00
Joel Challis
80cc6ad187 Fix 19701 merge 2023-01-28 21:16:59 +00:00
Joel Challis
8cc2e0e906 Fix quantum ring_buffer for ChibiOS (#19683) 2023-01-28 21:07:51 +00:00
Joel Challis
832479c7fb Split out mcu_selection to platform (#19701) 2023-01-29 07:40:47 +11:00
Albert Y
981f3c316c Additional handedness by EEPROM examples (#19686)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2023-01-28 09:41:50 -07:00
Ryan
b727434391 Remove commented out backlight config & stray "backlight levels" (#19703) 2023-01-28 15:42:44 +00:00
azhizhinov
ce7bb63999 VIA keymap for Reviung 34. (#19694)
VIA keymap for Reviung 34.
2023-01-27 22:52:05 +00:00
adophoxia
acea06b4f5 [Keyboard] Update effects for Keychron Q2 (#19685) 2023-01-27 14:39:38 -07:00
Patrick Muldoon
9aaf1c26f0 Swap LED_PIN_ON_STATE to 0. (#19692)
User reported that CAPS lock Led state was inverted after soldering a LED to their board.

LED_PIN_ON_STATE defaults to 1, so just swap to low.

Flashed board and now CAPS LED reflects the actual state
2023-01-27 16:35:26 +00:00
Jay Greco
b3dca4bb36 Add RP2040 SCRAMBLE v2 (#19489) 2023-01-27 08:03:57 +00:00
wangfuco
f1b5659ba8 fix pegasushoof caps light, add via keymap (#19649)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Fucong Wang <wangfuco@Fucongs-Mac-mini.local>
2023-01-26 23:11:29 -07:00
AnotherStranger
6e42b58549 VIA keymap for the dactyl manuform 4x6 (#19668)
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-26 14:14:34 -07:00
Charly Delay
19ecd69757 Rename LAYOUT macros identifier that contained the keyboard name (#19657) 2023-01-26 18:43:08 +00:00
QMK Bot
ad817a71a3 Merge remote-tracking branch 'origin/master' into develop 2023-01-26 16:35:07 +00:00
schwarzer-geiger
3823046712 new keyboard: edinburgh41 (#19569)
* added edinburgh41

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-26 16:34:27 +00:00
Sergey Vlasov
81ca83296f analog.c: Fix pinToMux() for STM32F0xx (#19658)
The `adc_read()` code for STM32F0xx expects to get the 0-based channel
number in `mux.input`, but the `pinToMux()` code for STM32F0xx was
attempting to pass the CHSELR bit mask in that field, which resulted in
selecting a wrong channel, therefore `analogReadPin()` did not work
properly for the STM32F0xx chips.  Fix `pinToMux()` to put the channel
number in that field (this matches the behavior for other supported
chips and also allows selection of channels 16...18, which can be used
to access the builtin temperature, reference voltage and VBAT sensors).
2023-01-25 01:47:55 +00:00
QMK Bot
0edf478a53 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 00:20:11 +00:00
Darkhan
fa132baa43 Decrease LED animation frequency to improve performance (#19677) 2023-01-25 11:19:32 +11:00
QMK Bot
019c3217a6 Merge remote-tracking branch 'origin/master' into develop 2023-01-24 20:03:41 +00:00
Christian Brauner
8af872056a [Keymap] Update brauner preonic layout (#19665) 2023-01-24 12:03:05 -08:00
QMK Bot
7ff55e67e1 Merge remote-tracking branch 'origin/master' into develop 2023-01-24 15:18:09 +00:00
arrowj
419a7944a4 Update understanding_qmk.md (#19664)
Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46.
2023-01-24 15:17:24 +00:00
QMK Bot
d14863c00b Merge remote-tracking branch 'origin/master' into develop 2023-01-24 14:20:10 +00:00
Natan-P
b24fa2f9db escaped stray backslash in bux.py (#19667) 2023-01-24 14:19:34 +00:00
QMK Bot
8767e74c82 Merge remote-tracking branch 'origin/master' into develop 2023-01-24 09:20:21 +00:00
MJM
1c69682605 [Keyboard] Add the Black Hellebore (#19655) 2023-01-24 01:19:42 -08:00
QMK Bot
fca6d16b55 Merge remote-tracking branch 'origin/master' into develop 2023-01-24 08:52:36 +00:00
adophoxia
695c4c6030 [Keyboard] Add missing dip_switch_update_kb for Keychron V2 (#19674) 2023-01-24 00:51:45 -08:00
QMK Bot
025e530f46 Merge remote-tracking branch 'origin/master' into develop 2023-01-24 08:05:37 +00:00
jack
4d180c935a fixup splitkb/kyria VIA keymap (#19676) 2023-01-24 08:04:56 +00:00
jack
dd7b244872 Fixup handwired/jscotto/scotto40 (#19675) 2023-01-23 23:24:56 -07:00
QMK Bot
79d5f2feb3 Merge remote-tracking branch 'origin/master' into develop 2023-01-24 05:43:18 +00:00
cole smith
4c6415d768 [Keyboard] Fix boardsource/lulu/avr encoder pins (#19672) 2023-01-23 22:42:38 -07:00
Stefan Kerkmann
8ca3f0fb7c [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (#19652)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-01-23 22:24:21 +01:00
Nick Brassel
ea05045923 Allow overriding of keymap/encodermap layer count. (#19325) 2023-01-24 07:10:03 +11:00
David Hoelscher
aea1194ea3 Corrections to uart driver for Chibios platform (#19075) 2023-01-24 07:05:47 +11:00
QMK Bot
dfb28334e4 Merge remote-tracking branch 'origin/master' into develop 2023-01-23 10:23:39 +00:00
youturn45
4e658d47f8 [Keymap] Add youturn/yt keymap for think65 (#19300)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jue Liu <youturn@Jues-MacBook-Pro.local>
2023-01-23 02:23:00 -08:00
QMK Bot
0a51ea28fa Merge remote-tracking branch 'origin/master' into develop 2023-01-23 09:39:16 +00:00
Joe Scotto
9c7490d7cb [Keyboard] Add Scotto40 Keyboard (#18453)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2023-01-23 01:38:22 -08:00
Joel Challis
603c86b6a2 Run format-text on keyboard PRs (#19656) 2023-01-22 14:15:10 +11:00
QMK Bot
713003b7fd Merge remote-tracking branch 'origin/master' into develop 2023-01-20 19:43:58 +00:00
era
300a0def4e Change era65 keymap&debounce_type (#19627) 2023-01-20 12:43:11 -07:00
Ryan
cf935d97ae Fix functions with empty params (#19647)
* Fix functions with empty params

* Found a bunch more
2023-01-20 16:21:17 +00:00
QMK Bot
0f77ae6a20 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 11:23:34 +00:00
leah-splitkb
64c399ba38 [Keyboard] Add Kyria rev3 (#19423) 2023-01-20 11:22:53 +00:00
QMK Bot
560b981746 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 05:44:42 +00:00
Joel Challis
53cc6170ae Refactor some layouts which contain keyboard name (#19645)
* Refactor some layouts which contain keyboard name

* use planck_mit
2023-01-20 05:44:05 +00:00
QMK Bot
64c04640ce Merge remote-tracking branch 'origin/master' into develop 2023-01-20 04:30:21 +00:00
dztech
18d107b29b Og60 fix indicator (#19631) 2023-01-19 21:29:48 -07:00
QMK Bot
b738d52160 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 04:24:40 +00:00
Leo Deng
255e138ee1 djam add rgb matrix (#19621) 2023-01-19 21:24:06 -07:00
Joel Challis
fe6502f12e Publish keymap.json to API (#19167) 2023-01-20 03:38:19 +00:00
Joel Challis
27504d974d Fix converter alias after 19603 (#19644) 2023-01-20 02:41:10 +00:00
QMK Bot
c6d7f61e79 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 02:37:07 +00:00
Joel Challis
f2ad3ba7c3 Refactor some layouts which contain keyboard name (#19643) 2023-01-20 02:36:30 +00:00
QMK Bot
771d85b86f Merge remote-tracking branch 'origin/master' into develop 2023-01-20 02:35:58 +00:00
Joel Challis
5e502c3265 Remove stray UNUSED_PINS (#19639) 2023-01-20 02:35:18 +00:00
QMK Bot
64d5ef4056 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 02:00:19 +00:00
Joel Challis
891780b17f Refactor some layouts which contain keyboard name (#19642) 2023-01-20 01:59:46 +00:00
Joel Challis
cc9a3a84d0 Fix mk0_avr_extra PIN_COMPATIBLE lint warning (#19640) 2023-01-20 01:59:27 +00:00
QMK Bot
d6ba3b4b84 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 23:09:55 +00:00
leviport
e5b36e2c3f Docs: typo fixes in platformdev_blackpill_f4x1.md (#19635) 2023-01-19 16:09:11 -07:00
QMK Bot
e99b2b6ec8 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 11:31:19 +00:00
Nick Brassel
22be5190ab Minor cleanup to breaking/checklist docs. (#19596)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-19 22:30:16 +11:00
Joel Challis
4973950ddc Print distro in doctor output (#19633) 2023-01-19 10:25:47 +00:00
QMK Bot
3723c0e3d5 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 01:06:08 +00:00
Nick Brassel
327f7ee9a7 Fixup ChibiOS header inclusion search ordering. (#19623)
* Add STM32F446-Nucleo onekey. 

* Fixup onekey build for F446, all keymaps.

* Fixup board inclusion search ordering.
2023-01-19 01:05:29 +00:00
Joel Challis
0b25528b6b Fix 'No LAYOUTs defined' check (#19537) 2023-01-19 00:27:11 +00:00
Joel Challis
0ce3f6bcfe De-duplicate platform detection (#19603) 2023-01-19 00:27:00 +00:00
Joel Challis
a1f253cbef qmk compile/qmk flash - Validate keymap argument (#19530) 2023-01-19 00:24:13 +00:00
Nick Brassel
baecc69da5 Add support for current/voltage measurement on Ghoul. (#19630) 2023-01-19 11:13:39 +11:00
Nick Brassel
4723f308ad Remove CLI commands: multibuild, cformat, fileformat, pyformat. (#19629) 2023-01-19 10:56:15 +11:00
Joel Challis
88ec588ae7 Remove make all-<platform> build targets (#19496) 2023-01-19 10:44:41 +11:00
Sergey Vlasov
272281f1a0 Add analog support for RP2040 (#19453)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-19 10:30:58 +11:00
Joel Challis
12f1a30d16 Add alias support for converters (#19563) 2023-01-18 23:16:33 +00:00
QMK Bot
364a910b92 Merge remote-tracking branch 'origin/master' into develop 2023-01-18 22:37:06 +00:00
Joel Challis
82a94ea1bd Add f303 to tinyuf2 bootloader support (#19620) 2023-01-18 22:36:58 +00:00
Nick Brassel
17c9388af5 Allow for wildcard filtering in qmk mass-compile (#19625) 2023-01-18 22:36:32 +00:00
QMK Bot
dcd532830d Merge remote-tracking branch 'origin/master' into develop 2023-01-18 08:56:13 +00:00
Shandon Anderson
d73ad52040 [Keyboard] Add Mino Plus Keyboard (#19535)
Co-authored-by: Shandon Anderson <shandon@shandon.codes>
2023-01-18 00:55:34 -08:00
QMK Bot
83a6f6534c Merge remote-tracking branch 'origin/master' into develop 2023-01-18 08:55:20 +00:00
spbgzh
e6ec2bde07 [Keyboard] Add tata80 (#19445)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-18 00:54:20 -08:00
QMK Bot
4858059280 Merge remote-tracking branch 'origin/master' into develop 2023-01-18 01:39:32 +00:00
lukeski14
f5a31fdda6 updating productId for via compat (#19611) 2023-01-18 01:38:53 +00:00
QMK Bot
bd7c396c18 Merge remote-tracking branch 'origin/master' into develop 2023-01-18 01:22:55 +00:00
Albert Y
204ba02765 Use consistent highlight format (#19619) 2023-01-18 01:22:34 +00:00
Albert Y
eb7a8d994a Reduce RGB maximum brightness (#19618) 2023-01-18 01:22:19 +00:00
QMK Bot
949bdd22ef Merge remote-tracking branch 'origin/master' into develop 2023-01-18 00:26:53 +00:00
Albert Y
737e6bf027 Highlight inclusion of extern macro (#19614) 2023-01-18 00:26:16 +00:00
Dean Scarff
8e16920530 [Keyboard] keebio/iris document LED matrix (#19588) 2023-01-17 12:54:16 -08:00
QMK Bot
13fe1a9fe8 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 17:47:06 +00:00
Anton
d907f104aa [Keymap] Add saph1s keymap for KPrepublic BM80v2 (#19608)
Co-authored-by: jack <0x6A73@pm.me>
2023-01-17 10:46:33 -07:00
QMK Bot
d448ff4c17 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 07:40:37 +00:00
QMK Bot
625e57480f Format code according to conventions (#19615) 2023-01-16 23:39:09 -08:00
QMK Bot
3b60a05ae1 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 05:57:55 +00:00
Ivan Gromov
9f84b9ac09 [Keyboard] Add kt3700 (#19432)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-16 21:57:18 -08:00
QMK Bot
275673c562 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 05:57:09 +00:00
JW2586
c6cc104810 [Keyboard] Waterfowl - Updated default keymap (#19438)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-01-16 21:56:37 -08:00
QMK Bot
69397d4fe2 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 05:49:24 +00:00
Alabahuy
7b795b2921 [Keyboard] add kamigakushi (#19514) 2023-01-16 21:48:44 -08:00
Jouke Witteveen
db7ca07909 Process Tap Dances before WPM/Velocikey (#19599) 2023-01-16 21:23:57 -08:00
QMK Bot
a52b3aafd2 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 04:34:24 +00:00
d-floe
49f3ffa264 [Keyboard] Add Bubble 75 (#18863)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-16 20:33:49 -08:00
QMK Bot
2cf904b20d Merge remote-tracking branch 'origin/master' into develop 2023-01-17 01:55:46 +00:00
era
4098ff5574 [Keyboard] Add ERA65 (#19591)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-16 17:55:13 -08:00
Albert Y
0ff52925c0 Refactor pixel rain animation (#19606) 2023-01-16 17:54:51 -08:00
Ryan
7acc3f4449 ChibiOS: Consolidate report sending code (#19607) 2023-01-16 17:54:26 -08:00
QMK Bot
6fd4d8c7ee Merge remote-tracking branch 'origin/master' into develop 2023-01-16 22:42:25 +00:00
Tom Barnes
465b6a14e3 Docs/space b cleanup (#19612)
* Clean up remaining mentions of the deprecated Space B reset method

* cleanup auto_tag.yml that got sucked in
2023-01-16 22:41:52 +00:00
QMK Bot
4c7f67f724 Merge remote-tracking branch 'origin/master' into develop 2023-01-16 09:33:19 +00:00
Pablo Martínez
2bff00e1ba Small doc changes (#19601) 2023-01-16 01:32:43 -08:00
QMK Bot
b6e42db64b Merge remote-tracking branch 'origin/master' into develop 2023-01-16 08:52:56 +00:00
Sergey Vlasov
917d93e968 [Docs] Fix JOYSTICK_AXIS_COUNT name in docs (#19605) 2023-01-16 00:52:18 -08:00
QMK Bot
b077e633c0 Merge remote-tracking branch 'origin/master' into develop 2023-01-16 08:49:16 +00:00
adiabatic
4f83b673bd [Keymap] Improve Zweihander layout for the Ergodox EZ (#18737) 2023-01-16 00:48:41 -08:00
QMK Bot
401b4753fd Merge remote-tracking branch 'origin/master' into develop 2023-01-16 00:56:04 +00:00
Ryan Baker
fe27e46e6d [Keyboard] Add rb87 (#19546) 2023-01-15 16:55:30 -08:00
Sergey Vlasov
955829bfd0 Fix joystick build for ChibiOS (#19602)
`joystick_report_t` was renamed to `report_joystick_t`, but apparently
one place in the code was missed.
2023-01-15 23:29:29 +00:00
Joel Challis
0730740add Add mmoskal/uf2-stm32f103 bootloader support (#19594) 2023-01-15 15:04:32 +00:00
Ryan
a92071494a usb_main.c: remove CH_KERNEL_MAJOR check (#19597) 2023-01-15 19:40:52 +11:00
QMK Bot
80464674d3 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 08:03:56 +00:00
Christian Brauner
44bcde102d [Keymap] Update brauner preonic layout (#19595) 2023-01-15 00:03:27 -08:00
jack
2c98e795f7 [Keyboard] Fixup gingko65 matrix pins (#19589) 2023-01-15 00:03:16 -08:00
QMK Bot
d40516c3c7 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 03:58:42 +00:00
jurassic73
e7d1b210ba [Keyboard] Update handwired/split89 to new standard. (#19540)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2023-01-14 19:58:09 -08:00
QMK Bot
5f46e29c72 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 03:47:13 +00:00
Bastien BALOUP
4a53d9c431 [Keymap] Add Bastian-Baloup sofle keymap (#18836)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-01-14 19:46:13 -08:00
David Hoelscher
45851a10f6 Add RGB565 and RGB888 color support to Quantum Painter (#19382) 2023-01-14 21:24:54 +11:00
QMK Bot
5873fbe569 Merge remote-tracking branch 'origin/master' into develop 2023-01-14 02:25:42 +00:00
Renegade-Master
3f2cbc9e68 Pr/reorder docker podman check (#19561) 2023-01-14 13:25:07 +11:00
QMK Bot
6f575fb23b Merge remote-tracking branch 'origin/master' into develop 2023-01-13 22:21:11 +00:00
gitdrik
9c02b2990a Updates to gitdrik Planck keymap (#19585) 2023-01-13 22:19:57 +00:00
QMK Bot
83c6454a76 Merge remote-tracking branch 'origin/master' into develop 2023-01-13 11:09:14 +00:00
Duccio
d196ab56d3 [bluebell/Swoop] Enable RGB underlight by default (#19501) 2023-01-13 03:08:12 -08:00
QMK Bot
867f2fb280 Merge remote-tracking branch 'origin/master' into develop 2023-01-13 11:04:54 +00:00
Jens Peter Secher
0de7ccedac [Keyboard] Acacia keyboard (#19532) 2023-01-13 03:04:16 -08:00
QMK Bot
a306a31042 Merge remote-tracking branch 'origin/master' into develop 2023-01-13 11:04:13 +00:00
Rucker Machine
e1feab3167 [Keyboard] Add additional layout to RM_Numpad (#19534)
Co-authored-by: jason <jrucker2004@gmail.com>
2023-01-13 03:03:37 -08:00
QMK Bot
d44581b036 Merge remote-tracking branch 'origin/master' into develop 2023-01-13 10:59:53 +00:00
jack
b756c53c7b [Docs] Touch up documentation templates & porting keyboard docs (#19573) 2023-01-13 02:58:38 -08:00
QMK Bot
28832cf54c Merge remote-tracking branch 'origin/master' into develop 2023-01-13 10:58:09 +00:00
James Young
c965243bb7 Synth Labs 060 Layout Additions and Fixes (#19575) 2023-01-13 02:57:35 -08:00
QMK Bot
5a3c9d3efd Merge remote-tracking branch 'origin/master' into develop 2023-01-13 10:57:14 +00:00
James Young
aba0441117 Teleport Native Layout Implementation Rework (#19576) 2023-01-13 02:55:37 -08:00
QMK Bot
c35798f282 Merge remote-tracking branch 'origin/master' into develop 2023-01-13 06:49:24 +00:00
James Young
9a4c7a48ba Quarkeys Z60 Layout Addtions (#19568)
* quarkeys/z60/hotswap: rename LAYOUT to LAYOUT_60_ansi_tsangan_split_rshift

* quarkeys/z60/solder: add matrix diagram

* quarkeys/z60/solder: rename LAYOUT to LAYOUT_all

* quarkeys/z60/solder: add LAYOUT_60_ansi

* quarkeys/z60/solder: add LAYOUT_60_ansi_split_bs_rshift

* quarkeys/z60/solder: add LAYOUT_60_iso

* quarkeys/z60/solder: add LAYOUT_60_iso_split_bs_rshift

* quarkeys/z60/solder: add LAYOUT_60_ansi_tsangan

* quarkeys/z60/solder: add LAYOUT_60_tsangan_hhkb

* quarkeys/z60/solder: add LAYOUT_60_iso_tsangan

* quarkeys/z60/solder: enable Community Layout support
2023-01-12 22:48:50 -08:00
QMK Bot
33da7f77a4 Merge remote-tracking branch 'origin/master' into develop 2023-01-13 06:39:24 +00:00
Jonathan Moallem
c1aef03e98 Rectified ins/del layout macro ordering of Keychron Q1 ANSI (#19560) 2023-01-13 17:38:50 +11:00
QMK Bot
e57d703d50 Merge remote-tracking branch 'origin/master' into develop 2023-01-12 11:30:07 +00:00
Tom Barnes
0cff636739 weact docs patch re "security vulnerability" (#19572) 2023-01-12 22:29:25 +11:00
Stefan Kerkmann
ec09087543 Update ChibiOS[-Contrib], SIO driver, configs (#17915)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-01-12 21:47:36 +11:00
QMK Bot
81513ab5f5 Merge remote-tracking branch 'origin/master' into develop 2023-01-12 09:57:20 +00:00
Peter Park
6e4b4a1360 [Keymap] Add The Uni Utility Belt Keymap (#19411)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2023-01-12 01:56:34 -08:00
Christian Brauner
2b5e5d9047 [Keymap] Add brauner preonic layout (#19444) 2023-01-12 01:56:12 -08:00
QMK Bot
4cfdefa2b5 Merge remote-tracking branch 'origin/master' into develop 2023-01-12 07:45:52 +00:00
Ramon Imbao
62eba54092 [Keyboard] Add Plywrks Ji-Eun (#18276) 2023-01-11 23:45:08 -08:00
Joel Challis
1bbacec44d Promote CTPC warning to error (#19565) 2023-01-11 22:44:55 +00:00
QMK Bot
53caeb7952 Merge remote-tracking branch 'origin/master' into develop 2023-01-11 22:34:07 +00:00
James Young
74d8f16c1d Keychron V3: correct layout data (#19567)
* keychron/v3/ansi_encoder: correct layout data

* keychron/v3/iso_encoder: correct layout data
2023-01-11 22:33:30 +00:00
Joel Challis
b61654fb95 Tidy up use of CTPC (#19570) 2023-01-11 22:31:54 +00:00
Drashna Jael're
6576127b4c Merge remote-tracking branch 'origin/master' into develop 2023-01-11 14:18:08 -08:00
James Young
377f87cb7e Keychron V1: correct layout data for ANSI versions (#19558)
* keychron/v1/ansi: correct layout data

* keychron/v1/ansi_encoder: correct layout data
2023-01-11 12:50:11 -08:00
Joel Challis
46c85c93f0 Revert "De-duplicate platform detection (#19545)" (#19564)
This reverts commit e11235ee14.
2023-01-11 19:58:27 +00:00
Joel Challis
e11235ee14 De-duplicate platform detection (#19545) 2023-01-11 02:13:32 +00:00
Joel Challis
20474ae232 Fix CLI community detection (#19562) 2023-01-11 12:38:35 +11:00
Drashna Jaelre
a1676c3b8c [Keyboard] Work Louder updates for via v3 (#19555) 2023-01-10 16:35:33 -08:00
QMK Bot
f4a25bcfaf Merge remote-tracking branch 'origin/master' into develop 2023-01-10 16:34:14 +00:00
James Young
5e5b19cf94 Keychron S1 ANSI Layout Touch-Up (#19556) 2023-01-10 15:09:09 +00:00
QMK Bot
6b81ba1d4c Merge remote-tracking branch 'origin/master' into develop 2023-01-10 09:06:09 +00:00
squarecut
aba67829e9 [Keymap] Kbdfans Tiger 80 keymap & Planck keymap (#19428)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Abhishek Malavalli <abhishek.malavalli@fphcare.co.nz>
2023-01-10 01:05:31 -08:00
QMK Bot
64dea51094 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 06:39:27 +00:00
Filip Paryż
4d83583410 [Keymap] Updated Freoduo keymap (#19351) 2023-01-09 22:38:54 -08:00
QMK Bot
8bc85c0f42 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 03:22:17 +00:00
Drashna Jaelre
90fd08bf4b [Bug] Use correct functions for RGB Matrix support in VIA (#19554) 2023-01-10 03:21:38 +00:00
Ryan
56555c61e1 Migrate LAYOUTS to data driven (#19541)
* Migrate `LAYOUTS` to data driven, 0-9

* Migrate `LAYOUTS` to data driven, A

* Migrate `LAYOUTS` to data driven, B

* Migrate `LAYOUTS` to data driven, C

* Migrate `LAYOUTS` to data driven, D

* Migrate `LAYOUTS` to data driven, E

* Migrate `LAYOUTS` to data driven, F

* Migrate `LAYOUTS` to data driven, G

* Migrate `LAYOUTS` to data driven, H

* Migrate `LAYOUTS` to data driven, handwired

* Migrate `LAYOUTS` to data driven, I

* Migrate `LAYOUTS` to data driven, J

* Migrate `LAYOUTS` to data driven, K

* Migrate `LAYOUTS` to data driven, L

* Migrate `LAYOUTS` to data driven, M

* Migrate `LAYOUTS` to data driven, N

* Migrate `LAYOUTS` to data driven, O

* Migrate `LAYOUTS` to data driven, P

* Migrate `LAYOUTS` to data driven, Q

* Migrate `LAYOUTS` to data driven, R

* Migrate `LAYOUTS` to data driven, S

* Migrate `LAYOUTS` to data driven, T

* Migrate `LAYOUTS` to data driven, U

* Migrate `LAYOUTS` to data driven, V

* Migrate `LAYOUTS` to data driven, W

* Migrate `LAYOUTS` to data driven, X

* Migrate `LAYOUTS` to data driven, Y

* Migrate `LAYOUTS` to data driven, Z
2023-01-10 02:48:20 +00:00
QMK Bot
59ae682dc9 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 00:49:04 +00:00
Dennis Kruyt
caca029e12 [Keyboard] add YMDK40 AIR40 (#19276)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-09 16:48:11 -08:00
QMK Bot
2dd4359181 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 23:50:53 +00:00
Manna Harbour
0becd33c4d [keyboard] Enable community layout support (#19499) 2023-01-09 23:50:18 +00:00
QMK Bot
14fabfd893 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 21:34:03 +00:00
Nick Brassel
01de98428c [Keychron Q5] Build failures: recursive function call. (#19553) 2023-01-10 08:33:28 +11:00
QMK Bot
3a726203a4 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 20:19:56 +00:00
Nick Brassel
2891d901c3 New ChibiOS SVN URL, added new release. (#19493) 2023-01-10 07:19:20 +11:00
Joel Challis
b57714f793 qmk doctor - Handle timeouts while checking binaries (#19549) 2023-01-09 09:27:41 +00:00
Joel Challis
a3ed1b0c8d Relax converter within keymap schema (#19544) 2023-01-09 09:23:02 +00:00
Joel Challis
1b045b1e60 Handle doctor permission issues while checking udev (#19548) 2023-01-09 08:21:21 +00:00
QMK Bot
cf55032485 Merge remote-tracking branch 'origin/master' into develop 2023-01-08 15:27:43 +00:00
Joel Challis
1c024bfa91 Add some missing layout data (#19539) 2023-01-08 15:26:37 +00:00
QMK Bot
c172ae107e Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:07:51 +00:00
Joel Challis
f6023a36bc Remove invalid pin_compatible config from defaults (#19512) 2023-01-07 17:07:19 +00:00
Joel Challis
974a1eaf2a Ignore defaults.hjson values if already set (#19511)
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
2023-01-07 17:05:53 +00:00
QMK Bot
403c7eeb5c Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:03:18 +00:00
Joel Challis
c5e3275299 Fix handwired/onekey/kb2040 WS2812 pin (#19517) 2023-01-07 17:02:40 +00:00
QMK Bot
31b8dd34a3 Merge remote-tracking branch 'origin/master' into develop 2023-01-06 21:46:41 +00:00
dependabot[bot]
97910fac06 Bump anothrNick/github-tag-action from 1.58.0 to 1.61.0 (#19519)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.58.0 to 1.61.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.58.0...1.61.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-06 21:45:23 +00:00
QMK Bot
72dc1f88b9 Merge remote-tracking branch 'origin/master' into develop 2023-01-06 17:13:12 +00:00
Daniel Schaefer
b56ffc8920 docs: Fix IS31FL3743A driver name (#19518)
Incorrectly documented.
See: `builddefs/common_features.mk`
2023-01-06 17:12:30 +00:00
Joel Challis
5c730d971e Migrate submodule dirty check to CLI (#19488) 2023-01-06 04:16:52 +00:00
QMK Bot
b2384f1809 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 23:41:28 +00:00
Sergey Vlasov
4a7d65b9d7 Fix MATRIX_COLS and MATRIX_ROWS generation for custom matrix (#19508)
The code which generated the MATRIX_COLS and MATRIX_ROWS defines from
the JSON information was checking the presence of the `matrix_pins` key,
which may not exist if a custom matrix is used.  Check the presence of
`matrix_size` instead.
2023-01-05 23:40:53 +00:00
QMK Bot
fee362e09a Merge remote-tracking branch 'origin/master' into develop 2023-01-05 19:33:34 +00:00
dependabot[bot]
64508caa76 Bump anothrNick/github-tag-action from 1.57.0 to 1.58.0 (#19509)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.57.0 to 1.58.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.57.0...1.58.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-05 19:32:57 +00:00
QMK Bot
8f36e08be0 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 15:13:44 +00:00
Paul Massendari
84a642266c A comma was missing (#19507) 2023-01-05 15:12:46 +00:00
QMK Bot
68aa64172d Merge remote-tracking branch 'origin/master' into develop 2023-01-04 19:41:58 +00:00
dependabot[bot]
e2ef3c8cc9 Bump anothrNick/github-tag-action from 1.56.0 to 1.57.0 (#19502)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-05 06:41:20 +11:00
QMK Bot
8b141020b2 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 06:18:53 +00:00
SapuSeven
6a02eb2874 Add SapuSeven MacroPad12 (#19466)
* Add SapuSeven MacroPad12

* Update image url

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

* Remove unnecessary layers

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-01-04 06:18:16 +00:00
QMK Bot
b6b9b25525 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 05:21:35 +00:00
Carlo
be024a1d43 feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (#19426) 2023-01-04 05:21:32 +00:00
Paul James
04dcf81d1e [Keyboard] Stop LED1 from flashing on layer change (#19427) 2023-01-04 05:21:03 +00:00
QMK Bot
03a728f71c Merge remote-tracking branch 'origin/master' into develop 2023-01-04 05:07:50 +00:00
Nick Brassel
8e869da1da Allow for specifying the number of symbols to output. (#19497) 2023-01-04 16:07:13 +11:00
zvecr
115c241f21 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 04:17:58 +00:00
Nick Brassel
691668340c Add qmk mass-compile, which intends to supercede qmk multibuild whilst providing support for filtering as per data-driven definitions. (#18971) 2023-01-04 04:10:18 +00:00
Joel Challis
f9ee0571a7 Remove unused Makefile paths (#19487) 2023-01-04 14:25:48 +11:00
QMK Bot
6d41ba75d3 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 19:36:56 +00:00
dependabot[bot]
46ed46e384 Bump anothrNick/github-tag-action from 1.55.0 to 1.56.0 (#19494)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.55.0 to 1.56.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.55.0...1.56.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-03 19:36:22 +00:00
Joel Challis
c345278101 Replace list_keyboards.sh with CLI calls (#19485) 2023-01-03 14:15:29 +11:00
QMK Bot
44800f119d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:52:06 +00:00
Jesus Climent
5962ebaba1 Fix github URL for the atreyu maintainer. (#19476) 2023-01-03 09:51:32 +11:00
Joel Challis
20ee103399 Remove cmp checks from Makefile (#19480) 2023-01-02 22:26:26 +00:00
QMK Bot
b497d58d6d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:13:00 +00:00
Joel Challis
4b2fd42122 Build warning when not valid work-tree (#19475) 2023-01-03 09:12:54 +11:00
Joel Challis
975d64cc2b adpenrose/akemipad fixes (#19477) 2023-01-03 09:12:25 +11:00
Joel Challis
b297531dbf Migrate 'make git-submodule' to CLI command (#19479) 2023-01-03 09:11:57 +11:00
Joel Challis
3a5a4c708f Report submodule status when not valid work-tree (#19474) 2023-01-03 09:00:29 +11:00
David Kosorin
0f5500182c Allow mod-tap hold action on one shot layer (#19214) 2023-01-02 11:16:24 +01:00
Joel Challis
24adecd922 Implement XAP style merge semantics for DD keycodes (#19397) 2023-01-01 19:16:38 +00:00
QMK Bot
8c09170fff Merge remote-tracking branch 'origin/master' into develop 2023-01-01 17:31:57 +00:00
theamarin
ff73cb6290 [Keymap] Add Neo2-based keymap for Planck keyboard (#19173)
Co-authored-by: christian <christian.lueke@sonoware.de>
2023-01-01 09:31:25 -08:00
QMK Bot
17085ec49d Merge remote-tracking branch 'origin/master' into develop 2023-01-01 16:06:35 +00:00
Byron Clark
867e4fc11c [Keyboard] Add community layout support to Piantor (#19455) 2023-01-01 08:05:57 -08:00
Joel Challis
e4cfbd2532 Allow CLI to flash .uf2 files (#19462) 2023-01-01 15:51:29 +11:00
Joel Challis
cd1f05a23a Use unique name for regen PR branches (#19464) 2023-01-01 13:38:31 +11:00
QMK Bot
fc2c9ccbc5 Regenerate Files (#19463) 2023-01-01 02:20:11 +00:00
QMK Bot
03ec3db651 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:57:59 +00:00
Drashna Jaelre
9b8f18699f Partially revert #18940 for Ploopy Thumb Trackball (#18943) 2023-01-01 11:57:36 +11:00
Drashna Jaelre
b4d5c22ed4 Keyboard/fix work louder micro (#18968) 2023-01-01 11:57:15 +11:00
Drashna Jaelre
b585ece5ef Add Split support for Haptic feedback (#19203) 2023-01-01 11:56:32 +11:00
Drashna Jaelre
ac561b9473 [Bug] Prevent dynamic keymaps from processing layers that don't exist (#19225) 2023-01-01 11:55:14 +11:00
Joel Challis
d0ebafaea6 Align definition of unicode_map (#19452) 2023-01-01 11:54:12 +11:00
QMK Bot
4704a4e053 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:53:46 +00:00
Joel Challis
2ae215514a Add docs to cover recent LAYOUT_all lint checks (#19393) 2023-01-01 11:53:10 +11:00
Joel Challis
5a3594366f Initial DD keycode regen workflow (#19400) 2023-01-01 11:46:17 +11:00
QMK Bot
422fd8aed8 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:44:40 +00:00
Joel Challis
b8e12eed80 WSL qmk flash firmware.bin workaround (#19434) 2023-01-01 11:44:33 +11:00
Joel Challis
61696fda83 CLI flashers should allow files outside qmk_firmware folder (#19454) 2023-01-01 11:43:30 +11:00
QMK Bot
c6bc439eb2 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:42:58 +00:00
TommyZ
c7c44de32f [Keyboard] Add Quarkeys Z60, reorganized keyboard file directory (#19404)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-01-01 11:41:58 +11:00
QMK Bot
22b3d76f9b Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:40:34 +00:00
DOIO2022
53100496c3 Add KB30 keyboard (#19395)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-01 11:40:01 +11:00
QMK Bot
06b12a98c7 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:39:31 +00:00
Jesus Climent
20bafb9313 Atreyu rev2 (#19443) 2023-01-01 11:38:44 +11:00
QMK Bot
ea96799970 Merge remote-tracking branch 'origin/master' into develop 2022-12-31 21:23:49 +00:00
BBBNBBB
943aae85d5 Fixes unicode_map declaration example (#19450)
If the previous example was used the incorrect codepoints are produced.
Changes the order of arguments the declaration of the unicode_map
2022-12-31 21:23:17 +00:00
jack
829c7e0931 Fixup horrortroll/handwired_k552 (#19447) 2022-12-31 21:15:16 +00:00
HorrorTroll
724aa3a4b2 Refactor entire Handwired K552 keyboard (#18066) 2022-12-30 12:04:01 +11:00
QMK Bot
87cace28a6 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 01:02:09 +00:00
Yizhen Liu
590c889537 [keyboard]Add Graystudio Space65 R3 (#18909)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-30 12:01:32 +11:00
QMK Bot
7cccba8a3b Merge remote-tracking branch 'origin/master' into develop 2022-12-30 01:00:29 +00:00
HorrorTroll
5fa2aab41e Added support keyboard Pila87 / XM87 PRO (#18919) 2022-12-30 11:59:55 +11:00
QMK Bot
62d101b886 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:53:52 +00:00
Evgenii Vilkov
ced8142847 [Keyboard] Add Pica40 (#19220)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-30 11:53:31 +11:00
QMK Bot
91bfc2ba3f Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:52:37 +00:00
Wolf Van Herreweghe
a7ff2b8d54 Typ65+ Add code to auto turn off LEDs when the PC goes to sleep (#19365)
Co-authored-by: Wolf <contact@vwolf.be>
2022-12-30 11:51:12 +11:00
QMK Bot
d4096db271 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:51:12 +00:00
Roberto Santalla
a781672ce7 docs: add a note about reflashing both halves for encoder resolution (#19162)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-30 11:50:37 +11:00
jasonj2232
6b50b1be9b [Keyboard] Added support for a new keyboard - Ishi 80 Mk0 (#19195) 2022-12-30 11:50:16 +11:00
dztech
e08debb62f Fix odinmini layout macro (#19429) 2022-12-30 11:48:26 +11:00
QMK Bot
cd1d1d80bb Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:48:13 +00:00
Ryan
801d2ff940 Remove useless line continuations (#19399) 2022-12-30 11:48:05 +11:00
yonatanzunger
6bd76c97be A fancy keymap for the wt65_xt. (#19375) 2022-12-30 11:47:40 +11:00
QMK Bot
2b61cc739f Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:45:52 +00:00
alaviss
444760efcb ploopyco/trackball_mini: always update encoder (#18561) 2022-12-30 11:45:10 +11:00
QMK Bot
69a9577558 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:44:58 +00:00
x123
ab667a8b64 add x123 keymap for splitkb/aurora/corne (#19407) 2022-12-30 11:44:21 +11:00
Albert Y
77092675aa Update RGB matrix reactive gradient timer scale (#19415) 2022-12-30 11:38:15 +11:00
QMK Bot
40fddcb1e5 Merge remote-tracking branch 'origin/master' into develop 2022-12-27 20:29:52 +00:00
gachiham
4c32e060e8 [Keyboard] Add XR63GL keyboard (#19380) 2022-12-27 12:29:19 -08:00
QMK Bot
3b80638ac3 Merge remote-tracking branch 'origin/master' into develop 2022-12-27 20:15:16 +00:00
DeskDaily
202a708ba7 [Keyboard] Add Mk65 (#19346)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-27 12:14:56 -08:00
Isaac Lyons
fd9c809fc3 [Keymap] Add snowskeleton preonic layout (#19357)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-27 12:14:42 -08:00
Albert Y
7f2ac4c576 De-obfuscate random8 functions in RGB matrix animations (#19416) 2022-12-27 12:11:31 -08:00
Albert Y
809c05ddf2 Use random8 for jellybean effect (#19418) 2022-12-27 12:10:07 -08:00
QMK Bot
d81c54109a Merge remote-tracking branch 'origin/master' into develop 2022-12-27 20:09:35 +00:00
Arturo Avila
3de3f885de [Keyboard] Add AkemiPad (#18790)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-27 12:09:01 -08:00
QMK Bot
3232f52efb Merge remote-tracking branch 'origin/master' into develop 2022-12-27 19:39:29 +00:00
leah-splitkb
95e97fa839 [Keyboard] Fix Aurora Lily58 default encoder behaviour (#19424) 2022-12-27 11:38:53 -08:00
Joel Challis
517f8af99e Revert changes to keymap_steno.h (#19412) 2022-12-23 23:42:33 +00:00
jack
003cee0098 Validate keyboard name before accepting further input (#19394) 2022-12-23 18:18:57 +00:00
QMK Bot
1c5a67b767 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 18:14:59 +00:00
dependabot[bot]
b56c0fa674 Bump actions/stale from 6 to 7 (#19392)
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-23 18:14:23 +00:00
QMK Bot
430b551407 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 17:53:44 +00:00
Joel Challis
70f67ca908 Update breaking changes year... (#19409) 2022-12-23 17:53:08 +00:00
QMK Bot
8f506b5bc2 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 11:12:33 +00:00
Joel Challis
ab1898e660 Minor alignment of rgb_breathe_table generator (#19403) 2022-12-23 11:11:56 +00:00
QMK Bot
d988c1c082 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 09:09:11 +00:00
DeskDaily
99b69dc80e [Keyboard] Corrected a GPIO pin on config.h on the jisoo pcb (#19396)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-23 01:08:37 -08:00
QMK Bot
f6eccf49e8 Merge remote-tracking branch 'origin/master' into develop 2022-12-22 23:41:55 +00:00
Nick Brassel
f75ac6042e Lock down workflow permissions. (#19406)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-12-23 10:41:16 +11:00
Joel Challis
e5721bbd37 Remaining DD keymap_extras migration (#19110)
* Parse headers to data

* Regen headers from data
2022-12-21 23:35:23 +00:00
QMK Bot
89b72017a0 Merge remote-tracking branch 'origin/master' into develop 2022-12-21 10:04:25 +00:00
ebastler
b8a9de206d Add Anvil Native keyboard (#19333)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-21 21:03:50 +11:00
QMK Bot
b2036a4c9f Merge remote-tracking branch 'origin/master' into develop 2022-12-21 00:24:13 +00:00
dependabot[bot]
c0e54737ad Bump anothrNick/github-tag-action from 1.54.0 to 1.55.0 (#19387)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-21 11:23:38 +11:00
Filip Paryż
ae94be98ed New keymap for ID75 - paryz (#19350) 2022-12-21 03:48:17 +11:00
QMK Bot
d95a51fb17 Merge remote-tracking branch 'origin/master' into develop 2022-12-20 06:45:05 +00:00
lalalademaxiya1
8560280afe Add Keychron S1 (#19378) 2022-12-20 17:44:23 +11:00
QMK Bot
174263445f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 10:00:37 +00:00
4pplet
8d43f20624 Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B (#18584)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-12-19 20:59:48 +11:00
QMK Bot
3944eda299 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:57:45 +00:00
lalalademaxiya1
90bd710b69 Add Keychron V7 (#19360) 2022-12-19 20:55:30 +11:00
QMK Bot
995aad1123 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:55:02 +00:00
lalalademaxiya1
007a8c8b35 Add Keychron V8 (#19361) 2022-12-19 20:54:05 +11:00
QMK Bot
ff8d514262 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:52:40 +00:00
Manna Harbour
5922751b17 [Keyboard] Add converter/xmk (#18433) 2022-12-19 20:52:03 +11:00
QMK Bot
0b079424c8 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:48:45 +00:00
lalalademaxiya1
d27d6f0485 Add Keychron Q7 (#19308)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 20:48:30 +11:00
lalalademaxiya1
90c4a8785e Add Keychron Q60 (#19309)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 20:46:56 +11:00
QMK Bot
5d3fccf006 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:46:29 +00:00
lalalademaxiya1
4c28f93520 Add Keychron Q65 (#19310)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 20:45:57 +11:00
QMK Bot
e8d6c62934 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:45:26 +00:00
lalalademaxiya1
e0ff1189ce Add Keychron V1 (#19315) 2022-12-19 20:44:47 +11:00
QMK Bot
830bdd9a85 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:42:33 +00:00
lalalademaxiya1
de64c61d17 Add Keychron V2 (#19316) 2022-12-19 20:42:00 +11:00
QMK Bot
bef4d9965d Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:40:13 +00:00
lalalademaxiya1
a3392fdd1e Add Keychron V3 (#19317) 2022-12-19 20:39:36 +11:00
QMK Bot
f46018457f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:07:33 +00:00
lalalademaxiya1
0ab4f53691 Add Keychron V4 (#19319) 2022-12-19 20:06:51 +11:00
QMK Bot
f249789a8f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:54:27 +00:00
lalalademaxiya1
4a0027d493 Add Keychron V5 (#19320) 2022-12-19 19:53:51 +11:00
QMK Bot
cf1c50987a Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:43:20 +00:00
lalalademaxiya1
359caf1432 Add Keychron Q9 (#19318) 2022-12-19 19:42:45 +11:00
QMK Bot
2e36bde659 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:10:51 +00:00
Alexander Franco
11ae141835 Fix description for selectively disabling animations (#19374) 2022-12-19 19:10:11 +11:00
QMK Bot
05a2f0453a Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:10:10 +00:00
Salicylic-acid3
6a80b7266a [Keyboard] Add Guide68 (#19264)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 19:09:35 +11:00
QMK Bot
7526b2a621 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 07:29:10 +00:00
jack
8655b100b1 keebio/quefrency — add missing LAYOUT_all's to info.json (#19373) 2022-12-18 23:28:30 -08:00
QMK Bot
dd9d3d6c8e Merge remote-tracking branch 'origin/master' into develop 2022-12-18 22:34:09 +00:00
zvecr
2e9ebf0756 Correct 19355 2022-12-18 22:33:08 +00:00
QMK Bot
54f441ca9f Merge remote-tracking branch 'origin/master' into develop 2022-12-18 22:32:35 +00:00
dztech
f1cf00ab70 change d45lite keyboard name to d45v2 (#19355) 2022-12-18 22:31:34 +00:00
Stefan Kerkmann
c2b13bd77b Introduce VERIFY_AND_CLEAR shorthand (#19370)
Which is just a syntactic sugar for
testing::Mock::VerifyAndClearExpectations to reduce the visual clutter
in unit-tests.
2022-12-18 21:55:14 +01:00
Peter Park
7aa2d791f6 [Keyboard] The Uni change folder location (#19326)
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2022-12-17 19:26:02 -08:00
QMK Bot
9c08c7d4b6 Merge remote-tracking branch 'origin/master' into develop 2022-12-18 03:21:34 +00:00
Nostril
f3041c5500 [Keyboard] Add Synth Labs 060 keyboard (#19363)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-17 19:21:02 -08:00
QMK Bot
2e126faf92 Merge remote-tracking branch 'origin/master' into develop 2022-12-17 19:56:39 +00:00
jack
bb82ded302 [Keyboard] tkc/portico75 — Fix layers & move to encoder map (#19359) 2022-12-17 11:55:37 -08:00
jack
a73014fa27 [Keyboard] tkc/portico75 — Fix layers & move to encoder map (#19359) 2022-12-17 11:55:12 -08:00
Stefan Kerkmann
85984902cf Introduce IS_EVENT instead of !IS_NOEVENT (#19366) 2022-12-17 14:06:27 +00:00
Stefan Kerkmann
dedc54a328 [Core] guard action related debug messages (#19348) 2022-12-15 23:38:25 +01:00
QMK Bot
233ae20d33 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 19:36:22 +00:00
James Young
f21443d6a2 DZTECH OG60 Touch-Up (#19343) 2022-12-15 11:35:28 -08:00
QMK Bot
e3a34d6062 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 19:29:21 +00:00
Leo Deng
79d083c635 [Docs] Update feature_joystick.md (#19347) 2022-12-15 11:28:48 -08:00
QMK Bot
0072f5bb1b Merge remote-tracking branch 'origin/master' into develop 2022-12-15 19:26:01 +00:00
Basil Sh
293a9fb342 [Keymap] Fix miryoku layout for draculad (#19338) 2022-12-15 11:25:17 -08:00
Albert Y
c6d0aa6ae4 Add change log for quick tap term (#19341) 2022-12-15 12:29:26 +01:00
QMK Bot
1d3b27eb34 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 09:03:23 +00:00
ebastler
d7225eafbe [Keymap] Add E80-1800 keymap with bongocat OLED animation (#19334) 2022-12-15 01:02:49 -08:00
QMK Bot
62b89f8184 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 08:19:43 +00:00
jotix
33cc81f36e [Keymap] Simplifying ortho-4x12 jotix's layout (#19336) 2022-12-15 00:19:39 -08:00
Joshua Diamond
571a9794af Fix non-functional RGBLIGHT_EFFECT_TWINKLE on ARM (#19335) 2022-12-15 00:18:54 -08:00
QMK Bot
9e29fe16e6 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 06:40:57 +00:00
James Young
8e50f1c5f5 DZTECH Endless80 Touch-Up (#19339) 2022-12-14 22:40:17 -08:00
Nick Brassel
64715084b2 Fixup build failures. (#19332) 2022-12-15 09:56:30 +11:00
QMK Bot
2ea290f5b9 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 21:09:59 +00:00
Nick Brassel
6543065180 Reorder paths to (hopefully) trigger a re-tag. 2022-12-15 08:09:14 +11:00
QMK Bot
fd6b1558ce Format code according to conventions (#19331) 2022-12-14 12:58:02 -08:00
QMK Bot
309b4dc2b7 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:56:53 +00:00
QMK Bot
51360f3d54 Format code according to conventions (#19330) 2022-12-14 20:56:19 +00:00
QMK Bot
1bf60eb6fc Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:51:55 +00:00
Zykrah
5c817bffe9 [Keyboard] Add Slime88 (#19054)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-14 12:51:02 -08:00
QMK Bot
7311b17875 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:50:36 +00:00
Nick Brassel
0f97402d21 Add builddefs to the paths associated with tagging. (#19329) 2022-12-15 07:50:02 +11:00
QMK Bot
6550b67005 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:49:23 +00:00
Zykrah
35f460643a [Keyboard] Tinny50 RGB Edition (#19285)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-14 12:48:45 -08:00
QMK Bot
66af985a62 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:41:09 +00:00
BentoBoxStudio
5373376020 [Keyboard] Add cosmo65 (#19181) 2022-12-14 12:40:38 -08:00
Ryan
1978007fae Tap Dance: remove qk_ prefix (#19313) 2022-12-14 12:40:25 -08:00
QMK Bot
83e8e5845a Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:27:34 +00:00
Nick Brassel
e67e690cf3 Revert to legacy wear-leveling driver by default for F401. (#19328) 2022-12-15 07:27:00 +11:00
QMK Bot
2f15cde2d1 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 15:51:31 +00:00
mfkiiyd
1130834513 add ubest/vn 68 keyboard (#19263)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: water <mfkiiyd@163.com>
2022-12-15 02:50:56 +11:00
QMK Bot
2b2d1d43d8 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 15:50:29 +00:00
dztech
4c5e0606fe add tofu_jr keyboard (#18960)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-15 02:49:49 +11:00
Stefan Kerkmann
962e4c0e18 [Test] Reset timer for every unit test and provide timestamps for log messages (#17028) 2022-12-15 02:31:08 +11:00
QMK Bot
e2ab98f960 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 14:44:19 +00:00
Pablo Martínez
99174edf0a [Docs] Remove broken link (#19321) 2022-12-15 01:43:39 +11:00
Joel Challis
1124bbc1db Remove deprecated led_set_kb (#19273)
* Remove led_set_kb maintaining existing led_set_user behaviour

* Also call led_set_user
2022-12-14 11:14:10 +00:00
QMK Bot
0fcf481cdd Merge remote-tracking branch 'origin/master' into develop 2022-12-14 02:49:39 +00:00
jack
fecfb176b4 Add encoder map to boardsource/lulu, and some other dd migrations (#19281) 2022-12-14 13:49:06 +11:00
Ryan
e2117564c5 Leader: remove qk_ prefix (#19304) 2022-12-14 13:46:01 +11:00
QMK Bot
49b81a9c2b Merge remote-tracking branch 'origin/master' into develop 2022-12-14 02:44:46 +00:00
Ryan
9e4cfcd181 UCIS: remove qk_ prefix (#19302) 2022-12-14 13:44:36 +11:00
James Young
582f879d6f Mode SixtyFive HA Layout Refactor (#19312) 2022-12-14 13:43:40 +11:00
precondition
515dd18c28 Remove IGNORE_MOD_TAP_INTERRUPT_PER_KEY in favour of HOLD_ON_OTHER_KEY_PRESS_PER_KEY (#15741) 2022-12-13 22:20:07 +11:00
QMK Bot
ca13734f91 Merge remote-tracking branch 'origin/master' into develop 2022-12-13 09:24:13 +00:00
Zykrah
411ed54b0a [Keyboard] Add Fuyu (#19055)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-13 01:23:37 -08:00
QMK Bot
3cb0888afa Merge remote-tracking branch 'origin/master' into develop 2022-12-13 09:15:33 +00:00
Leo Deng
70b9cec3f2 [Keyboard] add deng/thirty keyboard (#19228)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Leo DENG <leo.deng@nio.com>
2022-12-13 01:14:29 -08:00
Drashna Jaelre
222f685b90 [Keyboard] Fix DZTECH Tofu II v1 i2c config (#19306) 2022-12-13 15:59:32 +11:00
QMK Bot
408bb469bb Merge remote-tracking branch 'origin/master' into develop 2022-12-13 02:50:58 +00:00
Danny
e25672baef [Keyboard] Add Convolution Rev. 1 PCB (#19283)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-12-12 18:50:23 -08:00
QMK Bot
e0e22176bb Merge remote-tracking branch 'origin/master' into develop 2022-12-13 02:38:55 +00:00
DeskDaily
e444cf9578 [Keyboard] Add Daily60 keyboard (#19116)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-12 18:38:38 -08:00
dztech
7cf3dd7b8d [Keyboard] add tofu_ii keyboard (#19118)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-12 18:38:15 -08:00
mechlovin
7578daaf16 [Keyboard] Add Olly Orion to QMK (#19134)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-12 18:37:35 -08:00
QMK Bot
a137edf5df Merge remote-tracking branch 'origin/master' into develop 2022-12-13 02:36:41 +00:00
Ramon Imbao
812468abb4 [Keyboard] Add the Gone Hacking Studio XLS (#19185)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-12 18:36:26 -08:00
Simon Fell
2792ee6573 [Keymap] superfell's custom keymap for the 0xc pad (#19196) 2022-12-12 18:36:05 -08:00
ebastler
29b8bbc4a0 [Keyboard] moved E80-1800 to data driven configuration (#19199)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-12 18:35:49 -08:00
QMK Bot
9a3df6e4e2 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:51:32 +00:00
TW59420
9c2703cab0 [Keyboard] add mw80 (#19223)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-12 15:50:04 -08:00
QMK Bot
84e0a17aae Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:49:02 +00:00
DeskDaily
291f988423 [Keyboard] Add Jisoo pcb (#19238)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-12 15:48:39 -08:00
Moses Hoyt
48a80a502d [Keyboard] Add Lagom keyboard (#19240)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-12 15:48:18 -08:00
Wolf Van Herreweghe
a5eaa461dc [Keyboard] Add Rama Works M60-B (#19248)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-12 15:48:01 -08:00
QMK Bot
b6a4923863 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:47:41 +00:00
DeskDaily
06593acc7d [Keyboard] Add Navi60 (#19253)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-12 15:47:40 -08:00
yiancar
89399b5494 [Keyboard] Crypt Macro (#19279)
Co-authored-by: yiancar <yiancar@gmail.com>
2022-12-12 15:47:08 -08:00
QMK Bot
35477a38b1 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:46:44 +00:00
dztech
15ef0a7e3c [Keyboard] add d45 lite keyboard (#19288)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-12-12 15:46:09 -08:00
QMK Bot
4b6d458f49 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:42:20 +00:00
mechlovin
68f550a3f2 [Keyboard] Add Zed65-monoLED and Zed65-Cor65 (#18872)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-12 15:41:06 -08:00
QMK Bot
b44317ff70 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:24:28 +00:00
T.Shinohara
6d0f944e5e Keyboard rura66 (#15853)
* add : BlackMask60 and MayShi.No30

* fix:spell miss

* change:keyboard name area

* change: default keymap

* 配列を自分用に変更

* MyKemap Update

* 構成変更

* Add RURA66 new keyboard

* remove additional files

* fix file

* fix info.json from rura66

* fix KC_LANG to KC_LNG from rura66

* Fix readme
- fix purchase URL
- adjust to the recent standard

* Fix rules.mk
- no backlight
- remove DIP switch/Bluetooth
- OLED_DRIVER_ENABLE -> OLED_ENABLE

* Fix rura66.h: add LICENSE

* Fix config.h
- UNUSED_PINS is deprecated
- accept suggestion on PR

* Fix oled_display.c
- remove snprintf()
- OLED_DRIVER_ENABLE->OLED_ENABLE
- oled_task_user() returns false

* Fix config.h
- no SPLIT_HAND_MATRIX_GRID
- no RGB Matrix

* move default keymap readme

* add VIA keymap

* Fix info.json
- Fix keyboard URL
- Change VID/PID

* Fix comments in rules.mk

* fix info.json keyboard url

Co-authored-by: yswallow <1426202+yswallow@users.noreply.github.com>
2022-12-12 15:23:54 -08:00
QMK Bot
ecdc768451 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 21:17:26 +00:00
xofyarg
25790fc886 [Keyboard] add ydpm40 keyboard (#19294) 2022-12-12 13:16:26 -08:00
QMK Bot
57aff7ff18 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 21:16:15 +00:00
precondition
454edf68d1 Tests that caps word stays active after use of OSL (#19303) 2022-12-12 22:16:12 +01:00
MJM
b8532d100d [Keyboard] Switch heliotrope from rgblight to rgb matrix (#19296) 2022-12-12 13:15:41 -08:00
Alabastard-64
008f1312bb Cleanup pmw3389.c (#19301) 2022-12-12 13:14:48 -08:00
jpe230
102f22f7e9 [Core] Quantum Painter - LVGL Integration (#18499)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-12-13 07:51:14 +11:00
QMK Bot
2d19e59d78 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 20:11:20 +00:00
lalalademaxiya1
1431f314a4 Add Keychron Q10 (#19127)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-12-13 07:10:32 +11:00
QMK Bot
598735a2b8 Format code according to conventions (#19305) 2022-12-12 17:02:15 +01:00
Albert Y
cbabc8dbe6 [Core] Replace Tapping Force Hold feature with Quick Tap Term (#17007)
* Replace Tapping Force Hold feature with Quick Tap Term

* Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0

* Deprecate force hold in info_config.json

* Before and after quick tap term unit tests

* Quick tap unit tests iteration

* Keymap config.h correction

* Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed

* Add two more test cases for quick tap

* Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2

* Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2

* Add function declaration for get_quick_tap_term

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-12-12 16:52:22 +01:00
QMK Bot
8698d109d7 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 05:22:01 +00:00
Luc
bf2ed0174b [Keymap] user dvorak_42_key ergodox_ez and crkbd keymaps (#19154)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
Co-authored-by: Luc W <lucw@airpost.net>
2022-12-11 21:21:23 -08:00
QMK Bot
7d51636581 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 05:17:53 +00:00
Christopher Bunn
96ba554ca8 [Keymap] lets_split: add mypetyak map (#19205) 2022-12-11 21:17:08 -08:00
Stefan Kerkmann
9dc3f79196 [RP2040] update i2c drivers to reflect peripheral number (#19277) 2022-12-11 14:04:29 +01:00
QMK Bot
f67f787cc2 Merge remote-tracking branch 'origin/master' into develop 2022-12-11 07:15:16 +00:00
QMK Bot
57f9a2ad6d [CI] Format code according to conventions (#19292) 2022-12-11 18:14:34 +11:00
QMK Bot
4b75b90f5c [CI] Format code according to conventions (#19293) 2022-12-11 18:14:18 +11:00
QMK Bot
c2687906d2 Merge remote-tracking branch 'origin/master' into develop 2022-12-11 07:00:52 +00:00
Ryan
7c72c5e436 sthlmkb/litl: fix layout macros (#19244) 2022-12-11 18:00:14 +11:00
QMK Bot
d9aab6f9c7 Merge remote-tracking branch 'origin/master' into develop 2022-12-11 04:06:12 +00:00
Wolf Van Herreweghe
608ed489de Update KC_BKSP->KCBSPC for default Ortho4x6 layout (#19290)
Co-authored-by: Wolf <contact@vwolf.be>
2022-12-11 15:05:23 +11:00
QMK Bot
c6ab70ef0d Merge remote-tracking branch 'origin/master' into develop 2022-12-11 02:35:40 +00:00
MJM
57351e4a37 [Keyboard] Add heliotrope Keyboard (#19170) 2022-12-10 18:35:06 -08:00
QMK Bot
0435381c91 Merge remote-tracking branch 'origin/master' into develop 2022-12-10 20:46:56 +00:00
Adam Lickel
143b7a3c3d [Keymap] Keeb.io Sinc - Lickel keymap update (#19188) 2022-12-10 12:46:24 -08:00
Joel Challis
1dd3e46336 Remove broken keymap/userspace (#19271) 2022-12-10 13:19:31 +11:00
Pablo Martínez
d9cba6e978 Add *_RIGHT configuration for PMW33XX driver (#19243) 2022-12-10 13:18:40 +11:00
Ryan
8c12559edb Add KPrepublic BM16A v2 (#19194) 2022-12-09 15:31:13 +11:00
Wolf Van Herreweghe
aa06a6e094 Minor lint fixes for various info.json (#19275) 2022-12-09 04:23:24 +00:00
QMK Bot
43870190af Merge remote-tracking branch 'origin/master' into develop 2022-12-09 03:33:24 +00:00
Joel Challis
89fdafc27d Refactor use of led_set_user within handwired/prime_exl (#19274) 2022-12-09 03:32:47 +00:00
QMK Bot
37ade41ad9 Merge remote-tracking branch 'origin/master' into develop 2022-12-09 02:16:18 +00:00
James Young
96cd333371 TGR Jane V2 CE Refactor (#19261) 2022-12-08 18:15:44 -08:00
QMK Bot
57bf060198 Merge remote-tracking branch 'origin/master' into develop 2022-12-09 01:43:01 +00:00
Joel Challis
99cd0b13e1 Refactor some led_set_kb instances (#19179)
* Refactor some led_set_kb instances

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-09 01:42:22 +00:00
Ryan
701747ad4f Teensy 3.5: do not restart USB stack after wakeup (#19269) 2022-12-09 01:41:22 +00:00
Joel Challis
9bc7e9afbd Initial uk+us DD keymap_extras migration (#19031) 2022-12-09 00:54:52 +00:00
Joel Challis
6133b08e73 Rework input_pressed_state docs (#19267)
* Revert changes to porting

* Update reference_info_json.md
2022-12-08 20:41:38 +00:00
QMK Bot
6ae0f83138 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 19:40:31 +00:00
James Young
ba6ee29040 fix LinWorks FAve84H keymaps (#19266)
Develop merge broke a previous refactor.
2022-12-08 19:39:54 +00:00
QMK Bot
29e0d440c3 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 17:15:43 +00:00
James Young
f4a4d841e5 Dactyl Manuform 4x5_5 Configurator Rendering Update (#18313) 2022-12-09 04:15:09 +11:00
QMK Bot
1786932d9f [CI] Format code according to conventions (#19265) 2022-12-09 04:10:52 +11:00
Jack Humbert
a23333eb58 Return USB HID GET_REPORT requests (#14814)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-12-09 04:08:36 +11:00
QMK Bot
dd93b17e96 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 17:02:38 +00:00
James Young
de92e8b3b0 Idobao ID80 V2: Partial Data-Driven Conversion (#19247) 2022-12-09 04:01:56 +11:00
QMK Bot
75a145af59 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:52:04 +00:00
James Young
e4f4e0a307 Aperture: fix Community Layout support (#19260) 2022-12-09 03:50:59 +11:00
James Young
069e6a259a Soda Cherish Refactor (#19259) 2022-12-09 03:50:34 +11:00
QMK Bot
769a4f830d Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:50:17 +00:00
Michael Stapelberg
9e103a2c58 kint36: do not restart USB stack after wakeup (#19077) 2022-12-09 03:49:58 +11:00
simchee
88d8817397 [Keymap] Add personal config for Kprepublic BM40HSRGB (#19186) 2022-12-09 03:49:22 +11:00
Jouke Witteveen
c9fe884b26 Moonlander: Add RGB LED layout map macro (#18745) 2022-12-09 03:48:58 +11:00
kopibeng
1df41e6db1 Add support for MNK65_STM32 (#18744)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-09 03:48:42 +11:00
QMK Bot
56e907b16e Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:48:34 +00:00
peepeetee
5447b075f9 [Keyboard] Add momokai tap duo (#19042) 2022-12-09 03:47:38 +11:00
QMK Bot
d9a64d950f Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:45:45 +00:00
Ruslan Sayfutdinov
85ee55ff3b Detect host OS based on USB fingerprint (#18463)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-12-09 03:45:30 +11:00
adophoxia
fa56e51894 Add support for Keychron Q4 (#19048) 2022-12-09 03:45:10 +11:00
QMK Bot
e06f50c489 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:44:03 +00:00
lalalademaxiya1
1215fc2a78 Update Q1 and Q2 for keychron (#18713)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jpe230 <pablin.123.ra@gmail.com>
2022-12-09 03:43:28 +11:00
QMK Bot
5a2ed77a08 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:31:37 +00:00
Joel Challis
6e6039995b Add lint check for keyboard/keymap license header (#19215) 2022-12-09 03:31:02 +11:00
QMK Bot
c2aa0f67ec Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:15:43 +00:00
Mikhail Nosov
071268633d [Keyboard] Fix CapsLock pin for ymdk/ymd75/rev3 (#19158) 2022-12-09 03:13:53 +11:00
Wolf Van Herreweghe
c6e291c416 Revert RESET-> QK_BOOT in Read Me files where applicable (#19262) 2022-12-09 03:12:49 +11:00
QMK Bot
beaea2eb0d Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:11:25 +00:00
syntax-magic
261e7668c6 Added mouse clicks to RBG layer (#19105)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
2022-12-09 03:09:43 +11:00
dexter93
f2a8a13dba Core: Support inverted scan logic for optical switches (#19053) 2022-12-09 03:09:01 +11:00
QMK Bot
6668a0adb0 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:08:30 +00:00
4pplet
d30bf44a60 Add AEKISO60 rev B (#19074)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-12-09 03:07:54 +11:00
ForsakenRei
53423f0369 KC_GESC -> QK_GESC for cn and ja Docs (#19024) 2022-12-09 03:03:33 +11:00
lokher
0d7edbbcbe Fixed NKRO issue caused by HID_SET_PROTOCOL on Chibios platform (#17588) 2022-12-09 02:56:36 +11:00
QMK Bot
6866466b07 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 15:54:53 +00:00
tarneo
ebcbbfc1e8 correct config for supersplit and add keymap (#18927) 2022-12-09 02:54:19 +11:00
QMK Bot
5d8ece1b3d Merge remote-tracking branch 'origin/master' into develop 2022-12-08 13:35:08 +00:00
Ryan
acca2eb963 Fix build failures for aurora/lily58 and sweep (#19258) 2022-12-08 13:34:32 +00:00
QMK Bot
d4ead8783c Merge remote-tracking branch 'origin/master' into develop 2022-12-07 21:02:49 +00:00
Jordan Duabe
bb3d694875 [Keyboard] Add NCR-80 (#19130) 2022-12-07 13:02:05 -08:00
QMK Bot
2183eda7ac Merge remote-tracking branch 'origin/master' into develop 2022-12-07 18:00:05 +00:00
Ryan
405aa7b2ed Fix keyboard for some JSON keymaps (#19251) 2022-12-07 17:59:23 +00:00
QMK Bot
25b9e34fbe Merge remote-tracking branch 'origin/master' into develop 2022-12-07 15:57:26 +00:00
James Young
760e5c2ee1 ASK55: correct layout data (#19252) 2022-12-07 15:56:21 +00:00
QMK Bot
8cba1d3297 Merge remote-tracking branch 'origin/master' into develop 2022-12-06 21:44:52 +00:00
dependabot[bot]
3fa1e8e273 Bump anothrNick/github-tag-action from 1.53.0 to 1.54.0 (#19246)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-07 08:44:19 +11:00
QMK Bot
71c1ca47db Merge remote-tracking branch 'origin/master' into develop 2022-12-06 15:58:25 +00:00
leah-splitkb
0e93b0d59b [Keyboard] Add splitkb.com's Aurora Lily58 (#19183) 2022-12-06 15:57:50 +00:00
Xelus22
0b1d5497fc [Keyboard] Refactor xs60 with soldered and hotswap version (#19049)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-06 00:32:25 -08:00
QMK Bot
76c69f35c5 Merge remote-tracking branch 'origin/master' into develop 2022-12-05 19:32:26 +00:00
dependabot[bot]
2709b6ed61 Bump anothrNick/github-tag-action from 1.52.0 to 1.53.0 (#19242)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.52.0 to 1.53.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.52.0...1.53.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-05 19:31:20 +00:00
QMK Bot
1fd2ef2bcb Merge remote-tracking branch 'origin/master' into develop 2022-12-05 02:33:15 +00:00
Joel Challis
92fadf0110 Ensure info.json layout macros are somewhat valid (#19236) 2022-12-05 02:32:40 +00:00
QMK Bot
3bf0a10990 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 21:04:18 +00:00
mechlovin
92354b2ca8 [Keyboard] Add Olly_Octagon PCB to QMK (#19128)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-04 21:03:41 +00:00
QMK Bot
db4934f922 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:58:50 +00:00
Charly Delay
af14b212b9 Re-structure splinky support to handle versioning in the same fashion as for the teensy (#19123) 2022-12-04 20:58:12 +00:00
QMK Bot
41b1f7283b Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:48:35 +00:00
mechlovin
ea1a6975a8 [Keyboard] Add ISO layout support for Zed60 PCB (#19204)
* add iso layout

* Update zed60.h
2022-12-04 20:47:56 +00:00
QMK Bot
b4073e11e1 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:44:02 +00:00
David Kühling
2f92880578 dqz11n1g: Documentation improvement. (#19230)
Co-authored-by: David <dvdkhlng@posteo.de>
2022-12-04 20:43:28 +00:00
QMK Bot
9e757ea5d0 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 18:53:44 +00:00
dztech
4d1b1bc534 [Keyboard] add kbdpadmk3 (#18795)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-04 10:53:08 -08:00
QMK Bot
dd252ebb55 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 09:35:58 +00:00
gshmu
1dd77d9944 [Keymap] gshmu keymap for lily58 (#19040) 2022-12-04 01:35:23 -08:00
QMK Bot
3af6fb5d0f Merge remote-tracking branch 'origin/master' into develop 2022-12-04 09:26:59 +00:00
lalalademaxiya1
d878edfaad [Keyboard] Add Keychron Q8 (#19126) 2022-12-04 01:26:27 -08:00
QMK Bot
76a8778672 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 09:22:54 +00:00
dztech
ee772ad165 [Keyboard] add odinmini keyboard (#19111)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-04 01:22:21 -08:00
QMK Bot
45c288d5b1 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 07:17:06 +00:00
micros24
6af12001eb [Keymap] KBDFans Tiger80 Keymap (#19148)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Jasper Jan O. Solee <jjosolee@mymail.mapua.edu.ph>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-03 23:16:34 -08:00
Andrew Kannan
f288a3bb3b [Keyboard] Add Ortho60 v2 Keyboard (#18890)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-03 23:15:44 -08:00
Andre Brait
f32070bfef [Keymap] Change DEBOUNCE_TYPE to sym_eager_pk to reduce latency (#19153) 2022-12-03 22:56:04 -08:00
QMK Bot
004ca55011 Merge remote-tracking branch 'origin/master' into develop 2022-12-03 20:05:56 +00:00
mechlovin
03d7c31e6c [Keyboard] Change indicator LED state on Kay60 (#19182) 2022-12-03 12:05:23 -08:00
Joel Challis
32dabd5320 Align new-keymap with new-keyboard (#19229) 2022-12-03 12:04:06 +00:00
Joel Challis
82760bcea6 Apply suggested workaround for #18371 (#19226)
Fixes undefined
2022-12-03 11:42:54 +11:00
Joel Challis
4540f52e98 Revert WB32 ISO workaround (#19224) 2022-12-03 09:07:16 +11:00
QMK Bot
68c54d846d Merge remote-tracking branch 'origin/master' into develop 2022-12-02 10:56:12 +00:00
Nick Brassel
cf3c26533c Fixup EFL and F4's sector selection. (#19221) 2022-12-02 21:55:28 +11:00
QMK Bot
e85439eb04 Merge remote-tracking branch 'origin/master' into develop 2022-12-02 05:38:02 +00:00
Ryan
f98a7e8ffe Fix RGB_MATRIX_LED_COUNT for aurora/corne (#19222) 2022-12-02 16:36:47 +11:00
QMK Bot
e68eb2f4ad Merge remote-tracking branch 'origin/master' into develop 2022-12-01 22:13:43 +00:00
Drashna Jaelre
0e8d22e2b7 [Keyboard] Fix config error for Charybdis (#19219) 2022-12-01 22:12:35 +00:00
Drashna Jaelre
50661ab65c Remove RGBLIGHT_ANIMATIONS from core (+cleanup) (#19216) 2022-12-01 13:06:45 -08:00
QMK Bot
9c320bc558 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 23:31:14 +00:00
HorrorTroll
e9d5967a93 [Keyboard] Add keyboard Caticorn (#19138) 2022-11-30 15:30:41 -08:00
QMK Bot
9ebd6eacd5 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 23:28:49 +00:00
tsubuan_145
3f98542e52 Add meow48 ver.1.0 keyboard (#19217)
just make the PRs stop
2022-11-30 23:28:17 +00:00
Joel Challis
3e59bbd731 Automate "Data Driven" migrations (#17820) 2022-11-30 20:08:54 +00:00
QMK Bot
12e4a36db7 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 19:21:17 +00:00
Commander1024
402d3d8a86 [Keyboard] Daskeyboard4 (#18675)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-30 11:20:45 -08:00
QMK Bot
b4f6a329d4 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 17:48:56 +00:00
Pablo Martínez
a5c2eea6c1 Update OLED doc (#19213)
* Update OLED doc

* Update docs/feature_oled_driver.md

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2022-11-30 17:48:23 +00:00
QMK Bot
3274a80189 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 07:06:35 +00:00
Moses Hoyt
5ff7f289f2 [Keyboard] Add Litl keyboard (#19000)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-29 23:06:01 -08:00
QMK Bot
102c7665f4 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 06:54:22 +00:00
IFo Hancroft
38a153b143 [Keymap] Fixed ifohancroft Swap Hands Config (#19176) 2022-11-29 22:52:44 -08:00
QMK Bot
798d6a1c68 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 06:52:25 +00:00
Adam Lickel
3d091f4a9d Keeb.io Sinc: Enable Split LED state (#19187) 2022-11-29 22:52:10 -08:00
Manna Harbour
0b29af1019 [Keymap] Update Miryoku (#19190) 2022-11-29 22:51:49 -08:00
QMK Bot
f7095283e8 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 06:39:59 +00:00
Joel Challis
5d516ac2e2 Ignore some layout macro names from lint (#19207) 2022-11-30 06:39:41 +00:00
Joel Challis
739d4ad2fb Add some community layouts to 40percentclub boards (#19209) 2022-11-30 06:39:27 +00:00
QMK Bot
b2c8e59cc1 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 06:38:33 +00:00
Joel Challis
2d45e5e4b4 Add ortho_3x3 community layout (#19210) 2022-11-30 06:38:02 +00:00
QMK Bot
891734e2d3 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 06:18:38 +00:00
Joel Challis
e0d0d81dfa Add missing default_ortho_5x5 keymap (#19208) 2022-11-30 06:18:05 +00:00
QMK Bot
3fffdf4c71 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 06:03:51 +00:00
Joel Challis
bb4f094a08 Fix bad bootmagic config (#19206) 2022-11-30 17:03:19 +11:00
QMK Bot
370c02cb9a Merge remote-tracking branch 'origin/master' into develop 2022-11-30 04:28:46 +00:00
Joel Challis
17fec52b0f Extend layout lint checks (#19200)
* Extend layout lint checks

* Apply suggestions from code review

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

* Fix function comment

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-30 04:27:48 +00:00
Joel Challis
c952458c78 DD bootmagic config (#19201)
* DD bootmagic config

* Also enable

* docs
2022-11-30 04:27:21 +00:00
QMK Bot
20b901366a Merge remote-tracking branch 'origin/master' into develop 2022-11-30 02:46:25 +00:00
Joel Challis
4a0aa9ada2 Fix headers in info.json reference (#19202) 2022-11-30 02:45:51 +00:00
QMK Bot
4d74839d35 Merge remote-tracking branch 'origin/master' into develop 2022-11-30 01:01:46 +00:00
Albert Y
90fe668dd9 Enable bootmagic (#19191) 2022-11-30 01:01:10 +00:00
QMK Bot
d648eb42ca Merge remote-tracking branch 'origin/master' into develop 2022-11-29 19:44:26 +00:00
Drashna Jaelre
4a87af0e9a [Keymap] Drashna updates for 0.19 (#19175)
* Fix up bastardkb boards since blackpill support is officially added.
  * Check for blackpill version, not elite c.
  * Add checks in chibiOS config since multiple ARM controllers supported.
  * Rework rules.mk for keymaps to better handle arm vs avr support
* Start moving away from `matrix_*_*` functions.
  * `housekeeping_task_*` instead of `matrix_scan_*`
  * `keyboard_(pre|post)_init_*` instead of `matrix_init_*` 
* Add ℂℴmⅈℂ unicode input method.
* Clean up unicode code to be more compact and flexible.
* Remove/move Pro Micro LED commands to userspace and better filter them
* Fixup OLED code
  * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation
  * Make unicode mode render much more compact/simple.
* Make qmk secrets more self contained
* Remove custom implementation of split watchdog
2022-11-29 11:43:42 -08:00
QMK Bot
c146563f4b Merge remote-tracking branch 'origin/master' into develop 2022-11-29 16:35:30 +00:00
Ryan
8a8000b4ec Fix Czech sendstring LUT (#19193) 2022-11-29 16:34:57 +00:00
JayceFayne
9ddb0165a4 fix typo (#19189) 2022-11-29 16:34:20 +00:00
Joel Challis
393a37c012 Update files changed action (#19172) 2022-11-28 20:04:04 +00:00
Felix Kuehling
4ae7525923 Bug17281 - Retain momentary layers until the end of tapping (#17282)
* Make process_tapping more readable

Move most #ifdefs into conditionally defined macros to make the logic
easier to follow.

* Retain momentary layers until the end of tapping

This allows mod-tap and layer-tap keys on layers to behave as expected.

Bug: https://github.com/qmk/qmk_firmware/issues/17281

* Add tests for delayed mod/layer release while tapping

Mods and layer key release is delayed while tapping is in progress to
ensure that the tap is registered with the modifier state and on the
layer where the key was first pressed.

Signed-off-by: Felix Kuehling <felix.kuehling@gmail.com>
2022-11-28 09:16:38 +01:00
QMK Bot
baf573a144 Merge remote-tracking branch 'origin/master' into develop 2022-11-28 05:47:14 +00:00
Ryan Baker
d27b852fcc new keyboard rb1 (#18164)
* rb1

* Update keymap.c

* Update keyboards/ryanbaekr/rb1/info.json

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

* Delete rb1.c

* Delete rb1.h

* Update keyboards/ryanbaekr/rb1/config.h

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

* Update keyboards/ryanbaekr/rb1/config.h

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

* Update keyboards/ryanbaekr/rb1/config.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-28 05:46:40 +00:00
QMK Bot
7e27e5e9c8 Merge remote-tracking branch 'origin/master' into develop 2022-11-28 05:26:50 +00:00
gshmu
690eb4a453 Fix RWIN typo within keycode list (#19155)
fix typo
2022-11-28 05:25:56 +00:00
QMK Bot
af703e6c0a Merge remote-tracking branch 'origin/master' into develop 2022-11-28 02:08:59 +00:00
Ndot
5a3770d363 [Docs] Update reference_info_json.md (#18817)
* [Docs] Update reference_info_json.md

- Makes it easier to find keyboard.jsonschema.
- Adds a reference to the Data Driven page.

* Update docs/reference_info_json.md

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-28 02:08:27 +00:00
QMK Bot
1c2669f801 Merge remote-tracking branch 'origin/master' into develop 2022-11-28 02:04:41 +00:00
Leo Lou
cbedec64a4 Add piantor (#18920)
* Add piantor

* Update keyboards/beekeeb/piantor/readme.md

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-28 02:03:58 +00:00
Gabriele Musco
d915ab59ac Add udev rule for the WB32 DFU bootloader (#19135)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-28 09:13:25 +11:00
Nick Brassel
f3620b9ad0 Branch point for 2023q1 Breaking Change 2022-11-28 07:57:51 +11:00
Nick Brassel
4020674163 Merge remote-tracking branch 'upstream/develop' 2022-11-28 07:54:00 +11:00
Nick Brassel
9e78e65a56 2022 Nov 26 changelog. (#19164)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-28 07:33:55 +11:00
Joel Challis
0ab03f8fbc Fix API errors in handwired/tractyl_manuform/5x6_right/arduinomicro (#19166) 2022-11-27 02:07:07 +00:00
Joel Challis
cb57ec9c02 Revert lib/usbhost changes (#19165) 2022-11-27 02:05:04 +00:00
Christopher Hoage
9b51f02f45 Fix encoder_init call order in keyboard_init (#19140) 2022-11-27 10:07:35 +11:00
Ryan
e12ca14af8 Change RGB_MATRIX_STARTUP_* defines to RGB_MATRIX_DEFAULT_* (#19079) 2022-11-27 04:18:24 +11:00
Nick Brassel
ad7b095da6 Fixup installation procedure for different Fedora versions. (#19159) 2022-11-27 04:16:08 +11:00
Ryan
1e95f7be8f Joystick feature improvements (#19052) 2022-11-27 03:14:45 +11:00
Ryan
a5a20cc792 Change LED_MATRIX_STARTUP_* defines to LED_MATRIX_DEFAULT_* (#19080) 2022-11-27 03:14:35 +11:00
QMK Bot
2582992381 Merge remote-tracking branch 'origin/master' into develop 2022-11-25 17:32:45 +00:00
Ryan
8f9b49dc5b Fix build failures for bastardkb/tbk and jels/boaty (#19152) 2022-11-25 17:31:58 +00:00
QMK Bot
8a906d7fd5 Merge remote-tracking branch 'origin/master' into develop 2022-11-25 04:29:59 +00:00
Joel Challis
6ed605a614 Fix annepro2/c18:iso_default (#19147) 2022-11-25 15:29:20 +11:00
Joel Challis
59443fa970 jsonify some info.json (#19146) 2022-11-25 02:47:02 +00:00
jack
3209c7a42c Fixup aurora/corne on develop (#19144) 2022-11-24 18:50:17 +11:00
Joel Challis
af6aa225eb Additional DD backlight config (#19124)
* Additional dd backlight config

* Update docs
2022-11-23 18:48:22 +00:00
Drashna Jael're
b494bc4459 Merge remote-tracking branch 'origin/master' into develop 2022-11-23 10:15:28 -08:00
Adam Price
558ab18611 [Keymap] komidore64 planck rev6 (#19036)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-23 10:12:36 -08:00
Joel Challis
dfa53900dc Publish constants metadata to API (#19143)
* Publish metadata

* Ensure content is sorted
2022-11-23 18:01:07 +00:00
leah-splitkb
535dd84691 [Keyboard] Add splitkb.com's Aurora Corne (#18880) 2022-11-23 09:12:50 +00:00
Nick Brassel
bebfdad795 NVRAM refactor, phase 1. (#18969)
* Rename `eeprom_stm32` to `eeprom_legacy_emulated_flash`.

* Rename `flash_stm32` to `legacy_flash_ops`.

* Rename `eeprom_teensy` to `eeprom_kinetis_flexram`.
2022-11-23 08:50:19 +00:00
spbgzh
8b1069f15a [Add function] add 'Split Space and ISO and delete RGUI for Promise 87 (#18929)
* add split space and ISO

* Update wkl.h

* update ISO

* update

* change KC_LGUI to KC_RGUI

* delete RGUI

* format

* update promise87 readme.md

* update promise87 wkl readme.md

* Update readme.md

* Update readme.md

* change KC_SLCK to KC_SCRL

* wuque/promise87/ansi: standardize Layout Macro names

- rename `LAYOUT_tkl_f13_ansi` to `LAYOUT_tkl_f13_ansi_tsangan`
- convert `LAYOUT_tkl_f13_ansi_iso` to `LAYOUT_tkl_f13_iso_tsangan` (adds position `K41`)
- rename `LAYOUT_tkl_f13_ansi_split_space` to `LAYOUT_tkl_f13_ansi_tsangan_split_space`
- rename `LAYOUT_tkl_f13_ansi_split_bs` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs`
- rename `LAYOUT_tkl_f13_ansi_split_lshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_lshift`
- rename `LAYOUT_tkl_f13_ansi_split_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_rshift`
- rename `LAYOUT_tkl_f13_ansi_split_bs_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift`

* wuque/promise87/wkl: refactor LAYOUT_tkl_f13_ansi_wkl_iso

Refactors `LAYOUT_tkl_f13_ansi_wkl_iso` into `LAYOUT_tkl_f13_iso_wkl` by adding position `K41` (Non-US Backslash) to the layout macro.

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-11-22 12:56:48 -08:00
jack
bfdc761819 initial (#19137) 2022-11-22 23:19:38 +11:00
Joel Challis
3b11e98215 Update use of legacy keycodes (#19120) 2022-11-22 22:07:47 +11:00
zvecr
ab17d34dbd Merge remote-tracking branch 'origin/master' into develop 2022-11-22 02:48:11 +00:00
Nick Brassel
06a3801a27 Update .gitignore (#19132) 2022-11-22 13:32:36 +11:00
zvecr
08805cada0 Stub next develop dates 2022-11-22 01:27:15 +00:00
dztech
9291c8f867 [Keyboard] add og60 keyboard (#19114)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-20 20:17:09 -08:00
Joel Challis
fe577daf96 Remove .noci functionality (#19122) 2022-11-21 02:03:38 +00:00
Joel Challis
e451703680 Merge API update workflow (#19121) 2022-11-21 02:03:17 +00:00
Charly Delay
2b0a3cd2f1 Bastard Keyboards: upstream recent changes (#19083)
Co-authored-by: Simian <alex@Mandelbrot>
Co-authored-by: Charly Delay <0xcharly@users.noreply.github.com>
Co-authored-by: Alex Baldwin <alexbaldwin42@gmail.com>
2022-11-20 12:34:42 -08:00
Xelus22
127a70b6ca [Keyboard] Add Satellite Rev1 (#18869)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-20 10:24:25 -08:00
rafal0p
852952cfd8 Use modern solution for tri-layer in sofle default layout (#19113) 2022-11-20 17:23:41 +00:00
QMK Bot
c96d9d3508 Merge remote-tracking branch 'origin/master' into develop 2022-11-20 17:22:58 +00:00
CoffeeIsLife
ca693d7f9b [Keymap] Add home and end keys to coffee's bm40hsrgb keymap (#19108)
Co-authored-by: Fae <faenkhauser@gmail.com>
2022-11-20 09:22:25 -08:00
Drashna Jael're
4597e01061 Merge remote-tracking branch 'origin/master' into develop 2022-11-20 09:20:46 -08:00
jack
6c40a46057 Fixup keychron/q5 (#19119) 2022-11-20 14:30:40 +00:00
Jesus Climent
6f8bbb1632 [Keyboard] Small fixes for the Atreyu rev1 keyboard (#19098) 2022-11-20 00:57:13 -08:00
Hayley
eb63857237 [Keymap] Fix ducky one 2 sf fn layer mappings (#18955) 2022-11-20 00:54:48 -08:00
spbgzh
62160193f0 [Keyboard] change RGBLED_NUM to 20 for zoom87 (#18930)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-20 00:53:38 -08:00
mmccoyd
543a863766 [Keyboard] Move Hillside out of handwired (#18751)
Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
2022-11-20 00:50:09 -08:00
jack
0489739351 [Keyboard] Fix up Boaty (#19117) 2022-11-20 00:49:34 -08:00
JX
f5ca82854b [Keyboard] Add YR80 (#18945)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-20 00:29:02 -08:00
Lex Brugman
66e4add972 [Keyboard] Add support for KBDfans Odin V2 (#18910) 2022-11-20 00:28:35 -08:00
Daniel Shields
6de4870ee0 [Keyboard] Add layer tap keys to dshields keymaps. (#18953) 2022-11-20 00:27:45 -08:00
Xelus22
26db668878 [Keyboard] EXT65 rev3 support (#18873) 2022-11-20 00:27:24 -08:00
bwprobably
0420a74d4c [Keyboard] Add hardwired Dactyl macropad (#18761)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-20 00:27:10 -08:00
QMK Bot
7357426bc3 Merge remote-tracking branch 'origin/master' into develop 2022-11-20 08:24:43 +00:00
Joe Scotto
f0454c9682 [Keyboard] Add ScottoStarter Keyboard (#18626)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-20 00:24:11 -08:00
QMK Bot
473580d0ef Merge remote-tracking branch 'origin/master' into develop 2022-11-20 08:15:54 +00:00
TW59420
41399b1779 [Keyboard] add mw660 keyboard (#18849)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-20 00:15:16 -08:00
QMK Bot
deca2069dc Merge remote-tracking branch 'origin/master' into develop 2022-11-20 07:32:08 +00:00
Xelus22
e172148e46 [Keyboard] Add XS108 (#19112)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-19 23:31:02 -08:00
QMK Bot
4b99336c4b Merge remote-tracking branch 'origin/master' into develop 2022-11-20 05:38:05 +00:00
lalalademaxiya1
0f6a4edfb2 [Keyboard] Keychron Q5 (#18283)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-19 21:37:23 -08:00
QMK Bot
8c3d9c6006 Merge remote-tracking branch 'origin/master' into develop 2022-11-20 05:15:52 +00:00
Patrick Muldoon
525b472d88 Fix Typo in Saevus Cor Matrix (#19073) 2022-11-20 16:15:16 +11:00
QMK Bot
b774cb34f8 Merge remote-tracking branch 'origin/master' into develop 2022-11-20 03:46:49 +00:00
Sleepdealer
e5e186c516 [Keyboard] Add WITF (#18922)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-19 19:46:12 -08:00
QMK Bot
57956f506b Merge remote-tracking branch 'origin/master' into develop 2022-11-19 23:41:46 +00:00
coffeeyy
37c271460a [Keyboard] annepro2: fix bluetooth multi-pairing issue (#17483) 2022-11-20 10:40:52 +11:00
QMK Bot
0984cb8ca5 Merge remote-tracking branch 'origin/master' into develop 2022-11-19 21:52:34 +00:00
Yizhen Liu
becd7e5975 [Keyboard] GrayStudio Aero75 Hotswap (#18883)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-19 13:51:59 -08:00
Drashna Jael're
3d72be0637 Merge remote-tracking branch 'origin/master' into develop 2022-11-19 13:44:25 -08:00
Elliot Powell
ede2b4155d [Keyboard] Add keebsforall freebird75 (#18653)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-19 13:39:16 -08:00
jels
e165407957 [Keyboard] Add Boaty (#17378)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jels02 <joah@Joah-Big-PC.localdomain>
2022-11-19 11:43:59 -08:00
nopunin10did
0bf72e4fe5 [Keyboard] Add Jabberwocky v2 and reorganize (#19014)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-19 11:35:35 -08:00
Pablo Martínez
fe652e6247 Fix references to mouse_report_t (which doesnt exist) (#19107) 2022-11-18 15:19:45 +00:00
QMK Bot
8449a4a11f Merge remote-tracking branch 'origin/master' into develop 2022-11-18 02:17:25 +00:00
Joel Challis
5d882ab6ef Disable onekey console by default (#19104) 2022-11-18 02:16:38 +00:00
Selene ToyKeeper
31fb55ae7b fixed MOUSEKEY_INERTIA on AVR (#19096)
Co-authored-by: Selene ToyKeeper <git@toykeeper.net>
2022-11-16 13:46:11 -08:00
QMK Bot
63377c8c57 Merge remote-tracking branch 'origin/master' into develop 2022-11-16 17:24:03 +00:00
Charly Delay
d86c0d3723 Use keyboard_pre_init_kb(void) at keyboard level (#19091) 2022-11-16 09:23:21 -08:00
QMK Bot
dda3a901ea Merge remote-tracking branch 'origin/master' into develop 2022-11-16 07:08:26 +00:00
Charly Delay
d6956668e3 Specify DEFAULT_FOLDER for v2/splinky (#19093) 2022-11-16 18:07:51 +11:00
Joel Challis
57ac917b43 Extend eeconfig kb/user datablock API (#19094) 2022-11-16 18:06:49 +11:00
Ryan
81a6407dca Update more DRIVER_LED_TOTAL defines to RGB_MATRIX_LED_COUNT (#19089) 2022-11-16 05:59:09 +11:00
QMK Bot
5dabc1b387 Merge remote-tracking branch 'origin/master' into develop 2022-11-15 18:41:13 +00:00
Albert Y
df5689ed06 [Docs] Note default value for TAP_CODE_DELAY (#19078) 2022-11-15 10:40:28 -08:00
QMK Bot
d2888162b4 Merge remote-tracking branch 'origin/master' into develop 2022-11-15 17:23:44 +00:00
bghull
538dbb5b8e Personal keymap updates (#18763)
* Latest updates

* Aligning and cleaning up planck and babyv layouts

* Added license, cleaned up errors
2022-11-15 17:23:03 +00:00
QMK Bot
64b744e5be Merge remote-tracking branch 'origin/master' into develop 2022-11-15 16:58:09 +00:00
trguhq
cadf18c6d3 Planck unicode rune layout (#18674)
* Furthark layout
2022-11-15 16:57:09 +00:00
QMK Bot
9974978909 Merge remote-tracking branch 'origin/master' into develop 2022-11-15 16:55:25 +00:00
Leon Anavi
7e843d0eca keyboards/anavi: Add ANAVI Knob 1 (#18623)
ANAVI Knob 1 is a mini mechanical keyboard with a clickable rotary
encoder, USB-C, RP2040 microcontroller and I2C slot for a display.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2022-11-15 16:54:45 +00:00
QMK Bot
4de3f53984 Merge remote-tracking branch 'origin/master' into develop 2022-11-15 16:54:38 +00:00
David Kosorin
c21b77fbd2 Fix typo (#19035)
Swap Hands on/off - it's `SH_ON/OFF` not `SW_ON/OFF`
2022-11-15 16:53:57 +00:00
Ryan
de66797705 Fix some old keycodes (#19086) 2022-11-15 16:52:01 +00:00
QMK Bot
594f869619 Merge remote-tracking branch 'origin/master' into develop 2022-11-15 09:34:22 +00:00
Xelus22
4e7f533998 [Keyboard] Add Constellation Rev3 (#18868)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-15 01:33:58 -08:00
Sean Jasin
ed70f42638 [Keyboard] change BT LEDs so no longer hard coded in Anne Pro (#18934) 2022-11-15 01:33:37 -08:00
QMK Bot
4238d49efe Merge remote-tracking branch 'origin/master' into develop 2022-11-15 08:52:19 +00:00
Charly Delay
30b2dbe369 Bastard Keyboards: upstream recent changes (#18903)
* bastardkb: cleanup blackpill configuration

Fixes #17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes #15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes #20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
2022-11-15 08:51:44 +00:00
Drashna Jaelre
1a3f2130d5 Revert "Add pointing device support to data driven config (#18215)" (#19063) 2022-11-15 17:44:09 +11:00
jack
05540eb668 Fixup handwired/alcor_dactyl (#19072) 2022-11-14 15:44:07 +00:00
Drashna Jael're
bed5e1abf5 Merge remote-tracking branch 'origin/master' into develop 2022-11-13 17:51:56 -08:00
Joel Challis
0719d68b20 Add default limit to OLED dirty processing (#19068) 2022-11-14 01:49:58 +00:00
David Hoelscher
a42ab90220 Add Bonsai C4 as a platform board file (#18901)
* Set up Bonsai C4 as a platform board file

* corrections and improvements based on testing and feedback

* Added VBUS sensing as default capability for improved split support using Bonsai C4

* Update clock divisor for SPI flash

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-11-13 23:59:01 +00:00
jack
7901ba431a Fixup keychron/q6 (#19066) 2022-11-14 09:49:06 +11:00
jack
ee7426e7b1 Fixup day_off (#19067) 2022-11-14 09:48:31 +11:00
jack
a30964b3c5 Add missing manufacturer fields (#19065) 2022-11-14 09:40:51 +11:00
QMK Bot
3bf8e9c9bb Merge remote-tracking branch 'origin/master' into develop 2022-11-13 16:59:11 +00:00
Nick Brassel
3f579c5ef3 Cleanup. (#19061) 2022-11-14 03:58:37 +11:00
Joel Challis
9a488a44f6 Fix up laser_ninja/pumpkin_pad (#19060) 2022-11-14 03:37:07 +11:00
nicknimchuk
c1ef943ce0 Add missing prototype for get_hold_on_other_key_press to resolve #18855 (#19056)
Closes undefined
2022-11-14 03:34:59 +11:00
Nick Brassel
d627609f5e Fixup. (#19059) 2022-11-13 16:31:47 +00:00
Joel Challis
e273df8b93 Fix duplicate key in keyboard.jsonschema (#19058) 2022-11-14 03:31:29 +11:00
QMK Bot
83477bfa0f Merge remote-tracking branch 'origin/master' into develop 2022-11-13 16:07:40 +00:00
Klesh Wong
133fe1c013 fix: mousekey doesn't work with trackpoint (#18474)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-11-14 03:07:08 +11:00
Drashna Jaelre
d3073ef494 Add pointing device support to data driven config (#18215)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-14 03:05:46 +11:00
Drashna Jaelre
8812872794 Only trigger encoder callbacks on primary side (#18467)
Co-authored-by: zvecr <git@zvecr.com>
2022-11-14 02:51:19 +11:00
Richard Nash
4c1d8a0eb3 Fix oled_render to render all dirty blocks. (#18887) 2022-11-14 02:49:59 +11:00
QMK Bot
81bf60a636 Merge remote-tracking branch 'origin/master' into develop 2022-11-13 01:13:00 +00:00
lalalademaxiya1
6c4e6a86f7 [Keyboard] Keychron Q6 (#18288)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-12 17:12:20 -08:00
Drashna Jael're
731633e133 Merge remote-tracking branch 'origin/master' into develop 2022-11-12 17:10:04 -08:00
arcmags
2e39647618 [Keyboard] add 60_ansi layout to dz60rgb_ansi rules.mk (#18664) 2022-11-12 17:02:18 -08:00
fgoodwin
f3ea6591db [Keyboard] Add Dactyl Manuform 5x6 with 6 thumb cluster (#18845)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-12 17:01:38 -08:00
Brandon Burgess
d4b6678e99 [Keyboard] Add Dayoff60 (#17640)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-12 17:00:35 -08:00
Rocco Meli
317b800bbb [Keymap] Update/refactor userspace and add keymaps for rmeli (#18398)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Elliot Powell <johnp8727@gmail.com>
2022-11-12 17:00:13 -08:00
Andrew Kannan
ddcb8dd7ca [Keyboard] Add Serenity PCB (#18705)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-12 16:59:17 -08:00
Ethan Johnston
cd682ad8b7 [Keyboard] Add Handwired alcor dactyl (#18586)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-12 16:58:56 -08:00
Ryan
6cc9513ab0 Digitizer feature improvements (#19034) 2022-11-12 23:28:11 +00:00
jels
b7c6d6d79f [Keyboard] Add pumpkin pad (#18897)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-12 14:56:21 -08:00
Ryan
8cecf7fad8 onekey: disable NKRO and mousekeys by default (#19038) 2022-11-12 03:20:44 +00:00
Drashna Jaelre
1caedd10c4 Don't clear keys on layer change unless STRICT_LAYER_RELEASE is enabled (#18577)
* Don't clear mousekeys unless clearing keys

* Revert "Don't clear mousekeys unless clearing keys"

This reverts commit 29a0c06b54.

* Just don't clear anything on layer set

* Fix lint

* Enable test?
2022-11-12 02:11:50 +00:00
Nick Brassel
092228571c Move EFL wear-leveling driver to be default for F1, F3, F4, L4, G4, WB32, GD32V. (#19020) 2022-11-11 23:57:44 +00:00
Eric Gebhart
050472a4d0 Eric Gebhart user space and keymaps (#17487)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-11 23:09:41 +00:00
QMK Bot
8c6d2946f7 Merge remote-tracking branch 'origin/master' into develop 2022-11-11 23:08:08 +00:00
IFo Hancroft
49a78b8114 Ifohancroft HotDox76v2 keymap (#19030)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-11-11 23:07:20 +00:00
Ryan
20ed138236 LED config fixes (#18973) 2022-11-11 12:15:19 +11:00
jack
dad5262425 Fixup WS2812 vendor driver (#19028) 2022-11-11 09:38:13 +11:00
jack
159ec766f7 Fixup bn006 on develop (#19029) 2022-11-11 09:37:10 +11:00
QMK Bot
d796a84b72 Merge remote-tracking branch 'origin/master' into develop 2022-11-10 21:53:30 +00:00
Sid Quinsaat
dbd5a1d821 [Keymap] sharkby7e keymap updates (#18906)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-10 13:52:24 -08:00
QMK Bot
bb843d3a1c Merge remote-tracking branch 'origin/master' into develop 2022-11-10 20:42:51 +00:00
QMK Bot
81625e5091 Format code according to conventions (#19026) 2022-11-10 20:42:16 +00:00
QMK Bot
35baf1815c Merge remote-tracking branch 'origin/master' into develop 2022-11-10 20:38:09 +00:00
Synth and Keys
6562c5a940 Adding Synth and Keys' Debit Card (#18995)
* Adding Synth and Keys' Debit Card

Initial Commit

* Add files via upload

* Delete config.h

* Update keyboards/synthandkeys/the_debit_card/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-10 20:36:55 +00:00
Joshua Diamond
f6baf916a9 Avoid repeated calls to rgblight_set() in tight succession when setting lighting layers (#18338)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2022-11-10 20:27:40 +11:00
ForsakenRei
bc269702ee KC_GESC -> QK_GESC and better alignment (#19018) 2022-11-10 01:27:09 +00:00
QMK Bot
785e6f5476 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 21:27:12 +00:00
Vino Rodrigues
84920ff5f4 Addition of the Binepad BN006 6-key macropad (#18810) 2022-11-09 21:26:43 +00:00
Stefan Kerkmann
27dec8d16d [Core] Allow custom timings for WS2812 PIO driver (#18006) 2022-11-10 07:58:15 +11:00
Wilba
bc6f8dc8b0 VIA V3 - The Custom UI Update (#18222) 2022-11-10 07:46:44 +11:00
Nick Brassel
575b0e33fa Rollback unrelated changes from previous PR. (#19015) 2022-11-10 07:43:51 +11:00
Christopher Hoage
af52a9f8ad Fix jump in report value when scale changes during cirque get report (#18992)
Fixes undefined
2022-11-09 09:48:46 -08:00
Joel Challis
dc9162438d Reject json with duplicate keys? (#18108) 2022-11-09 15:50:43 +00:00
QMK Bot
293dbfdeff Merge remote-tracking branch 'origin/master' into develop 2022-11-09 14:04:19 +00:00
Ryan
c231c5fa4f bolsa/bolsalice: fix layout (#19009) 2022-11-09 14:03:06 +00:00
Ryan
d789b4b7d9 Improve LED config parsing error messages (#19007) 2022-11-09 14:02:44 +00:00
jack
f7df771e70 Fixup keychron/q1/iso_encoder (#19006) 2022-11-09 06:51:04 +11:00
Ryan
b567622d59 handwired/swiftrax/cowfish: fix layouts (#18984) 2022-11-09 06:11:09 +11:00
Ryan
d810878d5e Normalise output selection (Bluetooth) keycodes (#19004) 2022-11-08 19:03:31 +00:00
QMK Bot
9a0f347a09 Merge remote-tracking branch 'origin/master' into develop 2022-11-08 16:25:44 +00:00
Andrew Kannan
0113550066 [Keyboard] Add Brutal v2 1800 PCB to QMK (#18891)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-08 08:23:37 -08:00
QMK Bot
d0d4ab2531 Merge remote-tracking branch 'origin/master' into develop 2022-11-08 16:22:55 +00:00
QMK Bot
425f906473 Merge remote-tracking branch 'origin/master' into develop 2022-11-08 16:22:40 +00:00
HorrorTroll
421448cd41 [Keyboard] Refactor chinese PCB folder (#18923) 2022-11-08 08:22:38 -08:00
adophoxia
a25e5ce1b3 [Keyboard] Add ISO Encoder variant of Keychron Q1v1 (#18829) 2022-11-08 08:21:51 -08:00
Ryan Anderson
2acb2e696a [Keymap] Add model01 and doio/kb16 keymaps (#18681) 2022-11-08 08:21:35 -08:00
Ryan
d11676566e gboards/gergoplex: fix matrix pins (#18999) 2022-11-08 15:49:50 +00:00
Nick Brassel
9daf77b593 Add raw output option for QGF/QFF files. (#18998) 2022-11-08 15:47:07 +00:00
QMK Bot
bb0856d231 Merge remote-tracking branch 'origin/master' into develop 2022-11-08 04:51:22 +00:00
Kevin Ohlin
a1cc41e1af [Keymap] KO Kyria (#18413)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-07 20:50:41 -08:00
Ryan
4b12bd05ea pizzakeyboards/pizza65: fix layouts (#18979) 2022-11-08 14:25:34 +11:00
Ryan
15143654b9 mechlovin/adelais/standard_led/avr/rev1: fix layout (#18997) 2022-11-08 14:17:46 +11:00
Joel Challis
7666c966d5 Publish hjson files as json (#18996) 2022-11-08 03:03:02 +00:00
Ryan
479d8de622 Format DD mappings and schemas (#18924) 2022-11-08 01:05:08 +00:00
jack
ce80a3ad46 Fixup hotdox76v2 on develop (#18991) 2022-11-08 09:16:05 +11:00
Ryan
4deaa58016 cannonkeys/db60/hotswap: fix layouts (#18982) 2022-11-07 16:16:41 +11:00
Joel Challis
e4d2ba9a4d Align haptic feedback keycode names (#18964) 2022-11-07 02:43:53 +00:00
Ryan
8b658dcc9a Normalise MIDI keycodes (#18972)
* `MI_ON`, `MI_OFF`, `MI_TOG` -> `MI_TOGG`

* `MI_CH*`, `MI_CHU` -> `MI_CHNU`, `MI_CHD` -> `MI_CHND`

* `MI_VEL_*` -> `MI_VL*`, `MI_VELU`, `MI_VELD`

* `MI_TRNS_*` -> `MI_TR*`, `MI_TRNSU` -> `MI_TRSU`, `MI_TRNSD` -> `MI_TRSD`

* `MI_OCT_*` -> `MI_OC*`, `MI_OCTU`, `MI_OCTD`

* Misc controls

* Note keycodes

* Add legacy keycodes

* Regenerate keycodes

* Typo
2022-11-07 02:26:15 +00:00
Joel Challis
442e7653cc Fix use of shifted custom keycode (#18978) 2022-11-06 23:48:31 +00:00
Sergey Vlasov
a7b2f4233c Fix keycode parameter extraction to match the new DD keycodes (#18977)
* Add macros to extract parameters from keycode values

Implement both encoding and decoding for keycodes like TO(layer) or
LM(layer, mod) in one place, so that the decoding won't get out of sync
with the encoding.

While at it, fix some macros for creating keycode values that did not
apply the appropriate masks to parameters (and therefore could allow the
result to be out of range if a wrong parameter was passed).

* keymap_common: Use extraction macros for keycodes

* pointing_device_auto_mouse: Use extraction macros for keycodes

Fixes #18970.

* process_autocorrect: Use extraction macros for keycodes

* process_caps_word: Use extraction macros for keycodes

(Also fix a minor bug - SH_TG was not handled properly)

* process_leader: Use extraction macros for keycodes

(Technically the code is not 100% correct, because it always assumes
that the LT() or MT() action was a tap, but it's a separate issue that
already existed before the keycode changes.)

* process_unicode: Use extraction macros for keycodes

* process_unicodemap: Use extraction macros for keycodes
2022-11-06 21:39:05 +00:00
Ryan
5f9b7c035b handwired/swiftrax/walter: fix layout mismatch (#18974)
* `handwired/swiftrax/walter`: fix layout mismatch

* Undo K4A removal, fix info.json instead
2022-11-06 18:42:59 +00:00
Drashna Jael're
d9e559a78e Merge remote-tracking branch 'origin/master' into develop 2022-11-06 09:05:52 -08:00
Nick Brassel
219afaba42 Reworked backlight keycodes. (#18961)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-06 08:11:59 +11:00
Drashna Jaelre
352beeac2f [Bug] Fix compilation issue with WPM (#18965) 2022-11-05 19:05:01 +00:00
Drashna Jaelre
e3a97eb1c8 [Keyboard] Add Work Louder Numpad (#18912)
* [Keyboard] Add Work Louder Numpad

* Add future proofing for rgb matrix

* Update readme

* fixup copyright headers

* Actually enable via
2022-11-05 17:55:42 +00:00
Joel Challis
69fa02c37d Align audio keycode names (#18962)
* Align audio keycode names

* Update docs

* Update quantum
2022-11-05 17:05:19 +00:00
Joel Challis
fd4c3f46fb Align dynamic tapping term keycode names (#18963)
* Align dynamic tapping term keycode names

* regen header
2022-11-05 16:58:30 +00:00
Nick Brassel
5233c69bc6 Remove thermal printer. (#18959) 2022-11-06 00:15:55 +11:00
Nick Brassel
4d33f356a6 Macro keycode name refactoring (#18958) 2022-11-05 23:22:11 +11:00
Ryan
fe00c80211 Reduce includes for send_string header (#18952) 2022-11-05 21:45:40 +11:00
Joel Challis
a69ab05dd6 Initial DD keycode migration (#18643)
* Initial DD keycode migration

* Sort magic keycodes
2022-11-05 10:30:09 +00:00
Joel Challis
a070c4c501 Remove hardcoded VIA keycode range (#18956) 2022-11-05 08:12:37 +00:00
Ryan
54682f961e Fix "no matrix definition" errors for some boards (#18954) 2022-11-05 02:48:00 +00:00
Nick Brassel
f82e90bdea Formalise keyboard- and user-specific EEPROM blocks (#18874)
* Formalise keyboard and user eeconfig datablocks.

* Add debounce helper that checks a condition and issues post-write function invocation.

* Naming.
2022-11-04 19:20:11 +00:00
Joel Challis
ea98aa8e5e Reduce includes for dip_switch header (#18951) 2022-11-04 11:54:35 +00:00
Ryan
8213eb7fbb Fix DD warnings for RGBKB boards (#18944) 2022-11-04 04:13:26 +00:00
Joel Challis
fb96b88842 Reduce includes for wpm header (#18949) 2022-11-04 00:50:59 +00:00
Joel Challis
1249f74b31 Reduce includes for caps_word header (#18948) 2022-11-03 23:42:58 +00:00
Ryan
fe18df9d41 Normalise Dynamic Macro keycodes (#18939)
* `DYN_REC_START1` -> `QK_DYNAMIC_MACRO_RECORD_START_1`

* `DYN_REC_START2` -> `QK_DYNAMIC_MACRO_RECORD_START_2`

* `DYN_MACRO_PLAY1` -> `QK_DYNAMIC_MACRO_PLAY_1`

* `DYN_MACRO_PLAY2` -> `QK_DYNAMIC_MACRO_PLAY_2`

* `DYN_REC_STOP` -> `QK_DYNAMIC_MACRO_RECORD_STOP`

* Update docs
2022-11-03 23:01:06 +00:00
Joel Challis
3de296f420 Reduce includes for crc header (#18947) 2022-11-03 21:36:58 +00:00
Joel Challis
f11a247127 Reduce includes for sequencer header (#18946) 2022-11-03 20:44:36 +00:00
Ryan
40122c28e0 Resolve info.json/rules.mk feature conflicts in three boards (#18942) 2022-11-03 18:26:18 +00:00
Ryan
db2aa039f1 Remove more UNUSED_PINS defines (#18940) 2022-11-03 17:42:19 +00:00
Drashna Jaelre
7fe76e53c1 [Keyboard] Add hotdox76v2 support (#18680) 2022-11-03 17:40:56 +00:00
Joshua Diamond
5fb80562f1 Fix syntax error introduced in #18800 (#18933) 2022-11-01 21:34:31 +00:00
Joy Lee
9435ad19ee Added analog support for WB32 MCU. (#18289)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-11-01 15:04:15 +11:00
Drashna Jaelre
ae5f818d5a Simplify Keymap Config EEPROM (#18886)
* Simplify Keymap Config EEPROM

* Decrement eeconfig magic number due to eeconfig changes

* Update quantum/eeconfig.h

Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-01 01:02:43 +00:00
Ryan
7ebc396876 compiler.txt: ensure file exists before comparison (#18921) 2022-11-01 00:35:38 +00:00
Ryan
5974d989fe Normalise Unicode keycodes (#18898)
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`

* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`

* `UC_MAC` -> `UNICODE_MODE_MACOS`

* `UC_LNX` -> `UNICODE_MODE_LINUX`

* `UC_WIN` -> `UNICODE_MODE_WINDOWS`

* `UC_BSD` -> `UNICODE_MODE_BSD`

* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`

* `UC_EMACS` -> `UNICODE_MODE_EMACS`

* `UC__COUNT` -> `UNICODE_MODE_COUNT`

* `UC_M_MA` -> `UC_MAC`

* `UC_M_LN` -> `UC_LINX`

* `UC_M_WI` -> `UC_WIN`

* `UC_M_BS` -> `UC_BSD`

* `UC_M_WC` -> `UC_WINC`

* `UC_M_EM` -> `UC_EMAC`

* Docs

* Update quantum/unicode/unicode.h
2022-10-31 21:15:12 +00:00
Joel Challis
96c48a5f4a Refactor to avoid deprecated wmic execution (#18122)
* wmic deprecated?

* Update platforms/avr/flash.mk

* Update platforms/avr/flash.mk
2022-10-31 20:16:43 +00:00
Max Rumpf
a45607f4e6 Phoebe: Add key to print screen (#18856) 2022-10-31 11:03:14 -07:00
James Young
1183704578 Star75 Refactor (#18885) 2022-10-31 11:02:49 -07:00
QMK Bot
743524df32 Merge remote-tracking branch 'origin/master' into develop 2022-10-31 01:57:58 +00:00
Anton Chernenko
652b10e6a7 [Keyboard] Add Hubble keyboard (#18718)
Co-authored-by: Anton Chernenko <anton.chernenko@chaintrust.it>
2022-10-30 18:57:23 -07:00
Ryan
594dcbf66c Properly fix elephant42 (#18908) 2022-10-30 15:34:24 +00:00
QMK Bot
56986e928b Merge remote-tracking branch 'origin/master' into develop 2022-10-30 05:26:59 +00:00
Joel Challis
ac4b3fd1e9 Remove duplicate key in novelkeys/nk65b (#18907) 2022-10-30 05:26:23 +00:00
Joel Challis
c63e2e378d Revert "mcp23018: add return status to init (#18178)" (#18709)
This reverts commit 3fffa51554.
2022-10-29 22:33:47 +01:00
QMK Bot
c78dc85a1a Merge remote-tracking branch 'origin/master' into develop 2022-10-29 20:49:16 +00:00
mechlovin
078a511394 [Keyboard] Update Kay65 LED state (#18895) 2022-10-29 13:48:45 -07:00
fauxpark
9d717c85dc Merge remote-tracking branch 'upstream/master' into develop 2022-10-29 16:54:14 +11:00
Andrew Kannan
e90ff84c31 Add indicator LEDs to hoodrow G PCB (#18888) 2022-10-29 00:55:18 +01:00
Toshihiro Suzuki
bb97a78d3e [Keymap] toshi0383 keymaps update (#18760)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-28 12:49:52 -07:00
Alabahuy
bc502348c3 [Keyboard] Add Encoder map support for rart (#18851) 2022-10-28 12:49:01 -07:00
Danny
e31fa77e9b [Keyboard] Add Sinc Rev 1&2 Encoder Map Support (#18861) 2022-10-28 12:27:38 -07:00
Ryan
22be7e79ac Normalise Auto Shift keycodes (#18892)
* Normalise Auto Shift keycodes

* Add keycode table to main list

* Add old keycodes to legacy header
2022-10-28 13:53:15 +01:00
Ryan
2ff1d85290 Normalise Autocorrect keycodes (#18893) 2022-10-28 12:21:24 +01:00
weimao
6514c25ca6 Docs: fix a typo (#18896) 2022-10-28 11:48:08 +01:00
Ryan
7407347be1 Remove rgblight_list.h (#18878)
* Remove rgblight_list defines with no usage

* Remove rgblight_setrgb_*[_at] defines

* Remove rgblight_sethsv_* defines

* Remove rgblight_sethsv_noeeprom_* defines

* Delete rgblight_list.h and remove all references
2022-10-27 23:50:14 +01:00
jack
a96a9fd5f8 Fixup keebio/sinc/rev3 (#18866) 2022-10-27 16:04:33 -04:00
Ryan
7b888fb328 elephant42: fix default keymap (#18884) 2022-10-27 19:34:00 +01:00
Ryan
90f6b75873 Remove KC_DELT (#18882) 2022-10-27 19:33:38 +01:00
Stefan Kerkmann
19145704e4 [Core] Adjust PWM hardware audio driver for RP2040 (#17723) 2022-10-27 19:26:16 +02:00
James Young
84569788d5 MelGeek MJ6XY Refactor (#18862)
* mj6xy.h: convert tabs to spaces

* info.json: convert tabs to spaces

* info.json: apply friendly formatting

Whitespace-only change.

* rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan

- rename `60_ansi_7u_spc` keymap to `default_ansi_tsangan`

* add K31 position to LAYOUT_60_iso

* rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_split_rshift

- rename `60_iso_7u_spc_split_rshift` keymap to `default_iso_tsangan_split_rshift`

* add K31 position to LAYOUT_60_iso_arrow

* add K31 position to LAYOUT_60_iso_arrow_6u_spc

* add K31 position to LAYOUT_60_iso_arrow_3u_spc

* refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan

- add K31 position to layout macro
- rename `60_iso_7u_spc` keymap to `default_iso_tsangan`

* add K31 position to LAYOUT_64_iso

- rename `64_iso` keymap to `default_64_iso`

* add K31 position to LAYOUT_64_iso_3u_spc

- rename `64_iso_3u_spc` keymap to `default_64_iso_3u_spc`

* add K31 position to LAYOUT_64_iso_split_3u_spc

- rename `64_iso_split_3u_spc` keymap to `default_64_iso_split_3u_spc`

* remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_split_rshift`.

* remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_tsangan_split_rshift`.

* rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs

- rename `60_ansi_7u_spc_split_bs` keymap to `default_60_ansi_tsangan_split_bs`

* add K31 position to LAYOUT_60_iso_split_bs

* rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_split_bs_rshift

- rename `60_iso_7u_spc_split_bs_rshift` keymap to `default_60_iso_tsangan_split_bs_rshift`

* add K31 position to LAYOUT_60_iso_arrow_split_bs

* add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs

- rename `60_iso_arrow_3u_spc_split_bs` keymap to `default_60_iso_arrow_3u_spc_split_bs`

* add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc

- rename `60_iso_arrow_split_bs_3u_spc` keymap to `default_60_iso_arrow_split_bs_3u_spc`

* refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_split_bs

- add K31 position to layout macro
- rename `60_iso_7u_spc_split_bs` keymap to `default_60_iso_tsangan_split_bs`

* add K31 position to LAYOUT_64_iso_split_bs

- rename `64_iso_split_bs` keymap to `default_64_iso_split_bs`

* add K31 position to LAYOUT_64_iso_3u_spc_split_bs

rename `64_iso_3u_spc_split_bs` keymap to `default_64_iso_3u_spc_split_bs`

* add K31 position to LAYOUT_64_iso_split_bs_3u_spc

- rename `64_iso_split_bs_3u_spc` keymap to `default_64_iso_split_bs_3u_spc`

* remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap

Functionally identical to `LAYOUT_60_ansi_arrow`.

* remove LAYOUT_64_ansi_6u_spc macro and keymap

Functionally identical to `LAYOUT_64_ansi`.

* remove LAYOUT_60_iso_arrow_6u_spc macro and keymap

Functionally identical to `LAYOUT_60_iso_arrow`.

* remove LAYOUT_64_iso_6u_spc macro and keymap

Functionally identical to `LAYOUT_64_iso`.

* remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_60_ansi_arrow_split_bs`.

* remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_64_ansi_split_bs`.

* remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_60_iso_arrow_split_bs`.

* remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap

Functionally identical to `LAYOUT_64_iso_split_bs`.

* remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_split_bs_rshift`.

* remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap

Functionally identical to `LAYOUT_60_iso_tsangan_split_bs_rshift`.

* refactor keymaps

- convert tabs to spaces
- update keycode grid alignment

* remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap

Subset of `LAYOUT_60_ansi_arrow_3u_spc_split_bs`.

* remove LAYOUT_60_iso_arrow_3u_spc macro and keymap

Subset of `LAYOUT_60_iso_arrow_3u_spc_split_bs`.

* remove LAYOUT_60_iso_tsangan_split_bs macro and keymap

Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`.

* remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap

Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`.

* remove LAYOUT_64_ansi_3u_spc macro and keymap

Subset of `LAYOUT_64_ansi_3u_spc_split_bs`.

* remove LAYOUT_64_iso_3u_spc macro and keymap

Subset of `LAYOUT_64_iso_3u_spc_split_bs`.

* remove LAYOUT_60_iso_split_bs macro and keymap

Subset of `LAYOUT_60_iso_split_bs_rshift`.

* remove LAYOUT_60_iso_split_rshift macro and keymap

Subset of `LAYOUT_60_iso_split_bs_rshift`.

* add LAYOUT_60_ansi_split_bs_rshift macro and keymap

* remove LAYOUT_60_ansi_split_bs macro and keymap

Subset of `LAYOUT_60_ansi_split_bs_rshift`.

* add LAYOUT_60_tsangan_hhkb macro and keymap

* remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap

Subset of `LAYOUT_60_tsangan_hhkb`.

* standardize keymap names

Rename all keymaps per QMK guidelines (e.g. keymap using `LAYOUT_60_ansi_arrow` should be named `default_60_ansi_arrow`).

* add LAYOUT_all; refactor default keymap

Add a `LAYOUT_all` macro, and update the `default` keymap to use the new macro.

* refactor via keymap

Update the `via` keymap to match the behaviour of the `default` keymap.

* improve keyboard readme

- fix broken image reference
- improve grammar on keyboard description
- fix Hardware Availability link
- fix `make` instructions
- add bootloader and flashing instructions

* fix default_60_tsangan_hhkb keymap

Fix a keycode count mismatch.

* mj6xy.h: add matrix diagram

* KC_GESC -> QK_GESC per fauxpark

* KC_SLCK -> KC_SCRL per fauxpark
2022-10-27 09:52:21 -07:00
leah-splitkb
20ce76f48c [Keyboard] Minor Aurora Sweep fixes (#18879)
- Fixes compile error with `SWAP_HANDS_ENABLE = yes`
- Fixes OLED, RGB Matrix, and encoder when using QMK Configurator
2022-10-27 16:01:17 +01:00
Ryan
efe520645e Normalise Combo keycodes (#18877) 2022-10-27 13:59:58 +01:00
Manna Harbour
d8183c5249 [Keymap] Update Miryoku (#18773)
* [miryoku] Revert "[Keymap] manna-harbour_miryoku RESET to QK_BOOT (#18755)"

This reverts commit 89dbc18161.

* [miryoku] Add keyboardio/model01

* [miryoku] Add handwired/dactyl_manuform/4x6

* [miryoku] Update BT keycodes

- Update BT keycodes on Media inner index:
  - Move OUT_AUTO to bottom row
- Move RGB_TOG in vi to pinkie column to match other TOG keycodes, and rotate row

* [miryoku] Add Extra and Tap layers

* [miryoku] Rename config workflow option to custom_config

* [miryoku] Update custom_config.h and custom_rules.mk behaviour

* [miryoku] Make mapping macro customisable globally and per layer

* [miryoku] Add layer lock

* [miryoku] Update RGB order in media-l-invertedt

* [miryoku] Change mouse button order

* [miryoku] Change to X macros for layer list

- Supports adding and removing layers from custom_config.h
- Add "U_" prefix to layer names
- Add layer name strings
- Populate keymaps array from X macro
- Populate layers enum from X macro
- Move layers enum to manna-harbour_miryoku.h
- Rename miryoku_alternatives.h to miryoku_layer_alternatives.h
- Rename miryoku_layer.h to miryoku_layer_selection.h
- Remove miryoku_layer_names.h
- Add miryoku_layer_list.h

* [miryoku] Reformat split_3x6_3 mapping

* [miryoku] Add merge field to workflows

* [miryoku] Update thumb combos with new layer names

* [miryoku] Update cover image

* [miryoku] Add satt/vision

* [miryoku] Update Branches and Building docs

* [miryoku] Update reset keycode

* [miryoku] Add xmk

* [miryoku] Add boardsource/lulu

* [miryoku] Fix keyboardio/model01
2022-10-27 13:50:32 +01:00
Ryan
8436f0dfa6 Add missing Space Cadet alias (#18876) 2022-10-27 13:08:14 +01:00
Ryan
002b58f0e4 Normalise Space Cadet keycodes (#18864) 2022-10-27 11:19:16 +01:00
Seth Barberee
18a70451fd userspace: fix up sethBarberee sinc keymap CI errors (#18865) 2022-10-27 09:57:50 +01:00
Joel Challis
8e0945c822 Fix rgb_matrix_set_flags_noeeprom declaration (#18860) 2022-10-27 09:52:51 +01:00
Nick Brassel
91b1e8a3e5 Allow overriding of dynamic keymap start address. (#18867) 2022-10-27 18:29:26 +11:00
jack
fb8cfe43a3 initial (#18859) 2022-10-27 15:24:13 +11:00
QMK Bot
dfef313587 Merge remote-tracking branch 'origin/master' into develop 2022-10-27 00:17:30 +00:00
ai03
432feecc61 [Keyboard] Add Lunar II (#18827)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: ai03 <sarcaphx510@gmail.com>
2022-10-26 17:16:59 -07:00
QMK Bot
d311d86ddf Merge remote-tracking branch 'origin/master' into develop 2022-10-26 20:44:46 +00:00
Danny
42c240f6cf Add Sinc Rev. 3 (#18846)
* Initial work on adding Sinc Rev. 3

* Add RGB Matrix support

* Add encoder map support

* Set I2C pins

* Update LED locations for right half

* Move USB definitions to info.json

* Update RGB modes

* Replace pin mappings for right half with correct ones

* Move config.h back to rev1/rev2 due to addition of rev3

* Convert initial Rev. 3 config work to be data-driven

* Convert RGB Matrix config to DD format

* More config cleanup

* Use full-duplex PIO

* Add MCU/bootloader settings for Rev. 2

* Change ISO Enter location since it shares location with Backslash

* Adjust build settings to reduce flash/EEPROM usage
2022-10-26 21:44:06 +01:00
jack
d05334cfab Fixup 1upkeyboards/pi60_rgb (#18858) 2022-10-26 21:37:59 +01:00
Selene ToyKeeper
2a61bfc27d add "inertia" mode for mouse keys (#18774)
Co-authored-by: Selene ToyKeeper <git@toykeeper.net>
2022-10-26 20:49:44 +01:00
QMK Bot
4c0c491e31 Merge remote-tracking branch 'origin/master' into develop 2022-10-26 19:41:39 +00:00
Terlekchi Seityagiya
8ea8a4edcb [Keyboard] Kepler 33 (#18771)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-26 12:41:30 -07:00
kopibeng
48dc8122e7 [Keyboard] Update MNK65 (#18743)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-26 12:41:02 -07:00
Nostril
99d5b5506a [Keymap] Add new IIDX gamepad keymap for Synth Labs Solo (#18741)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-26 12:40:44 -07:00
QMK Bot
1d629f75b8 Merge remote-tracking branch 'origin/master' into develop 2022-10-26 19:39:49 +00:00
Vino Rodrigues
e59475992e [Keyboard] Add Binepad BNR1 rotary encoder (#18809)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-10-26 12:39:17 -07:00
QMK Bot
c07614dadf Merge remote-tracking branch 'origin/master' into develop 2022-10-26 19:38:54 +00:00
Markus Korn
e485261e53 [Keymap] gmmk gmmk2 p65: new keymap (#18808)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-26 12:38:20 -07:00
QMK Bot
d051528d6c Merge remote-tracking branch 'origin/master' into develop 2022-10-26 18:00:21 +00:00
HorrorTroll
9dec43a0f2 Added new keyboard DOIO KB16 (Rev 2) (#18699) 2022-10-26 18:59:30 +01:00
QMK Bot
23b481ab03 Merge remote-tracking branch 'origin/master' into develop 2022-10-26 17:57:47 +00:00
ziptyze
cd8099539b Addition of pi60_rgb to 1upkeyboards (#18633) 2022-10-26 18:57:11 +01:00
Joel Challis
ec2414c074 Deprecate SECURE_* keycodes for QK_SECURE_* (#18847)
* Deprecate SECURE_* keycodes for QK_SECURE_*

* Update keycode process

* Update process_secure.c

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-25 22:59:17 +01:00
Ryan
812001de7f Deprecate ONESHOT_* keycodes for QK_ONE_SHOT_* (#18844)
* Deprecate `ONESHOT_*` keycodes for `QK_ONE_SHOT_*`

* Docs
2022-10-25 17:50:22 +01:00
Ryan
1d34f380eb Deprecate KEY_OVERRIDE_* keycodes for KO_* (#18843) 2022-10-25 14:45:57 +01:00
QMK Bot
fccf788285 Merge remote-tracking branch 'origin/master' into develop 2022-10-25 13:45:31 +00:00
Ryan
5d8c8a6f7c Fix splitkb/aurora/sweep (#18839)
* Fix splitkb/aurora/sweep

* Add back layout alias
2022-10-25 14:44:25 +01:00
jack
843680d85b Fixup controllerwords/mini36 (#18840) 2022-10-25 14:41:54 +01:00
jack
51cc4f804e Fixup huytbt/h50 (#18841) 2022-10-25 14:41:21 +01:00
QMK Bot
bfb926f22c Merge remote-tracking branch 'origin/master' into develop 2022-10-25 13:41:20 +00:00
jack
cb960da1f4 Fixup bpiphany/ghost_squid (#18842) 2022-10-25 14:40:40 +01:00
Drashna Jael're
eeb3f9c043 Merge remote-tracking branch 'origin/master' into develop 2022-10-24 23:28:56 -07:00
Dalius Dobravolskas
f100de88e5 Callum style layout improvements and my layout changes (#16174) 2022-10-24 23:23:35 -07:00
jack
e359413501 [Keyboard] Fixup emptystring/nqg (#18804) 2022-10-24 22:52:44 -07:00
syntax-magic
846e9d4c53 [Keymap] Added tap dance to LNG1 key (LNG2) (#18682)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
2022-10-24 22:46:37 -07:00
Joel Challis
4f63be4d1d Remove some assumptions on sequential keycode ranges (#18838) 2022-10-24 22:07:34 -07:00
Andrew Kannan
2dff39720d [Keyboard] Add Ellipse PCB support (#18706)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-24 22:05:53 -07:00
Andrew Kannan
d861a35ebf [Keyboard] Add Ellipse hotswap PCB support (#18707)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-24 22:05:22 -07:00
Selene ToyKeeper
e863c431f6 added BS_TOGG so BS_SWAP and BS_NORM can be on a single key (#18837)
Co-authored-by: Selene ToyKeeper <git@toykeeper.net>
2022-10-24 22:02:21 -07:00
Joel Challis
67fd4e6b7a [DOCS] Use correct OSM arguments (#18835) 2022-10-24 23:29:23 +01:00
Ryan
a80b886751 Deprecate CAPS_WORD/CAPSWRD for CW_TOGG (#18834) 2022-10-24 17:30:37 +01:00
Peter Hindes
40aa9c8745 spelling fix (#18831) 2022-10-24 17:18:03 +01:00
Ryan
6bbe8b6edd Normalise Joystick and Programmable Button keycodes (#18832) 2022-10-24 15:50:33 +01:00
James Young
51dd63c926 MWStudio MW65 Black Refactor (#18824)
* mw65_black.h: add matrix diagram

* mw65_black.h: fill-in matrix definition

Fill the empty electrical positions with `KC_NO`.

* mw65_black.h: update matrix diagram

* rename LAYOUT to LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_tsangan

* info.json: correct maintainer value
2022-10-23 14:34:42 +01:00
James Young
590ce134b3 Mode SixtyFive HI Layout Refactor (#18823)
* m65hi_alpha.h: add matrix diagram

* rename LAYOUT_all to LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_tsangan

* tidy-up keymaps

- use four-space indent
- polish keycode grid alignment

* touch-up keymaps

Switch one Page Down keycode for Page Up on the `default` keymap, and switch the Page Down and Page Up keycodes on the `via` keymap.
2022-10-23 14:33:45 +01:00
James Young
64e8441910 Han60 Refactor (#18819)
* info.json: apply friendly formatting

* han60.h: add matrix diagram

* han60.h: tidy file

- remove trailing whitespace
- use four-space indent

* info.json: remove key overlaps from LAYOUT_all rendering

* rename LAYOUT_tsangan to LAYOUT_60_ansi_tsangan

* rename LAYOUT_tsangan_arrowkeys to LAYOUT_60_ansi_arrow_tsangan

* refactor LAYOUT_tsangan_iso into LAYOUT_60_iso_tsangan

Moves position `K2C` (Enter) to the home row.

* refactor LAYOUT_tsangan_iso_arrowkeys into LAYOUT_60_iso_arrow_tsangan

Moves position `K2C` (Enter) to the home row.

* refactor default keymap

- use four-space indent
- use QMK-native keycode aliases
- grid-align keycodes

* bugfix layout macros

* add reference keymaps
2022-10-23 14:33:25 +01:00
James Young
9248a04e17 Studio Kestra Galatea: fix ISO layout macros (#18825)
Switch the matrix positions for `KC_NUHS` and `KC_ENT`.
2022-10-23 14:32:34 +01:00
James Young
ac75d6e4e6 Aurora65: Correct Layout Data (#18826)
* info.json: apply friendly formatting

* info.json: correct layout data
2022-10-23 14:32:10 +01:00
Joel Challis
64ca14feea Fix garbled test output (#18822)
* Fix garbled test output

* Correct SRC listing
2022-10-23 04:30:17 +01:00
James Young
716969a01a Macro3: rename LAYOUT to LAYOUT_ortho_2x4 (#18820) 2022-10-23 00:07:31 +01:00
QMK Bot
1a1a3651d3 Format code according to conventions (#18818) 2022-10-23 00:00:40 +01:00
Huy Ta Ba Thanh
4a9771c0ec Add H50 keyboard from huytbt (#18752)
* Add H50 keyboard from huytbt

Add H50 keyboard

The H50 is a mini keyboard with a 50 percent layout. The keyboard consists of 53 keys.

* Optimize code

* Optimize keymap code

* Optimize code H50 keyboard
2022-10-22 23:59:43 +01:00
Controller Works
9e2a063163 Add mini36 (#18739) 2022-10-22 23:56:38 +01:00
precondition
c012490712 Add unit tests for HOLD_ON_OTHER_KEY_PRESS (#18721)
* Add HOLD_ON_OTHER_KEY_PRESS to data/ files

* Add unit tests for HOLD_ON_OTHER_KEY_PRESS
2022-10-22 23:51:24 +01:00
James Young
69719db6e9 Bathroom Epiphanies Ghost Squid Refactor (#18816)
* refactor default keymap

- shorten layer names
  - KM_QWERTY -> _QW
  - KM_MEDIA -> _MD
  - KM_GUI_LOCK -> _GL
- use QMK-native keycode aliases
- use four-space indent
- grid-align keycodes

* remove third layer from default keymap

The third layer only serves to disable the GUI keys, which we can do with a keycode.

* update default keymap readme

* ghost_squid.h: add matrix diagram

* add LAYOUT_fullsize_ansi

* add LAYOUT_fullsize_iso

* use LAYOUT_fullsize_iso macro in default keymap

Refactor the default keymap to use the new LAYOUT_fullsize_iso macro.

* remove LAYOUT macro

Same matrix as LAYOUT_fullsize_iso, but in a different assignment order.

* enable Community Layout support
2022-10-22 21:48:29 +01:00
James Young
af02e24aa7 MechBrewery MB65S Layout Rework (#18814)
* rename LAYOUT_65_ansi_blocker_tsangan to LAYOUT_65_ansi_blocker_tsangan_split_bs

Layout was implemented with Split Backspace.

* rename LAYOUT_65_iso_blocker_7u_spc to LAYOUT_65_iso_blocker_tsangan_split_bs

* rules.mk: update Community Layout support setting

* mb65s.h: update matrix diagram

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_ansi_blocker_tsangan

* add LAYOUT_65_iso_blocker_tsangan

* move Community Layout support to info.json

* update Community Layout support
2022-10-22 21:48:13 +01:00
Ryan
74484e21af Deprecate VLK_TOG for VK_TOGG (#18807) 2022-10-22 21:45:20 +01:00
QMK Bot
2e2e7511fd Merge remote-tracking branch 'origin/master' into develop 2022-10-22 20:23:08 +00:00
James Young
cdb04900cd Polyandry: rename LAYOUT to LAYOUT_ortho_4x3 (#18815) 2022-10-22 13:22:29 -07:00
QMK Bot
71480001ea Merge remote-tracking branch 'origin/master' into develop 2022-10-22 19:40:21 +00:00
Eddie Nuno
fc394dfdd4 [Docs] Fix link to keyboard layout editor (#18801) 2022-10-22 12:39:49 -07:00
Joel Challis
575db6949a Generalise CTPC logic from common_features (#18803) 2022-10-22 12:39:39 -07:00
QMK Bot
416c54297e Merge remote-tracking branch 'origin/master' into develop 2022-10-22 18:50:53 +00:00
stanrc85
68e68e7dc2 [Keyboard] Add Bolsalice keyboard (#18772) 2022-10-22 11:50:20 -07:00
Sergey Vlasov
1ea54e5052 ChibiOS USB: Add a dummy IN callback to work around LLD bugs (#18811)
In #18631 some IN notification callbacks that were doing nothing were
removed, which should be a valid thing to do (ChibiOS HAL checks the
`in_cb` and `out_cb` pointers for being non-NULL before invoking those
optional callbacks).  However, it turned out that some less popular USB
LLDs (KINETIS and MIMXRT1062) have their own checks for those pointers,
and (incorrectly) skip the ChibiOS callback handling when those pointers
are NULL, which breaks the code for the `USB_USE_WAIT` configuration
option (the waiting thread never gets resumed if the corresponding
callback pointer is NULL).

Add those dummy callbacks again (but use a single function for all of
them instead of individual ones for each endpoint); this restores the
KINETIS and MIMXRT1062 boards to the working state while the LLDs are
getting fixed.
2022-10-22 18:16:09 +01:00
Joel Challis
428114fac2 Remove broken userspace and keymaps (#18806) 2022-10-22 18:03:33 +01:00
Ryan
4f3af09209 Remove legacy fauxclicky and unicode keycodes (#18800) 2022-10-21 21:43:55 +01:00
Ryan
7cbff9d921 Deprecate KC_LOCK for QK_LOCK (#18796) 2022-10-21 15:46:10 +01:00
Ryan
b33fc34967 Deprecate KC_LEAD for QK_LEAD (#18792) 2022-10-21 14:25:54 +01:00
Selene ToyKeeper
374d5d7480 wilba_tech: allow keymaps to override backlight_effect_indicators() (#18791) 2022-10-21 14:25:01 +01:00
QMK Bot
f97ef22873 Merge remote-tracking branch 'origin/master' into develop 2022-10-21 05:02:49 +00:00
HorrorTroll
bd044ae5ff Update Black E6.5 keymap issues on QMK Configurator (#18794) 2022-10-20 22:02:11 -07:00
QMK Bot
156842bf4f Merge remote-tracking branch 'origin/master' into develop 2022-10-21 03:27:53 +00:00
Alex Berger
5343df09e0 [Keyboard] Fix saka68 solder layout (#18788) 2022-10-20 20:27:20 -07:00
QMK Bot
0ab824e744 Merge remote-tracking branch 'origin/master' into develop 2022-10-21 02:21:39 +00:00
DeskDaily
693303ddbc [Keyboard] Add Octopad+ Keyboard (#18484)
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-10-20 19:21:04 -07:00
Joel Challis
345f19a5d7 Add converter support to keymap.json (#18776) 2022-10-20 18:21:17 -07:00
QMK Bot
6e55aa42fa Merge remote-tracking branch 'origin/master' into develop 2022-10-21 01:20:56 +00:00
Stefan
2c3859fbf7 Keychron Q3 I2C & CKLED2001 transfer speedup (#18780) 2022-10-20 18:20:47 -07:00
8bits4ever
93a0995e48 A1200 Converter. Small modification on a1200.h file (#18783)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-20 18:20:23 -07:00
QMK Bot
b0982f85e0 Merge remote-tracking branch 'origin/master' into develop 2022-10-21 01:17:36 +00:00
James Young
c3b6a4bcb2 Wavtype p01_ultra Touch-Up (#18784) 2022-10-20 18:17:04 -07:00
Ryan
1cb1a5a374 Remove legacy Grave Escape keycodes (#18787) 2022-10-20 18:04:11 -07:00
Jouke Witteveen
d192d70327 Update keyboards readme (#18714) 2022-10-20 17:42:44 -07:00
Joel Challis
08e111758d Remove stale userspace/keymaps (#18700) 2022-10-20 23:15:15 +01:00
QMK Bot
00a4774243 Merge remote-tracking branch 'origin/master' into develop 2022-10-20 21:30:35 +00:00
Markus Fritsche
dbce41cb6b [Docs] Update platformdev_blackpill_f411.md (#18666)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-20 14:29:57 -07:00
Thomas Kriechbaumer
c4f99f06ab ws2812: replace RGBLED_NUM with driver-owned constant to decouple driver from RGBLEDs/RGBMATRIX defines (#18036) 2022-10-21 08:17:51 +11:00
Ryan
a7d6643e3d Fix build failures uncovered by #18753 (#18789) 2022-10-21 07:28:18 +11:00
Ryan
af678521c1 Remove quantum/audio from global VPATH (#18753) 2022-10-20 14:41:45 +01:00
Joel Challis
0b41c13509 [CLI] Ensure consistent clean behaviour (#18781) 2022-10-20 14:35:27 +01:00
Ryan
c347e732be Remove legacy EEPROM clear keycodes (#18782)
* `EEP_RST` -> `EE_CLR`, default-ish keymaps

* `EEP_RST` -> `EE_CLR`, user keymaps

* `EEP_RST` -> `EE_CLR`, community layouts

* `EEP_RST` -> `EE_CLR`, userspace

* `EEP_RST` -> `EE_CLR`, docs & core
2022-10-20 12:20:07 +01:00
QMK Bot
35f1cd0ec4 Merge remote-tracking branch 'origin/master' into develop 2022-10-20 07:53:11 +00:00
Wolf Van Herreweghe
d13f5f0d66 [Keyboard] Fix LEDs being inverted on Sabre (#18762) 2022-10-20 00:52:38 -07:00
QMK Bot
053153ceb5 Merge remote-tracking branch 'origin/master' into develop 2022-10-20 07:42:13 +00:00
James Young
1b107baf56 Wilba Tech WT65-D Layout Additions (#18779) 2022-10-20 00:41:40 -07:00
Drashna Jael're
f1a9259ac9 Merge remote-tracking branch 'origin/master' into develop 2022-10-20 00:38:14 -07:00
James Young
ada77ac291 Ano Layout Refactor (#18778)
* info.json: apply friendly formatting

* info.json: remove dead space in Configurator rendering

* physically arrange layout macro

* info.json: correct Configurator key sequence
2022-10-19 17:49:37 -07:00
QMK Bot
089df34e9e Merge remote-tracking branch 'origin/master' into develop 2022-10-19 20:59:21 +00:00
James Young
04e51d7aa8 Delikeeb Vaneela Configurator Fix (#18777)
* info.json: fix layout reference

`LAYOUT` -> `LAYOUT_ortho_5x12`

* info.json: apply friendly formatting

* info.json: correct maintainer value
2022-10-19 21:58:47 +01:00
Joel Challis
aa8e0a3e7a Build correctly when out of tree (#18775) 2022-10-19 17:43:25 +01:00
Ryan
18dc851e37 Remove legacy Debug keycode (#18769)
* `DEBUG` -> `DB_TOGG`, default-ish keymaps

* `DEBUG` -> `DB_TOGG`, user keymaps

* `DEBUG` -> `DB_TOGG`, community layouts

* `DEBUG` -> `DB_TOGG`, userspace

* `DEBUG` -> `DB_TOGG`, docs & core
2022-10-19 11:33:05 +01:00
Joel Challis
fc0330a54a Correctly build keymap.json containing additional config (#18766) 2022-10-19 11:29:44 +01:00
Nick Brassel
f99b9ba270 Widen the ARM Cortex-M family support. Allow USB peripheral change. (#18767) 2022-10-19 17:17:49 +11:00
QMK Bot
d2bc11ca67 Merge remote-tracking branch 'origin/master' into develop 2022-10-19 00:41:02 +00:00
Tyler Thrailkill
0b8fbff1cb Adjust oled gen to fix flashing on timeout (#18747)
Fixes an issue in Ocean Dream that causes flashing after the oled screen
times out and turns off.

This occurs because writing to an OLED screen turns it on as well and we
are both writing then immediately turning the screen off, but only if
the timeout has occurred (no WPM, 30 seconds has passed).
2022-10-19 01:40:26 +01:00
Joshua Diamond
80fdbfce5f A little personal cleanup after #18726 and #18729 (#18734)
* A little cleanup after #18726

* Re-instate RGBLIGHT_EFFECT_STATIC_GRADIENT

* Extend to spin
2022-10-19 00:28:19 +01:00
fauxpark
803d62f78a Merge remote-tracking branch 'upstream/master' into develop 2022-10-18 13:33:37 +11:00
mmccoyd
89dbc18161 [Keymap] manna-harbour_miryoku RESET to QK_BOOT (#18755)
Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
2022-10-18 13:23:21 +11:00
QMK Bot
e59cb51be0 [CI] Format code according to conventions (#18756) 2022-10-18 08:29:19 +11:00
Jamal Bouajjaj
9d4c4ceee1 4 Driver support for IS31FL3737 (#18750)
* Added 4 driver support for the IS31FL3737 LED driver

* Updated docs for IS31FL3737 to support 4 drivers
2022-10-18 08:26:58 +11:00
QMK Bot
ae3825a3bc Merge remote-tracking branch 'origin/master' into develop 2022-10-17 16:14:23 +00:00
jack
5fdb49b5db Fixup handwired/kbod (#18754) 2022-10-17 17:13:40 +01:00
Ryan
bad8c5992b Remove legacy sendstring keycodes (#18749) 2022-10-17 13:45:23 +01:00
QMK Bot
c57330d340 Merge remote-tracking branch 'origin/master' into develop 2022-10-16 20:31:26 +00:00
Nick Brassel
f731e2789f Allow Fedora to update ChibiOS configs. (#18698) 2022-10-17 07:30:49 +11:00
Ryan
74223c34a9 Remove legacy keycodes, part 6 (#18740)
* `KC_RSHIFT` -> `KC_RSFT`

* `KC_RCTRL` -> `KC_RCTL`

* `KC_LSHIFT` -> `KC_LSFT`

* `KC_LCTRL` -> `KC_LCTL`
2022-10-16 14:14:40 +01:00
Nick Brassel
39c22f5cf5 Merge remote-tracking branch 'upstream/master' into develop 2022-10-16 16:08:34 +11:00
Nick Brassel
81988cc032 Slipped through the cracks. (#18742) 2022-10-16 15:58:42 +11:00
Jouke Witteveen
d089af8703 Mark the moonlander keyboard default music map as weak (#18715)
This allows user keymaps to set a different music map.
2022-10-16 03:31:51 +01:00
jack
8464bb91e2 Fixup work_louder/micro VIA keymap (#18738)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-15 16:16:17 -07:00
jack
4b5ebb7248 Fixup latinpadble (#18736) 2022-10-15 23:24:26 +01:00
Ryan
5e4b076af3 Remove legacy keycodes, part 5 (#18710)
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
2022-10-15 22:29:43 +01:00
QMK Bot
92d7964b28 Merge remote-tracking branch 'origin/master' into develop 2022-10-15 21:27:30 +00:00
James Young
b5e26ccb94 Y&R Studio NZ67v2 Layout Refactor (#18724)
* info.json: apply friendly formatting

* nz67v2.h: use ____ for KC_NO

* nz67v2.h: add matrix diagram

* add LAYOUT_all

Same matrix as `LAYOUT`, but physically arranged to mimic the keyboard layout.

Rotary encoder positions move from the bottom row to the top row.

* refactor keymaps to use LAYOUT_all macro

* info.json: add LAYOUT_all data

* remove LAYOUT macro

Now unused.

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_space

* remove dead space from layouts

Remove empty space from `LAYOUT_65_ansi_blocker` and `LAYOUT_65_ansi_blocker_split_space` layouts.
2022-10-15 22:26:56 +01:00
QMK Bot
cbf9907c78 Merge remote-tracking branch 'origin/master' into develop 2022-10-15 21:26:26 +00:00
James Young
679cbb8426 bbrfkr Dynamis Refactor (#18733)
* dynamis.h: use XXX for KC_NO

* dynamis.h: add matrix diagram

* info.json: apply friendly formatting

* refactor keymaps

- use four-space indent
- grid-align keycodes for readability

* info.json: fix LAYOUT_iso key sequence
2022-10-15 22:25:53 +01:00
QMK Bot
3fe9fbf950 Merge remote-tracking branch 'origin/master' into develop 2022-10-15 21:23:33 +00:00
Reibl János Dániel
ccdd28930a fix: Remove OLED support (#18719)
* fix: Remove OLED support

* redundant files

Co-authored-by: zvecr <git@zvecr.com>
2022-10-15 22:22:59 +01:00
precondition
2b24f16779 Update converter/usb_usb keymaps to use LAYOUT_fullsize (#18720) 2022-10-15 22:20:20 +01:00
Jouke Witteveen
2ee573fc5f led_update_kb -> led_update_ports where appropriate (#18716)
Following #14452, less boilerplate is needed to customize indicator led
control.
2022-10-15 15:09:03 -04:00
Drashna Jaelre
ad8630bd72 Remove RGBLIGHT_ANIMATION and clean up effect defines for layouts+users (#18729) 2022-10-15 09:59:31 -07:00
Drashna Jaelre
f0da486fab Remove RGBLIGHT_ANIMATION and clean up effect defines for R-Z (#18728) 2022-10-15 09:55:53 -07:00
Drashna Jaelre
c8e998ccad Remove RGBLIGHT_ANIMATION and clean up effect defines for L-Q (#18727) 2022-10-15 09:55:40 -07:00
Drashna Jaelre
55b9a4d06e Remove RGBLIGHT_ANIMATION and clean up effect defines for G-K (#18726) 2022-10-15 09:55:27 -07:00
Drashna Jaelre
d021bedf50 Remove RGBLIGHT_ANIMTION and clean up effect defines for 0-F (#18725) 2022-10-15 09:55:12 -07:00
Drashna Jaelre
be1c9af209 Update info.json configs to explicitly list RGBLIGHT animations (#18730) 2022-10-15 09:54:52 -07:00
Ryan
19e2dd742b LUFA: Consolidate report sending code (#18629) 2022-10-15 12:53:57 -04:00
QMK Bot
7c0116a3ec Merge remote-tracking branch 'origin/master' into develop 2022-10-15 16:37:02 +00:00
James Young
1e726a13d8 Xelus RS60 Layout Refactor (#18708)
* add matrix diagrams

* add LAYOUT_60_ansi

* add LAYOUT_60_ansi_tsangan

* add LAYOUT_60_tsangan_hhkb

* enable Community Layout support

* enable Community Layout support, phase 2

Remove the `LAYOUTS` rules from the `rules.mk` files, now that the data is in `info.json`.
2022-10-15 09:36:20 -07:00
fauxpark
47f6882157 Merge remote-tracking branch 'upstream/master' into develop 2022-10-15 14:39:36 +11:00
Ryan
f0b2bfd5ca Programmable Button API refactor and improve docs (#18641) 2022-10-15 14:33:24 +11:00
Nick Brassel
19aed5e999 Make QP driver init functions weak. (#18717) 2022-10-14 18:15:02 +01:00
JohSchneider
3fffa51554 mcp23018: add return status to init (#18178) 2022-10-13 18:03:32 -07:00
jack
06a7a1c205 Fixup momoka_ergo (#18704) 2022-10-14 10:07:07 +11:00
QMK Bot
f4f638c160 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 22:29:23 +00:00
jack
78484449e2 Fixup bluebell/swoop (#18703) 2022-10-13 23:28:42 +01:00
QMK Bot
e269db2440 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 22:27:39 +00:00
dependabot[bot]
dcc0c3f350 Bump JamesIves/github-pages-deploy-action from 4.4.0 to 4.4.1 (#18702)
Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/v4.4.0...v4.4.1)

---
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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-13 23:27:03 +01:00
QMK Bot
d66e5c6ea2 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 19:35:10 +00:00
arnstadm
ca7cfff7c5 add akb/vero (#18652) 2022-10-13 20:34:35 +01:00
Joel Challis
17f679ea2a Fix aurora/sweep (#18701) 2022-10-13 20:31:58 +01:00
QMK Bot
d89f7f02b0 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 19:02:55 +00:00
Paula Isabel
a3f9992cc9 docs: fix typos (#18671) 2022-10-13 20:02:15 +01:00
QMK Bot
676368be67 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 18:56:59 +00:00
Kevin Boss
2762b458fc Add momoka ergo via support (#18678) 2022-10-13 19:56:24 +01:00
QMK Bot
53ca8a12cd Merge remote-tracking branch 'origin/master' into develop 2022-10-13 18:44:22 +00:00
Duccio
4a30ea6a18 Add Swoop keyboard (#18436) 2022-10-13 19:43:03 +01:00
Ryan
5629ba1807 Remove legacy keycodes, part 4 (#18683)
* `KC_PGDOWN` -> `KC_PGDN`

* `KC_PSCREEN` -> `KC_PSCR`

* `KC_SCOLON` -> `KC_SCLN`

* `KC_BSLASH` -> `KC_BSLS`

* `KC_BSPACE` -> `KC_BSPC`
2022-10-13 18:28:14 +01:00
jack
474c0bc8a2 Fixup dumbpad/v3x (#18692) 2022-10-13 18:26:42 +01:00
QMK Bot
6829476fb7 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 10:53:59 +00:00
lalalademaxiya1
f50ba3b031 Update info.json of Q3 ISO with Encoder (#18697)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-13 21:53:16 +11:00
QMK Bot
9227c04a8d Merge remote-tracking branch 'origin/master' into develop 2022-10-13 07:15:38 +00:00
Wilba
4a74e3d02d Fix Caps Lock indicators on Wilba Tech PCBs (#18695) 2022-10-13 18:14:58 +11:00
QMK Bot
6a363fbb5b Merge remote-tracking branch 'origin/master' into develop 2022-10-13 07:13:51 +00:00
James Young
d5b9081864 Keychron Q3 Layout Touch-Up (#18696) 2022-10-13 18:13:16 +11:00
Joel Challis
a9e5e23063 Remove keymaps that still reference legacy macros (#18693) 2022-10-13 14:17:20 +11:00
jack
3f4fd85dc7 Fixup keychron/q3 (#18687)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-13 14:09:10 +11:00
QMK Bot
563a59d3c7 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 03:06:56 +00:00
leah-splitkb
a8df5fd303 [Keyboard] Add splitkb.com's Aurora Sweep (#18691) 2022-10-13 14:06:18 +11:00
Joel Challis
14b522bb34 Remove keymaps that still reference legacy macros (#18690) 2022-10-13 02:22:16 +01:00
Ryan
2078a56369 Fix joystick functionality for ChibiOS and OTG (Blackpill) (#18631)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2022-10-13 10:28:49 +11:00
jack
cd5b2e84f5 Fixup handwired/jopr — remove deprecated keycode (#18668) 2022-10-13 10:18:33 +11:00
QMK Bot
ba69536f9a Merge remote-tracking branch 'origin/master' into develop 2022-10-12 23:18:19 +00:00
James Young
a195f78200 Vertex ARC60 Layout Refactor (#18670) 2022-10-13 10:17:35 +11:00
QMK Bot
f693f1d9c5 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 23:12:30 +00:00
Alex Ong
80894f5c44 Quefrency xeal (#18657) 2022-10-13 10:12:06 +11:00
James Young
f5ac3ecaa7 Viendi 8L Layout Refactor (#18677) 2022-10-13 10:11:48 +11:00
QMK Bot
9d9c51f8ab Merge remote-tracking branch 'origin/master' into develop 2022-10-12 22:19:45 +00:00
Dicko
29169243a7 [Keyboard] Support for dumbpad_v3x (#18663)
* feat: support for dumbpad_v3x

- all credit goes to
- ref: https://github.com/qmk/qmk_firmware/pull/16285

- included comment from noroadsleft
- ref: https://github.com/qmk/qmk_firmware/pull/16285#pullrequestreview-1038213899

* fix: add newline on every .c, .h, .mk files end

* feat: response to change https://github.com/qmk/qmk_firmware/pull/18663#discussion_r991515821

* feat: response to change https://github.com/qmk/qmk_firmware/pull/18663#discussion_r991516192
2022-10-12 15:19:07 -07:00
QMK Bot
e93dc66733 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 21:41:29 +00:00
Joel Challis
4dec07741b Remove unused LED_INDICATORS constant (#18686) 2022-10-12 22:40:53 +01:00
Joel Challis
fb2c7da2fd Remove some .gitignore files (#18689) 2022-10-13 08:36:51 +11:00
QMK Bot
a751565468 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 18:34:25 +00:00
lalalademaxiya1
cf749f2dd0 Keychron q3 (#16912)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
Co-authored-by: bootstrapper <ido.samuelson@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-13 05:33:44 +11:00
QMK Bot
2acba48623 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 12:20:57 +00:00
Alex Ong
edef8d2a84 Remove xealousbrown keyboard (#18658)
Co-authored-by: alexo <alex-ong>
2022-10-12 13:20:16 +01:00
James Thomson
41159326ca Fix boundary in RGB_MATRIX_INDICATOR_SET_COLOR (#18650) 2022-10-11 11:33:02 -07:00
QMK Bot
6af7d9fa73 Merge remote-tracking branch 'origin/master' into develop 2022-10-11 13:23:28 +00:00
4pplet
868c7b5293 Bugfix waffling60 rev d solder (#18673) 2022-10-11 14:22:43 +01:00
Ryan
e96d829724 Remove legacy keycodes, part 3 (#18669)
* `KC__VOLDOWN` -> `KC_VOLD`

* `KC__VOLUP` -> `KC_VOLU`

* `KC__MUTE` -> `KC_MUTE`

* `KC_POWER` -> `KC_PWR`
2022-10-11 14:21:47 +01:00
precondition
17ada03243 Update snowe's KC_RESET to use QK_BOOT (#18667) 2022-10-11 10:27:21 +11:00
Ryan
c6f1b594a2 Remove legacy keycodes, part 2 (#18660)
* `KC_SYSREQ` -> `KC_SYRQ`

And one `KC_ALT_ERASE` -> `KC_ERAS`

* `KC_NONUS_BSLASH` -> `KC_NUBS`

* `KC_NUMLOCK` -> `KC_NUM`

* `KC_CLCK` -> `KC_CAPS`

* `KC_SCROLLLOCK` -> `KC_SCRL`

* `KC_LBRACKET` -> `KC_LBRC`

* `KC_RBRACKET` -> `KC_RBRC`

* `KC_CAPSLOCK` -> `KC_CAPS`
2022-10-10 20:06:26 +01:00
QMK Bot
c87bc92908 Merge remote-tracking branch 'origin/master' into develop 2022-10-10 08:38:04 +00:00
Andy Tsai
46fe3b0cf5 [Keyboard] Add hardwareabstraction/handwire Board (#18504)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Tom Barnes <barnestom@me.com>
2022-10-10 09:37:25 +01:00
QMK Bot
d115bcb69e Merge remote-tracking branch 'origin/master' into develop 2022-10-10 08:09:55 +00:00
James Young
2dadbbf04d Vertex AngleR2 Layout Refactor (#18661) 2022-10-10 01:09:15 -07:00
QMK Bot
aab2bad089 Merge remote-tracking branch 'origin/master' into develop 2022-10-10 08:05:15 +00:00
Artjoms Rizihs
cd4a265560 [Keyboard][Keymap] Fix random keys being sent on Mac + userspace changes (#15648)
* qmk art 2020+

* fix compilation

* remove functions. translation matrix

* fix edgecases

* whitespace

* fix memory oddity changing the keymap with every string print

* return edge cases

* support workman layout for git strings

* subm

* secrets

* fix git ignore

* rename var

* workman HW feature toggle

* remember lenght for inserting secrets

* blink leds on secret finish

* 75:fix LEDs not reflecting state on boot

* move common led functions to user file

* move common led funcs to separate file

* move funcs file to separate folder

* capsword

* move string functions to a separate file

* consolidate led funcs

* tidy up variables

* email

* fix printing random keys on Mac + temp disable dynamic macro

* make switch lang shortcut configurable

* revert ergodone behaviour

* move git ignore to userspace folder

* ergodone clean up + saving space

* navigation combos

* shift caps always turns on caps lock. more combos

* convert led funcs into header file

* convert string funcs into header file

* fix compilation for split75

* remove git cherry pick

* update legal headers

* more legal headers

* home row macros

* refactor combo names

* redo combos for homerow + f10 11 12

* custom strings implementation (like secrets)

* ergodone: more consistent f keys

* tweak left right combos to minimise typing interference

* ctr z shortcut

* ergodone: move del to a more convenient key

* rename secrets file to a shorter length

* ergodone tweaks

* fix after merge

* removed included .c files

* Update keyboards/ktec/ergodone/keymaps/art/user_config.c.example

* Update keyboards/mt/split75/keymaps/art/user_config.c.example

* Update users/art/secr.h.example

* Update users/art/custom_definitions.h.example

* Update users/art/art_user_config.h.example

* Update users/art/art.h
2022-10-10 01:04:30 -07:00
jack
9f5806781c Remove lingering DRIVER_LED_TOTAL references (#18662) 2022-10-10 01:03:19 -07:00
QMK Bot
7ac159cd4f Merge remote-tracking branch 'origin/master' into develop 2022-10-10 03:17:56 +00:00
Vino Rodrigues
7aab5e4d89 [Keyboard] New IDOBAO ID61 (a.k.a. Denwir D60) (#17362)
* initial upload

* adjust keymap

* Delete config.h

* Update post.rules.mk

* remapped to correct pins

* add idobao keymap

* disable underglow

* minor fix

* right menu on windows

* imgur

* ID61_process_special_k() function

* KC_APP fix

* Update keymap.c

* pre-pr touchups

* enum layouts

* review changes recommended by tzarc

* refactor special keys to common lib

* rename layout and add info.json labels

* account for 15 possible USER keys

* post drashna review

* Fn Arrow keys added

* post review edits

* use bitmask instead of bool array in specialk.c

* move to community layout
2022-10-09 20:17:21 -07:00
QMK Bot
4bf34ce5d7 Merge remote-tracking branch 'origin/master' into develop 2022-10-10 02:29:02 +00:00
Leon Anavi
a3d2c89c4c [Keyboard] Add ANAVI Macro Pad 10 (#18620) 2022-10-09 19:28:19 -07:00
Joel Challis
9d43cc319c Fix mouse use within send_string (#18659) 2022-10-09 18:00:26 -07:00
nezumee
d6d6cdcb4f Make MIDI output endpoint use the out direction (#18654) 2022-10-09 21:08:27 +01:00
jack
219c18703e twig50 - Remove deprecated keycodes (#18651) 2022-10-09 20:53:27 +01:00
Ryan
4b2d71de52 Remove legacy international keycodes (#18588) 2022-10-09 14:51:09 +11:00
Joel Challis
48093000e1 Various keyboard fixes (#18649) 2022-10-09 09:30:51 +11:00
jpe230
85dc473faa AnnePro2: Adjust RGB flushing (#18640) 2022-10-08 22:04:16 +01:00
jpe230
86938fd958 Allow QK_MAKE to work with converters (#18637) 2022-10-08 09:13:58 -07:00
QMK Bot
7a1517b6d4 Merge remote-tracking branch 'origin/master' into develop 2022-10-08 04:53:26 +00:00
Nick Brassel
7b3ad56f13 Fix future naming collisions. (#18645) 2022-10-08 15:52:38 +11:00
QMK Bot
010ed2e132 Merge remote-tracking branch 'origin/master' into develop 2022-10-08 02:04:49 +00:00
James Young
52a5949917 Synth Labs Solo Configurator Fixes (#18642)
* info.json: apply friendly formatting

- four-space indent
- line breaks between physical rows

* info.json: fix key sequence

* info.json: fix layout macro reference

The macro `LAYOUT` doesn't exist - this data should reference `LAYOUT_all`.

* info.json: add LAYOUT_left data

* info.json: add LAYOUT_right data

* info.json: correct LAYOUT_right key sequence and positioning
2022-10-08 03:04:07 +01:00
Joel Challis
f090cfe75c Relocate US ANSI shifted keycode aliases (#18634) 2022-10-07 23:36:38 +01:00
Giuseppe Rota
9e1ff0e6b9 fix typo in solenoid.h (#18635) 2022-10-07 22:16:31 +01:00
QMK Bot
c1e05b14d5 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 19:31:00 +00:00
jpe230
5d7e19209e Update CRKBD keymap (#18619) 2022-10-07 20:30:19 +01:00
Andre Brait
150572da44 [Keymap] update andrebrait GMMK Pro keymap (#18608) 2022-10-07 11:14:29 -07:00
QMK Bot
111dcdf713 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 08:09:15 +00:00
jack
de2c81d5b2 Remove all BACKLIGHT_LEVELS 0 (#18630) 2022-10-07 09:07:56 +01:00
QMK Bot
564589a006 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 05:59:12 +00:00
Less/Rikki
a8d6b37fac DD mappings for build.debounce_type and backlight.levels (#18628) 2022-10-06 22:58:13 -07:00
QMK Bot
7c4a012509 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 05:33:01 +00:00
adophoxia
ca2f9e4c8f Add encoder map support for Keychron Q1v1 and Q2 (#18598) 2022-10-06 22:32:19 -07:00
QMK Bot
c9d66bee70 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 05:30:57 +00:00
James Young
1a9058b2d1 Studio Kestra Nascent Refactor (#18625) 2022-10-06 22:30:09 -07:00
QMK Bot
7b57bfe083 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 02:55:33 +00:00
tarneo
a000ea11f7 [Keyboard] Add supersplit (#18611)
Co-authored-by: tarneo <tarneo@tarneo.fr>
2022-10-06 19:54:50 -07:00
Ryan
6dbbeea46a Refactor send_extra (#18615) 2022-10-06 19:35:01 -07:00
Thomas Weißschuh
cbe1c22d46 quantum: led: split out led_update_ports() for customization of led behaviour (#14452) 2022-10-06 21:24:41 +11:00
Dasky
c255174cf3 Implement split comms watchdog (#18599) 2022-10-06 20:52:42 +11:00
QMK Bot
a9414f4840 Merge remote-tracking branch 'origin/master' into develop 2022-10-06 01:01:47 +00:00
4pplet
b820c6db2d [Keyboard] Add waffling80 Rev B (#18603)
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-05 18:01:09 -07:00
Joel Challis
c59df9a54c Fix some rp2040 hardware ID errors (#18617) 2022-10-06 00:36:48 +01:00
Dasky
ab4cf9a7c1 Fix compilation of 1upkeyboards on develop (#18618) 2022-10-06 00:36:06 +01:00
QMK Bot
b3b7d601cd Merge remote-tracking branch 'origin/master' into develop 2022-10-05 23:00:41 +00:00
peepeetee
316edfd297 Enable mouse keys for momokai tap_trio (#18614) 2022-10-06 00:00:08 +01:00
QMK Bot
397c822e42 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 22:38:06 +00:00
Leon Anavi
2f559c0313 [Keyboard] adafruit/macropad: Fix typo (#18616) 2022-10-05 15:37:22 -07:00
QMK Bot
18a9fdb9dc Merge remote-tracking branch 'origin/master' into develop 2022-10-05 21:52:53 +00:00
ziptyze
6313258f23 Product changes to 1up lineup (#18382) 2022-10-05 22:52:18 +01:00
Joel Challis
f120b39fb0 Update ChibiOS hardware ID (#18613) 2022-10-05 21:20:09 +01:00
QMK Bot
7f43e3ba19 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 19:20:23 +00:00
precondition
248f98bdad width:2 → height:2 for spacetime thumb keys (#18605) 2022-10-05 20:19:45 +01:00
fauxpark
4d0177cd2a Merge remote-tracking branch 'upstream/master' into develop 2022-10-06 04:47:34 +11:00
adophoxia
fe6f707a85 [Keyboard] Add encoder map support for GMMK Pro (#18600) 2022-10-05 10:42:21 -07:00
precondition
49030e3e5b Use get_u16_str instead of snprintf in autoshift_timer_report (#18606) 2022-10-05 10:42:05 -07:00
QMK Bot
7a84a7458c Merge remote-tracking branch 'origin/master' into develop 2022-10-05 17:30:53 +00:00
4pplet
44aad7b92b [Keyboard] Add waffling60 Rev D ANSI Hotswap (#18579)
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-05 10:30:41 -07:00
4pplet
e7d5a6e490 [Keyboard] Add waffling60 Rev D Solder (#18580)
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-05 10:30:03 -07:00
Brian Choromanski
f7785223e5 Added new issue template for "Other issues" (#18578) 2022-10-05 10:29:43 -07:00
Stefan Kerkmann
c76d2074b6 [Bug] Fix ST7565 handler deadlock (#18609) 2022-10-05 19:22:57 +02:00
QMK Bot
86ce1d4b04 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 16:55:12 +00:00
George Rodrigues
959f4cbb62 docs: some typos (#18582)
probably hacktoberism
2022-10-05 17:32:07 +01:00
Ryan
d1b6b06202 Remove legacy locking caps/num/scroll keycodes (#18601) 2022-10-05 16:21:40 +01:00
QMK Bot
ee0a2b5d49 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 15:05:04 +00:00
precondition
5f671de13a RESET → QK_BOOT in nyhxis/nfr_70 (#18607) 2022-10-05 16:04:17 +01:00
QMK Bot
d150850397 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 10:36:37 +00:00
Nick Brassel
c1d21de1a2 Fixup builds for mechlovin/infinity87. (#18604) 2022-10-05 21:35:56 +11:00
QMK Bot
85f87d1a02 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 10:00:10 +00:00
Klesh Wong
164d2f36d1 fix: ps2_interrupt.c failed to compile (#18597) 2022-10-05 20:59:28 +11:00
QMK Bot
0c53d6fe4b Merge remote-tracking branch 'origin/master' into develop 2022-10-05 09:52:46 +00:00
Nick Brassel
df7f33582f Add C++ prerequisite for Fedora. (#18602) 2022-10-05 20:52:10 +11:00
QMK Bot
7392c6b255 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 02:35:21 +00:00
Jesper Severinsen
0e81954289 [Keyboard] Add Nyhxis NFR-70 keyboard (#17562)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-04 19:34:48 -07:00
QMK Bot
1811ac9a6f Merge remote-tracking branch 'origin/master' into develop 2022-10-05 02:16:50 +00:00
Kim Minjong
b100db1e56 [Docs] Add a note about the print function. (#17737)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-04 19:16:11 -07:00
QMK Bot
dd7673f3a7 Merge remote-tracking branch 'origin/master' into develop 2022-10-05 01:40:52 +00:00
nodatk
3f63bbc7d8 [Keyboard] Twig50 (#18085)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-04 18:40:18 -07:00
QMK Bot
0d5e0e3b2a Merge remote-tracking branch 'origin/master' into develop 2022-10-05 01:38:10 +00:00
Conor Burns
fe7ac87f18 [Docs] Clarify how to use the bootloader LED for rp2040 (#18585) 2022-10-04 18:37:28 -07:00
jack
bb4740d95b Remove lingering DRIVER_LED_TOTAL references (#18594) 2022-10-05 01:38:19 +01:00
jack
b3211c106c Fixup linworks/fave84h (#18593) 2022-10-05 01:37:50 +01:00
Ryan
4d6fab1cfa onekey: Enable ADC for STM32F072 Discovery (#18592) 2022-10-05 11:36:20 +11:00
Drashna Jaelre
64b1ed4550 Fix Per Key LED Indicator Callbacks (#18450)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-10-04 15:24:22 -07:00
Ryan
09d3e27710 Refactor more host code (programmable button & digitizer) (#18565) 2022-10-05 09:19:12 +11:00
QMK Bot
3168a3c883 Merge remote-tracking branch 'origin/master' into develop 2022-10-04 22:09:32 +00:00
dependabot[bot]
8b824a8029 Bump anothrNick/github-tag-action from 1.51.0 to 1.52.0 (#18590)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-05 09:08:59 +11:00
QMK Bot
46762bb078 Merge remote-tracking branch 'origin/master' into develop 2022-10-04 22:00:46 +00:00
Less/Rikki
d43045e845 define oled_write_ln_P as oled_write_ln for non-AVR MCUs (#18589) 2022-10-05 09:00:01 +11:00
Stefan Kerkmann
7e844a4d55 [Core] RP2040: use built-in integer hardware divider and optimized i64 multiplication (#18464) 2022-10-04 23:43:38 +02:00
Stefan Kerkmann
996a9006d3 [Core] PWM Backlight for RP2040 (#17706) 2022-10-04 23:10:24 +02:00
Stefan Kerkmann
b6ea8837e4 [Bug] RP2040: only clear RX FIFO for serial pio driver clear (#18581) 2022-10-04 19:56:40 +01:00
Stefan Kerkmann
56f7b34289 [Core] rewrite locking in split transaction handlers (#18417) 2022-10-05 05:49:29 +11:00
QMK Bot
89e75f6230 Merge remote-tracking branch 'origin/master' into develop 2022-10-04 02:17:40 +00:00
mmccoyd
78c4907f34 [Docs] Clarify CAPS_WORD behaviors (#18137)
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-03 19:17:08 -07:00
QMK Bot
42ede46fad Merge remote-tracking branch 'origin/master' into develop 2022-10-04 01:43:30 +00:00
Brian Choromanski
dc52347461 Added new issue templates for feature requests and bug reports (#18576)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-04 12:42:56 +11:00
QMK Bot
eada9ba7db Merge remote-tracking branch 'origin/master' into develop 2022-10-03 21:52:36 +00:00
dependabot[bot]
88046b3ebf Bump anothrNick/github-tag-action from 1.50.0 to 1.51.0 (#18575)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 08:51:57 +11:00
Stefan Kerkmann
976f454df0 [Bug] Update ChibiOS-Contrib for USB IRQ and bus handling fixes (#18574) 2022-10-03 18:57:13 +01:00
Stefan Kerkmann
6bbcabe0cc [Core] Serial-protocol: always clear receive queue on main half of split keyboard (#18419) 2022-10-03 18:23:45 +02:00
Sergey Vlasov
ca0c12847a Fix layer switching from tap dances by redoing the keymap lookup (#17935) 2022-10-03 20:48:16 +11:00
QMK Bot
0e6f191436 Merge remote-tracking branch 'origin/master' into develop 2022-10-03 07:42:01 +00:00
Johns
1d194ac60f Adds Anne Pro 2 c18 ISO variant support (#18154) 2022-10-03 18:41:24 +11:00
Jason Ken Adhinarta
c0e6a28bc6 Prevent tap dance from wiping dynamic macros (#17880) 2022-10-03 18:26:47 +11:00
QMK Bot
de19cb7b22 Merge remote-tracking branch 'origin/master' into develop 2022-10-03 06:36:18 +00:00
Alabahuy
f5e81681cd add rart60 (#18570)
* add rart60
2022-10-03 07:35:43 +01:00
QMK Bot
f5df1b155a Merge remote-tracking branch 'origin/master' into develop 2022-10-03 01:26:40 +00:00
Ryan
cc1565f2a3 :flash: print bootloader (#18569) 2022-10-03 12:26:04 +11:00
QMK Bot
bdffe9efe8 Merge remote-tracking branch 'origin/master' into develop 2022-10-02 20:24:56 +00:00
Nick Brassel
9ecd6eb9b9 Add tzarc/ghoul. (#18562)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-03 07:24:22 +11:00
Stefan Kerkmann
6f13a76530 [Core] ChibiOS: Fix USB bus disconnect handling (#18566) 2022-10-02 15:35:33 +02:00
Ryan
c4ff8192c2 Reverse keymap search order (#18449) 2022-10-01 23:36:07 +01:00
QMK Bot
3c9ac5ce58 Merge remote-tracking branch 'origin/master' into develop 2022-10-01 17:57:17 +00:00
Peter Park
2b3f6d0ec6 [Keyboard] Add Uni v4 keyboard (#18280)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2022-10-01 10:56:41 -07:00
QMK Bot
38bc9b57b3 Merge remote-tracking branch 'origin/master' into develop 2022-10-01 17:45:24 +00:00
4pplet
0bae3b09a1 [Keyboard] Add waffling60 Rev D ISO Hotswap (#18372)
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-01 10:44:52 -07:00
Joel Challis
e068f7a8d1 RESET -> QK_BOOT user keymaps (#18560) 2022-10-01 17:47:12 +01:00
QMK Bot
818ef07c24 Merge remote-tracking branch 'origin/master' into develop 2022-10-01 16:21:12 +00:00
Joel Challis
2d25b89d11 Remove more RESET keycode references (#18559) 2022-10-01 17:20:42 +01:00
QMK Bot
2c5ceccc5a Merge remote-tracking branch 'origin/master' into develop 2022-10-01 14:22:06 +00:00
Nick Brassel
059a7fb9b0 Djinn theme, allow force redraws (#18558) 2022-10-01 15:21:22 +01:00
precondition
e78fa1fbf0 Fix comment of CM_QUES (Colemak question mark) (#18557)
`#define CM_QUES S(CM_SLSH) // /` → `#define CM_QUES S(CM_SLSH) // ?`
2022-10-01 01:52:46 -07:00
QMK Bot
f81123469e Merge remote-tracking branch 'origin/master' into develop 2022-10-01 02:55:17 +00:00
Ryan
9f0d9b4fbe onekey: fix quine keymap (#18555) 2022-10-01 12:54:42 +10:00
QMK Bot
165d2e867d Merge remote-tracking branch 'origin/master' into develop 2022-09-30 23:33:56 +00:00
Markus Knutsson
2b33d2c098 [Keyboard] Add Little Big Scroll 4 macropad (#18516)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 16:33:09 -07:00
QMK Bot
82a996ad2d Merge remote-tracking branch 'origin/master' into develop 2022-09-30 23:07:56 +00:00
nimishgautam
3db33fba28 [Keymap] corne layout with mac/linux text editing shortcuts (#18374)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 16:07:20 -07:00
QMK Bot
305fd1c877 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 22:09:37 +00:00
jack
245f00b4d9 Fixup keebio/sinc (#18551) 2022-09-30 23:08:40 +01:00
jack
d1903f4dd4 Fixup controllerworks/mini42 (#18553)
fix up stuff by waffle
2022-09-30 22:26:40 +01:00
QMK Bot
394ded234f Merge remote-tracking branch 'origin/master' into develop 2022-09-30 20:46:07 +00:00
James Young
dfa5880144 Smith and Rune Iron 165R2 Refactor (#18552)
by noroadsleft
2022-09-30 21:45:21 +01:00
Ryan
2c96c75263 Small un/register_code() cleanups (#18544) 2022-09-30 16:29:24 -04:00
Jouke Witteveen
8bd73d4455 Fix keyboard pet OLED timeout logic (#17189)
The animation itself turns the screen on, preventing the normal timeout
from ever triggering.
2022-09-30 16:24:43 -04:00
QMK Bot
ff1aa6be9a Merge remote-tracking branch 'origin/master' into develop 2022-09-30 20:23:55 +00:00
Forrest Cahoon
5329f2558c Forrcaho foldkb caps lock blink (#17424)
* Add mapping for Keebio FoldKB

* Add (test) macro key; draw box chars around layout

* More programming macro keys added

* Fix stupid bug: return false when key has been handled

* Add mouse layer

* Encoder functions as mouse scroll wheel

* add readme.md for my foldkb layout

* Custom Keebio FoldKB keymap: blink backlight when caps lock is on
2022-09-30 16:23:24 -04:00
QMK Bot
01f5a5ffcd Merge remote-tracking branch 'origin/master' into develop 2022-09-30 20:08:44 +00:00
Pascal J
3b95f97a19 [Keyboard] handwired/tractyl_manuform: Arduino Micro (#17199)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 13:08:10 -07:00
QMK Bot
e974ba0c6a Merge remote-tracking branch 'origin/master' into develop 2022-09-30 19:43:08 +00:00
JX
4dfd744e4e [Keyboard] Add nightstar75 (#18546) 2022-09-30 12:42:28 -07:00
Ryan
e0115caab9 onekey: enable ADC for Bluepill and Blackpill (#18545) 2022-09-30 17:14:41 +01:00
QMK Bot
def966cd66 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 06:13:58 +00:00
3araht
10005e9f39 Rotary encoder setting is revised to solve a malfunction. (#18227)
* Rotary encoder setting is revised to solve a mulfunction. UNUSED_PINS deleted.

* Encoder map applied.

* ENCODER_MAP_ENABLE moved to keymap level.

* Settings in rules.mk moved to info.json.

* picture sent to imgur. config.h streamlined.
2022-09-30 07:13:21 +01:00
QMK Bot
660c5f926d Merge remote-tracking branch 'origin/master' into develop 2022-09-30 06:02:57 +00:00
Purdea Andrei
e1e86cb1fb Add Unicomp PC122 keyboard (#18326) 2022-09-30 07:02:24 +01:00
QMK Bot
5aa63ed2cd Merge remote-tracking branch 'origin/master' into develop 2022-09-30 05:56:18 +00:00
Luis Moreno
b77ff4edf4 AceVice One's keymap for Kyria keyboard (#18393) 2022-09-30 06:55:46 +01:00
QMK Bot
012d2f1d77 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 05:49:14 +00:00
Controller Works
043e6e72c0 [Keyboard] Add mini42 (#18491)
Co-authored-by: kevinmgee <kevingee@kevingee.biz>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 06:48:41 +01:00
QMK Bot
1a69acd1ad Merge remote-tracking branch 'origin/master' into develop 2022-09-30 05:42:43 +00:00
Ramon Imbao
f3351c6bfb [Keyboard] Add saevus cor (#18368) 2022-09-29 22:42:29 -07:00
Zicodia
cb2a99a415 [Keyboard] Fix tklfrlnrlmlao layout (#18543)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-29 22:42:11 -07:00
QMK Bot
fbf34353d6 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 05:25:28 +00:00
Tom Barnes
454c8c3100 [Keyboard] add Ask55 (#18256)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-29 22:24:41 -07:00
QMK Bot
fa5debe201 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 05:14:22 +00:00
JX
cc8f2c584a [Keyboard] Add yandrstudio/buff67v3 keyboard (#17592)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-29 22:13:49 -07:00
QMK Bot
a330217ccd Merge remote-tracking branch 'origin/master' into develop 2022-09-30 04:28:59 +00:00
James Young
dc7d2692c6 Grammar Fix for PR Checklist (#18540)
* Grammar Fix for PR Checklist

* Update docs/pr_checklist.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update docs/pr_checklist.md, take 2

Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-09-30 05:28:12 +01:00
QMK Bot
1f26ec0064 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 03:44:55 +00:00
Joseph Fass
83776b44b3 [Keyboard] Add handwired tkk diodeless keyboard (#18379)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-29 20:44:25 -07:00
Johannes Löthberg
d412dc61ee Remove remaining use of terminal keys and related comment labels (#18402) 2022-09-29 20:42:42 -07:00
QMK Bot
6f979439a1 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 03:29:53 +00:00
Andrew Kannan
be61df0827 [Keyboard] Add Moment Solderable (#18385)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-29 20:29:11 -07:00
QMK Bot
848984a772 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 03:02:17 +00:00
Markus Knutsson
dab9edeabb [Keyboard] Add Little Big Scroll 6 macropad (#18510)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-29 20:01:33 -07:00
QMK Bot
a50b18c9aa Merge remote-tracking branch 'origin/master' into develop 2022-09-30 02:57:53 +00:00
JX
2c4fd924c0 [Keyboard] Add EAU87 (#18532) 2022-09-29 19:57:39 -07:00
Nick Brassel
168b69654f Explicitly specify path to RP2040 wear_leveling config file. (#18541) 2022-09-29 19:57:20 -07:00
QMK Bot
c490584961 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 02:57:15 +00:00
jack
917c12d973 [Keyboard] fixup tklfrlnrlmlao (#18539) 2022-09-29 19:56:34 -07:00
QMK Bot
1147053498 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 02:49:37 +00:00
James Young
8f7b382902 P3D Glitch Configurator Fix and Keymap Touch-Up (#18534) 2022-09-29 19:49:05 -07:00
QMK Bot
0a40299b4b Merge remote-tracking branch 'origin/master' into develop 2022-09-30 02:02:10 +00:00
ZyberSE
adcdacf93c [Keymap] Personal user space code and keymaps by ZyBeR (#18512)
Co-authored-by: ZyBeR <n/a>
2022-09-29 19:01:33 -07:00
QMK Bot
eb742d7a3f Merge remote-tracking branch 'origin/master' into develop 2022-09-30 00:57:02 +00:00
James Young
5b2eb4ec85 Plywrks Ahgase Community Layout Support (#18535) 2022-09-29 17:56:34 -07:00
QMK Bot
62a9c7276a Merge remote-tracking branch 'origin/master' into develop 2022-09-30 00:23:37 +00:00
Seth Barberee
26c3e877c7 [Keyboard] Convert most of sinc to data driven info.json (#18481) 2022-09-29 17:23:02 -07:00
QMK Bot
dbb63b380f Merge remote-tracking branch 'origin/master' into develop 2022-09-30 00:11:32 +00:00
Less/Rikki
1dd15a8f22 [Keyboard] tau4 fixup/refactor (#18523) 2022-09-29 17:10:33 -07:00
QMK Bot
2d98485f55 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 23:03:03 +00:00
James Young
96c1ac24ee TKL-FF Community Layout Support (#18538) 2022-09-30 09:02:21 +10:00
QMK Bot
700723e046 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 22:55:58 +00:00
Zicodia
413284a2e8 Fixed layout matrix for TKLFRLNRLMLAO (#18537)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 08:55:19 +10:00
QMK Bot
307173d928 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 20:33:01 +00:00
Joe Scotto
43e57ab777 [Keyboard] Add ScottoCMD Keyboard (#18520) 2022-09-29 13:32:27 -07:00
QMK Bot
d44b5b512a Merge remote-tracking branch 'origin/master' into develop 2022-09-29 19:34:39 +00:00
dependabot[bot]
94ec64f91b Bump anothrNick/github-tag-action from 1.49.0 to 1.50.0 (#18536)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-30 05:34:02 +10:00
fauxpark
dbb70871fc Merge remote-tracking branch 'upstream/master' into develop 2022-09-30 05:19:53 +10:00
Ryan
45b5ed5c6e Onekey: migrate some stuff to data driven (#18502) 2022-09-30 04:23:11 +10:00
Drashna Jaelre
dbe214c326 Handle mouse keys more consistently (#18513) 2022-09-29 10:50:47 -07:00
QMK Bot
b53918fbe9 Format code according to conventions (#18533) 2022-09-29 10:47:17 -07:00
James Young
bad8c67189 Neson Design 700E Refactor (#18524) 2022-09-29 10:45:36 -07:00
Ryan
f80058d96e Start Bluetooth API (#18366) 2022-09-29 18:38:09 +01:00
syntax-magic
49128d6b85 Updated documentations. No changes to keymap.c functions. (#18530) 2022-09-29 18:33:23 +01:00
Nick Brassel
cbbb45c13f Start moving towards introspection-based data retrieval (#18441) 2022-09-29 18:25:55 +01:00
Daniel Bast
b51b3681b7 Fix keychron q2 iso default keymaps (#18501) 2022-09-29 13:15:00 -04:00
Less/Rikki
00dc764f72 [docs] Improve documentation regarding info.json (#18508)
* docs: raise info.json awareness

* docs: note that DD migration is WIP
2022-09-29 13:08:45 -04:00
lalalademaxiya1
bfcbcfe3c7 Update q0 for keychron (#18522) 2022-09-29 17:50:47 +01:00
QMK Bot
8349ff1e8b Merge remote-tracking branch 'origin/master' into develop 2022-09-29 16:49:32 +00:00
James Young
14e1886405 novelkeys/nk20: rename LAYOUT_all to LAYOUT (#18525)
This board only supports one layout.
2022-09-29 17:48:44 +01:00
jack
84ef824236 Gentoo install script — build newlib with nano USE flag (#18527) 2022-09-29 17:28:39 +01:00
QMK Bot
3a10514e4f Merge remote-tracking branch 'origin/master' into develop 2022-09-29 15:02:27 +00:00
Markus Knutsson
961de3c205 Update reference_info_json.md (#18518)
* Update reference_info_json.md

* Update docs/reference_info_json.md

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

* Update docs/reference_info_json.md

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

* Update docs/reference_info_json.md

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

* Update docs/reference_info_json.md

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

* Update docs/reference_info_json.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-29 11:01:34 -04:00
QMK Bot
ee588049a9 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 10:51:26 +00:00
DeflateAwning
51f2d27321 Fix typo (#18526) 2022-09-29 11:50:32 +01:00
QMK Bot
0e01759c61 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 08:33:39 +00:00
James Young
eb55551e2d Monoflex 60 Layout Refactor and Touch-Up (#18517) 2022-09-29 01:32:25 -07:00
QMK Bot
30c4529684 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 06:42:10 +00:00
James Young
6b8dfdfca5 Mokey Ibis80 Refactor (#18514) 2022-09-28 23:41:33 -07:00
QMK Bot
59ea8164e3 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 06:32:45 +00:00
James Young
c705f0f85f Mechlovin Zed65 Wearhaus66 Configurator Fixes (#18507) 2022-09-28 23:32:03 -07:00
QMK Bot
a32092e6c3 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 01:03:19 +00:00
dependabot[bot]
c71bc77da1 Bump anothrNick/github-tag-action from 1.46.0 to 1.49.0 (#18515)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-29 11:02:36 +10:00
Joshua Diamond
d2e5e64990 Merge remote-tracking branch 'origin/master' into develop 2022-09-28 16:47:03 -04:00
Mike Ryan
d6f77637c5 [Keyboard] dygma/raise: multiple fixes and improvements (#18361[) 2022-09-28 12:23:42 -07:00
QMK Bot
2079446452 Merge remote-tracking branch 'origin/master' into develop 2022-09-28 19:23:34 +00:00
Alabahuy
d050e689f5 [Keyboard] add rart80 (#18287) 2022-09-28 12:23:17 -07:00
Luis Carlos
269600f640 Update feature_tap_dance.md (#18509)
Fixed typo
2022-09-28 20:22:59 +01:00
QMK Bot
0169a066f8 Merge remote-tracking branch 'origin/master' into develop 2022-09-28 19:22:00 +00:00
Max Renner
7b7255553c [Keymap] Add rennerom planck layout (#17283)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-28 12:21:16 -07:00
QMK Bot
628aef63fe Merge remote-tracking branch 'origin/master' into develop 2022-09-28 19:21:10 +00:00
Felix Jen
6f108642eb [Keyboard] Add KG60 and KG65 (#17565)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-28 12:20:26 -07:00
izmishi
703d8cd417 Fix retain brightness when val is changed while a layer is active (#18426)
* Fix retain brightness when val is changed while a layer is active

* Fix retain brightness for RGBLIGHT_MODE_STATIC_GRADIENT

* Fix formatting
2022-09-28 13:16:24 -04:00
QMK Bot
8d8e70fc3f Merge remote-tracking branch 'origin/master' into develop 2022-09-27 13:52:20 +00:00
Ramon Imbao
63c87f591e Update VID and PID of Abats Keyboard Club Nayeon (#18503) 2022-09-27 14:51:40 +01:00
QMK Bot
baf1847637 Merge remote-tracking branch 'origin/master' into develop 2022-09-27 12:45:21 +00:00
Arturo Avila
848e1ec318 [Keyboard] Updated Kintsugi to support encoder mapping (#18492) 2022-09-27 05:44:41 -07:00
QMK Bot
bb3627dae0 Merge remote-tracking branch 'origin/master' into develop 2022-09-27 12:37:28 +00:00
JX
f8c8005ce1 [Keyboard] Add wave75 (#18490) 2022-09-27 05:36:49 -07:00
QMK Bot
49ac435be1 Merge remote-tracking branch 'origin/master' into develop 2022-09-27 09:17:29 +00:00
James Young
7d0c1332cc Mechlovin Foundation Configurator Cleanup (#18500) 2022-09-27 02:17:08 -07:00
James Young
492c34f8d0 Linworks FAve 87H Layout Refactor (#18497) 2022-09-27 02:16:51 -07:00
James Young
e1980726ba Linworks FAve 84H Layout Refactor (#18496) 2022-09-27 02:16:35 -07:00
Arturo Avila
cad1547ee6 [Keyboard] Add Obi keyboard (#18489) 2022-09-27 02:16:23 -07:00
Zicodia
e021fe90b1 [Keyboard] Add TKLFRLNRLMLAO (#18487)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-27 02:16:03 -07:00
Ryan
be8907d634 Further refactoring of joystick feature (#18437) 2022-09-27 18:37:13 +10:00
Drashna Jaelre
fb400f2ac2 Enabling Pointing Device support in register code functions (#18363) 2022-09-26 20:49:32 -07:00
Drashna Jaelre
d909038b28 Move Oneshot mod callbacks to after mods are set (#18101) 2022-09-26 20:49:15 -07:00
QMK Bot
ce0cd17a13 Merge remote-tracking branch 'origin/master' into develop 2022-09-27 01:54:07 +00:00
James Young
045170a958 Keyten Aperture Community Layout support (#18495)
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs

* enable Community Layouts support

* info.json: format whitespace

- apply four-space indent
- remove trailing whitespace

* info.json: correct maintainer value

Field is intended to reference the maintainer's GitHub username.
2022-09-27 02:53:31 +01:00
QMK Bot
3788d4c879 Merge remote-tracking branch 'origin/master' into develop 2022-09-26 23:44:33 +00:00
James Young
357eeafd39 Keyquest Enclave-1: rename LAYOUT to LAYOUT_ortho_3x3 (#18494)
* rename LAYOUT to LAYOUT_ortho_3x3

* info.json: correct maintainer value

Field is intended to reference the maintainer's GitHub username.
2022-09-27 00:43:33 +01:00
QMK Bot
7113ff3a6a Merge remote-tracking branch 'origin/master' into develop 2022-09-26 06:16:20 +00:00
Drashna Jaelre
b521641c50 [Keyboard] Ploopy Thumb Trackball (#18214)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: ploopyco <git@ploopy.co>
2022-09-25 23:15:50 -07:00
QMK Bot
99d4225135 Merge remote-tracking branch 'origin/master' into develop 2022-09-26 06:14:44 +00:00
Nick Lopez
d98ec93eb8 [Keyboard] Add Osborne 1 handwired keyboard (#18397)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-25 23:14:36 -07:00
zhiquankhor
65d0fef47a [Keymap] Add zq keymap for w1_at (#18479) 2022-09-25 23:13:48 -07:00
QMK Bot
07db8c3813 Merge remote-tracking branch 'origin/master' into develop 2022-09-26 06:12:54 +00:00
Alejandro J
667831daba [Keymap] Add ajarov's crkbd layout (#17479)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-25 23:12:24 -07:00
QMK Bot
6d309e166b Merge remote-tracking branch 'origin/master' into develop 2022-09-26 06:12:09 +00:00
Ben Allen
1b9de35f3a [Keymap] Adding Benrestech keymap for the Crkbd (#18163)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-25 23:11:48 -07:00
JX
e2954cd432 [Keyboard] add yr6095 (#18278) 2022-09-25 23:11:22 -07:00
QMK Bot
247c40544a Merge remote-tracking branch 'origin/master' into develop 2022-09-26 06:01:32 +00:00
Ramon Imbao
7a5a99b6a5 [Keyboard] Add GHS.JEM (#17340)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-25 23:00:59 -07:00
James Young
e64ec530cd Durgod K310/K320 Refactor (#18224) 2022-09-25 22:59:58 -07:00
QMK Bot
1fd8a45dde Merge remote-tracking branch 'origin/master' into develop 2022-09-26 05:51:46 +00:00
JX
995a0077fc [Keyboard] add eau75 (#18173)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-25 22:51:09 -07:00
QMK Bot
e1d63ad0df Merge remote-tracking branch 'origin/master' into develop 2022-09-26 05:42:40 +00:00
Cao Thai Duong
6809f154c9 [Keyboard] Add Handwired 87 keys (#17682)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-25 22:42:04 -07:00
QMK Bot
77e3f8704a Merge remote-tracking branch 'origin/master' into develop 2022-09-26 04:53:53 +00:00
syntax-magic
04b93bd2a9 [Keymap] Switched keys around in RIGHFN layer and updated indicator lights to green (#18465)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
2022-09-25 21:53:16 -07:00
Ryan
ea2819b2c2 Change {LED,RGB}_DISABLE_TIMEOUT to {LED,RGB}_MATRIX_TIMEOUT (#18415) 2022-09-26 14:40:15 +10:00
QMK Bot
9509dfbe39 Merge remote-tracking branch 'origin/master' into develop 2022-09-26 03:39:18 +00:00
Joe Scotto
fe7ee4961c [Keyboard] Add Scotto9 Macropad (#18452)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-25 20:39:09 -07:00
Daniel Shields
a4dcf22fd7 [Keymap] Tune mod tap configuration for dshields home row mods (#18458) 2022-09-25 20:38:37 -07:00
Ryan
675d91b813 Generate DD RGBLight/LED/RGB Matrix animation defines (#18459) 2022-09-26 01:04:21 +01:00
QMK Bot
5c2b598c42 Merge remote-tracking branch 'origin/master' into develop 2022-09-26 00:00:58 +00:00
jack
82eb98449d Fixup saevus/cor_tkl (#18476) 2022-09-26 01:00:20 +01:00
Drashna Jaelre
5abb125b02 [Keymap] develop updates for Drashna Keymaps (#18472) 2022-09-25 13:04:00 -07:00
QMK Bot
34490f098a Merge remote-tracking branch 'origin/master' into develop 2022-09-25 18:03:54 +00:00
Albert Y
ab58ae582e [Keyboard] Layout matrix correction (#18473) 2022-09-25 19:03:19 +01:00
jack
d84b1d1013 Fixup cradio bootloader/processor (#18477) 2022-09-25 18:56:58 +01:00
QMK Bot
ad586293eb Merge remote-tracking branch 'origin/master' into develop 2022-09-25 12:05:24 +00:00
Nick Brassel
1bdf4cdc22 Fix tzarc/djinn screen geometry. (#18478) 2022-09-25 22:04:52 +10:00
jack
c7a65558ee Remove lingering DRIVER_LED_TOTAL references (#18475) 2022-09-25 19:32:51 +10:00
QMK Bot
d69c7849b0 Merge remote-tracking branch 'origin/master' into develop 2022-09-25 07:55:12 +00:00
Ryan
056d6aee27 Untangle layouts for Dimple rev3 and Infinity87 (#18462) 2022-09-25 17:54:41 +10:00
QMK Bot
cbd6f4fa7f Merge remote-tracking branch 'origin/master' into develop 2022-09-24 19:59:05 +00:00
Drashna Jaelre
431c92893f [Keyboard] Update Work Louder VIA layouts (#18470)
* [Keyboard] Fix Encoder Maps for Work Louder Boards

* Fix via keymap for work board

* Cleanup
2022-09-24 20:58:10 +01:00
Drashna Jael're
8478e96de6 Merge remote-tracking branch 'origin/master' into develop 2022-09-24 12:23:36 -07:00
Joe Scotto
e88f0adcae [Keyboard] Add Scotto36 Keyboard (#18446) 2022-09-24 11:56:06 -07:00
adophoxia
7caf0b1ab8 [Keyboard] Add Keychron Q0 (#18348) 2022-09-24 11:53:22 -07:00
Ramon Imbao
dfa6fd4b2a [Keyboard] Add Plywrks Allaro (#18275)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-24 11:49:13 -07:00
Falke Carlsen
2901649578 [Keymap] falkecarlsen gmmk keymap and readme (#17286) 2022-09-24 09:39:44 -07:00
Andre Brait
32204f4a03 GMMK Pro: fix unintended volume encoder taps (#17129) 2022-09-24 09:37:04 -07:00
Joel Challis
6d4d228bea [Keyboard] Add SENSE75 firmware (#18442) 2022-09-24 09:05:12 -07:00
Wes Lord
244f27ac27 Remove orphan custom functions reference in keymap docs (#18444) 2022-09-24 09:04:14 -07:00
Albert Y
0dca9a1f62 [Keyboard] Convert Cradio config to data driven model (#18412) 2022-09-24 08:44:50 -07:00
Thomas
94d5fe6f90 Allow Active High for Pointing Device Motion Pin (#18404)
Needed by the Cirque Trackpad for motion detection
2022-09-24 08:44:14 -07:00
QMK Bot
c932e76d36 Merge remote-tracking branch 'origin/master' into develop 2022-09-24 15:39:10 +00:00
Andrew Kannan
fa1388a42e [Keyboard] Add Moment Hotswap PCB (#18384) 2022-09-24 08:38:42 -07:00
QMK Bot
6b998e9a6d Merge remote-tracking branch 'origin/master' into develop 2022-09-24 15:36:49 +00:00
Ramon Imbao
5ff2d93582 [Keyboard] Add Saevus Cor TKL (#18369) 2022-09-24 08:36:19 -07:00
QMK Bot
6b94c4d791 Merge remote-tracking branch 'origin/master' into develop 2022-09-24 15:36:12 +00:00
Steven Karrmann
3072feb8ed [Keyboard] Add Janus keyboard (#18367)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-24 08:35:37 -07:00
Drashna Jael're
4add874867 Merge remote-tracking branch 'origin/master' into develop 2022-09-24 07:14:33 -07:00
takashicompany
45cc7f1e94 [Keyboard] Add GOAT51 (#18220)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-24 07:05:53 -07:00
lunatic
fe9c1d8e45 [Keyboard] add CherryB CB65 (#18356) 2022-09-24 06:58:03 -07:00
jun10000
6cf4af9876 [Keyboard] Add om60 rev1 keyboard (#18126)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jun10000 <jun1kbd@outlook.jp>
2022-09-24 00:38:43 -07:00
QMK Bot
df30327c19 Format code according to conventions (#18466) 2022-09-24 00:34:44 -07:00
Matt Chan
e3e0a35b58 kegen/gboy: Fix typo in readme.md; add labels to info.json and reformat for readability (#18269)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-24 00:03:07 -07:00
Alabastard-64
7c1797f52f [Core] Pointing Device Automatic Mouse Layer (#17962)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-09-23 23:43:55 -07:00
QMK Bot
2318ae0433 Merge remote-tracking branch 'origin/master' into develop 2022-09-23 23:41:08 +00:00
Wilba
2791ceb6aa Add caps lock and scroll lock indicators (#17725) 2022-09-23 19:39:55 -04:00
QMK Bot
15f4bc6583 Merge remote-tracking branch 'origin/master' into develop 2022-09-23 22:27:27 +00:00
James Young
03a671e795 JadooKB JKB65 Community Layout Support (#18461)
* rename LAYOUT_67_ansi to LAYOUT_65_ansi_blocker

* enable Community Layouts support
2022-09-23 23:26:52 +01:00
Ryan
36c410592d Change DRIVER_LED_COUNT to {LED,RGB}_MATRIX_LED_COUNT (#18399) 2022-09-23 22:46:23 +10:00
QMK Bot
d967de0df7 Merge remote-tracking branch 'origin/master' into develop 2022-09-22 23:52:56 +00:00
dependabot[bot]
3b7aeddc4d Bump actions/stale from 5 to 6 (#18456)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-23 09:52:21 +10:00
Stefan Kerkmann
b8ffaa6331 Copy RP2040 vector table to RAM on startup (#18424)
...this reduces possible latency when invoking interrupt handlers by
mitigating XIP cache misses which are not existent when running code from
RAM.
2022-09-22 22:48:20 +01:00
Stefan Kerkmann
828a1db035 Update chibios-contrib for RP2040 i2c fixes take 2 (#18455)
...includes missing system locking inside a timeout waiting condition and
updates to the rp2040 linker file.
2022-09-22 20:57:50 +01:00
QMK Bot
f28d899908 Merge remote-tracking branch 'origin/master' into develop 2022-09-21 21:01:00 +00:00
Drashna Jaelre
ea80141f69 [Docs] Explicitly mention kb/user callbacks as boolean (#18448)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-21 14:00:25 -07:00
QMK Bot
9b42ee1f6d Merge remote-tracking branch 'origin/master' into develop 2022-09-21 17:33:15 +00:00
bojiguard
ee22f34e69 Fungo rev1: fix QMK Configurator key sequence - info.json (#18434)
* * info.json: fix key position and order

* fix json format

* Update keyboards/fungo/rev1/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-21 18:32:31 +01:00
Ryan
2f48d300f4 Normalise info_config.h define generation (#18439)
* Normalise info_config.h define generation

* format

* Fix tests

* Update lib/python/qmk/cli/generate/config_h.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-09-21 18:31:57 +01:00
QMK Bot
fc7f3f17e6 Merge remote-tracking branch 'origin/master' into develop 2022-09-21 11:09:23 +00:00
Nick Brassel
b03a3d7047 Checklist clarification. (#18440) 2022-09-21 12:08:47 +01:00
Ryan
591701cdf9 Fix incorrect g_led_config generation (#18431) 2022-09-21 02:41:18 +01:00
Ryan
89a1374ef4 Add DD mapping for LED/RGB Matrix center (#18432) 2022-09-21 00:45:07 +01:00
QMK Bot
8dc81309f4 Merge remote-tracking branch 'origin/master' into develop 2022-09-20 18:44:34 +00:00
Álvaro A. Volpato
b0f824755a Update Apollo PCBs to use wear levelling code (#18411) 2022-09-20 11:43:49 -07:00
Stefan Kerkmann
881aab9e76 Stabilize Half-duplex PIO split comms take 2 (#18421)
...by moving the actually timing critical `enter_rx_state()` and
`leave_rx_state()` functions to RAM in order to not be affected by XIP
cache spikes. This commit also reverts the hacky USB interrupt disabling
that was done in 293c53d774
2022-09-20 08:54:43 +02:00
QMK Bot
ea90fccbd6 Merge remote-tracking branch 'origin/master' into develop 2022-09-20 06:53:12 +00:00
Joel Challis
456d6f3342 Remove legacy keycodes from unit tests (#18430) 2022-09-20 08:52:43 +02:00
QMK Bot
c4d8da4112 Merge remote-tracking branch 'origin/master' into develop 2022-09-20 06:20:27 +00:00
Jimmy Sjölund
100cf3db3a [Keymap] Added Kyria keyboard to jimmysjolund (#18335) 2022-09-19 23:19:51 -07:00
Stefan Kerkmann
5a563444ac Update ChibiOS to latest 21.11.2 (#18428)
This includes a hotfix for RP2040 deadlocks due to XIP cache misses in
the ChibiOS virtual timer implementation.
2022-09-20 01:14:43 +01:00
QMK Bot
0803e2ec00 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 19:27:27 +00:00
Danny
41fdf32afb Add encoder map to Quefrency VIA keymap (#18380)
* Add encoder map to Quefrency VIA keymap

* Explicitly define which RGB animations are enabled

* Set different PID to prep for different VIA .json usage

* Add ifdefs to handle if ENCODER_ENABLE is set to NO
2022-09-19 20:26:29 +01:00
QMK Bot
e517790b5e Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:43:16 +00:00
Felix Springer
51620c1042 Fix boardsource/lulu RGB matrix (#18407)
* Fix ordering of entries for RGB matrix.

* Fix typos in RGB matrix definition.

These matrix indices overlapped.

* Improve positions in RGB matrix.

The rotary encoder and the key below that are in a new column.
The rotary encoder's height is inbetween rows.
The key below is kind of off-axis and thus hard to pin down to a
specific location.

The modifer keys in the bottom row are staggered compared to the other
columns.
2022-09-19 19:42:38 +01:00
Ryan
8d0fb4ca9e Add DD mapping for LED/RGB Matrix HSVS steps (#18414) 2022-09-19 19:36:48 +01:00
QMK Bot
731000533f Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:35:02 +00:00
Marius Renner
652d1d8a6d Fix int8_t overflow in RGB heatmap effect (#18410) 2022-09-19 19:34:29 +01:00
Stefan Kerkmann
613e3f68b5 Update pico-sdk to version 1.4.0 (#18423)
...which contains fixes for GCC warnings.
2022-09-19 19:30:16 +01:00
QMK Bot
4af51ea601 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:19:45 +00:00
Danny
89df40d4f3 Enable more BDN9 RGB effects (#18420) 2022-09-19 19:19:13 +01:00
QMK Bot
8bcbc2aced Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:19:00 +00:00
Derek
ed6679b89c [Keyboard] Sodium50 - Fix configuration (#18422) 2022-09-19 19:18:13 +01:00
Stefan Kerkmann
2aa3a8e059 [Core] remove busy waiting from rgblight functions (#18418) 2022-09-19 18:05:31 +02:00
QMK Bot
252810a72c Merge remote-tracking branch 'origin/master' into develop 2022-09-19 01:20:51 +00:00
coliss86
2c516fab29 [Docs] Extract 'Layer Change Code' and EEPROM (#18174)
* [Docs] Extract 'Layer Change Code' and EEPROM

* adjust wording

* Update docs/custom_quantum_functions.md

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-19 02:20:22 +01:00
Joel Challis
20f142a772 Tidy up LAYOUT macro generation (#18262) 2022-09-19 01:35:46 +01:00
QMK Bot
07936d37b6 Merge remote-tracking branch 'origin/master' into develop 2022-09-18 23:11:22 +00:00
Daniel Shields
d8ef2ea7dd Add home row modifiers to dshields keymaps. (#18376) 2022-09-18 19:10:50 -04:00
QMK Bot
b7358825d7 Merge remote-tracking branch 'origin/master' into develop 2022-09-18 23:09:33 +00:00
Joel Challis
e7e08030d2 Reduce charue/sunsetter_r2 firmware size (#18378)
* Reduce charue/sunsetter_r2 firmware size

* add rules.mk
2022-09-19 00:09:02 +01:00
Joshua Diamond
9a1b4b78f1 Merge remote-tracking branch 'origin/master' into develop 2022-09-18 19:06:31 -04:00
Danny
ecb4ba70b1 Add encoder map to BDN9 VIA keymap (#18388) 2022-09-18 19:01:05 -04:00
jonavin
c6ff10a257 FIx ARRAYSIZE def and Murphpad string array (#18392)
Co-authored-by: Jonavin <=>
2022-09-18 18:57:37 -04:00
Ryan
8beb61b790 Add DD mapping for LED/RGB Matrix split count (#18408) 2022-09-18 22:57:50 +01:00
Nick Brassel
1849897444 [QP] Add RGB565 surface. Docs clarification, cleanup, tabsification, and reordering. (#18396) 2022-09-19 07:30:08 +10:00
QMK Bot
e9bdc4eeb1 Merge remote-tracking branch 'origin/master' into develop 2022-09-18 21:19:38 +00:00
Nick Brassel
c56dc9c0bb Fixup axon40 lint. (#18409)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-19 07:19:03 +10:00
Ryan
0f5cfc0363 Add DD mapping for LED/RGB Matrix max brightness (#18403) 2022-09-18 20:32:47 +01:00
Joel Challis
1155140631 Add Elite-C to converters (#18309) 2022-09-18 20:30:27 +01:00
Joshua Diamond
a3a47a6556 Work around WinCompose issue for U+Axxx or U+Exxx (#18260)
* Work around WinCompose issue for U+Axxx or U+Exxx

* tzarc's more efficient version

Co-authored-by: Thomas <mail@tpreisner.de>
2022-09-18 11:51:04 -04:00
QMK Bot
f0940a6fe4 Merge remote-tracking branch 'origin/master' into develop 2022-09-18 06:02:20 +00:00
Less/Rikki
3444dd5e2d [keyboard] kbdfans/kbd75rgb info.json fix (#18391) 2022-09-18 16:01:46 +10:00
Dasky
db6a637398 Fix EECONFIG_KEYMAP_UPPER_BYTE init (#18394)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-17 20:58:46 +01:00
Drashna Jaelre
fb29c0ae53 [Core] Add getreuer's Autocorrect feature to core (#15699)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2022-09-17 17:50:54 +10:00
Drashna Jaelre
d67d388e77 Move mousekey keycodes into newly freed up keycode block (#16076) 2022-09-17 15:49:00 +10:00
Joshua Diamond
a26f1ddafa Chromeos keycodes (#18212) 2022-09-17 15:48:09 +10:00
Ryan
33c47fe010 Add UART support for Kinetis boards (#18370)
* Add UART support for Kinetis boards

* Default PAL mode for GPIOV1
2022-09-17 02:24:03 +01:00
QMK Bot
786fabc144 Merge remote-tracking branch 'origin/master' into develop 2022-09-16 21:04:10 +00:00
dependabot[bot]
4781a798ca Bump anothrNick/github-tag-action from 1.45.0 to 1.46.0 (#18386)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.45.0 to 1.46.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.45.0...1.46.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-16 22:03:32 +01:00
QMK Bot
7598ea9be9 Merge remote-tracking branch 'origin/master' into develop 2022-09-16 17:38:10 +00:00
npspears
799046fd9d Quark revision - rotary encoder and 7u support (#17664)
by npspears
2022-09-16 18:37:39 +01:00
QMK Bot
3ceaf7f72c Merge remote-tracking branch 'origin/master' into develop 2022-09-16 16:25:54 +00:00
an_achronism
1ec8ae8a49 Initial support for Tetromino added (#18341)
by the spherical lad @an-achronism
2022-09-16 17:25:16 +01:00
QMK Bot
cf0494e458 Merge remote-tracking branch 'origin/master' into develop 2022-09-16 08:19:51 +00:00
Nick Brassel
cf88d95613 Add ability to remove temporary files during multibuild. (#18381) 2022-09-16 09:19:10 +01:00
Ryan
bc0756f294 Disconnect usb.device_ver (#18259) 2022-09-16 12:05:25 +10:00
QMK Bot
b223e29921 Merge remote-tracking branch 'origin/master' into develop 2022-09-16 01:03:59 +00:00
Joel Challis
617f957e82 Fix handwired/swiftrax/bumblebee layout macro (#18377) 2022-09-16 02:03:18 +01:00
Dasky
e1aed8da08 Move fake EE_HANDS (#18352) 2022-09-16 00:06:00 +01:00
QMK Bot
08738aab7e Merge remote-tracking branch 'origin/master' into develop 2022-09-15 18:17:44 +00:00
ziptyze
57c35bd817 [Keyboard] Add pi40 (#18207)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-15 11:16:58 -07:00
QMK Bot
6f75226460 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 06:53:13 +00:00
Vino Rodrigues
56bad5d357 [Keyboard] Removal of deprecated defines in IDOBAO keyboards (#18358) 2022-09-14 23:52:38 -07:00
Dasky
40b0b3a983 Fix cirque tap from secondary side (#18351) 2022-09-14 23:48:43 -07:00
QMK Bot
6d39cc858f Merge remote-tracking branch 'origin/master' into develop 2022-09-15 00:14:52 +00:00
ENDO Katsuhiro
f483520ff9 Fix problem that Chidori is not recognized by host computer. (#17882) 2022-09-15 01:14:19 +01:00
QMK Bot
a949164b99 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 00:05:17 +00:00
Drew Hamilton
3fbc3ac8ad [Keyboard] Add a new keyboard 'plum47' (#18359) 2022-09-15 01:04:40 +01:00
QMK Bot
13dab7f050 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 00:04:32 +00:00
Joel Challis
01f31bf28e [Docs] RESET -> QK_BOOT (#18365) 2022-09-15 01:03:55 +01:00
QMK Bot
91a3ae24fe Merge remote-tracking branch 'origin/master' into develop 2022-09-14 22:56:12 +00:00
jack
0abde386ae Remove RESET keycodes from fjlabs keyboards (#18364) 2022-09-14 23:54:24 +01:00
Joel Challis
8d715fc16b Remove deprecated RESET keycode alias (#18271) 2022-09-14 11:15:57 -07:00
QMK Bot
5492dd00c7 Merge remote-tracking branch 'origin/master' into develop 2022-09-14 18:14:36 +00:00
Andrew Kannan
017398c283 [Keyboard] Add Vector PCB (#17380) 2022-09-14 11:13:13 -07:00
QMK Bot
da60b89dc0 Merge remote-tracking branch 'origin/master' into develop 2022-09-14 17:56:45 +00:00
jels
624ab64750 [Keyboard] Add Calice (#17929)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-14 10:56:09 -07:00
QMK Bot
dd7b700ab1 Merge remote-tracking branch 'origin/master' into develop 2022-09-14 16:00:10 +00:00
James Young
083ac400e2 GeonWorks Frog Mini Soldered Layout Rework (#18308) 2022-09-14 08:59:17 -07:00
QMK Bot
ff2585dc49 Merge remote-tracking branch 'origin/master' into develop 2022-09-14 15:41:05 +00:00
satorusaka
87b1b560cb [Keyboard] Add skmt/15k keyboard (#18321)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-14 08:40:18 -07:00
QMK Bot
41da1f42de Merge remote-tracking branch 'origin/master' into develop 2022-09-14 15:18:04 +00:00
Ramon Imbao
fc3f2dcb43 [Keyboard] Replace Nayeon ATmega32u4 config with RP2040 (#18265) 2022-09-14 08:16:54 -07:00
QMK Bot
d2ce817dfa Merge remote-tracking branch 'origin/master' into develop 2022-09-14 00:36:56 +00:00
dependabot[bot]
23666150e9 Bump anothrNick/github-tag-action from 1.42.0 to 1.45.0 (#18355)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-14 10:36:20 +10:00
QMK Bot
e591b94544 Merge remote-tracking branch 'origin/master' into develop 2022-09-14 00:21:20 +00:00
Reibl János Dániel
6984c6d3b3 fix: Remove TERM_ON/TERM_OFF from my keymap (#18354) 2022-09-14 01:20:34 +01:00
QMK Bot
38f9b0beea Merge remote-tracking branch 'origin/master' into develop 2022-09-13 11:11:26 +00:00
dependabot[bot]
2800cd31ae Bump anothrNick/github-tag-action from 1.39.0 to 1.42.0 (#18344)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-13 21:10:52 +10:00
Joshua Diamond
23e12497b2 Merge remote-tracking branch 'origin/master' into develop 2022-09-12 18:57:58 -04:00
Purdea Andrei
b2ad047d7f Fix keyboard_name for Unicomp Classic/Ultra Classic keyboards (#18327) 2022-09-12 23:10:17 +01:00
Joshua Diamond
7c49b8caa9 Adapt to unicode refactoring (#18345) 2022-09-12 21:32:52 +01:00
ebastler
110de0b512 Add EM.8 keyboard (#18328)
by ebastler
2022-09-12 17:17:01 +01:00
Thomas
55c637f28f [Docs] Fix docs regarding cirque pinnacle attenuation (#18279) 2022-09-12 08:56:21 -07:00
Ryan
3d667f0970 Refactor Unicode feature (#18333) 2022-09-12 08:49:04 -07:00
Vino Rodrigues
f46379f308 fixed missing x coordinate on spacebar (#18330) 2022-09-11 13:07:32 +01:00
Joel Challis
16c2b528df GMMK2: Fix 'ISO' within product name (#18322) 2022-09-10 13:31:46 +01:00
Joel Challis
4087251da6 Reboot wb32 devices after flashing (#18323) 2022-09-10 01:14:12 +01:00
Joy Lee
405a32ddf4 Added gmmk v2 p65 keyboard. (#18185) 2022-09-09 23:12:48 +01:00
Ryan
f20883fef1 RN42 driver: small cleanups (#18310)
* RN42 driver: small cleanups

* Include header

* Fix mouse report per RN42 UG

* Spacing for consistency
2022-09-09 21:36:39 +01:00
Joel Challis
725df1278b Fix '_RIGHT' matrix pins lint error (#18320) 2022-09-09 21:22:55 +01:00
Joel Challis
9e24262161 Fix DD use within boardsource/microdox (#18319) 2022-09-09 21:21:48 +01:00
QMK Bot
a18aab4c3c Merge remote-tracking branch 'origin/master' into develop 2022-09-09 18:17:46 +00:00
ZhaoYou.Ge
9ad75dbf47 'soda/cherish' support apm32f072 (#18316) 2022-09-09 19:17:10 +01:00
QMK Bot
2b30b3e168 Merge remote-tracking branch 'origin/master' into develop 2022-09-09 12:41:51 +00:00
Jacqueline Liang
88555d8e18 Add via support for 6key (#18082) 2022-09-09 13:41:18 +01:00
QMK Bot
b6a79bec46 Merge remote-tracking branch 'origin/master' into develop 2022-09-09 01:58:52 +00:00
James Young
107ccc56b4 Hillside 46 & 52: remove dead space from QMK Configurator renderings (#18315)
* Hillside 46 info.json: fix syntax error

* Hillside 46 info.json: remove dead space

* Hillside 52 info.json: remove dead space
2022-09-09 02:57:46 +01:00
Danny
fb6e821541 Add Elite-Pi converter (#18236)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-08 14:59:27 -04:00
QMK Bot
3e0a22d532 Merge remote-tracking branch 'origin/master' into develop 2022-09-07 21:52:45 +00:00
Danny
7b4dc5a7e4 Add Iris Rev. 6b (#18307) 2022-09-07 17:52:11 -04:00
QMK Bot
60d2108f23 Merge remote-tracking branch 'origin/master' into develop 2022-09-07 21:30:54 +00:00
James Young
ce90be0961 GeonWorks Frog Mini Hotswap Layout Rework (#18305)
* fmh.h: add matrix diagram

* info.json: apply friendly formatting

* physically arrange LAYOUT_all macro

Move position `K5D` (right half of Split Backspace) to the end of the top row.

* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_ansi_tsangan

* add LAYOUT_60_hhkb

* add LAYOUT_60_ansi_wkl

* add LAYOUT_60_ansi_wkl_split_bs_rshift

* enable Community Layouts support
2022-09-07 14:30:17 -07:00
QMK Bot
fd8875f82c Merge remote-tracking branch 'origin/master' into develop 2022-09-07 21:05:23 +00:00
Danny
3f65d48539 Update Iris VIA configuration (#18306)
* Update RGB matrix max brightness

* Remove old VIA workaround code

* Fix default encoder rotations	for encoder map
2022-09-07 22:04:46 +01:00
QMK Bot
4bbac50277 Merge remote-tracking branch 'origin/master' into develop 2022-09-07 19:19:22 +00:00
mechlovin
b0dc789a1b [Keyboard] Wearhaus66 correct matrix (#18284) 2022-09-07 20:18:48 +01:00
QMK Bot
9ca91a7a98 Merge remote-tracking branch 'origin/master' into develop 2022-09-07 19:18:35 +00:00
David Luo
76910eece1 enable RGB matrix effects for drop ctrl (#18291) 2022-09-07 20:17:52 +01:00
Ryan
f7d2b001bc Move Bluetooth-related function calls up to host/keyboard level (#18274)
* Move Bluetooth-related function calls up to host/keyboard level

* Remove pointless set_output() call

* Move bluetooth (rn42) init to end of keyboard_init()

* Enable SPI/UART for ChibiOS targets

* Some more slight tweaks
2022-09-07 19:59:24 +01:00
QMK Bot
cf8cdd1992 Merge remote-tracking branch 'origin/master' into develop 2022-09-07 18:53:04 +00:00
syntax-magic
6321cbaadd [Keymap] removed else in numlock led if statement (#18304) 2022-09-07 19:52:32 +01:00
QMK Bot
54f6b61643 Merge remote-tracking branch 'origin/master' into develop 2022-09-07 16:15:38 +00:00
syntax-magic
8a0c0f72a5 added a new kprepublic/bm40hsrgb keymap called dan (#18301)
by syntax-magic
2022-09-07 17:14:46 +01:00
QMK Bot
03f6954c3a Merge remote-tracking branch 'origin/master' into develop 2022-09-07 10:39:35 +00:00
ddeklerk
a082fcc933 Delete my keymaps (#18302) 2022-09-07 20:38:54 +10:00
Dasky
d30f0f71d0 Remove legacy define SERIAL_USE_MULTI_TRANSACTION (#18299) 2022-09-07 00:42:28 +01:00
Dasky
c2b35b2327 Remove legacy define USE_SERIAL_PD2 (#18298) 2022-09-07 00:35:47 +01:00
Joshua Diamond
ff7470420a Merge remote-tracking branch 'origin/master' into develop 2022-09-06 19:03:08 -04:00
Michael Stapelberg
f733307551 keymaps/stapelberg: keypad layer for multimedia keys, wake on escape (#18295)
This makes more keys function as printed on the actual keyboard :)
2022-09-06 23:13:12 +01:00
Joshua Diamond
a4d1d8b745 Resolve conflict merging master to develop (#18297)
* Discourage use of ENCODER_MAP at keyboard level (#18286)

* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

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

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

* Fungo rev1: fix QMK Configurator key sequence (#18293)

* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence

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>
2022-09-06 17:42:43 -04:00
Dasky
dc4af81e0b Remove legacy USE_SERIAL define (#18292)
* Remove legacy USE_SERIAL define

* tidy up missed comments
2022-09-06 18:46:34 +01:00
James Young
7160487ccd Fungo rev1: fix QMK Configurator key sequence (#18293)
* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence
2022-09-06 18:36:37 +01:00
Joel Challis
60cac6d938 Discourage use of ENCODER_MAP at keyboard level (#18286)
* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-06 18:08:48 +01:00
Ryan
8833b28361 Remove UNICODE_KEY_OSX and UC_OSX (#18290) 2022-09-06 18:07:08 +01:00
QMK Bot
c6ab11bc45 Merge remote-tracking branch 'origin/master' into develop 2022-09-06 04:26:42 +00:00
James Young
712aa7b1cd Mars 6.5 Layout Additions (#18282)
* info.json: apply friendly formatting

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_split_bs

* enable Community Layouts support

* info.json: correct maintainer value
2022-09-06 05:26:11 +01:00
QMK Bot
165c15e250 Merge remote-tracking branch 'origin/master' into develop 2022-09-06 04:26:03 +00:00
Joel Challis
0306bdf7fd Remove use of legacy keycode (#18281) 2022-09-06 05:25:32 +01:00
QMK Bot
f010af0c8e Merge remote-tracking branch 'origin/master' into develop 2022-09-05 13:15:04 +00:00
James Young
5f1273fca6 EU ISOlation: fix QMK Configurator key sequence (#18272)
* eu_isolation.h: physically arrange layout macros

Whitespace only; no logic changes.

* info.json: apply friendly formatting

Add line breaks between physical rows.

* info.json: correct key sequence
2022-09-05 14:14:25 +01:00
QMK Bot
0ac18bfc84 Merge remote-tracking branch 'origin/master' into develop 2022-09-05 01:01:23 +00:00
AMing Lau
a36c95db60 Fix compilation error for GH60 satan HHKB 7u layout (#18250)
* Fix compilation error for GH60 satan HHKB 7u layout

* Update keyboards/gh60/satan/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2022-09-05 02:00:44 +01:00
Ryan
3e02b70d28 Rename keyboards with uppercase letters (#18268) 2022-09-04 21:36:33 +01:00
QMK Bot
a9f8111eac Merge remote-tracking branch 'origin/master' into develop 2022-09-03 21:44:27 +00:00
James Young
288808526b dyz60_hs Layout Additions (#18261)
* dyz60_hs: add matrix diagram

* add LAYOUT_60_ansi

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_iso

* add LAYOUT_60_iso_split_bs_rshift

* enable Community Layouts support

* readme.md: correct keyboard references

Replace `dyz60` with `dyz60_hs` as needed.
2022-09-03 22:43:52 +01:00
QMK Bot
3a56e973ff Merge remote-tracking branch 'origin/master' into develop 2022-09-03 18:47:52 +00:00
Ryan
3c09db41fe Fix a couple of boards still using usb.device_ver (#18258) 2022-09-03 14:47:22 -04:00
QMK Bot
d1c4008f1c Merge remote-tracking branch 'origin/master' into develop 2022-09-03 18:45:16 +00:00
Ryan
bfec30a9fe Clean up data driven mappings syntax (#18257) 2022-09-03 19:44:42 +01:00
QMK Bot
aa2e5fc6da Merge remote-tracking branch 'origin/master' into develop 2022-09-03 17:47:15 +00:00
coliss86
39e611794d [Docs] Update 'Process Record' according to the code (#18209)
* [doc] Update 'Process Record' according to the code

* [doc] fix link
2022-09-03 13:46:42 -04:00
QMK Bot
272b6f6ddb Merge remote-tracking branch 'origin/master' into develop 2022-09-03 15:27:31 +00:00
Xelus22
489b287e1f [Keyboard] RS60 Rev2 change to eeprom emulation (#18201)
by xelus
2022-09-03 16:27:00 +01:00
QMK Bot
556fd909eb Merge remote-tracking branch 'origin/master' into develop 2022-09-03 15:21:53 +00:00
Vino Rodrigues
0c76a3c7d0 [Keyboard] Add IDOBAO Abacus ID42 Keyboard (#16923)
by vinorodrigues
2022-09-03 16:21:00 +01:00
QMK Bot
2c9c62b365 Merge remote-tracking branch 'origin/master' into develop 2022-09-03 14:47:51 +00:00
Tim Traversy
f27c70fffc Add absolute key positions to microdox info.json (#18238) 2022-09-03 15:47:20 +01:00
QMK Bot
fea65c9856 Merge remote-tracking branch 'origin/master' into develop 2022-09-03 05:51:26 +00:00
Joel Challis
5c0e87608f Remove more RESET keycode references (#18252) 2022-09-03 06:50:44 +01:00
Ryan
f76b55d5ad Adjust EXTRAKEY_ENABLE ifdefs for send_extra() (#18249) 2022-09-02 21:50:36 +01:00
Ryan
09d668eb0e Simplify extrakeys sending at the host driver level (#18230)
* Simplify extrakeys sending at the host driver level

* There are two arguments here

* Wrong syntax

* Adjust keyboards which use a custom host driver
2022-09-02 20:38:27 +01:00
QMK Bot
0ceaaaae8e Merge remote-tracking branch 'origin/master' into develop 2022-09-02 16:10:46 +00:00
Brian
5d932e2612 [Keymap] Fixing location of my Keymap for the Gentleman65 (#18246) 2022-09-02 09:10:05 -07:00
QMK Bot
db90919c7a Merge remote-tracking branch 'origin/master' into develop 2022-09-02 15:33:43 +00:00
Drashna Jaelre
90418b371f [Keymap] Fix bootmagic compilation issue with Drashna keymaps (#18223) 2022-09-02 08:32:38 -07:00
QMK Bot
4ad659f226 Merge remote-tracking branch 'origin/master' into develop 2022-09-02 03:55:05 +00:00
Yoichiro Tanaka
27671d8a43 [Keyboard] Add Lunakey Pico (#18202)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-01 20:54:33 -07:00
QMK Bot
fbfb04b253 Merge remote-tracking branch 'origin/master' into develop 2022-09-02 03:48:58 +00:00
Jannik Becker
8c793c1a43 [Keyboard] Add Shoc Keyboard (#18143)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-09-01 20:48:24 -07:00
Joy Lee
b5a52b4cff Prevent USB peripheral fault when restarting USB on WB32 MCUs (#18058)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-09-01 20:48:02 -07:00
QMK Bot
6b6cbf6038 Merge remote-tracking branch 'origin/master' into develop 2022-09-02 03:43:52 +00:00
Joel Challis
26814ca060 Install correct package on Fedora (#18243) 2022-09-01 20:43:19 -07:00
Drashna Jaelre
423826a34a Better handle EEPROM reset keycode (#18244) 2022-09-01 20:43:06 -07:00
QMK Bot
98ed5b6cfa Merge remote-tracking branch 'origin/master' into develop 2022-09-01 23:33:21 +00:00
jpuerto96
101d7b5337 [Keyboard] Add Ingrained Keyboard (#15928)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Juan Puerto <jpuerto@psc.edu>
Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com>
2022-09-01 16:32:47 -07:00
QMK Bot
bc4ab8a433 Merge remote-tracking branch 'origin/master' into develop 2022-09-01 22:39:30 +00:00
Joel Challis
7adef85fa4 Remove non promicro pins from converters (#18239) 2022-09-01 15:38:52 -07:00
Joshua Diamond
e4bf832368 Add unicode mode change callbacks (#18235) 2022-08-31 16:39:16 -07:00
QMK Bot
b9effc94db Merge remote-tracking branch 'origin/master' into develop 2022-08-31 20:06:14 +00:00
3araht
1ccd0c19da Add giabalanai keyboard (#10125)
by 3araht
2022-08-31 21:05:43 +01:00
QMK Bot
55c0c920e9 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 19:30:30 +00:00
Ryan Neff
d4c935d8fa Added personal Iris Rev6a layout and Milk 2% layout (#17600)
by JellyTitan
2022-08-31 20:29:26 +01:00
QMK Bot
64749d3adc Merge remote-tracking branch 'origin/master' into develop 2022-08-31 17:20:16 +00:00
Benjamin Collet
6104b66014 Add bepo variant to massdrop/thekey keymaps (#18129)
by mrBen
2022-08-31 18:19:42 +01:00
QMK Bot
5af7982af1 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 17:18:46 +00:00
3araht
786b5d310d Bandominedoni encoder fix (#18229)
by 3araht
2022-08-31 18:17:54 +01:00
QMK Bot
8e6f8ec37f Merge remote-tracking branch 'origin/master' into develop 2022-08-31 16:44:57 +00:00
Drashna Jaelre
0faedb11cc [Keyboard] Updates to Work Louder keyboards (#18232)
by Drashna
2022-08-31 17:44:00 +01:00
QMK Bot
196b71ad53 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 16:41:59 +00:00
JX
de0d342b82 [Keyboard] add tg67 (#18225) 2022-08-31 09:41:14 -07:00
Ryan
50c4ca3426 Ensure all keyboards have a bootloader set (#18234) 2022-08-31 17:36:41 +01:00
Ryan
bb6f028833 Move bootloader.mk to platforms (#18228) 2022-08-31 07:17:24 -07:00
Marek Kraus
0237ff0c62 [Core] Rework PS/2 driver selection (#17892)
* [Core] Rework PS/2 driver selection

Enabling and selecting PS/2 driver was using old approach,
so it was reworked to current approach, inspired by Serial
and WS2812 driver selections.

* [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection

* [Docs] Update PS/2 documentation to use new PS/2 driver selection

* Fix indentation

* [Core] Add PS2 to data driver

* Fix oversight in property name

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

* Add PS/2 pins to data driven mappings

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-31 09:16:07 +02:00
QMK Bot
ba7030d216 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 05:20:33 +00:00
Ryan
6f804f76b4 qmk lint: fix TypeError (#18226) 2022-08-31 15:20:00 +10:00
QMK Bot
c249afefc6 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 18:29:41 +00:00
Andrew Kannan
bc538e3776 [Keyboard] CannonKeys Malicious Ergo (#17076)
* Add Malicious Ergo keyboard to QMK

* Update layout

* update info.json

* update info.json again

* Update info.json again

* i h8 info.json

* its default not all

* Update keyboards/cannonkeys/malicious_ergo/config.h

* Add bootloader instructions and license header

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Remove rotation from info.json

* Remove labels

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h

* Revise info.json again

* whitespace fix

* Apply suggestions from code review

Move pid/vid into info json
Fix rounding errors in info json

Thanks to fauxpark and noroadsleft!
2022-08-30 11:29:05 -07:00
QMK Bot
757a03cf1a Merge remote-tracking branch 'origin/master' into develop 2022-08-30 09:50:48 +00:00
yiancar
a9e726501d [Keyboard] Add NK65B (#18211)
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-30 02:50:43 -07:00
yiancar
907d7bfc54 [Keyboard] Add NK87B (#18210)
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-30 02:50:00 -07:00
QMK Bot
ef4f73ff00 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 08:41:07 +00:00
Drashna Jaelre
092dd58e34 [Keyboard] Fix layout macro for Cannonkeys Atlas keyboard (#18216) 2022-08-30 01:40:35 -07:00
QMK Bot
ae81e998ad Merge remote-tracking branch 'origin/master' into develop 2022-08-30 08:36:21 +00:00
jack
df4b01b433 fix boardsource/lulu (#18217) 2022-08-30 09:34:39 +01:00
Jeff Epler
9632360caa Use a macro to compute the size of arrays at compile time (#18044)
* Add ARRAY_SIZE and CEILING utility macros

* Apply a coccinelle patch to use ARRAY_SIZE

* fix up some straggling items

* Fix 'make test:secure'

* Enhance ARRAY_SIZE macro to reject acting on pointers

The previous definition would not produce a diagnostic for
```
int *p;
size_t num_elem = ARRAY_SIZE(p)
```
but the new one will.

* explicitly get definition of ARRAY_SIZE

* Convert to ARRAY_SIZE when const is involved

The following spatch finds additional instances where the array is
const and the division is by the size of the type, not the size of
the first element:
```
@ rule5a using "empty.iso" @
type T;
const T[] E;
@@

- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)

@ rule6a using "empty.iso" @
type T;
const T[] E;
@@

- sizeof(E)/sizeof(T)
+ ARRAY_SIZE(E)
```

* New instances of ARRAY_SIZE added since initial spatch run

* Use `ARRAY_SIZE` in docs (found by grep)

* Manually use ARRAY_SIZE

hs_set is expected to be the same size as uint16_t, though it's made
of two 8-bit integers

* Just like char, sizeof(uint8_t) is guaranteed to be 1

This is at least true on any plausible system where qmk is actually used.

Per my understanding it's universally true, assuming that uint8_t exists:
https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1

* Run qmk-format on core C files touched in this branch

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-08-30 10:20:04 +02:00
QMK Bot
2c5aa98143 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 08:04:19 +00:00
precondition
6f2c173743 Expand on the differences between Caps Word and Caps Lock (#18139)
* Expand on the differences between Caps Word and Caps Lock

* Add the equiv default KC_ next to intl alias

* It's configurable so it's not a problem
2022-08-30 10:03:25 +02:00
QMK Bot
8067c3bff5 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 07:20:44 +00:00
jack
035e7fdb8b Add boardsource/lulu RP2040 support (#18200)
by waffle87
2022-08-30 08:20:05 +01:00
QMK Bot
4a7a4b2b94 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 03:03:51 +00:00
Xelus22
f3d52d8fe8 [Keyboard] Kangaroo Rev2 (#18199) 2022-08-29 20:03:30 -07:00
Less/Rikki
7eb71f72a7 [Keyboard] jacky_studio/piggy60 refactor (#18197) 2022-08-29 20:03:16 -07:00
QMK Bot
1a33b5a479 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 19:19:56 +00:00
3araht
f04336ff46 Redefinition of MIN is avoided in midi.c (#18203) 2022-08-29 12:18:53 -07:00
QMK Bot
774aa2499d Merge remote-tracking branch 'origin/master' into develop 2022-08-29 18:26:02 +00:00
Felix Jen
de1d6b6f15 [Keyboard] Add sinanju WK (#17736)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-29 11:25:20 -07:00
QMK Bot
bf77307ffb Merge remote-tracking branch 'origin/master' into develop 2022-08-29 18:23:39 +00:00
Felix Jen
a6b47de732 [Keyboard] Add Peaker keyboard (#17920)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-29 11:23:23 -07:00
Felix Jen
ccb244d5ed [Keyboard] Add Trailblazer Avalon (#17568)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-29 11:22:54 -07:00
QMK Bot
f87f802d6c Merge remote-tracking branch 'origin/master' into develop 2022-08-29 18:22:52 +00:00
Christian Solje
22136f8135 [Keymap] Add csolje 42 keymap for the cantor (#18125)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Christian Solje <csolje@gn.com>
2022-08-29 11:22:01 -07:00
Ryan
ef775d0fc8 Fix incorrect bluetooth.driver rules.mk mapping (#18205) 2022-08-29 19:05:05 +01:00
Stefan Kerkmann
e99ec28f5f [Core] Introduce pointing device specific debug messages (#17663) 2022-08-29 19:16:49 +02:00
Nick Brassel
d910e8df77 Use TAP_CODE_DELAY for encoder mapping by default (#18098) 2022-08-28 21:53:08 -07:00
QMK Bot
7ef6c179e4 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 04:49:22 +00:00
Stefan
56b93a3ad8 [Keyboard] Add handwired Split 5x7 (#18128)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-28 21:49:17 -07:00
TJ
b719a16b03 [Keyboard] add Nearfield, fix typo in Le Chiffre Readme (#17914) 2022-08-28 21:48:41 -07:00
QMK Bot
2b8d7af941 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 04:48:02 +00:00
bbrfkr
a2294bcc97 [Keyboard] Update dynamis keyboard (#17625)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-28 21:47:30 -07:00
QMK Bot
7084fc3d65 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 04:40:24 +00:00
Simon Hengel
38de991fda [Keyboard] Add chord/zero (#18190) 2022-08-28 21:39:45 -07:00
Drzony
f2edb73974 Fix mouse report comparison failing on shared EP (#18060)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2022-08-28 21:34:42 -07:00
QMK Bot
7e246b8a63 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 01:44:06 +00:00
NGatti1997
8b9f0a58b4 Swap KC_VOLD and KC_VOLU on GMMK2 to correct places (#18193) 2022-08-29 02:43:24 +01:00
QMK Bot
0d40c65aee Merge remote-tracking branch 'origin/master' into develop 2022-08-29 01:38:01 +00:00
biesigrr
3f99c42800 Expose Moonlander split detection to user code (#18040) 2022-08-29 02:37:29 +01:00
QMK Bot
6a13ae9fd7 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 01:35:17 +00:00
Juno Nguyen
1cc0b1e371 Update junonum keymap: add AG_NORM recovery (#18170) 2022-08-29 02:34:47 +01:00
QMK Bot
cfb9486d40 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 20:40:55 +00:00
Jeff Epler
3c3f55c0e9 Add an ez_maker directpins for rp2040 (#17908)
* Add an ez_maker directpins for rp2040

This allows all exposed pins on the Raspberry Pi Pico to be used
as up to 26 individual keys. Keys use a common ground arrangement.

The firmware is also expected to work on generic RP2040 boards, check
manufacturer pinout diagrams or use trial and error to find out the GP#s
of the pins.

* Update keyboards/ez_maker/directpins/rp2040/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

* Changes based on review comments

Co-authored-by: Joel Challis <git@zvecr.com>
2022-08-28 21:40:10 +01:00
QMK Bot
a699b24638 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 20:21:18 +00:00
Ryan
d18698a8e8 Remove deprecated USBasp and bootloadHID bootloader types (#18195) 2022-08-28 21:20:43 +01:00
Davide Masserut
0633e71a18 [Keymap] Add Miryoku keymap for Hillside 48 (#18191) 2022-08-28 13:20:30 -07:00
QMK Bot
8fc62cb098 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 19:55:56 +00:00
Ryan
8e113c5991 kegen/gboy: add manufacturer string (#18196) 2022-08-28 12:55:35 -07:00
Drashna Jaelre
fa08cb2478 [Keymap] Drashna keymap updates for 0.18.0 (#18184)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-28 12:55:19 -07:00
Ryan
3adaf6a46a Handle escaping of manufacturer/product strings (#18194) 2022-08-28 19:35:17 +01:00
QMK Bot
ac33b7b0b3 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 18:24:41 +00:00
Ryan
d4a6ee1cad Clean up schema syntax (#18192) 2022-08-28 19:24:11 +01:00
QMK Bot
10a84d6b93 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 17:16:50 +00:00
Less/Rikki
4adb64a91b [Keyboard] mechwild/bde cleanup and refactor (#18149) 2022-08-28 10:16:20 -07:00
QMK Bot
75c3e9545c Merge remote-tracking branch 'origin/master' into develop 2022-08-28 17:12:49 +00:00
Matt Chan
585b134729 [Keyboard] Add Kegen G-Boy (#18048)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-28 10:12:18 -07:00
QMK Bot
d2cc8d5060 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 17:11:07 +00:00
Joshua Diamond
37a85e1f9b More spidey3 userspace cleanup (#18049) 2022-08-28 10:10:28 -07:00
QMK Bot
f4b5842a7a Merge remote-tracking branch 'origin/master' into develop 2022-08-28 16:59:43 +00:00
Ryan
d983251c10 Switch over MANUFACTURER and PRODUCT to string literals (#18183) 2022-08-28 09:59:40 -07:00
Albert Y
ef0c87c976 Exclude uf2 files in VS Code (#18186) 2022-08-28 09:59:07 -07:00
QMK Bot
6a28ceefcd Merge remote-tracking branch 'origin/master' into develop 2022-08-28 06:14:30 +00:00
James Young
efdd4f4d50 Clean-up of #define _ADJUST 16 instances (#18182)
* enum layer_names: 40percentclub/nori default keymap

* enum layer_names: ergotravel default keymap

* enum layer_names: handwired/atreus50 default keymap

* enum layer_names: handwired/ortho5x13 default keymap

* enum layer_names: keebio/levinson default keymap

* enum layer_names: keebio/nyquist default keymap

* enum layer_names: keebio/rorschach default keymap

* enum layer_names: keebio/viterbi default keymap

* enum layer_names: keebio/wavelet default keymap

* enum layer_names: lets_split default keymap

* enum layer_names: maple_computing/launchpad reference keymaps

Update `default` and `default_rgb` keymaps.

* enum layer_names: maple_computing/minidox default keymap

* enum layer_names: miniaxe reference keymaps

Update `default` and `underglow` keymaps.

* enum layer_names: omkbd/ergodash/mini default keymap

* enum layer_names: omkbd/ergodash/rev1 default keymap

* enum layer_names: orthodox default keymap

* enum layer_names: unikeyboard/divergetm2 default keymap

* enum layer_names: woodkeys/scarletbandana default keymap

* add _Static_assert to keymap_introspection.c
2022-08-27 23:13:44 -07:00
Nick Brassel
1258fdb9ee Branch point for 2022 Nov 26 Breaking Change 2022-08-28 14:27:52 +10:00
Nick Brassel
0a3f7e4869 Merge remote-tracking branch 'upstream/develop' 2022-08-28 14:23:01 +10:00
Nick Brassel
9b5b072255 2022q3 Changelog. (#18180)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-28 14:20:52 +10:00
Joel Challis
a2765bfe19 Add missing SS_LOPT and SS_ROPT defines (#18175) 2022-08-27 09:41:10 +10:00
Ryan
24720400a8 Update LUFA submodule (#18168) 2022-08-26 12:19:34 +10:00
Joel Challis
43fd647130 Add eeprom defaults for tinyuf2 bootloader (#18042) 2022-08-25 21:17:41 +10:00
QMK Bot
1c47bd0ddf Merge remote-tracking branch 'origin/master' into develop 2022-08-24 21:20:43 +00:00
Ryan
fc0bf67f37 Add missing DD mapping for RGB_MATRIX_DRIVER (#18160) 2022-08-24 22:20:05 +01:00
QMK Bot
fdb0cc5981 Merge remote-tracking branch 'origin/master' into develop 2022-08-24 20:41:37 +00:00
Joel Challis
4a67123310 Refactor pianoforte for configurator (#18159) 2022-08-24 13:39:49 -07:00
QMK Bot
3aba764b43 Merge remote-tracking branch 'origin/master' into develop 2022-08-24 20:39:34 +00:00
Joel Challis
e95aa2a352 Fix use of encoder map in mechlovin/zed65/retro66 (#18158) 2022-08-24 13:38:53 -07:00
QMK Bot
fa25cacf6a Merge remote-tracking branch 'origin/master' into develop 2022-08-24 20:38:47 +00:00
Joel Challis
b2db8becf9 Fix use of encoder map in mechlovin/foundation (#18157) 2022-08-24 13:38:07 -07:00
QMK Bot
129c60946c Merge remote-tracking branch 'origin/master' into develop 2022-08-24 19:26:18 +00:00
Joel Challis
3d8c624698 Update invalid pip install flag (#18146) 2022-08-24 20:25:16 +01:00
QMK Bot
5f371104bc Merge remote-tracking branch 'origin/master' into develop 2022-08-24 18:11:55 +00:00
Joel Challis
7fab889696 Fix use of encoder map in mechwild/clunker (#18156) 2022-08-24 19:10:52 +01:00
Ryan
cf41c24db8 Move keyboard USB IDs and strings to data driven: develop (#18152)
* Move keyboard USB IDs and strings to data driven: develop

* Also do new onekeys
2022-08-24 15:28:38 +01:00
QMK Bot
e06ea4a10f Merge remote-tracking branch 'origin/master' into develop 2022-08-23 17:56:51 +00:00
Ramon Imbao
a53ef56946 [Keyboard] Add Plywrks Lune (#17057)
* Add Plywrks Lune

* Add OLED functionality

* Update keyboards/plywrks/lune/keymaps/default/keymap.c

* Update keyboards/plywrks/lune/keymaps/via/keymap.c

* Update keyboards/plywrks/lune/keymaps/via/keymap.c

* Update keyboards/plywrks/lune/lune.c

* Add the missing 2 layers in the keymap

Also added a missing parenthesis in lune.c, and removed
the oled_task_user in the default keymap.

* Update keyboards/plywrks/lune/info.json

* Update keyboards/plywrks/lune/info.json

* Update keyboards/plywrks/lune/info.json

* Update keyboards/plywrks/lune/config.h
2022-08-23 10:55:59 -07:00
QMK Bot
dd0277beab Merge remote-tracking branch 'origin/master' into develop 2022-08-23 17:51:17 +00:00
Kyle McCreery
7839396614 [Keyboard] Add Clunker (#18141)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-23 10:50:19 -07:00
QMK Bot
f03f89ccb5 Merge remote-tracking branch 'origin/master' into develop 2022-08-23 13:43:09 +00:00
Joel Challis
ee416048d9 Use correct board files for cantor (#18144) 2022-08-23 14:42:23 +01:00
QMK Bot
3dd12b5425 Merge remote-tracking branch 'origin/master' into develop 2022-08-23 05:01:45 +00:00
Dave Rowe
f9584c8368 [Keyboard] Enable VIA - ALF X1.1 (#18140) 2022-08-22 22:00:58 -07:00
QMK Bot
c1ce0f44f8 Merge remote-tracking branch 'origin/master' into develop 2022-08-23 02:13:07 +00:00
Brandon Claveria
b395f40e07 [Keyboard] add rgb animation handwired/swiftrax/glacier (#18121)
Co-authored-by: swiftrax <swiftrax@github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-22 19:12:33 -07:00
Sergey Vlasov
7c0e5ce917 Nix shell updates for develop (#18131)
* shell.nix: Update `tomlkit` to 0.11.4 using a Nixpkgs overlay

The used Nixpkgs snapshot contains `tomlkit` version 0.7.0, which is
affected by https://www.github.com/sdispater/tomlkit/issues/148; that
bug is triggered by `pyproject.toml` from `jsonschema` >= 4.11.0,
preventing the build of that module.

Just adding `tomlkit = "*"` to the `[tool.poetry.dev-dependencies]`
section of `nix/pyproject.toml` does not fix the `jsonschema` build,
because `makeRemoveSpecialDependenciesHook` inside `poetry2nix` is not
affected by `nix/pyproject.toml`.  Add a Nixpkgs overlay which updates
the `tomlkit` Python module globally, so that `poetry2nix` would also
use the updated version internally.

* shell.nix: Bump `poetry2nix` to the most recent version

The new `poetry2nix` version includes overrides which are required for
recent versions of some Python packages (in particular, `jsonschema` and
`dotty-dict`).

* shell.nix: Bump QMK CLI to 1.1.1; update other Python deps

Update `pyproject.toml` to match `requirements*.txt`:

- add `pyserial = "*"`
- replace `qmk-dotty-dict = "*"` with `dotty-dict = "*"` (#18117, also
  required for compatibility with `qmk` 1.1.1, where this replacement
  had already been performed)

Add build dependencies of various Python modules to `pyproject.toml`:

- `hatchling`, `hatch-vcs`, `hatch-fancy-pypi-readme` (required by
  `jsonschema` >= 4.11.0)
- `pytest` (a newer version is required to solve the dependency conflict
  with the `hatchling` module due to the upper bound on `pluggy`)
- `flit-core` (a more recent version is required to build `tomli`)
- `poetry-core` (required for `dotty-dict` >= 1.3.1, and the version
  from Nixpkgs does not build on Darwin due to NixOS/nix#4758)

Update `poetry.lock` to use the most recent versions of Python modules.

The complete list of Python module updates as listed in `poetry.lock`
(note that other modules might be present in the Python environment,
e.g., if they come from Nixpkgs):

- `atomicwrites`: none -> 1.4.1 (but this module is not actually used,
  because the corresponding dependency of `pytest` is win32-only)
- `attrs`: 21.4.0 -> 22.1.0
- `colorama`: 0.4.4 -> 0.4.5
- `coverage`: 6.4 -> none
- `dotty-dict`: none -> 1.3.1 (used instead of `qmk-dotty-dict`)
- `editables`: none -> 0.3
- `flake8`: 4.0.1 -> 5.0.4
- `flake8-polyfill`: 1.0.2 -> none
- `flit-core`: none -> 3.7.1
- `hatch-fancy-pypi-readme`: none -> 22.3.0
- `hatch-vcs`: none -> 0.2.0
- `hatchling`: none -> 1.8.0
- `hjson`: 3.0.2 -> 3.1.0
- `importlib-resources`: 5.7.1 -> 5.9.0
- `iniconfig`: none -> 1.1.1
- `jsonschema`: 4.5.1 -> 4.14.0
- `mccabe`: 0.6.1 -> 0.7.0
- `nose2`: 0.11.0 -> 0.12.0
- `packaging`: none -> 21.3
- `pathspec`: none -> 0.9.0
- `pep8-naming`: 0.12.1 -> 0.13.2
- `pillow`: 9.1.1 -> 9.2.0
- `pkgutil-resolve-name`: none -> 1.3.10
- `pluggy`: none -> 1.0.0
- `poetry-core`: none -> 1.0.8
- `py`: none -> 1.11.0
- `pycodestyle`: 2.8.0 -> 2.9.1
- `pyflakes`: 2.4.0 -> 2.5.0
- `pygments`: 2.12.0 -> 2.13.0
- `pyparsing`: none -> 3.0.9
- `pyserial`: none -> 3.5
- `pytest`: none -> 7.1.2
- `qmk`: 1.1.0 -> 1.1.1
- `qmk-dotty-dict`: 1.3.0.post1 -> none (replaced by `dotty-dict`)
- `setuptools-scm`: none -> 7.0.5
- `tomli`: none -> 2.0.1
- `typing-extensions`: none -> 4.3.0
- `zipp`: 3.8.0 -> 3.8.1
2022-08-23 02:59:33 +01:00
QMK Bot
d942c03be6 Merge remote-tracking branch 'origin/master' into develop 2022-08-22 23:06:18 +00:00
Jesse
624d92e2f5 Update Tap Dance Example 4 (#18138)
break statements are missing from the switch for both registering and unregistering key codes. Neither have a default: case either. The code as exists in the repository right now does not compile. It does with this changes.
2022-08-23 00:05:35 +01:00
QMK Bot
b1af9b4fe0 Merge remote-tracking branch 'origin/master' into develop 2022-08-22 09:04:48 +00:00
Ryan
68ad251667 Remove USB IDs and strings from fungo/rev1 (#18133) 2022-08-22 19:04:01 +10:00
Joel Challis
bbc3bc55f2 RESET -> QK_BOOT user keymaps (#17940) 2022-08-21 23:55:30 +01:00
QMK Bot
e36ae90a65 Merge remote-tracking branch 'origin/master' into develop 2022-08-21 22:09:30 +00:00
Ryan
b0eda7701a Move keyboard USB IDs and strings to data driven, pass 3 (#18111) 2022-08-21 23:08:50 +01:00
QMK Bot
51e4e91285 Merge remote-tracking branch 'origin/master' into develop 2022-08-21 19:37:50 +00:00
Paul Ewing
3c0806a489 Add pcewing Speedo v3 keymap (#18118)
* Add pcewing Speedo v3 keymap

* Add readme and code quality improvements
2022-08-21 20:37:18 +01:00
QMK Bot
1e84890a5b Merge remote-tracking branch 'origin/master' into develop 2022-08-21 19:04:26 +00:00
Mario Cadenas
93f0c1f32f [Keymap] Add new keymap to nasu (#18024) 2022-08-21 12:03:48 -07:00
Joel Challis
9b7965d3a9 Align CLI requirements (#18117) 2022-08-21 18:38:17 +01:00
QMK Bot
efd893be39 Merge remote-tracking branch 'origin/master' into develop 2022-08-21 00:18:07 +00:00
Louis Dalibard
7ea54a7837 [Keyboard] Add ai macropad (#17722)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Louis Dalibard <ontake@ontake.dev>
2022-08-20 17:17:02 -07:00
QMK Bot
f99bac052e Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:28:43 +00:00
Abigail
e2fbcc8099 added keymap for kprepublic/jj40:brdlf (#17961)
* added keymap for kprepublic/jj40:brdlf
2022-08-20 21:28:02 +01:00
QMK Bot
e3cf678569 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:21:44 +00:00
JX
706995c044 [Keyboard] Add yandrstudio/nz67v2 keyboard. (#17591)
* add yr nz67v2 by jiaxin96
2022-08-20 21:21:07 +01:00
QMK Bot
cb3c8f40d0 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:08:35 +00:00
QMK Bot
d93b5ef247 Format code according to conventions (#18119) 2022-08-20 21:07:57 +01:00
QMK Bot
aa7629f8e6 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:01:40 +00:00
bojiguard
5222cf7673 add fungo keyboard (#17513)
by bojiguard
2022-08-20 21:01:04 +01:00
QMK Bot
3609c24df4 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:00:24 +00:00
studiokestra
ce19a9cdc5 Add Nascent keyboard support. (#17824)
* Add nascent keyboard by studiokestra
2022-08-20 20:59:47 +01:00
QMK Bot
a580057422 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 18:46:12 +00:00
mechlovin
c2a46a6fa0 [Keyboard] Add Zed65 (#17917)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-20 11:45:38 -07:00
Drashna Jael're
8f6b019dcc Merge remote-tracking branch 'origin/master' into develop 2022-08-20 10:22:48 -07:00
Sergey Vlasov
7ee55b1754 Fix PID value for the Keyboardio Atreus 2 bootloader (#18116)
Copy the correct PID from `util/udev/50-qmk.rules`.
2022-08-20 15:59:17 +01:00
Joel Challis
d2accb48e7 RESET -> QK_BOOT keyboard readme (#18110) 2022-08-20 11:34:17 +01:00
Erovia
5e2ffe7d8f CLI: Teaching the CLI to flash binaries (#16584)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-08-20 15:39:19 +10:00
QMK Bot
3bf36e8b04 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 04:17:48 +00:00
Joe Scotto
e7107691ab [Keymap] Add joe_scotto keymap for CRKBD (#18103) 2022-08-19 21:17:09 -07:00
QMK Bot
68079cba61 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 03:52:33 +00:00
Drashna Jaelre
f08e08cec2 [Keyboard] Fix compilation issues for keycapsss kimiko (#18112) 2022-08-20 13:51:57 +10:00
QMK Bot
a69303bb78 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 02:59:05 +00:00
Davide Masserut
c9120ea8e9 [Keymap] Add Miryoku keymap for Hillside family (#18087) 2022-08-19 19:58:24 -07:00
QMK Bot
880ea06760 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 01:55:33 +00:00
AliceH66
85831fc188 [Keyboard] Add aliceh66 pianoforte (#18081)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-19 18:55:01 -07:00
fauxpark
61689ae609 Merge remote-tracking branch 'upstream/master' into develop 2022-08-20 10:55:40 +10:00
Ryan
201f1a8f47 Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093) 2022-08-20 01:48:38 +01:00
Ryan
f4dcce7e59 Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090) 2022-08-20 01:45:28 +01:00
Ryan
201a914beb Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) 2022-08-20 01:42:49 +01:00
Ryan
835c971f78 Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) 2022-08-20 10:39:35 +10:00
QMK Bot
eceed6c50b Merge remote-tracking branch 'origin/master' into develop 2022-08-20 00:32:18 +00:00
Ryan
48792b030b Move keyboard USB IDs and strings to data driven, pass 2: handwired (#18079) 2022-08-20 10:31:48 +10:00
QMK Bot
f1ac92ac63 Merge remote-tracking branch 'origin/master' into develop 2022-08-19 23:50:09 +00:00
Drashna Jaelre
39f0fb7bea [Keyboard] Update Work Louder keyboards (#18109) 2022-08-19 16:49:37 -07:00
QMK Bot
4a8bed844d Merge remote-tracking branch 'origin/master' into develop 2022-08-19 22:15:34 +00:00
Joel Challis
f1786cbd7b Fix duplicate keys in info.json files (#18107) 2022-08-19 23:14:38 +01:00
QMK Bot
c0c875d675 Merge remote-tracking branch 'origin/master' into develop 2022-08-19 19:48:31 +00:00
yiancar
8e8c0e2d57 Cyberstar Custom (#18076)
* Create Cyberstar Custom

Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-19 20:47:45 +01:00
Nick Brassel
1eac095c0c Use the correct bootloader definition. (#18102) 2022-08-19 05:20:44 +01:00
QMK Bot
5ee482b110 Merge remote-tracking branch 'origin/master' into develop 2022-08-19 01:19:23 +00:00
Simon Hengel
e6a1afb8f1 [Docs] Fix typo in data driven config docs (#18095) 2022-08-18 18:18:51 -07:00
QMK Bot
2ed2c88a08 Merge remote-tracking branch 'origin/master' into develop 2022-08-19 01:17:50 +00:00
~ aka goonf!sh
286dd6abe6 [Docs] Update list of "ARM-based ProMicro replacements" (#18083) 2022-08-18 18:17:20 -07:00
Joel Challis
3c745caf61 Remove legacy bootmagic cli parsing (#18099) 2022-08-19 01:56:48 +01:00
Joel Challis
9550cc464c Fix new-keyboard default for RP2040 bootloader (#18100) 2022-08-19 01:48:33 +01:00
Joel Challis
0fcebdcdf1 Swap F4x1 default board files away from blackpill (#17522) 2022-08-19 00:52:50 +01:00
HorrorTroll
227e552f5c Add support keyboard Feker IK75 (#17611) 2022-08-18 01:23:34 +01:00
David Hoelscher
a645301c82 Add Bonsai C4 converter (#17711) 2022-08-18 01:01:54 +01:00
QMK Bot
29f47f4cf3 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 22:51:34 +00:00
jack
9607b46756 Fixup mokey/ibis80 keymaps (#18088) 2022-08-17 23:51:04 +01:00
QMK Bot
f9abecda3f Merge remote-tracking branch 'origin/master' into develop 2022-08-17 14:11:59 +00:00
Juno Nguyen
45845ea07f Replace CG_SWAP in junonum (#18086)
Co-authored-by: Minh-tri Nguyen <mtngx@PigeonMac.local>
2022-08-17 15:11:00 +01:00
QMK Bot
47e98e3a68 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 07:28:11 +00:00
CoffeeIsLife
0df97fc968 [Keymap] Add personal keymap for kprepublic BM40HSRGB (#18021)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Fae <faenkhauser@gmail.com>
2022-08-17 00:27:31 -07:00
ZhaoYou
6b78d07e64 [Keyboard] add 'soda/cherish' (#18057)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-17 00:26:35 -07:00
QMK Bot
39337373f5 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 02:38:02 +00:00
Runheme
e5f1d8859e [Keyboard] Add ibis80 (#18051)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-16 19:37:57 -07:00
QMK Bot
2ade237e77 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 02:37:40 +00:00
Toshihiro Suzuki
5a1a0e71de [Keymap] toshi0383 keymaps update (#18073) 2022-08-16 19:37:29 -07:00
QMK Bot
cfab3e2d6e Merge remote-tracking branch 'origin/master' into develop 2022-08-17 02:37:10 +00:00
Albert Y
a1f0208797 [Docs] Use layer number as example for COMBO_ONLY_FROM_LAYER (#18072)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-16 19:37:06 -07:00
jotix
8230b4c49d [Keymap] jotix's community/ortho4x12 change (#18069) 2022-08-16 19:36:30 -07:00
QMK Bot
77150d00ac Merge remote-tracking branch 'origin/master' into develop 2022-08-16 18:42:23 +00:00
coliss86
837a57b3c5 Adjust the hierarchy of chapter Deferred Execution (#18075) 2022-08-16 11:41:31 -07:00
QMK Bot
7014e1efa3 Merge remote-tracking branch 'origin/master' into develop 2022-08-16 17:23:31 +00:00
yiancar
c834608a74 Fix WS2812 order for aurora65 and loki65 (#18074) 2022-08-16 18:22:47 +01:00
QMK Bot
c5dc4b4d1d Merge remote-tracking branch 'origin/master' into develop 2022-08-16 17:02:38 +00:00
Tom Barnes
2f4ad40561 [Docs] update pr_checklist.md with info about data-driven (#18068)
* update pr_checklist with info about data-driven

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-08-16 18:01:56 +01:00
QMK Bot
9f0925fb18 Merge remote-tracking branch 'origin/master' into develop 2022-08-16 14:29:11 +00:00
Joel Challis
164faf0a5c Use correct board file in xelus/valor_frl_tkl/rev2_0 (#18071) 2022-08-16 15:28:22 +01:00
QMK Bot
904df296b0 Merge remote-tracking branch 'origin/master' into develop 2022-08-15 17:55:58 +00:00
Joel Challis
e44b6242b7 Migrate more F4x1 board files (#18054) 2022-08-15 18:55:21 +01:00
precondition
5021cf58ad Fix DV_SCLN and DV_COLN in keymap_spanish_dvorak.h (#18043) 2022-08-15 18:41:05 +01:00
Stefan Kerkmann
f74ed5fc53 Fix GD32VF103 WS2812 PWM driver (#18067)
...by adding the missing STM32 DMA defines.
2022-08-15 18:00:22 +01:00
Stefan Kerkmann
8ce946b5c8 [Bug] Add key event check to is_tap_record and remove is_tap_key (#18063) 2022-08-15 16:40:51 +02:00
jack
5e6175a553 Fixup gmmk/pro/rev2 USB Data (#18056) 2022-08-15 23:21:15 +10:00
QMK Bot
1ccfed483d Merge remote-tracking branch 'origin/master' into develop 2022-08-15 09:15:56 +00:00
Ryan
b297a347bb ADB to USB converter: split into rev1 and rev2 (#18052) 2022-08-15 10:15:22 +01:00
fauxpark
c202602938 Merge remote-tracking branch 'upstream/master' into develop 2022-08-15 17:54:07 +10:00
precondition
8e9ee29fe3 Remove duplicate COMBINING HORN in keymap_us_extended.h (#18045) 2022-08-14 22:25:37 -07:00
Joel Challis
ed3b4bb606 Fix missing development_board schema entry (#18050) 2022-08-14 22:25:16 -07:00
Ryan
51d5aad25b Move keyboard USB IDs and strings to data driven, pass 2: D-E (#17956) 2022-08-15 13:30:12 +10:00
Ryan
1027aed83a Move keyboard USB IDs and strings to data driven, pass 2: F-I (#17958) 2022-08-15 02:53:19 +01:00
QMK Bot
5334614e8a Merge remote-tracking branch 'origin/master' into develop 2022-08-14 23:55:05 +00:00
PeterFalken
4c91e5bef8 Allow disabling RGB_MATRIX_ANIMATIONS system76 keyboards (#17478) 2022-08-14 19:54:25 -04:00
QMK Bot
630de240b4 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 23:26:34 +00:00
Joel Challis
93fb69fbda Migrate more F4x1 board files (#18046) 2022-08-15 00:25:40 +01:00
Joel Challis
463fb72d29 Partially revert some WB32 specific changes (#18038) 2022-08-14 20:48:44 +01:00
QMK Bot
74b4bcb607 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 19:43:25 +00:00
Alberto
3d3e463598 Feat/port ft mars 65 (#17994)
* by wonderbeel
2022-08-14 20:42:58 +01:00
QMK Bot
e6a522417a Merge remote-tracking branch 'origin/master' into develop 2022-08-14 19:26:44 +00:00
Cyn
5f74ae5b63 Improve Drop Alt compatibility with VIA (#18041)
by slycedix
2022-08-14 20:26:06 +01:00
Pascal Getreuer
95c43a2759 Fix Caps Word to treat mod-taps more consistently. (#17463)
* Fix Caps Word to treat mod-taps more consistently.

Previously, holding any mod-tap key while Caps Word is active stops Caps
Word, and this happens regardless of `caps_word_press_user()`. Yet for
regular mod keys, AltGr (KC_RALT) is ignored, Shift keys are passed to
`caps_word_press_user()` to determine whether to continue, and
similarly, a key `RSFT(KC_RALT)` representing Right Shift + Alt is
passed to `caps_word_press_user()` to determine whether to continue.

This commit makes held mod-tap keys consistent with regular mod keys:

* Holding a `RALT_T` mod-tap is ignored.
* When holding a shift mod-tap key, `KC_LSFT` or `KC_RSFT` is passed to
  `caps_word_press_user()` to determine whether to continue.
* When holding a Right Shift + Alt (`RSA_T`) mod-tap, `RSFT(KC_RALT)` is
  passed to `caps_word_press_user()`.

Particularly, with this fix a user may choose to continue Caps Word when
a shift mod-tap key is held by adding `KC_LSFT` and `KC_RSFT` cases in
`caps_word_press_user()`. For instance as

```
bool caps_word_press_user(uint16_t keycode) {
  switch (keycode) {
    // Keycodes that continue Caps Word, with shift applied.
    case KC_A ... KC_Z:
    case KC_MINS:
      add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
      return true;

    // Keycodes that continue Caps Word, without shifting.
    case KC_1 ... KC_0:
    case KC_BSPC:
    case KC_DEL:
    case KC_UNDS:
    case KC_LSFT:  // <<< Added here.
    case KC_RSFT:
      return true;

    default:
      return false;  // Deactivate Caps Word.
  }
}
```

* Fix Caps Word to treat mod-taps more consistently.

Previously, holding any mod-tap key while Caps Word is active stops Caps
Word, and this happens regardless of `caps_word_press_user()`. Yet for
regular mod keys, AltGr (KC_RALT) is ignored, Shift keys are passed to
`caps_word_press_user()` to determine whether to continue, and
similarly, a key `RSFT(KC_RALT)` representing Right Shift + Alt is
passed to `caps_word_press_user()` to determine whether to continue.

This commit makes held mod-tap keys consistent with regular mod keys:

* Holding a `RALT_T` mod-tap is ignored.
* When holding a shift mod-tap key, `KC_LSFT` or `KC_RSFT` is passed to
  `caps_word_press_user()` to determine whether to continue.
* When holding a Right Shift + Alt (`RSA_T`) mod-tap, `RSFT(KC_RALT)` is
  passed to `caps_word_press_user()`.

Particularly, with this fix a user may choose to continue Caps Word when
a shift mod-tap key is held by adding `KC_LSFT` and `KC_RSFT` cases in
`caps_word_press_user()`. For instance as

```
bool caps_word_press_user(uint16_t keycode) {
  switch (keycode) {
    // Keycodes that continue Caps Word, with shift applied.
    case KC_A ... KC_Z:
    case KC_MINS:
      add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
      return true;

    // Keycodes that continue Caps Word, without shifting.
    case KC_1 ... KC_0:
    case KC_BSPC:
    case KC_DEL:
    case KC_UNDS:
    case KC_LSFT:  // <<< Added here.
    case KC_RSFT:
      return true;

    default:
      return false;  // Deactivate Caps Word.
  }
}
```

* Update quantum/process_keycode/process_caps_word.c

Co-authored-by: Joel Challis <git@zvecr.com>
2022-08-14 20:25:32 +01:00
Chewxy
6fc7c03e95 Added emacs as an "operating system" for input mode. (#16949) 2022-08-14 20:24:52 +01:00
Drashna Jaelre
4da3482872 Fix Emulated EEPROM issue with F466 (#18039) 2022-08-14 17:18:59 +01:00
precondition
0a6327d20c Replace ; by : in the shifted symbols ASCII art of keymap_norman (#18029)
Thanks!
2022-08-14 12:18:42 -04:00
Drashna Jaelre
9f31fcace3 [Keyboard] Fix compilation issues for Boardsource Microdox (#18037) 2022-08-14 17:03:40 +01:00
Mega Mind
fce99f3875 [Controller] Added board config for custom controller STeMCell (#16287)
Co-authored-by: Mariappan Ramasamy <947300+Mariappan@users.noreply.github.com>
Co-authored-by: Mariappan Ramasamy <maari@basis-ai.com>
Co-authored-by: Sadek Baroudi <sadekbaroudi@gmail.com>
2022-08-14 21:27:26 +10:00
Joel Challis
ba04ecfabd Align TO() max layers with other keycodes (#17989) 2022-08-14 21:25:46 +10:00
Drashna Jael're
ac31e42974 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 01:54:23 -07:00
Xelus22
4195eb8fe1 [Keyboard] Add Valor FRL TKL rev2.0 and 2.1 (#17992)
* add valor frl tkl rev2 by xelus22
2022-08-14 08:17:11 +01:00
Joy Lee
e948fa6f6e Added support for gmmk pro rev2 keyboard. (#17655)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-08-14 14:00:12 +10:00
Ryan
3a7dbc8981 Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) 2022-08-14 12:16:16 +10:00
yiancar
dfc92d8f7b Fix buffer size for WS2812 PWM driver (#17046)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-13 18:36:34 -07:00
Joy Lee
c02d7ae86f Added ws2812_pwm support for WB32 MCU. (#17142)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-08-13 18:21:46 -07:00
Joy Lee
6b1c7d20aa Added ws2812_spi support for WB32 MCU (#17143)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-08-13 18:09:57 -07:00
QMK Bot
5c805e4cc5 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 01:09:31 +00:00
Gary Kong
28b05d15ff [Keyboard] add bajjak keyboard (#12377)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-08-13 18:08:46 -07:00
JJ48
4eda139b83 Add Gentleman 65 SE Solderd PCB support (#16992) 2022-08-14 01:55:03 +01:00
QMK Bot
2d40713567 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:52:21 +00:00
Nick Brassel
86261bfd8e Add texts for Discord Events to be created post-merge. (#17944) 2022-08-13 17:51:45 -07:00
precondition
2c3b447641 Use ANSI ASCII art and fix comments for LT_COLN and LT_UNDS in keymap_lithuanian_qwerty.h (#18028) 2022-08-13 17:50:32 -07:00
QMK Bot
50ff52639f Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:47:42 +00:00
Ryan
3079691391 Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A (#17941) 2022-08-13 17:47:05 -07:00
QMK Bot
b44c3f92ae Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:47:05 +00:00
Marko Skakun
0f1bb982e9 [Keyboard] Added different wiring of dactyl (#17997) 2022-08-13 17:46:35 -07:00
QMK Bot
4faf0ccaec Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:36:47 +00:00
Less/Rikki
ca2d05f5c6 [Keyboard] jacky_studio/piggy60 (#18012) 2022-08-13 17:36:11 -07:00
QMK Bot
2363a3bc42 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:33:31 +00:00
Tom Barnes
0d3e07a3db [Docs] Suggest imgur images are edited to set size (#18031) 2022-08-13 17:32:30 -07:00
Takeshi ISHII
a83afb3fcd Improve avr wait_us() (#16879) 2022-08-14 00:04:03 +01:00
Joshua Diamond
2f87abd4ef Revert "[Core] Re-order user space rules inclusion (#17459)" (#18032) 2022-08-14 07:13:15 +10:00
QMK Bot
b1c7df9a68 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 20:26:43 +00:00
Jesus Climent
cbcb4f2ec0 [Keyboard] Added Atreyu keyboard. (#17698)
* Add Atreyu keyboard.

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-13 21:26:05 +01:00
QMK Bot
8fd7825007 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 20:16:08 +00:00
mechlovin
1eecdb502d [Keyboard] Add Foundation to QMK (#17573)
* add mechlovin foundation keyboard

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-13 21:15:35 +01:00
QMK Bot
7dca40f5af Merge remote-tracking branch 'origin/master' into develop 2022-08-13 20:13:03 +00:00
p4yne
40676d058e [Keymap] adding new user (p4yne) layout with complex lighting feature… (#16085)
* [Keymap] adding new user (p4yne) layout with complex lighting features (per layer, per key, per type) and usefull layers DE/US, etc.

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-13 21:12:31 +01:00
QMK Bot
bcd021263e Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:48:14 +00:00
emlah
a49bdd2659 add BAMFK-4 (#17985)
* add BAMFK-4
2022-08-13 20:47:39 +01:00
QMK Bot
97b610e166 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:45:00 +00:00
3araht
e145c7ad3f Bandominedoni version output feature and a new keymap added (#17947)
* SPLIT_USB_DETECT added.

* lednotg keymap added.

* lednotg missing modification fixed.

* VERSION is available.

* USER00 is used instead of SAFE_RANGE in via/keymap.c
2022-08-13 20:44:29 +01:00
QMK Bot
f417ffff5a Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:39:19 +00:00
Shem Sedrick
95782691d4 Dactyl Manuform 4x5 with 5 thumb cluster (#17671)
* Working on new dactyl

* Preliminary build and keymap in place for 4x5_5 dactyl manuform

* Removing first attempt to use 4x5

* Updating to match c style guide

* Fixing issues after merge, deletion of dactyl_manuform.h

* Spliting out custom keymap

* Adding license headers

* Fixing EE_HANDS detection on Pro-Micro

The pro-micro was not working when I plugged into the elite-c on the
right hand side of my keyboard. Adding the SPLIT_USB_DIRECT definition
fixed the issue.

* Apply suggestions from code review

Adding Drashna's delete comments

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

* Removed config.h for keymaps and tweaked keymap

Per Drashna's pr review, I have removed the config.h files for the
keymaps.
Also tweaked my keymap to switch backspace and enter. Added tapping
toggle for RAISE.

* Further tweaking ssedrick keymap for dactyl_manuform 4x5_5

As with most new keyboards, they take some getting used to.
I've rearranged my thumb cluster to hopfully a more long
term solution.

* Adding missing KC_BSLS to ssedrick keymap for 4x5_5

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-13 20:38:31 +01:00
QMK Bot
e95ba0d651 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:10:39 +00:00
mmccoyd
aee738c61b [Keyboard] Add Hillside 46 (#17968)
* 46: Copy from 52 and file rename

* 46: File internals refer to 46, not 52

* 46: Board remove row

* 46: Keymap: Lshift becomes ctrl, Rshift a symbol

- ESC and CAPs on upper thumbs
- AltGr and App on upper thumbs
- Page up/down on upper thumbs
- F11, F12 and mods for them on adjust

* 46: Readme update for json script, tweaks

* 46: Board fix LED count

* 46: Keymap: Arrows right, symmetric layer keys

* 46: Readme: Image link with and w/o outer pinkie

* 46: Keymap: link fixed image of nav layer

* 46: Keymap: fix reaching adj layer

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
2022-08-13 20:10:01 +01:00
QMK Bot
826ab5412f Merge remote-tracking branch 'origin/master' into develop 2022-08-13 18:02:19 +00:00
alaviss
b1fe7621eb RFC: add a simple implementation of the ploopy optical encoder (#17912) 2022-08-13 11:01:44 -07:00
precondition
96731ba88e Fix LV_CCAR and LV_NCED (#18025) 2022-08-13 10:24:15 -07:00
QMK Bot
a03849c92c Merge remote-tracking branch 'origin/master' into develop 2022-08-13 16:24:37 +00:00
gourdo1
4c6ce12d2a Updated gourdo1 GMMK Pro keymaps (#17873)
* Fixed Left Shift tapdance in general and for gaming mode. (#12)

* update ISO readme
* left shift fixed in general, including for gaming mode

* fixed toggle menu rendering on ISO layouts

* updated readme's and cosmetics

* update readme's

* update readme's again

* readme cosmetics

* consolidate readme's

* more readme cosmetics

* clarification for bootloader mode on ISO

* Autocorrect added with 400 word English dictionary (#13)

* autocorrect added with 400 word dictionary

* update readme's for autocorrect

* Add FN-B as shortcut to bootloader

* Update .gitignore

Co-authored-by: Joel Challis <git@zvecr.com>

* RGB changes to system numlock and ISO extended alphas

- hide system numlock off indicator (primarily for Mac users) by moving it to numpad and FN layers instead
- give users with extended alpha ISO languages a config option to add RGB highlights for extras alphas on capslock

* readme updates

* Fixed [FN]B and [FN]N shortcuts not working on numpad layer

Co-authored-by: Joel Challis <git@zvecr.com>
2022-08-13 17:24:07 +01:00
QMK Bot
149db3c6a8 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 16:19:58 +00:00
mmccoyd
0c0d01966f [Keyboard] Add Hillside 52 (#17374)
* 52 Keymap.json: Set for Hillside 52

- Change script rows

* 52 Keymap.c: mirror .json

CAPSWORD, QK_BOOT, readme cleanup, EE_RST

* 52 Keymap.json: Initial files copy from 56

* 52 Keymap.json nav/edit lay, thumb shift, syms

- Del in backspace spot on sym layer
- Thumb shift OSM instead of extra space
- Nav/edit on num/fn: arrows cut copy paste undo redo, page up/down
- Fn keys bottom row to allow nav edit keys
- App and AltGr on lower row, on their layer
- Braces on index, so more common -= on middle ring.
- Adjust has Ctrl/GUI swap
- EE_RST, CAPSWORD, QK_BOOT, SPLIT_DETECT

* 52 Family: readme image and folder link

* 52 Board: initial copy from 56

* 52 Keymap via

* 52 Board: remove keys, cant columns, better ids

- .json: vid: MM, pid: H52

* 52 Keymap.c: initial.c copy from 48

* QK_BOOT EE_CLR, not ANY(), as config.qmk supports

- CAPSWRD instead of ANY, though config.qmk still converts to ANY()

* Cleanup readme

* 52 Keymap: Remove redundant key, cleanup script

* 52 Keymap: Fix template

* 52 Readme: Link lower res image better for readme

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

* 52 Keymap: Move pretty-print script to GitHub wiki

* 52 Keymap: Link to 1024 res image thumbnails

* 52 Keymap: fix whitespace before image link

* Family: Fix image link to 1024 thumb

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

* 52: Keymap: Caps word on a layer home row

* 52: Keymap: Arrows on right. Symmetric layer keys.

- Nav:
  - Arrows on right so up/down more intuitive. Page up/down on ends
  - Cut on home row, as more common

- Sym:
  - Layer mods on activate hand, extras symbols on left
  - Common digits on lower row

- Base:
  - Layer keys symmetric, on most extended, not resting, thumb
  - Mute on util key for easy use

- Swap layers 3 and 4 to match swapped thumbs

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-13 17:19:21 +01:00
QMK Bot
39d2f61d51 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 16:14:39 +00:00
kopibeng
648f3eb71f Add support for XT60_SINGA (#17752)
* Added support for Christine, XT65E and Adelais

* Add support for MNK88

* Add support for XT8x

* Renamed XT65E to Typ65

* Revert "Renamed XT65E to Typ65"

This reverts commit b4fbc853d2.

* Revert "Revert "Renamed XT65E to Typ65""

This reverts commit 09baee94eb.

* File reorganization

* Add support for MNK88

* Update readme.md

* Update keyboards/kopibeng/mnk88/rules.mk

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

* Update keyboards/kopibeng/mnk88/rules.mk

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

* Fix imgur link

* Update keyboards/kopibeng/mnk88/rules.mk

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

* Update keyboards/kopibeng/mnk88/info.json

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

* Update info.json

Previous suggested change was breaking lint check, reverting back to the original.

* Update keyboards/kopibeng/mnk88/info.json

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

* Fix info.json

* Added XT60_SINGA

* Update config.h

* Update readme.md

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-13 17:13:49 +01:00
Vino Rodrigues
52dc16b758 [Keyboard] IDOBAO ID80v1 folder rename (#17265)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-14 00:00:42 +10:00
Albert Y
69fa2d8378 [Core] Re-order user space rules inclusion (#17459) 2022-08-13 23:57:07 +10:00
Pascal Getreuer
6a0d90f81a Fix Caps Word capitalization when used with Combos + Auto Shift. (#17549) 2022-08-13 23:48:51 +10:00
Jay Greco
4eeafbebab Add Bit-C PRO converter (#17827) 2022-08-13 14:48:30 +01:00
Joel Challis
fc7e9efd21 Improve importer workflow (#17707) 2022-08-13 14:39:56 +01:00
lokher
a02aff9c77 Add led matrix support for CKLED2001 (#17643) 2022-08-13 14:39:06 +01:00
QMK Bot
ee664e0960 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 13:24:07 +00:00
Nick Brassel
dccb8ff7d6 Remove old submodules if present (#17930) 2022-08-13 23:23:32 +10:00
QMK Bot
853d47b4cc Merge remote-tracking branch 'origin/master' into develop 2022-08-13 04:49:33 +00:00
Drashna Jaelre
b881778f53 [Keyboard] Remove unused keycodes from Aurora65 keymap (#18022) 2022-08-12 21:48:33 -07:00
Drashna Jaelre
3d24845016 [Bug] Fix wrong varaible in encoder block (#18020) 2022-08-12 19:55:59 -07:00
QMK Bot
31e78aafbd Merge remote-tracking branch 'origin/master' into develop 2022-08-13 02:47:02 +00:00
arnstadm
aee48b8aab [Keyboard] add ogrn (#17983)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-12 19:46:16 -07:00
QMK Bot
60176a3a28 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 02:38:32 +00:00
rockybulwinkle
fb150e08f1 [Keyboard] Increase kinesis/kint41 unselect delay (#18015)
* [Keyboard] Increase kinesis/kint41 unselect delay

Fixes #18014

* Update kint41.c

Use correct si-abbreviation for micro in comment.
2022-08-13 03:38:01 +01:00
QMK Bot
7a95926f46 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 02:30:55 +00:00
arnstadm
5ed7e1acf1 [Keyboard] Add akb-ogr (#17982)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-12 19:30:10 -07:00
precondition
4ff39b5652 KR_DQUO S(KR_COLN) → KR_DQUO S(KR_QUOT) (#18011) 2022-08-12 19:20:58 -07:00
precondition
e3415d6b97 define CZ_PERC S(CZ_PLUS) → define CZ_PERC S(CZ_EQL) (#18008) 2022-08-12 19:20:35 -07:00
precondition
20f0f40220 Remove invisible variation selector-15 from keymap_japanese.h (#18007) 2022-08-12 19:16:50 -07:00
precondition
b4fbb340c5 Use LT_ZCAR in place of LT_PLUS for modded kc definitions (#18000) 2022-08-12 19:13:43 -07:00
precondition
db4c4b1f78 Fix Bépo's BP_NNBS (narrow non-breaking space) (#17999)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-12 19:13:22 -07:00
QMK Bot
e0b4fa512e Merge remote-tracking branch 'origin/master' into develop 2022-08-13 02:04:58 +00:00
Ryan
536e39a5d9 Fix viendi8l compilation (#18017) 2022-08-12 19:04:18 -07:00
Joy Lee
19ce1418ba Added implementation of WB32 MCU wear_leveling_efl. (#17579) 2022-08-13 02:14:33 +01:00
Drashna Jaelre
aed82bc6a0 Move Encoder+Encoder Map from generic features (#18018) 2022-08-12 18:04:02 -07:00
QMK Bot
06c7614a71 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 00:45:05 +00:00
Drashna Jaelre
ea2ec5835b [Keyboard] Fix compilation issues for Mechlovin Adelais (#18019) 2022-08-13 01:44:33 +01:00
QMK Bot
06391314cd Merge remote-tracking branch 'origin/master' into develop 2022-08-13 00:27:58 +00:00
DUILCHOI
a1fe9fe3b3 [Keymap] update fave104 keymap (#18004) 2022-08-12 17:27:53 -07:00
Albert Y
70c6b183df [Docs] Refactor code examples (#18003) 2022-08-12 17:27:24 -07:00
Drashna Jaelre
ccdba43e59 Create generic Pointing Device Pin defines (#17776) 2022-08-12 16:22:34 -07:00
QMK Bot
83f6aedd93 Merge remote-tracking branch 'origin/master' into develop 2022-08-12 23:03:46 +00:00
precondition
1a4a278251 Put non-US ISO keys in their expected spots in sagittarius' default keymaps (#18005) 2022-08-13 09:03:14 +10:00
Nick Brassel
8133f40c26 Update to latest ChibiOS-Contrib. (#18016) 2022-08-13 08:54:32 +10:00
QMK Bot
c565b415f7 Merge remote-tracking branch 'origin/master' into develop 2022-08-12 18:51:40 +00:00
QMK Bot
90e2a5100b Format code according to conventions (#18009) 2022-08-12 11:50:58 -07:00
QMK Bot
92d78a0198 Merge remote-tracking branch 'origin/master' into develop 2022-08-12 18:29:58 +00:00
Vertex-kb
cded26b199 [Keyboard] Add arc60 (#17976)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-12 11:28:53 -07:00
QMK Bot
15422b3b26 Merge remote-tracking branch 'origin/master' into develop 2022-08-12 02:04:13 +00:00
Joel Challis
7e7387c0d1 Remove legacy keycode use from command (#18002) 2022-08-12 03:03:36 +01:00
Albert Y
cde9dd8b90 Refactor Pixel Fractal effect (#17602)
* Refactor effect with smaller array

* Add RGB_MATRIX_USE_LIMITS call

* Remove spaces

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-11 22:41:42 +01:00
Sergey Vlasov
9e44362179 Add minimal STM32F103C6 support (#17853)
Unfortunately, the crippled versions of “Bluepill” boards with
STM32F103C6xx chips instead of STM32F103C8xx are now sold all over the
place, sometimes advertised in a confusing way to make the difference
not noticeable until too late.  Add minimal support for these MCUs in
the common “Bluepill with stm32duino” configuration, so that it could be
possible to make something useful from those boards (although fitting
QMK into the available 24 KiB of flash may be rather hard).

(In fact, I'm not sure whether the “STM32” part of the chip name is
actually correct for those boards of uncertain origin, so the onekey
board name is `bluepill_f103c6`; another reason for that name is to
match the existing `blackpill_f401` and `blackpill_f411`.)

The EEPROM emulation support is not included on purpose, because
enabling it without having a working firmware size check would be
irresponsible with such flash size (the chance that someone would build
a firmware where the EEPROM backing store ends up overlapping some
firmware code is really high).  Other than that, enabling the EEPROM
emulation code is mostly trivial (the `wear_leveling` driver with the
`embedded_flash` backing store even works without any custom
configuration, although its code is significantly larger than the
`vendor` driver, which may also be important for such flash size).
2022-08-11 22:37:41 +01:00
QMK Bot
8c4269f98e Merge remote-tracking branch 'origin/master' into develop 2022-08-11 21:04:46 +00:00
Danny
fab6c8a028 [Keyboard] Add Iris Rev. 7 (#17967)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-11 14:04:00 -07:00
Joshua Diamond
272f224dc6 Add cursor layer to DMQ Spin (#17996) 2022-08-11 13:28:48 -04:00
QMK Bot
ba370a54cd Merge remote-tracking branch 'origin/master' into develop 2022-08-11 16:09:38 +00:00
mincedshon
55f5406ac7 update ecila layout (#17975)
-update layout
2022-08-11 17:08:57 +01:00
QMK Bot
9981aaaae8 Merge remote-tracking branch 'origin/master' into develop 2022-08-11 05:06:33 +00:00
QMK Bot
a54ccb4ced Format code according to conventions (#17990) 2022-08-10 22:05:59 -07:00
QMK Bot
9d10a19fa8 Merge remote-tracking branch 'origin/master' into develop 2022-08-11 05:00:10 +00:00
DUILCHOI
0aeb9da030 [Keymap] update fave104 keymap (#17988) 2022-08-10 21:59:48 -07:00
Adam Applegate
a6fad5cc87 [Keymap] Added personal keymap for keebio/iris/rev6 (#17971) 2022-08-10 21:59:21 -07:00
Ivan Gromov
5dd944d450 [Keyboard] Add Aperture keyboard (#17980) 2022-08-10 21:59:05 -07:00
QMK Bot
f3acbf60fc Merge remote-tracking branch 'origin/master' into develop 2022-08-11 04:43:11 +00:00
Less/Rikki
34f0c1ac1b [Keyboard] fix: unicorne info.json LAYOUT (#17981) 2022-08-10 21:42:34 -07:00
QMK Bot
91be4740f2 Merge remote-tracking branch 'origin/master' into develop 2022-08-11 02:21:46 +00:00
James Young
380465e51c Acheron Athena Layout Macro Refactor and Additions (#17973) 2022-08-10 19:21:06 -07:00
QMK Bot
1882cdbf7b Merge remote-tracking branch 'origin/master' into develop 2022-08-11 01:48:48 +00:00
James Young
9ccbdad816 KBDfans KBD67 rev2: rename LAYOUT_65_ansi_split_bs_2_right_mods macro (#17972) 2022-08-10 18:48:12 -07:00
QMK Bot
e4b55a423a Merge remote-tracking branch 'origin/master' into develop 2022-08-11 01:45:33 +00:00
Álvaro A. Volpato
9898d6f4b0 [Keyboard] Add Viendi8L (#17943)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-10 18:44:59 -07:00
QMK Bot
ff59ae9783 Merge remote-tracking branch 'origin/master' into develop 2022-08-11 01:44:31 +00:00
Álvaro A. Volpato
90c4350af7 [Keyboard] Initial FM-S and FM-H support (#17765)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-10 18:43:52 -07:00
QMK Bot
b7b842da55 Merge remote-tracking branch 'origin/master' into develop 2022-08-11 01:39:09 +00:00
3araht
1038ade342 [Keyboard] add chromatonemini keyboard (#13516) 2022-08-10 18:38:32 -07:00
QMK Bot
90a290ea62 Merge remote-tracking branch 'origin/master' into develop 2022-08-11 01:34:34 +00:00
James Young
c230d0658e MacroCat Refactor (#17969) 2022-08-10 18:34:20 -07:00
Roger
d790b53580 [Keymap] single layer layout for BFO-9000 with numpad on the left (#17957) 2022-08-10 18:33:55 -07:00
QMK Bot
63915e84dc Merge remote-tracking branch 'origin/master' into develop 2022-08-10 20:08:21 +00:00
yiancar
a6d0cc3aab Aurora65 (#17966)
* aurora65 initial commit

* Add keymap images

* Move USB config to JSON

Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-10 21:07:41 +01:00
QMK Bot
663b250e2f Merge remote-tracking branch 'origin/master' into develop 2022-08-10 03:01:41 +00:00
Wilba
8a24fbbdae Fix detection of EEPROM reset in some keyboards (#17970) 2022-08-09 20:01:09 -07:00
QMK Bot
9bbc0cbb3b Merge remote-tracking branch 'origin/master' into develop 2022-08-10 00:24:17 +00:00
Kyle McCreery
7019d0bce8 [Keyboard] MechWild Puckbuddy (#17161)
* Initial commit

* testing modes

* working on puckbuddy firmware. This is all working for now but need to clean it up and personalize it.

* needs to be updated from vial build

* prepping for PR

* added rgb mode cycling to fn1 since it isn't on the encoder for these maps

* readme written in preparation for pr

* reverting driver print line

* Removed old reference to OBE in the readme from copypaste error

* applying changes based on review

* applying changes from review

* Update keyboards/mechwild/puckbuddy/puckbuddy.c

* trailing whitespaces removed

* added clear screen condition for switching back to name rendering

* Added uf2 keymap and fixed display glitch for the logo render art.

* Removed extra definition of FEE_PAGE_BASE_ADDRESS

* Removed the uf2 keymap and made it automatic when selecting bootloader instead

* Fixed the bad bootloader check

* moved the uf2 check from rules.mk to post_rules.mk to satisfy lint

* changing it back to stm32-dfu bootloader default

* Fixed RGBLIGHT enable oversight.

* Added persistent dynamic tapping configuration for the cirque touchpad tap term

* new lines at end of files for formatting and diff sanity

* changing default bootloader back to stm32-dfu

* Had to completely redefine the tap keycodes instead of using the DT_UP and DT_DOWN keycodes because I was not able to specify them easily in the via/vial configs and this allows me to keep the original functionality instead of tying it to eeprom like these are.

* Added tap toggling keycodes to quick enable and disable the tapping term

* working out an issue where the tap status keeps turning to off on power cycle

* correcting submodule garbo

* Fixed display issue and rewrote TAP config approach to make it a little easier to control

* removing backup puckbuddy.c code

* Added some comment, removed some commented out old code, removed trailing whitespace

* Changed to handle tinyuf2 by expecting emulated eeprom so that adding other forms of eeprom can be handled for the memory offset separately, and added user oled conditional inside the keyboard oled code block

* Updated default keymaps to have the tap and dpi keys on by default

* Apply suggestions from code review

* Apply suggestions from code review
2022-08-09 17:23:44 -07:00
QMK Bot
994a2542af Merge remote-tracking branch 'origin/master' into develop 2022-08-09 18:21:11 +00:00
mechlovin
94b3efe92e change Adelais En Ciel rev. 3 from STM32F303 to APM32F103 MCU (#16964)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-09 11:20:36 -07:00
QMK Bot
525049990c Merge remote-tracking branch 'origin/master' into develop 2022-08-09 18:20:08 +00:00
mincedshon
336c4904b5 [Keyboard] add ecila keyboard (#17596) 2022-08-09 11:19:15 -07:00
QMK Bot
25913ef518 Merge remote-tracking branch 'origin/master' into develop 2022-08-09 17:41:07 +00:00
yiancar
5de655023e [Keyboard] Add NK20 (#17907)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-09 10:40:32 -07:00
QMK Bot
6e1c2b20e5 Merge remote-tracking branch 'origin/master' into develop 2022-08-09 06:41:55 +00:00
Salicylic-acid3
923cd63f3e [Keyboard] (7skb)Change number of LEDs and Enable Mouse Keys (#17954) 2022-08-08 23:41:10 -07:00
QMK Bot
1d33baac8f Merge remote-tracking branch 'origin/master' into develop 2022-08-08 18:06:29 +00:00
Joel Challis
0002b1cc20 Also disable line ending conversion for merge workflows (#17953) 2022-08-08 19:05:41 +01:00
QMK Bot
a3b06fd87c Format code according to conventions (#17951) 2022-08-08 17:33:25 +01:00
QMK Bot
a14cd0fba5 Merge remote-tracking branch 'origin/master' into develop 2022-08-08 16:31:00 +00:00
Joel Challis
bccf933bc9 Force no git line ending conversion on format workflow (#16176) 2022-08-08 17:30:26 +01:00
QMK Bot
22cb4e520a Merge remote-tracking branch 'origin/master' into develop 2022-08-08 09:46:27 +00:00
Vertex-kb
9a3c30f2c7 [Keyboard] Add Vertex AngleR2 keyboard (#16764)
* Add files via upload

* Delete Vertex/AngleR2 directory

* Add files via upload

* Delete keyboards/Vertex/AngleR2 directory

* Add files via upload

* Add files via upload

* Add files via upload

* Update keyboards/vertex/angler2/angler2.h

* Update keyboards/vertex/angler2/info.json

* Update keyboards/vertex/angler2/keymaps/default/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c

* Update keyboards/vertex/angler2/keymaps/default/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c
2022-08-08 02:45:36 -07:00
Joel Challis
764c542bef Remove tmk_core 'serial' code (#17866) 2022-08-08 03:13:16 +01:00
QMK Bot
972f9a612c Merge remote-tracking branch 'origin/master' into develop 2022-08-07 21:11:17 +00:00
Arturo Avila
d27a6bd629 [Keyboard] Add Shisaku keyboard (#17572) 2022-08-07 14:10:32 -07:00
QMK Bot
b214768e09 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 21:07:55 +00:00
yeimialberth
ca04babf3f [Keymap] qwerty and dvorak keyboard setup (#16592)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-07 14:07:25 -07:00
QMK Bot
6a1a398627 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 19:40:49 +00:00
csc027
4267f0e0d4 csc027/keymap-updates (#17881)
* Reverted to most usable configuration for RDP usage.

* Added some HSV color definitions without the value portion to allow using the existing value.

* Switched to using HSV and HS color definitions.

* Added media keys to the convenience layer.

* Updated make rules to enable media keys.

* Cleaned up planck make rules.
2022-08-07 20:40:16 +01:00
QMK Bot
67461a0a47 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 19:33:39 +00:00
Takeshi ISHII
5ecd745514 fix comment space code in quantum/matrix_common.c (#17942) 2022-08-07 20:32:59 +01:00
QMK Bot
6e7678c415 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 13:01:43 +00:00
XScorpion2
034e266998 Rgbkb/keeb fixes (#17932)
* Disable console by default for better bios & reboot behavior

* Remove custom matrix

* Disable console by default for better bios & reboot behavior

* PR feedback
2022-08-07 14:01:10 +01:00
QMK Bot
9087e6ee28 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 12:57:41 +00:00
Joel Challis
a6ea760c94 rgbkb/zen - Resolve CONVERT_TO_PROTON_C warnings (#17619) 2022-08-07 13:57:12 +01:00
QMK Bot
e8ff0d6ced Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:34:18 +00:00
medoix
b9269bf689 [Keyboard] Dumbpad v1x_oled (#17058)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-07 02:33:36 -07:00
QMK Bot
4f3bf762f1 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:30:52 +00:00
DUILCHOI
964ce931e2 [Keyboard] add fave104 (#17909)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-07 02:30:18 -07:00
QMK Bot
5599f26667 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:29:42 +00:00
yiancar
82a72fe815 [Keyboard] Add P01 (#17921)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-07 02:28:46 -07:00
QMK Bot
50e6dd41e6 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:21:28 +00:00
James Young
de613fac0a Lin Works FAve 65H Refactor (#17938) 2022-08-07 02:20:51 -07:00
Drashna Jaelre
ac25109312 Always run pointing device init (#17936) 2022-08-07 02:18:03 -07:00
QMK Bot
93914142a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 01:24:34 +00:00
Joel Challis
c6ad38e79f RESET -> QK_BOOT default keymaps (#17939) 2022-08-07 02:23:58 +01:00
QMK Bot
c5844931e2 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 21:42:44 +00:00
Julian Turner
5c1cfc917e [Keymap] German Corne Layout (#17268)
* added german corne

* added symbol layer

* Delete settings.json

revert setting

* Delete keymap.c

* Update config.h

* Update keycodes.h

* Update config.h

* Update keyboards/crkbd/keymaps/JulianTurner/oled.c

* Update keycodes.h

* Update oled.c

added header

* Update keymap.c

added header

* Update keytabs.h

added header

* Update readme.md

* Update rules.mk

* default settings

* Update settings.json

* renamed folder

* revert

* remove c file import and added to rules

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update rules.mk

* updated files from pull request

* fixed issues with merge

* Update keyboards/crkbd/keymaps/julian_turner/oled.c

* Update keyboards/crkbd/keymaps/julian_turner/rules.mk

* Update keyboards/crkbd/keymaps/julian_turner/keymap.c

* Delete keycodes.h

* Update keyboards/crkbd/keymaps/julian_turner/readme.md
2022-08-06 14:41:52 -07:00
Joshua Diamond
5408334083 Update ginkgo65hot to allow use of community layouts (#17911) 2022-08-06 13:29:06 -07:00
QMK Bot
e938c663e5 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 17:19:59 +00:00
takashicompany
c8afb7a513 Update miniZone keymap (#17919) 2022-08-06 18:19:25 +01:00
QMK Bot
985b91b30f Merge remote-tracking branch 'origin/master' into develop 2022-08-06 16:21:41 +00:00
James Young
efdd048e18 Cipulot Kawayo Refactor (#17884)
* info.json: apply friendly formatting

* kawayo.h: use QMK 3-character notation

* refactor keymaps

- use QMK-native keycode aliases
  - KC_ENTER -> KC_ENT
  - KC_RIGHT -> KC_RGHT
  - KC_TRNS -> _______
  - RESET -> QK_BOOT
- use four-space indent

* kawayo.h: add matrix diagram

* info.json: correct layout data

* rename LAYOUT_default to LAYOUT_ansi_blocker_split_bs

* add LAYOUT_ansi_blocker macro with reference keymap

* add LAYOUT_ansi_blocker_tsangan macro with reference keymap

* add LAYOUT_ansi_blocker_tsangan_split_bs macro with reference keymap

* kawayo.h: add Corner Blocker (CB) option to matrix diagram

* change Layout Macro naming scheme

- update layout macro naming scheme
  - rename `LAYOUT_ansi_blocker` to `LAYOUT_65_ansi_cb_blocker`
  - rename `LAYOUT_ansi_blocker_split_bs` to `LAYOUT_65_ansi_cb_blocker_split_bs`
  - rename `LAYOUT_ansi_blocker_tsangan` to `LAYOUT_65_ansi_cb_blocker_tsangan`
  - rename `LAYOUT_ansi_blocker_tsangan_split_bs` to `LAYOUT_65_ansi_cb_blocker_tsangan_split_bs`
- rename reference keymaps to format specified in QMK docs
  - keymap using `LAYOUT_65_ansi_cb_blocker` macro should be named `default_65_ansi_cb_blocker`, etc.
- update layout macro grid alignment (no logic change)

* add LAYOUT_65_ansi_blocker macro

* add LAYOUT_65_ansi_blocker_split_bs macro

* add LAYOUT_65_ansi_blocker_tsangan macro

* add LAYOUT_65_ansi_blocker_tsangan_split_bs macro

* denote LAYOUT_all as an alias for LAYOUT_65_ansi_blocker_split_bs

* enable Community Layout support
2022-08-06 09:21:11 -07:00
Nick Brassel
154d35ac14 Remove UNUSED_PINS (#17931) 2022-08-06 23:23:35 +10:00
QMK Bot
820371c31b Merge remote-tracking branch 'origin/master' into develop 2022-08-06 12:38:13 +00:00
Ryan
37345e2ace Provide users with replacements for deprecated/invalid functionality where applicable (#17604) 2022-08-06 22:37:40 +10:00
Stefan Kerkmann
f27b617f36 [Core] Process all changed keys in one scan loop, deprecate QMK_KEYS_PER_SCAN (#15292) 2022-08-06 20:51:13 +10:00
QMK Bot
e9f9f99a33 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 08:59:44 +00:00
Ryan
0ff8c4f6fd Move keyboard USB IDs and strings to data driven: Z (#17927) 2022-08-06 18:59:13 +10:00
QMK Bot
dd0ac80ee4 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 08:52:48 +00:00
Ryan
fb19e14048 Move keyboard USB IDs and strings to data driven: Y (#17926) 2022-08-06 18:52:13 +10:00
Stefan Kerkmann
ed9bdcbc36 [Core] guard RPC invocation by checking RPC info against crc checksum (#17840) 2022-08-06 18:46:59 +10:00
QMK Bot
cac7042414 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 08:46:12 +00:00
Ryan
0e3cc6af12 Move keyboard USB IDs and strings to data driven: X (#17925) 2022-08-06 18:45:43 +10:00
QMK Bot
1d45c99355 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 06:37:08 +00:00
Albert Y
64acbcb42a [Docs] Building with GitHub Userspace (#16271) 2022-08-06 16:36:31 +10:00
QMK Bot
3c9941a629 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 06:31:44 +00:00
Andrew Kannan
99377a0f5b [Keyboard] Add Crin PCB (#17913) 2022-08-05 23:31:05 -07:00
QMK Bot
5efa2ff23e Merge remote-tracking branch 'origin/master' into develop 2022-08-06 06:30:45 +00:00
keyquest.tech
07fc37541d Added support for keyquest keyboards (#17667)
Co-authored-by: Mathiaszmrga <mmoragrega@centro.edu.mx>
2022-08-06 16:30:05 +10:00
Joel Challis
897403c4a7 Publish data as part of API generation (#17020) 2022-08-06 16:14:29 +10:00
QMK Bot
ec5186f0f9 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 05:50:30 +00:00
Ryan
10ad238944 Move keyboard USB IDs and strings to data driven: W (#17903) 2022-08-06 15:49:44 +10:00
Jeff Epler
7bbc1b21dd Add kb2040 onkey keyboard that works with the oled keymap (#17786) 2022-08-05 19:38:10 -07:00
Drashna Jaelre
ad4ef47d2b [Keyboard] use correct function in Dilemma splinky (#17923) 2022-08-06 02:58:06 +01:00
QMK Bot
758a0a0902 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 01:54:55 +00:00
Less/Rikki
660dedfb17 [Keyboard] encoder map on more mechwild boards (#17894) 2022-08-05 18:54:22 -07:00
QMK Bot
217bd431e9 Merge remote-tracking branch 'origin/master' into develop 2022-08-04 23:41:59 +00:00
Joel Challis
8978960a87 Tidy up ez_maker (#17910) 2022-08-05 00:41:29 +01:00
Drashna Jaelre
eb417b3aaf Add deprecated check for RGBLIGHT_ANIMATIONS (#17832) 2022-08-04 11:05:53 -07:00
QMK Bot
7093846319 Merge remote-tracking branch 'origin/master' into develop 2022-08-04 13:07:34 +00:00
ebastler
efd3b1e0bd added missing indicator defines for dolice (#17906) 2022-08-04 14:06:50 +01:00
Nick Brassel
d9eb152a90 Fix issue with #17904. (#17905) 2022-08-04 22:15:42 +10:00
Nick Brassel
94e8701b3e Fixup compilation of printf-like functions with uint32_t args. (#17904) 2022-08-04 21:44:56 +10:00
Nick Brassel
543f54a483 [Core] STM32_USB_USE_OTG1 => USB_ENDPOINTS_ARE_REORDERABLE (#17647) 2022-08-04 21:05:16 +10:00
QMK Bot
88cfd55b8c Merge remote-tracking branch 'origin/master' into develop 2022-08-04 01:36:14 +00:00
Ryan
17176daf26 Move keyboard USB IDs and strings to data driven: T (#17899) 2022-08-04 02:35:08 +01:00
QMK Bot
4e50de3a4b Merge remote-tracking branch 'origin/master' into develop 2022-08-04 00:22:37 +00:00
James Young
5a631ed9ac Balloondogcaps TR90 and TR90PM: rename LAYOUT to LAYOUT_ortho_3x3 (#17879)
* balloondogcaps/tr90: rename LAYOUT to LAYOUT_ortho_3x3

* balloondogcaps/tr90pm: rename LAYOUT to LAYOUT_ortho_3x3
2022-08-04 01:21:59 +01:00
QMK Bot
42a36a2095 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:55:51 +00:00
James Young
b01814bf68 boardsource/the_mark: add QMK Configurator layout data (#17898)
* boardsource/the_mark: add QMK Configurator layout data

* add keyboard maintainers to info.json

Adds the individual and organization accounts as listed maintainers.
2022-08-03 23:54:50 +01:00
QMK Bot
d8a15ce5bb Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:54:33 +00:00
Ryan
a30c1884c7 Move keyboard USB IDs and strings to data driven: U (#17900) 2022-08-03 23:53:46 +01:00
QMK Bot
adf8218399 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:53:16 +00:00
Ryan
1fd8d5c322 Move keyboard USB IDs and strings to data driven: V (#17901) 2022-08-03 23:52:24 +01:00
QMK Bot
0a198b59a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:13:21 +00:00
Ryan
a8744b1630 Move keyboard USB IDs and strings to data driven: S (#17889) 2022-08-04 08:12:37 +10:00
QMK Bot
237039cdcd Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:06:14 +00:00
Ryan
b40c03140e Move keyboard USB IDs and strings to data driven: R (#17885) 2022-08-04 08:05:40 +10:00
QMK Bot
c6a6f987c9 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 20:08:10 +00:00
Joel Challis
92bcbee226 Fix up splittest/bluepill (#17897) 2022-08-03 21:06:54 +01:00
QMK Bot
f326b0b40e Merge remote-tracking branch 'origin/master' into develop 2022-08-03 17:23:55 +00:00
Stephen J Bush
df8a538489 Userspace: muppetjones (#1) (#13461)
* Userspace: muppetjones (#1)

Add and update lily58 to work with userspace
Add and update kyria keymap to work with userspace
Add and update planck keymap with userspace
Add etchamouse code and docs to userpace
Add userspace
Update mouse encoder for smoother movement.
Encoder + mouse
Added casemodes by andrewjrae

* Rollback lily58 state reader and add missing GPL

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* fix lily58 keymap

* Updates to user and lily for muppetjones.

Updated parameters for etchamouse for smoother mouse movement. Updated lily keymap and userspace to actually work together.

* Update keyboards/lily58/keymaps/muppetjones/config.h

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

* Updated keymaps and userspace

* Little more cleanup.

* Update keyboards/lily58/keymaps/muppetjones/rules.mk

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

* Rollback accidental libchibios update

* Apply suggestions from code review

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

* Update kyria keymap

* Move kyria keymap to splitkb/kyria

* Update planck keymap

* Remove all changes to keyboards/lily58/lib/layer_state_reader.c

* Update lily58 keymap

* Recommended change

* Update keymap readme

* Update kyria keymap and userspace

* Apply suggestions from code review

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

* Renamed users/muppetjones/README.md to lc

* Update keyboards/lily58/keymaps/muppetjones/config.h

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-03 18:23:17 +01:00
QMK Bot
e93124f05c Merge remote-tracking branch 'origin/master' into develop 2022-08-03 14:59:13 +00:00
Ryan
5f6cf24294 Move keyboard USB IDs and strings to data driven: Q (#17883) 2022-08-03 15:58:29 +01:00
QMK Bot
4c81d4e526 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 13:20:50 +00:00
yulei
c4e767b4c9 added neson design's 700e keyboard (#17768)
* added neson design's 700e keyboard

* Apply suggestions from code review

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-03 14:20:10 +01:00
QMK Bot
671e211930 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 10:33:16 +00:00
jotix
4ec2626b43 jotix's community ortho_4x12 layout change (#17891) 2022-08-03 11:32:23 +01:00
QMK Bot
2dfccd29c8 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 08:33:04 +00:00
dvermd
0206bd9df3 add bluepill mcu to splittest (#16959)
* add bluepill mcu to splittest

* fix typo

* refactoring

* mcu config goes to mcuconf.h of keyboard
* keymap specific config goes to keymap config.h
* keyboard specific depending of keymap goes to post_config.h

* Apply suggested change

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

* Apply suggested change

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

* Apply suggested change

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

* Apply suggested change

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

* Apply suggested change

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

* splittest/bluepill: improve documentation

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-03 09:31:37 +01:00
QMK Bot
61a3fe4fac Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:23:52 +00:00
Ryan
b6757d2380 Move keyboard USB IDs and strings to data driven: P (#17875) 2022-08-03 17:23:15 +10:00
QMK Bot
d4f9eb5225 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:16:28 +00:00
Ryan
3da6575e24 Move keyboard USB IDs and strings to data driven: M (#17859) 2022-08-03 17:15:43 +10:00
QMK Bot
bce4fb4574 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:04:43 +00:00
Ryan
1b92c204c1 Move keyboard USB IDs and strings to data driven: K (#17846)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-08-03 17:03:47 +10:00
QMK Bot
d52d7bc658 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 06:48:37 +00:00
kkokdae
ce9bb6d39b [keymap] Add kkokdae keymap for keyboardio/atreus (#17843)
* [keymap] Add kkokdae keymap for keyboardio/atreus

* Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c

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

* Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c

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

* Revert "Update keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c"

This reverts commit 8e9ccc78c7.

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-03 07:47:48 +01:00
QMK Bot
40499bed06 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 06:11:19 +00:00
Travis
5f6ec37b7d [Keymap] Add TravisHi keymap for SplitKB Kyria (#17858)
* Init commit

* Prep for MVP

* Add F Fixes (thanks F!)

* Fix some incorrect layer summons

* Create readme (remove comments from code)

* Update OLED indicators (test)

* Add more OLED updates

* Add more layouts

* Update readme and small tweaks

* Update layers and prep for LED layers

* Fix a trapped layer issue

* Test animations

* Add a happy frog animation to right screen

* Add bulk work

* Move fren readme image

* Can't save images

* Update FPS layout

* Update Symbols layer

* Update readme

* Update readme (future comments move to readme)

* Remove superfluous comments & add Licence

* Add licence update
2022-08-03 07:10:46 +01:00
QMK Bot
b31c914f0f Merge remote-tracking branch 'origin/master' into develop 2022-08-03 00:07:38 +00:00
AnthonyNguyen168
4c8469f565 Update json file to support Configurator correctly. (#17692) 2022-08-03 01:06:55 +01:00
QMK Bot
90259eb012 Merge remote-tracking branch 'origin/master' into develop 2022-08-02 18:39:44 +00:00
Ryan
be5b1a24bf Move keyboard USB IDs and strings to data driven: O (#17874) 2022-08-02 19:39:00 +01:00
QMK Bot
7883306466 Merge remote-tracking branch 'origin/master' into develop 2022-08-02 18:31:04 +00:00
James Young
24488e043e SKergo Refactor (#17877)
* skergo.h: use ___ for KC_NO

* skergo.h: use 3-character notation

* skergo.h: add matrix diagram

* add LAYOUT_all macro

* update grid alignment of LAYOUT macro and keymaps

* refactor keymaps

Refactor keymaps to use the `LAYOUT_all` macro. Converts tabs to spaces.

This change necessitates the following changes to keymaps:

- The keycodes for Page Up, Page Down, and End each move up one row - all as the last keys on their new rows.
- The keycode for the secondary B key moves up one row, inserted between the primary (left side) B and the N.

* remove LAYOUT macro

* rename LAYOUT_all macro to LAYOUT_split_bs

* add LAYOUT_2u_bs macro

* readme.md: add flashing example

* info.json: correct maintainer value

Update to reference maintainer's GitHub username.
2022-08-02 19:30:26 +01:00
QMK Bot
1f8e9c1854 Merge remote-tracking branch 'origin/master' into develop 2022-08-02 06:54:51 +00:00
Niko Wenselowski
068bfc49de [Keymap] Move the ut472 keymap from gardego5 to keyhive folder (#17598) 2022-08-01 23:54:14 -07:00
QMK Bot
479c7876e6 Merge remote-tracking branch 'origin/master' into develop 2022-08-02 00:11:25 +00:00
Ryan
056a44c7d3 Move keyboard USB IDs and strings to data driven: N (#17865) 2022-08-02 01:10:48 +01:00
QMK Bot
e6dc14ae41 Merge remote-tracking branch 'origin/master' into develop 2022-08-02 00:03:00 +00:00
Ryan
7222969964 Move keyboard USB IDs and strings to data driven: L (#17849) 2022-08-02 01:02:19 +01:00
QMK Bot
e3ee87ee31 Merge remote-tracking branch 'origin/master' into develop 2022-08-01 16:10:17 +00:00
James Young
26b17a71e0 MS Sculpt Touch-Up (#17871)
* info.json: fix JSON syntax error

* info.json: convert tabs to spaces

* info.json: add QMK Configurator layout data

* readme.md: switch Bootloader and Docs sections
2022-08-01 17:09:40 +01:00
Drashna Jaelre
b1eac5c671 [Keyboard] Overhaul uzu42 (#17868) 2022-08-01 14:04:26 +01:00
QMK Bot
0e3b1740ef Merge remote-tracking branch 'origin/master' into develop 2022-08-01 13:01:06 +00:00
James Young
3b40ded512 ryanbaekr rb18 Configurator Data Fixes (#17872)
* info.json: apply friendly formatting

* info.json: correct key sequence

* info.json: remove dead space from layout

* info.json: correct maintainer value
2022-08-01 14:00:31 +01:00
QMK Bot
e32a956028 Format code according to conventions (#17869) 2022-07-31 21:35:53 -07:00
David Hoelscher
2bdd73f801 Add ST7735 driver to Quantum Painter (#17848) 2022-07-31 19:58:25 -07:00
jack
09ea5f6337 [Keyboard] Fix uzu42 compilation issue (#17867) 2022-07-31 19:05:15 -07:00
QMK Bot
735fb38a0e Merge remote-tracking branch 'origin/master' into develop 2022-07-31 22:34:03 +00:00
axtloss
e1b6034f00 [Keymap] Add axtloss keymap for sofle (#17835)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-31 15:33:34 -07:00
Joel Challis
98d5c77521 Remove legacy AVR ssd1306 driver (#17864) 2022-07-31 22:15:01 +01:00
Joel Challis
f7aaed1b57 Migrate crkbd keymaps to oled driver (#17863) 2022-07-31 12:36:30 -07:00
Joel Challis
c10c2575b8 Remove OLED driver Split Common warning (#17862) 2022-07-31 12:33:12 -07:00
Joel Challis
2f19579d3f Convert yosino58 to use split common (#17861) 2022-07-31 12:32:45 -07:00
Daniel Kao
b03a7cef75 Fix POINTING_DEVICE_GESTURES_SCROLL_ENABLE typo (#17850)
* Fix typo for POINTING_DEVICE_GESTURES_SCROLL_ENABLE

Follow the name written in documentation which follows
POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE

* Reword the blurb about POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE in docs
2022-07-31 15:51:20 +01:00
Joel Challis
409790457c Refactor satt/comet46 to use core OLED driver (#17856) 2022-07-31 15:35:42 +01:00
Joshua Diamond
baf34989f1 Default rgblight (#17855)
* better rgb bindings; improve default

* trim firmware size
2022-07-30 18:31:31 -04:00
Joshua Diamond
f02e355380 More glyph transformations for spidey3 userspace (#17854)
* add bold and blackboard bold glyph transformations

* trim firmware size; cformat

* fix typo in macro

* trim firmware size a bit more
2022-07-30 18:21:54 -04:00
QMK Bot
3d53c64992 Merge remote-tracking branch 'origin/master' into develop 2022-07-30 20:00:58 +00:00
James Young
f6a91649ff KPrepublic BM80v2 Touch-Up (#17851)
* info.json: apply friendly formatting

* info.json: correct layout data

Fix the size and position of the Backslash key.

* readme.md: touch-up formatting

* readme.md: switch Bootloader and Docs sections

* correct keyboard maintainer
2022-07-30 21:00:15 +01:00
QMK Bot
06fe4b16d2 Merge remote-tracking branch 'origin/master' into develop 2022-07-30 07:32:18 +00:00
Ryan
2d778d2ff2 Move keyboard USB IDs and strings to data driven: handwired (#17822) 2022-07-30 17:31:44 +10:00
QMK Bot
ef94f93fe2 Merge remote-tracking branch 'origin/master' into develop 2022-07-30 07:24:42 +00:00
Ryan
1c6b0391b4 Move keyboard USB IDs and strings to data driven: E (#17815) 2022-07-30 17:23:55 +10:00
Drzony
0b726a437b Implement relative mode for Cirque trackpad (#17760) 2022-07-29 21:20:34 -07:00
QMK Bot
b085d5221b Merge remote-tracking branch 'origin/master' into develop 2022-07-30 04:07:26 +00:00
Bahrul Hidayat
da07e7dd0e [Keyboard] add dyz60-hs (#17763)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-29 21:07:10 -07:00
kopibeng
c0e3a16121 [Keyboard] Update MNK88 RGB Underglow LED Number (#17833)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-29 21:06:40 -07:00
QMK Bot
7e172fd944 Merge remote-tracking branch 'origin/master' into develop 2022-07-30 03:03:14 +00:00
Ryan
306e50b84c Move keyboard USB IDs and strings to data driven: D (#17814) 2022-07-29 20:02:47 -07:00
QMK Bot
07f007de9a Merge remote-tracking branch 'origin/master' into develop 2022-07-30 03:02:29 +00:00
Chris Swenson
d1096ad440 [Keymap] Add enigma keymap for contra keyboard (#17829) 2022-07-29 20:01:35 -07:00
QMK Bot
a97c61074e Merge remote-tracking branch 'origin/master' into develop 2022-07-30 02:47:09 +00:00
James Young
d2aa8e6bb8 KBDfans Bounce Pad: Correct QMK Configurator Implementation (#17845) 2022-07-29 19:46:32 -07:00
QMK Bot
ed719d5d8d Merge remote-tracking branch 'origin/master' into develop 2022-07-30 02:17:19 +00:00
GG
0aec4203e7 [Keyboard] add Zoom87 (#17831) 2022-07-29 19:16:50 -07:00
QMK Bot
0c487cbeba Merge remote-tracking branch 'origin/master' into develop 2022-07-30 00:32:42 +00:00
Drashna Jaelre
d93dfbff3c Fix check when compiling HID Joystick with digital driver (#17844) 2022-07-30 01:32:06 +01:00
Frank Tackitt
21603c5142 Enable mousekeys by default for RGBKB Sol3 (#17842) 2022-07-29 23:42:34 +01:00
QMK Bot
3f1b61ba55 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 21:03:24 +00:00
James Young
7f2ddf1711 kbdfans/bounce/75: correct typos of keyboard name (#17841) 2022-07-29 22:02:45 +01:00
Stefan Kerkmann
a204523bbb [Core] RP2040 disable PIO IRQs on serial timeout (#17839) 2022-07-29 20:13:16 +02:00
zvecr
ade2eb1e75 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 17:30:33 +01:00
Ryan
394cf7c41e Move keyboard USB IDs and strings to data driven: J (#17837) 2022-07-29 13:49:01 +01:00
Ryan
bcb8600a31 Move keyboard USB IDs and strings to data driven: I (#17836) 2022-07-29 13:40:16 +01:00
QMK Bot
1050cf2453 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 12:19:39 +00:00
James Young
1ded7ad460 KBDfans Bounce75 Touch-Up (#17834)
* kbdfans/bounce/75/hotswap: keymap readability fix

Update grid alignment to disambiguate which keycodes correspond in different layers.

----

Layer 0 had 13 and 9 keycodes on the bottom two rows respectively, while Layers 1-3 had 14 and 8.

* kbdfans/bounce/75/soldered: keymap readability fix

Update grid alignment to disambiguate which keycodes correspond in different layers.

----

Layer 0 had 14 and 9 keycodes on the bottom two rows respectively, while Layers 1-3 had 15 and 8.

* kbdfans/bounce/75/soldered: fix layer index in keymaps

Layer indexes were 0,1,2,1 instead of 0,1,2,3.
2022-07-29 13:18:28 +01:00
QMK Bot
a7d0e01e5b Merge remote-tracking branch 'origin/master' into develop 2022-07-29 06:44:32 +00:00
James Young
5c90f7ae14 Wuque Promise87 WKL Refactor (#17828) 2022-07-28 23:43:54 -07:00
precondition
95c1cc425e Rename postprocess_steno_user → post_process_steno_user (#17823) 2022-07-28 21:51:01 -07:00
QMK Bot
2d0443ec25 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 04:42:45 +00:00
GG
b5452581da [Keyboard] fix mistakes in promise87 config (#17830) 2022-07-28 21:41:42 -07:00
QMK Bot
c2f68e3232 Merge remote-tracking branch 'origin/master' into develop 2022-07-28 13:13:39 +00:00
Ryan
920f983767 Move keyboard USB IDs and strings to data driven: H (#17821) 2022-07-28 14:12:40 +01:00
Stefan Kerkmann
157ea96411 ChibiOS: use correct status codes in i2c_master.c (#17808)
msg_t is MSG_OK in the success case and either MSG_RESET or MSG_TIMEOUT
in case of errors. So actually use them in the comparison.
2022-07-28 02:02:10 +01:00
QMK Bot
476d709fa5 Merge remote-tracking branch 'origin/master' into develop 2022-07-28 00:57:13 +00:00
Less/Rikki
e7affd0541 feat: encoder map, OLED & encoder kb-level config (#17809) 2022-07-28 01:56:37 +01:00
QMK Bot
b029252e76 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 23:52:09 +00:00
Arthur
1e745c48b6 [Keymap] Add artflag kyria layout (#17778)
* Initial firmware

* feedback

* updates

* update map
2022-07-27 16:51:13 -07:00
QMK Bot
7bb73306d6 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 21:44:42 +00:00
Ryan
23f365b601 Move keyboard USB IDs and strings to data driven: F (#17816) 2022-07-27 22:44:05 +01:00
QMK Bot
5055c9a74b Merge remote-tracking branch 'origin/master' into develop 2022-07-27 21:12:28 +00:00
Kevin Zhao
6731712cc1 Fix SKErgo Keymap (#17812) 2022-07-27 22:10:57 +01:00
QMK Bot
ed5351d75e Merge remote-tracking branch 'origin/master' into develop 2022-07-27 19:19:51 +00:00
Ryan
4a0eb733ac Move keyboard USB IDs and strings to data driven: G (#17818) 2022-07-27 20:19:09 +01:00
QMK Bot
602fde61e2 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 16:29:08 +00:00
turbololvo
c788857b6b fix function layer to reflect cap labels (#17813)
These changes correctly reflect the keycap labels on the Vortex Race 3.
2022-07-27 17:27:39 +01:00
QMK Bot
df15caf407 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 15:02:29 +00:00
James Young
0f40e5d0dc Wuque Promise87 ANSI Refactor (#17807) 2022-07-27 08:01:37 -07:00
Drashna Jael're
3d98269652 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 07:40:30 -07:00
Drashna Jaelre
8973835183 [Docs] Add information about WeAct Blackpill F411 (#16755)
* [Docs] Add information about WeAct Blackpill F411

* Add clarification for matrix pins

* Update documentation

* Tweak wording
2022-07-27 14:49:12 +01:00
QMK Bot
00c1653a15 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 09:29:50 +00:00
Albert Y
3285659690 CLI compatibility for MacOS (#17811) 2022-07-27 10:29:10 +01:00
Stefan Kerkmann
59d940c9f3 ChibiOS-Contrib: Update for RP2040 PWM and I2C driver (#17817) 2022-07-27 10:06:18 +02:00
QMK Bot
5df7cfdeb4 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 20:48:59 +00:00
Danny
dc48b3fd04 [Keyboard] Fix typo with RGB LED positioning in Iris (#17805) 2022-07-26 13:48:07 -07:00
QMK Bot
ff5848992c Merge remote-tracking branch 'origin/master' into develop 2022-07-26 20:25:59 +00:00
Less/Rikki
fc9654a1d0 feat: encoder map, OLED & encoder kb-level config (#17767) 2022-07-26 21:25:23 +01:00
QMK Bot
53ca6338c7 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 19:51:21 +00:00
Drashna Jaelre
5f36285fc5 [Keyboard] Add work louder micro (#17586)
* [Keyboard] Add work louder micro

* Update keyboards/work_louder/micro/readme.md

* Update readme

* Update kb config files

* Update to use encoder map

Co-authored-by: Tom Barnes <barnestom@me.com>
2022-07-26 20:50:45 +01:00
QMK Bot
e0e1f0af92 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 19:44:06 +00:00
Scott Bennett
9dbc0473ef Dz65v2 Settings for SBennett13 (#17747)
* Start of dz65v2 map for sbennett13

* No wpm, disable some rgb, ~copyright~

* No more raindrops

* Remove more rgb modes and set default

* Almost orgot this crappy thing

* cannot define startup :(

* Layered esc is kc_grv

* Start of dz65v2 map for sbennett13

* No wpm, disable some rgb, ~copyright~

* No more raindrops

* Remove more rgb modes and set default

* Almost orgot this crappy thing

* cannot define startup :(

* Layered esc is kc_grv

* Add license to config and keymap
2022-07-26 20:43:26 +01:00
Stefan Kerkmann
083b42068a Chibios: Stop I2C peripheral on transaction error (#17798)
From the ChibiOS HAL I2C driver pages:

After a timeout the driver must be stopped and restarted because the bus is in
an uncertain state.

This commit does that stopping explicitly on any error that occurred, not only
timeouts. As all the i2c functions restart the peripheral if necessary it is
safe to do so.

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2022-07-26 21:40:14 +02:00
QMK Bot
2899e69ead Merge remote-tracking branch 'origin/master' into develop 2022-07-26 19:15:45 +00:00
Spaceman
d4bb5a9820 Add alternative Logos (#17787) 2022-07-26 20:15:08 +01:00
Daniel Kao
b8b2e99976 Constrain Cirque Pinnacle coordinates (#17803)
Static x & y should be the same type as touchData.xValue &
touchData.yValue: uint16_t.
Their delta could be larger than int8_t and should be constrained to
mouse_xy_report_t.
2022-07-26 19:35:41 +01:00
Joel Challis
c982d6c5e3 Avoid OOB in dynamic_keymap_reset (#17695) 2022-07-26 17:38:28 +01:00
QMK Bot
61da9286a1 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 16:38:06 +00:00
QMK Bot
0534b878c3 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 16:37:29 +00:00
Nick Brassel
d1434b6d75 Make qmk doctor print out the last log entry for upstream/{master,develop}, including dates (#17713) 2022-07-26 17:37:28 +01:00
Wilba
501276a8fd Added WT65-D (#17724) 2022-07-26 17:36:30 +01:00
QMK Bot
1cf68476cc Merge remote-tracking branch 'origin/master' into develop 2022-07-26 08:00:23 +00:00
Álvaro A. Volpato
b0b14cc440 [Keyboard] Acheron Athena support (#16818)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-26 00:59:38 -07:00
Drashna Jaelre
5d898a3d34 [Docs] Updates to Pointing Device Docs (#17777) 2022-07-26 00:27:34 -07:00
Charly Delay
244450625a bastardkb: fix info.json changes that got reverted during the last merge from master to develop (#17800)
* bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop`

* Remove board name from root folder `info.json`
2022-07-26 07:41:24 +01:00
QMK Bot
9f5b71bada Merge remote-tracking branch 'origin/master' into develop 2022-07-26 06:27:00 +00:00
Olly Hayes
77e48f5b7e [Keymap] Add ollyhayes keymap (#16632) 2022-07-25 23:26:22 -07:00
QMK Bot
9825b66cac Merge remote-tracking branch 'origin/master' into develop 2022-07-26 06:26:00 +00:00
Leo Deng
ddae04bca1 [Keyboard] add DJam keyboard (#17430)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25 23:25:28 -07:00
Daniel Kao
1de6811ebe Cirque circular scroll: Support POINTING_DEVICE_COMBINED (#17654) 2022-07-25 23:19:33 -07:00
QMK Bot
2456044d5f Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:36:55 +00:00
shamit05
91d911eb1f [Keyboard] Add Halokeys Elemental 75 (#17323)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-25 22:36:11 -07:00
QMK Bot
9f976b89d8 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:31:41 +00:00
Cipulot
ba1643af7d [Keyboard] Add Kawayo Keyboard (#17454)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25 22:30:59 -07:00
QMK Bot
11c9a5e3ac Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:24:46 +00:00
hornslyn
a33dc8ebb5 [Keyboard] Add Star75 support (#17421)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-25 22:24:04 -07:00
Albert Y
70d554420c [Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557) 2022-07-25 22:22:42 -07:00
QMK Bot
f004d93bad Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:21:11 +00:00
James Young
753ca0e13c takashicompany miniZone: fix QMK Configurator implementation (#17801) 2022-07-25 22:20:36 -07:00
QMK Bot
4bd4210e97 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:02:37 +00:00
Daniel O'Brien
3eb9f28c89 [Keyboard] Add missing mute button to sofle keymap (#17796) 2022-07-25 22:02:02 -07:00
QMK Bot
f0300fc763 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 05:00:11 +00:00
Diogo Sergio
e6a7db2fd2 Update README.md for teensy lc onekey (#17797) 2022-07-25 21:59:37 -07:00
QMK Bot
d556c4233e Merge remote-tracking branch 'origin/master' into develop 2022-07-26 04:01:41 +00:00
Ryan
5ed98df374 gboards/georgi: cleanup & fix (#17753) 2022-07-26 14:01:05 +10:00
Drashna Jaelre
928bbded6d [Keyboard] Fix compilation issues for Charybdis/Dilemma (#17791)
* [Keyboard] Fix debug printing for Charybdis/Dilemma

* Fix compliation issue for dilemma
2022-07-26 02:40:14 +01:00
QMK Bot
77ed0feebe Merge remote-tracking branch 'origin/master' into develop 2022-07-26 00:53:04 +00:00
Ryan
674422eb13 Move keyboard USB IDs and strings to data driven: A (#17781) 2022-07-26 01:52:18 +01:00
QMK Bot
1e651dbdb0 Merge remote-tracking branch 'origin/master' into develop 2022-07-25 23:04:48 +00:00
Ryan
a939293aca Move keyboard USB IDs and strings to data driven: C (#17789) 2022-07-26 00:04:09 +01:00
QMK Bot
4baed8037d Merge remote-tracking branch 'origin/master' into develop 2022-07-25 22:56:05 +00:00
James Young
b6ac0ecf82 Runes Skjöldr Touch-Up (#17792)
* skjoldr.h: use ___ for KC_NO

* skjoldr.h: use K<row><column> notation

Matrix was previously defined using identifiers in the format of K<column><row>.

* skjoldr.h: add matrix diagram

* info.json: apply friendly formatting

- key legends as labels
- correct key sizes and positioning

* refactor keymaps

Refactors the `default` and `via` keymaps.

- use QMK-native keycode aliases
- grid-align keycodes for readability

* rename LAYOUT macro to LAYOUT_60_ansi_arrow

* enable Community Layout support

* info.json: correct maintainer value

Field is meant to reference the maintainer's GitHub username.
2022-07-25 23:55:26 +01:00
QMK Bot
4837bc50c4 Merge remote-tracking branch 'origin/master' into develop 2022-07-25 22:08:08 +00:00
Drashna Jaelre
68cc6be564 [Keyboard] Fix Charue Sunsetter_r2 compilation issues (#17793) 2022-07-25 23:07:32 +01:00
Drashna Jaelre
683eeca2e2 [Docs] Fix custom debug function and sample output (#17790) 2022-07-25 23:07:15 +01:00
Drashna Jaelre
325da02e57 Fix QK_MAKE's reboot check (#17795) 2022-07-25 23:06:26 +01:00
Drashna Jael're
99c48f1361 Merge remote-tracking branch 'origin/master' into develop 2022-07-25 10:15:47 -07:00
ILWrites
1df6322f10 Fixed spacebar position (#17784) 2022-07-25 17:21:09 +01:00
Ryan
50c2b151b2 Move keyboard USB IDs and strings to data driven: B (#17782) 2022-07-25 16:20:19 +01:00
QMK Bot
7d2260ab75 Merge remote-tracking branch 'origin/master' into develop 2022-07-25 14:59:45 +00:00
James Young
d2161f113b MechWild Mokulua: Correct QMK Configurator Data (#17783)
* Mokulua Mirrored: rebuild info.json file

* Mokulua Standard: rebuild info.json file
2022-07-25 15:58:58 +01:00
Charly Delay
50a12c06b9 [keyboard] bastardkb: restructure folder hierarchy (#16778)
* bastardkb: restructure folder hierarchy ahead of supporting other adapters/mcus

Upcoming support for the following (adapter, mcu) pairs will be
submitted in follow-up PRs:

- `v2/elitec`
- `v2/stemcell`
- `blackpill`

This PR contains the following changes:

- Move previous implementation to an inner `v1/elitec` folder
- Move keyboard USB IDs and strings to data driven
- Update headers to update maintainers list
- Run `qmk format-c`

* bastardkb/charybdis: remove broken acceleration implementation

* bastardkb/charybdis: fix debug output

* bastardkb: add support for BastardKb the `v2/elitec` (adapter, mcu) pair

* bastardkb: add Blackpill support

* bastardkb/charybdis/3x5: add `bstiq` keymap

* bastardkb/charybdis: add fake LEDs to the configuration

For the Charybdis 3x5 (respectively 4x6), the LED config now simulates
36 (respectively 58) LEDs instead of the actual 35 (respectively 56) to
prevent confusion when testing LEDs during assembly when handedness is
not set correctly.  Those fake LEDs are bound to the physical
bottom-left corner.

* bastardkbk/charybdis/readme.md: update build commands

Merge pull request #5 from Nathancooke7/update_charybdis_readme_v2_shield.

* bastardkb/charybdis: fix Via keymap with blackpill

* bastardkb/charybdis: add 3x6 configuration

* bastardkb/charybdis: remove unnecessary files

* bastardkb/charybdis: remove obsolete code

* bastardkb/charybdis/3x6: add Via keymap

* bastardkb: add support for Splinky (RP2040) board

* bastardkb: initial configuration for the Splinky (SPI not working yet)

* bastardkb/charybdis/3x5/v2/splinky: tentative change to enable trackball

* bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins

* bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins

* bastardkb/charybdis/4x6/v2/splinky: add SPI configuration and enable trackball

* bastardkb/charybdis/3x6: add splinky config

* bastardkb/*/v2/splinky: update drivers to `vendor`

* bastardkb/dilemma: add new board

* bastardkb/charybdis: fix infinite loop in `layer_state_set_user(…)` in the `via` keymaps

* bastardkb/dilemma: add `bstiq` keymap

* bastardkb: specify blackpill boards

* bastardkb/charybdis: fix blackpill-specific define syntax

* bastardkb: remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` which are no longer valid options

* bastardkb: fix `QK_BOOT` keycodes

* bastardkb/dilemma: fix mouse direction on X axis

* bastardkb/charybdis/3x6: adjust CS

* bastardkb/dilemma: adjust trackpad configuration

* charybdis: fix `PWM33XX_CS_PIN` defines

This is a follow-up of https://github.com/qmk/qmk_firmware/pull/17613.

* bastardkb: remove Vial mentions from `bstiq` keymaps

* Cleanup unnecessary comments

Co-authored-by: Nathan <nathan.cooke@compass.com>
Co-authored-by: Charly Delay <0xcharly@codesink.dev>
2022-07-25 10:11:28 +01:00
QMK Bot
336df3297e Merge remote-tracking branch 'origin/master' into develop 2022-07-24 23:01:36 +00:00
Drashna Jaelre
c0763363db [Docs] Fix tables in Audio driver document (#17780) 2022-07-25 00:00:51 +01:00
QMK Bot
d5e619f472 Merge remote-tracking branch 'origin/master' into develop 2022-07-24 16:12:13 +00:00
James Young
00c02e3bd8 FJLabs Sinanju Refactor (#17773)
* sinanju.h: add matrix diagram

* add LAYOUT_60_ansi_wkl_split_bs_rshift macro

Same matrix as `LAYOUT_all`, but with position K2D (right half of split Backspace) moved to the end of the top row.

* refactor keymaps

- use `LAYOUT_60_ansi_wkl_split_bs_rshift` macro instead of `LAYOUT_all`
- polish four-space indent
- update grid alignment
- replace `RESET` keycode with `QK_BOOT`

* remove now-unused LAYOUT_all macro

* add LAYOUT_60_ansi_wkl macro with keymap

Add a layout with 2u Backspace and 2.75u right Shift.

* info.json: correct maintainer value
2022-07-24 17:11:28 +01:00
QMK Bot
c1783ff35d Merge remote-tracking branch 'origin/master' into develop 2022-07-24 16:07:21 +00:00
James Young
5f172b63f5 Chocofly v1: add info.json (#17772) 2022-07-24 17:06:30 +01:00
QMK Bot
62cd280c3b Merge remote-tracking branch 'origin/master' into develop 2022-07-24 12:40:43 +00:00
James Young
191f6e8069 Idobao ID63 Community Layout support (#17769)
* info.json: add key labels

* rename LAYOUT_63_ansi to LAYOUT_60_ansi_arrow

* enable community layout support
2022-07-24 05:39:53 -07:00
QMK Bot
f6612c219f Merge remote-tracking branch 'origin/master' into develop 2022-07-24 12:26:27 +00:00
James Young
049811be0d Add info.json files for Acheron Apollo series keyboards (#17770)
* add info.json file for Apollo87H

* add info.json file for Apollo87H-T-SC

* add info.json file for Apollo88H-T-SC
2022-07-24 05:25:46 -07:00
QMK Bot
7f938e969d Merge remote-tracking branch 'origin/master' into develop 2022-07-24 11:07:34 +00:00
James Young
592028c724 boardsource/beiwagon: correct QMK Configurator layout data (#17771) 2022-07-24 21:06:55 +10:00
QMK Bot
914861b07c Merge remote-tracking branch 'origin/master' into develop 2022-07-24 05:10:28 +00:00
4pplet
58d484ea28 Waffling80 layout fix (#17757) 2022-07-24 06:09:40 +01:00
QMK Bot
db3d9f9935 Merge remote-tracking branch 'origin/master' into develop 2022-07-24 03:28:12 +00:00
James Young
962dcbf3a3 Creatkeebs Thera Refactor (#17766) 2022-07-23 20:27:38 -07:00
QMK Bot
3825362a3b Merge remote-tracking branch 'origin/master' into develop 2022-07-24 00:10:33 +00:00
Álvaro A. Volpato
98c1f7a9ef [Keyboard] Apollo87H PCB support (#16817)
* Initial Apollo87H support

* Define RGB animations and default animation

* Add proper per-key RGB support

* Adjust LED positions

* Separate delta-gamma

* Fine-tune LED positions

* fix up GAMMA revision

* fix up tabs indentation to spaces indentation

* Fixed positioning and CS-SW defs for some LEDs

* Fix INS RGB position

* Fine-tune LED positions, fix default RGB

* Update readme's

* Rename LAYOUT_87H to lowercase 87h

* Formatting gamma's rules.mk

* Formatting delta's rules.mk

* Use smaller readme image

* Use smaller README image

* First support for 87H-T-SC and 88H-T-SC

* Update README

* Fix layout naming

* Remove

* Remove EEPROM definitions, fix missing RGB LED mod/alpha definer

* Add suggestions from noroadsleft
2022-07-23 17:09:52 -07:00
QMK Bot
f383f7d6e5 Merge remote-tracking branch 'origin/master' into develop 2022-07-24 00:04:24 +00:00
TJ
c3df1775bc [Keyboard] Le Chiffre rev 2 and HE additions (#17377)
* chiffre refactor for new revisions

* updated led matrix config

* updated per suggestions

* add tapdance enable

* revert tapdance (none defined in the default keymaps)

* clean up rules

* add readme for HE

* remove notes in readme

* fix perm

* fix perms

* Fix spacing on readme

* fix perm

* fix perms again?
2022-07-23 17:03:41 -07:00
QMK Bot
302fa11d1f Merge remote-tracking branch 'origin/master' into develop 2022-07-23 20:23:43 +00:00
4pplet
f1ccd60458 [Keyboard] 4pplet Perk60 (#16853)
* adding perk60 iso

adding perk60 iso

* Update info.json

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Delete chconf.h

* Update keyboards/4pplet/perk60_iso/rev_a/rules.mk

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Update rules.mk

* Update config.h

* removing a few RGB effects

* removing more effects

* Update keyboards/4pplet/perk60_iso/rev_a/config.h

* Update keyboards/4pplet/perk60_iso/keymaps/default/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/default/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.h

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/info.json

* Update keyboards/4pplet/perk60_iso/rev_a/rules.mk
2022-07-23 13:23:14 -07:00
JayceFayne
d02cefe613 implement tap_code16_delay (#17748) 2022-07-23 19:21:20 +01:00
jack
a6f3194397 Add ability to enter bootloader mode from QK_MAKE (#17745) 2022-07-23 17:43:32 +01:00
QMK Bot
8254d73fd4 Merge remote-tracking branch 'origin/master' into develop 2022-07-23 16:42:55 +00:00
Niko Wenselowski
1f42a8ccdd Fix test logic to check for both keymaps (#17761)
Python will evaluate first the left and then the right side of the and operator.

The left side would previously return True based on the truthiness logic that treats any non-emptry string as true.

It would not check if the desired keymap exists.

If the left side is true it will evaluate the right side which will check for the existance of a specific keymap.

With this change the check for existance of two keymaps is implemented.
2022-07-23 17:42:19 +01:00
jpe230
c586cfda48 (develop) Update bootmagic for Adafruit Macropad (#17755) 2022-07-22 23:28:51 +01:00
QMK Bot
c39a902867 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 20:20:43 +00:00
Yuannan
2202efaf0c Added autoclicker, better mouse, Vim like editing layer and more. (#15702)
* Added autoclicker, better mouse, vim like FN layer and more.

* Updated docs to comply with guidelines

* Fixed Imgur links

* increased step sizes

* updated readme to reflect step size

* Added second delay array for autoclicker to compensate for RGB animation CPU loads

* better RGB effects and updated docs

* better README.md formatting

* added DEBONCE libinput workaround for Linux

* fixed formatting

* fixed typos and clarified

* fixed layer picture order

* Update keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c

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

* Update keyboards/dztech/dz65rgb/keymaps/yuannan/README.md

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

* Updated Docs and rules

* Updated with the new deferred exec API to ensure more consistant CPS

* renamed README.md to be lower case to comply with fauxpark's request

* Remapped alt to be left instead of right for compatibility reasons

* Update keyboards/dztech/dz65rgb/keymaps/yuannan/config.h

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-22 21:20:02 +01:00
QMK Bot
536511a32a Merge remote-tracking branch 'origin/master' into develop 2022-07-22 14:58:18 +00:00
mechlovin
8de0427fec [Kay60] Change LED pin state and correct keycode. (#17746) 2022-07-22 15:57:03 +01:00
QMK Bot
0e81d63b64 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 13:23:36 +00:00
Aidan Gauland
de10784799 Fix compilation error in Ploopy Nano maddie keymap (#17733) 2022-07-22 14:22:56 +01:00
QMK Bot
f1671ec720 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 03:43:08 +00:00
Sắn
b9c7d4c48d [Keyboard] Add Krush65 Hotswap (#16692)
* Add Krush65 Hotswap

* Led fix

* small fix

* a

* B

* move ec action to VIA keymaps

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk

* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json

* Update keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
2022-07-21 20:42:29 -07:00
QMK Bot
d681eac0ad Merge remote-tracking branch 'origin/master' into develop 2022-07-21 20:24:51 +00:00
Joel Challis
5a0e47db5e Add reviewer/labels to dependabot PRs (#17743) 2022-07-21 21:24:07 +01:00
QMK Bot
bfed88dba2 Merge remote-tracking branch 'origin/master' into develop 2022-07-21 19:55:00 +00:00
dependabot[bot]
4ca99af8f5 Bump JamesIves/github-pages-deploy-action from 4.3.4 to 4.4.0 (#17742) 2022-07-21 20:54:27 +01:00
Drashna Jaelre
5f32690cba Move Pointing Device Initialization (#17740)
Move Pointing Device Initialization to after Split Post Initialization

If both pointing device and split is enabled, the pointing device init needs to be called after the split post init, otherwise the connection (serial/etc) isn't initialized yet, and any commands that need to send data over (such as calling the set cpi command) never get sent over.
2022-07-21 10:16:44 -07:00
jpe230
5c90732622 Adafruit Macropad: Add VIA keymap, fix default km (#17735) 2022-07-21 14:44:12 +01:00
QMK Bot
6081a8091d Merge remote-tracking branch 'origin/master' into develop 2022-07-21 12:45:28 +00:00
jonavin
7f0581cd35 Jonavin mercutio - reduce mem footprint (#17498)
* Reduce mem footprint - remove sprintf

* remove stdio reference and use get_u8_str

Co-authored-by: Jonavin <=>
2022-07-21 13:44:51 +01:00
Albert Y
d510e80b89 Add Blok 2040 conversion (#17603) 2022-07-21 00:54:05 +01:00
Wilba
4efe6330c4 VIA Encoder Map Support (#17734) 2022-07-21 09:53:42 +10:00
QMK Bot
493d422406 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 23:20:34 +00:00
mechlovin
a6d70de96a [Keyboardo] Update PID for mechlovin zed60 (#17728) 2022-07-20 16:19:51 -07:00
mknj
9a31bbb3fa fix syntax error (#17732) 2022-07-20 22:59:18 +01:00
Albert Y
05f30f0787 Use Pro Micro pinout for SDA/SCL (#17595) 2022-07-20 18:24:34 +01:00
QMK Bot
ab45e3b993 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 17:00:18 +00:00
takashicompany
62e3f8b885 Add miniZone Keymap (#17552) 2022-07-20 17:59:40 +01:00
Ben Fiedler
1db5272154 docs: fix default value of USB_SUSPEND_WAKEUP_DELAY (#17501)
Documents the change made in #12081
2022-07-20 17:43:41 +01:00
Drashna Jaelre
ee17ffadea Move Pointing Device code to a subdirectory (#17684) 2022-07-20 17:32:00 +01:00
QMK Bot
adfa36fee4 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 15:02:35 +00:00
Felix Jen
55f16167e4 Added Windz Sinanju to QMK (#17566) 2022-07-20 16:01:35 +01:00
QMK Bot
fa44f2b21e Merge remote-tracking branch 'origin/master' into develop 2022-07-20 00:56:25 +00:00
Michal
00c8e24c6a [Keymap] Michal Keymap for Sofle rev1 (#17610) 2022-07-19 17:55:48 -07:00
Drashna Jaelre
12eb6444c6 Add support for PAW3204 Optical Sensor (#17669)
Co-authored-by: gompa <gompa@h-bomb.nl>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-07-19 17:46:22 -07:00
QMK Bot
6992efb229 Merge remote-tracking branch 'origin/master' into develop 2022-07-19 23:24:53 +00:00
Duccio
a7893f207d Add rgb underglow support and change vendor_id (#17719) 2022-07-20 00:24:10 +01:00
QMK Bot
d0c095eec2 Merge remote-tracking branch 'origin/master' into develop 2022-07-19 15:43:59 +00:00
JW2586
32512bbf10 [Keyboard] Waterfowl keyboard support (#16760)
* Added waterfowl files

* Completing PR Checklist

* Added encoders to info.json

* Added license to default keymap

* Update keyboards/waterfowl/keymaps/cyanduck/keymap.c

* Update keyboards/waterfowl/keymaps/default/keymap.c

* Update keyboards/waterfowl/waterfowl.c

* Update keyboards/waterfowl/keymaps/default/keymap.c

* Update keyboards/waterfowl/waterfowl.c

* Update keyboards/waterfowl/waterfowl.c

* Update keyboards/waterfowl/keymaps/cyanduck/keymap.c

* Update keyboards/waterfowl/rules.mk

* Update readme.md

* Update keyboards/waterfowl/waterfowl.c

* Update keyboards/waterfowl/info.json

* Update keyboards/waterfowl/info.json
2022-07-19 08:43:19 -07:00
QMK Bot
d458df7698 Merge remote-tracking branch 'origin/master' into develop 2022-07-19 10:29:44 +00:00
takashicompany
819231afe1 Add keymap for Radialex (#17662)
* fix keymap

* fix keymaps
2022-07-19 11:28:45 +01:00
QMK Bot
7a10c3370f Merge remote-tracking branch 'origin/master' into develop 2022-07-19 10:14:23 +00:00
David Hoelscher
1bf95d60e4 [Keyboard] customMK EVO70 (#14907)
* added files for EVO70

* updated info.json and readme

* ran qmk lint and fixed typo in info.json

* removed defines from config.h in favor of info.json

* removed an unnecssary include

* removed unnecessary code

* updated rules.mk to remove mention of Bluetooth

* corrected edit to rules.mk

* added code for OLED menu display

* removed extraneous comments and spaces

* added bongo cat animation

* Update keyboards/custommk/evo70/rules.mk

* Update keyboards/custommk/evo70/config.h

* Modified Bongocat graphics to match original proportions

* updated info.json device version

* updated OLED splash screen display timing

* improved bongo cat tap detection and added backlight breathing to OLED menu

* various improvements to OLED, saving settings, and VIA keymap fix

* removed extraneous define

* custom encoder assignment retained upon powerup, backlight sleep upon suspend

* corrected bongo cat tap detection

* Changed splash screen and bongo cat encoder rotation to use the custom assignments

* removed _default from LAYOUT naming and changed keyboard image to be hosted from imgur

* Force smaller version of image to be used in readme
2022-07-19 03:13:16 -07:00
Nick Brassel
1cdde7ba6a Fix AVR compilation of FNV by using standard integer typenames. (#17716) 2022-07-19 05:30:01 +01:00
jack
59c7b15b4d [Keyboard] boardsource/microdox data driven (#17675) 2022-07-18 19:20:24 -07:00
QMK Bot
e8b14a52de Merge remote-tracking branch 'origin/master' into develop 2022-07-19 02:09:38 +00:00
James Young
7aea67980b Update noroadsleft userspace and keymaps (2022-07-18) (#17714)
* kbdfans/kbd75/rev1:noroadsleft - remove LAYOUT_75_ansi_wkl definition

* coseyfannitutti/discipline:noroadsleft - change KC_GESC to KC_ESC

* update Quantum keycode instances in noroadsleft keymaps

- `RESET` -> `QK_BOOT`
- `EEP_RST` -> `EE_CLR`
- `DEBUG` -> `DB_TOGG`

* create and add G_PWD macro
2022-07-18 19:09:05 -07:00
Joel Challis
c3f1ba7dd1 Remove full bootmagic config (#17702) 2022-07-19 02:28:23 +01:00
QMK Bot
eabbc04213 Merge remote-tracking branch 'origin/master' into develop 2022-07-18 19:53:40 +00:00
Sergey Vlasov
627e35b7ac Remove Nixpkgs-provided poetry from the environment (#17673)
The `poetry` package from the used Nixpkgs snapshot triggers the regex
compatibility issue in Nix >= 2.10.0 binaries for `x86_64-darwin`:

    https://www.github.com/NixOS/nix/issues/4758

Remove the `poetry` package from the Nix shell environment for now
(it is not really required to compile QMK, only to develop the Nix shell
environment itself).

In addition, all `poetry` version earlier than 1.1.14 became effectively
non-functional after a breaking change of the PyPI JSON API:

    https://www.github.com/python-poetry/poetry/pull/5973

Updating the `poetry` package is not trivial (just adding it it to
`pyproject.toml` does not work due to dependency version conflicts with
other modules), therefore removing it seems to be the easiest solution
to restore compatibility with new Nix versions while not creating any
major inconvenience for QMK users.
2022-07-18 22:52:55 +03:00
QMK Bot
0e4f953976 Merge remote-tracking branch 'origin/master' into develop 2022-07-18 12:20:54 +00:00
Jason Wihardja
c10d0fc785 Add Support for Massdrop's Stack Overflow The Key V2 (#17696)
* Default Factory Settings

* Change Keyboard Name in Readme

* Fix LED Orders

* Change Brightness Step

* Enable Lighting Layers

* Add RGB Control Mode

* Unblink Layer to Clear Stack

* Add MacOS RGB Control

* Comment Fixes
2022-07-18 13:20:19 +01:00
QMK Bot
11cfc8a0b6 Merge remote-tracking branch 'origin/master' into develop 2022-07-18 12:18:48 +00:00
Runheme
4be736c192 [Keyboard]modify ginkgo65hot (#17705)
modify ginkgo65hot
2022-07-18 13:18:08 +01:00
Joel Challis
42eff8c372 Allow dynamic keymap to compile without via.h (#17703) 2022-07-18 11:55:27 +01:00
QMK Bot
32cc8a7f43 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 23:56:05 +00:00
Kyle McCreery
a444ccd27c Re-refactor Mokulua (#17125)
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream

* initial commit for mokulua keyboard

* Split the board into mirrored and standard layouts.

* Prepping for PR. Silly keymap added.

* prepped for PR

* Apply suggestions from code review

* Fixing firmware from the refactor that removed the mirrored layout.

* Small tweaks using changes from refactor

* Changed the name of the layouts back to match the original to resolve conflict in info.json

* these files needed to be removed as well, they were added as a part of the refactor

* info.json moveds to be different for each build

* Another file had to be removed and the mirrored.c file changed to call mirrored.h instead of standard.h

* fixing chibios ver

* force deleting to revert

* fixing chibios shit

* Update keyboards/mechwild/mokulua/mirrored/mirrored.c

* Update keyboards/mechwild/mokulua/standard/standard.c

* Removing tabs and replacing with 4 spaces. Small style and formatting changes.
2022-07-17 16:55:32 -07:00
Stefan Kerkmann
a304a9b51e Use correct angle tune range of +/-127 on PMW33XX (#17708)
...partially reverts 580bcff4f6 as the
datasheet doesn't claim that the angle tuning as limited to +/- 30
degrees.
2022-07-17 21:08:55 +02:00
QMK Bot
4779539543 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 16:50:28 +00:00
David Kühling
931c7539d2 [Keyboard] Handwired Maltron DQz11N1G contoured keyboard (#17237)
* Basic support for Maltron DQz11N1G controller replacement.

* Update keyboards/handwired/dqz11n1g/rules.mk

* Rehost images to cubeupload.com.

(They were previously hosted via github wiki)

* Apply suggestions from noroadsleft code review

* Update keyboards/handwired/dqz11n1g/dqz11n1g.h
2022-07-17 09:49:36 -07:00
QMK Bot
4f7be48758 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 16:36:02 +00:00
Richard
747b33cb81 [Keyboard] Adding chocV keyboard (#15921)
* Adding chocV keyboard

* Fix checklist issues / community layout support

* Remove template cruft from readme

* Fix image url in readme

* Fix image url in readme to raw github content

* Change readme example to use default Keymap

* Remove vestigal config

* More informative keymap readme

* Config.h swapsies

* Remove deprecated features

* Conform / Modernize Rules

* Conform / Modernize Rules

* Clean up spacing

* Update keyboards/chocv/readme.md

Move build docs links to end 👍
2022-07-17 09:35:09 -07:00
QMK Bot
96c92d208f Merge remote-tracking branch 'origin/master' into develop 2022-07-17 16:25:12 +00:00
mechlovin
6025df79b3 [Keyboard] Add Zed60 PCB (#17304)
* add zed60

* update readme.md

* Delete chconf.h

* update readme.md

* Update keyboards/mechlovin/zed60/rules.mk

* Update keyboards/mechlovin/zed60/keymaps/via/keymap.c

* Update keyboards/mechlovin/zed60/keymaps/default/keymap.c

* Update keyboards/mechlovin/zed60/keymaps/default/keymap.c

* Update keyboards/mechlovin/zed60/keymaps/via/keymap.c

* Update keyboards/mechlovin/zed60/keymaps/via/keymap.c

* Update keyboards/mechlovin/zed60/keymaps/via/keymap.c

* Update keyboards/mechlovin/zed60/config.h

* Update keyboards/mechlovin/zed60/config.h

* Update keyboards/mechlovin/zed60/info.json

* Update keyboards/mechlovin/zed60/readme.md

* Update keyboards/mechlovin/zed60/info.json

* Update keyboards/mechlovin/zed60/zed60.h
2022-07-17 09:24:28 -07:00
QMK Bot
a1fb1405e4 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 12:03:31 +00:00
Joel Challis
37cd5ad810 Remove full bootmagic config (#17701) 2022-07-17 13:02:56 +01:00
QMK Bot
859c1a6fc9 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 07:18:04 +00:00
Jens-Petter Sandvik
4e5cc3c2ba Planck swap hand matrix for rev6, fixing issue #17388 (#17389)
* Add correct hand_swap_config matrix for planck_rev6 and planck_rev6_drop

* Make sure indentations are consistent

* Make the rev6 hand_swap_config matrix the default, also correct for ez.

* Move hand_swap_config matrix from planck.c to revision subdirectories
2022-07-17 00:17:22 -07:00
QMK Bot
54be228882 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 00:32:15 +00:00
Teimor Epstein
28f9def219 [Keymap] teimor keymap for Keychron Q1 (#16396)
* teimor keymap

* quickfix and cleanup

* update readme

* quickfix and cleanup before pr

* clang

* clean layout

* add reset

* pr fix

* fix pr

* Rename README.md to readme.md
2022-07-16 17:31:21 -07:00
QMK Bot
06e93a8f5c Merge remote-tracking branch 'origin/master' into develop 2022-07-16 19:48:33 +00:00
Brian
05f6838f37 [Keymap] Added Layout Keymaps for BriianPowell (#17310)
* Keymaps for Gentleman65 and Discipline

* Apply suggestions from code review

* Update keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c

* More custom configuration for Gentleman65

* Completed Gentleman65 Layout (for now)
2022-07-16 12:47:28 -07:00
QMK Bot
e50b1d33f3 Merge remote-tracking branch 'origin/master' into develop 2022-07-16 19:39:00 +00:00
HorrorTroll
92c3e6305b [Keyboard] Gopolar GG86 (#15425)
* Added keyboard GG86

* Rebased, resolved issue and updated code

* Delete 1000Hz on config

* Resolved fix

* Another resolved fix

* Last resolved fix

* Fixed LED position
2022-07-16 12:38:22 -07:00
QMK Bot
de545b8e21 Merge remote-tracking branch 'origin/master' into develop 2022-07-16 19:04:10 +00:00
ymlmkb
4d443d921b [Keyboard] KeebMonkey KBMG68 (#15909)
* added KeebMonkey KBMG68.

* Update keyboards/keebmonkey/kbmg68/config.h

* changes requested by fauxpark .

* Apply suggestions from code review

changes suggested by fauxpark

* Update readme.md

changes requested by fauxpark

* Apply suggestions from code review

changes requested by noroadsleft.

* Apply suggestions from code review per fauxpark
2022-07-16 12:03:39 -07:00
QMK Bot
9fa14655df Merge remote-tracking branch 'origin/master' into develop 2022-07-16 18:39:27 +00:00
bri
847cca541c Add .orig to .gitignore (#17626) 2022-07-17 04:38:56 +10:00
Stefan Kerkmann
580bcff4f6 Use correct angle tune range of +/-30 on PMW33XX (#17693)
Co-authored-by: Daniel Kao <daniel.m.kao@gmail.com>

Co-authored-by: Daniel Kao <daniel.m.kao@gmail.com>
2022-07-16 11:33:18 +02:00
QMK Bot
f5e16f94d5 Merge remote-tracking branch 'origin/master' into develop 2022-07-16 07:29:50 +00:00
Allen Choi
9cdccb12d1 [Keymap] Crkbd/thunderbird2086 (#16973)
* crkbd:thunderbird2086

* readme

* after code review

* coding format

* minor change

* changed file name

* correct image

* updated readme

* using query to get rgb status

* minor update
2022-07-16 00:29:09 -07:00
QMK Bot
c8ce87e044 Merge remote-tracking branch 'origin/master' into develop 2022-07-16 06:49:24 +00:00
James Young
66983f090c Suavity Ehan Refactor (#17694)
* info.json: apply friendly formatting, phase 1

* info.json: fix macro reference and layout

* info.json: apply friendly formatting, phase 2

Add key labels.

* refactor keymaps and layout macro

- apply four-space indent
- apply grid alignment to keycodes, matrix position identifiers, and matrix

* add LAYOUT_all

* ehan.h: add matrix diagram

* rename LAYOUT_ansi_default to LAYOUT_ansi_split_bs_rshift_lspace

* ehan.h: correct K3E position in LAYOUT_ansi_split_bs_rshift_lspace

Move location K3E to actually be on Column 14 (E); was previously on Column 13 (D) in source..

* add LAYOUT_iso_split_bs_rshift_lspace

Includes reference keymap.
2022-07-15 23:48:35 -07:00
QMK Bot
abdca8847d Merge remote-tracking branch 'origin/master' into develop 2022-07-16 05:21:50 +00:00
Wilfrid Li
1f93485aef feat(keebwerk): added VIA support keymap for keebwerk nano slider (#16761)
* feat(keebwerk): added VIA support keymap for keebwerk nano slider

Added VIA support for keebwerk nano slider, VIA json is keebwerk_nano_via.json
Fixed midi2vol keymap where comma symbol is missing from enum "custom_layers"

* feat(keebwerk): removed VIA json as requested

* Update keyboards/keebwerk/nano_slider/keymaps/via/keymap.c

* Update keyboards/keebwerk/nano_slider/keymaps/via/keymap.c

* Fix(PR): removed file as requested
2022-07-15 22:21:15 -07:00
QMK Bot
c84f68d4c8 Merge remote-tracking branch 'origin/master' into develop 2022-07-16 05:16:47 +00:00
James Young
303992da70 FJLabs Solanis Refactor (#17686)
* solanis.h: add matrix diagram

* refactor keymaps: apply grid alignment

* refactor LAYOUT_all macro

Moves the matrix position identifier for the right half of Split Backspace to the number row.
2022-07-15 22:16:14 -07:00
QMK Bot
82f806b1ab Merge remote-tracking branch 'origin/master' into develop 2022-07-16 01:02:25 +00:00
projectcain
f5333e9136 [Keyboard] add ProjectCain Relic (#15577)
* Adding relic keyboard

* Update keyboards/projectcain/relic/relic.c

* Update keyboards/projectcain/relic/relic.c

* Update keyboards/projectcain/relic/rules.mk

* Update keyboards/projectcain/relic/rules.mk

* Update keyboards/projectcain/relic/rules.mk

* Update config.h

* Update config.h

* Update keyboards/projectcain/relic/rules.mk

* Update keyboards/projectcain/relic/readme.md

* Update keyboards/projectcain/relic/info.json

* Update keyboards/projectcain/relic/config.h

* Update keyboards/projectcain/relic/config.h
2022-07-15 18:01:52 -07:00
QMK Bot
38cd3684e1 Merge remote-tracking branch 'origin/master' into develop 2022-07-15 21:07:17 +00:00
Henry Lum
ba4ba66b2f [Keyboard] eHan Keyboard (#15861)
* Compiled Suavity QMK Directory

* updated info.json's name from 'LAYOUT_default' to 'LAYOUT_default_split'

* updated rules.mk to reflect new layout name of each keymap

* Updated hanjie.h to reflect physical matrix of PCB

* switched info.json key matrix from split backspace to 2U backspace to better reflect electrical matrix

* updated keymap.c key matrix to reflect PCB electrical matrix

* updated keymap.c key matrix t oreflect PCB electrical matrix

* removed split left shift from physical matrix for default_split layout

* removed split left shift physical & electrical default_split layout

* removed split left shift from physical matrix for default_split layout

* removed split left shift from physical matrix for default_split layout

* updated qmk and via keymap.c and hanjie.h files to reflect pcb electrical matrix

* changed diode direction from row2col to col2row

* fixed false keycode triggers

* updated via keymaps

* added 's'

* added ehan branch for development

* updated readme.md

* updated ehan.h

* updated readme.md

* updated ehan.h layout

* added keymap.c and updated ehan.h

* progress

* compiled qmk

* updated matrix column and row pin out

* updated QMK default ansi keymap

* added VIA ansi_default keymaps

* corrected col 15's pin out to be pin B9, not C13

* Update keyboards/suavity/ehan/config.h

* Update keyboards/suavity/ehan/info.json

* Update keyboards/suavity/ehan/rules.mk

* Update keyboards/suavity/hanjie/rules.mk

* Update keyboards/suavity/hanjie/rules.mk

* Update keyboards/suavity/hanjie/keymaps/via/rules.mk

* Update keyboards/suavity/ehan/rules.mk

* changed readme.md's picturefrom html to markdown

* updated traces & diode placement

* Apply suggestions from code review

Remove trailing backslashes from keymaps (per fauxpark)

* Apply suggestions from code review

Remove `BOOTMAGIC_ENABLE = lite` from `keyboards/suavity/ehan/keymaps/via/rules.mk`

(per fauxpark)

* Apply suggestions from code review

Update formatting of `keyboards/suavity/ehan/rules.mk`

(per fauxpark)

* Update keyboards/suavity/ehan/readme.md

Fix image URL

* Update keyboards/suavity/ehan/config.h

Remove trailing comma in MATRIX_COL_PINS definition
2022-07-15 14:06:19 -07:00
QMK Bot
ce2dbe17b5 Merge remote-tracking branch 'origin/master' into develop 2022-07-15 08:57:19 +00:00
Evelien Dekkers
09b0d3e0ed Move ins, home and pgup keys to the left (#17690) 2022-07-15 09:56:06 +01:00
QMK Bot
c79818e703 Merge remote-tracking branch 'origin/master' into develop 2022-07-15 06:12:57 +00:00
Elliot Patros
0ececbcdb7 [Keymap] emp keymap for keebio/iris (#16858)
* added new layout for keebio/iris

* Update keyboards/keebio/iris/keymaps/emp/config.h

* Update keyboards/keebio/iris/keymaps/emp/keymap.c

Replace #defines with enum

* Update keyboards/keebio/iris/keymaps/emp/keymap.c

Made requested changes about formatting and the license.

* Update config.h

Cleaned up formatting

* Update keyboards/keebio/iris/keymaps/emp/keymap.c

Small changes to improve readability:
* changed whitespace in license
* added more whitespace around if/else blocks
* fixed bracket style in places
2022-07-14 23:11:44 -07:00
QMK Bot
64d2097a27 Merge remote-tracking branch 'origin/master' into develop 2022-07-15 02:58:03 +00:00
Joel Challis
3c6765b21c Ignore kbfirmware exports (#17687) 2022-07-15 03:57:34 +01:00
QMK Bot
f54a55dcfe Merge remote-tracking branch 'origin/master' into develop 2022-07-15 02:53:09 +00:00
Sam
16c91e0cf2 [Keyboard] Added TutelPad keyboard (#16975)
* TutelPad firmware v1.0

* Added VIA compatibility

* Update keyboards/0xcb/tutelpad/config.h

* Update keyboards/0xcb/tutelpad/keymaps/via/keymap.c

* Update keyboards/0xcb/tutelpad/keymaps/via/keymap.c

* Update keyboards/0xcb/tutelpad/keymaps/via/keymap.c

* Add new OLED image, implement suggested fixes

* Update keyboards/0xcb/tutelpad/rules.mk

* Update keyboards/0xcb/tutelpad/rules.mk
2022-07-14 19:52:39 -07:00
QMK Bot
15c09335e9 Merge remote-tracking branch 'origin/master' into develop 2022-07-15 02:45:47 +00:00
Will Winder
807620fa3c [Keyboard] Add Chocofly v1 (#17289)
* [Keyboard] Add Chocofly v1

* PR Feedback

* Small change to keymap.

* Replace KC__VOLUP and KC__VOLDOWN with single underscore version.

* Apply suggestions from code review

* Required for my PC

* Required for my PC
2022-07-14 19:45:08 -07:00
QMK Bot
7501523e1f Merge remote-tracking branch 'origin/master' into develop 2022-07-14 21:52:10 +00:00
James Young
be56817743 KB16-01: correct QMK Configurator key sequence (#17670) 2022-07-14 14:51:25 -07:00
QMK Bot
d547c0bea7 Merge remote-tracking branch 'origin/master' into develop 2022-07-14 21:32:20 +00:00
James Young
2d7de91888 Nayeon Community Layout support (#17665)
* Nayeon Community Layout support

- macro `LAYOUT_ansi` renamed to  `LAYOUT_tkl_f13_ansi_tsangan`
- macro `LAYOUT_iso` renamed to  `LAYOUT_tkl_f13_iso_tsangan`
- Community Layout support enabled in `rules.mk`

* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

* info.json: update maintainer field

Field is meant to reference the GitHub username of the maintainer.
2022-07-14 14:31:37 -07:00
QMK Bot
8ee42cd6c4 Merge remote-tracking branch 'origin/master' into develop 2022-07-14 13:09:37 +00:00
Drashna Jaelre
67f9777b8f [Keyboard] Fix Tractyl Manuform 4x6 json (#17681) 2022-07-14 06:08:54 -07:00
Albert Y
2f73e65837 Add LED limit call (#17679) 2022-07-14 12:37:47 +01:00
Albert Y
1862ac5454 Fix the use of LED limits (#17678) 2022-07-14 12:36:51 +01:00
QMK Bot
da4689d6b5 Merge remote-tracking branch 'origin/master' into develop 2022-07-14 11:23:09 +00:00
Albert Y
300dab7962 [Code] Add solid reactive gradient mode (#17228) 2022-07-14 12:22:53 +01:00
Albert Y
2efad277ee [Keyboard] Readme file correction (#17674) 2022-07-14 12:22:31 +01:00
Stefan Kerkmann
3c58f98929 [Core] PMW33XX drivers overhaul (#17613)
* PMW33XX drivers overhaul

This combines the PMW3389 and PM3360 drivers as they only differ in the
firmware blobs and CPI get and set functions. The following changes have
been made:

* PMW3389 now gets the same multi-sensor feature that is already available on the
  PMW3360.

* Introduced a shared pmw33xx_report_t struct is now directly readable via SPI
  transactions instead of individual byte-sized reads, saving multiple
  copies and bitshift operations.

* pmw33(89/60)_get_report functions had unreachable branches in their motion
  detection logic these have been simplied as much as possible.

* The fast firmware upload option has been removed as this becomes obsolete by
  the newly introduced polled waiting functions for ChibiOS polled waiting

* PMW33(60/89)_SPI_LSBFIRST and PMW33(60/89)_SPI_MODE config options
  have been removed as they don't need to be configurable.

* All PMW3389 and PMW3360 defines have been unified to a PMW33XX prefix
  to reduce code duplication and make the defines interchangeable

* Adjust keyboards to PMW33XX naming scheme
2022-07-14 11:50:00 +02:00
QMK Bot
82685fc2ac Merge remote-tracking branch 'origin/master' into develop 2022-07-14 06:35:34 +00:00
James Young
928be32c83 KPrepublic BM80v2 ISO Refactor (#17660)
* bm80v2_iso.h: convert tabs to spaces

* bm80v2_iso.h: use ___ for KC_NO

* bm80v2_iso.h: use QMK 3-character notation

* refactor macro for tkl_iso Community Layout compatibility

- move the matrix position identifier for Enter to the home row

* info.json: correct layout data

* rules.mk: tidy-up formatting

* readme.md: tidy-up formatting

* update maintainer; re-assign copyright

* assign ISO-appropriate keycodes in keymaps
2022-07-13 23:34:51 -07:00
QMK Bot
9b04e9be04 Merge remote-tracking branch 'origin/master' into develop 2022-07-14 06:27:11 +00:00
Kyle McCreery
acc11f4941 [Keyboard] MechWild BB Steno (#17163)
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream

* Initial commit

* testing modes

* working on puckbuddy firmware. This is all working for now but need to clean it up and personalize it.

* needs to be updated from vial build

* prepping for PR

* added rgb mode cycling to fn1 since it isn't on the encoder for these maps

* shipping firmware built. Need to clean up readme and info.json layout

* removing puckbuddy files from this branch

* readme done, prepping for PR

* info.json updated prepping for PR

* Restore cirque driver that was modified from puckbuddy testing on this branch

* applying changes from review

* Update keyboards/mechwild/bbs/bbs.c

* Fixed info.json

* Apply suggestions from code review
2022-07-13 23:26:13 -07:00
QMK Bot
633df1f365 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 22:25:18 +00:00
wangfuco
99e9e1b8e7 [Keyboard] Modelm101 teensy2 (#16805)
* Add modelm101_teensy2 files from modelm101

* Change info.json

* Update README.md

* Update pin def

* Fix file name

* Update readme.md

* Delete config.h

* Apply suggestions from code review

* Update keyboards/converter/modelm101_teensy2/config.h

* Delete keyboards/converter/modelm101_teensy2/keymaps/iw0rm3r directory

* Delete .noci
2022-07-13 15:24:42 -07:00
QMK Bot
ce2ac433d9 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 20:58:40 +00:00
James Young
4ef0c8230c Ducky One 2 SF touch-up (#17672)
* info.json: correct JSON syntax error

* info.json: correct key sizes

* update readme files

Moves nearly all of the information about this keyboard to the 1967st version's readme, because this readme is exposed in QMK Configurator.

Also updates the readme to align more closely with QMK's keyboard readme template.

* info.json: update metadata

Updates the keyboard name and maintainer fields.
2022-07-13 21:57:55 +01:00
QMK Bot
2cdaa639ee Merge remote-tracking branch 'origin/master' into develop 2022-07-13 19:40:36 +00:00
James Young
f7510ca202 Gentoo & Gentoo Hotswap: correct Configurator key sequence errors (#17668)
* Gentoo info.json: apply friendly formatting

* Gentoo info.json: correct key sequence error

* Gentoo Hotswap info.json: apply friendly formatting

* Gentoo Hotswap info.json: correct key sequence error
2022-07-13 12:40:03 -07:00
James Young
6eac98286a Swift65 Hotswap: correct key sizes (#17666)
Corrects the key sizes on the bottom row (1.5-1-1.5-7 instead of 1.25-1.25-1.25-7.25).
2022-07-13 12:39:39 -07:00
Nick Brassel
dc70ba612a Post-bootloader EFL/SPI fixes. (#17661)
* Fixup read address for EFL driver.

* Fixup sequencing of SPI.

* Lock during init of EFL backing store.
2022-07-14 00:41:08 +10:00
QMK Bot
2a0d490eb3 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 08:12:12 +00:00
Drashna Jaelre
d98f309429 [Keyboard] Fix compilation issue for runes/skoldjr (#17659) 2022-07-13 01:11:24 -07:00
Drashna Jaelre
09e4001bba [Bug] Fix compile issue with LED Matrix (#17658) 2022-07-13 01:10:51 -07:00
QMK Bot
4b108f7689 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 08:05:22 +00:00
Yizhen Liu
acf114315e [Keyboard] Kprepublic bm80v2 iso issue resolved (#17657)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-13 01:04:42 -07:00
Drashna Jaelre
b21a52c824 Fix compilation issue with Cirque Guestures file (#17656) 2022-07-13 09:01:30 +02:00
QMK Bot
2468be889b Merge remote-tracking branch 'origin/master' into develop 2022-07-13 05:35:44 +00:00
jack
2a3cd98fc6 boardsource/technik_o data driven (#17635) 2022-07-13 06:35:06 +01:00
QMK Bot
bc385435a7 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 05:33:00 +00:00
jack
320219d5d8 boardsource/5x12 data driven (#17630) 2022-07-13 06:32:22 +01:00
QMK Bot
38c8fc9baf Merge remote-tracking branch 'origin/master' into develop 2022-07-13 05:32:19 +00:00
jack
63154631ab boardsource/4x12 data driven (#17629) 2022-07-13 06:31:43 +01:00
QMK Bot
0052b03ee0 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 05:25:36 +00:00
James Young
4f4e72e44c ID75 v2: update info.json (#17653) 2022-07-12 22:25:04 -07:00
jack
98312417b5 [Keyboard] boardsource/lulu data driven (#17638) 2022-07-12 22:20:38 -07:00
QMK Bot
068d5688d8 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 05:19:48 +00:00
jack
2271b28386 [Keyboard] boardsource/the_mark data driven (#17637) 2022-07-12 22:19:36 -07:00
QMK Bot
590c2342fc Merge remote-tracking branch 'origin/master' into develop 2022-07-13 05:19:25 +00:00
jack
f80bb4a517 [Keyboard] boardsource/technik_s data driven (#17636) 2022-07-12 22:19:17 -07:00
jack
b99ccd4f06 [Keyboard] boardsource/beiwagon data driven (#17631) 2022-07-12 22:18:53 -07:00
Drashna Jaelre
1dfe2bb49a Update LED/RGB Matrix flag function behavior (#17651) 2022-07-12 22:18:02 -07:00
QMK Bot
34fec2c07d Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:58:34 +00:00
Vicktor Hutama
5a126e1a74 [Keyboard] Add Runes Skjoldr (#17305)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-12 21:58:31 -07:00
jack
a991d65e87 [Keyboard] boardsource/3x4 data driven (#17628)
* initial

* change to development board

* replaced KC_TRNS & use rules.mk template
2022-07-12 21:58:04 -07:00
QMK Bot
018fad6b95 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:53:38 +00:00
Zach Rice
019bfc4159 [Keymap] Add RAOEUS keymap for the XD75 (#17456)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-12 21:52:52 -07:00
jack
8a1ca7f6b8 [Keyboard] boardsource/holiday/spooky data driven (#17632) 2022-07-12 21:47:32 -07:00
Nick Brassel
dfff040433 Allow MCU-specific overrides for SPI flags. (#17650) 2022-07-13 14:42:24 +10:00
QMK Bot
f9724dfa67 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:37:54 +00:00
James Young
e68de95214 KBDfans KBD67 rev2 Layout Patch (#17649) 2022-07-12 21:37:23 -07:00
QMK Bot
27dd4dc91e Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:31:57 +00:00
Cipulot
5bc81d3a63 [Keyboard] Add Kallos keyboard (#17461)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-12 21:31:17 -07:00
Daniel Kao
5db705d054 Cirque trackpad features: circular scroll, inertial cursor (#17482) 2022-07-12 21:17:40 -07:00
QMK Bot
904ec0ce78 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:11:08 +00:00
Yizhen Liu
7a090bb3df [Keyboard] Kprepublic bm80v2 iso revised (#17571)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-12 21:10:31 -07:00
QMK Bot
9d6a94cfb5 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:10:07 +00:00
AnthonyNguyen168
257fc042df [Keyboard] Update layout for MechBrewery series (#17570) 2022-07-12 21:09:37 -07:00
James Young
36c2575658 Grammar fixes for docs/feature_converters.md (#17652) 2022-07-13 04:58:16 +01:00
QMK Bot
6bb2ed68a8 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 03:51:07 +00:00
Drashna Jaelre
26954bbc28 [Docs] Add Encoder requirements to PR Checklist doc (#17634)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-12 20:50:26 -07:00
zvecr
82f0263e41 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 01:19:58 +01:00
Joel Challis
2a3dd95229 Add basic secure docs (#17577) 2022-07-13 00:06:19 +01:00
jack
ffb34fc082 Include stdint.h in avr/i2c_master.h (#17639) 2022-07-12 21:55:19 +02:00
Stefan Kerkmann
45ffe42f1a [Fix] Make ChibiOS _wait.h independent of quantum.h (#17645) 2022-07-12 21:54:33 +02:00
GloriousThrall
bbd6ea977c GMMK 2 WBG7 MCU compatibility (#16436)
* GMMK V2 QMK Compatibility

* fix problems

* Update keyboards/gmmk/gmmk2/config.h

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

* Update keyboards/gmmk/gmmk2/config.h

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

* Fix a minor problem

* Optimize the code

* Update config.h

* Update

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h

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

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h

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

* Update config.h

* Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk

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

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c

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

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c

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

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

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

* Update keyboards/gmmk/gmmk2/p96/iso/rules.mk

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

* Update keyboards/gmmk/gmmk2/p65/iso/rules.mk

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

* Update config.h

* Update config.h

* Update config.h

* Modify device pid

* Add gmmk2_p96 keyboard.

* Add gmmk2_p96 keyboard.

* Update led matrix.

* Update led matrix.

* Delete eeprom_flash.c

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update from qmk develop branch

* Increased compatibility with wear_leveling.

* Update config.h

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-12 17:30:54 +10:00
QMK Bot
a768ec265d Merge remote-tracking branch 'origin/master' into develop 2022-07-11 21:46:29 +00:00
Joel Challis
2714c70bd7 Fix layout macro for nightly_boards/paraluman (#17633) 2022-07-11 22:45:56 +01:00
QMK Bot
b78a7e42b1 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 21:15:45 +00:00
Danny
9a41a303cc [Keyboard] Add Quefrency Rev. 5 (#17503) 2022-07-11 14:14:55 -07:00
QMK Bot
85cdde1541 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 20:59:02 +00:00
Felix Jen
7c3b6c4bc4 [Keyboard] Add Swordfish keyboard (#17567) 2022-07-11 13:57:20 -07:00
FREEWING.JP
61df87ae2c Added Delay time dynamic keymap's macro feature (#16810)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-11 12:59:16 -07:00
QMK Bot
52e9ed75e8 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 19:47:42 +00:00
Alex Băluț
2bb0550707 [Keyboard] add kinesis/kintlc (#17301) 2022-07-11 12:46:51 -07:00
QMK Bot
51b7828540 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 18:54:26 +00:00
balloondogcaps
61a5059fc5 [Keyboard] TR90PM (#17060)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-11 11:53:51 -07:00
balloondogcaps
6663dd7288 [Keyboard] Add TR90 (#16838)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-11 11:53:25 -07:00
Stefan Kerkmann
3f5dc47296 [Core] Use polled waiting on ChibiOS platforms that support it (#17607)
* Use polled waiting on platforms that support it

Due to context switching overhead waiting a very short amount of time on
a sleeping thread is often not accurate and in fact not usable for timing
critical usage i.e. in a driver. Thus we use polled waiting for ranges
in the us range on platforms that support it instead. The fallback is
the thread sleeping mechanism.

This includes:

* ARM platforms with CYCCNT register (ARMv7, ARMv8) this is
  incremented at CPU clock frequency
* GD32VF103 RISC-V port with CSR_MCYCLE register this is incremented at
  CPU clock frequency
* RP2040 ARMv6 port which uses the integrated timer peripheral which is
  incremented with a fixed 1MHz frequency

* Use wait_us() instead of chSysPolledDelayX

...as it is powered by busy waiting now.

* Add chibios waiting methods test bench
2022-07-11 15:17:05 +02:00
QMK Bot
57021d6358 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 12:58:12 +00:00
Evelien Dekkers
61ce15f202 [Keyboard] Fin pad (#17523)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-11 05:57:39 -07:00
QMK Bot
5925ea3478 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 12:55:42 +00:00
Naphtaline
c8f969a3ce [Keyboard] kbdfans kbd67 rev 2 : add new LAYOUT_65_iso_split_bs (#16922)
* [Layout/Keymap] kbdfans kbd67 rev2 : add new LAYOUT_65_iso_split_bs and naphaline keymap as a working example

* Update keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/keymap.c

I do trust the reviewer, here goes the change :)

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

* Remove QMK custom keycodes 1/2

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Remove QMK custom keycodes 2/2

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-11 05:55:01 -07:00
QMK Bot
5e750cf039 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 12:52:03 +00:00
James Young
2dab029bcf Peej Rosaline Refactor (#17564) 2022-07-11 05:51:29 -07:00
Aidan Smith
7a73f9a6b3 [Keyboard] Add Fine!40 PCB Support (#17426)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-11 05:10:47 -07:00
QMK Bot
5e347f42a6 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 11:31:19 +00:00
Joel Challis
5389f088b1 splitkb/kyria - Resolve CONVERT_TO_PROTON_C warnings (#17617) 2022-07-11 04:30:45 -07:00
QMK Bot
2e567150ea Merge remote-tracking branch 'origin/master' into develop 2022-07-11 11:23:48 +00:00
GG
16b837b35b [Keyboard] Add Promise87 (#17525) 2022-07-11 04:23:13 -07:00
Stefan Kerkmann
0348071810 Stabilize Half-duplex PIO split comms (#17612) 2022-07-11 04:05:04 -07:00
Joel Challis
35d78aa8a4 More DD encoder fixes (#17615) 2022-07-11 10:51:39 +01:00
QMK Bot
0bee7cbebe Merge remote-tracking branch 'origin/master' into develop 2022-07-10 22:45:26 +00:00
Joel Challis
a5eeee4ded Fix infinite recursion in checkerboards/quark_plus (#17616) 2022-07-10 23:44:56 +01:00
QMK Bot
a15e44cfb3 Merge remote-tracking branch 'origin/master' into develop 2022-07-09 17:27:37 +00:00
Joel Challis
2106acc24a merge/um80 - Fix WPM issues in configurator builds (#17608) 2022-07-09 18:26:48 +01:00
QMK Bot
39e1e27ea9 Merge remote-tracking branch 'origin/master' into develop 2022-07-09 12:33:33 +00:00
Nick Brassel
561c5e1d7a Add line to multibuild output log showing the actual build target. (#17606) 2022-07-09 22:32:43 +10:00
jpe230
13b2b93fb0 Add Adafruit Macropad (#17512) 2022-07-08 23:33:03 +01:00
QMK Bot
30f2556ae9 Merge remote-tracking branch 'origin/master' into develop 2022-07-08 21:50:28 +00:00
Dasky
06310e81e9 Allow only col or row pins for *_right extraction. (#17590) 2022-07-08 22:49:55 +01:00
Joel Challis
345e19f691 Add converter docs (#17593) 2022-07-08 22:49:16 +01:00
Joel Challis
81d317aa87 Fix rgbkb/sol/rev2 build issues (#17601) 2022-07-08 22:48:48 +01:00
QMK Bot
b0c3d61c17 Merge remote-tracking branch 'origin/master' into develop 2022-07-07 12:43:20 +00:00
Bartosz Nowak
e724801d33 [Keyboard] Clean up dactyl manuform unused files (#15890) 2022-07-07 05:42:28 -07:00
Stefan Kerkmann
643f6367a1 [Fix] Patches after printf library update (#17584)
* Add missing '(' to print_bin_reverse32 declaration
* Fix insufficient character buffers on satisfaction75
* Remove \0 character in format string and use corrected offset math
  instead on rocketboard 16
* Replace snprintf_ with snprintf for djinn
* Explicitly ignore format checks for tracktyl manuform that uses %b
  specifier
* Print properly escaped version string in command.c, as PRODUCT or
  other defines can contain constructs like 'Vendor keyboard 66%' which
  will be interpreted as a format specifier
2022-07-07 14:14:09 +02:00
Stefan Kerkmann
8224f62806 Make debounce() signal changes in the cooked matrix as return value (#17554) 2022-07-07 10:00:40 +02:00
Albert Y
cca5d35321 Update PM2040 I2C pins (#17578) 2022-07-07 09:33:11 +02:00
Stefan Kerkmann
d9bb189e25 [Core] Update mpaland/printf to eyalroz/printf fork (#16163)
mpaland printf implementation was abandoned in ~2019 and the fork by
eyalroz is now regarded to be the goto replacement of it. So this commit
incoporates the changes needed to use this fork in QMK.

Note that pointer ptrdiff_t is always supported since commit
51c90f93a97fdaef895783ecbe24569be0db7cb8
2022-07-07 09:27:50 +02:00
QMK Bot
8f086faf8a Merge remote-tracking branch 'origin/master' into develop 2022-07-07 05:44:58 +00:00
Zykrah
0d30565bb7 Fix/waka60 audio (#17561) 2022-07-06 22:44:21 -07:00
Joel Challis
744af003be Add kb2040 and sparkfun rp2040 converters (#17514) 2022-07-06 19:27:15 +01:00
Nick Brassel
29a2bac469 Fixup SPI. (#17534) 2022-07-05 22:41:35 +02:00
Nick Brassel
0e5d67145a Allow for keymaps array to be implemented in a file other than $(KEYMAP_C) (#17559) 2022-07-05 08:58:35 +10:00
QMK Bot
5cad58dfa9 Merge remote-tracking branch 'origin/master' into develop 2022-07-04 20:49:23 +00:00
James Young
75bc9e6496 TKL Community Layout Additions (#17563) 2022-07-04 13:48:44 -07:00
QMK Bot
d37db0c50c Merge remote-tracking branch 'origin/master' into develop 2022-07-03 23:41:36 +00:00
Joel Challis
8fa7b62011 Attempt to discourage manual MSYS install for new users (#17556) 2022-07-04 00:41:00 +01:00
QMK Bot
e68205db1b Merge remote-tracking branch 'origin/master' into develop 2022-07-03 21:25:42 +00:00
James Young
9a157a3a99 KP Republic BM60HSRGB_EC QMK Configurator and readme touch-up (#17541) 2022-07-03 14:25:29 -07:00
stanrc85
b7fee11e34 [Userspace] Add support for additional Mechlovin Adelais PCB version to my userspace (#17547) 2022-07-03 14:25:09 -07:00
QMK Bot
63474e2c17 Merge remote-tracking branch 'origin/master' into develop 2022-07-03 18:08:32 +00:00
李董睿煊
168a631720 Add support for MacroCat Keyboard (#17480) 2022-07-03 19:07:31 +01:00
QMK Bot
7d89dfe2dc Merge remote-tracking branch 'origin/master' into develop 2022-07-03 04:12:32 +00:00
James Young
d87d537b50 Remove dead space from Pierce QMK Configurator layout data (#17551) 2022-07-03 14:12:01 +10:00
QMK Bot
6154c184a8 Merge remote-tracking branch 'origin/master' into develop 2022-07-03 04:11:21 +00:00
jack
665feccca1 Fixup bounce/75 (#17548) 2022-07-03 14:10:51 +10:00
QMK Bot
e8c46fab96 Merge remote-tracking branch 'origin/master' into develop 2022-07-03 02:56:16 +00:00
Drashna Jaelre
1c43410e26 [Keymap] Updates to drashna Keymaps and Userspace (#17543) 2022-07-02 19:55:46 -07:00
QMK Bot
03909b8a3f Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:54:45 +00:00
duoshock
a3119385a4 Add keyboard 'UM-80' (#17035) 2022-07-03 00:54:15 +01:00
QMK Bot
2d5047a79c Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:43:38 +00:00
jack
c5215d4a06 initial (#17545) 2022-07-03 00:43:29 +01:00
moyi4681
4ba5102a50 add bounce keyboard (#17030) 2022-07-03 00:43:07 +01:00
QMK Bot
c8a78b1f04 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:38:39 +00:00
TW59420
f2d4424bb7 Add alicekk support (#17027) 2022-07-03 00:38:02 +01:00
nirim000
fb40abe2f2 Pca9505/6 driver (#17333) 2022-07-03 00:37:02 +01:00
QMK Bot
ce29cb0f10 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:15:32 +00:00
br
fbf3cbcd5c Added PLOOPY_DRAGSCROLL_H_INVERT (#17453) 2022-07-03 00:13:45 +01:00
QMK Bot
4d243e94fa Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:12:20 +00:00
James Young
71f9a07b0f 65% Community Layout Updates (#17476)
* update 65_ansi community layout keymap

- add license header
- add function layer

* update 65_ansi_blocker community layout keymap

- add license header
- add function layer

* update 65_ansi_blocker_split_bs community layout keymap

- add license header
- add function layer

* update 65_ansi_blocker_tsangan community layout keymap

- add license header
- add function layer
- remove trailing spaces in keymap readme

* add 65_ansi_blocker_tsangan_split_bs community layout keymap

* update 65_ansi_split_bs community layout keymap

- add license header
- add function layer

* update 65_iso community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme

* update 65_iso_blocker community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme

* update 65_iso_blocker_split_bs community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme

* add 65_iso_blocker_tsangan community layout keymap

* add 65_iso_blocker_tsangan_split_bs community layout keymap

* update 65_iso_split_bs community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme
2022-07-03 00:12:02 +01:00
yiancar
6a0814bb04 Update NK1 RGB animation defines (#17486) 2022-07-03 00:11:48 +01:00
QMK Bot
4b7c01c84b Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:11:36 +00:00
Ralph Bacolod
3ed4a7086e Update readme.md (#17489)
Fixed link to http://mkweb.bcgsc.ca/carpalx/?popular_alternatives
2022-07-03 00:10:30 +01:00
QMK Bot
8744d57578 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 22:19:13 +00:00
Andrew Kannan
43e33ba232 Add Gentoo Hotswap PCB to QMK (#17528) 2022-07-02 23:18:43 +01:00
QMK Bot
5f11d7b554 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 22:18:33 +00:00
Andrew Kannan
2011aec06f Add Gentoo Solderable PCB to QMK (#17527) 2022-07-02 23:17:53 +01:00
QMK Bot
ba1f184267 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 19:10:40 +00:00
stanrc85
bb1edf6676 [Userspace] Add Nasu to userspace code (#17524)
* Define Nasu indicator pins in userspace

* Add userspace indicator code to Nasu
2022-07-02 20:10:07 +01:00
QMK Bot
a41c5d8023 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 19:09:55 +00:00
Ciutadellla
4804b73540 Update info.json (#17530)
Change to correct keyboard name from reviung31 to reviung41
2022-07-02 20:09:21 +01:00
QMK Bot
6c7d549e31 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 18:10:05 +00:00
Evelien Dekkers
40d295abf6 [Keyboard] Add nt-650 (#17471)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-02 11:09:26 -07:00
QMK Bot
efd41fe9df Merge remote-tracking branch 'origin/master' into develop 2022-07-02 17:51:26 +00:00
James Young
18a1cbce75 Mikeneko 65 QMK Configurator touch-up and Community Layout Support (#17542)
* info.json: apply friendly formatting

* info.json: remove dead space from Configurator rendering

* rename LAYOUT_all to LAYOUT_65_ansi_blocker

* rules.mk: enable Community Layout support
2022-07-02 18:50:54 +01:00
Nick Brassel
f346c8400c Update ChibiOS-Contrib (#17540) 2022-07-03 00:47:28 +10:00
QMK Bot
36de989e6f Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:32:39 +00:00
James Young
9b8ae05796 Correct QMK Configurator layout data for Kin80 (#17526) 2022-07-03 00:32:09 +10:00
QMK Bot
b56edb5f11 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:23:42 +00:00
Nick Brassel
b9a6126518 Revert "[Keyboard]KPrepublic bm80v2 Keyboard ISO support " (#17537) 2022-07-03 00:23:21 +10:00
Nick Brassel
1b9491f8f3 Fixup builds for TzCI (#17538) 2022-07-03 00:23:08 +10:00
Nick Brassel
ea14a93718 Merge remote-tracking branch 'upstream/master' into develop 2022-07-03 00:16:33 +10:00
Ryan
ac5e6b6a3b Tentative Teensy 3.5 support (#14420)
* Tentative Teensy 3.5 support

* Set firmware format to .hex for ARM Teensys

* Got to "device descriptor failed" by comparing with Teensy 3.6 code

* Drop down to 96MHz...

* Bump back up to 120MHz
2022-07-03 00:12:45 +10:00
bruun-baer
5108d53169 Add a workman-miryoku hybrid keymap for the ferris sweep keyboard (#17511) 2022-07-03 00:11:53 +10:00
gourdo1
97dfdcb2bd [keymap] Update gourdo1 keymap for Q2 changes (#17398) 2022-07-03 00:11:26 +10:00
QMK Bot
11299b337b Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:10:26 +00:00
HorrorTroll
d694488e2e Added new keyboard KB16-01 (#17418) 2022-07-03 00:08:38 +10:00
Ryan
25033d5d9e MSYS2 install: use MinGW python-qmk package (#17302)
* MSYS2 install: use MinGW python-qmk package

* Add missing flashers

* Note VC Redist for manual install

* VC Redist no longer needed
2022-07-02 15:08:05 +01:00
QMK Bot
f083eb1a37 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:07:53 +00:00
IFo Hancroft
1cffe5b6ce My ErgoDox Keymap (finally perfected, I think) (#17208)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-03 00:06:23 +10:00
QMK Bot
61eca0c972 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:06:19 +00:00
TJ
7c64a2bcaa Add BigBoy macro pad (#16962)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-03 00:05:44 +10:00
QMK Bot
7de801ed9a Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:05:18 +00:00
Khairullah
81b7d6f67f [Keyboard] Add Support to Ducky One2 SF (#17260) 2022-07-03 00:04:46 +10:00
QMK Bot
3871c717da Merge remote-tracking branch 'origin/master' into develop 2022-07-02 14:01:44 +00:00
npspears
60ab61386e add rotary encoder support for Quark^2 (#17470) 2022-07-03 00:01:08 +10:00
Drashna Jaelre
0c74892e90 [Keyboard] Update Charybdis code for Extended Mouse reports (#17435) 2022-07-02 23:58:40 +10:00
QMK Bot
326d3ffad8 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 13:14:58 +00:00
Yizhen Liu
5ac71ef27a [Keyboard]KPrepublic bm80v2 Keyboard ANSI support (#17192)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 23:14:27 +10:00
QMK Bot
1bf67b808d Merge remote-tracking branch 'origin/master' into develop 2022-07-02 13:13:58 +00:00
Guilherme Bermêo
2aa4f7cf61 add crkbd/keymaps/bermeo (#17320)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 23:13:28 +10:00
QMK Bot
d9e311ad30 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 13:09:54 +00:00
zv0n
783d1cd458 [keyboard] annepro2 Add support for sticky keys (#17359) 2022-07-02 23:09:21 +10:00
QMK Bot
c1d9f9911c Merge remote-tracking branch 'origin/master' into develop 2022-07-02 13:08:54 +00:00
Nick Brassel
7e926f5c93 Cleanup post-#17314. (#17536) 2022-07-02 23:08:39 +10:00
Vega Deftwing
e25879e836 [keymap] Add tiny text, full width characters to Ergodone->Vega (#17427) 2022-07-02 23:08:18 +10:00
QMK Bot
414a387f22 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:53:52 +00:00
DeskDaily
d66b5db1d6 Added 3 new keyboards (#17314)
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-07-02 22:53:01 +10:00
QMK Bot
84d9996b6d Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:51:09 +00:00
Radliński Ignacy
5a727dbc6d feat(keymap): add keebio/iris/rev6/radlinskii keymap (#17216)
Co-authored-by: ignacy-radlinski <ignacy.radlinski@schibsted.com>
2022-07-02 22:50:31 +10:00
QMK Bot
a6faf3bc9e Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:49:52 +00:00
CoffeeIsLife
0365f640af Allow for RGB actions to take place on Keydown instead of Keyup (#16886)
* Allow for switch on keydown

* add docs
2022-07-02 22:49:49 +10:00
QMK Bot
fcc14b8838 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:49:19 +00:00
ripdog
4e35697e1a Add note about qmk doctor in newbs_flashing.md (#15688)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:48:44 +10:00
Vino Rodrigues
ec6875af56 [Keyboard] New IDOBAO ID63 (a.k.a. Denwir D60) (#17144)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:46:42 +10:00
QMK Bot
bf44fc81bd Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:44:27 +00:00
InonL
feea704da7 Added VIA support for Drop CTRL (#17336)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:42:45 +10:00
QMK Bot
5f16a4ec62 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:42:41 +00:00
Murali S
0c84dd6bdc Add keymaps for muralis and kuru (#17337)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sree Vidya Sobha Dharmarajan <ssd@Srees-MacBook-Pro.local>
2022-07-02 22:42:13 +10:00
QMK Bot
fd883890af Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:41:39 +00:00
spooknik
3059d7883c Swift65 Hotswap Support (#16987)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Steven Phillips <steven.phillips.17@me.com>
2022-07-02 22:41:32 +10:00
QMK Bot
90ad47b1f2 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:41:05 +00:00
jpe230
07f6fba6de Add Jpe230 Preonic Keymap (#17331) 2022-07-02 22:40:24 +10:00
Minke Zhang
4a3e0ef9ab Add personal YMDK Split64 keymap (#16980)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:39:31 +10:00
QMK Bot
f996a4c5b7 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:38:02 +00:00
Jairo Ramírez Ávila
56ecc86482 Added oriaj3 keymap with Matrix RGB support for Kimiko keyboard. (#17103)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:37:29 +10:00
QMK Bot
6285a1c0d3 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:37:05 +00:00
Wolf Van Herreweghe
627f9321a8 Add base Ryujin firmware (#17187)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
2022-07-02 22:36:32 +10:00
Vino Rodrigues
882eadd94d [Keyboard] IDOBAO ID67 code touch-ups and include factory keymap (#17231) 2022-07-02 22:35:37 +10:00
Vino Rodrigues
7a5f76d40a [Keyboard] IDOBAO ID87v2 code rewrite and include factory keymap (#17232) 2022-07-02 22:32:32 +10:00
Vino Rodrigues
4aca94d247 [Keyboard] IDOBAO ID80v3 code rewrite and include factory keymap (#17234) 2022-07-02 22:31:38 +10:00
QMK Bot
7a8a4b1938 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:21:26 +00:00
Nick Brassel
3b14383f48 Fix line endings. 2022-07-02 22:20:30 +10:00
-k
5699763d4c Update massdrop/alt:charlesrocket (#17297)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:19:35 +10:00
QMK Bot
5c5610074a Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:19:26 +00:00
jels
ac333016eb Add ATmega32u2 Support to HHKB (#17298) 2022-07-02 22:18:56 +10:00
QMK Bot
fa0aea2a5a Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:18:55 +00:00
David Kristoffersen
a80943579c [Keymap] Add prog_qgmlwb keymap (#16890) 2022-07-02 22:18:21 +10:00
QMK Bot
65832c0fc3 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:17:12 +00:00
Jean Bernard
ef633cf461 Added MS Sculpt ISO-layout conversion with STM32F401 (#17049) 2022-07-02 22:16:38 +10:00
Marek Wyborski
b8e8a20ca6 Improve ENCODER_DEFAULT_POS to recognize lost ticks (#16932) 2022-07-02 22:12:41 +10:00
Ryan
3ecb0a80af Feature-ify Send String (#17275) 2022-07-02 22:10:08 +10:00
QMK Bot
7e41eb0277 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:09:58 +00:00
Osamu Aoki
871eeae4ea PoC: Swap Escape and Caps (#16336) 2022-07-02 22:08:48 +10:00
foureight84
9c2505676c foureight84 keymap for sofle (#17246)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:08:13 +10:00
QMK Bot
c7d8adfeaa Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:08:11 +00:00
Will Winder
f03aec28fb [Keyboard] Add Avalanche v4 (#17288)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:07:35 +10:00
QMK Bot
5d711c89c3 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:07:22 +00:00
Yizhen Liu
c3ef70b9a6 [Keyboard]KPrepublic bm80v2 Keyboard ISO support (#17193)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 22:06:38 +10:00
QMK Bot
ca0a9d243c Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:03:45 +00:00
torkel104
8b78fac451 Fix keys being discarded after using the leader key (#17287) 2022-07-02 22:03:40 +10:00
Aidan Gauland
8c4a5f9ba2 Add lkbm keymap (#17218) 2022-07-02 22:03:11 +10:00
QMK Bot
08721b4125 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:00:37 +00:00
jack
ee26d3e77f Add Zsh note for tab complete (#17226) 2022-07-02 21:59:59 +10:00
QMK Bot
5d1bc92c64 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:58:55 +00:00
PixelSpaceStudio
a80461e264 Add pixelspace user space and capsule65i keyboard (#17235) 2022-07-02 21:58:00 +10:00
Jouke Witteveen
0112938140 Expose the time of the last change to the LED state (#17222) 2022-07-02 21:57:05 +10:00
mmccoyd
2af2c5e109 [Keyboard] Move/Rename to Hillside48, simplify default keymap (#17210)
Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
2022-07-02 21:56:23 +10:00
QMK Bot
a7179b188d Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:55:42 +00:00
Watson
48721b20fc Updated revisions and added a keyboard (#16731)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: WestM <93159069+WestMProducts@users.noreply.github.com>
2022-07-02 21:55:10 +10:00
Joel Challis
59e28b8958 Add cli command to import keyboard|keymap|kbfirmware (#16668) 2022-07-02 21:50:09 +10:00
FREEWING.JP
9dc7b9d40c Added Wait time to sending each Keys for Dynamic Macros function (#16800)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-02 21:48:26 +10:00
QMK Bot
0856b36139 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:47:16 +00:00
anubhav dhiman
c725f6f768 Add new keyboard AT3 (#17431)
Co-authored-by: zvecr <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-02 21:46:29 +10:00
QMK Bot
c679decb2b Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:45:40 +00:00
spx01
2f11509465 spx01 keymap for the kbd67mkiirgb (#17012) 2022-07-02 21:44:58 +10:00
QMK Bot
6b21f8369e Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:44:07 +00:00
Nick Krichevsky
69f0fc5868 Add workaround to allow Sesame to work without atomic interactions (#17034) 2022-07-02 21:43:36 +10:00
QMK Bot
6f1eca9c7b Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:43:17 +00:00
Xelus22
f8a56cd638 [Keyboard] RS108 Addition (#16989) 2022-07-02 21:42:48 +10:00
QMK Bot
05074cbdf0 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:27:40 +00:00
Josh Hinnebusch
096db8c8ca Add LED backlight/indicator info to reference_info_json.md (#17010)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-02 21:27:34 +10:00
Gardego5
6fce400ef5 Ut47.2 gardego5 layout (#16955) 2022-07-02 21:27:08 +10:00
QMK Bot
a949d32072 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:26:57 +00:00
Manna Harbour
3842b15cf1 [Keymap] Update Miryoku (#16482) 2022-07-02 21:26:23 +10:00
QMK Bot
5d8b6847c7 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:23:33 +00:00
Daniil Iastremskii
f2f88bcfcc Add elephant42 keyboard (#14336) 2022-07-02 21:22:51 +10:00
Nick Brassel
a9af4c928e Merge remote-tracking branch 'upstream/master' into develop 2022-07-02 21:13:06 +10:00
Batuhan Baserdem
fd44341cbf Userspace and keymap update for user bbaserdem. (#14484) 2022-07-02 21:09:04 +10:00
QMK Bot
92c0b29be9 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:01:36 +00:00
Kan-Ru Chen
f439fe6055 HHKB YDKB Yang BT Controller (#15759)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-02 21:01:03 +10:00
QMK Bot
e3cad4045a Merge remote-tracking branch 'origin/master' into develop 2022-07-02 10:57:59 +00:00
Taeyoon Kim
0eab24be26 Adding 34keys layout for kprepublic bm40 keyboard. (#15974) 2022-07-02 20:57:12 +10:00
QMK Bot
93e657fa99 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 10:55:05 +00:00
moyi4681
578a3e3505 add baguette66 keyboard (#16429)
* add baguette66 keyboard

* Update keyboards/kbdfans/baguette66/soldered/config.h

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

* Update keyboards/kbdfans/baguette66/rgb/config.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-02 20:54:22 +10:00
Nick Brassel
5846b40f74 RP2040 emulated EEPROM. (#17519) 2022-07-02 15:18:50 +10:00
Nick Brassel
9f1c4f304d Fixup #17438 (#17533) 2022-07-02 14:29:45 +10:00
QMK Bot
3def7b98d4 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 03:23:21 +00:00
Nick Brassel
c8fbfca1b6 [QP] Explicit buffer alignment. (#17532) 2022-07-02 13:22:46 +10:00
Nick Brassel
b67ae67687 [QP] Add ILI9488 support. (#17438) 2022-07-02 13:20:45 +10:00
QMK Bot
d6c39490df Merge remote-tracking branch 'origin/master' into develop 2022-07-01 21:21:11 +00:00
Joel Challis
9d70162d53 Allow locate_keymap to handle DEFAULT_FOLDER (#17529) 2022-07-01 22:20:32 +01:00
QMK Bot
a61e549a31 Merge remote-tracking branch 'origin/master' into develop 2022-07-01 14:39:35 +00:00
Joel Challis
2757251218 Specify blackpill board files where relevant (#17521) 2022-07-01 15:38:57 +01:00
QMK Bot
dfb23456b1 Merge remote-tracking branch 'origin/master' into develop 2022-07-01 14:36:43 +00:00
Joel Challis
d978432812 Swap over F4x1 8MHz HSE boards over from blackpill board files (#17520) 2022-07-01 15:36:08 +01:00
QMK Bot
03630db506 Merge remote-tracking branch 'origin/master' into develop 2022-07-01 06:11:45 +00:00
yiancar
1e643ba1d1 [Keyboard] Nebula12b (#17308)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-06-30 23:11:13 -07:00
QMK Bot
5936e05a33 Merge remote-tracking branch 'origin/master' into develop 2022-07-01 03:02:42 +00:00
Jan Lindblom
38ca5e95e1 Adding Rev41lp keyboard (#15895)
* [keyboard] Add rev41lp

* [keymap] rev41lp: More layer, less clutter

* [keymap] rev41lp:whitespace cleanup

* [keymap] rev41lp: Remove outer shift & edit homerow timings

left-ctrl < left-shift
kc-enter < kc-sftent
lower + tab = grave
raise + tab = tilde

* Initial namnlos keymap for rev41lp.

* Updated according to PR checklist.

* Update keyboards/b_sides/rev41lp/config.h

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/rules.mk

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Updated to fulfill PR checklist.

* Update keyboards/b_sides/rev41lp/info.json

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

* Update keyboards/b_sides/rev41lp/config.h

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

* Update keyboards/b_sides/rev41lp/keymaps/cyril/config.h

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

* Update keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c

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

* Update keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c

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

* Update keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk

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

* Update keyboards/b_sides/rev41lp/rules.mk

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

* Update keyboards/b_sides/rev41lp/rules.mk

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

* Update keyboards/b_sides/rev41lp/rules.mk

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

* Update keyboards/b_sides/rev41lp/readme.md

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

* Update keyboards/b_sides/rev41lp/readme.md

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

* Update keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c

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

* Update keyboards/b_sides/rev41lp/rules.mk

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

* Adding picture.

* Rename README.md to readme.md

* Cleaning up in rules.mk.

* Moving en- and em-dash from dedicated keys.

* Readme fixup.

There was a typo in the title, also changed the description a little.

* Update keyboards/b_sides/rev41lp/readme.md

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

* Update keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk

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

Co-authored-by: cyril279 <cyril.x9@gmail.com>
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-01 13:02:07 +10:00
QMK Bot
2f2d3e9c7b Merge remote-tracking branch 'origin/master' into develop 2022-06-30 22:40:36 +00:00
James Young
f2f2a7ace9 Add missing QMK Configurator layout data for chlx str.merro60 (#17518)
* add LAYOUT_60_ansi_split_bs_rshift layout data

* add LAYOUT_60_iso layout data
2022-06-30 23:39:49 +01:00
Joel Challis
a98f69850f Also check /run/media/ for uf2 drives (#17517) 2022-06-30 23:29:56 +01:00
QMK Bot
e5a15f404d Merge remote-tracking branch 'origin/master' into develop 2022-06-30 19:10:51 +00:00
James Young
c1d4950938 Add QMK Configurator layout data for ADM42 rev4 (#17515) 2022-06-30 20:10:15 +01:00
Stefan Kerkmann
77d960cce3 Disable clang-format for stage2_bootloaders (#17516) 2022-06-30 20:07:54 +01:00
Stefan Kerkmann
d717396708 [Core] Add Raspberry Pi RP2040 support (#14877)
* Disable RESET keycode because of naming conflicts

* Add Pico SDK as submodule

* Add RP2040 build support to QMK

* Adjust USB endpoint structs for RP2040

* Add RP2040 bootloader and double-tap reset routine

* Add generic and pro micro RP2040 boards

* Add RP2040 onekey keyboard

* Add WS2812 PIO DMA enabled driver and documentation

Supports regular and open-drain output configuration. RP2040 GPIOs are
sadly not 5V tolerant, so this is a bit use-less or needs extra hardware
or you take the risk to fry your hardware.

* Adjust SIO Driver for RP2040

* Adjust I2C Driver for RP2040

* Adjust SPI Driver for RP2040

* Add PIO serial driver and documentation

* Add general RP2040 documentation

* Apply suggestions from code review

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-06-30 13:19:27 +02:00
jpe230
d206c1791e (develop)Keychron Q2: Enable support for WL EEPROM Driver (#17507) 2022-06-30 12:25:33 +10:00
jpe230
4f124574f1 (develop)AP2: Enable support for WL EEPROM Driver (#17506) 2022-06-30 11:07:43 +10:00
QMK Bot
fb05b491e7 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 23:34:39 +00:00
Joel Challis
7326a0051b Allow module check to error out when piped to /dev/null (#17505) 2022-06-30 00:33:59 +01:00
Nick Brassel
34e244cecf Wear-leveling EEPROM drivers: embedded_flash, spi_flash, legacy (#17376) 2022-06-30 07:42:23 +10:00
ihatechoosingusernames
1204cbb7ea Update feature_split_keyboard.md to add extra detail about left and right matrices. (#17492) 2022-06-29 18:39:37 +10:00
Dasky
dcdc7290e5 RGB Matrix Heatmap - Skip positions with NO_LED (#17488) 2022-06-29 01:25:03 -07:00
QMK Bot
f7eb7926e8 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 08:17:56 +00:00
Drashna Jaelre
74bec84740 [Bug] Fix 3 speed mousekey mode (#17500) 2022-06-29 01:16:31 -07:00
QMK Bot
0151f4c307 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 06:45:13 +00:00
dependabot[bot]
88086a80b0 Bump JamesIves/github-pages-deploy-action from 3.7.1 to 4.3.4 (#17497)
Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 3.7.1 to 4.3.4.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/3.7.1...v4.3.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:45:09 +10:00
dependabot[bot]
58f4e19503 Bump actions/checkout from 2 to 3 (#17496)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:44:54 +10:00
dependabot[bot]
b37a59a967 Bump peter-evans/create-pull-request from 3 to 4 (#17495)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-29 16:44:19 +10:00
QMK Bot
1f61fb33b4 Merge remote-tracking branch 'origin/master' into develop 2022-06-28 22:47:17 +00:00
Nick Brassel
2b094d4112 Enable dependabot for actions. 2022-06-29 08:46:47 +10:00
QMK Bot
2daad28ab1 Merge remote-tracking branch 'origin/master' into develop 2022-06-28 22:29:19 +00:00
QMK Bot
54383674db Merge remote-tracking branch 'origin/master' into develop 2022-06-28 22:14:09 +00:00
QMK Bot
33b62b6867 Merge remote-tracking branch 'origin/master' into develop 2022-06-26 22:59:06 +00:00
Nick Brassel
01ecf332ff Generic wear-leveling algorithm (#16996)
* Initial import of wear-leveling algorithm.

* Alignment.

* Docs tweaks.

* Lock/unlock.

* Update quantum/wear_leveling/wear_leveling_internal.h

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>

* More tests, fix issue with consolidation when unlocked.

* More tests.

* Review comments.

* Add plumbing for FNV1a.

* Another test checking that checksum mismatch clears the cache.

* Check that the write log still gets played back.

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-06-27 07:18:21 +10:00
Thomas Kriechbaumer
0d013a21e1 [Split] Verify Split Pointing Device config (#17481) 2022-06-26 09:15:25 -07:00
Thomas Kriechbaumer
01bc974365 improvements for Cirque Pinnacle trackpads (#17091) 2022-06-25 22:22:28 +02:00
QMK Bot
60cbb25148 Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:46:15 +00:00
QMK Bot
99614bd89a Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:41:30 +00:00
QMK Bot
e30cd0fa16 Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:35:17 +00:00
QMK Bot
c43e89bb4a Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:15:48 +00:00
QMK Bot
3c9f27e1c9 Merge remote-tracking branch 'origin/master' into develop 2022-06-24 22:03:10 +00:00
precondition
3b9e186019 Do not enable PERMISSIVE_HOLD when TAPPING_TERM exceeds 500ms (#15674) 2022-06-24 12:40:09 +02:00
QMK Bot
0e60b3a620 Merge remote-tracking branch 'origin/master' into develop 2022-06-24 04:11:58 +00:00
precondition
7060cb7b26 Refactor steno and add STENO_PROTOCOL = [all|txbolt|geminipr] (#17065)
* Refactor steno into STENO_ENABLE_[ALL|GEMINI|BOLT]

* Update stenography documentation

* STENO_ENABLE_TXBOLT → STENO_ENABLE_BOLT

TXBOLT is a better name but BOLT is more consistent with the
pre-existing TX Bolt related constants, which all drop the "TX " prefix

* Comments

* STENO_ENABLE_[GEMINI|BOLT|ALL] → STENO_PROTOCOL = [geminipr|txbolt|all]

* Add note on lacking V-USB support

* Clear chord at the end of the switch(mode){send_steno_chord} block

* Return true if NOEVENT

* update_chord_xxx → add_xxx_key_to_chord

* Enable the defines for all the protocols if STENO_PROTOCOL = all

* Mention how to use `steno_set_mode`

* Set the default steno protocol to "all"

This is done so that existing keymaps invoking `steno_set_mode` don't
all suddenly break

* Add data driver equivalents for stenography feature

* Document format of serial steno packets

(Thanks dnaq)

* Add missing comma
2022-06-23 20:43:24 +02:00
SmugSam
2239527871 In honor of king terry (#17387) 2022-06-23 02:47:15 +01:00
QMK Bot
32792826a8 Merge remote-tracking branch 'origin/master' into develop 2022-06-23 01:26:43 +00:00
QMK Bot
25b5c2c538 Merge remote-tracking branch 'origin/master' into develop 2022-06-23 01:23:52 +00:00
Jamal Bouajjaj
d3858585ac Added global current to all other issi drivers who don't have it (#17448) 2022-06-23 02:16:39 +01:00
QMK Bot
a0f857b7a2 Merge remote-tracking branch 'origin/master' into develop 2022-06-23 01:16:12 +00:00
QMK Bot
2f9145c6ea Merge remote-tracking branch 'origin/master' into develop 2022-06-23 00:52:50 +00:00
QMK Bot
b02f178c06 Merge remote-tracking branch 'origin/master' into develop 2022-06-23 00:39:54 +00:00
Stefan Kerkmann
9aa9155e88 [Core] Mark GD32VF103 as ChibiOS-Contrib (#17444) 2022-06-23 08:37:40 +10:00
Kyle McCreery
eac0f6d4c9 Cirque Attenuation Setting (#17342) 2022-06-22 21:59:37 +02:00
QMK Bot
2e27eb318e Merge remote-tracking branch 'origin/master' into develop 2022-06-22 16:41:19 +00:00
QMK Bot
8ea9f13c67 Merge remote-tracking branch 'origin/master' into develop 2022-06-22 14:30:56 +00:00
QMK Bot
b450ffc5c6 Merge remote-tracking branch 'origin/master' into develop 2022-06-22 05:10:58 +00:00
QMK Bot
267864e42c Merge remote-tracking branch 'origin/master' into develop 2022-06-22 02:15:13 +00:00
QMK Bot
86bfd8195c Merge remote-tracking branch 'origin/master' into develop 2022-06-22 01:53:38 +00:00
Daniel Kao
608404f874 Fix AVR I2C master 1ms timeout (#17174)
* avr i2c_master: Fix 1ms timeout

i2c_start() produces a minimum time_slice of 1ms for use as timeout
value.
The timer granularity is 1ms, it is entirely possible for timer_count
to tick up immediately after the last timer read and falsely trigger
timeout with a '>= 1' comparison.

* avr/drivers/i2c_master: Use timer_elapsed()
2022-06-22 00:00:04 +02:00
Dasky
be42c5fb98 Fix RGB heatmap to use XY positions and use correct led limits (#17184)
* Fix RGB heatmap to use XY positions

* lower effect area limit and make configurable

* tidy up macro

* Fix triggering in both directions.

* add docs

* fix bug when decreasing value

* performance tweak
2022-06-21 10:53:34 -07:00
QMK Bot
2d7a2dfad0 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 15:50:58 +00:00
QMK Bot
65fcf951d3 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 12:23:46 +00:00
QMK Bot
d116cf5e9a Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:42:15 +00:00
QMK Bot
2b23ca876d Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:34:03 +00:00
QMK Bot
503b40e748 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:25:43 +00:00
QMK Bot
52c1517766 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:16:43 +00:00
Joel Challis
1a400d8644 Allow encoder config from info.json (#17295) 2022-06-20 20:15:06 -07:00
QMK Bot
4c39bad2e6 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:12:14 +00:00
QMK Bot
a6eeb930ae Merge remote-tracking branch 'origin/master' into develop 2022-06-21 02:24:10 +00:00
QMK Bot
3370e2b74d Merge remote-tracking branch 'origin/master' into develop 2022-06-21 02:23:27 +00:00
Nick Brassel
589e756e98 Fixup SPI mode 3 => 0 on tzarc/djinn. (#17440) 2022-06-21 10:56:47 +10:00
QMK Bot
2fb24c0298 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 00:53:03 +00:00
QMK Bot
93ee789387 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 00:26:40 +00:00
Stefan Kerkmann
6a81cb44f2 [Fix] Fix compilation warning for non-split keebs after #17423 (#17439) 2022-06-21 09:31:20 +10:00
Stefan Kerkmann
2703ecc9e9 [BUG] Fix deadlocks on disconnected secondary half (#17423) 2022-06-21 08:24:53 +10:00
Dasky
62eaec52e0 Init eeconfig before reading handedness (#17256) 2022-06-20 15:31:27 +01:00
QMK Bot
36d60769f8 Merge remote-tracking branch 'origin/master' into develop 2022-06-20 04:21:32 +00:00
Jamal Bouajjaj
2bddffeaec IS31FL3737 Global Current Setting (#17420) 2022-06-19 14:32:37 -07:00
QMK Bot
4e3db51e92 Merge remote-tracking branch 'origin/master' into develop 2022-06-19 18:17:00 +00:00
Albert Y
c725b6bf89 [Core] Mouse key kinetic mode fix (#17176)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-19 11:15:55 -07:00
QMK Bot
d6eff188e9 Merge remote-tracking branch 'origin/master' into develop 2022-06-19 17:59:31 +00:00
QMK Bot
7f8886a1b7 Merge remote-tracking branch 'origin/master' into develop 2022-06-18 22:32:54 +00:00
Drashna Jaelre
0da6562c4d Make default layer size 16-bit (#15286)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-06-19 07:37:51 +10:00
QMK Bot
cfcd647b2e Merge remote-tracking branch 'origin/master' into develop 2022-06-18 07:34:32 +00:00
Joel Challis
17ec1650fd Additional schema fixes (#17414) 2022-06-18 15:30:46 +10:00
Yan-Fa Li
7b3ee1db8c Minor schema fixes (#14200)
Validating using AJV
2022-06-18 02:42:32 +01:00
Stefan Kerkmann
fe680a8568 [Core] Split ChibiOS usart split driver in protocol and hardware driver part (#16669) 2022-06-18 08:04:17 +10:00
Stefan Kerkmann
6d67e9df4b [Core] Allow usage of ChibiOS's SIO driver for split keyboards (#15907) 2022-06-17 22:06:44 +02:00
QMK Bot
e44604c256 Merge remote-tracking branch 'origin/master' into develop 2022-06-17 03:50:47 +00:00
QMK Bot
00872ea7e7 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 22:36:12 +00:00
QMK Bot
c251d88934 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 22:35:55 +00:00
QMK Bot
4610a6bf49 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 22:34:39 +00:00
Nick Brassel
999b91fbd9 SPI Bugfix for ChibiOS 21.11.1 -- also rollback AW20216 mode change issue. (#17371) 2022-06-17 08:03:38 +10:00
QMK Bot
9e35a1f617 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 21:46:41 +00:00
QMK Bot
4e8b864258 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 21:16:35 +00:00
QMK Bot
e312fa44e2 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 18:21:12 +00:00
precondition
0b1bed1d41 Use --exclude-from=.gitignore in place of --exclude-standard (#17399) 2022-06-16 11:20:12 -07:00
Ryan
ef80a1dd67 Update V-USB submodule (#17385) 2022-06-16 21:02:40 +10:00
Jouke Witteveen
050fa9062f tap-dance: Rename tests so that tap_dance is used consistently (#17396) 2022-06-16 08:05:27 +02:00
QMK Bot
fa9ecc431d Merge remote-tracking branch 'origin/master' into develop 2022-06-16 02:08:34 +00:00
QMK Bot
cac5f96275 Merge remote-tracking branch 'origin/master' into develop 2022-06-16 02:05:06 +00:00
Nick Brassel
fa8fb60279 Dump out the largest symbols in flash and in RAM. (#17397) 2022-06-16 09:55:15 +10:00
QMK Bot
589bdedc47 Merge remote-tracking branch 'origin/master' into develop 2022-06-15 21:44:32 +00:00
QMK Bot
6e10a80174 Merge remote-tracking branch 'origin/master' into develop 2022-06-15 20:31:47 +00:00
QMK Bot
c40af06871 Merge remote-tracking branch 'origin/master' into develop 2022-06-15 20:31:09 +00:00
QMK Bot
81d2218cee Merge remote-tracking branch 'origin/master' into develop 2022-06-15 00:14:34 +00:00
QMK Bot
85d84938cf Merge remote-tracking branch 'origin/master' into develop 2022-06-14 23:42:47 +00:00
QMK Bot
adf4c27db2 Merge remote-tracking branch 'origin/master' into develop 2022-06-14 23:32:38 +00:00
QMK Bot
4cde5c243b Merge remote-tracking branch 'origin/master' into develop 2022-06-14 13:55:32 +00:00
Joel Challis
87e1ff218d backlight|led 'on state' for DD configuration (#17383) 2022-06-14 12:30:31 +01:00
QMK Bot
2f4c7697a9 Merge remote-tracking branch 'origin/master' into develop 2022-06-14 10:16:16 +00:00
QMK Bot
84d3575fdb Merge remote-tracking branch 'origin/master' into develop 2022-06-14 10:13:29 +00:00
Jouke Witteveen
1706da9054 tap-dance: Restructure code and document in more detail (#16394) 2022-06-13 22:12:55 +02:00
QMK Bot
b17324498e Merge remote-tracking branch 'origin/master' into develop 2022-06-13 18:31:17 +00:00
QMK Bot
0c82aafb8a Merge remote-tracking branch 'origin/master' into develop 2022-06-13 05:15:12 +00:00
QMK Bot
577e9d89fa Merge remote-tracking branch 'origin/master' into develop 2022-06-13 01:16:03 +00:00
QMK Bot
d21ee22cc5 Merge remote-tracking branch 'origin/master' into develop 2022-06-13 01:06:36 +00:00
QMK Bot
5ba04d1204 Merge remote-tracking branch 'origin/master' into develop 2022-06-13 00:55:54 +00:00
QMK Bot
10345adaa5 Merge remote-tracking branch 'origin/master' into develop 2022-06-13 00:44:22 +00:00
Ryan
0d64038b73 Update LUFA submodule (#17368) 2022-06-13 09:17:24 +10:00
QMK Bot
d288121f21 Merge remote-tracking branch 'origin/master' into develop 2022-06-12 18:30:50 +00:00
QMK Bot
191c180644 Merge remote-tracking branch 'origin/master' into develop 2022-06-12 14:35:07 +00:00
QMK Bot
90765aaefd Merge remote-tracking branch 'origin/master' into develop 2022-06-12 10:47:53 +00:00
QMK Bot
0d991b8873 Merge remote-tracking branch 'origin/master' into develop 2022-06-11 18:25:28 +00:00
QMK Bot
1a7a6f313e Merge remote-tracking branch 'origin/master' into develop 2022-06-11 18:19:21 +00:00
Ryan
af6435d44d qmk doctor: show arch for macOS (#17356) 2022-06-11 19:10:09 +01:00
QMK Bot
5887bf7158 Merge remote-tracking branch 'origin/master' into develop 2022-06-11 17:53:14 +00:00
Drashna Jaelre
80034a847f Ensure that rgb+via compiles in all cases (#17355) 2022-06-10 22:01:46 -07:00
Dasky
568924c76c Add missing bracket for VIA brightness scaling (#17354) 2022-06-10 19:07:58 -07:00
yiancar
0fd08da806 Scale brigthness for VIA (#17352)
Co-authored-by: yiancar <yiancar@gmail.com>
2022-06-10 17:20:01 -07:00
QMK Bot
d05a1deb7c Merge remote-tracking branch 'origin/master' into develop 2022-06-10 22:24:58 +00:00
QMK Bot
6b838785b7 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 10:45:24 +00:00
QMK Bot
97fc4f1b6a Merge remote-tracking branch 'origin/master' into develop 2022-06-10 07:46:24 +00:00
QMK Bot
738cec9bd5 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:43:25 +00:00
QMK Bot
ef8a30250b Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:41:14 +00:00
QMK Bot
ed15a579a7 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:26:21 +00:00
QMK Bot
c84d058c8b Merge remote-tracking branch 'origin/master' into develop 2022-06-10 01:16:19 +00:00
QMK Bot
e5e2cd94be Merge remote-tracking branch 'origin/master' into develop 2022-06-10 01:13:18 +00:00
QMK Bot
474b4083ae Merge remote-tracking branch 'origin/master' into develop 2022-06-09 20:02:58 +00:00
QMK Bot
c5f26b0e9a Merge remote-tracking branch 'origin/master' into develop 2022-06-09 18:54:04 +00:00
jack
d2abfaeacd Fixup Pimoroni trackball code (#17335) 2022-06-09 10:09:00 -07:00
Drashna Jaelre
0ab51ee29d Add support for large Mouse Reports (#16371)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-08 18:39:16 -07:00
QMK Bot
84944df6a6 Merge remote-tracking branch 'origin/master' into develop 2022-06-08 21:52:12 +00:00
QMK Bot
728f7308af Merge remote-tracking branch 'origin/master' into develop 2022-06-08 19:21:10 +00:00
QMK Bot
0e2009c669 Merge remote-tracking branch 'origin/master' into develop 2022-06-08 06:24:16 +00:00
QMK Bot
8a6fd0dc7e Merge remote-tracking branch 'origin/master' into develop 2022-06-08 01:48:42 +00:00
QMK Bot
1e1f387be7 Merge remote-tracking branch 'origin/master' into develop 2022-06-08 00:48:36 +00:00
Nick Brassel
1085500e89 Rework paths for eeprom locations. (#17326)
* Rework paths for eeprom locations.

* File relocation.

* Wrong file move.

* Fixup test paths.
2022-06-08 09:42:35 +10:00
QMK Bot
6df5fce073 Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:33:49 +00:00
QMK Bot
5141d6eeb1 Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:31:22 +00:00
QMK Bot
fe08bbc4a0 Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:30:09 +00:00
QMK Bot
da1c562ddf Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:28:46 +00:00
QMK Bot
36109a887a Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:23:09 +00:00
QMK Bot
b74509d4ae Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:15:24 +00:00
QMK Bot
9d226b92a8 Merge remote-tracking branch 'origin/master' into develop 2022-06-07 18:01:59 +00:00
QMK Bot
11836128fc Merge remote-tracking branch 'origin/master' into develop 2022-06-07 13:32:48 +00:00
QMK Bot
6f82647e8d Merge remote-tracking branch 'origin/master' into develop 2022-06-06 22:30:38 +00:00
Dasky
85b3b98570 Move SPLIT_HAND_PIN setup to split_pre_init (#17271)
* Move SPLIT_HAND_PIN setup to split_pre_init

* doppelganger should use old behaviour

* Add comment for future

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2022-06-06 01:33:32 +01:00
Stefan Kerkmann
e89478eb0f [Core] Update C standard to GNU11, C++ to GNU++14 (#17114) 2022-06-06 08:47:22 +10:00
QMK Bot
6221c86186 Merge remote-tracking branch 'origin/master' into develop 2022-06-05 19:06:37 +00:00
QMK Bot
d6402fe9fb Merge remote-tracking branch 'origin/master' into develop 2022-06-05 11:15:11 +02:00
Nick Brassel
08c556b78b Add keymap wrappers for introspection into the keymap. (#17229)
* Introspection handlers for keymaps.

* Renaming.
2022-06-05 10:26:02 +10:00
Xelus22
af84772a5f initial 24lc32a (#16990) 2022-06-04 01:53:24 +01:00
QMK Bot
b1a3f806f5 Merge remote-tracking branch 'origin/master' into develop 2022-06-04 00:45:35 +00:00
QMK Bot
bb324e5b3e Merge remote-tracking branch 'origin/master' into develop 2022-06-03 11:13:22 +00:00
QMK Bot
267f392237 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 18:30:44 +00:00
QMK Bot
b94baa8bc3 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 17:20:59 +00:00
QMK Bot
86e93d7654 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 16:51:28 +00:00
QMK Bot
344b8410f7 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 16:38:09 +00:00
QMK Bot
8bb2c66c88 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 16:18:53 +00:00
QMK Bot
73bd3dff8c Merge remote-tracking branch 'origin/master' into develop 2022-06-02 13:03:13 +00:00
Dasky
af02baae78 Allow larger SPLIT_USB_TIMEOUT with default SPLIT_USB_TIMEOUT_POLL (#17272)
* Switch SPLIT_USB_DETECT loop to uint16_t

* Add assertion
2022-06-01 00:10:05 +01:00
QMK Bot
f9e97fd3c3 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 21:38:36 +00:00
QMK Bot
38839a9105 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 11:32:26 +00:00
QMK Bot
6fdce80822 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 08:22:54 +00:00
Thomas Preisner
bbab8eb993 Make bootloader_jump for dualbank STM32 respect STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178) 2022-05-30 23:20:10 -07:00
Andrew Dunai
ecce9900c9 Improve PS/2 mouse performance (#17111) 2022-05-30 23:15:17 -07:00
precondition
d44a950c10 Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK (#17099) 2022-05-30 22:55:33 -07:00
Nick Brassel
8545473307 Removes terminal from QMK. (#17258) 2022-05-30 22:38:08 -07:00
trwnh
9e2fe4eff6 Make SPI Mode configurable and change default mode to 3 (#17263) 2022-05-31 15:28:55 +10:00
QMK Bot
e869d089b7 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 05:03:28 +00:00
QMK Bot
f663f84413 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 04:47:02 +00:00
QMK Bot
044486500c Merge remote-tracking branch 'origin/master' into develop 2022-05-31 04:09:14 +00:00
QMK Bot
a099579aa0 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 02:09:37 +00:00
QMK Bot
67e80780bb Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:44:05 +00:00
QMK Bot
6e4e50d5aa Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:06:28 +00:00
Dasky
2de70e6f2d Add uf2-split-* make targets. (#17257) 2022-05-31 08:04:50 +10:00
QMK Bot
31fb141528 Merge remote-tracking branch 'origin/master' into develop 2022-05-30 21:46:00 +00:00
QMK Bot
6b640db4bb Merge remote-tracking branch 'origin/master' into develop 2022-05-30 18:29:09 +00:00
QMK Bot
e4be4d282c Merge remote-tracking branch 'origin/master' into develop 2022-05-30 18:07:56 +00:00
QMK Bot
9a2943d221 Merge remote-tracking branch 'origin/master' into develop 2022-05-30 14:34:54 +00:00
QMK Bot
f03fe5b917 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 19:16:27 +00:00
QMK Bot
6123698270 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 05:18:24 +00:00
QMK Bot
a765f730b1 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 05:10:23 +00:00
QMK Bot
3ce029c7fd Merge remote-tracking branch 'origin/master' into develop 2022-05-28 23:07:45 +00:00
Nick Brassel
87c3a53716 Branch point after 2022-05-28 Breaking Change. 2022-05-29 08:16:00 +10:00
Nick Brassel
103c08cc75 Merge branch 'master' into develop 2022-05-29 08:13:56 +10:00
23335 changed files with 537125 additions and 259206 deletions

3
.clangd Normal file
View File

@@ -0,0 +1,3 @@
CompileFlags:
Remove: -mcall-prologues
Add: -nostdinc

View File

@@ -1,36 +0,0 @@
---
name: Bug report
about: Create a report to help us improve QMK Firmware.
title: "[Bug] "
labels: bug, help wanted
assignees: ''
---
<!-- Provide a general summary of the bug in the title above. -->
<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
## Describe the Bug
<!-- A clear and concise description of what the bug is. -->
## System Information
**Keyboard:**
**Revision (if applicable):**
**Operating system:**
**`qmk doctor` output:**
```
(Paste output here)
```
**Any keyboard related software installed?**
- [ ] AutoHotKey (Windows)
- [ ] Karabiner (macOS)
- [ ] Other:
## Additional Context
<!-- Add any other relevant information about the problem here. -->

41
.github/ISSUE_TEMPLATE/bug_report.yml vendored Normal file
View File

@@ -0,0 +1,41 @@
name: Bug report
description: Create a report to help us improve QMK Firmware.
title: "[Bug] "
labels: ["bug", "help wanted"]
body:
- type: markdown
attributes:
value: |
Provide a general summary of the bug in the title above.
- type: textarea
attributes:
label: Describe the Bug
description: A clear and concise description of what the bug is.
- type: input
attributes:
label: Keyboard Used
description: The name of the keyboard from the `make` or `qmk compile`/`qmk flash` commands, eg. `planck/rev6`.
- type: input
attributes:
label: Link to product page (if applicable)
- type: input
attributes:
label: Operating System
- type: textarea
attributes:
label: qmk doctor Output
description: Output from running the `qmk doctor` command.
render: text
- type: checkboxes
attributes:
label: Is AutoHotKey / Karabiner installed
options:
- label: AutoHotKey (Windows)
- label: Karabiner (macOS)
- type: input
attributes:
label: Other keyboard-related software installed
- type: textarea
attributes:
label: Additional Context
description: Add any other relevant information about the problem here.

View File

@@ -1,24 +0,0 @@
---
name: Feature request
about: Suggest a new feature or changes to existing features.
title: "[Feature Request] "
labels: enhancement, help wanted
assignees: ''
---
<!--- Provide a general summary of the changes you want in the title above. -->
<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
## Feature Request Type
- [ ] Core functionality
- [ ] Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
- [ ] Alteration (enhancement/optimization) of existing feature(s)
- [ ] New behavior
## Description
<!-- A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful. -->

View File

@@ -0,0 +1,24 @@
name: Feature request
description: Suggest a new feature or changes to existing features.
title: "[Feature Request] "
labels: ["enhancement", "help wanted"]
body:
- type: markdown
attributes:
value: |
Provide a general summary of the changes you want in the title above.
Please refrain from asking maintainers to add support for specific keyboards -- it is unlikely they will have hardware available, and will not be able to help.
Your best bet is to take the initiative, add support, then submit a PR yourself.
- type: checkboxes
attributes:
label: Feature Request Type
options:
- label: Core functionality
- label: Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
- label: Alteration (enhancement/optimization) of existing feature(s)
- label: New behavior
- type: textarea
attributes:
label: Description
description: A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful.

View File

@@ -1,14 +0,0 @@
---
name: Other issues
about: Anything else that doesn't fall into the above categories.
title: ''
labels: help wanted, question
assignees: ''
---
<!--- Provide a general summary of the changes you want in the title above. -->
<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
<!-- Please check https://docs.qmk.fm/#/support for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate. -->

19
.github/ISSUE_TEMPLATE/other_issues.yml vendored Normal file
View File

@@ -0,0 +1,19 @@
name: Other issues
description: Anything else that doesn't fall into the above categories.
labels: ["help wanted", "question"]
body:
- type: markdown
attributes:
value: |
Provide a general summary of the changes you want in the title above.
- type: markdown
attributes:
value: |
Please check [https://docs.qmk.fm/#/support](https://docs.qmk.fm/#/support) for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate.
Please refrain from asking maintainers to add support for specific keyboards -- it is unlikely they will have hardware available, and will not be able to help.
Your best bet is to take the initiative, add support, then submit a PR yourself.
- type: textarea
attributes:
label: Issue Description
description: Describe your issue in as much detail as possible.

9
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
labels: CI
reviewers:
- "qmk/collaborators"
schedule:
interval: "daily"

1
.github/labeler.yml vendored
View File

@@ -5,6 +5,7 @@ core:
- tests/**/*
- util/**/*
- platforms/**/*
- builddefs/**/*
- Makefile
- '*.mk'
dependencies:

View File

@@ -1,12 +1,19 @@
name: Update API Data
permissions:
contents: read
on:
push:
branches:
- master
- develop
paths:
- 'keyboards/**'
- 'layouts/community/**'
- 'lib/python/**'
- 'data/**'
- '.github/workflows/api.yml'
workflow_dispatch:
jobs:
@@ -14,24 +21,29 @@ jobs:
runs-on: ubuntu-latest
container: qmkfm/qmk_cli
# protect against those who develop with their fork on master
# protect against those who work in their fork on 'important' branches
if: github.repository == 'qmk/qmk_firmware'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1
persist-credentials: false
- name: Install dependencies
run: |
pip3 install -r requirements-dev.txt
- name: Generate API Data
run: qmk generate-api
run: |
qmk generate-api
- name: Upload API Data
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: ${{ secrets.API_SPACE_MASTER }}
AWS_S3_BUCKET: ${{ github.ref == 'refs/heads/develop' && secrets['API_SPACE_DEVELOP'] || secrets['API_SPACE_MASTER'] }}
AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com

View File

@@ -1,5 +1,7 @@
name: Automatic Approve
permissions: {}
on:
schedule:
- cron: "*/5 * * * *"

View File

@@ -1,16 +1,20 @@
name: Essential files modified
permissions:
contents: write
on:
push:
branches:
- master
paths:
- quantum/**/*
- tmk_core/**/*
- builddefs/**/*
- drivers/**/*
- tests/**/*
- util/**/*
- platforms/**/*
- quantum/**/*
- tests/**/*
- tmk_core/**/*
- util/**/*
- Makefile
- '*.mk'
@@ -22,12 +26,12 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.39.0
uses: anothrNick/github-tag-action@1.61.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'

60
.github/workflows/ci_builds.yml vendored Normal file
View File

@@ -0,0 +1,60 @@
name: CI Builds
permissions:
contents: read
on:
workflow_dispatch:
schedule:
- cron: '0 0,12 * * *'
jobs:
ci_builds:
name: "CI Build"
runs-on: self-hosted
timeout-minutes: 1380
if: github.repository == 'qmk/qmk_firmware'
strategy:
fail-fast: false
matrix:
branch: [master, develop]
keymap: [default, via]
container: qmkfm/qmk_cli
steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
with:
submodules: recursive
ref: ${{ matrix.branch }}
- name: Install dependencies
run: pip3 install -r requirements.txt
- name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
run: |
export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
# Generate the step summary markdown
./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
# Truncate to a maximum of 1MB to deal with GitHub workflow limit
truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
# Exit with failure if the compilation stage failed
[ ! -f .failed ] || exit 1
- name: 'Upload artifacts'
uses: actions/upload-artifact@v3
if: always()
with:
name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }}
if-no-files-found: ignore
path: |
*.bin
*.hex
*.uf2
.build/failed.*

View File

@@ -1,5 +1,8 @@
name: CLI CI
permissions:
contents: read
on:
push:
branches:
@@ -18,9 +21,13 @@ jobs:
container: qmkfm/qmk_cli
steps:
- uses: actions/checkout@v2
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Install dependencies
run: pip3 install -r requirements-dev.txt
- name: Run tests

View File

@@ -1,40 +0,0 @@
name: Update Develop API Data
on:
push:
branches:
- develop
paths:
- 'keyboards/**'
- 'layouts/community/**'
workflow_dispatch:
jobs:
api_data:
runs-on: ubuntu-latest
container: qmkfm/qmk_cli
# protect against those who work in their fork on develop
if: github.repository == 'qmk/qmk_firmware'
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
persist-credentials: false
- name: Generate API Data
run: |
python3 -m pip install -r requirements-dev.txt
qmk generate-api
- name: Upload API Data
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: ${{ secrets.API_SPACE_DEVELOP }}
AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
SOURCE_DIR: '.build/api_data'

View File

@@ -1,5 +1,8 @@
name: Update develop after master merge
permissions:
contents: write
on:
push:
branches:
@@ -12,11 +15,15 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0
- name: Disable automatic eol conversion
run: |
echo "* -text" > .git/info/attributes
- name: Checkout develop
run: |
git fetch origin master develop

View File

@@ -1,5 +1,8 @@
name: Generate Docs
permissions:
contents: write
on:
push:
branches:
@@ -20,7 +23,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1
@@ -34,7 +37,7 @@ jobs:
qmk --verbose generate-docs
- name: Deploy
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@v4.4.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE_BRANCH: master

View File

@@ -1,5 +1,8 @@
name: Update feature branches after develop merge
permissions:
contents: write
on:
push:
branches:
@@ -17,11 +20,15 @@ jobs:
- xap
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0
- name: Disable automatic eol conversion
run: |
echo "* -text" > .git/info/attributes
- name: Checkout branch
run: |
git fetch origin develop ${{ matrix.branch }}

View File

@@ -1,5 +1,8 @@
name: PR Lint Format
permissions:
contents: read
on:
pull_request:
paths:
@@ -19,7 +22,10 @@ jobs:
container: qmkfm/qmk_cli
steps:
- uses: actions/checkout@v2
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
with:
fetch-depth: 0
@@ -27,16 +33,14 @@ jobs:
run: |
pip3 install -r requirements-dev.txt
- uses: trilom/file-changes-action@v1.2.4
- name: Get changed files
id: file_changes
with:
output: ' '
fileOutput: ' '
uses: tj-actions/changed-files@v35
- name: Run qmk formatters
shell: 'bash {0}'
run: |
cat ~/files_added.txt ~/files_modified.txt > ~/files_changed.txt
echo '${{ steps.file_changes.outputs.added_files}}' '${{ steps.file_changes.outputs.modified_files}}' > ~/files_changed.txt
qmk format-c --core-only $(< ~/files_changed.txt) || true
qmk format-python $(< ~/files_changed.txt) || true
qmk format-text $(< ~/files_changed.txt) || true

View File

@@ -1,5 +1,8 @@
name: Lint Format
permissions:
contents: read
on:
push:
branches:
@@ -13,10 +16,17 @@ jobs:
container: qmkfm/qmk_cli
steps:
- uses: actions/checkout@v2
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Disable automatic eol conversion
run: |
echo "* -text" > .git/info/attributes
- name: Install dependencies
run: |
pip3 install -r requirements-dev.txt
@@ -37,7 +47,7 @@ jobs:
git config user.email 'hello@qmk.fm'
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v4
if: ${{ github.repository == 'qmk/qmk_firmware'}}
with:
token: ${{ secrets.QMK_BOT_TOKEN }}

View File

@@ -1,5 +1,9 @@
name: "Pull Request Labeler"
permissions:
contents: read
pull-requests: write
on:
pull_request_target:
types: [opened, synchronize, reopened, ready_for_review, locked]

View File

@@ -1,5 +1,8 @@
name: PR Lint keyboards
permissions:
contents: read
on:
pull_request:
paths:
@@ -12,31 +15,34 @@ jobs:
container: qmkfm/qmk_cli
steps:
- uses: actions/checkout@v2
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install dependencies
run: pip3 install -r requirements-dev.txt
- uses: trilom/file-changes-action@v1.2.4
- name: Get changed files
id: file_changes
with:
output: '\n'
uses: tj-actions/changed-files@v35
- name: Print info
run: |
git rev-parse --short HEAD
echo ${{ github.event.pull_request.base.sha }}
echo '${{ steps.file_changes.outputs.files}}'
echo '${{ steps.file_changes.outputs.all_changed_files}}'
- name: Run qmk lint
shell: 'bash {0}'
run: |
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.files}}')
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.all_changed_files}}' | sed 's/ /\n/g')
QMK_KEYBOARDS=$(qmk list-keyboards)
exit_code=0
for KB in $QMK_KEYBOARDS; do
KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
if [[ -z "$KEYBOARD_CHANGES" ]]; then
@@ -52,6 +58,16 @@ jobs:
exit_code=$(($exit_code + $?))
fi
done
qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
if ! git diff --quiet $file; then
echo "File '${file}' Requires Formatting"
echo "::error file=${file}::Requires Formatting"
exit_code=$(($exit_code + 1))
fi
done
if [[ $exit_code -gt 255 ]]; then
exit 255
fi

36
.github/workflows/regen.yml vendored Normal file
View File

@@ -0,0 +1,36 @@
name: PR Regenerate Files
permissions:
contents: read
on:
pull_request:
paths:
- 'data/constants/**'
- 'lib/python/**'
jobs:
regen:
runs-on: ubuntu-latest
container: qmkfm/qmk_cli
steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
- name: Run qmk generators
run: |
util/regen.sh
git diff
- name: Fail when regeneration required
run: |
git diff
for file in $(git diff --name-only); do
echo "File '${file}' Requires Regeneration"
echo "::error file=${file}::Requires Regeneration"
done
test -z "$(git diff --name-only)"

46
.github/workflows/regen_push.yml vendored Normal file
View File

@@ -0,0 +1,46 @@
name: Regenerate Files
permissions:
contents: write
on:
push:
branches:
- master
- develop
jobs:
regen:
runs-on: ubuntu-latest
container: qmkfm/qmk_cli
steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'
- uses: actions/checkout@v3
- name: Run qmk generators
run: |
util/regen.sh
git diff
- uses: rlespinasse/github-slug-action@v3.x
- name: Become QMK Bot
run: |
git config user.name 'QMK Bot'
git config user.email 'hello@qmk.fm'
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
if: ${{ github.repository == 'qmk/qmk_firmware'}}
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
delete-branch: true
branch: bugfix/regen_${{ env.GITHUB_REF_SLUG }}
author: QMK Bot <hello@qmk.fm>
committer: QMK Bot <hello@qmk.fm>
commit-message: Regenerate Files
title: '[CI] Regenerate Files'

View File

@@ -1,18 +1,19 @@
name: 'Close stale issues and PRs'
on:
schedule:
- cron: '30 1 * * *'
workflow_dispatch:
permissions:
issues: write
pull-requests: write
on:
schedule:
- cron: '30 1 * * *'
workflow_dispatch:
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v5
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,5 +1,8 @@
name: Unit Tests
permissions:
contents: read
on:
push:
branches:
@@ -23,7 +26,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Install dependencies

36
.gitignore vendored
View File

@@ -5,6 +5,10 @@
.DS_Store
._*
# Merge files
*.orig
*.rej
# Build artifacts
.clang_complete
.build/
@@ -27,16 +31,11 @@ quantum/version.h
*.uf2
# Old-style QMK Makefiles
/keyboards/*/Makefile
/keyboards/*/*/Makefile
/keyboards/*/*/*/Makefile
/keyboards/*/*/*/*/Makefile
/keyboards/*/*/*/*/*/Makefile
/keyboards/*/keymaps/Makefile
/keyboards/*/*/keymaps/Makefile
/keyboards/*/*/*/keymaps/Makefile
/keyboards/*/*/*/*/keymaps/Makefile
/keyboards/*/*/*/*/*/keymaps/Makefile
/keyboards/**/Makefile
# kbfirmware....
/keyboards/**/kb.h
/keyboards/**/kb.c
# Eclipse/PyCharm/Other IDE Settings
*.iml
@@ -53,7 +52,11 @@ quantum/version.h
.history/
build/
cmake-build-debug
CMakeLists.txt
# CMakeLists.txt
*.pdf
# cmake toolchain downloads
/toolchains
# Let these ones be user specific, since we have so many different configurations
*.code-workspace
@@ -68,9 +71,20 @@ CMakeLists.txt
tags
# Ignore image/font files
*.bmp
*.wbmp
*.gif
*.jpg
*.jpeg
*.png
*.apng
*.mng
*.svg
*.webp
*.webm
*.avi
*.mp4
*.mpeg
*.ttf
*.otf

7
.gitmodules vendored
View File

@@ -18,3 +18,10 @@
[submodule "lib/printf"]
path = lib/printf
url = https://github.com/qmk/printf
[submodule "lib/pico-sdk"]
path = lib/pico-sdk
url = https://github.com/qmk/pico-sdk.git
[submodule "lib/lvgl"]
path = lib/lvgl
url = https://github.com/qmk/lvgl.git
branch = release/v8.2

9
.vscode/cmake-kits.json vendored Normal file
View File

@@ -0,0 +1,9 @@
[
{
"name": "AVR GCC",
"compilers": {
"CC": "C:\\QMK_MSYS\\mingw64\\bin\\avr-gcc.exe",
"CXX": "C:\\QMK_MSYS\\mingw64\\bin\\avr-g++.exe"
}
}
]

View File

@@ -5,8 +5,9 @@
// Configure glob patterns for excluding files and folders.
"files.exclude": {
"**/.build": true,
"**/*.hex": true,
"**/*.bin": true
// "**/*.hex": true,
// "**/*.bin": true,
"**/*.uf2": true
},
"files.associations": {
"*.h": "c",

114
.vscode/tasks.json vendored Normal file
View File

@@ -0,0 +1,114 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Load Keyboard",
"dependsOrder": "sequence",
"dependsOn":[
"Only Load Keyboard",
"Configure CMake"
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Only Load Keyboard",
"type": "shell",
"command": "cmake -D QMK_KEYBOARD_FOLDER=\"${input:all_keyboards}\" -D QMK_KEYMAP_FOLDER=\"${input:keyboard_keymap}\" -P ${workspaceFolder}/cmake/ConfigureKeyboard.cmake",
"problemMatcher": []
},
{
"label": "Configure CMake",
"type": "cmake",
"command": "configure"
},
{
"label": "Build",
"problemMatcher": [
{
"base": "$gcc",
"fileLocation": ["relative", "${workspaceFolder}/build"]
},
],
"options": {
"environment": {
"CLICOLOR_FORCE": "1"
}
},
"type": "cmake",
"command": "build",
"targets":[
"${input:keyboard_target}"
],
"group": {
"kind": "build",
"isDefault": true
},
},
// {
// "label": "Rebuild",
// "problemMatcher": [
// {
// "base": "$gcc",
// "fileLocation": ["relative", "${workspaceFolder}/build"]
// },
// ],
// "options": {
// "environment": {
// "CLICOLOR_FORCE": "1"
// }
// },
// "type": "cmake",
// "command": "cleanRebuild",
// "targets":[
// "${input:keyboard_target}"
// ],
// "group": {
// "kind": "build",
// "isDefault": true
// },
// }
],
"inputs": [
{
"id": "keyboard_target",
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "type build\\targets",
"description": "Target:",
"fieldSeparator": "|"
},
},
{
"id": "all_keyboards",
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "type build\\all_keyboards",
"description": "Keyboard:",
"default": ""
},
},
{
"id": "keymap",
"description": "Keymap:",
"type": "pickString",
"options":[
"default"
]
},
{
"id": "keyboard_keymap",
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "cmake -D QMK_KEYBOARD_FOLDER=\"${input:all_keyboards}\" -P ${workspaceFolder}/cmake/GetKeymaps.cmake && type build\\keyboard_keymaps",
"description": "Keymap:",
"default": ""
},
},
]
}

97
CMakeLists.txt Normal file
View File

@@ -0,0 +1,97 @@
cmake_minimum_required(VERSION 3.20)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(UpdateSubmodule)
include(ResolveKeyboard)
include(ValidateJson)
include(ProcessKeyboard)
set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
function(_get_all_cmake_targets out_var current_dir)
get_property(targets DIRECTORY ${current_dir} PROPERTY BUILDSYSTEM_TARGETS)
get_property(subdirs DIRECTORY ${current_dir} PROPERTY SUBDIRECTORIES)
foreach(subdir ${subdirs})
_get_all_cmake_targets(subdir_targets ${subdir})
list(APPEND targets ${subdir_targets})
endforeach()
set(${out_var} ${targets} PARENT_SCOPE)
endfunction()
if(NOT DEFINED QMK_KEYBOARD)
# configure step - populate targets
project(qmk_firmware)
add_subdirectory(keyboards)
else()
# build step
if(NOT DEFINED QMK_KEYMAP_FOLDER)
set(QMK_KEYMAP_FOLDER "default")
endif()
resolve_keyboard(${QMK_KEYBOARD_FOLDER} QMK_KEYBOARD_FOLDER_ABS)
cmake_path(IS_PREFIX QMK_KEYBOARDS_FOLDER "${QMK_KEYBOARD_FOLDER_ABS}" IS_KEYBOARDS_FOLDER)
resolve_config_h(${QMK_KEYBOARD_FOLDER_ABS} QMK_KEYBOARD_CONFIG_H)
process_keyboard()
resolve_keyboard_h(${QMK_KEYBOARD_FOLDER_ABS} QMK_KEYBOARD_H)
resolve_keymap_c(${QMK_KEYBOARD_FOLDER_ABS} ${QMK_KEYMAP_FOLDER} QMK_KEYMAP_C)
message(STATUS "config.h: ${QMK_KEYBOARD_CONFIG_H}")
message(STATUS "keyboard.h: ${QMK_KEYBOARD_H}")
message(STATUS "keymap.c: ${QMK_KEYMAP_C}")
project(${QMK_KEYBOARD}
LANGUAGES C CXX ASM
HOMEPAGE_URL ${URL}
VERSION ${DEVICE_VER})
# add_compile_options(
# -include ${QMK_KEYBOARD_CONFIG_H}
# )
add_compile_definitions(
QMK_KEYBOARD_H="${QMK_KEYBOARD_H}"
KEYBOARD_${QMK_KEYBOARD}
KEYMAP_C="${QMK_KEYMAP_C}"
MATRIX_ROWS=8
MATRIX_COLS=6
)
if(DEFINED DIODE_DIRECTION)
add_compile_definitions(DIODE_DIRECTION=${DIODE_DIRECTION})
endif()
include_directories(${CMAKE_SOURCE_DIR})
# if(EXISTS ${QMK_KEYBOARD_FOLDER_ABS}/CMakeLists.txt)
# add_subdirectory(${QMK_KEYBOARD_FOLDER_ABS})
# else()
file(GLOB KEYBOARD_SRC "${QMK_KEYBOARD_FOLDER_ABS}/*.c")
list(REMOVE_ITEM KEYBOARD_SRC "${QMK_KEYMAP_C}")
add_qmk_executable(${TARGET_NAME} ${KEYBOARD_SRC})
# endif()
# add_library(qmk)
target_precompile_headers(qmk PUBLIC
${QMK_KEYBOARD_CONFIG_H}
)
resolve_keyboard_includes(${QMK_KEYBOARD_FOLDER_ABS})
add_subdirectory(quantum)
add_subdirectory(platforms)
add_subdirectory(tmk_core/protocol)
include(features/oled)
include(features/backlight)
include(features/eeprom)
include(features/matrix)
include(features/fnv)
endif()

View File

@@ -19,8 +19,13 @@ endif
# Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
override SILENT := false
ifeq ($(shell git rev-parse --is-inside-work-tree 2>/dev/null),)
export SKIP_GIT := yes
export NOT_REPO := yes
endif
ifdef SKIP_VERSION
SKIP_GIT := yes
export SKIP_GIT := yes
endif
ifndef SUB_IS_SILENT
@@ -43,17 +48,10 @@ ON_ERROR := error_occurred=1
BREAK_ON_ERRORS = no
STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
ROOT_DIR := $(dir $(ROOT_MAKEFILE))
ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
ifeq ($(ROOT_DIR),)
ROOT_DIR := .
endif
ABS_STARTING_MAKEFILE := $(abspath $(STARTING_MAKEFILE))
ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE))
ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE))
ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE))
STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR))
include paths.mk
@@ -126,29 +124,16 @@ endef
define PARSE_RULE
RULE := $1
COMMANDS :=
REQUIRE_PLATFORM_KEY :=
# If the rule starts with all, then continue the parsing from
# PARSE_ALL_KEYBOARDS
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
KEYBOARD_RULE=all
$$(eval $$(call PARSE_ALL_KEYBOARDS))
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-avr),true)
KEYBOARD_RULE=all
REQUIRE_PLATFORM_KEY := avr
$$(eval $$(call PARSE_ALL_KEYBOARDS))
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-chibios),true)
KEYBOARD_RULE=all
REQUIRE_PLATFORM_KEY := chibios
$$(eval $$(call PARSE_ALL_KEYBOARDS))
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-arm_atsam),true)
KEYBOARD_RULE=all
REQUIRE_PLATFORM_KEY := arm_atsam
$$(eval $$(call PARSE_ALL_KEYBOARDS))
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true)
$$(eval $$(call PARSE_TEST))
# If the rule starts with the name of a known keyboard, then continue
# the parsing from PARSE_KEYBOARD
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true)
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)),true)
KEYBOARD_RULE=$$(MATCHED_ITEM)
$$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
else
@@ -241,7 +226,7 @@ endef
# if we are going to compile all keyboards, match the rest of the rule
# for each of them
define PARSE_ALL_KEYBOARDS
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh noci | sort -u)))
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)))
endef
# Prints a list of all known keymaps for the given keyboard
@@ -264,7 +249,7 @@ define PARSE_KEYMAP
# The rest of the rule is the target
# Remove the leading ":" from the target, as it acts as a separator
MAKE_TARGET := $$(patsubst :%,%,$$(RULE))
# We need to generate an unique indentifer to append to the COMMANDS list
# We need to generate an unique identifier to append to the COMMANDS list
CURRENT_KB_UNDER := $$(subst /,_,$$(CURRENT_KB))
COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB_UNDER)_KEYMAP_$$(CURRENT_KM)
# If we are compiling a keyboard without a subproject, we want to display just the name
@@ -273,7 +258,7 @@ define PARSE_KEYMAP
# Format it in bold
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
# Specify the variables that we are passing forward to submake
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) QMK_BIN=$$(QMK_BIN)
# And the first part of the make command
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_keyboard.mk $$(MAKE_TARGET)
# The message to display
@@ -390,24 +375,15 @@ endef
# Catch everything and parse the command line ourselves.
.PHONY: %
%:
# Check if we have the CMP tool installed
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
# Ensure that $(QMK_BIN) works.
if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
# Check if the submodules are dirty, and display a warning if they are
ifdef NOT_REPO
printf "$(MSG_NOT_REPO)"
endif
ifndef SKIP_GIT
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --depth 50 --init lib/chibios-contrib; fi
if [ ! -e lib/lufa ]; then git submodule sync lib/lufa && git submodule update --depth 50 --init lib/lufa; fi
if [ ! -e lib/vusb ]; then git submodule sync lib/vusb && git submodule update --depth 50 --init lib/vusb; fi
if [ ! -e lib/printf ]; then git submodule sync lib/printf && git submodule update --depth 50 --init lib/printf; fi
git submodule status --recursive 2>/dev/null | \
while IFS= read -r x; do \
case "$$x" in \
\ *) ;; \
*) printf "$(MSG_SUBMODULE_DIRTY)";break;; \
esac \
done
$(QMK_BIN) git-submodule --sync
# Check if the submodules are dirty, and display a warning if they are
if ! $(QMK_BIN) git-submodule --check 1> /dev/null 2>&1; then printf "$(MSG_SUBMODULE_DIRTY)"; fi
endif
rm -f $(ERROR_FILE) > /dev/null 2>&1
$(eval $(call PARSE_RULE,$@))
@@ -428,16 +404,18 @@ lib/%:
.PHONY: git-submodule
git-submodule:
git submodule sync --recursive
git submodule update --init --recursive --progress
$(QMK_BIN) git-submodule
.PHONY: git-submodules
git-submodules: git-submodule
.PHONY: list-keyboards
list-keyboards:
util/list_keyboards.sh | sort -u | tr '\n' ' '
$(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
.PHONY: generate-keyboards-file
generate-keyboards-file:
util/list_keyboards.sh | sort -u
$(QMK_BIN) list-keyboards --no-resolve-defaults
.PHONY: clean
clean:

View File

@@ -1,218 +0,0 @@
# Copyright 2017 Jack Humbert
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# If it's possible that multiple bootloaders can be used for one project,
# you can leave this unset, and the correct size will be selected
# automatically.
#
# Sets the bootloader defined in the keyboard's/keymap's rules.mk
# Current options:
#
# AVR:
# halfkay PJRC Teensy
# caterina Pro Micro (Sparkfun/generic)
# atmel-dfu Atmel factory DFU
# lufa-dfu LUFA DFU
# qmk-dfu QMK DFU (LUFA + blinkenlight)
# qmk-hid QMK HID (LUFA + blinkenlight)
# bootloadhid HIDBootFlash compatible (ATmega32A)
# usbasploader USBaspLoader (ATmega328P)
# ARM:
# halfkay PJRC Teensy
# kiibohd Input:Club Kiibohd bootloader (only used on their boards)
# stm32duino STM32Duino (STM32F103x8)
# stm32-dfu STM32 USB DFU in ROM
# apm32-dfu APM32 USB DFU in ROM
# RISC-V:
# gd32v-dfu GD32V USB DFU in ROM
#
# If you need to provide your own implementation, you can set inside `rules.mk`
# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
# which functions may be overridden.
#
# BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list
ifeq ($(strip $(BOOTLOADER)), custom)
OPT_DEFS += -DBOOTLOADER_CUSTOM
BOOTLOADER_TYPE = custom
endif
ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
OPT_DEFS += -DBOOTLOADER_DFU
BOOTLOADER_TYPE = dfu
ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
BOOTLOADER_SIZE = 4096
endif
ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))
BOOTLOADER_SIZE = 8192
endif
endif
ifeq ($(strip $(BOOTLOADER)), lufa-dfu)
OPT_DEFS += -DBOOTLOADER_LUFA_DFU
OPT_DEFS += -DBOOTLOADER_DFU
BOOTLOADER_TYPE = dfu
ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
BOOTLOADER_SIZE ?= 4096
endif
ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))
BOOTLOADER_SIZE ?= 8192
endif
endif
ifeq ($(strip $(BOOTLOADER)), qmk-dfu)
OPT_DEFS += -DBOOTLOADER_QMK_DFU
OPT_DEFS += -DBOOTLOADER_DFU
BOOTLOADER_TYPE = dfu
ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
BOOTLOADER_SIZE ?= 4096
endif
ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))
BOOTLOADER_SIZE ?= 8192
endif
endif
ifeq ($(strip $(BOOTLOADER)), qmk-hid)
OPT_DEFS += -DBOOTLOADER_QMK_HID
OPT_DEFS += -DBOOTLOADER_HID
BOOTLOADER_TYPE = dfu
BOOTLOADER_SIZE ?= 4096
endif
ifeq ($(strip $(BOOTLOADER)), halfkay)
OPT_DEFS += -DBOOTLOADER_HALFKAY
BOOTLOADER_TYPE = halfkay
# Teensy 2.0
ifeq ($(strip $(MCU)), atmega32u4)
BOOTLOADER_SIZE = 512
endif
# Teensy 2.0++
ifeq ($(strip $(MCU)), at90usb1286)
BOOTLOADER_SIZE = 1024
endif
# Teensy LC, 3.x
ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK66FX1M0))
FIRMWARE_FORMAT = hex
endif
endif
ifeq ($(strip $(BOOTLOADER)), caterina)
OPT_DEFS += -DBOOTLOADER_CATERINA
BOOTLOADER_TYPE = caterina
BOOTLOADER_SIZE = 4096
endif
ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
BOOTLOADER_TYPE = bootloadhid
BOOTLOADER_SIZE = 4096
endif
ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
OPT_DEFS += -DBOOTLOADER_USBASP
BOOTLOADER_TYPE = usbasploader
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(BOOTLOADER)), lufa-ms)
OPT_DEFS += -DBOOTLOADER_MS
BOOTLOADER_TYPE = dfu
BOOTLOADER_SIZE ?= 8192
FIRMWARE_FORMAT = bin
cpfirmware: lufa_warning
.INTERMEDIATE: lufa_warning
lufa_warning: $(FIRMWARE_FORMAT)
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
$(info LUFA MASS STORAGE Bootloader selected)
$(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!)
$(info It is extremely prone to bricking, and is only included to support existing boards.)
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
endif
ifdef BOOTLOADER_SIZE
OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
endif
ifeq ($(strip $(BOOTLOADER)), stm32-dfu)
OPT_DEFS += -DBOOTLOADER_STM32_DFU
BOOTLOADER_TYPE = stm32_dfu
# Options to pass to dfu-util when flashing
DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
endif
ifeq ($(strip $(BOOTLOADER)), apm32-dfu)
OPT_DEFS += -DBOOTLOADER_APM32_DFU
BOOTLOADER_TYPE = stm32_dfu
# Options to pass to dfu-util when flashing
DFU_ARGS ?= -d 314B:0106 -a 0 -s 0x08000000:leave
DFU_SUFFIX_ARGS ?= -v 314B -p 0106
endif
ifeq ($(strip $(BOOTLOADER)), gd32v-dfu)
OPT_DEFS += -DBOOTLOADER_GD32V_DFU
BOOTLOADER_TYPE = gd32v_dfu
# Options to pass to dfu-util when flashing
DFU_ARGS ?= -d 28E9:0189 -a 0 -s 0x08000000:leave
DFU_SUFFIX_ARGS ?= -v 28E9 -p 0189
endif
ifeq ($(strip $(BOOTLOADER)), kiibohd)
OPT_DEFS += -DBOOTLOADER_KIIBOHD
BOOTLOADER_TYPE = kiibohd
ifeq ($(strip $(MCU_ORIG)), MK20DX128)
MCU_LDSCRIPT = MK20DX128BLDR4
endif
ifeq ($(strip $(MCU_ORIG)), MK20DX256)
MCU_LDSCRIPT = MK20DX256BLDR8
endif
# Options to pass to dfu-util when flashing
DFU_ARGS = -d 1C11:B007
DFU_SUFFIX_ARGS = -v 1C11 -p B007
endif
ifeq ($(strip $(BOOTLOADER)), stm32duino)
OPT_DEFS += -DBOOTLOADER_STM32DUINO
MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO
BOOTLOADER_TYPE = stm32duino
# Options to pass to dfu-util when flashing
DFU_ARGS = -d 1EAF:0003 -a 2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
endif
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
OPT_DEFS += -DBOOTLOADER_TINYUF2
BOOTLOADER_TYPE = tinyuf2
endif
ifeq ($(strip $(BOOTLOADER)), halfkay)
OPT_DEFS += -DBOOTLOADER_HALFKAY
BOOTLOADER_TYPE = halfkay
endif
ifeq ($(strip $(BOOTLOADER)), md-boot)
OPT_DEFS += -DBOOTLOADER_MD_BOOT
BOOTLOADER_TYPE = md_boot
endif
ifeq ($(strip $(BOOTLOADER)), wb32-dfu)
OPT_DEFS += -DBOOTLOADER_WB32_DFU
BOOTLOADER_TYPE = wb32_dfu
endif
ifeq ($(strip $(BOOTLOADER_TYPE)),)
$(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
endif

View File

@@ -20,16 +20,18 @@ $(TEST)_SRC := \
$(TMK_COMMON_SRC) \
$(QUANTUM_SRC) \
$(SRC) \
tests/test_common/keymap.c \
$(QUANTUM_PATH)/keymap_introspection.c \
tests/test_common/matrix.c \
tests/test_common/test_driver.cpp \
tests/test_common/keyboard_report_util.cpp \
tests/test_common/keycode_util.cpp \
tests/test_common/keycode_table.cpp \
tests/test_common/test_fixture.cpp \
tests/test_common/test_keymap_key.cpp \
tests/test_common/test_logger.cpp \
$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS)
$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
$(TEST)_CONFIG := $(TEST_PATH)/config.h

View File

@@ -13,6 +13,14 @@ endif
include paths.mk
include $(BUILDDEFS_PATH)/message.mk
# Helper to add defines with a 'QMK_' prefix
define add_qmk_prefix_defs
ifdef $1
# Need to cater for 'STM32L4xx+'
OPT_DEFS += -DQMK_$(2)="$($1)" -DQMK_$(2)_$(shell echo $($1) | sed -e 's@+@Plus@g' -e 's@[^a-zA-Z0-9]@_@g' | tr '[:lower:]' '[:upper:]')
endif
endef
# Set the qmk cli to use
QMK_BIN ?= qmk
@@ -21,6 +29,11 @@ KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
ifeq ($(strip $(DUMP_CI_METADATA)),yes)
$(info CI Metadata: KEYBOARD=$(KEYBOARD))
$(info CI Metadata: KEYMAP=$(KEYMAP))
endif
# Force expansion
TARGET := $(TARGET)
@@ -38,11 +51,12 @@ ifdef SKIP_VERSION
endif
# Generate the version.h file
VERSION_H_FLAGS :=
ifdef SKIP_VERSION
VERSION_H_FLAGS := --skip-all
VERSION_H_FLAGS += --skip-all
endif
ifdef SKIP_GIT
VERSION_H_FLAGS := --skip-git
VERSION_H_FLAGS += --skip-git
endif
# Generate the board's version.h file.
@@ -116,26 +130,26 @@ include $(BUILDDEFS_PATH)/build_json.mk
# Pull in keymap level rules.mk
ifeq ("$(wildcard $(KEYMAP_PATH))", "")
# Look through the possible keymap folders until we find a matching keymap.c
ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_5)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_4)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_3)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_1)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_2)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_1)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_3)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_4)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_5)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
else ifneq ($(LAYOUTS),)
# If we haven't found a keymap yet fall back to community layouts
include $(BUILDDEFS_PATH)/build_layout.mk
@@ -154,7 +168,7 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
-include $(KEYMAP_PATH)/rules.mk
# Load any rules.mk content from keymap.json
INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/src/rules.mk)
INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(KEYMAP_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
include $(INFO_RULES_MK)
# Add rules to generate the keymap files - indentation here is important
@@ -165,7 +179,7 @@ $(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H))
$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
@$(BUILD_CMD)
generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
@@ -174,7 +188,14 @@ endif
include $(BUILDDEFS_PATH)/converters.mk
include $(BUILDDEFS_PATH)/mcu_selection.mk
MCU_ORIG := $(MCU)
include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk)
# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU')
ifeq ($(PLATFORM_KEY),)
$(call CATASTROPHIC_ERROR,Platform not defined)
endif
PLATFORM=$(shell echo $(PLATFORM_KEY) | tr '[:lower:]' '[:upper:]')
# Find all the C source files to be compiled in subfolders.
KEYBOARD_SRC :=
@@ -228,44 +249,25 @@ endif
# that the same keymap may be used on multiple keyboards.
#
# We grab the most top-level include file that we can. That file should
# use #ifdef statements to include all the neccesary subfolder includes,
# use #ifdef statements to include all the necessary subfolder includes,
# as described here:
#
# https://docs.qmk.fm/#/feature_layouts?id=tips-for-making-layouts-keyboard-agnostic
#
QMK_KEYBOARD_H = $(KEYBOARD_OUTPUT)/src/default_keyboard.h
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/$(KEYBOARD_FOLDER_2).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/$(KEYBOARD_FOLDER_3).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/$(KEYBOARD_FOLDER_4).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
endif
# Determine and set parameters based on the keyboard's processor family.
# We can assume a ChibiOS target When MCU_FAMILY is defined since it's
# not used for LUFA
ifdef MCU_FAMILY
PLATFORM=CHIBIOS
PLATFORM_KEY=chibios
FIRMWARE_FORMAT?=bin
OPT_DEFS += -DMCU_$(MCU_FAMILY)
else ifdef ARM_ATSAM
PLATFORM=ARM_ATSAM
PLATFORM_KEY=arm_atsam
FIRMWARE_FORMAT=bin
else
PLATFORM=AVR
PLATFORM_KEY=avr
FIRMWARE_FORMAT?=hex
FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
endif
# Find all of the config.h files and add them to our CONFIG_H define.
@@ -321,7 +323,7 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
endif
CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h
KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c
$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
@@ -336,15 +338,10 @@ $(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
$(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
@$(BUILD_CMD)
$(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h)
@$(BUILD_CMD)
generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h
generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
.INTERMEDIATE : generated-files
@@ -366,6 +363,10 @@ endif
# Disable features that a keyboard doesn't support
-include $(BUILDDEFS_PATH)/disable_features.mk
ifneq ("$(CONVERTER)","")
-include $(CONVERTER)/post_converter.mk
endif
# Pull in post_rules.mk files from all our subfolders
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
include $(KEYBOARD_PATH_1)/post_rules.mk
@@ -390,10 +391,18 @@ ifneq ("$(KEYMAP_H)","")
CONFIG_H += $(KEYMAP_H)
endif
OPT_DEFS += -DKEYMAP_C=\"$(KEYMAP_C)\"
# If a keymap or userspace places their keymap array in another file instead, allow for it to be included
# !!NOTE!! -- For this to work, the source file cannot be part of $(SRC), so users should not add it via `SRC += <file>`
ifneq ($(strip $(INTROSPECTION_KEYMAP_C)),)
OPT_DEFS += -DINTROSPECTION_KEYMAP_C=\"$(strip $(INTROSPECTION_KEYMAP_C))\"
endif
# project specific files
SRC += \
$(KEYBOARD_SRC) \
$(KEYMAP_C) \
$(QUANTUM_DIR)/keymap_introspection.c \
$(QUANTUM_SRC) \
$(QUANTUM_DIR)/main.c \
@@ -412,7 +421,6 @@ include $(BUILDDEFS_PATH)/common_features.mk
include $(BUILDDEFS_PATH)/generic_features.mk
include $(TMK_PATH)/protocol.mk
include $(PLATFORM_PATH)/common.mk
include $(BUILDDEFS_PATH)/bootloader.mk
SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
@@ -420,13 +428,7 @@ SRC += $(TMK_COMMON_SRC)
OPT_DEFS += $(TMK_COMMON_DEFS)
EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
SKIP_COMPILE := no
ifneq ($(REQUIRE_PLATFORM_KEY),)
ifneq ($(REQUIRE_PLATFORM_KEY),$(PLATFORM_KEY))
SKIP_COMPILE := yes
endif
endif
-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/bootloader.mk
include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
@@ -436,6 +438,14 @@ else
include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
endif
# Setup definitions based on the selected MCU
$(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))
$(eval $(call add_qmk_prefix_defs,MCU_ARCH,MCU_ARCH))
$(eval $(call add_qmk_prefix_defs,MCU_PORT_NAME,MCU_PORT_NAME))
$(eval $(call add_qmk_prefix_defs,MCU_FAMILY,MCU_FAMILY))
$(eval $(call add_qmk_prefix_defs,MCU_SERIES,MCU_SERIES))
$(eval $(call add_qmk_prefix_defs,BOARD,BOARD))
# TODO: remove this bodge?
PROJECT_DEFS := $(OPT_DEFS)
PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
@@ -447,7 +457,7 @@ ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
$(KEYMAP_OUTPUT)_SRC := $(SRC)
$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD_OUTPUT)/src/default_keyboard.h\" \
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)
$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
@@ -457,18 +467,31 @@ $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC)
$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
# Default target.
ifeq ($(SKIP_COMPILE),no)
all: build check-size
else
all:
echo "skipped" >&2
endif
build: elf cpfirmware
check-size: build
check-md5: build
objs-size: build
ifneq ($(strip $(TOP_SYMBOLS)),)
ifeq ($(strip $(TOP_SYMBOLS)),yes)
NUM_TOP_SYMBOLS := 10
else
NUM_TOP_SYMBOLS := $(strip $(TOP_SYMBOLS))
endif
all: top-symbols
check-size: top-symbols
top-symbols: build
echo "###########################################"
echo "# Highest flash usage:"
$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [t] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000# #g' -e 's#^000000# #g' -e 's#^00000# #g' -e 's#^0000# #g' -e 's#^000# #g' -e 's#^00# #g' -e 's#^0# #g'
echo "###########################################"
echo "# Highest RAM usage:"
$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [dbv] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000# #g' -e 's#^000000# #g' -e 's#^00000# #g' -e 's#^0000# #g' -e 's#^000# #g' -e 's#^00# #g' -e 's#^0# #g'
echo "###########################################"
endif
include $(BUILDDEFS_PATH)/show_options.mk
include $(BUILDDEFS_PATH)/common_rules.mk

View File

@@ -38,11 +38,11 @@ CREATE_MAP := no
VPATH += \
$(LIB_PATH)/googletest \
$(LIB_PATH)/googlemock \
$(LIB_PATH)/printf
$(COMMON_VPATH) \
$(TEST_PATH)
all: elf
VPATH += $(COMMON_VPATH)
PLATFORM:=TEST
PLATFORM_KEY:=test
BOOTLOADER_TYPE:=none
@@ -62,15 +62,17 @@ include $(PLATFORM_PATH)/common.mk
include $(TMK_PATH)/protocol.mk
include $(QUANTUM_PATH)/debounce/tests/rules.mk
include $(QUANTUM_PATH)/encoder/tests/rules.mk
include $(QUANTUM_PATH)/os_detection/tests/rules.mk
include $(QUANTUM_PATH)/sequencer/tests/rules.mk
include $(QUANTUM_PATH)/wear_leveling/tests/rules.mk
include $(QUANTUM_PATH)/logging/print.mk
include $(PLATFORM_PATH)/test/rules.mk
ifneq ($(filter $(FULL_TESTS),$(TEST)),)
include $(BUILDDEFS_PATH)/build_full_test.mk
endif
$(TEST)_SRC += \
tests/test_common/main.c \
$(LIB_PATH)/printf/printf.c \
tests/test_common/main.cpp \
$(QUANTUM_PATH)/logging/print.c
$(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)

View File

@@ -15,7 +15,6 @@
QUANTUM_SRC += \
$(QUANTUM_DIR)/quantum.c \
$(QUANTUM_DIR)/send_string.c \
$(QUANTUM_DIR)/bitwise.c \
$(QUANTUM_DIR)/led.c \
$(QUANTUM_DIR)/action.c \
@@ -65,6 +64,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
OPT_DEFS += -DAUDIO_DRIVER_PWM
endif
OPT_DEFS += -DAUDIO_ENABLE
COMMON_VPATH += $(QUANTUM_PATH)/audio
MUSIC_ENABLE = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
@@ -84,6 +84,13 @@ endif
ifeq ($(strip $(MIDI_ENABLE)), yes)
OPT_DEFS += -DMIDI_ENABLE
MUSIC_ENABLE = yes
COMMON_VPATH += $(QUANTUM_PATH)/midi
SRC += $(QUANTUM_DIR)/midi/midi.c
SRC += $(QUANTUM_DIR)/midi/midi_device.c
SRC += $(QUANTUM_DIR)/midi/qmk_midi.c
SRC += $(QUANTUM_DIR)/midi/sysex_tools.c
SRC += $(QUANTUM_DIR)/midi/bytequeue/bytequeue.c
SRC += $(QUANTUM_DIR)/midi/bytequeue/interrupt_setting.c
SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
endif
@@ -92,10 +99,29 @@ ifeq ($(MUSIC_ENABLE), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_music.c
endif
VALID_STENO_PROTOCOL_TYPES := geminipr txbolt all
STENO_PROTOCOL ?= all
ifeq ($(strip $(STENO_ENABLE)), yes)
OPT_DEFS += -DSTENO_ENABLE
VIRTSER_ENABLE ?= yes
SRC += $(QUANTUM_DIR)/process_keycode/process_steno.c
ifeq ($(filter $(STENO_PROTOCOL),$(VALID_STENO_PROTOCOL_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid STENO_PROTOCOL,STENO_PROTOCOL="$(STENO_PROTOCOL)" is not a valid stenography protocol)
else
OPT_DEFS += -DSTENO_ENABLE
VIRTSER_ENABLE ?= yes
ifeq ($(strip $(STENO_PROTOCOL)), geminipr)
OPT_DEFS += -DSTENO_ENABLE_GEMINI
endif
ifeq ($(strip $(STENO_PROTOCOL)), txbolt)
OPT_DEFS += -DSTENO_ENABLE_BOLT
endif
ifeq ($(strip $(STENO_PROTOCOL)), all)
OPT_DEFS += -DSTENO_ENABLE_ALL
OPT_DEFS += -DSTENO_ENABLE_GEMINI
OPT_DEFS += -DSTENO_ENABLE_BOLT
endif
SRC += $(QUANTUM_DIR)/process_keycode/process_steno.c
endif
endif
ifeq ($(strip $(VIRTSER_ENABLE)), yes)
@@ -108,15 +134,17 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/mousekey.c
endif
VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi pmw3360 pmw3389 pimoroni_trackball custom
VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3360 pmw3389 pimoroni_trackball custom
ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
else
OPT_DEFS += -DPOINTING_DEVICE_ENABLE
MOUSE_ENABLE := yes
SRC += $(QUANTUM_DIR)/pointing_device.c
SRC += $(QUANTUM_DIR)/pointing_device_drivers.c
VPATH += $(QUANTUM_DIR)/pointing_device
SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c
SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c
SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_auto_mouse.c
ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom)
SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
@@ -131,19 +159,21 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_i2c)
OPT_DEFS += -DSTM32_I2C -DHAL_USE_I2C=TRUE
SRC += drivers/sensors/cirque_pinnacle.c
SRC += drivers/sensors/cirque_pinnacle_gestures.c
SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
QUANTUM_LIB_SRC += i2c_master.c
else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_spi)
OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
SRC += drivers/sensors/cirque_pinnacle.c
SRC += drivers/sensors/cirque_pinnacle_gestures.c
SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
QUANTUM_LIB_SRC += spi_master.c
else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE
QUANTUM_LIB_SRC += i2c_master.c
else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3360)
OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
QUANTUM_LIB_SRC += spi_master.c
else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3389)
else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)
OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
SRC += drivers/sensors/pmw33xx_common.c
QUANTUM_LIB_SRC += spi_master.c
endif
endif
@@ -154,33 +184,42 @@ ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
include $(QUANTUM_DIR)/painter/rules.mk
endif
VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi
VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
EEPROM_DRIVER ?= vendor
ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
else
OPT_DEFS += -DEEPROM_ENABLE
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
COMMON_VPATH += $(DRIVER_PATH)/eeprom
COMMON_VPATH += $(PLATFORM_COMMON_DIR)
ifeq ($(strip $(EEPROM_DRIVER)), custom)
# Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
COMMON_VPATH += $(DRIVER_PATH)/eeprom
SRC += eeprom_driver.c
else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
# Wear-leveling EEPROM implementation
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
SRC += eeprom_driver.c eeprom_wear_leveling.c
else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
# External I2C EEPROM implementation
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
COMMON_VPATH += $(DRIVER_PATH)/eeprom
QUANTUM_LIB_SRC += i2c_master.c
SRC += eeprom_driver.c eeprom_i2c.c
else ifeq ($(strip $(EEPROM_DRIVER)), spi)
# External SPI EEPROM implementation
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
COMMON_VPATH += $(DRIVER_PATH)/eeprom
QUANTUM_LIB_SRC += spi_master.c
SRC += eeprom_driver.c eeprom_spi.c
else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
# STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
COMMON_VPATH += $(DRIVER_PATH)/flash
SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
else ifeq ($(strip $(EEPROM_DRIVER)), transient)
# Transient EEPROM implementation -- no data storage but provides runtime area for it
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
COMMON_VPATH += $(DRIVER_PATH)/eeprom
SRC += eeprom_driver.c eeprom_transient.c
else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
# Vendor-implemented EEPROM
@@ -188,53 +227,91 @@ else
ifeq ($(PLATFORM),AVR)
# Automatically provided by avr-libc, nothing required
else ifeq ($(PLATFORM),CHIBIOS)
ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
# Emulated EEPROM
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
COMMON_VPATH += $(DRIVER_PATH)/eeprom
SRC += eeprom_driver.c
SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
# STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
COMMON_VPATH += $(DRIVER_PATH)/flash
SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx GD32VF103),)
# Wear-leveling EEPROM implementation, backed by MCU flash
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
SRC += eeprom_driver.c eeprom_wear_leveling.c
WEAR_LEVELING_DRIVER ?= embedded_flash
else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
# True EEPROM on STM32L0xx, L1xx
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
COMMON_VPATH += $(DRIVER_PATH)/eeprom
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
SRC += eeprom_driver.c
SRC += eeprom_stm32_L0_L1.c
SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
else ifneq ($(filter $(MCU_SERIES),RP2040),)
# Wear-leveling EEPROM implementation, backed by RP2040 flash
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
SRC += eeprom_driver.c eeprom_wear_leveling.c
WEAR_LEVELING_DRIVER ?= rp2040_flash
else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
# Teensy EEPROM implementations
OPT_DEFS += -DEEPROM_TEENSY
SRC += eeprom_teensy.c
OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
SRC += eeprom_kinetis_flexram.c
else
# Fall back to transient, i.e. non-persistent
OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
COMMON_VPATH += $(DRIVER_PATH)/eeprom
SRC += eeprom_driver.c eeprom_transient.c
endif
else ifeq ($(PLATFORM),ARM_ATSAM)
# arm_atsam EEPROM
OPT_DEFS += -DEEPROM_SAMD
SRC += $(PLATFORM_COMMON_DIR)/eeprom_samd.c
SRC += eeprom_samd.c
else ifeq ($(PLATFORM),TEST)
# Test harness "EEPROM"
OPT_DEFS += -DEEPROM_TEST_HARNESS
SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
SRC += eeprom.c
endif
endif
endif
VALID_WEAR_LEVELING_DRIVER_TYPES := custom embedded_flash spi_flash rp2040_flash legacy
WEAR_LEVELING_DRIVER ?= none
ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
ifeq ($(filter $(WEAR_LEVELING_DRIVER),$(VALID_WEAR_LEVELING_DRIVER_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid WEAR_LEVELING_DRIVER,WEAR_LEVELING_DRIVER="$(WEAR_LEVELING_DRIVER)" is not a valid wear leveling driver)
else
FNV_ENABLE := yes
OPT_DEFS += -DWEAR_LEVELING_ENABLE
OPT_DEFS += -DWEAR_LEVELING_$(strip $(shell echo $(WEAR_LEVELING_DRIVER) | tr '[:lower:]' '[:upper:]'))
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling
COMMON_VPATH += $(DRIVER_PATH)/wear_leveling
COMMON_VPATH += $(QUANTUM_DIR)/wear_leveling
SRC += wear_leveling.c
ifeq ($(strip $(WEAR_LEVELING_DRIVER)), embedded_flash)
OPT_DEFS += -DHAL_USE_EFL
SRC += wear_leveling_efl.c
POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_efl_config.h
else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), spi_flash)
FLASH_DRIVER := spi
SRC += wear_leveling_flash_spi.c
POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_flash_spi_config.h
else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), rp2040_flash)
SRC += wear_leveling_rp2040_flash.c
POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
SRC += legacy_flash_ops.c wear_leveling_legacy.c
POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_legacy_config.h
endif
endif
endif
VALID_FLASH_DRIVER_TYPES := spi
FLASH_DRIVER ?= no
ifneq ($(strip $(FLASH_DRIVER)), no)
FLASH_DRIVER ?= none
ifneq ($(strip $(FLASH_DRIVER)), none)
ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),)
$(error FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid FLASH driver)
$(call CATASTROPHIC_ERROR,Invalid FLASH_DRIVER,FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid flash driver)
else
OPT_DEFS += -DFLASH_ENABLE
ifeq ($(strip $(FLASH_DRIVER)), spi)
ifeq ($(strip $(FLASH_DRIVER)),spi)
OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI
COMMON_VPATH += $(DRIVER_PATH)/flash
SRC += flash_spi.c
QUANTUM_LIB_SRC += spi_master.c
endif
endif
endif
@@ -275,7 +352,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
endif
LED_MATRIX_ENABLE ?= no
VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A custom
VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 custom
# TODO: IS31FL3733 IS31FL3737 IS31FL3741
ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
@@ -331,6 +408,13 @@ endif
QUANTUM_LIB_SRC += i2c_master.c
endif
ifeq ($(strip $(LED_MATRIX_DRIVER)), CKLED2001)
OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led
SRC += ckled2001-simple.c
QUANTUM_LIB_SRC += i2c_master.c
endif
endif
RGB_MATRIX_ENABLE ?= no
@@ -448,12 +532,6 @@ ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c
endif
ifeq ($(strip $(PRINTING_ENABLE)), yes)
OPT_DEFS += -DPRINTING_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c
QUANTUM_LIB_SRC += uart.c
endif
VARIABLE_TRACE ?= no
ifneq ($(strip $(VARIABLE_TRACE)),no)
SRC += $(QUANTUM_DIR)/variable_trace.c
@@ -473,11 +551,7 @@ endif
VALID_BACKLIGHT_TYPES := pwm timer software custom
BACKLIGHT_ENABLE ?= no
ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
BACKLIGHT_DRIVER ?= software
else
BACKLIGHT_DRIVER ?= pwm
endif
BACKLIGHT_DRIVER ?= pwm
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid BACKLIGHT_DRIVER,BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
@@ -500,7 +574,7 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
endif
endif
VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c
VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c vendor
WS2812_DRIVER ?= bitbang
ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
@@ -542,16 +616,11 @@ ifeq ($(strip $(LED_TABLES)), yes)
SRC += $(QUANTUM_DIR)/led_tables.c
endif
ifeq ($(strip $(TERMINAL_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c
OPT_DEFS += -DTERMINAL_ENABLE
OPT_DEFS += -DUSER_PRINT
endif
ifeq ($(strip $(VIA_ENABLE)), yes)
DYNAMIC_KEYMAP_ENABLE := yes
RAW_ENABLE := yes
BOOTMAGIC_ENABLE := yes
TRI_LAYER_ENABLE := yes
SRC += $(QUANTUM_DIR)/via.c
OPT_DEFS += -DVIA_ENABLE
endif
@@ -595,6 +664,14 @@ ifneq ($(strip $(DEBOUNCE_TYPE)), custom)
QUANTUM_SRC += $(QUANTUM_DIR)/debounce/$(strip $(DEBOUNCE_TYPE)).c
endif
VALID_SERIAL_DRIVER_TYPES := bitbang usart vendor
SERIAL_DRIVER ?= bitbang
ifeq ($(filter $(SERIAL_DRIVER),$(VALID_SERIAL_DRIVER_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid SERIAL_DRIVER,SERIAL_DRIVER="$(SERIAL_DRIVER)" is not a valid SERIAL driver)
endif
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
POST_CONFIG_H += $(QUANTUM_DIR)/split_common/post_config.h
OPT_DEFS += -DSPLIT_KEYBOARD
@@ -619,11 +696,11 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
endif
endif
SERIAL_DRIVER ?= bitbang
OPT_DEFS += -DSERIAL_DRIVER_$(strip $(shell echo $(SERIAL_DRIVER) | tr '[:lower:]' '[:upper:]'))
ifeq ($(strip $(SERIAL_DRIVER)), bitbang)
QUANTUM_LIB_SRC += serial.c
else
QUANTUM_LIB_SRC += serial_protocol.c
QUANTUM_LIB_SRC += serial_$(strip $(SERIAL_DRIVER)).c
endif
endif
@@ -635,6 +712,12 @@ ifeq ($(strip $(CRC_ENABLE)), yes)
SRC += crc.c
endif
ifeq ($(strip $(FNV_ENABLE)), yes)
OPT_DEFS += -DFNV_ENABLE
VPATH += $(LIB_PATH)/fnv
SRC += qmk_fnv_type_validation.c hash_32a.c hash_64a.c
endif
ifeq ($(strip $(HAPTIC_ENABLE)),yes)
COMMON_VPATH += $(DRIVER_PATH)/haptic
@@ -701,8 +784,10 @@ endif
ifeq ($(strip $(UNICODE_COMMON)), yes)
OPT_DEFS += -DUNICODE_COMMON_ENABLE
COMMON_VPATH += $(QUANTUM_DIR)/unicode
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c \
$(QUANTUM_DIR)/utf8.c
$(QUANTUM_DIR)/unicode/unicode.c \
$(QUANTUM_DIR)/unicode/utf8.c
endif
MAGIC_ENABLE ?= yes
@@ -711,6 +796,13 @@ ifeq ($(strip $(MAGIC_ENABLE)), yes)
OPT_DEFS += -DMAGIC_KEYCODE_ENABLE
endif
SEND_STRING_ENABLE ?= yes
ifeq ($(strip $(SEND_STRING_ENABLE)), yes)
OPT_DEFS += -DSEND_STRING_ENABLE
COMMON_VPATH += $(QUANTUM_DIR)/send_string
SRC += $(QUANTUM_DIR)/send_string/send_string.c
endif
ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_auto_shift.c
OPT_DEFS += -DAUTO_SHIFT_ENABLE
@@ -726,31 +818,25 @@ ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
OPT_DEFS += -DMOUSE_ENABLE
endif
ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
PS2_ENABLE := yes
SRC += ps2_busywait.c
SRC += ps2_io.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif
ifeq ($(strip $(PS2_USE_INT)), yes)
PS2_ENABLE := yes
SRC += ps2_interrupt.c
SRC += ps2_io.c
OPT_DEFS += -DPS2_USE_INT
endif
ifeq ($(strip $(PS2_USE_USART)), yes)
PS2_ENABLE := yes
SRC += ps2_usart.c
SRC += ps2_io.c
OPT_DEFS += -DPS2_USE_USART
endif
VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
PS2_DRIVER ?= busywait
ifeq ($(strip $(PS2_ENABLE)), yes)
ifeq ($(filter $(PS2_DRIVER),$(VALID_PS2_DRIVER_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid PS2_DRIVER,PS2_DRIVER="$(PS2_DRIVER)" is not a valid PS/2 driver)
endif
OPT_DEFS += -DPS2_DRIVER_$(strip $(shell echo $(PS2_DRIVER) | tr '[:lower:]' '[:upper:]'))
COMMON_VPATH += $(DRIVER_PATH)/ps2
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/ps2
OPT_DEFS += -DPS2_ENABLE
ifneq ($(strip $(PS2_DRIVER)), vendor)
SRC += ps2_io.c
endif
SRC += ps2_$(strip $(PS2_DRIVER)).c
endif
JOYSTICK_ENABLE ?= no
@@ -806,18 +892,34 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
OPT_DEFS += -DBLUETOOTH_ENABLE
NO_USB_STARTUP_CHECK := yes
COMMON_VPATH += $(DRIVER_PATH)/bluetooth
SRC += outputselect.c
SRC += outputselect.c bluetooth.c
ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE
SRC += analog.c
OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
QUANTUM_LIB_SRC += analog.c
QUANTUM_LIB_SRC += spi_master.c
endif
ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
OPT_DEFS += -DBLUETOOTH_RN42
OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE
SRC += $(DRIVER_PATH)/bluetooth/rn42.c
QUANTUM_LIB_SRC += uart.c
endif
endif
ifeq ($(strip $(ENCODER_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/encoder.c
OPT_DEFS += -DENCODER_ENABLE
ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
OPT_DEFS += -DENCODER_MAP_ENABLE
endif
endif
ifeq ($(strip $(OS_DETECTION_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/os_detection.c
OPT_DEFS += -DOS_DETECTION_ENABLE
ifeq ($(strip $(OS_DETECTION_DEBUG_ENABLE)), yes)
OPT_DEFS += -DOS_DETECTION_DEBUG_ENABLE
endif
endif

View File

@@ -1,21 +1,7 @@
# Hey Emacs, this is a -*- makefile -*-
#----------------------------------------------------------------------------
# WinAVR Makefile Template written by Eric B. Weddington, Jg Wunsch, et al.
#
# Released to the Public Domain
#
# Additional material for this makefile was written by:
# Peter Fleury
# Tim Henigan
# Colin O'Flynn
# Reiner Patommel
# Markus Pfaff
# Sander Pool
# Frederik Rouleau
# Carlos Lamas
#
# Enable vpath seraching for source files only
# Enable vpath searching for source files only
# Without this, output files, could be read from the wrong .build directories
VPATH_SRC := $(VPATH)
vpath %.c $(VPATH_SRC)
@@ -38,36 +24,15 @@ NO_LTO_OBJ := $(filter %.a,$(OBJ))
MASTER_OUTPUT := $(firstword $(OUTPUTS))
# Output format. (can be srec, ihex, binary)
FORMAT = ihex
# Optimization level, can be [0, 1, 2, 3, s].
# 0 = turn off optimization. s = optimize for size.
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
OPT ?= s
# Compiler flag to set the C Standard level.
# c89 = "ANSI" C
# gnu89 = c89 plus GCC extensions
# c99 = ISO C99 standard (not yet fully implemented)
# gnu99 = c99 plus GCC extensions
CSTANDARD = -std=gnu99
# Place -D or -U options here for C sources
#CDEFS +=
# Place -D or -U options here for ASM sources
#ADEFS +=
# Place -D or -U options here for C++ sources
#CXXDEFS += -D__STDC_LIMIT_MACROS
#CXXDEFS += -D__STDC_CONSTANT_MACROS
#CXXDEFS +=
# Compiler flag to set the C and C++ language standard level
CSTANDARD = -std=gnu11
CXXSTANDARD = -std=gnu++14
# Speed up recompilations by opt-in usage of ccache
USE_CCACHE ?= no
@@ -75,12 +40,8 @@ ifneq ($(USE_CCACHE),no)
CC_PREFIX ?= ccache
endif
#---------------- Compiler Options C ----------------
# -g*: generate debugging information
# -O*: optimization level
# -f...: tuning, see GCC manual and avr-libc documentation
# -Wall...: warning level
# -Wa,...: tell GCC to pass this to the assembler.
#---------------- C Compiler Options ----------------
ifeq ($(strip $(LTO_ENABLE)), yes)
ifeq ($(PLATFORM),ARM_ATSAM)
$(info Enabling LTO on arm_atsam-targeting boards is known to have a high likelihood of failure.)
@@ -111,29 +72,20 @@ CFLAGS += -Wstrict-prototypes
ifneq ($(strip $(ALLOW_WARNINGS)), yes)
CFLAGS += -Werror
endif
#CFLAGS += -mshort-calls
#CFLAGS += -fno-unit-at-a-time
#CFLAGS += -Wundef
#CFLAGS += -Wunreachable-code
#CFLAGS += -Wsign-compare
CFLAGS += $(CSTANDARD)
# This fixes lots of keyboards linking errors but SHOULDN'T BE A FINAL SOLUTION
# Fixing of multiple variable definitions must be made.
CFLAGS += -fcommon
#---------------- Compiler Options C++ ----------------
# -g*: generate debugging information
# -O*: optimization level
# -f...: tuning, see GCC manual and avr-libc documentation
# -Wall...: warning level
# -Wa,...: tell GCC to pass this to the assembler.
#---------------- C++ Compiler Options ----------------
ifeq ($(strip $(DEBUG_ENABLE)),yes)
CXXFLAGS += -g$(DEBUG)
endif
CXXFLAGS += $(CXXDEFS)
CXXFLAGS += -O$(OPT)
# to supress "warning: only initialized variables can be placed into program memory area"
# to suppress "warning: only initialized variables can be placed into program memory area"
CXXFLAGS += -w
CXXFLAGS += -Wall
CXXFLAGS += -Wundef
@@ -141,57 +93,17 @@ CXXFLAGS += -Wundef
ifneq ($(strip $(ALLOW_WARNINGS)), yes)
CXXFLAGS += -Werror
endif
#CXXFLAGS += -mshort-calls
#CXXFLAGS += -fno-unit-at-a-time
#CXXFLAGS += -Wstrict-prototypes
#CXXFLAGS += -Wunreachable-code
#CXXFLAGS += -Wsign-compare
#CXXFLAGS += $(CSTANDARD)
#---------------- Assembler Options ----------------
ASFLAGS += $(ADEFS)
ifeq ($(VERBOSE_AS_CMD),yes)
ASFLAGS += -v
endif
#---------------- Library Options ----------------
# Minimalistic printf version
PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
# Floating point printf version (requires MATH_LIB = -lm below)
PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
# If this is left blank, then it will use the Standard printf version.
PRINTF_LIB =
#PRINTF_LIB = $(PRINTF_LIB_MIN)
#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
# Minimalistic scanf version
SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
# If this is left blank, then it will use the Standard scanf version.
SCANF_LIB =
#SCANF_LIB = $(SCANF_LIB_MIN)
#SCANF_LIB = $(SCANF_LIB_FLOAT)
MATH_LIB = -lm
CREATE_MAP ?= yes
#---------------- Linker Options ----------------
# -Wl,...: tell GCC to pass this to linker.
# -Map: create map file
# --cref: add cross reference to map file
#
# Comennt out "--relax" option to avoid a error such:
# (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'
#
CREATE_MAP ?= yes
ifeq ($(CREATE_MAP),yes)
LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
endif
@@ -201,20 +113,11 @@ endif
#LDFLAGS += -Wl,--relax
LDFLAGS += $(EXTMEMOPTS)
LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
#LDFLAGS += -T linker_script.x
LDFLAGS += -lm
# You can give EXTRALDFLAGS at 'make' command line.
LDFLAGS += $(EXTRALDFLAGS)
#---------------- Assembler Listings ----------------
# -Wa,...: tell GCC to pass this to the assembler.
# -adhlns: create listing
# -gstabs: have the assembler create line number information; note that
# for use in COFF files, additional information about filenames
# and function names needs to be present in the assembler source
# files -- see avr-libc docs [FIXME: not yet described there]
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
# dump that will be displayed for a given single line of source input.
ADHLNS_ENABLE ?= no
ifeq ($(ADHLNS_ENABLE),yes)
@@ -315,8 +218,8 @@ gccversion :
@$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD)
@$(BUILD_CMD)
%.uf2: %.hex
$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex --output $(BUILD_DIR)/$(TARGET).uf2 --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
%.uf2: %.elf
$(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
@$(BUILD_CMD)
@@ -429,6 +332,7 @@ $1/asflags.txt: $1/force
echo '$$($1_ASFLAGS)' | cmp -s - $$@ || echo '$$($1_ASFLAGS)' > $$@
$1/compiler.txt: $1/force
test -f $$@ || touch $$@
$$(CC) --version | cmp -s - $$@ || $$(CC) --version > $$@
endef
@@ -468,6 +372,7 @@ show_path:
dump_vars: ERROR_IF_EMPTY=""
dump_vars: ERROR_IF_NONBOOL=""
dump_vars: ERROR_IF_UNSET=""
dump_vars: CATASTROPHIC_ERROR=""
dump_vars:
@$(foreach V,$(sort $(.VARIABLES)),$(if $(filter-out environment% default automatic,$(origin $V)),$(info $V=$($V))))

View File

@@ -1,37 +1,36 @@
# Note for new boards -- CTPC and CONVERT_TO_PROTON_C are deprecated terms
# and should not be replicated for new boards. These will be removed from
# documentation as well as existing keymaps in due course.
ifeq ($(strip $(CTPC)), yes)
CONVERT_TO_PROTON_C=yes
endif
ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
CONVERT_TO=proton_c
cpfirmware: ctpc_warning
.INTERMEDIATE: ctpc_warning
ctpc_warning: elf
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
$(info The `CONVERT_TO_PROTON_C` and `CTPC` options are soon to be deprecated.)
$(info Boards should be changed to use `CONVERT_TO=proton_c` instead.)
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
$(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
endif
# TODO: opt in rather than assume everything uses a pro micro
PIN_COMPATIBLE ?= promicro
ifneq ($(CONVERT_TO),)
# stash so we can overwrite env provided vars if needed
ACTIVE_CONVERTER=$(CONVERT_TO)
# glob to search each platfrorm and/or check for valid converter
CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/)
ifeq ($(CONVERTER),)
$(call CATASTROPHIC_ERROR,Converting from '$(PIN_COMPATIBLE)' to '$(CONVERT_TO)' not possible!)
endif
-include $(CONVERTER)/pre_converter.mk
PLATFORM_KEY = $(shell echo $(CONVERTER) | cut -d "/" -f2)
TARGET := $(TARGET)_$(CONVERT_TO)
# Configure any defaults
OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
OPT_DEFS += -DCONVERTER_ENABLED
VPATH += $(CONVERTER)
# Configure for "alias" - worst case it produces an idential define
OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]'))
# Finally run any converter specific logic
include $(CONVERTER)/converter.mk
endif

View File

@@ -14,7 +14,6 @@ FEATURE_NAMES += LCD_BACKLIGHT
FEATURE_NAMES += LCD
FEATURE_NAMES += OLED
FEATURE_NAMES += POINTING_DEVICE
FEATURE_NAMES += PRINTING
FEATURE_NAMES += PS2_MOUSE
FEATURE_NAMES += RGBLIGHT
FEATURE_NAMES += RGB_MATRIX

View File

@@ -17,6 +17,7 @@ SPACE_CADET_ENABLE ?= yes
GRAVE_ESC_ENABLE ?= yes
GENERIC_FEATURES = \
AUTOCORRECT \
CAPS_WORD \
COMBO \
COMMAND \
@@ -25,8 +26,6 @@ GENERIC_FEATURES = \
DIP_SWITCH \
DYNAMIC_KEYMAP \
DYNAMIC_MACRO \
ENCODER \
ENCODER_MAP \
GRAVE_ESC \
HAPTIC \
KEY_LOCK \
@@ -40,6 +39,7 @@ GENERIC_FEATURES = \
VELOCIKEY \
WPM \
DYNAMIC_TAPPING_TERM \
TRI_LAYER
define HANDLE_GENERIC_FEATURE
# $$(info "Processing: $1_ENABLE $2.c")

View File

@@ -1,848 +0,0 @@
MCU_ORIG := $(MCU)
ifneq ($(findstring MKL26Z64, $(MCU)),)
# Cortex version
MCU = cortex-m0plus
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = KINETIS
MCU_SERIES = KL2x
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= MKL26Z64
# Startup code to use
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= kl2x
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= PJRC_TEENSY_LC
endif
ifneq ($(findstring MK20DX128, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = KINETIS
MCU_SERIES = K20x
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= MK20DX128
# Startup code to use
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= k20x5
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= PJRC_TEENSY_3
endif
ifneq ($(findstring MK20DX256, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = KINETIS
MCU_SERIES = K20x
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= MK20DX256
# Startup code to use
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= k20x7
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= PJRC_TEENSY_3_1
endif
ifneq ($(findstring MK66FX1M0, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = KINETIS
MCU_SERIES = MK66F18
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= MK66FX1M0
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= MK66F18
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= PJRC_TEENSY_3_6
endif
ifneq ($(findstring STM32F042, $(MCU)),)
# Cortex version
MCU = cortex-m0
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F0xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F042x6
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f0xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F042X6
USE_FPU ?= no
# UF2 settings
UF2_FAMILY ?= STM32F0
# Stack sizes: Since this chip has limited RAM capacity, the stack area needs to be reduced.
# This ensures that the EEPROM page buffer fits into RAM
USE_PROCESS_STACKSIZE = 0x600
USE_EXCEPTIONS_STACKSIZE = 0x300
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFFC400
endif
ifneq ($(findstring STM32F072, $(MCU)),)
# Cortex version
MCU = cortex-m0
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F0xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F072xB
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f0xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F072XB
USE_FPU ?= no
# UF2 settings
UF2_FAMILY ?= STM32F0
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFFC800
endif
ifneq ($(findstring STM32F103, $(MCU)),)
# Cortex version
MCU = cortex-m3
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F1xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F103x8
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f1xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F103
USE_FPU ?= no
# UF2 settings
UF2_FAMILY ?= STM32F1
endif
ifneq ($(findstring STM32F303, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F3xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F303xC
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f3xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F303XC
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32F3
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFFD800
endif
ifneq ($(findstring STM32F401, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
FIRMWARE_FORMAT ?= uf2
else
MCU_LDSCRIPT ?= STM32F401xC
endif
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= BLACKPILL_STM32_F401
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32F4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring STM32F405, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F405xG
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F405XG
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32F4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring STM32F407, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F407xE
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F407XE
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32F4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring STM32F411, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
FIRMWARE_FORMAT ?= uf2
else
MCU_LDSCRIPT ?= STM32F411xE
endif
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= BLACKPILL_STM32_F411
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32F4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring STM32F446, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F446xE
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32f4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_F446XE
USE_FPU ?= yes
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring STM32G431, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32G4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32G431xB
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32g4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_G431XB
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32G4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring STM32G474, $(MCU)),)
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32G4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32G474xE
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32g4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_G474XE
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32G4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq (,$(filter $(MCU),STM32L432 STM32L442))
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32L4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32L432xC
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32l4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_L432XC
PLATFORM_NAME ?= platform_l432
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32L4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq (,$(filter $(MCU),STM32L433 STM32L443))
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32L4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32L432xC
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32l4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_L433XC
PLATFORM_NAME ?= platform_l432
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32L4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq (,$(filter $(MCU),STM32L412 STM32L422))
# Cortex version
MCU = cortex-m4
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32L4xx
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32L412xB
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= stm32l4xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_STM32_L412XB
PLATFORM_NAME ?= platform_l412_l422
USE_FPU ?= yes
# UF2 settings
UF2_FAMILY ?= STM32L4
# Bootloader address for STM32 DFU
STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
endif
ifneq ($(findstring WB32F3G71, $(MCU)),)
# Cortex version
MCU = cortex-m3
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = WB32
MCU_SERIES = WB32F3G71xx
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= WB32F3G71x9
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= wb32f3g71xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_WB32_F3G71XX
USE_FPU ?= no
# Bootloader address for WB32 DFU
WB32_BOOTLOADER_ADDRESS ?= 0x1FFFE000
endif
ifneq ($(findstring WB32FQ95, $(MCU)),)
# Cortex version
MCU = cortex-m3
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 7
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = WB32
MCU_SERIES = WB32FQ95xx
# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= WB32FQ95xB
# Startup code to use
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
MCU_STARTUP ?= wb32fq95xx
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= GENERIC_WB32_FQ95XX
USE_FPU ?= no
# Bootloader address for WB32 DFU
WB32_BOOTLOADER_ADDRESS ?= 0x1FFFE000
endif
ifneq ($(findstring GD32VF103, $(MCU)),)
# RISC-V
MCU = risc-v
# RISC-V extensions and abi configuration
MCU_ARCH = rv32imac
MCU_ABI = ilp32
MCU_CMODEL = medlow
## chip/board settings
# - the next two should match the directories in
# <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
# OR
# <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_PORT_NAME = GD
MCU_FAMILY = GD32V
MCU_SERIES = GD32VF103
# Linker script to use
# - it should exist either in <chibios>/os/common/startup/RISCV-ECLIC/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= GD32VF103xB
# Startup code to use
# - it should exist in <chibios>/os/common/startup/RISCV-ECLIC/compilers/GCC/mk/
MCU_STARTUP ?= gd32vf103
# Board: it should exist either in <chibios>/os/hal/boards/,
# <keyboard_dir>/boards/, or drivers/boards/
BOARD ?= SIPEED_LONGAN_NANO
USE_FPU ?= no
endif
ifneq (,$(filter $(MCU),at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647 at90usb1286 at90usb1287))
PROTOCOL = LUFA
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
# processor frequency in Hz. You can then use this symbol in your source code to
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
# automatically to create a 32-bit value in your source code.
#
# This will be an integer division of F_USB below, as it is sourced by
# F_USB after it has run through any CPU prescalers. Note that this value
# does not *change* the processor frequency - it should merely be updated to
# reflect the processor speed set externally so that the code can use accurate
# software delays.
F_CPU ?= 16000000
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB ?= $(F_CPU)
# Interrupt driven control endpoint task
ifeq (,$(filter $(NO_INTERRUPT_CONTROL_ENDPOINT),yes))
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
endif
ifneq (,$(filter $(MCU),at90usb162 atmega16u2 atmega32u2))
NO_I2C = yes
endif
endif
ifneq (,$(filter $(MCU),atmega32a))
# MCU name for avrdude
AVRDUDE_MCU = m32
PROTOCOL = VUSB
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
# processor frequency in Hz. You can then use this symbol in your source code to
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
# automatically to create a 32-bit value in your source code.
F_CPU ?= 12000000
endif
ifneq (,$(filter $(MCU),atmega328p))
# MCU name for avrdude
AVRDUDE_MCU = m328p
PROTOCOL = VUSB
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
# processor frequency in Hz. You can then use this symbol in your source code to
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
# automatically to create a 32-bit value in your source code.
F_CPU ?= 16000000
endif
ifneq (,$(filter $(MCU),atmega328))
# MCU name for avrdude
AVRDUDE_MCU = m328
PROTOCOL = VUSB
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
# processor frequency in Hz. You can then use this symbol in your source code to
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
# automatically to create a 32-bit value in your source code.
F_CPU ?= 16000000
endif
ifneq (,$(filter $(MCU),attiny85))
PROTOCOL = VUSB
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
# processor frequency in Hz. You can then use this symbol in your source code to
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
# automatically to create a 32-bit value in your source code.
F_CPU ?= 16500000
endif

View File

@@ -64,9 +64,10 @@ MSG_ASSEMBLING = Assembling:
MSG_CLEANING = Cleaning project:
MSG_CREATING_LIBRARY = Creating library:
MSG_GENERATING = Generating:
MSG_NOT_REPO = $(WARN_COLOR)WARNING:$(NO_COLOR) Target folder is not a git repo, you probably downloaded a zip file instead of cloning.\n\
Please consider following $(BOLD)https://docs.qmk.fm/\#/newbs_getting_started$(NO_COLOR).\n\n
MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\
Please consider running $(BOLD)make git-submodule$(NO_COLOR).\n\n
MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR)
Please consider running $(BOLD)qmk git-submodule$(NO_COLOR).\n\n
define GENERATE_MSG_MAKE_KB
MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR)
@@ -106,4 +107,4 @@ MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying a
define CATASTROPHIC_ERROR
$(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2)
$(error $1)
endef
endef

View File

@@ -5,7 +5,6 @@ BUILD_OPTION_NAMES = \
CONSOLE_ENABLE \
COMMAND_ENABLE \
NKRO_ENABLE \
TERMINAL_ENABLE \
CUSTOM_MATRIX \
DEBOUNCE_TYPE \
SPLIT_KEYBOARD \
@@ -44,8 +43,8 @@ OTHER_OPTION_NAMES = \
KEY_LOCK_ENABLE \
KEY_OVERRIDE_ENABLE \
LEADER_ENABLE \
PRINTING_ENABLE \
STENO_ENABLE \
STENO_PROTOCOL \
TAP_DANCE_ENABLE \
VIRTSER_ENABLE \
OLED_ENABLE \
@@ -66,7 +65,9 @@ OTHER_OPTION_NAMES = \
KEYLOGGER_ENABLE \
LCD_BACKLIGHT_ENABLE \
MACROS_ENABLED \
PS2_ENABLE \
PS2_MOUSE_ENABLE \
PS2_DRIVER \
RAW_ENABLE \
SWAP_HANDS_ENABLE \
RING_BUFFERED_6KRO_REPORT_ENABLE \
@@ -82,7 +83,9 @@ OTHER_OPTION_NAMES = \
LTO_ENABLE \
PROGRAMMABLE_BUTTON_ENABLE \
SECURE_ENABLE \
CAPS_WORD_ENABLE
CAPS_WORD_ENABLE \
AUTOCORRECT_ENABLE \
TRI_LAYER_ENABLE
define NAME_ECHO
@printf " %-30s = %-16s # %s\\n" "$1" "$($1)" "$(origin $1)"

View File

@@ -3,7 +3,9 @@ FULL_TESTS := $(notdir $(TEST_LIST))
include $(QUANTUM_PATH)/debounce/tests/testlist.mk
include $(QUANTUM_PATH)/encoder/tests/testlist.mk
include $(QUANTUM_PATH)/os_detection/tests/testlist.mk
include $(QUANTUM_PATH)/sequencer/tests/testlist.mk
include $(QUANTUM_PATH)/wear_leveling/tests/testlist.mk
include $(PLATFORM_PATH)/test/testlist.mk
define VALIDATE_TEST_LIST

41
chibios_mcu.json Normal file
View File

@@ -0,0 +1,41 @@
{
"MKL26Z64" : {
"MCU" : "cortex-m0plus",
"ARMV": 6,
"MCU_FAMILY": "KINETIS",
"MCU_SERIES": "KL2x",
"MCU_LDSCRIPT": "MKL26Z64",
"MCU_STARTUP": "kl2x",
"BOARD": "PJRC_TEENSY_LC"
},
"MK20DX128" : {
"MCU" : "cortex-m4",
"ARMV": 7,
"MCU_FAMILY": "KINETIS",
"MCU_SERIES": "K20x",
"MCU_LDSCRIPT": "MK20DX128",
"MCU_STARTUP": "k20x5",
"BOARD": "PJRC_TEENSY_3"
},
"MK20DX256" : {
"MCU" : "cortex-m4",
"ARMV": 7,
"MCU_FAMILY": "KINETIS",
"MCU_SERIES": "K20x",
"MCU_LDSCRIPT": "MK20DX256",
"MCU_STARTUP": "k20x7",
"BOARD": "PJRC_TEENSY_3_1"
},
"STM32F303" : {
"MCU" : "cortex-m4",
"ARMV": 7,
"MCU_FAMILY": "STM32",
"MCU_SERIES": "STM32F3xx",
"MCU_LDSCRIPT": "STM32F303xC",
"MCU_STARTUP": "stm32f3xx",
"BOARD": "GENERIC_STM32_F303XC",
"USE_FPU": true,
"UF2_FAMILY": "STM32F3",
"STM32_BOOTLOADER_ADDRESS": "0x1FFFD800"
}
}

83
cmake/AddKeyboard.cmake Normal file
View File

@@ -0,0 +1,83 @@
include(ResolveKeyboard)
include(ValidateJson)
include(ResolveToolchain)
macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)
# not entirely sure why this is necessary
# set(TEMP_PATH ${KEYBOARD_FOLDER})
# cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
# if(${IS_KEYBOARD_FOLDER_RELATIVE})
# set(KEYBOARD_FOLDER_ABS ${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD_FOLDER})
# if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
# # message(FATAL_ERROR "Keyboard does not exist in QMK - try using an absolute path to the keyboard folder")
# resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
# endif()
# else()
# set(KEYBOARD_FOLDER_ABS ${KEYBOARD_FOLDER})
# if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
# message(FATAL_ERROR "Absolute path to keyboard does not exist")
# endif()
# endif()
resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
set(TEMP_PATH ${KEYBOARD_FOLDER})
cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
set(TEMP_PATH ${KEYMAP_FOLDER})
cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
if(${IS_KEYMAP_FOLDER_RELATIVE})
set(KEYMAP_NAME ${KEYMAP_FOLDER})
else()
if(WIN32)
set(KEYMAP_NAME $ENV{USERNAME})
else()
set(KEYMAP_NAME $ENV{USE})
endif()
endif()
# find the right toolchain
# not sure we need to validate here
validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
string(JSON PROCESSOR GET ${JSON_STRING} processor)
resolve_toolchain(${PROCESSOR} TOOLCHAIN)
string(JSON KEYBOARD_NAME GET ${JSON_STRING} keyboard_name)
if(${IS_KEYBOARD_FOLDER_RELATIVE})
string(MAKE_C_IDENTIFIER ${KEYBOARD_FOLDER} KEYBOARD_SLUG)
else()
string(MAKE_C_IDENTIFIER ${KEYBOARD_NAME} KEYBOARD_SLUG)
endif()
string(JSON MANUFACTURER GET ${JSON_STRING} manufacturer)
set(TARGET_NAME "${KEYBOARD_SLUG}_${KEYMAP_NAME}")
ExternalProject_Add(${TARGET_NAME}
SOURCE_DIR ${CMAKE_SOURCE_DIR}
# PREFIX ${CMAKE_SOURCE_DIR}/build/keyboards/${KEYBOARD_FOLDER}
TMP_DIR ${CMAKE_SOURCE_DIR}/build/tmp
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/build/download
BINARY_DIR ${CMAKE_SOURCE_DIR}/build/keyboards/${TARGET_NAME}
STAMP_DIR ${CMAKE_SOURCE_DIR}/build/stamp
LOG_DIR ${CMAKE_SOURCE_DIR}/build/log
INSTALL_DIR ${CMAKE_SOURCE_DIR}/build/install
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/${TARGET_NAME}${QMK_EXTENSION} ${CMAKE_SOURCE_DIR}/${TARGET_NAME}${QMK_EXTENSION}
# this seems to work well for all systems so far - not sure if it'd be useful to customize
CMAKE_GENERATOR "Unix Makefiles"
CMAKE_ARGS
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/toolchains/${TOOLCHAIN}.cmake
-DQMK_KEYBOARD=${KEYBOARD_SLUG}
-DQMK_KEYBOARD_FOLDER=${KEYBOARD_FOLDER}
-DQMK_KEYMAP_FOLDER=${KEYMAP_FOLDER}
-DTARGET_NAME=${TARGET_NAME}
)
ExternalProject_Add_Step(${TARGET_NAME} copy_compile_commands
DEPENDEES configure
DEPENDERS build
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/keyboards/${TARGET_NAME}/compile_commands.json ${CMAKE_SOURCE_DIR}/compile_commands.json
# BYPRODUCTS ${CMAKE_SOURCE_DIR}/compile_commands.json
ALWAYS TRUE
)
# file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${KEYMAP_FOLDER}|${KEYBOARD_FOLDER}|Made by: ${MANUFACTURER}\n")
endmacro(add_keyboard)

View File

@@ -0,0 +1,44 @@
cmake_minimum_required(VERSION 3.20)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(ResolveKeyboard)
include(ValidateJSON)
resolve_keyboard(${QMK_KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
if(NOT DEFINED QMK_KEYMAP_FOLDER)
set(QMK_KEYMAP_FOLDER default)
endif()
set(TEMP_PATH ${QMK_KEYBOARD_FOLDER})
cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
set(TEMP_PATH ${QMK_KEYMAP_FOLDER})
cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
if(${IS_KEYMAP_FOLDER_RELATIVE})
set(KEYMAP_NAME ${QMK_KEYMAP_FOLDER})
else()
if(WIN32)
set(KEYMAP_NAME $ENV{USERNAME})
else()
set(KEYMAP_NAME $ENV{USE})
endif()
endif()
string(JSON KEYBOARD_NAME GET ${JSON_STRING} keyboard_name)
if(${IS_KEYBOARD_FOLDER_RELATIVE})
string(MAKE_C_IDENTIFIER ${QMK_KEYBOARD_FOLDER} KEYBOARD_SLUG)
else()
string(MAKE_C_IDENTIFIER ${KEYBOARD_NAME} KEYBOARD_SLUG)
endif()
string(JSON MANUFACTURER GET ${JSON_STRING} manufacturer)
set(TARGET_NAME "${KEYBOARD_SLUG}_${KEYMAP_NAME}")
file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${QMK_KEYMAP_FOLDER}|${QMK_KEYBOARD_FOLDER}:${QMK_KEYMAP_FOLDER}|Made by: ${MANUFACTURER}\n")
message(STATUS "Added keyboard '${QMK_KEYBOARD_FOLDER}' with keymap '${QMK_KEYMAP_FOLDER}'")

View File

@@ -0,0 +1,14 @@
macro(find_arm_toolchain)
find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
if(NOT TOOLCHAIN_ROOT)
include(GetARMToolchain)
find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
endif()
if(NOT TOOLCHAIN_ROOT)
message(FATAL_ERROR "ARM Toolchain could not be found")
endif()
message(STATUS "ARM toolchain found: ${TOOLCHAIN_ROOT}")
endmacro()

View File

@@ -0,0 +1,20 @@
macro(find_avr_toolchain)
find_toolchain(avr TOOLCHAIN_ROOT)
if(NOT TOOLCHAIN_ROOT)
include(GetAVRToolchain)
find_toolchain(avr TOOLCHAIN_ROOT)
endif()
find_program(DFU_PROGRAMMER NAMES dfu-programmer PATHS ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/)
if(${DFU_PROGRAMMER} STREQUAL "DFU_PROGRAMMER-NOTFOUND")
include(GetDfuProgrammer)
find_program(DFU_PROGRAMMER NAMES dfu-programmer PATHS ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/)
endif()
if(NOT TOOLCHAIN_ROOT)
message(FATAL_ERROR "AVR Toolchain could not be found")
endif()
message(STATUS "AVR toolchain found: ${TOOLCHAIN_ROOT}")
endmacro()

282
cmake/Findchibios.cmake Normal file
View File

@@ -0,0 +1,282 @@
include(ParseMakefile)
# STM32F303
set(MCU "cortex-m4")
set(ARMV 7)
set(MCU_FAMILY "STM32")
set(MCU_SERIES "STM32F3xx")
string(TOUPPER ${MCU_SERIES} MCU_SERIES_UPPER)
set(MCU_LDSCRIPT "STM32F303xC")
set(MCU_STARTUP "stm32f3xx")
set(BOARD "GENERIC_STM32_F303XC")
set(USE_FPU TRUE)
set(UF2_FAMILY "STM32F3")
set(STM32_BOOTLOADER_ADDRESS 0x1FFFD800)
set(EEPROM_DRIVER "wear_leveling" FORCE)
set(WEAR_LEVELING_DRIVER "embedded_flash" FORCE)
target_compile_definitions(qmk PUBLIC
QMK_MCU_FAMILY_${MCU_FAMILY}
QMK_MCU_SERIES_${MCU_SERIES_UPPER}
)
target_compile_options(qmk PUBLIC
-march=armv7-m
)
target_compile_definitions(qmk PUBLIC
MCU_${MCU_FAMILY}
__ARM_ARCH_7M__
)
# platforms/chibios/platform.mk
if(NOT DEFINED USE_PROCESS_STACKSIZE)
set(USE_PROCESS_STACKSIZE 0x800)
endif()
if(NOT DEFINED USE_EXCEPTIONS_STACKSIZE)
set(USE_EXCEPTIONS_STACKSIZE 0x400)
endif()
target_link_options(qmk PUBLIC
-Wl,--defsym=__process_stack_size__=${USE_PROCESS_STACKSIZE},--defsym=__main_stack_size__=${USE_EXCEPTIONS_STACKSIZE}
)
if(NOT DEFINED MCU_PORT_NAME)
set(MCU_PORT_NAME ${MCU_FAMILY})
endif()
set(MCU_ARCH ${MCU})
if(NOT DEFINED CHIBIOS_PORT)
set(CHIBIOS_PORT "ARMv${ARMV}-M")
endif()
if(NOT DEFINED PLATFORM_NAME)
set(PLATFORM_NAME platform)
endif()
set(CHIBIOS ${CMAKE_SOURCE_DIR}/lib/chibios)
set(CHIBIOS_CONTRIB ${CMAKE_SOURCE_DIR}/lib/chibios-contrib)
# port*.mk
include(chibios/ports/${CHIBIOS_PORT})
# platform.mk
include(chibios/ports/${MCU_SERIES})
# startup_*.mk - might need to convert these
find_file(STARTUP_MK startup_${MCU_STARTUP}.mk
${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/mk
${CHIBIOS}/os/common/startup/ARMCMx/compilers/GCC/mk
${CHIBIOS_CONTRIB}/os/common/startup/ARMCMx/compilers/GCC/mk
)
get_filename_component(STARTUP_DIR ${STARTUP_MK} DIRECTORY)
ParseMakefile(${STARTUP_MK})
target_sources(qmk PUBLIC ${STARTUPSRC})
target_sources(qmk PUBLIC ${STARTUPASM})
target_include_directories(qmk PUBLIC ${STARTUPINC})
# board paths - we should just standardize these
find_path(BOARD_PATH
NAMES
boards/${BOARD}/board.mk
board/board.mk
PATHS
${QMK_KEYBOARD_FOLDER}/boards/${BOARD}
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}
${CHIBIOS}/os/hal/
${CHIBIOS_CONTRIB}/os/hal/
)
# if(EXISTS ${BOARD_PATH}/rules.mk)
# ParseMakefile(${BOARD_PATH}/rules.mk)
# endif()
if(EXISTS ${BOARD_PATH}/configs/config.h)
target_precompile_headers(qmk PUBLIC
${BOARD_PATH}/configs/config.h
)
endif()
if(EXISTS ${BOARD_PATH}/configs/post_config.h)
target_precompile_headers(qmk PUBLIC
${BOARD_PATH}/configs/post_config.h
)
endif()
find_file(BOARD_MK board.mk
${BOARD_PATH}/boards/${BOARD}
${BOARD_PATH}/board
)
ParseMakefile(${BOARD_MK})
target_sources(qmk PUBLIC ${BOARDSRC})
target_include_directories(qmk PUBLIC ${BOARDINC})
# allow board.c to be overriden
file(RELATIVE_PATH INIT_HOOK_RELATIVE ${CMAKE_BINARY_DIR}
"${CMAKE_SOURCE_DIR}/tmk_core/protocol/chibios/init_hooks.h")
set_source_files_properties(${BOARDSRC} TARGET_DIRECTORY qmk PROPERTIES
# COMPILE_OPTIONS "-include ../../../tmk_core/protocol/chibios/init_hooks.h"
COMPILE_OPTIONS "-include ${INIT_HOOK_RELATIVE}"
)
# bootloader
if(DEFINED STM32_BOOTLOADER_ADDRESS)
target_compile_definitions(qmk PUBLIC STM32_BOOTLOADER_ADDRESS=${STM32_BOOTLOADER_ADDRESS})
endif()
if(DEFINED WB32_BOOTLOADER_ADDRESS)
target_compile_definitions(qmk PUBLIC WB32_BOOTLOADER_ADDRESS=${WB32_BOOTLOADER_ADDRESS})
endif()
find_file(BOOTLOADER_DEFS_H bootloader_defs.h
${QMK_KEYBOARD_FOLDER}
${QMK_KEYBOARD_FOLDER}/boards/${BOARD}
${BOARD_PATH}/configs
)
if(EXISTS ${BOOTLOADER_DEFS_H})
target_compile_options(qmk PUBLIC -include ${BOOTLOADER_DEFS_H})
endif()
# chconf directories
find_path(CHCONFDIR chconf.h
${QMK_KEYBOARD_FOLDER}
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/configs
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/configs
)
target_include_directories(qmk PUBLIC ${CHCONFDIR})
# halconf directories
find_path(HALCONFDIR halconf.h
${QMK_KEYBOARD_FOLDER}
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/configs
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/configs
)
target_include_directories(qmk PUBLIC ${HALCONFDIR})
# linker script
find_file(LDSCRIPT ${MCU_LDSCRIPT}.ld
${QMK_KEYBOARD_FOLDER}/ld
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/ld
${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/ld
${STARTUPLD}
${STARTUPLD_CONTRIB}
)
get_filename_component(LDSCRIPT_PATH ${LDSCRIPT} DIRECTORY)
target_link_options(qmk PUBLIC
-T ${LDSCRIPT}
-L ${LDSCRIPT_PATH}
)
# os/hal/hal.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/src/hal.c
${CHIBIOS}/os/hal/src/hal_st.c
${CHIBIOS}/os/hal/src/hal_buffers.c
${CHIBIOS}/os/hal/src/hal_queues.c
${CHIBIOS}/os/hal/src/hal_flash.c
${CHIBIOS}/os/hal/src/hal_mmcsd.c
${CHIBIOS}/os/hal/src/hal_adc.c
${CHIBIOS}/os/hal/src/hal_can.c
${CHIBIOS}/os/hal/src/hal_crypto.c
${CHIBIOS}/os/hal/src/hal_dac.c
${CHIBIOS}/os/hal/src/hal_efl.c
${CHIBIOS}/os/hal/src/hal_gpt.c
${CHIBIOS}/os/hal/src/hal_i2c.c
${CHIBIOS}/os/hal/src/hal_i2s.c
${CHIBIOS}/os/hal/src/hal_icu.c
${CHIBIOS}/os/hal/src/hal_mac.c
${CHIBIOS}/os/hal/src/hal_mmc_spi.c
${CHIBIOS}/os/hal/src/hal_pal.c
${CHIBIOS}/os/hal/src/hal_pwm.c
${CHIBIOS}/os/hal/src/hal_rtc.c
${CHIBIOS}/os/hal/src/hal_sdc.c
${CHIBIOS}/os/hal/src/hal_serial.c
${CHIBIOS}/os/hal/src/hal_serial_usb.c
${CHIBIOS}/os/hal/src/hal_sio.c
${CHIBIOS}/os/hal/src/hal_spi.c
${CHIBIOS}/os/hal/src/hal_trng.c
${CHIBIOS}/os/hal/src/hal_uart.c
${CHIBIOS}/os/hal/src/hal_usb.c
${CHIBIOS}/os/hal/src/hal_wdg.c
${CHIBIOS}/os/hal/src/hal_wspi.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/include
)
# os/hal/osal/rt-nil/osal.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/osal/rt-nil/osal.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/osal/rt-nil
)
# os/rt/rt.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/rt/src/chsys.c
${CHIBIOS}/os/rt/src/chrfcu.c
${CHIBIOS}/os/rt/src/chdebug.c
${CHIBIOS}/os/rt/src/chtrace.c
${CHIBIOS}/os/rt/src/chvt.c
${CHIBIOS}/os/rt/src/chschd.c
${CHIBIOS}/os/rt/src/chinstances.c
${CHIBIOS}/os/rt/src/chthreads.c
${CHIBIOS}/os/rt/src/chsys.c
${CHIBIOS}/os/rt/src/chrfcu.c
${CHIBIOS}/os/rt/src/chdebug.c
${CHIBIOS}/os/rt/src/chtrace.c
${CHIBIOS}/os/rt/src/chvt.c
${CHIBIOS}/os/rt/src/chschd.c
${CHIBIOS}/os/rt/src/chinstances.c
${CHIBIOS}/os/rt/src/chthreads.c
${CHIBIOS}/os/rt/src/chtm.c
${CHIBIOS}/os/rt/src/chstats.c
${CHIBIOS}/os/rt/src/chregistry.c
${CHIBIOS}/os/rt/src/chsem.c
${CHIBIOS}/os/rt/src/chmtx.c
${CHIBIOS}/os/rt/src/chcond.c
${CHIBIOS}/os/rt/src/chevents.c
${CHIBIOS}/os/rt/src/chmsg.c
${CHIBIOS}/os/rt/src/chdynamic.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/rt/include
)
# os/oslib/oslib.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/oslib/src/chmboxes.c
${CHIBIOS}/os/oslib/src/chmemcore.c
${CHIBIOS}/os/oslib/src/chmemheaps.c
${CHIBIOS}/os/oslib/src/chmempools.c
${CHIBIOS}/os/oslib/src/chpipes.c
${CHIBIOS}/os/oslib/src/chobjcaches.c
${CHIBIOS}/os/oslib/src/chdelegates.c
${CHIBIOS}/os/oslib/src/chfactory.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/oslib/include
)
# os/hal/lib/streams/streams.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/lib/streams/chprintf.c
${CHIBIOS}/os/hal/lib/streams/chscanf.c
${CHIBIOS}/os/hal/lib/streams/memstreams.c
${CHIBIOS}/os/hal/lib/streams/nullstreams.c
${CHIBIOS}/os/hal/lib/streams/bufstreams.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/lib/streams
)
# resume platform.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/various/syscalls.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/license
${CHIBIOS}/os/oslib/include
${CHIBIOS}/os/various
)

27
cmake/Findlufa.cmake Normal file
View File

@@ -0,0 +1,27 @@
include(UpdateSubmodule)
update_submodule(lib/lufa)
set(LUFA_PATH ${CMAKE_SOURCE_DIR}/lib/lufa)
set(LUFA_ROOT_PATH ${LUFA_PATH}/LUFA)
target_sources(qmk PUBLIC
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBController_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBInterrupt_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/ConfigDescriptors.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/Events.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/USBTask.c
${LUFA_ROOT_PATH}/Drivers/USB/Class/Common/HIDParser.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Host_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Pipe_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/PipeStream_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/HostStandardReq.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Device_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Endpoint_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/EndpointStream_${ARCH}.c
${LUFA_ROOT_PATH}/Drivers/USB/Core/DeviceStandardReq.c
${LUFA_PATH}/LUFA/Drivers/USB/USB.h
)
target_include_directories(qmk PUBLIC ${LUFA_PATH})
# target_link_libraries(lufa ${QMK_TARGET})
# target_link_libraries(lufa tmk_core_protocol)
# target_link_libraries(lufa tmk_core_protocol_lufa)

View File

@@ -0,0 +1,24 @@
message("Downloading gcc-arm-none-eabi")
if(WIN32)
file(DOWNLOAD
https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-win32.zip?rev=8f4a92e2ec2040f89912f372a55d8cf3&hash=8A9EAF77EF1957B779C59EADDBF2DAC118170BBF
${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-win32.zip
EXPECTED_HASH MD5=2bc8f0c4c4659f8259c8176223eeafc1
SHOW_PROGRESS
)
file(ARCHIVE_EXTRACT
INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-win32.zip
DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
)
elseif(UNIX)
file(DOWNLOAD
https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2?rev=78196d3461ba4c9089a67b5f33edf82a&hash=D484B37FF37D6FC3597EBE2877FB666A41D5253B
${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-x86_64-linux.tar.bz2
EXPECTED_HASH MD5=3fe3d8bb693bd0a6e4615b6569443d0d
SHOW_PROGRESS
)
file(ARCHIVE_EXTRACT
INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-x86_64-linux.tar.bz2
DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
)
endif()

View File

@@ -0,0 +1,24 @@
message("Downloading avr-gcc")
if(WIN32)
file(DOWNLOAD
https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-windows.zip
${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-windows.zip
EXPECTED_HASH SHA256=e921a964fdeaedbe963352d0f26c6520a0a3eb8effc6ff232f3824b06c4ea0e2
SHOW_PROGRESS
)
file(ARCHIVE_EXTRACT
INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-windows.zip
DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
)
elseif(UNIX)
file(DOWNLOAD
https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-linux.tar.bz2
${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-linux.tar.bz2
EXPECTED_HASH SHA256=feb034f4b85237032da8bac1f03765af5ebc4a8939b69bed57ff31bc482ca1a6
SHOW_PROGRESS
)
file(ARCHIVE_EXTRACT
INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-linux.tar.bz2
DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
)
endif()

View File

@@ -0,0 +1,22 @@
message("Downloading dfu-programmer")
if(WIN32)
file(DOWNLOAD
https://github.com/dfu-programmer/dfu-programmer/releases/download/v1.0.0/dfu-programmer-x64-1.0.0.7z
${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-x64-1.0.0.7z
SHOW_PROGRESS
)
file(ARCHIVE_EXTRACT
INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-x64-1.0.0.7z
DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/
)
elseif(UNIX)
file(DOWNLOAD
https://github.com/dfu-programmer/dfu-programmer/releases/download/v1.0.0/dfu-programmer-linux-1.0.0.7z
${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-linux-1.0.0.7z
SHOW_PROGRESS
)
file(ARCHIVE_EXTRACT
INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-linux-1.0.0.7z
DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/
)
endif()

51
cmake/GetKeymaps.cmake Normal file
View File

@@ -0,0 +1,51 @@
cmake_minimum_required(VERSION 3.20)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(ResolveKeyboard)
include(ValidateJson)
set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
set(CMAKE_MESSAGE_INDENT "")
resolve_keyboard(${QMK_KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STR)
cmake_path(IS_PREFIX QMK_KEYBOARDS_FOLDER "${KEYBOARD_FOLDER_ABS}" IS_KEYBOARDS_FOLDER)
file(WRITE "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "")
if(${IS_KEYBOARDS_FOLDER})
file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")
file(GLOB KEYMAPS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/*/keymap.c")
foreach(KEYMAP ${KEYMAPS})
file(RELATIVE_PATH KEYMAP_C "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps" "${KEYMAP}")
get_filename_component(KEYMAP_FOLDER ${KEYMAP_C} DIRECTORY)
# message(STATUS "${KEYMAP_FOLDER}")
file(APPEND "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "${KEYMAP_FOLDER}\n")
endforeach()
get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
endwhile()
else()
if(EXISTS "${KEYBOARD_FOLDER_ABS}/keymap.c")
set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymap.c" PARENT_SCOPE)
elseif(EXISTS "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c")
set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
endif()
endif()
string(JSON COMMUNITY_LAYOUTS ERROR_VARIABLE NO_COMMUNITY_LAYOUTS GET ${JSON_STR} community_layouts)
if(${NO_COMMUNITY_LAYOUTS} STREQUAL "NOTFOUND")
string(JSON NUM_LAYOUTS LENGTH ${COMMUNITY_LAYOUTS})
math(EXPR MAX "${NUM_LAYOUTS} - 1")
foreach(IDX RANGE ${MAX})
string(JSON LAYOUT GET ${COMMUNITY_LAYOUTS} ${IDX})
file(GLOB KEYMAPS "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/*/keymap.c")
foreach(KEYMAP ${KEYMAPS})
file(RELATIVE_PATH KEYMAP_C "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}" "${KEYMAP}")
get_filename_component(KEYMAP_FOLDER ${KEYMAP_C} DIRECTORY)
# message(STATUS "${KEYMAP_FOLDER}")
file(APPEND "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "${KEYMAP_FOLDER}\n")
endforeach()
endforeach()
endif()

64
cmake/ParseHeader.cmake Normal file
View File

@@ -0,0 +1,64 @@
# Simple CMake utility to read variables from MK files
# - Gets contents from given file (name or path)
# - Parses the assignment statements
# - Makes the same assignments in the PARENT_SCOPE
if(POLICY CMP0007)
cmake_policy(SET CMP0007 NEW)
endif()
function(ParseHeader HeaderFile Prefix)
_ParseHeader(${HeaderFile} ${Prefix})
endfunction()
macro(_ParseHeader HeaderFile Prefix)
message(CHECK_START "Parsing Header")
list(APPEND CMAKE_MESSAGE_INDENT " ")
message(STATUS "Reading \"${HeaderFile}\"")
file(READ "${HeaderFile}" FileContents)
string(REGEX REPLACE "/\\*.*\\*/" "" FileContents ${FileContents})
# replace the \ newlines with spaces
string(REGEX REPLACE "\\\\\r?\n *" " " FileContents ${FileContents})
# turn each line into an item in a list
string(REGEX REPLACE "\r?\n" ";" FileLines ${FileContents})
list(REMOVE_ITEM FileLines "")
foreach(line ${FileLines})
# remove comments from the ends of each line
string(REGEX REPLACE "//.*" "" line ${line})
# remove now-empty lines
if("${line}" STREQUAL "")
continue()
endif()
# try to process includes, if the file exists
if(line MATCHES "^#include \"(.+)\"")
set(INCLUDED_HEADER ${CMAKE_MATCH_1})
if(EXISTS ${INCLUDED_HEADER})
_ParseHeader("${INCLUDED_HEADER}" ${Prefix})
else()
message(STATUS "Could not read ${INCLUDED_HEADER}")
endif()
continue()
endif()
# array
if(line MATCHES "#define ([A-Za-z0-9_]+) {(.*)}")
set(VARIABLE_NAME ${CMAKE_MATCH_1})
set(VARIABLE_VALUE ${CMAKE_MATCH_2})
set(${Prefix}${VARIABLE_NAME} ${VARIABLE_VALUE})
endif()
# regular variable
if(line MATCHES "#define ([A-Za-z0-9_]+) (.*)")
set(VARIABLE_NAME ${CMAKE_MATCH_1})
set(VARIABLE_VALUE ${CMAKE_MATCH_2})
set(${Prefix}${VARIABLE_NAME} ${VARIABLE_VALUE})
endif()
endforeach()
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "Complete")
endmacro()

98
cmake/ParseMakefile.cmake Normal file
View File

@@ -0,0 +1,98 @@
# Simple CMake utility to read variables from MK files
# - Gets contents from given file (name or path)
# - Parses the assignment statements
# - Makes the same assignments in the PARENT_SCOPE
if(POLICY CMP0007)
cmake_policy(SET CMP0007 NEW)
endif()
function(ParseMakefile MKFile)
_ParseMakefile(${MKFile} ${ARGN})
endfunction()
macro(_ParseMakefile MKFile)
message(CHECK_START "Parsing Makefile")
list(APPEND CMAKE_MESSAGE_INDENT " ")
message(STATUS "Reading \"${MKFile}\"")
file(READ "${MKFile}" FileContents)
# replace the \ newlines with spaces
string(REGEX REPLACE "\\\\\r?\n *" " " FileContents ${FileContents})
# turn each line into an item in a list
string(REGEX REPLACE "\r?\n" ";" FileLines ${FileContents})
list(REMOVE_ITEM FileLines "")
foreach(line ${FileLines})
# remove comments from the ends of each line
string(REGEX REPLACE "#.*" "" line ${line})
# remove now-empty lines
if("${line}" STREQUAL "")
continue()
endif()
# try to process includes, if the file exists
if(line MATCHES "^-?include (.+)$")
set(MAKE_CHILD ${CMAKE_MATCH_1})
if(EXISTS ${MAKE_CHILD})
_ParseMakefile("${MAKE_CHILD}" ${ARGN})
else()
message(STATUS "Could not read ${MAKE_CHILD}")
endif()
continue()
endif()
# turn the assignment into a list with the first item being the variable name
string(REPLACE "=" ";" line_split ${line})
list(LENGTH line_split count)
if(count LESS 2)
message(STATUS "Skipping ${line}")
continue()
endif()
list(GET line_split -1 value)
string(STRIP ${value} value)
# separate_arguments(value)
# string(REPLACE " " ";" value ${value})
list(REMOVE_AT line_split -1)
foreach(var_name ${line_split})
string(STRIP ${var_name} var_name)
# replace $(?) with the variable ? from cmake
if(value MATCHES "\\$\\(([^\\(\\)]+)\\)")
set(MAKE_VARIABLE "${CMAKE_MATCH_1}")
string(REPLACE "$(${MAKE_VARIABLE})" "${${MAKE_VARIABLE}}" value ${value})
endif()
# look for +, assuming it used to be +=
if(${var_name} MATCHES "([^ \\+]+) *\\+")
message(STATUS "Appending \"${CMAKE_MATCH_1}\" with \"${value}\"")
# read parent variable in local & append
set(LOCAL_${CMAKE_MATCH_1} ${CMAKE_MATCH_1})
# APPEND accepts spaces between values
list(APPEND LOCAL_${CMAKE_MATCH_1} ${value})
set(${CMAKE_MATCH_1} ${LOCAL_${CMAKE_MATCH_1}})
set(${CMAKE_MATCH_1} ${LOCAL_${CMAKE_MATCH_1}} PARENT_SCOPE)
else()
# set needs ; between elements to be considered a list
string(REGEX REPLACE " +" ";" value ${value})
# try to find variable in cache and FORCE wtih INTERNAL if it exists
if(DEFINED CACHE${${var_name}})
message(STATUS "Caching \"${var_name}\" to \"${value}\"")
# set locally so replacement still work
set(${var_name} ${value})
set(${var_name} ${value} CACHE INTERNAL "")
else()
message(STATUS "Setting \"${var_name}\" to \"${value}\"")
set(${var_name} ${value})
set(${var_name} ${value} PARENT_SCOPE)
endif()
endif()
endforeach()
endforeach()
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "Complete")
endmacro()

View File

@@ -0,0 +1,78 @@
include(ParseMakefile)
include(Utils)
macro(process_keyboard)
message(CHECK_START "Processing keyboard")
list(APPEND CMAKE_MESSAGE_INDENT " ")
validate_json(${QMK_KEYBOARD_FOLDER_ABS}/info.json keyboard QMK_KEYBOARD_INFO_JSON_STRING)
# process rules from info.json
file(READ ${CMAKE_SOURCE_DIR}/data/mappings/info_rules.hjson JSON_STRING)
string(JSON MAPPING_LENGTH LENGTH ${JSON_STRING})
math(EXPR MAX "${MAPPING_LENGTH} - 1")
foreach(IDX RANGE ${MAX})
string(JSON RULE_KEY MEMBER ${JSON_STRING} ${IDX})
# string(JSON INFO_KEY GET ${JSON_STRING} ${RULE_KEY} info_key)
json_get_with_default(INFO_KEY ${JSON_STRING} _ ${RULE_KEY} info_key)
string(REPLACE "." " " INFO_KEYS ${INFO_KEY})
string(JSON RULE_VALUE ERROR_VARIABLE RULE_KEY_NOT_FOUND GET ${QMK_KEYBOARD_INFO_JSON_STRING} ${INFO_KEYS})
if(${RULE_KEY_NOT_FOUND} STREQUAL "NOTFOUND")
json_get_with_default(VALUE_TYPE ${JSON_STRING} raw ${RULE_KEY} value_type)
if(${VALUE_TYPE} STREQUAL "list")
string(JSON NUM_VALUES LENGTH ${RULE_VALUE})
math(EXPR MAX "${NUM_VALUES} - 1")
foreach(IDX RANGE ${MAX})
string(JSON VALUE GET ${RULE_VALUE} ${IDX})
list(APPEND ${RULE_KEY} ${VALUE})
endforeach()
message(STATUS "Found rule '${INFO_KEY}': '${${RULE_KEY}}' assigned to '${RULE_KEY}'")
else()
set(${RULE_KEY} ${RULE_VALUE})
message(STATUS "Found rule '${INFO_KEY}': '${RULE_VALUE}' assigned to '${RULE_KEY}'")
endif()
endif()
endforeach()
# process definitions from info.json
file(READ ${CMAKE_SOURCE_DIR}/data/mappings/info_config.hjson JSON_STRING)
string(JSON MAPPING_LENGTH LENGTH ${JSON_STRING})
math(EXPR MAX "${MAPPING_LENGTH} - 1")
foreach(IDX RANGE ${MAX})
string(JSON CONFIG_KEY MEMBER ${JSON_STRING} ${IDX})
json_get_with_default(INFO_KEY ${JSON_STRING} _ ${CONFIG_KEY} info_key)
string(REPLACE "." ";" INFO_KEYS ${INFO_KEY})
# string(JSON CONFIG_VALUE ERROR_VARIABLE CONFIG_KEY_NOT_FOUND GET ${QMK_KEYBOARD_INFO_JSON_STRING} ${INFO_KEYS})
json_get_with_default(CONFIG_VALUE ${QMK_KEYBOARD_INFO_JSON_STRING} NOTFOUND ${INFO_KEYS})
if(NOT CONFIG_VALUE STREQUAL "NOTFOUND")
set(${CONFIG_KEY} ${CONFIG_VALUE})
json_get_with_default(VALUE_TYPE ${JSON_STRING} raw ${CONFIG_KEY} value_type)
if(${VALUE_TYPE} STREQUAL "str")
add_compile_definitions(${CONFIG_KEY}="${CONFIG_VALUE}")
message(STATUS "Found definition '${INFO_KEY}': '\"${CONFIG_VALUE}\"' assigned to '${CONFIG_KEY}'")
elseif(${VALUE_TYPE} STREQUAL "bcd_version")
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" VERSION_MATCH ${CONFIG_VALUE})
set(VERSION_MAJOR ${CMAKE_MATCH_1})
set(VERSION_MINOR ${CMAKE_MATCH_2})
set(VERSION_PATCH ${CMAKE_MATCH_3})
math(EXPR BCD_VERSION "${VERSION_MAJOR} * 10000 + ${VERSION_MINOR} * 100 + ${VERSION_PATCH}" OUTPUT_FORMAT HEXADECIMAL)
add_compile_definitions(${CONFIG_KEY}=${BCD_VERSION})
message(STATUS "Found definition '${INFO_KEY}': '${BCD_VERSION}' assigned to '${CONFIG_KEY}'")
else()
add_compile_definitions(${CONFIG_KEY}=${CONFIG_VALUE})
message(STATUS "Found definition '${INFO_KEY}': '${CONFIG_VALUE}' assigned to '${CONFIG_KEY}'")
endif()
endif()
endforeach()
string(JSON KEYBOARD_NAME GET ${QMK_KEYBOARD_INFO_JSON_STRING} keyboard_name)
string(JSON MANUFACTURER GET ${QMK_KEYBOARD_INFO_JSON_STRING} manufacturer)
string(JSON URL GET ${QMK_KEYBOARD_INFO_JSON_STRING} url)
string(JSON QMK_MCU GET ${QMK_KEYBOARD_INFO_JSON_STRING} processor)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "info.json validated and loaded")
ParseMakefile(${QMK_KEYBOARD_FOLDER_ABS}/rules.mk)
endmacro()

146
cmake/ResolveKeyboard.cmake Normal file
View File

@@ -0,0 +1,146 @@
include(Utils)
function(resolve_keyboard KEYBOARD KEYBOAD_FOLDER_ABS_STR)
message(VERBOSE "Resolving ${KEYBOARD}")
if(EXISTS "${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD}")
message(VERBOSE "Found in repo: ${KEYBOARD}")
set(${KEYBOAD_FOLDER_ABS_STR} "${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD}" PARENT_SCOPE)
return()
endif()
if(EXISTS "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}")
message(VERBOSE "Already checked out: ${KEYBOARD}")
set(${KEYBOAD_FOLDER_ABS_STR} "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}" PARENT_SCOPE)
return()
endif()
file(READ ${CMAKE_SOURCE_DIR}/data/keyboards.json KEYBOARDS_JSON)
string(JSON KEYBOARD_SLUG ERROR_VARIABLE JSON_ERROR GET ${KEYBOARDS_JSON} ${KEYBOARD})
if(${JSON_ERROR} STREQUAL "NOTFOUND")
message(VERBOSE "Found ${KEYBOARD_SLUG}")
if(${KEYBOARD_SLUG} MATCHES "^@([0-9a-zA-Z_]+/[0-9a-zA-Z_]+)")
# keyboard slug is mapped to a github repo
set(GIT_SLUG ${CMAKE_MATCH_1})
# string(MAKE_C_IDENTIFIER ${KEYBOARD} KEYBOARD_NAME)
message(VERBOSE "Cloning ${GIT_SLUG}")
find_package(Git QUIET)
if(GIT_FOUND)
file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}")
execute_process(COMMAND ${GIT_EXECUTABLE} clone "https://github.com/${GIT_SLUG}.git" .
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}"
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(FATAL_ERROR "git clone failed with ${GIT_SUBMOD_RESULT}")
endif()
else()
message("Git not found - skipping submodule update")
endif()
set(${KEYBOAD_FOLDER_ABS_STR} "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}" PARENT_SCOPE)
else()
message(FATAL_ERROR "Didn't match")
endif()
else()
message(FATAL_ERROR "Couldn't find")
# set(${RESULT_STR} "NOTFOUND" PARENT_SCOPE)
endif()
endfunction()
function(resolve_config_h KEYBOARD_FOLDER_ABS CONFIG_H_STR)
set(${CONFIG_H_STR} PARENT_SCOPE)
if(${IS_KEYBOARDS_FOLDER})
file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
# get the deepest config.h
while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")
if(EXISTS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/config.h")
parent_list(PREPEND ${CONFIG_H_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/config.h")
# set(${CONFIG_H_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/config.h" PARENT_SCOPE)
# return()
endif()
get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
endwhile()
# message(FATAL_ERROR "Could not find config.h in ${KEYBOARD_FOLDER_ABS}")
else()
if(EXISTS "${KEYBOARD_FOLDER_ABS}/config.h")
set(${CONFIG_H_STR} "${KEYBOARD_FOLDER_ABS}/config.h" PARENT_SCOPE)
else()
message(FATAL_ERROR "Could not find config.h in ${KEYBOARD_FOLDER_ABS}")
endif()
endif()
endfunction()
function(resolve_keyboard_h KEYBOARD_FOLDER_ABS KEYBOARD_H_STR)
if(${IS_KEYBOARDS_FOLDER})
file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
# get the deepest header
while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")
get_filename_component(LAST_PART ${RELATIVE_KEYBOARD_FOLDER} NAME)
if(EXISTS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/${LAST_PART}.h")
set(${KEYBOARD_H_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/${LAST_PART}.h" PARENT_SCOPE)
return()
endif()
get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
endwhile()
message(FATAL_ERROR "Could not find *.h in ${KEYBOARD_FOLDER_ABS}")
else()
if(EXISTS "${KEYBOARD_FOLDER_ABS}/keyboard.h")
set(${KEYBOARD_H_STR} "${KEYBOARD_FOLDER_ABS}/keyboard.h" PARENT_SCOPE)
else()
message(FATAL_ERROR "Could not find keyboard.h in ${KEYBOARD_FOLDER_ABS}")
endif()
endif()
endfunction()
function(resolve_keymap_c KEYBOARD_FOLDER_ABS KEYMAP_FOLDER KEYMAP_C_STR)
if(IS_ABSOLUTE ${KEYMAP_FOLDER})
if(EXISTS "${KEYMAP_FOLDER}/keymap.c")
set(${KEYMAP_C_STR} "${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
return()
endif()
else()
if(${IS_KEYBOARDS_FOLDER})
file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
# get the deepest keymap.c
while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")
if(EXISTS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/${KEYMAP_FOLDER}/keymap.c")
set(${KEYMAP_C_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
return()
endif()
get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
endwhile()
else()
if(EXISTS "${KEYBOARD_FOLDER_ABS}/keymap.c")
set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymap.c" PARENT_SCOPE)
return()
elseif(EXISTS "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c")
set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
return()
endif()
endif()
endif()
# string(JSON COMMUNITY_LAYOUTS ERROR_VARIABLE NO_COMMUNITY_LAYOUTS GET ${QMK_KEYBOARD_INFO_JSON_STRING} community_layouts)
# if(${NO_COMMUNITY_LAYOUTS} STREQUAL "NOTFOUND")
# string(JSON NUM_LAYOUTS LENGTH ${COMMUNITY_LAYOUTS})
# math(EXPR MAX "${NUM_LAYOUTS} - 1")
foreach(LAYOUT ${LAYOUTS})
# foreach(IDX RANGE ${MAX})
# string(JSON LAYOUT GET ${COMMUNITY_LAYOUTS} ${IDX})
if(EXISTS "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/${KEYMAP_FOLDER}/keymap.c")
set(${KEYMAP_C_STR} "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
return()
endif()
endforeach()
# endif()
message(FATAL_ERROR "Could not resolve keymap '${KEYMAP_FOLDER}'")
endfunction()
function(resolve_keyboard_includes KEYBOARD_FOLDER_ABS)
if(${IS_KEYBOARDS_FOLDER})
file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")
target_include_directories(qmk PUBLIC "${CMAKE_SOURCE_DIR}/keyboards/${RELATIVE_KEYBOARD_FOLDER}")
get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
endwhile()
else()
target_include_directories(qmk PUBLIC "${KEYBOARD_FOLDER_ABS}")
endif()
endfunction()

View File

@@ -0,0 +1,60 @@
function(resolve_toolchain PROCESSOR TOOLCHAIN_STR)
unset(${TOOLCHAIN_STR} PARENT_SCOPE)
if(
${PROCESSOR} MATCHES "^at.*"
)
set(${TOOLCHAIN_STR} "avr" PARENT_SCOPE)
set(QMK_EXTENSION ".hex" PARENT_SCOPE)
include(FindAVRToolchain)
find_avr_toolchain()
elseif(
${PROCESSOR} MATCHES "^STM.*" OR
${PROCESSOR} MATCHES "^WB32.*" OR
${PROCESSOR} MATCHES "^MK.*" OR
${PROCESSOR} MATCHES "RP2040" OR
${PROCESSOR} MATCHES "^GD32.*"
)
set(${TOOLCHAIN_STR} "arm-none-eabi" PARENT_SCOPE)
set(QMK_EXTENSION ".bin" PARENT_SCOPE)
include(FindARMToolchain)
find_arm_toolchain()
elseif(
${PROCESSOR} MATCHES "risc-v"
)
set(${TOOLCHAIN_STR} "riscv32-unknown-elf" PARENT_SCOPE)
set(QMK_EXTENSION ".bin" PARENT_SCOPE)
else()
message(FATAL_ERROR "Could not find toolchain for ${PROCESSOR}")
endif()
endfunction()
function(find_toolchain TOOLCHAIN TOOLCHAIN_ROOT_STR)
unset(${TOOLCHAIN_STR} PARENT_SCOPE)
if(UNIX)
set(OS_SUFFIX "")
find_path(TOOLCHAIN_ROOT
NAMES
${TOOLCHAIN}-gcc${OS_SUFFIX}
PATHS
"${CMAKE_SOURCE_DIR}/toolchains/avr-gcc/avr-gcc-12.1.0-x64-linux/bin/"
"${CMAKE_SOURCE_DIR}/toolchains/gcc-arm-none-eabi-10.3-2021.10/bin/"
/usr/bin/
/usr/local/bin
/bin/
$ENV{AVR_ROOT}
)
elseif(WIN32)
set(OS_SUFFIX ".exe")
find_path(TOOLCHAIN_ROOT
NAMES
${TOOLCHAIN}-gcc${OS_SUFFIX}
PATHS
"${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-windows/bin"
"${CMAKE_SOURCE_DIR}/toolchains/gcc-arm-none-eabi-10.3-2021.10/bin/"
$ENV{AVR_ROOT}
)
else()
message(FATAL_ERROR "Unsure how to handle this OS")
endif(UNIX)
set(${TOOLCHAIN_ROOT_STR} ${TOOLCHAIN_ROOT} PARENT_SCOPE)
endfunction(find_toolchain)

View File

@@ -0,0 +1,22 @@
# can be passed a relative path (to CMAKE_SOURCE_DIR) to update/checkout that submodule
macro(update_submodule SUBMODULE)
find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE)
message(STATUS "Updating submoudle ${SUBMODULE}")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update ${SUBMODULE}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(FATAL_ERROR "git submodule update ${SUBMODULE} failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif()
endif()
else()
message("Git not found - skipping submodule update")
endif()
if(NOT EXISTS "${CMAKE_SOURCE_DIR}/${SUBMODULE}/.git")
message(FATAL_ERROR "The submodule was not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
endif()
endmacro()

25
cmake/Utils.cmake Normal file
View File

@@ -0,0 +1,25 @@
macro(json_get_with_default KEY_STR JSON_STR DEFAULT)
# message(STATUS "Getting ${ARGN} for ${KEY_STR}")
string(JSON ${KEY_STR} ERROR_VARIABLE JSON_ERROR GET ${JSON_STR} ${ARGN})
if(NOT ${JSON_ERROR} STREQUAL "NOTFOUND")
set(${KEY_STR} ${DEFAULT})
endif()
endmacro()
macro(json_get KEY_STR JSON_STR)
# message(STATUS "Getting ${ARGN} for ${KEY_STR}")
string(JSON ${KEY_STR} ERROR_VARIABLE JSON_ERROR GET ${JSON_STR} ${ARGN})
if(NOT ${JSON_ERROR} STREQUAL "NOTFOUND")
unset(${KEY_STR})
endif()
endmacro()
macro(parent_list ACTION LIST_STR)
set(ARGS ${ARGN})
string(REPLACE ";" " " ARGS ${ARGS})
set(LOCAL_LIST ${${LIST_STR}})
list(${ACTION} LOCAL_LIST ${ARGS})
# set in current scope too
set(${LIST_STR} ${LOCAL_LIST})
set(${LIST_STR} ${LOCAL_LIST} PARENT_SCOPE)
endmacro()

199
cmake/ValidateJson.cmake Normal file
View File

@@ -0,0 +1,199 @@
function(validate_json JSON_FILE SCHEMA_NAME JSON_STRING_STR)
unset(${JSON_STRING_STR} PARENT_SCOPE)
message(VERBOSE "Validating ${JSON_FILE} with '${SCHEMA_NAME}' schema")
file(READ ${JSON_FILE} JSON_STRING)
file(READ ${CMAKE_SOURCE_DIR}/data/schemas/${SCHEMA_NAME}.jsonschema SCHEMA_STRING)
string(JSON SCHEMA_ID GET ${SCHEMA_STRING} $id)
set(DEFINITIONS "{}")
file(READ ${CMAKE_SOURCE_DIR}/data/schemas/definitions.jsonschema DEFINITIONS_STRING)
string(JSON DEFINITION_ID GET ${DEFINITIONS_STRING} $id)
string(JSON DEFINITIONS SET ${DEFINITIONS} "${DEFINITION_ID}#" ${DEFINITIONS_STRING})
string(JSON SCHEMA_DEFINITIONS ERROR_VARIABLE JSON_ERROR GET ${SCHEMA_STRING} definitions)
if(${JSON_ERROR} STREQUAL "NOTFOUND")
string(JSON DEFINITIONS SET ${DEFINITIONS} "#" "{}")
string(JSON DEFINITIONS SET ${DEFINITIONS} "#" definitions ${SCHEMA_DEFINITIONS})
# string(JSON DEFINITIONS_LENGTH LENGTH ${SCHEMA_DEFINITIONS})
# math(EXPR MAX "${DEFINITIONS_LENGTH} - 1")
# foreach(IDX RANGE ${MAX})
# string(JSON DEFINITION_NAME MEMBER ${SCHEMA_DEFINITIONS} ${IDX})
# string(JSON DEFINITION GET ${SCHEMA_DEFINITIONS} ${DEFINITION_NAME})
# message(VERBOSE "Loading local definition '${DEFINITION_NAME}'")
# string(JSON DEFINITIONS_STRING SET ${DEFINITIONS_STRING} ${DEFINITION_NAME} ${DEFINITION})
# endforeach()
endif()
validate_object(${JSON_STRING} ${SCHEMA_STRING} OBJECT_ERROR)
if(DEFINED OBJECT_ERROR)
message(FATAL_ERROR ${OBJECT_ERROR})
else()
set(${JSON_STRING_STR} ${JSON_STRING} PARENT_SCOPE)
endif()
endfunction()
function(validate_object JSON_STRING SCHEMA_STRING OBJECT_ERROR_STR)
unset(${OBJECT_ERROR_STR} PARENT_SCOPE)
set(OBJECT_ERROR)
string(JSON PROPERTY_NAME_SCHEMA ERROR_VARIABLE PROPERTY_NAMES_ERROR GET ${SCHEMA_STRING} propertyNames)
string(JSON REQUIRED_PROPERTIES ERROR_VARIABLE REQUIRED_PROPERTIES_ERROR GET ${SCHEMA_STRING} required)
set(REQUIRED_LIST)
if(${REQUIRED_PROPERTIES_ERROR} STREQUAL "NOTFOUND")
string(JSON REQUIRED_LENGTH LENGTH ${REQUIRED_PROPERTIES})
math(EXPR MAX "${REQUIRED_LENGTH} - 1")
foreach(IDX RANGE ${MAX})
string(JSON REQUIRED GET ${REQUIRED_PROPERTIES} ${IDX})
list(APPEND REQUIRED_LIST ${REQUIRED})
endforeach()
endif()
string(JSON NUM_PROPERTIES LENGTH ${JSON_STRING})
math(EXPR MAX "${NUM_PROPERTIES} - 1")
foreach(IDX RANGE ${MAX})
string(JSON PROPERTY_NAME MEMBER ${JSON_STRING} ${IDX})
list(REMOVE_ITEM REQUIRED_LIST ${PROPERTY_NAME})
message(VERBOSE "Validating property '${PROPERTY_NAME}'")
if(${PROPERTY_NAMES_ERROR} STREQUAL "NOTFOUND")
validate_property(${PROPERTY_NAME} ${PROPERTY_NAME_SCHEMA} PROPERTY_NAME_ERROR)
if(DEFINED PROPERTY_NAME_ERROR)
list(APPEND OBJECT_ERROR "${PROPERTY_NAME_ERROR}")
endif()
endif()
string(JSON PROPERTY GET ${JSON_STRING} ${PROPERTY_NAME})
string(JSON SCHEMA_PROPERTIES ERROR_VARIABLE PROPERTIES_ERROR GET ${SCHEMA_STRING} properties ${PROPERTY_NAME})
if(${PROPERTIES_ERROR} STREQUAL "NOTFOUND")
string(JSON PROPERTY_SCHEMA GET ${SCHEMA_STRING} properties ${PROPERTY_NAME})
else()
string(JSON PROPERTY_SCHEMA ERROR_VARIABLE ADDITIONAL_PROPERTIES_ERROR GET ${SCHEMA_STRING} additionalProperties)
if(NOT ${ADDITIONAL_PROPERTIES_ERROR} STREQUAL "NOTFOUND" OR "${PROPERTY_SCHEMA}" STREQUAL "OFF")
list(APPEND OBJECT_ERROR "Additional properties like '${PROPERTY_NAME}' not permitted in '${JSON_STRING}'")
endif()
endif()
validate_property(${PROPERTY} ${PROPERTY_SCHEMA} PROPERTY_ERROR)
if(DEFINED PROPERTY_ERROR)
list(APPEND OBJECT_ERROR "${PROPERTY_ERROR}")
endif()
endforeach()
list(LENGTH REQUIRED_LIST REQUIRED_REMAINING_LENGTH)
if(${REQUIRED_REMAINING_LENGTH} GREATER 0)
list(APPEND OBJECT_ERROR "Required properties not found: ${REQUIRED_LIST}")
endif()
set(${OBJECT_ERROR_STR} ${OBJECT_ERROR} PARENT_SCOPE)
endfunction()
function(validate_property PROPERTY PROPERTY_SCHEMA PROPERTY_ERROR_STR)
unset(${PROPERTY_ERROR_STR} PARENT_SCOPE)
set(PROPERTY_ERROR)
string(JSON PROPERTY_REF ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} $ref)
if(${JSON_ERROR} STREQUAL "NOTFOUND")
string(REPLACE "/" ";" REF_COMPONENTS "${PROPERTY_REF}")
string(JSON PROPERTY_SCHEMA GET ${DEFINITIONS} ${REF_COMPONENTS})
endif()
string(JSON PROPERTY_TYPE ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} type)
if(${JSON_ERROR} STREQUAL "NOTFOUND")
message(VERBOSE "Validating property type '${PROPERTY_TYPE}'")
if(${PROPERTY_TYPE} STREQUAL "object")
validate_object(${PROPERTY} ${PROPERTY_SCHEMA} OBJECT_ERROR)
if(DEFINED OBJECT_ERROR)
list(APPEND PROPERTY_ERROR ${OBJECT_ERROR})
endif()
elseif(${PROPERTY_TYPE} STREQUAL "array")
string(JSON ARRAY_LENGTH LENGTH ${PROPERTY})
string(JSON MAX_ITEMS ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} maxItems)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${ARRAY_LENGTH} GREATER ${MAX_ITEMS})
list(APPEND PROPERTY_ERROR "Number of items in '${PROPERTY}' exceeds maximum ${MAX_ITEMS}")
endif()
string(JSON MIN_ITEMS ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} minItems)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${ARRAY_LENGTH} LESS ${MIN_ITEMS})
list(APPEND PROPERTY_ERROR "Number of items in '${PROPERTY}' is less than ${MIN_ITEMS}")
endif()
string(JSON ITEM_SCHEMA ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} items)
if(${JSON_ERROR} STREQUAL "NOTFOUND")
math(EXPR MAX "${ARRAY_LENGTH} - 1")
foreach(IDX RANGE ${MAX})
string(JSON ITEM GET ${PROPERTY} ${IDX})
validate_property(${ITEM} ${ITEM_SCHEMA} ITEM_ERROR)
if(DEFINED ITEM_ERROR)
list(APPEND PROPERTY_ERROR ${ITEM_ERROR})
endif()
endforeach()
endif()
elseif(${PROPERTY_TYPE} STREQUAL "null")
if(NOT "${PROPERTY}" STREQUAL "null")
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not null'")
endif()
elseif(${PROPERTY_TYPE} STREQUAL "boolean")
if(NOT "${PROPERTY}" STREQUAL "OFF" AND NOT "${PROPERTY}" STREQUAL "ON")
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not a boolean'")
endif()
elseif(${PROPERTY_TYPE} STREQUAL "number")
if(NOT "${PROPERTY}" MATCHES "-?[0-9]+\\.?[0-9]*")
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not a number'")
endif()
elseif(${PROPERTY_TYPE} STREQUAL "integer")
if(NOT "${PROPERTY}" MATCHES "-?[0-9]+")
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not an integer'")
endif()
string(JSON MIN ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} minimum)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${PROPERTY} LESS ${MIN})
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is less than the minimum of ${MIN}")
endif()
string(JSON MAX ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} maximum)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${PROPERTY} GREATER ${MAX})
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is greater than the maximum of ${MAX}")
endif()
elseif(${PROPERTY_TYPE} STREQUAL "string")
# cmake regex doesn't support {}, so other options might be needed here
string(JSON PATTERN ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} pattern)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND NOT "${PROPERTY}" MATCHES "${PATTERN}")
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' does not match '${PATTERN}'")
endif()
string(LENGTH ${PROPERTY} STRING_LENGTH)
string(JSON MIN_LENGTH ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} minLength)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${STRING_LENGTH} LESS ${MIN_LENGTH})
list(APPEND PROPERTY_ERROR "Length of property '${PROPERTY}' is less than the minimum of ${MIN_LENGTH}")
endif()
string(JSON MAX_LENGTH ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} maxLength)
if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${STRING_LENGTH} GREATER ${MAX_LENGTH})
list(APPEND PROPERTY_ERROR "Length of property '${PROPERTY}' is greater than the maximum of ${MAX_LENGTH}")
endif()
string(JSON ENUM_LIST ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} enum)
if(${JSON_ERROR} STREQUAL "NOTFOUND")
set(FOUND_IN_ENUM_LIST FALSE)
string(JSON ENUM_LENGTH LENGTH ${ENUM_LIST})
math(EXPR MAX "${ENUM_LENGTH} - 1")
foreach(IDX RANGE ${MAX})
string(JSON ENUM GET ${PROPERTY_SCHEMA} enum ${IDX})
if(${ENUM} STREQUAL ${PROPERTY})
set(FOUND_IN_ENUM_LIST TRUE)
endif()
endforeach()
if(NOT ${FOUND_IN_ENUM_LIST})
list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not defined in the schema's enum: ${ENUM_LIST}")
endif()
endif()
else()
message(VERBOSE "Unknown type '${PROPERTY_TYPE}'")
endif()
else()
string(JSON PROPERTY_ONEOF ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} oneOf)
if(${JSON_ERROR} STREQUAL "NOTFOUND")
set(TYPE_SUCCESS FALSE)
string(JSON NUM_ONEOF LENGTH ${PROPERTY_ONEOF})
math(EXPR MAX "${NUM_ONEOF} - 1")
set(ONEOF_ERRORS)
foreach(IDX RANGE ${MAX})
string(JSON PROPERTY_SCHEMA GET ${PROPERTY_ONEOF} ${IDX})
validate_property(${PROPERTY} ${PROPERTY_SCHEMA} ONEOF_ERROR)
if(NOT DEFINED ONEOF_ERROR)
set(TYPE_SUCCESS TRUE)
else()
list(APPEND ONEOF_ERRORS "${ONEOF_ERROR}\n")
endif()
endforeach()
if(NOT TYPE_SUCCESS)
list(APPEND PROPERTY_ERROR "Could not validate oneOf type '${PROPERTY}' :\n${ONEOF_ERRORS}")
endif()
endif()
endif()
set(${PROPERTY_ERROR_STR} ${PROPERTY_ERROR} PARENT_SCOPE)
endfunction()

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/ADCv3/hal_adc_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/ADCv3)

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/CANv1/hal_can_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/CANv1)

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DACv1/hal_dac_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DACv1)

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DMAv1/stm32_dma.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DMAv1)

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/EXTIv1/stm32_exti.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/EXTIv1)

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/GPIOv2/hal_pal_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/GPIOv2)

View File

@@ -0,0 +1,7 @@
if(${USE_HAL_I2C_FALLBACK})
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2C/hal_i2c_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2C)
else()
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2Cv2/hal_i2c_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2Cv2)
endif()

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/RTCv2/hal_rtc_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/RTCv2)

View File

@@ -0,0 +1,5 @@
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SPIv2/hal_i2s_lld.c
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SPIv2/hal_spi_v2_lld.c
)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SPIv2)

View File

@@ -0,0 +1,2 @@
target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SYSTICKv1/hal_st_lld.c)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SYSTICKv1)

View File

@@ -0,0 +1,6 @@
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1/hal_gpt_lld.c
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1/hal_icu_lld.c
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1/hal_pwm_lld.c
)
target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1)

View File

@@ -0,0 +1,9 @@
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2/hal_serial_lld.c
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2/hal_sio_lld.c
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2/hal_uart_lld.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USART
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2
)

View File

@@ -0,0 +1,6 @@
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USBv1/hal_usb_lld.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USBv1
)

View File

@@ -0,0 +1,6 @@
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/xWDGv1/hal_wdg_lld.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/xWDGv1
)

View File

@@ -0,0 +1,10 @@
# os/common/ports/ARMv7/compilers/GCC/mk/port.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/common/ports/ARMv7-M/chcore.c
${CHIBIOS}/os/common/ports/ARMv7-M/compilers/GCC/chcoreasm.S
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/common/portability/GCC
${CHIBIOS}/os/common/ports/ARM-common
${CHIBIOS}/os/common/ports/ARMv7-M
)

View File

@@ -0,0 +1,25 @@
# os/hal/ports/STM32/STM32F3xx/platform.mk
target_sources(qmk PUBLIC
${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c
${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/stm32_isr.c
${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/hal_lld.c
${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/hal_efl_lld.c
)
target_include_directories(qmk PUBLIC
${CHIBIOS}/os/hal/ports/common/ARMCMx
${CHIBIOS}/os/hal/ports/STM32/STM32F3xx
)
include(chibios/LLD/ADCv3)
include(chibios/LLD/CANv1)
include(chibios/LLD/DACv1)
include(chibios/LLD/DMAv1)
include(chibios/LLD/EXTIv1)
include(chibios/LLD/GPIOv2)
include(chibios/LLD/I2Cv2)
include(chibios/LLD/RTCv2)
include(chibios/LLD/SPIv2)
include(chibios/LLD/SYSTICKv1)
include(chibios/LLD/TIMv1)
include(chibios/LLD/USARTv2)
include(chibios/LLD/USBv1)
include(chibios/LLD/xWDGv1)

View File

@@ -0,0 +1,32 @@
option(BACKLIGHT_ENABLE "" TRUE)
set(BACKLIGHT_DRIVER "pwm" CACHE STRING "Backlight driver")
set_property(CACHE BACKLIGHT_DRIVER PROPERTY STRINGS pwm timer software custom)
string(JSON BACKLIGHT_PIN ERROR_VARIABLE NO_BACKLIGHT_PIN GET ${QMK_KEYBOARD_INFO_JSON_STRING} backlight pin)
if(${BACKLIGHT_ENABLE} AND NOT ${BACKLIGHT_PIN} STREQUAL "backlight-NOTFOUND")
target_sources(qmk PUBLIC
quantum/backlight/backlight.c
quantum/process_keycode/process_backlight.c
)
target_compile_definitions(qmk PUBLIC
BACKLIGHT_ENABLE
BACKLIGHT_PIN=${BACKLIGHT_PIN}
)
if(${BACKLIGHT_DRIVER} STREQUAL "custom")
target_compile_definitions(qmk PUBLIC BACKLIGHT_CUSTOM_DRIVER)
else()
target_sources(qmk PUBLIC quantum/backlight/backlight_driver_common.c)
if(${BACKLIGHT_DRIVER} STREQUAL "pwm")
target_sources(qmk PUBLIC quantum/backlight/backlight_${QMK_PLATFORM}.c)
else()
target_sources(qmk PUBLIC quantum/backlight/backlight_${BACKLIGHT_DRIVER}.c)
endif()
endif()
target_include_directories(qmk PUBLIC quantum/backlight)
target_include_directories(qmk PUBLIC drivers/oled)
# target_link_libraries(backlight qmk)
# target_include_directories(backlight PUBLIC quantum/backlight)
# target_include_directories(quantum PUBLIC quantum/backlight)
# target_link_libraries(backlight ${QMK_TARGET})
# target_link_libraries(backlight quantum)
endif()

View File

@@ -0,0 +1,70 @@
set(EEPROM_DRIVER "vendor" CACHE STRING "EEPROM driver")
set_property(CACHE EEPROM_DRIVER PROPERTY STRINGS vendor custom transient i2c spi wear_leveling legacy_stm32_flash)
set(WEAR_LEVELING_DRIVER "none" CACHE STRING "EEPROM wear-leveling driver")
set_property(CACHE WEAR_LEVELING_DRIVER PROPERTY STRINGS custom embedded_flash spi_flash rp2040_flash legacy)
target_compile_definitions(qmk PUBLIC
EEPROM_ENABLE
)
target_include_directories(qmk PUBLIC
platforms/${QMK_PLATFORM}/drivers/eeprom
drivers/eeprom
platforms/common
)
if(${EEPROM_DRIVER} STREQUAL "wear_leveling")
target_compile_definitions(qmk PUBLIC
EEPROM_DRIVER
EEPROM_WEAR_LEVELING
)
target_sources(qmk PUBLIC
drivers/eeprom/eeprom_driver.c
drivers/eeprom/eeprom_wear_leveling.c
)
elseif(${EEPROM_DRIVER} STREQUAL "vendor")
target_compile_definitions(qmk PUBLIC
EEPROM_VENDOR
)
if(${QMK_PLATFORM} STREQUAL "chibios")
if(${QMK_MCU} MATCHES "STM32F[1-9].*" OR ${QMK_MCU} MATCHES "WB32.*" OR ${QMK_MCU} MATCHES "GD32.*")
target_compile_definitions(qmk PUBLIC
EEPROM_DRIVER
EEPROM_WEAR_LEVELING
)
target_sources(qmk PUBLIC
drivers/eeprom/eeprom_driver.c
drivers/eeprom/eeprom_wear_leveling.c
)
set(WEAR_LEVELING_DRIVER "embedded_flash")
endif()
endif()
endif()
if(NOT ${WEAR_LEVELING_DRIVER} STREQUAL "none")
set(FNV_ENABLE TRUE)
target_compile_definitions(qmk PUBLIC
WEAR_LEVELING_ENABLE
)
target_include_directories(qmk PUBLIC
platforms/${QMK_PLATFORM}/drivers/wear_leveling
drivers/wear_leveling
quantum/wear_leveling
)
target_sources(qmk PUBLIC quantum/wear_leveling/wear_leveling.c)
if(${WEAR_LEVELING_DRIVER} STREQUAL "embedded_flash")
target_compile_definitions(qmk PUBLIC
HAL_USE_EFL
WEAR_LEVELING_EMBEDDED_FLASH
)
target_sources(qmk PUBLIC
platforms/${QMK_PLATFORM}/drivers/wear_leveling/wear_leveling_efl.c
)
# target_compile_options(qmk PUBLIC
# -include ${CMAKE_SOURCE_DIR}/platforms/${QMK_PLATFORM}/drivers/wear_leveling/wear_leveling_efl_config.h
# )
target_precompile_headers(qmk PUBLIC
${CMAKE_SOURCE_DIR}/platforms/${QMK_PLATFORM}/drivers/wear_leveling/wear_leveling_efl_config.h
)
endif()
endif()

9
cmake/features/fnv.cmake Normal file
View File

@@ -0,0 +1,9 @@
if(${FNV_ENABLE})
target_compile_definitions(qmk PUBLIC FNV_ENABLE)
target_include_directories(qmk PUBLIC lib/fnv)
target_sources(qmk PUBLIC
lib/fnv/qmk_fnv_type_validation.c
lib/fnv/hash_32a.c
lib/fnv/hash_64a.c
)
endif()

View File

@@ -0,0 +1,9 @@
message(STATUS "Custom Matrix: ${CUSTOM_MATRIX}")
set(CUSTOM_MATRIX "no" CACHE STRING "Custom matrix-scanning")
set_property(CACHE CUSTOM_MATRIX PROPERTY STRINGS yes lite no)
if(NOT ${CUSTOM_MATRIX} STREQUAL yes)
target_sources(qmk PUBLIC quantum/matrix_common.c)
if(NOT ${CUSTOM_MATRIX} STREQUAL lite)
target_sources(qmk PUBLIC quantum/matrix.c)
endif()
endif()

10
cmake/features/oled.cmake Normal file
View File

@@ -0,0 +1,10 @@
option(OLED_ENABLE "" OFF)
if(${OLED_ENABLE})
target_sources(qmk PUBLIC
drivers/oled/ssd1306_sh1106.c
platforms/${QMK_PLATFORM}/drivers/i2c_master.c)
target_compile_definitions(qmk PUBLIC OLED_ENABLE)
target_include_directories(qmk PUBLIC drivers)
target_include_directories(qmk PUBLIC drivers/oled)
target_include_directories(qmk PUBLIC platforms/${QMK_PLATFORM}/drivers)
endif()

View File

@@ -0,0 +1,144 @@
set(CMAKE_EXPORT_COMPILE_COMMANDS on)
include(ResolveToolchain)
set(QMK_TOOLCHAIN "arm-none-eabi")
set(QMK_PLATFORM "chibios")
set(QMK_PROTOCOL "chibios")
set(QMK_EXTENSION ".bin")
if(UNIX)
set(OS_SUFFIX "")
elseif(WIN32)
set(OS_SUFFIX ".exe")
endif()
find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_SYSTEM_PROCESSOR arm)
set(CMAKE_CROSS_COMPILING 1)
set(CMAKE_C_COMPILER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-gcc${OS_SUFFIX}" CACHE PATH "gcc" FORCE)
set(CMAKE_CXX_COMPILER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-g++${OS_SUFFIX}" CACHE PATH "g++" FORCE)
set(CMAKE_AR "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ar${OS_SUFFIX}" CACHE PATH "ar" FORCE)
set(CMAKE_AS "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-as${OS_SUFFIX}" CACHE PATH "as" FORCE)
set(CMAKE_LINKER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ld${OS_SUFFIX}" CACHE PATH "linker" FORCE)
set(CMAKE_NM "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-nm${OS_SUFFIX}" CACHE PATH "nm" FORCE)
set(CMAKE_OBJCOPY "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objcopy${OS_SUFFIX}" CACHE PATH "objcopy" FORCE)
set(CMAKE_OBJDUMP "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objdump${OS_SUFFIX}" CACHE PATH "objdump" FORCE)
set(CMAKE_STRIP "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-strip${OS_SUFFIX}" CACHE PATH "strip" FORCE)
set(CMAKE_RANLIB "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ranlib${OS_SUFFIX}" CACHE PATH "ranlib" FORCE)
set(CMAKE_SIZE "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-size${OS_SUFFIX}" CACHE PATH "size" FORCE)
find_program(CMAKE_MAKE_PROGRAM NAME make
PATHS
"${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-windows/bin/"
"${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-linux/bin/"
/usr/bin/
/usr/local/bin
/bin/
)
add_compile_options(
$<$<COMPILE_LANGUAGE:C>:-std=gnu11>
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
# -flto
-Os
-Wall
-Wstrict-prototypes
# -fcommon
# -g
-fomit-frame-pointer
-ffunction-sections
-fdata-sections
-fno-common
-fshort-wchar
-fno-builtin-printf
# -funsigned-char
# -funsigned-bitfields
# -ffunction-sections
# -fdata-sections
# -fpack-struct
# -fshort-enums
# -fno-builtin-printf
# $<$<COMPILE_LANGUAGE:C>:-fno-inline-small-functions>
# $<$<COMPILE_LANGUAGE:C>:-fno-strict-aliasing>
# $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
)
add_link_options(
-Wl,--gc-sections
-nostartfiles
-Wl,--no-wchar-size-warning
--specs=nano.specs
-lm
)
macro(add_qmk_executable target_name)
set(elf_file ${target_name}.elf)
set(map_file ${target_name}.map)
set(bin_file ${target_name}.bin)
set(lst_file ${target_name}.lst)
add_link_options(
-Wl,-Map=${map_file},--cref
)
# create elf file
add_executable(qmk ${ARGN})
# add_executable(${elf_file} ${ARGN})
# target_link_libraries(${elf_file} qmk)
set_target_properties(qmk
PROPERTIES
OUTPUT_NAME ${elf_file}
)
# generate the lst file
add_custom_command(
OUTPUT ${lst_file}
COMMAND ${CMAKE_OBJDUMP} -h -S ${elf_file} > ${lst_file}
DEPENDS qmk
)
# add_custom_command(
# OUTPUT "print-size-${elf_file}"
# COMMAND
# ${CMAKE_SIZE} ${elf_file}
# DEPENDS ${elf_file}
# )
# add_custom_command(
# OUTPUT "print-size-${bin_file}"
# COMMAND
# ${CMAKE_SIZE} ${bin_file} sizeafter
# DEPENDS ${bin_file}
# )
add_custom_command(
TARGET qmk
POST_BUILD
COMMAND ${CMAKE_OBJCOPY} -O binary ${elf_file} ${CMAKE_SOURCE_DIR}/build/${bin_file}
# COMMAND ${CMAKE_COMMAND} -E copy ${elf_file} ${CMAKE_SOURCE_DIR}/build/${elf_file}
# COMMAND ${CMAKE_COMMAND} -E copy ${lst_file} ${CMAKE_SOURCE_DIR}/build/${lst_file}
# COMMAND ${CMAKE_COMMAND} -E copy ${map_file} ${CMAKE_SOURCE_DIR}/build/${map_file}
)
# build the intel hex file for the device
add_custom_target(${target_name} ALL
DEPENDS ${elf_file} ${lst_file}
)
set_target_properties(${target_name}
PROPERTIES
OUTPUT_NAME ${bin_file}
)
endmacro(add_qmk_executable)

182
cmake/toolchains/avr.cmake Normal file
View File

@@ -0,0 +1,182 @@
#
# AVR GCC Toolchain file
#
# @author Natesh Narain
# @since Feb 06 2016
set(CMAKE_EXPORT_COMPILE_COMMANDS on)
include(ResolveToolchain)
set(QMK_TOOLCHAIN "avr")
set(QMK_PLATFORM "avr")
set(QMK_PROTOCOL "lufa")
set(QMK_EXTENSION ".hex")
if(UNIX)
set(OS_SUFFIX "")
elseif(WIN32)
set(OS_SUFFIX ".exe")
endif()
find_toolchain(avr TOOLCHAIN_ROOT)
# setup the AVR compiler variables
set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_SYSTEM_PROCESSOR avr)
set(CMAKE_CROSS_COMPILING 1)
set(CMAKE_C_COMPILER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-gcc${OS_SUFFIX}" CACHE PATH "gcc" FORCE)
set(CMAKE_CXX_COMPILER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-g++${OS_SUFFIX}" CACHE PATH "g++" FORCE)
set(CMAKE_AR "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ar${OS_SUFFIX}" CACHE PATH "ar" FORCE)
set(CMAKE_AS "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-as${OS_SUFFIX}" CACHE PATH "as" FORCE)
set(CMAKE_LINKER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ld${OS_SUFFIX}" CACHE PATH "linker" FORCE)
set(CMAKE_NM "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-nm${OS_SUFFIX}" CACHE PATH "nm" FORCE)
set(CMAKE_OBJCOPY "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objcopy${OS_SUFFIX}" CACHE PATH "objcopy" FORCE)
set(CMAKE_OBJDUMP "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objdump${OS_SUFFIX}" CACHE PATH "objdump" FORCE)
set(CMAKE_STRIP "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-strip${OS_SUFFIX}" CACHE PATH "strip" FORCE)
set(CMAKE_RANLIB "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ranlib${OS_SUFFIX}" CACHE PATH "ranlib" FORCE)
set(AVR_SIZE "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-size${OS_SUFFIX}" CACHE PATH "size" FORCE)
# set(CMAKE_EXE_LINKER_FLAGS "-L /usr/lib/gcc/avr/4.8.2")
# avr uploader config
find_program(AVR_UPLOAD
NAME
avrdude
PATHS
/usr/bin/
$ENV{AVR_ROOT}
)
find_program(CMAKE_MAKE_PROGRAM NAME make
PATHS
"${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-windows/bin/"
"${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-linux/bin/"
/usr/bin/
/usr/local/bin
/bin/
)
# setup the avr exectable macro
# set(AVR_LINKER_LIBS "-lc -lm -lgcc -Wl,-lprintf_flt -Wl,-u,vfprintf")
add_compile_options(
$<$<COMPILE_LANGUAGE:C>:-std=gnu11>
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
-flto
# -mrelax
-Os
-Wall
-Wstrict-prototypes
-fcommon
# -g
$<$<BOOL:${WIN32}>:--param=min-pagesize=0>
-funsigned-char
-funsigned-bitfields
-ffunction-sections
-fdata-sections
-fpack-struct
-fshort-enums
-mcall-prologues
-fno-builtin-printf
$<$<COMPILE_LANGUAGE:C>:-fno-inline-small-functions>
$<$<COMPILE_LANGUAGE:C>:-fno-strict-aliasing>
$<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
)
add_compile_definitions(
F_CPU=16000000
F_USB=16000000UL
__AVR_ATmega32U4__
LTO_ENABLE
)
add_link_options(
-Wl,--gc-sections
)
macro(add_qmk_executable target_name)
set(elf_file ${target_name}.elf)
set(map_file ${target_name}.map)
set(hex_file ${target_name}.hex)
set(lst_file ${target_name}.lst)
add_compile_options(
-mmcu=${QMK_MCU}
)
add_link_options(
-mmcu=${QMK_MCU}
-Wl,-Map=${map_file}
)
# create elf file
# add_executable(${elf_file} ${ARGN})
# target_link_libraries(${elf_file} qmk)
add_executable(qmk ${ARGN})
set_target_properties(qmk
PROPERTIES
OUTPUT_NAME ${elf_file}
)
# set_target_properties(${elf_file}
# PROPERTIES
# COMPILE_FLAGS "-mmcu=${QMK_MCU} ${COMPILE_OPTIONS}"
# LINK_FLAGS "-mmcu=${QMK_MCU} ${LINK_OPTIONS}"
# )
# add_custom_target(compileOptions
# COMMAND cmake -P ${CMAKE_SOURCE_DIR}/cmake/WriteCompileOptions.cmake
# COMMENT "Writing compile_flags.txt"
# )
# generate the lst file
add_custom_command(
OUTPUT ${lst_file}
COMMAND ${CMAKE_OBJDUMP} -h -S ${elf_file} > ${lst_file}
DEPENDS ${elf_file}
)
# create hex file
add_custom_command(
OUTPUT ${hex_file}
# COMMAND ${CMAKE_OBJCOPY} -j .text -j .data -O ihex ${elf_file} ${hex_file}
COMMAND ${CMAKE_OBJCOPY} -O ihex -R .eeprom -R .fuse -R .lock -R .signature ${elf_file} ${hex_file}
DEPENDS ${elf_file}
)
add_custom_command(
OUTPUT "print-size-${elf_file}"
COMMAND ${AVR_SIZE} ${elf_file}
DEPENDS ${elf_file}
)
add_custom_command(
OUTPUT "print-size-${hex_file}"
COMMAND ${AVR_SIZE} ${hex_file}
DEPENDS ${hex_file}
)
add_custom_target(copy_hex
COMMAND ${CMAKE_COMMAND} -E copy ${hex_file} ${CMAKE_SOURCE_DIR}/build/${hex_file}
DEPENDS ${hex_file}
)
# build the intel hex file for the device
add_custom_target(${target_name} ALL
DEPENDS ${hex_file} ${lst_file} "print-size-${elf_file}" "print-size-${hex_file}" copy_hex
)
set_target_properties(${target_name}
PROPERTIES
OUTPUT_NAME ${hex_file}
)
endmacro(add_qmk_executable)

View File

@@ -0,0 +1,16 @@
if(${USE_PICOLIBC})
add_compile_options(
--specs=picolibc.specs
)
add_compile_definitions(USE_PICOLIBC)
add_link_options(
-Wl,--defsym=__heap_start=__heap_base__,--defsym=__heap_end=__heap_end__
)
endif()
add_compile_options(
-march=${MCU_ARCH}
-mabi=${MCU_ABI}
-mcmodel=${MCU_CMODEL}
-mstrict-align
)

View File

@@ -0,0 +1,375 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ² │ & │ é │ " │ ' │ ( │ § │ è │ ! │ ç │ à │ ) │ - │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ µ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ = │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "BE_SUP2",
"label": "²",
}
"KC_1": {
"key": "BE_AMPR",
"label": "&",
}
"KC_2": {
"key": "BE_EACU",
"label": "é",
}
"KC_3": {
"key": "BE_DQUO",
"label": "\"",
}
"KC_4": {
"key": "BE_QUOT",
"label": "'",
}
"KC_5": {
"key": "BE_LPRN",
"label": "(",
}
"KC_6": {
"key": "BE_SECT",
"label": "§",
}
"KC_7": {
"key": "BE_EGRV",
"label": "è",
}
"KC_8": {
"key": "BE_EXLM",
"label": "!",
}
"KC_9": {
"key": "BE_CCED",
"label": "ç",
}
"KC_0": {
"key": "BE_AGRV",
"label": "à",
}
"KC_MINS": {
"key": "BE_RPRN",
"label": ")",
}
"KC_EQL": {
"key": "BE_MINS",
"label": "-",
}
"KC_Q": {
"key": "BE_A",
"label": "A",
}
"KC_W": {
"key": "BE_Z",
"label": "Z",
}
"KC_E": {
"key": "BE_E",
"label": "E",
}
"KC_R": {
"key": "BE_R",
"label": "R",
}
"KC_T": {
"key": "BE_T",
"label": "T",
}
"KC_Y": {
"key": "BE_Y",
"label": "Y",
}
"KC_U": {
"key": "BE_U",
"label": "U",
}
"KC_I": {
"key": "BE_I",
"label": "I",
}
"KC_O": {
"key": "BE_O",
"label": "O",
}
"KC_P": {
"key": "BE_P",
"label": "P",
}
"KC_LBRC": {
"key": "BE_DCIR",
"label": "^ (dead)",
}
"KC_RBRC": {
"key": "BE_DLR",
"label": "$",
}
"KC_A": {
"key": "BE_Q",
"label": "Q",
}
"KC_S": {
"key": "BE_S",
"label": "S",
}
"KC_D": {
"key": "BE_D",
"label": "D",
}
"KC_F": {
"key": "BE_F",
"label": "F",
}
"KC_G": {
"key": "BE_G",
"label": "G",
}
"KC_H": {
"key": "BE_H",
"label": "H",
}
"KC_J": {
"key": "BE_J",
"label": "J",
}
"KC_K": {
"key": "BE_K",
"label": "K",
}
"KC_L": {
"key": "BE_L",
"label": "L",
}
"KC_SCLN": {
"key": "BE_M",
"label": "M",
}
"KC_QUOT": {
"key": "BE_UGRV",
"label": "ù",
}
"KC_NUHS": {
"key": "BE_MICR",
"label": "µ",
}
"KC_NUBS": {
"key": "BE_LABK",
"label": "<",
}
"KC_Z": {
"key": "BE_W",
"label": "W",
}
"KC_X": {
"key": "BE_X",
"label": "X",
}
"KC_C": {
"key": "BE_C",
"label": "C",
}
"KC_V": {
"key": "BE_V",
"label": "V",
}
"KC_B": {
"key": "BE_B",
"label": "B",
}
"KC_N": {
"key": "BE_N",
"label": "N",
}
"KC_M": {
"key": "BE_COMM",
"label": ",",
}
"KC_COMM": {
"key": "BE_SCLN",
"label": ";",
}
"KC_DOT": {
"key": "BE_COLN",
"label": ":",
}
"KC_SLSH": {
"key": "BE_EQL",
"label": "=",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ³ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ _ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ * │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ % │ £ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ > │ │ │ │ │ │ │ ? │ . │ / │ + │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(BE_SUP2)": {
"key": "BE_SUP3",
"label": "³",
}
"S(BE_AMPR)": {
"key": "BE_1",
"label": "1",
}
"S(BE_EACU)": {
"key": "BE_2",
"label": "2",
}
"S(BE_DQUO)": {
"key": "BE_3",
"label": "3",
}
"S(BE_QUOT)": {
"key": "BE_4",
"label": "4",
}
"S(BE_LPRN)": {
"key": "BE_5",
"label": "5",
}
"S(BE_SECT)": {
"key": "BE_6",
"label": "6",
}
"S(BE_EGRV)": {
"key": "BE_7",
"label": "7",
}
"S(BE_EXLM)": {
"key": "BE_8",
"label": "8",
}
"S(BE_CCED)": {
"key": "BE_9",
"label": "9",
}
"S(BE_AGRV)": {
"key": "BE_0",
"label": "0",
}
"S(BE_RPRN)": {
"key": "BE_DEG",
"label": "°",
}
"S(BE_MINS)": {
"key": "BE_UNDS",
"label": "_",
}
"S(BE_DCIR)": {
"key": "BE_DIAE",
"label": "¨ (dead)",
}
"S(BE_DLR)": {
"key": "BE_ASTR",
"label": "*",
}
"S(BE_UGRV)": {
"key": "BE_PERC",
"label": "%",
}
"S(BE_MICR)": {
"key": "BE_PND",
"label": "£",
}
"S(BE_LABK)": {
"key": "BE_RABK",
"label": ">",
}
"S(BE_COMM)": {
"key": "BE_QUES",
"label": "?",
}
"S(BE_SCLN)": {
"key": "BE_DOT",
"label": ".",
}
"S(BE_COLN)": {
"key": "BE_SLSH",
"label": "/",
}
"S(BE_EQL)": {
"key": "BE_PLUS",
"label": "+",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ | │ @ │ # │ │ │ ^ │ │ │ { │ } │ │ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ ´ │ ` │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ \ │ │ │ │ │ │ │ │ │ │ ~ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(BE_AMPR)": {
"key": "BE_PIPE",
"label": "|",
}
"ALGR(BE_EACU)": {
"key": "BE_AT",
"label": "@",
}
"ALGR(BE_DQUO)": {
"key": "BE_HASH",
"label": "#",
}
"ALGR(BE_SECT)": {
"key": "BE_CIRC",
"label": "^",
}
"ALGR(BE_CCED)": {
"key": "BE_LCBR",
"label": "{",
}
"ALGR(BE_AGRV)": {
"key": "BE_RCBR",
"label": "}",
}
"ALGR(BE_E)": {
"key": "BE_EURO",
"label": "€",
}
"ALGR(BE_DCIR)": {
"key": "BE_LBRC",
"label": "[",
}
"ALGR(BE_DLR)": {
"key": "BE_RBRC",
"label": "]",
}
"ALGR(BE_UGRV)": {
"key": "BE_ACUT",
"label": "´ (dead)",
}
"ALGR(BE_MICR)": {
"key": "BE_GRV",
"label": "` (dead)",
}
"ALGR(BE_LABK)": {
"key": "BE_BSLS",
"label": "\\",
}
"ALGR(BE_EQL)": {
"key": "BE_TILD",
"label": "~",
}
}
}

View File

@@ -0,0 +1,632 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ $ │ " │ « │ » │ ( │ ) │ @ │ + │ - │ / │ * │ = │ % │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ B │ É │ P │ O │ È │ ^ │ V │ D │ L │ J │ Z │ W │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ A │ U │ I │ E │ , │ C │ T │ S │ R │ N │ M │ Ç │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ Ê │ À │ Y │ X │ . │ K │ ' │ Q │ G │ H │ F │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "BP_DLR",
"label": "$",
}
"KC_1": {
"key": "BP_DQUO",
"label": "\"",
}
"KC_2": {
"key": "BP_LDAQ",
"label": "«",
}
"KC_3": {
"key": "BP_RDAQ",
"label": "»",
}
"KC_4": {
"key": "BP_LPRN",
"label": "(",
}
"KC_5": {
"key": "BP_RPRN",
"label": ")",
}
"KC_6": {
"key": "BP_AT",
"label": "@",
}
"KC_7": {
"key": "BP_PLUS",
"label": "+",
}
"KC_8": {
"key": "BP_MINS",
"label": "-",
}
"KC_9": {
"key": "BP_SLSH",
"label": "/",
}
"KC_0": {
"key": "BP_ASTR",
"label": "*",
}
"KC_MINS": {
"key": "BP_EQL",
"label": "=",
}
"KC_EQL": {
"key": "BP_PERC",
"label": "%",
}
"KC_Q": {
"key": "BP_B",
"label": "B",
}
"KC_W": {
"key": "BP_EACU",
"label": "É",
}
"KC_E": {
"key": "BP_P",
"label": "P",
}
"KC_R": {
"key": "BP_O",
"label": "O",
}
"KC_T": {
"key": "BP_EGRV",
"label": "È",
}
"KC_Y": {
"key": "BP_DCIR",
"label": "^ (dead)",
}
"KC_U": {
"key": "BP_V",
"label": "V",
}
"KC_I": {
"key": "BP_D",
"label": "D",
}
"KC_O": {
"key": "BP_L",
"label": "L",
}
"KC_P": {
"key": "BP_J",
"label": "J",
}
"KC_LBRC": {
"key": "BP_Z",
"label": "Z",
}
"KC_RBRC": {
"key": "BP_W",
"label": "W",
}
"KC_A": {
"key": "BP_A",
"label": "A",
}
"KC_S": {
"key": "BP_U",
"label": "U",
}
"KC_D": {
"key": "BP_I",
"label": "I",
}
"KC_F": {
"key": "BP_E",
"label": "E",
}
"KC_G": {
"key": "BP_COMM",
"label": ",",
}
"KC_H": {
"key": "BP_C",
"label": "C",
}
"KC_J": {
"key": "BP_T",
"label": "T",
}
"KC_K": {
"key": "BP_S",
"label": "S",
}
"KC_L": {
"key": "BP_R",
"label": "R",
}
"KC_SCLN": {
"key": "BP_N",
"label": "N",
}
"KC_QUOT": {
"key": "BP_M",
"label": "M",
}
"KC_BSLS": {
"key": "BP_CCED",
"label": "Ç",
}
"KC_NUBS": {
"key": "BP_ECIR",
"label": "Ê",
}
"KC_Z": {
"key": "BP_AGRV",
"label": "À",
}
"KC_X": {
"key": "BP_Y",
"label": "Y",
}
"KC_C": {
"key": "BP_X",
"label": "X",
}
"KC_V": {
"key": "BP_DOT",
"label": ".",
}
"KC_B": {
"key": "BP_K",
"label": "K",
}
"KC_N": {
"key": "BP_QUOT",
"label": "'",
}
"KC_M": {
"key": "BP_Q",
"label": "Q",
}
"KC_COMM": {
"key": "BP_G",
"label": "G",
}
"KC_DOT": {
"key": "BP_H",
"label": "H",
}
"KC_SLSH": {
"key": "BP_F",
"label": "F",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ ` │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ ! │ │ │ │ │ │ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ ; │ │ │ │ │ │ │ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ │ │ │ : │ │ ? │ │ │ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(BP_DLR)": {
"key": "BP_HASH",
"label": "#",
}
"S(BP_DQUO)": {
"key": "BP_1",
"label": "1",
}
"S(BP_LDAQ)": {
"key": "BP_2",
"label": "2",
}
"S(BP_RDAQ)": {
"key": "BP_3",
"label": "3",
}
"S(BP_LPRN)": {
"key": "BP_4",
"label": "4",
}
"S(BP_RPRN)": {
"key": "BP_5",
"label": "5",
}
"S(BP_AT)": {
"key": "BP_6",
"label": "6",
}
"S(BP_PLUS)": {
"key": "BP_7",
"label": "7",
}
"S(BP_MINS)": {
"key": "BP_8",
"label": "8",
}
"S(BP_SLSH)": {
"key": "BP_9",
"label": "9",
}
"S(BP_ASTR)": {
"key": "BP_0",
"label": "0",
}
"S(BP_EQL)": {
"key": "BP_DEG",
"label": "°",
}
"S(BP_PERC)": {
"key": "BP_GRV",
"label": "`",
}
"S(BP_DCIR)": {
"key": "BP_EXLM",
"label": "!",
}
"S(BP_COMM)": {
"key": "BP_SCLN",
"label": ";",
}
"S(BP_DOT)": {
"key": "BP_COLN",
"label": ":",
}
"S(BP_QUOT)": {
"key": "BP_QUES",
"label": "?",
}
"S(KC_SPC)": {
"key": "BP_NBSP",
"label": "(non-breaking space)",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ — │ < │ > │ [ │ ] │ ^ │ ± │ │ ÷ │ × │ ≠ │ ‰ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ | │ ´ │ & │ Œ │ ` │ ¡ │ ˇ │ Ð │ / │ IJ │ Ə │ ˘ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ Æ │ Ù │ ¨ │ € │ │ © │ Þ │ ẞ │ ® │ ~ │ ¯ │ ¸ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ \ │ { │ } │ … │ ~ │ ¿ │ ° │ │ † │ ˛ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ _ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(BP_DLR)": {
"key": "BP_NDSH",
"label": "",
}
"ALGR(BP_DQUO)": {
"key": "BP_MDSH",
"label": "—",
}
"ALGR(BP_LDAQ)": {
"key": "BP_LABK",
"label": "<",
}
"ALGR(BP_RDAQ)": {
"key": "BP_RABK",
"label": ">",
}
"ALGR(BP_LPRN)": {
"key": "BP_LBRC",
"label": "[",
}
"ALGR(BP_RPRN)": {
"key": "BP_RBRC",
"label": "]",
}
"ALGR(BP_AT)": {
"key": "BP_CIRC",
"label": "^",
}
"ALGR(BP_PLUS)": {
"key": "BP_PLMN",
"label": "±",
}
"ALGR(BP_MINS)": {
"key": "BP_MMNS",
"label": "",
}
"ALGR(BP_SLSH)": {
"key": "BP_DIV",
"label": "÷",
}
"ALGR(BP_ASTR)": {
"key": "BP_MUL",
"label": "×",
}
"ALGR(BP_EQL)": {
"key": "BP_NEQL",
"label": "≠",
}
"ALGR(BP_PERC)": {
"key": "BP_PERM",
"label": "‰",
}
"ALGR(BP_B)": {
"key": "BP_PIPE",
"label": "|",
}
"ALGR(BP_EACU)": {
"key": "BP_ACUT",
"label": "´ (dead)",
}
"ALGR(BP_P)": {
"key": "BP_AMPR",
"label": "&",
}
"ALGR(BP_O)": {
"key": "BP_OE",
"label": "Œ",
}
"ALGR(BP_EGRV)": {
"key": "BP_DGRV",
"label": "` (dead)",
}
"ALGR(BP_DCIR)": {
"key": "BP_IEXL",
"label": "¡",
}
"ALGR(BP_V)": {
"key": "BP_CARN",
"label": "ˇ (dead)",
}
"ALGR(BP_D)": {
"key": "BP_ETH",
"label": "Ð",
}
"ALGR(BP_L)": {
"key": "BP_DSLS",
"label": "/ (dead)",
}
"ALGR(BP_J)": {
"key": "BP_IJ",
"label": "IJ",
}
"ALGR(BP_Z)": {
"key": "BP_SCHW",
"label": "Ə",
}
"ALGR(BP_W)": {
"key": "BP_BREV",
"label": "˘ (dead)",
}
"ALGR(BP_A)": {
"key": "BP_AE",
"label": "Æ",
}
"ALGR(BP_U)": {
"key": "BP_UGRV",
"label": "Ù",
}
"ALGR(BP_I)": {
"key": "BP_DIAE",
"label": "¨ (dead)",
}
"ALGR(BP_E)": {
"key": "BP_EURO",
"label": "€",
}
"ALGR(BP_C)": {
"key": "BP_COPY",
"label": "©",
}
"ALGR(BP_T)": {
"key": "BP_THRN",
"label": "Þ",
}
"ALGR(BP_S)": {
"key": "BP_SS",
"label": "ẞ",
}
"ALGR(BP_R)": {
"key": "BP_REGD",
"label": "®",
}
"ALGR(BP_N)": {
"key": "BP_DTIL",
"label": "~ (dead)",
}
"ALGR(BP_M)": {
"key": "BP_MACR",
"label": "¯ (dead)",
}
"ALGR(BP_CCED)": {
"key": "BP_CEDL",
"label": "¸ (dead)",
}
"ALGR(BP_AGRV)": {
"key": "BP_BSLS",
"label": "\\",
}
"ALGR(BP_Y)": {
"key": "BP_LCBR",
"label": "{",
}
"ALGR(BP_X)": {
"key": "BP_RCBR",
"label": "}",
}
"ALGR(BP_DOT)": {
"key": "BP_ELLP",
"label": "…",
}
"ALGR(BP_K)": {
"key": "BP_TILD",
"label": "~",
}
"ALGR(BP_QUES)": {
"key": "BP_IQUE",
"label": "¿",
}
"ALGR(BP_Q)": {
"key": "BP_RNGA",
"label": "° (dead)",
}
"ALGR(BP_G)": {
"key": "BP_DGRK",
"label": "µ (dead Greek key)",
}
"ALGR(BP_H)": {
"key": "BP_DAGG",
"label": "†",
}
"ALGR(BP_F)": {
"key": "BP_OGON",
"label": "˛ (dead)",
}
"ALGR(KC_SPC)": {
"key": "BP_UNDS",
"label": "_",
}
/* Shift+AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ¶ │ „ │ “ │ ” │ ≤ │ ≥ │ │ ¬ │ ¼ │ ½ │ ¾ │ │ ″ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ ¦ │ ˝ │ § │ │ │ │ │ │ │ │ │ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ ˙ │ ¤ │ ̛ │ ſ │ │ │ ™ │ │ º │ , │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ │ │ · │ ⌨ │ ̉ │ ̣ │ │ ‡ │ ª │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(ALGR(BP_DLR))": {
"key": "BP_PARA",
"label": "¶",
}
"S(ALGR(BP_DQUO))": {
"key": "BP_DLQU",
"label": "„",
}
"S(ALGR(BP_LDAQ))": {
"key": "BP_LDQU",
"label": "“",
}
"S(ALGR(BP_RDAQ))": {
"key": "BP_RDQU",
"label": "”",
}
"S(ALGR(BP_LPRN))": {
"key": "BP_LEQL",
"label": "≤",
}
"S(ALGR(BP_RPRN))": {
"key": "BP_GEQL",
"label": "≥",
}
"S(ALGR(BP_PLUS))": {
"key": "BP_NOT",
"label": "¬",
}
"S(ALGR(BP_MINS))": {
"key": "BP_QRTR",
"label": "¼",
}
"S(ALGR(BP_SLSH))": {
"key": "BP_HALF",
"label": "½",
}
"S(ALGR(BP_ASTR))": {
"key": "BP_TQTR",
"label": "¾",
}
"S(ALGR(BP_EQL))": {
"key": "BP_PRIM",
"label": "",
}
"S(ALGR(BP_PERC))": {
"key": "BP_DPRM",
"label": "″",
}
"S(ALGR(BP_B))": {
"key": "BP_BRKP",
"label": "¦",
}
"S(ALGR(BP_EACU))": {
"key": "BP_DACU",
"label": "˝ (dead)",
}
"S(ALGR(BP_P))": {
"key": "BP_SECT",
"label": "§",
}
"S(ALGR(BP_I))": {
"key": "BP_DOTA",
"label": "˙ (dead)",
}
"S(ALGR(BP_E))": {
"key": "BP_CURR",
"label": "¤ (dead)",
}
"S(ALGR(BP_COMM))": {
"key": "BP_HORN",
"label": "̛ (dead)",
}
"S(ALGR(BP_C))": {
"key": "BP_LNGS",
"label": "ſ",
}
"S(ALGR(BP_R))": {
"key": "BP_TM",
"label": "™",
}
"S(ALGR(BP_M))": {
"key": "BP_MORD",
"label": "º",
}
"S(ALGR(BP_CCED))": {
"key": "BP_DCMM",
"label": ", (dead)",
}
"S(ALGR(BP_Y))": {
"key": "BP_LSQU",
"label": "",
}
"S(ALGR(BP_X))": {
"key": "BP_RSQU",
"label": "",
}
"S(ALGR(BP_DOT))": {
"key": "BP_MDDT",
"label": "·",
}
"S(ALGR(BP_K))": {
"key": "BP_KEYB",
"label": "⌨",
}
"S(ALGR(BP_QUOT))": {
"key": "BP_HOKA",
"label": "̉ (dead)",
}
"S(ALGR(BP_Q))": {
"key": "BP_DOTB",
"label": "̣ (dead)",
}
"S(ALGR(BP_H))": {
"key": "BP_DDAG",
"label": "‡",
}
"S(ALGR(BP_F))": {
"key": "BP_FORD",
"label": "ª",
}
"S(ALGR(KC_SPC))": {
"key": "BP_NNBS",
"label": "(narrow non-breaking space)",
}
}
}

View File

@@ -0,0 +1,379 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ' │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ´ │ [ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ç │ ~ │ ] │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
* │ │ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ ; │ / │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "BR_QUOT",
"label": "'",
}
"KC_1": {
"key": "BR_1",
"label": "1",
}
"KC_2": {
"key": "BR_2",
"label": "2",
}
"KC_3": {
"key": "BR_3",
"label": "3",
}
"KC_4": {
"key": "BR_4",
"label": "4",
}
"KC_5": {
"key": "BR_5",
"label": "5",
}
"KC_6": {
"key": "BR_6",
"label": "6",
}
"KC_7": {
"key": "BR_7",
"label": "7",
}
"KC_8": {
"key": "BR_8",
"label": "8",
}
"KC_9": {
"key": "BR_9",
"label": "9",
}
"KC_0": {
"key": "BR_0",
"label": "0",
}
"KC_MINS": {
"key": "BR_MINS",
"label": "-",
}
"KC_EQL": {
"key": "BR_EQL",
"label": "=",
}
"KC_Q": {
"key": "BR_Q",
"label": "Q",
}
"KC_W": {
"key": "BR_W",
"label": "W",
}
"KC_E": {
"key": "BR_E",
"label": "E",
}
"KC_R": {
"key": "BR_R",
"label": "R",
}
"KC_T": {
"key": "BR_T",
"label": "T",
}
"KC_Y": {
"key": "BR_Y",
"label": "Y",
}
"KC_U": {
"key": "BR_U",
"label": "U",
}
"KC_I": {
"key": "BR_I",
"label": "I",
}
"KC_O": {
"key": "BR_O",
"label": "O",
}
"KC_P": {
"key": "BR_P",
"label": "P",
}
"KC_LBRC": {
"key": "BR_ACUT",
"label": "´ (dead)",
}
"KC_RBRC": {
"key": "BR_LBRC",
"label": "[",
}
"KC_A": {
"key": "BR_A",
"label": "A",
}
"KC_S": {
"key": "BR_S",
"label": "S",
}
"KC_D": {
"key": "BR_D",
"label": "D",
}
"KC_F": {
"key": "BR_F",
"label": "F",
}
"KC_G": {
"key": "BR_G",
"label": "G",
}
"KC_H": {
"key": "BR_H",
"label": "H",
}
"KC_J": {
"key": "BR_J",
"label": "J",
}
"KC_K": {
"key": "BR_K",
"label": "K",
}
"KC_L": {
"key": "BR_L",
"label": "L",
}
"KC_SCLN": {
"key": "BR_CCED",
"label": "Ç",
}
"KC_QUOT": {
"key": "BR_TILD",
"label": "~ (dead)",
}
"KC_BSLS": {
"key": "BR_RBRC",
"label": "]",
}
"KC_NUBS": {
"key": "BR_BSLS",
"label": "\\",
}
"KC_Z": {
"key": "BR_Z",
"label": "Z",
}
"KC_X": {
"key": "BR_X",
"label": "X",
}
"KC_C": {
"key": "BR_C",
"label": "C",
}
"KC_V": {
"key": "BR_V",
"label": "V",
}
"KC_B": {
"key": "BR_B",
"label": "B",
}
"KC_N": {
"key": "BR_N",
"label": "N",
}
"KC_M": {
"key": "BR_M",
"label": "M",
}
"KC_COMM": {
"key": "BR_COMM",
"label": ",",
}
"KC_DOT": {
"key": "BR_DOT",
"label": ".",
}
"KC_SLSH": {
"key": "BR_SCLN",
"label": ";",
}
"KC_INT1": {
"key": "BR_SLSH",
"label": "/",
}
"KC_PCMM": {
"key": "BR_PDOT",
"label": ".",
}
"KC_PDOT": {
"key": "BR_PCMM",
"label": ",",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ " │ ! │ @ │ # │ $ │ % │ ¨ │ & │ * │ ( │ ) │ _ │ + │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ ` │ { │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ ^ │ } │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
* │ │ | │ │ │ │ │ │ │ │ < │ > │ : │ ? │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(BR_QUOT)": {
"key": "BR_DQUO",
"label": "\"",
}
"S(BR_1)": {
"key": "BR_EXLM",
"label": "!",
}
"S(BR_2)": {
"key": "BR_AT",
"label": "@",
}
"S(BR_3)": {
"key": "BR_HASH",
"label": "#",
}
"S(BR_4)": {
"key": "BR_DLR",
"label": "$",
}
"S(BR_5)": {
"key": "BR_PERC",
"label": "%",
}
"S(BR_6)": {
"key": "BR_DIAE",
"label": "¨ (dead)",
}
"S(BR_7)": {
"key": "BR_AMPR",
"label": "&",
}
"S(BR_8)": {
"key": "BR_ASTR",
"label": "*",
}
"S(BR_9)": {
"key": "BR_LPRN",
"label": "(",
}
"S(BR_0)": {
"key": "BR_RPRN",
"label": ")",
}
"S(BR_MINS)": {
"key": "BR_UNDS",
"label": "_",
}
"S(BR_EQL)": {
"key": "BR_PLUS",
"label": "+",
}
"S(BR_ACUT)": {
"key": "BR_GRV",
"label": "` (dead)",
}
"S(BR_LBRC)": {
"key": "BR_LCBR",
"label": "{",
}
"S(BR_TILD)": {
"key": "BR_CIRC",
"label": "^ (dead)",
}
"S(BR_RBRC)": {
"key": "BR_RCBR",
"label": "}",
}
"S(BR_BSLS)": {
"key": "BR_PIPE",
"label": "|",
}
"S(BR_COMM)": {
"key": "BR_LABK",
"label": "<",
}
"S(BR_DOT)": {
"key": "BR_RABK",
"label": ">",
}
"S(BR_SCLN)": {
"key": "BR_COLN",
"label": ":",
}
"S(BR_SLSH)": {
"key": "BR_QUES",
"label": "?",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ ¹ │ ² │ ³ │ £ │ ¢ │ ¬ │ │ │ │ │ │ § │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ ° │ │ │ │ │ │ │ │ │ ª │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ │ º │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
* │ │ │ │ │ ₢ │ │ │ │ │ │ │ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(BR_1)": {
"key": "BR_SUP1",
"label": "¹",
}
"ALGR(BR_2)": {
"key": "BR_SUP2",
"label": "²",
}
"ALGR(BR_3)": {
"key": "BR_SUP3",
"label": "³",
}
"ALGR(BR_4)": {
"key": "BR_PND",
"label": "£",
}
"ALGR(BR_5)": {
"key": "BR_CENT",
"label": "¢",
}
"ALGR(BR_6)": {
"key": "BR_NOT",
"label": "¬",
}
"ALGR(BR_EQL)": {
"key": "BR_SECT",
"label": "§",
}
"ALGR(BR_E)": {
"key": "BR_DEG",
"label": "°",
}
"ALGR(BR_LBRC)": {
"key": "BR_FORD",
"label": "ª",
}
"ALGR(BR_RBRC)": {
"key": "BR_MORD",
"label": "º",
}
"ALGR(BR_C)": {
"key": "BR_CRUZ",
"label": "₢",
}
}
}

View File

@@ -0,0 +1,641 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ / │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ Ç │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ È │ À │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ Ù │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ É │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "CA_SLSH",
"label": "/",
}
"KC_1": {
"key": "CA_1",
"label": "1",
}
"KC_2": {
"key": "CA_2",
"label": "2",
}
"KC_3": {
"key": "CA_3",
"label": "3",
}
"KC_4": {
"key": "CA_4",
"label": "4",
}
"KC_5": {
"key": "CA_5",
"label": "5",
}
"KC_6": {
"key": "CA_6",
"label": "6",
}
"KC_7": {
"key": "CA_7",
"label": "7",
}
"KC_8": {
"key": "CA_8",
"label": "8",
}
"KC_9": {
"key": "CA_9",
"label": "9",
}
"KC_0": {
"key": "CA_0",
"label": "0",
}
"KC_MINS": {
"key": "CA_MINS",
"label": "-",
}
"KC_EQL": {
"key": "CA_EQL",
"label": "=",
}
"KC_Q": {
"key": "CA_Q",
"label": "Q",
}
"KC_W": {
"key": "CA_W",
"label": "W",
}
"KC_E": {
"key": "CA_E",
"label": "E",
}
"KC_R": {
"key": "CA_R",
"label": "R",
}
"KC_T": {
"key": "CA_T",
"label": "T",
}
"KC_Y": {
"key": "CA_Y",
"label": "Y",
}
"KC_U": {
"key": "CA_U",
"label": "U",
}
"KC_I": {
"key": "CA_I",
"label": "I",
}
"KC_O": {
"key": "CA_O",
"label": "O",
}
"KC_P": {
"key": "CA_P",
"label": "P",
}
"KC_LBRC": {
"key": "CA_CIRC",
"label": "^ (dead)",
}
"KC_RBRC": {
"key": "CA_CCED",
"label": "Ç",
}
"KC_A": {
"key": "CA_A",
"label": "A",
}
"KC_S": {
"key": "CA_S",
"label": "S",
}
"KC_D": {
"key": "CA_D",
"label": "D",
}
"KC_F": {
"key": "CA_F",
"label": "F",
}
"KC_G": {
"key": "CA_G",
"label": "G",
}
"KC_H": {
"key": "CA_H",
"label": "H",
}
"KC_J": {
"key": "CA_J",
"label": "J",
}
"KC_K": {
"key": "CA_K",
"label": "K",
}
"KC_L": {
"key": "CA_L",
"label": "L",
}
"KC_SCLN": {
"key": "CA_SCLN",
"label": ";",
}
"KC_QUOT": {
"key": "CA_EGRV",
"label": "É",
}
"KC_NUHS": {
"key": "CA_AGRV",
"label": "À",
}
"KC_NUBS": {
"key": "CA_UGRV",
"label": "Ù",
}
"KC_Z": {
"key": "CA_Z",
"label": "Z",
}
"KC_X": {
"key": "CA_X",
"label": "X",
}
"KC_C": {
"key": "CA_C",
"label": "C",
}
"KC_V": {
"key": "CA_V",
"label": "V",
}
"KC_B": {
"key": "CA_B",
"label": "B",
}
"KC_N": {
"key": "CA_N",
"label": "N",
}
"KC_M": {
"key": "CA_M",
"label": "M",
}
"KC_COMM": {
"key": "CA_COMM",
"label": ",",
}
"KC_DOT": {
"key": "CA_DOT",
"label": ".",
}
"KC_SLSH": {
"key": "CA_EACU",
"label": "É",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ \ │ ! │ @ │ # │ $ │ % │ ? │ & │ * │ ( │ ) │ _ │ + │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ : │ │ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ │ │ │ │ │ │ │ ' │ " │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(CA_SLSH)": {
"key": "CA_BSLS",
"label": "\\",
}
"S(CA_1)": {
"key": "CA_EXLM",
"label": "!",
}
"S(CA_2)": {
"key": "CA_AT",
"label": "@",
}
"S(CA_3)": {
"key": "CA_HASH",
"label": "#",
}
"S(CA_4)": {
"key": "CA_DLR",
"label": "$",
}
"S(CA_5)": {
"key": "CA_PERC",
"label": "%",
}
"S(CA_6)": {
"key": "CA_QUES",
"label": "?",
}
"S(CA_7)": {
"key": "CA_AMPR",
"label": "&",
}
"S(CA_8)": {
"key": "CA_ASTR",
"label": "*",
}
"S(CA_9)": {
"key": "CA_LPRN",
"label": "(",
}
"S(CA_0)": {
"key": "CA_RPRN",
"label": ")",
}
"S(CA_MINS)": {
"key": "CA_UNDS",
"label": "_",
}
"S(CA_EQL)": {
"key": "CA_PLUS",
"label": "+",
}
"S(CA_CIRC)": {
"key": "CA_DIAE",
"label": "¨ (dead)",
}
"S(CA_SCLN)": {
"key": "CA_COLN",
"label": ":",
}
"S(CA_COMM)": {
"key": "CA_QUOT",
"label": "'",
}
"S(CA_DOT)": {
"key": "CA_DQUO",
"label": "\"",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ | │ │ │ │ ¤ │ │ │ { │ } │ [ │ ] │ │ ¬ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ € │ │ │ │ │ │ │ │ ` │ ~ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ ° │ │ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ « │ » │ │ │ │ │ │ < │ > │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(CA_SLSH)": {
"key": "CA_PIPE",
"label": "|",
}
"ALGR(CA_4)": {
"key": "CA_CURR",
"label": "¤",
}
"ALGR(CA_7)": {
"key": "CA_LCBR",
"label": "{",
}
"ALGR(CA_8)": {
"key": "CA_RCBR",
"label": "}",
}
"ALGR(CA_9)": {
"key": "CA_LBRC",
"label": "[",
}
"ALGR(CA_0)": {
"key": "CA_RBRC",
"label": "]",
}
"ALGR(CA_EQL)": {
"key": "CA_NOT",
"label": "¬",
}
"ALGR(CA_E)": {
"key": "CA_EURO",
"label": "€",
}
"ALGR(CA_CIRC)": {
"key": "CA_GRV",
"label": "` (dead)",
}
"ALGR(CA_CCED)": {
"key": "CA_DTIL",
"label": "~ (dead)",
}
"ALGR(CA_SCLN)": {
"key": "CA_DEG",
"label": "°",
}
"ALGR(CA_Z)": {
"key": "CA_LDAQ",
"label": "«",
}
"ALGR(CA_X)": {
"key": "CA_RDAQ",
"label": "»",
}
"ALGR(CA_COMM)": {
"key": "CA_LABK",
"label": "<",
}
"ALGR(CA_DOT)": {
"key": "CA_RABK",
"label": ">",
}
/* Right Ctrl symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ ¹ │ ² │ ³ │ ¼ │ ½ │ ¾ │ │ │ │ │ │ ¸ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Ω │ Ł │ Œ │ ¶ │ Ŧ │ ← │ ↓ │ → │ Ø │ Þ │ │ ~ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ Æ │ ß │ Ð │ │ Ŋ │ Ħ │ IJ │ ĸ │ Ŀ │ ´ │ │ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ │ │ ¢ │ “ │ ” │ ʼn │ μ │ ― │ ˙ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"RCTL(CA_1)": {
"key": "CA_SUP1",
"label": "¹",
}
"RCTL(CA_2)": {
"key": "CA_SUP2",
"label": "²",
}
"RCTL(CA_3)": {
"key": "CA_SUP3",
"label": "³",
}
"RCTL(CA_4)": {
"key": "CA_QRTR",
"label": "¼",
}
"RCTL(CA_5)": {
"key": "CA_HALF",
"label": "½",
}
"RCTL(CA_6)": {
"key": "CA_TQTR",
"label": "¾",
}
"RCTL(CA_EQL)": {
"key": "CA_CEDL",
"label": "¸ (dead)",
}
"RCTL(CA_Q)": {
"key": "CA_OMEG",
"label": "Ω",
}
"RCTL(CA_W)": {
"key": "CA_LSTR",
"label": "Ł",
}
"RCTL(CA_E)": {
"key": "CA_OE",
"label": "Œ",
}
"RCTL(CA_R)": {
"key": "CA_PARA",
"label": "¶",
}
"RCTL(CA_T)": {
"key": "CA_TSTR",
"label": "Ŧ",
}
"RCTL(CA_Y)": {
"key": "CA_LARR",
"label": "←",
}
"RCTL(CA_U)": {
"key": "CA_DARR",
"label": "↓",
}
"RCTL(CA_I)": {
"key": "CA_RARR",
"label": "→",
}
"RCTL(CA_O)": {
"key": "CA_OSTR",
"label": "Ø",
}
"RCTL(CA_P)": {
"key": "CA_THRN",
"label": "Þ",
}
"RCTL(CA_CCED)": {
"key": "CA_TILD",
"label": "~",
}
"RCTL(CA_A)": {
"key": "CA_AE",
"label": "Æ",
}
"RCTL(CA_S)": {
"key": "CA_SS",
"label": "ß",
}
"RCTL(CA_D)": {
"key": "CA_ETH",
"label": "Ð",
}
"RCTL(CA_G)": {
"key": "CA_ENG",
"label": "Ŋ",
}
"RCTL(CA_H)": {
"key": "CA_HSTR",
"label": "Ħ",
}
"RCTL(CA_J)": {
"key": "CA_IJ",
"label": "IJ",
}
"RCTL(CA_K)": {
"key": "CA_KRA",
"label": "ĸ",
}
"RCTL(CA_L)": {
"key": "CA_LMDT",
"label": "Ŀ",
}
"RCTL(CA_SCLN)": {
"key": "CA_ACUT",
"label": "´ (dead)",
}
"RCTL(CA_C)": {
"key": "CA_CENT",
"label": "¢",
}
"RCTL(CA_V)": {
"key": "CA_LDQU",
"label": "“",
}
"RCTL(CA_B)": {
"key": "CA_RDQU",
"label": "”",
}
"RCTL(CA_N)": {
"key": "CA_APSN",
"label": "ʼn",
}
"RCTL(CA_M)": {
"key": "CA_MICR",
"label": "μ",
}
"RCTL(CA_COMM)": {
"key": "CA_HRZB",
"label": "―",
}
"RCTL(CA_DOT)": {
"key": "CA_DOTA",
"label": "˙ (dead)",
}
/* Shift+Right Ctrl symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ - │ ¡ │ │ £ │ │ ⅜ │ ⅝ │ ⅞ │ ™ │ ± │ │ ¿ │ ˛ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ ® │ │ ¥ │ ↑ │ ı │ │ │ ° │ ¯ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ § │ │ ª │ │ │ │ │ │ ˝ │ ˇ │ ˘ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ ¦ │ │ │ © │ │ ♪ │ º │ × │ ÷ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"RCTL(S(CA_SLSH))": {
"key": "CA_SHYP",
"label": "­ (soft hyphen)",
}
"RCTL(S(CA_1))": {
"key": "CA_IEXL",
"label": "¡",
}
"RCTL(S(CA_3))": {
"key": "CA_PND",
"label": "£",
}
"RCTL(S(CA_5))": {
"key": "CA_TEIG",
"label": "⅜",
}
"RCTL(S(CA_6))": {
"key": "CA_FEIG",
"label": "⅝",
}
"RCTL(S(CA_7))": {
"key": "CA_SEIG",
"label": "⅞",
}
"RCTL(S(CA_8))": {
"key": "CA_TM",
"label": "™",
}
"RCTL(S(CA_9))": {
"key": "CA_PLMN",
"label": "±",
}
"RCTL(S(CA_MINS))": {
"key": "CA_IQUE",
"label": "¿",
}
"RCTL(S(CA_EQL))": {
"key": "CA_OGON",
"label": "˛ (dead)",
}
"RCTL(S(CA_R))": {
"key": "CA_REGD",
"label": "®",
}
"RCTL(S(CA_Y))": {
"key": "CA_YEN",
"label": "¥",
}
"RCTL(S(CA_U))": {
"key": "CA_UARR",
"label": "↑",
}
"RCTL(S(CA_I))": {
"key": "CA_DLSI",
"label": "ı",
}
"RCTL(S(CA_CIRC))": {
"key": "CA_RNGA",
"label": "° (dead)",
}
"RCTL(S(CA_CCED))": {
"key": "CA_MACR",
"label": "¯ (dead)",
}
"RCTL(S(CA_S))": {
"key": "CA_SECT",
"label": "§",
}
"RCTL(S(CA_F))": {
"key": "CA_FORD",
"label": "ª",
}
"RCTL(S(CA_SCLN))": {
"key": "CA_DACU",
"label": "˝ (dead)",
}
"RCTL(S(CA_EGRV))": {
"key": "CA_CARN",
"label": "ˇ (dead)",
}
"RCTL(S(CA_AGRV))": {
"key": "CA_BREV",
"label": "˘ (dead)",
}
"RCTL(S(CA_UGRV))": {
"key": "CA_BRKP",
"label": "¦",
}
"RCTL(S(CA_C))": {
"key": "CA_COPY",
"label": "©",
}
"RCTL(S(CA_V))": {
"key": "CA_LSQU",
"label": "",
}
"RCTL(S(CA_B))": {
"key": "CA_RSQU",
"label": "",
}
"RCTL(S(CA_N))": {
"key": "CA_ENOT",
"label": "♪",
}
"RCTL(S(CA_M))": {
"key": "CA_MORD",
"label": "º",
}
"RCTL(S(CA_COMM))": {
"key": "CA_MUL",
"label": "×",
}
"RCTL(S(CA_DOT))": {
"key": "CA_DIV",
"label": "÷",
}
}
}

View File

@@ -0,0 +1,302 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Q │ W │ F │ P │ G │ J │ L │ U │ Y │ ; │ [ │ ] │ \ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
* │ │ A │ R │ S │ T │ D │ H │ N │ E │ I │ O │ ' │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
* │ │ Z │ X │ C │ V │ B │ K │ M │ , │ . │ / │ │
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "CM_GRV",
"label": "`",
}
"KC_1": {
"key": "CM_1",
"label": "1",
}
"KC_2": {
"key": "CM_2",
"label": "2",
}
"KC_3": {
"key": "CM_3",
"label": "3",
}
"KC_4": {
"key": "CM_4",
"label": "4",
}
"KC_5": {
"key": "CM_5",
"label": "5",
}
"KC_6": {
"key": "CM_6",
"label": "6",
}
"KC_7": {
"key": "CM_7",
"label": "7",
}
"KC_8": {
"key": "CM_8",
"label": "8",
}
"KC_9": {
"key": "CM_9",
"label": "9",
}
"KC_0": {
"key": "CM_0",
"label": "0",
}
"KC_MINS": {
"key": "CM_MINS",
"label": "-",
}
"KC_EQL": {
"key": "CM_EQL",
"label": "=",
}
"KC_Q": {
"key": "CM_Q",
"label": "Q",
}
"KC_W": {
"key": "CM_W",
"label": "W",
}
"KC_E": {
"key": "CM_F",
"label": "F",
}
"KC_R": {
"key": "CM_P",
"label": "P",
}
"KC_T": {
"key": "CM_G",
"label": "G",
}
"KC_Y": {
"key": "CM_J",
"label": "J",
}
"KC_U": {
"key": "CM_L",
"label": "L",
}
"KC_I": {
"key": "CM_U",
"label": "U",
}
"KC_O": {
"key": "CM_Y",
"label": "Y",
}
"KC_P": {
"key": "CM_SCLN",
"label": ";",
}
"KC_LBRC": {
"key": "CM_LBRC",
"label": "[",
}
"KC_RBRC": {
"key": "CM_RBRC",
"label": "]",
}
"KC_BSLS": {
"key": "CM_BSLS",
"label": "\\",
}
"KC_A": {
"key": "CM_A",
"label": "A",
}
"KC_S": {
"key": "CM_R",
"label": "R",
}
"KC_D": {
"key": "CM_S",
"label": "S",
}
"KC_F": {
"key": "CM_T",
"label": "T",
}
"KC_G": {
"key": "CM_D",
"label": "D",
}
"KC_H": {
"key": "CM_H",
"label": "H",
}
"KC_J": {
"key": "CM_N",
"label": "N",
}
"KC_K": {
"key": "CM_E",
"label": "E",
}
"KC_L": {
"key": "CM_I",
"label": "I",
}
"KC_SCLN": {
"key": "CM_O",
"label": "O",
}
"KC_QUOT": {
"key": "CM_QUOT",
"label": "'",
}
"KC_Z": {
"key": "CM_Z",
"label": "Z",
}
"KC_X": {
"key": "CM_X",
"label": "X",
}
"KC_C": {
"key": "CM_C",
"label": "C",
}
"KC_V": {
"key": "CM_V",
"label": "V",
}
"KC_B": {
"key": "CM_B",
"label": "B",
}
"KC_N": {
"key": "CM_K",
"label": "K",
}
"KC_M": {
"key": "CM_M",
"label": "M",
}
"KC_COMM": {
"key": "CM_COMM",
"label": ",",
}
"KC_DOT": {
"key": "CM_DOT",
"label": ".",
}
"KC_SLSH": {
"key": "CM_SLSH",
"label": "/",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ " │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
* │ │ │ │ │ │ │ │ │ < │ > │ ? │ │
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(CM_GRV)": {
"key": "CM_TILD",
"label": "~",
}
"S(CM_1)": {
"key": "CM_EXLM",
"label": "!",
}
"S(CM_2)": {
"key": "CM_AT",
"label": "@",
}
"S(CM_3)": {
"key": "CM_HASH",
"label": "#",
}
"S(CM_4)": {
"key": "CM_DLR",
"label": "$",
}
"S(CM_5)": {
"key": "CM_PERC",
"label": "%",
}
"S(CM_6)": {
"key": "CM_CIRC",
"label": "^",
}
"S(CM_7)": {
"key": "CM_AMPR",
"label": "&",
}
"S(CM_8)": {
"key": "CM_ASTR",
"label": "*",
}
"S(CM_9)": {
"key": "CM_LPRN",
"label": "(",
}
"S(CM_0)": {
"key": "CM_RPRN",
"label": ")",
}
"S(CM_MINS)": {
"key": "CM_UNDS",
"label": "_",
}
"S(CM_EQL)": {
"key": "CM_PLUS",
"label": "+",
}
"S(CM_SCLN)": {
"key": "CM_COLN",
"label": ":",
}
"S(CM_LBRC)": {
"key": "CM_LCBR",
"label": "{",
}
"S(CM_RBRC)": {
"key": "CM_RCBR",
"label": "}",
}
"S(CM_BSLS)": {
"key": "CM_PIPE",
"label": "|",
}
"S(CM_QUOT)": {
"key": "CM_DQUO",
"label": "\"",
}
"S(CM_COMM)": {
"key": "CM_LABK",
"label": "<",
}
"S(CM_DOT)": {
"key": "CM_RABK",
"label": ">",
}
"S(CM_SLSH)": {
"key": "CM_QUES",
"label": "?",
}
}
}

View File

@@ -0,0 +1,403 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ¸ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "HR_CEDL",
"label": "¸ (dead)",
}
"KC_1": {
"key": "HR_1",
"label": "1",
}
"KC_2": {
"key": "HR_2",
"label": "2",
}
"KC_3": {
"key": "HR_3",
"label": "3",
}
"KC_4": {
"key": "HR_4",
"label": "4",
}
"KC_5": {
"key": "HR_5",
"label": "5",
}
"KC_6": {
"key": "HR_6",
"label": "6",
}
"KC_7": {
"key": "HR_7",
"label": "7",
}
"KC_8": {
"key": "HR_8",
"label": "8",
}
"KC_9": {
"key": "HR_9",
"label": "9",
}
"KC_0": {
"key": "HR_0",
"label": "0",
}
"KC_MINS": {
"key": "HR_QUOT",
"label": "'",
}
"KC_EQL": {
"key": "HR_PLUS",
"label": "+",
}
"KC_Q": {
"key": "HR_Q",
"label": "Q",
}
"KC_W": {
"key": "HR_W",
"label": "W",
}
"KC_E": {
"key": "HR_E",
"label": "E",
}
"KC_R": {
"key": "HR_R",
"label": "R",
}
"KC_T": {
"key": "HR_T",
"label": "T",
}
"KC_Y": {
"key": "HR_Z",
"label": "Z",
}
"KC_U": {
"key": "HR_U",
"label": "U",
}
"KC_I": {
"key": "HR_I",
"label": "I",
}
"KC_O": {
"key": "HR_O",
"label": "O",
}
"KC_P": {
"key": "HR_P",
"label": "P",
}
"KC_LBRC": {
"key": "HR_SCAR",
"label": "Š",
}
"KC_RBRC": {
"key": "HR_DSTR",
"label": "Đ",
}
"KC_A": {
"key": "HR_A",
"label": "A",
}
"KC_S": {
"key": "HR_S",
"label": "S",
}
"KC_D": {
"key": "HR_D",
"label": "D",
}
"KC_F": {
"key": "HR_F",
"label": "F",
}
"KC_G": {
"key": "HR_G",
"label": "G",
}
"KC_H": {
"key": "HR_H",
"label": "H",
}
"KC_J": {
"key": "HR_J",
"label": "J",
}
"KC_K": {
"key": "HR_K",
"label": "K",
}
"KC_L": {
"key": "HR_L",
"label": "L",
}
"KC_SCLN": {
"key": "HR_CCAR",
"label": "Č",
}
"KC_QUOT": {
"key": "HR_CACU",
"label": "Ć",
}
"KC_NUHS": {
"key": "HR_ZCAR",
"label": "Ž",
}
"KC_NUBS": {
"key": "HR_LABK",
"label": "<",
}
"KC_Z": {
"key": "HR_Y",
"label": "Y",
}
"KC_X": {
"key": "HR_X",
"label": "X",
}
"KC_C": {
"key": "HR_C",
"label": "C",
}
"KC_V": {
"key": "HR_V",
"label": "V",
}
"KC_B": {
"key": "HR_B",
"label": "B",
}
"KC_N": {
"key": "HR_N",
"label": "N",
}
"KC_M": {
"key": "HR_M",
"label": "M",
}
"KC_COMM": {
"key": "HR_COMM",
"label": ",",
}
"KC_DOT": {
"key": "HR_DOT",
"label": ".",
}
"KC_SLSH": {
"key": "HR_MINS",
"label": "-",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(HR_CEDL)": {
"key": "HR_DIAE",
"label": "¨ (dead)",
}
"S(HR_1)": {
"key": "HR_EXLM",
"label": "!",
}
"S(HR_2)": {
"key": "HR_DQUO",
"label": "\"",
}
"S(HR_3)": {
"key": "HR_HASH",
"label": "#",
}
"S(HR_4)": {
"key": "HR_DLR",
"label": "$",
}
"S(HR_5)": {
"key": "HR_PERC",
"label": "%",
}
"S(HR_6)": {
"key": "HR_AMPR",
"label": "&",
}
"S(HR_7)": {
"key": "HR_SLSH",
"label": "/",
}
"S(HR_8)": {
"key": "HR_LPRN",
"label": "(",
}
"S(HR_9)": {
"key": "HR_RPRN",
"label": ")",
}
"S(HR_0)": {
"key": "HR_EQL",
"label": "=",
}
"S(HR_QUOT)": {
"key": "HR_QUES",
"label": "?",
}
"S(HR_PLUS)": {
"key": "HR_ASTR",
"label": "*",
}
"S(HR_LABK)": {
"key": "HR_RABK",
"label": ">",
}
"S(HR_COMM)": {
"key": "HR_SCLN",
"label": ";",
}
"S(HR_DOT)": {
"key": "HR_COLN",
"label": ":",
}
"S(HR_MINS)": {
"key": "HR_UNDS",
"label": "_",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ │ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(HR_1)": {
"key": "HR_TILD",
"label": "~",
}
"ALGR(HR_2)": {
"key": "HR_CARN",
"label": "ˇ (dead)",
}
"ALGR(HR_3)": {
"key": "HR_CIRC",
"label": "^ (dead)",
}
"ALGR(HR_4)": {
"key": "HR_BREV",
"label": "˘ (dead)",
}
"ALGR(HR_5)": {
"key": "HR_RNGA",
"label": "° (dead)",
}
"ALGR(HR_6)": {
"key": "HR_OGON",
"label": "˛ (dead)",
}
"ALGR(HR_7)": {
"key": "HR_GRV",
"label": "`",
}
"ALGR(HR_8)": {
"key": "HR_DOTA",
"label": "˙ (dead)",
}
"ALGR(HR_9)": {
"key": "HR_ACUT",
"label": "´ (dead)",
}
"ALGR(HR_0)": {
"key": "HR_DACU",
"label": "˝ (dead)",
}
"ALGR(HR_Q)": {
"key": "HR_BSLS",
"label": "\\",
}
"ALGR(HR_W)": {
"key": "HR_PIPE",
"label": "|",
}
"ALGR(HR_E)": {
"key": "HR_EURO",
"label": "€",
}
"ALGR(HR_SCAR)": {
"key": "HR_DIV",
"label": "÷",
}
"ALGR(HR_DSTR)": {
"key": "HR_MUL",
"label": "×",
}
"ALGR(HR_F)": {
"key": "HR_LBRC",
"label": "[",
}
"ALGR(HR_G)": {
"key": "HR_RBRC",
"label": "]",
}
"ALGR(HR_K)": {
"key": "HR_LLST",
"label": "ł",
}
"ALGR(HR_L)": {
"key": "HR_CLST",
"label": "Ł",
}
"ALGR(HR_CACU)": {
"key": "HR_SS",
"label": "ß",
}
"ALGR(HR_ZCAR)": {
"key": "HR_CURR",
"label": "¤",
}
"ALGR(HR_V)": {
"key": "HR_AT",
"label": "@",
}
"ALGR(HR_B)": {
"key": "HR_LCBR",
"label": "{",
}
"ALGR(HR_N)": {
"key": "HR_RCBR",
"label": "}",
}
"ALGR(HR_M)": {
"key": "HR_SECT",
"label": "§",
}
}
}

View File

@@ -0,0 +1,435 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ; │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ´ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "CZ_SCLN",
"label": ";",
}
"KC_1": {
"key": "CZ_PLUS",
"label": "+",
}
"KC_2": {
"key": "CZ_ECAR",
"label": "ě",
}
"KC_3": {
"key": "CZ_SCAR",
"label": "š",
}
"KC_4": {
"key": "CZ_CCAR",
"label": "č",
}
"KC_5": {
"key": "CZ_RCAR",
"label": "ř",
}
"KC_6": {
"key": "CZ_ZCAR",
"label": "ž",
}
"KC_7": {
"key": "CZ_YACU",
"label": "ý",
}
"KC_8": {
"key": "CZ_AACU",
"label": "á",
}
"KC_9": {
"key": "CZ_IACU",
"label": "í",
}
"KC_0": {
"key": "CZ_EACU",
"label": "é",
}
"KC_MINS": {
"key": "CZ_EQL",
"label": "=",
}
"KC_EQL": {
"key": "CZ_ACUT",
"label": "´ (dead)",
}
"KC_Q": {
"key": "CZ_Q",
"label": "Q",
}
"KC_W": {
"key": "CZ_W",
"label": "W",
}
"KC_E": {
"key": "CZ_E",
"label": "E",
}
"KC_R": {
"key": "CZ_R",
"label": "R",
}
"KC_T": {
"key": "CZ_T",
"label": "T",
}
"KC_Y": {
"key": "CZ_Z",
"label": "Z",
}
"KC_U": {
"key": "CZ_U",
"label": "U",
}
"KC_I": {
"key": "CZ_I",
"label": "I",
}
"KC_O": {
"key": "CZ_O",
"label": "O",
}
"KC_P": {
"key": "CZ_P",
"label": "P",
}
"KC_LBRC": {
"key": "CZ_UACU",
"label": "ú",
}
"KC_RBRC": {
"key": "CZ_RPRN",
"label": ")",
}
"KC_A": {
"key": "CZ_A",
"label": "A",
}
"KC_S": {
"key": "CZ_S",
"label": "S",
}
"KC_D": {
"key": "CZ_D",
"label": "D",
}
"KC_F": {
"key": "CZ_F",
"label": "F",
}
"KC_G": {
"key": "CZ_G",
"label": "G",
}
"KC_H": {
"key": "CZ_H",
"label": "H",
}
"KC_J": {
"key": "CZ_J",
"label": "J",
}
"KC_K": {
"key": "CZ_K",
"label": "K",
}
"KC_L": {
"key": "CZ_L",
"label": "L",
}
"KC_SCLN": {
"key": "CZ_URNG",
"label": "ů",
}
"KC_QUOT": {
"key": "CZ_SECT",
"label": "§",
}
"KC_NUHS": {
"key": "CZ_DIAE",
"label": "¨ (dead)",
}
"KC_NUBS": {
"key": "CZ_BSLS",
"label": "\\",
}
"KC_Z": {
"key": "CZ_Y",
"label": "Y",
}
"KC_X": {
"key": "CZ_X",
"label": "X",
}
"KC_C": {
"key": "CZ_C",
"label": "C",
}
"KC_V": {
"key": "CZ_V",
"label": "V",
}
"KC_B": {
"key": "CZ_B",
"label": "B",
}
"KC_N": {
"key": "CZ_N",
"label": "N",
}
"KC_M": {
"key": "CZ_M",
"label": "M",
}
"KC_COMM": {
"key": "CZ_COMM",
"label": ",",
}
"KC_DOT": {
"key": "CZ_DOT",
"label": ".",
}
"KC_SLSH": {
"key": "CZ_MINS",
"label": "-",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ° │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ " │ ! │ ' │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ | │ │ │ │ │ │ │ │ ? │ : │ _ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(CZ_SCLN)": {
"key": "CZ_RNGA",
"label": "° (dead)",
}
"S(CZ_PLUS)": {
"key": "CZ_1",
"label": "1",
}
"S(CZ_ECAR)": {
"key": "CZ_2",
"label": "2",
}
"S(CZ_SCAR)": {
"key": "CZ_3",
"label": "3",
}
"S(CZ_CCAR)": {
"key": "CZ_4",
"label": "4",
}
"S(CZ_RCAR)": {
"key": "CZ_5",
"label": "5",
}
"S(CZ_ZCAR)": {
"key": "CZ_6",
"label": "6",
}
"S(CZ_YACU)": {
"key": "CZ_7",
"label": "7",
}
"S(CZ_AACU)": {
"key": "CZ_8",
"label": "8",
}
"S(CZ_IACU)": {
"key": "CZ_9",
"label": "9",
}
"S(CZ_EACU)": {
"key": "CZ_0",
"label": "0",
}
"S(CZ_EQL)": {
"key": "CZ_PERC",
"label": "%",
}
"S(CZ_ACUT)": {
"key": "CZ_CARN",
"label": "ˇ (dead)",
}
"S(CZ_UACU)": {
"key": "CZ_SLSH",
"label": "/",
}
"S(CZ_RPRN)": {
"key": "CZ_LPRN",
"label": "(",
}
"S(CZ_URNG)": {
"key": "CZ_DQUO",
"label": "\"",
}
"S(CZ_SECT)": {
"key": "CZ_EXLM",
"label": "!",
}
"S(CZ_DIAE)": {
"key": "CZ_QUOT",
"label": "'",
}
"S(CZ_BSLS)": {
"key": "CZ_PIPE",
"label": "|",
}
"S(CZ_COMM)": {
"key": "CZ_QUES",
"label": "?",
}
"S(CZ_DOT)": {
"key": "CZ_COLN",
"label": ":",
}
"S(CZ_MINS)": {
"key": "CZ_UNDS",
"label": "_",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ ~ │ │ ^ │ ˘ │ │ ˛ │ ` │ ˙ │ │ ˝ │ │ ¸ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ € │ │ │ │ │ │ │ │ ÷ │ × │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ │ │ # │ & │ @ │ { │ } │ │ < │ > │ * │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(CZ_PLUS)": {
"key": "CZ_TILD",
"label": "~",
}
"ALGR(CZ_SCAR)": {
"key": "CZ_CIRC",
"label": "^ (dead)",
}
"ALGR(CZ_CCAR)": {
"key": "CZ_BREV",
"label": "˘ (dead)",
}
"ALGR(CZ_ZCAR)": {
"key": "CZ_OGON",
"label": "˛ (dead)",
}
"ALGR(CZ_YACU)": {
"key": "CZ_GRV",
"label": "` (dead)",
}
"ALGR(CZ_AACU)": {
"key": "CZ_DOTA",
"label": "˙ (dead)",
}
"ALGR(CZ_EACU)": {
"key": "CZ_DACU",
"label": "˝ (dead)",
}
"ALGR(CZ_ACUT)": {
"key": "CZ_CEDL",
"label": "¸ (dead)",
}
"ALGR(CZ_E)": {
"key": "CZ_EURO",
"label": "€",
}
"ALGR(CZ_UACU)": {
"key": "CZ_DIV",
"label": "÷",
}
"ALGR(CZ_RPRN)": {
"key": "CZ_MUL",
"label": "×",
}
"ALGR(CZ_S)": {
"key": "CZ_LDST",
"label": "đ",
}
"ALGR(CZ_D)": {
"key": "CZ_CDST",
"label": "Đ",
}
"ALGR(CZ_F)": {
"key": "CZ_LBRC",
"label": "[",
}
"ALGR(CZ_G)": {
"key": "CZ_RBRC",
"label": "]",
}
"ALGR(CZ_K)": {
"key": "CZ_LLST",
"label": "ł",
}
"ALGR(CZ_L)": {
"key": "CZ_CLST",
"label": "Ł",
}
"ALGR(CZ_URNG)": {
"key": "CZ_DLR",
"label": "$",
}
"ALGR(CZ_SECT)": {
"key": "CZ_SS",
"label": "ß",
}
"ALGR(CZ_DIAE)": {
"key": "CZ_CURR",
"label": "¤",
}
"ALGR(CZ_X)": {
"key": "CZ_HASH",
"label": "#",
}
"ALGR(CZ_C)": {
"key": "CZ_AMPR",
"label": "&",
}
"ALGR(CZ_V)": {
"key": "CZ_AT",
"label": "@",
}
"ALGR(CZ_B)": {
"key": "CZ_LCBR",
"label": "{",
}
"ALGR(CZ_N)": {
"key": "CZ_RCBR",
"label": "}",
}
"ALGR(CZ_COMM)": {
"key": "CZ_LABK",
"label": "<",
}
"ALGR(CZ_DOT)": {
"key": "CZ_RABK",
"label": ">",
}
"ALGR(CZ_MINS)": {
"key": "CZ_ASTR",
"label": "*",
}
}
}

View File

@@ -0,0 +1,359 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ½ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ + │ ´ │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ¨ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Æ │ Ø │ ' │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "DK_HALF",
"label": "½",
}
"KC_1": {
"key": "DK_1",
"label": "1",
}
"KC_2": {
"key": "DK_2",
"label": "2",
}
"KC_3": {
"key": "DK_3",
"label": "3",
}
"KC_4": {
"key": "DK_4",
"label": "4",
}
"KC_5": {
"key": "DK_5",
"label": "5",
}
"KC_6": {
"key": "DK_6",
"label": "6",
}
"KC_7": {
"key": "DK_7",
"label": "7",
}
"KC_8": {
"key": "DK_8",
"label": "8",
}
"KC_9": {
"key": "DK_9",
"label": "9",
}
"KC_0": {
"key": "DK_0",
"label": "0",
}
"KC_MINS": {
"key": "DK_PLUS",
"label": "+",
}
"KC_EQL": {
"key": "DK_ACUT",
"label": "´ (dead)",
}
"KC_Q": {
"key": "DK_Q",
"label": "Q",
}
"KC_W": {
"key": "DK_W",
"label": "W",
}
"KC_E": {
"key": "DK_E",
"label": "E",
}
"KC_R": {
"key": "DK_R",
"label": "R",
}
"KC_T": {
"key": "DK_T",
"label": "T",
}
"KC_Y": {
"key": "DK_Y",
"label": "Y",
}
"KC_U": {
"key": "DK_U",
"label": "U",
}
"KC_I": {
"key": "DK_I",
"label": "I",
}
"KC_O": {
"key": "DK_O",
"label": "O",
}
"KC_P": {
"key": "DK_P",
"label": "P",
}
"KC_LBRC": {
"key": "DK_ARNG",
"label": "Å",
}
"KC_RBRC": {
"key": "DK_DIAE",
"label": "¨ (dead)",
}
"KC_A": {
"key": "DK_A",
"label": "A",
}
"KC_S": {
"key": "DK_S",
"label": "S",
}
"KC_D": {
"key": "DK_D",
"label": "D",
}
"KC_F": {
"key": "DK_F",
"label": "F",
}
"KC_G": {
"key": "DK_G",
"label": "G",
}
"KC_H": {
"key": "DK_H",
"label": "H",
}
"KC_J": {
"key": "DK_J",
"label": "J",
}
"KC_K": {
"key": "DK_K",
"label": "K",
}
"KC_L": {
"key": "DK_L",
"label": "L",
}
"KC_SCLN": {
"key": "DK_AE",
"label": "Æ",
}
"KC_QUOT": {
"key": "DK_OSTR",
"label": "Ø",
}
"KC_NUHS": {
"key": "DK_QUOT",
"label": "'",
}
"KC_NUBS": {
"key": "DK_LABK",
"label": "<",
}
"KC_Z": {
"key": "DK_Z",
"label": "Z",
}
"KC_X": {
"key": "DK_X",
"label": "X",
}
"KC_C": {
"key": "DK_C",
"label": "C",
}
"KC_V": {
"key": "DK_V",
"label": "V",
}
"KC_B": {
"key": "DK_B",
"label": "B",
}
"KC_N": {
"key": "DK_N",
"label": "N",
}
"KC_M": {
"key": "DK_M",
"label": "M",
}
"KC_COMM": {
"key": "DK_COMM",
"label": ",",
}
"KC_DOT": {
"key": "DK_DOT",
"label": ".",
}
"KC_SLSH": {
"key": "DK_MINS",
"label": "-",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ § │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(DK_HALF)": {
"key": "DK_SECT",
"label": "§",
}
"S(DK_1)": {
"key": "DK_EXLM",
"label": "!",
}
"S(DK_2)": {
"key": "DK_DQUO",
"label": "\"",
}
"S(DK_3)": {
"key": "DK_HASH",
"label": "#",
}
"S(DK_4)": {
"key": "DK_CURR",
"label": "¤",
}
"S(DK_5)": {
"key": "DK_PERC",
"label": "%",
}
"S(DK_6)": {
"key": "DK_AMPR",
"label": "&",
}
"S(DK_7)": {
"key": "DK_SLSH",
"label": "/",
}
"S(DK_8)": {
"key": "DK_LPRN",
"label": "(",
}
"S(DK_9)": {
"key": "DK_RPRN",
"label": ")",
}
"S(DK_0)": {
"key": "DK_EQL",
"label": "=",
}
"S(DK_PLUS)": {
"key": "DK_QUES",
"label": "?",
}
"S(DK_ACUT)": {
"key": "DK_GRV",
"label": "` (dead)",
}
"S(DK_DIAE)": {
"key": "DK_CIRC",
"label": "^ (dead)",
}
"S(DK_QUOT)": {
"key": "DK_ASTR",
"label": "*",
}
"S(DK_LABK)": {
"key": "DK_RABK",
"label": ">",
}
"S(DK_COMM)": {
"key": "DK_SCLN",
"label": ";",
}
"S(DK_DOT)": {
"key": "DK_COLN",
"label": ":",
}
"S(DK_MINS)": {
"key": "DK_UNDS",
"label": "_",
}
/* AltGr symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ │ | │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ \ │ │ │ │ │ │ │ µ │ │ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"ALGR(DK_2)": {
"key": "DK_AT",
"label": "@",
}
"ALGR(DK_3)": {
"key": "DK_PND",
"label": "£",
}
"ALGR(DK_4)": {
"key": "DK_DLR",
"label": "$",
}
"ALGR(DK_5)": {
"key": "DK_EURO",
"label": "€",
}
"ALGR(DK_7)": {
"key": "DK_LCBR",
"label": "{",
}
"ALGR(DK_8)": {
"key": "DK_LBRC",
"label": "[",
}
"ALGR(DK_9)": {
"key": "DK_RBRC",
"label": "]",
}
"ALGR(DK_0)": {
"key": "DK_RCBR",
"label": "}",
}
"ALGR(DK_ACUT)": {
"key": "DK_PIPE",
"label": "|",
}
"ALGR(DK_DIAE)": {
"key": "DK_TILD",
"label": "~ (dead)",
}
"ALGR(DK_LABK)": {
"key": "DK_BSLS",
"label": "\\",
}
"ALGR(DK_M)": {
"key": "DK_MICR",
"label": "µ",
}
}
}

View File

@@ -0,0 +1,302 @@
{
"aliases": {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ [ │ ] │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │ \ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
* │ │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
* │ │ ; │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "DV_GRV",
"label": "`",
}
"KC_1": {
"key": "DV_1",
"label": "1",
}
"KC_2": {
"key": "DV_2",
"label": "2",
}
"KC_3": {
"key": "DV_3",
"label": "3",
}
"KC_4": {
"key": "DV_4",
"label": "4",
}
"KC_5": {
"key": "DV_5",
"label": "5",
}
"KC_6": {
"key": "DV_6",
"label": "6",
}
"KC_7": {
"key": "DV_7",
"label": "7",
}
"KC_8": {
"key": "DV_8",
"label": "8",
}
"KC_9": {
"key": "DV_9",
"label": "9",
}
"KC_0": {
"key": "DV_0",
"label": "0",
}
"KC_MINS": {
"key": "DV_LBRC",
"label": "[",
}
"KC_EQL": {
"key": "DV_RBRC",
"label": "]",
}
"KC_Q": {
"key": "DV_QUOT",
"label": "'",
}
"KC_W": {
"key": "DV_COMM",
"label": ",",
}
"KC_E": {
"key": "DV_DOT",
"label": ".",
}
"KC_R": {
"key": "DV_P",
"label": "P",
}
"KC_T": {
"key": "DV_Y",
"label": "Y",
}
"KC_Y": {
"key": "DV_F",
"label": "F",
}
"KC_U": {
"key": "DV_G",
"label": "G",
}
"KC_I": {
"key": "DV_C",
"label": "C",
}
"KC_O": {
"key": "DV_R",
"label": "R",
}
"KC_P": {
"key": "DV_L",
"label": "L",
}
"KC_LBRC": {
"key": "DV_SLSH",
"label": "/",
}
"KC_RBRC": {
"key": "DV_EQL",
"label": "=",
}
"KC_BSLS": {
"key": "DV_BSLS",
"label": "\\",
}
"KC_A": {
"key": "DV_A",
"label": "A",
}
"KC_S": {
"key": "DV_O",
"label": "O",
}
"KC_D": {
"key": "DV_E",
"label": "E",
}
"KC_F": {
"key": "DV_U",
"label": "U",
}
"KC_G": {
"key": "DV_I",
"label": "I",
}
"KC_H": {
"key": "DV_D",
"label": "D",
}
"KC_J": {
"key": "DV_H",
"label": "H",
}
"KC_K": {
"key": "DV_T",
"label": "T",
}
"KC_L": {
"key": "DV_N",
"label": "N",
}
"KC_SCLN": {
"key": "DV_S",
"label": "S",
}
"KC_QUOT": {
"key": "DV_MINS",
"label": "-",
}
"KC_Z": {
"key": "DV_SCLN",
"label": ";",
}
"KC_X": {
"key": "DV_Q",
"label": "Q",
}
"KC_C": {
"key": "DV_J",
"label": "J",
}
"KC_V": {
"key": "DV_K",
"label": "K",
}
"KC_B": {
"key": "DV_X",
"label": "X",
}
"KC_N": {
"key": "DV_B",
"label": "B",
}
"KC_M": {
"key": "DV_M",
"label": "M",
}
"KC_COMM": {
"key": "DV_W",
"label": "W",
}
"KC_DOT": {
"key": "DV_V",
"label": "V",
}
"KC_SLSH": {
"key": "DV_Z",
"label": "Z",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ { │ } │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ " │ < │ > │ │ │ │ │ │ │ │ ? │ + │ | │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
* │ │ │ │ │ │ │ │ │ │ │ │ _ │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
* │ │ : │ │ │ │ │ │ │ │ │ │ │
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(DV_GRV)": {
"key": "DV_TILD",
"label": "~",
}
"S(DV_1)": {
"key": "DV_EXLM",
"label": "!",
}
"S(DV_2)": {
"key": "DV_AT",
"label": "@",
}
"S(DV_3)": {
"key": "DV_HASH",
"label": "#",
}
"S(DV_4)": {
"key": "DV_DLR",
"label": "$",
}
"S(DV_5)": {
"key": "DV_PERC",
"label": "%",
}
"S(DV_6)": {
"key": "DV_CIRC",
"label": "^",
}
"S(DV_7)": {
"key": "DV_AMPR",
"label": "&",
}
"S(DV_8)": {
"key": "DV_ASTR",
"label": "*",
}
"S(DV_9)": {
"key": "DV_LPRN",
"label": "(",
}
"S(DV_0)": {
"key": "DV_RPRN",
"label": ")",
}
"S(DV_LBRC)": {
"key": "DV_LCBR",
"label": "{",
}
"S(DV_RBRC)": {
"key": "DV_RCBR",
"label": "}",
}
"S(DV_QUOT)": {
"key": "DV_DQUO",
"label": "\"",
}
"S(DV_COMM)": {
"key": "DV_LABK",
"label": "<",
}
"S(DV_DOT)": {
"key": "DV_RABK",
"label": ">",
}
"S(DV_SLSH)": {
"key": "DV_QUES",
"label": "?",
}
"S(DV_EQL)": {
"key": "DV_PLUS",
"label": "+",
}
"S(DV_BSLS)": {
"key": "DV_PIPE",
"label": "|",
}
"S(DV_MINS)": {
"key": "DV_UNDS",
"label": "_",
}
"S(DV_SCLN)": {
"key": "DV_COLN",
"label": ":",
}
}
}

View File

@@ -0,0 +1,317 @@
{
"aliases": {
/* Dvorak for the French language
* Version: 2
*
* The layout is designed by Francis Leboutte <dvorak-fr@algo.be>
*
* Source: https://algo.be/ergo/dvorak-fr.html
*/
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ « │ » │ / │ - │ è │ \ │ ^ │ ( │ ` │ ) │ _ │ [ │ ] │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ : │ ' │ é │ G │ . │ H │ V │ C │ M │ K │ Z │ ¨ │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ O │ A │ U │ E │ B │ F │ S │ T │ N │ D │ W │ ~ │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ à │ ; │ Q │ , │ I │ Y │ X │ R │ L │ P │ J │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"KC_GRV": {
"key": "DV_LDAQ",
"label": "«",
}
"KC_1": {
"key": "DV_RDAQ",
"label": "»",
}
"KC_2": {
"key": "DV_SLSH",
"label": "/",
}
"KC_3": {
"key": "DV_MINS",
"label": "-",
}
"KC_4": {
"key": "DV_EGRV",
"label": "è",
}
"KC_5": {
"key": "DV_BSLS",
"label": "\\",
}
"KC_6": {
"key": "DV_CIRC",
"label": "^ (dead)",
}
"KC_7": {
"key": "DV_LPRN",
"label": "(",
}
"KC_8": {
"key": "DV_GRV",
"label": "` (dead)",
}
"KC_9": {
"key": "DV_RPRN",
"label": ")",
}
"KC_0": {
"key": "DV_UNDS",
"label": "_",
}
"KC_MINS": {
"key": "DV_LBRC",
"label": "[",
}
"KC_EQL": {
"key": "DV_RBRC",
"label": "]",
}
"KC_Q": {
"key": "DV_COLN",
"label": ":",
}
"KC_W": {
"key": "DV_QUOT",
"label": "'",
}
"KC_E": {
"key": "DV_EACU",
"label": "é",
}
"KC_R": {
"key": "DV_G",
"label": "G",
}
"KC_T": {
"key": "DV_DOT",
"label": ".",
}
"KC_Y": {
"key": "DV_H",
"label": "H",
}
"KC_U": {
"key": "DV_V",
"label": "V",
}
"KC_I": {
"key": "DV_C",
"label": "C",
}
"KC_O": {
"key": "DV_M",
"label": "M",
}
"KC_P": {
"key": "DV_K",
"label": "K",
}
"KC_LBRC": {
"key": "DV_Z",
"label": "Z",
}
"KC_RBRC": {
"key": "DV_DIAE",
"label": "¨ (dead)",
}
"KC_A": {
"key": "DV_O",
"label": "O",
}
"KC_S": {
"key": "DV_A",
"label": "A",
}
"KC_D": {
"key": "DV_U",
"label": "U",
}
"KC_F": {
"key": "DV_E",
"label": "E",
}
"KC_G": {
"key": "DV_B",
"label": "B",
}
"KC_H": {
"key": "DV_F",
"label": "F",
}
"KC_J": {
"key": "DV_S",
"label": "S",
}
"KC_K": {
"key": "DV_T",
"label": "T",
}
"KC_L": {
"key": "DV_N",
"label": "N",
}
"KC_SCLN": {
"key": "DV_D",
"label": "D",
}
"KC_QUOT": {
"key": "DV_W",
"label": "W",
}
"KC_NUHS": {
"key": "DV_TILD",
"label": "~ (dead)",
}
"KC_NUBS": {
"key": "DV_AGRV",
"label": "à",
}
"KC_Z": {
"key": "DV_SCLN",
"label": ";",
}
"KC_X": {
"key": "DV_Q",
"label": "Q",
}
"KC_C": {
"key": "DV_COMM",
"label": ",",
}
"KC_V": {
"key": "DV_I",
"label": "I",
}
"KC_B": {
"key": "DV_Y",
"label": "Y",
}
"KC_N": {
"key": "DV_X",
"label": "X",
}
"KC_M": {
"key": "DV_R",
"label": "R",
}
"KC_COMM": {
"key": "DV_L",
"label": "L",
}
"KC_DOT": {
"key": "DV_P",
"label": "P",
}
"KC_SLSH": {
"key": "DV_J",
"label": "J",
}
/* Shifted symbols
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ * │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 0 │ 0 │ + │ % │ │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
* │ │ ? │ < │ > │ │ ! │ │ │ │ │ │ │ = │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │
* │ │ │ │ │ │ │ │ │ │ │ │ │ # │ │
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
* │ │ ç │ | │ │ @ │ │ │ │ │ │ │ │ │
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
* │ │ │ │ │ │ │ │ │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
*/
"S(DV_LDAQ)": {
"key": "DV_ASTR",
"label": "*",
}
"S(DV_RDAQ)": {
"key": "DV_1",
"label": "1",
}
"S(DV_SLSH)": {
"key": "DV_2",
"label": "2",
}
"S(DV_MINS)": {
"key": "DV_3",
"label": "3",
}
"S(DV_EGRV)": {
"key": "DV_4",
"label": "4",
}
"S(DV_BSLS)": {
"key": "DV_5",
"label": "5",
}
"S(DV_CIRC)": {
"key": "DV_6",
"label": "6",
}
"S(DV_LPRN)": {
"key": "DV_7",
"label": "7",
}
"S(DV_GRV)": {
"key": "DV_8",
"label": "8",
}
"S(DV_RPRN)": {
"key": "DV_9",
"label": "9",
}
"S(DV_UNDS)": {
"key": "DV_0",
"label": "0",
}
"S(DV_LBRC)": {
"key": "DV_PLUS",
"label": "+",
}
"S(DV_RBRC)": {
"key": "DV_PERC",
"label": "%",
}
"S(DV_COLN)": {
"key": "DV_QUES",
"label": "?",
}
"S(DV_QUOT)": {
"key": "DV_LABK",
"label": "<",
}
"S(DV_EACU)": {
"key": "DV_RABK",
"label": ">",
}
"S(DV_DOT)": {
"key": "DV_EXLM",
"label": "!",
}
"S(DV_DIAE)": {
"key": "DV_EQL",
"label": "=",
}
"S(DV_TILD)": {
"key": "DV_HASH",
"label": "#",
}
"S(DV_AGRV)": {
"key": "DV_CCED",
"label": "ç",
}
"S(DV_SCLN)": {
"key": "DV_PIPE",
"label": "|",
}
"S(DV_COMM)": {
"key": "DV_AT",
"label": "@",
}
}
}

Some files were not shown because too many files have changed in this diff Show More