46318f36ac
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 09:23:28 +00:00
00eea387fc
[Keymap] Iracing replay keymap ( #12461 )
...
Co-authored-by: Aaron VerDow <aaron@verdow.com>
2021-04-19 02:23:20 -07:00
97e7defaae
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 09:22:54 +00:00
81be065fa5
[Keyboard] VIA Support for LCK75 ( #12402 )
2021-04-19 02:22:18 -07:00
56fff80e71
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 09:21:56 +00:00
53a35c0d0c
[Keyboard] Update RAMA WORKS M50-A ( #12459 )
2021-04-19 02:21:27 -07:00
34df6743f6
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 08:21:39 +00:00
5581ea8809
[Keyboard] Update dz60rgb default keymap ( #12488 )
...
The keymap for this PCB as of April 5, 2020 has a 4rth, largely superfluous layer, creating a total of 5 layers.
When ported to VIA, this results in a layer that users can access but cannot edit. I propose removing this layer completely along with it's access from the default.
2021-04-19 01:20:51 -07:00
0235fc7ab2
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 06:43:21 +00:00
17c880b076
[Keymap] add kinesis/keymaps/stapelberg ( #12430 )
2021-04-18 23:42:40 -07:00
f65a5d2fb5
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 06:18:08 +00:00
ef6802ca60
New keyboard keymap, small keymap updates to mm2 keymap ( #12310 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Alex <alex@turncommerce.com>
2021-04-18 23:17:34 -07:00
6e5fd1a210
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 06:13:00 +00:00
c7adb7a352
[Keyboard] Add wilba.tech WT60-G2 ( #12395 )
2021-04-18 23:12:48 -07:00
a66947b7d6
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 06:12:34 +00:00
10dfc8d92f
[Keyboard] Add wilba.tech WT65-FX ( #12394 )
2021-04-18 23:12:26 -07:00
c7214e1d13
[Keyboard] Add wilba.tech WT65-F ( #12393 )
2021-04-18 23:12:05 -07:00
86ece8e98e
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 06:04:50 +00:00
94d9d2bb31
[Keyboard] Add handwired/frankie_macropad ( #12349 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-18 23:04:16 -07:00
5632c5db31
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 06:00:42 +00:00
0b560673ce
[Keyboard] Updates for 0xCB 1337 ( #12336 )
2021-04-18 23:00:05 -07:00
ca9da27e16
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 05:44:51 +00:00
2b7078cd21
[Keymap] add my quefrency layout ( #12104 )
2021-04-18 22:44:23 -07:00
54521bd04b
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 05:31:08 +00:00
99c46e4b73
[Keyboard] Add G1_65 keyboard ( #12140 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-18 22:30:36 -07:00
2e7fd319a1
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 05:25:03 +00:00
1e19227b31
[Keyboard] Capsunlocked CU80 Squish and Refactor ( #12193 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-18 22:24:30 -07:00
21997e8894
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 05:05:55 +00:00
9b8c5c1860
[Keyboard] Helen80 matrix fixes ( #11969 )
...
Co-authored-by: LIParadise <a58524andy>
2021-04-18 22:05:21 -07:00
ea29874099
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 04:54:01 +00:00
0afbf8cc3c
[Keyboard] Add Dystopia keyboard ( #11997 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Sanctified <Sanctified@users.noreply.github.com>
2021-04-18 21:53:33 -07:00
ca11abc201
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 04:02:42 +00:00
2aab8a114e
[Keyboard] Update MJ61 architecture to support multi version ( #11787 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-18 21:02:13 -07:00
8ecdc66700
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 03:54:31 +00:00
6b2a3a67a6
[Keyboard] Adding of Monarch keyboard ( #11769 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
2021-04-18 20:54:07 -07:00
9484c46555
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 03:45:01 +00:00
cfefecd951
[Keyboard] Added Koolertron AMAG23 ( #11725 )
2021-04-18 20:44:32 -07:00
c2d7ebc3df
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 03:37:16 +00:00
05357d7937
[Keyboard] Add Tau4 keyboard ( #11361 )
...
with default and i2cscanner keymaps
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-04-18 20:36:40 -07:00
7728b0f966
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 03:08:31 +00:00
a0089aa345
Fixup Satisfaction75 bootprocess. ( #12621 )
...
- Use normal ChibiOS I2C driver.
- Move drawing code to housekeeping -- previously it was during matrix
scan, which gets executed during bootmagic checks. However, bootmagic
is invoked before QWIIC subsystem is enabled, which means I2C isn't
configured yet. All I2C calls to the OLED fail with timeouts while
bootmagic is being checked. Housekeeping ensures this is executed once
the system has initialised and settled.
- QWIIC OLED driver: properly clear out OLED buffer when clearing screen.
2021-04-19 13:08:01 +10:00
0a9e18fae1
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 22:40:16 +00:00
eb7e668eb9
Add RGB controls to picture; label Layer 3 correctly ( #12337 )
2021-04-18 18:39:15 -04:00
924b9fcf05
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 22:23:25 +00:00
a3d717cb83
Keymap: Orthocarpus keymap for idobo ( #12462 )
...
* Keymap: Orthocarpus keymap for idobo
* Update keyboards/idobo/keymaps/gkbd_75/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-18 18:22:56 -04:00
884f8658ef
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 22:14:59 +00:00
fd65451679
keyboardio/atreus: Add ardumont keymap ( #12479 )
2021-04-18 18:14:23 -04:00
99ce84827a
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 15:52:15 +00:00
d0973e1cfb
Add ferris 0.2 ( #12133 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-18 17:51:45 +02:00
7f809c013a
Merge remote-tracking branch 'origin/master' into develop
2021-04-17 15:47:13 +00:00
c32264d9b7
mcrown crkbd new keymap ( #12092 )
...
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-17 17:46:46 +02:00
40365f8297
Merge remote-tracking branch 'origin/master' into develop
2021-04-16 14:26:52 +00:00
09a392433a
Ergodone via support ( #11618 )
...
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16 16:26:19 +02:00
1ac030b119
Merge remote-tracking branch 'origin/master' into develop
2021-04-16 14:24:18 +00:00
3975c712f0
Bug in beautifier script, compound modifiers not correctly parsed ( #12595 )
2021-04-16 16:23:30 +02:00
1629c9b71a
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 17:20:12 +00:00
a8c013a145
Fix audio on WT60-XT ( #12526 )
2021-04-15 13:19:41 -04:00
42a57b37fb
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 17:05:00 +00:00
a69616c45c
Optimize NIBBLE oled_bongocat keymap to reduce flash usage ( #12330 )
...
* Optimize with squeez-o frame compression
Adds VIA support!
* Clean up for PR
+ Add copyright header
- Remove debug print statements
2021-04-15 13:04:26 -04:00
be1b5c5a54
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 17:01:54 +00:00
39d31d3ee4
update readme ( #12322 )
2021-04-15 13:01:25 -04:00
19b143688f
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 21:51:45 +00:00
b33e6793de
Dactyl manuform 5x6 2 5 keymap ( #11353 )
...
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys
* fix(keymap): add missing readme
* chore: add gpl2 license header
* chore: add gpl2 license header
* docs[dactyl_manuform_5x6_2_5]: reformat readme
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-14 17:51:08 -04:00
3c08d27abb
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 20:39:01 +00:00
bcceb701cd
[Keyboard] CyberGear Macro25 ( #12518 )
...
* add cybergear macro25 keyboard
* add readme and fix file namings
* rename readme.md
* separate default and via keymaps
* add info.json
* unify info.json and key coordinates
* remove via json
* add missing via layers
* Update keyboards/cybergear/macro25/keymaps/via/rules.mk
* Update keyboards/cybergear/macro25/macro25.c
* Update keyboards/cybergear/macro25/macro25.h
* Update keyboards/cybergear/macro25/readme.md
* Update keyboards/cybergear/macro25/readme.md
* Update keyboards/cybergear/macro25/readme.md
* Update keyboards/cybergear/macro25/readme.md
* remove unnecessary config.h parameters
* Update keyboards/cybergear/macro25/config.h
* remove MATRIX_ROWS and COLS from config.h
* Apply suggestions from code review
set to LAYOUT_ortho_2x5 and fix grammar
2021-04-14 13:38:27 -07:00
98dd9b6614
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 03:09:16 +00:00
9dea6f7720
[Keyboard] Add Caffeinated Studios Serpent65 ( #12578 )
2021-04-13 20:08:42 -07:00
4ed273699a
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 01:32:38 +00:00
b64dabdffd
Correct layout macro name in Cannonkeys Ortho75 info.json ( #12581 )
2021-04-13 18:31:51 -07:00
30f38c4952
Merge remote-tracking branch 'origin/master' into develop
2021-04-13 09:52:45 +00:00
a2ac6f50aa
[Keymap] ANAVI Macro Pad 2 add Google Meet keymap ( #12449 )
...
This keymap for ANAVI Macro Pad 2 contains a couple of shortcuts
for Google Meet:
- left key: turn on/off the microphone (mute button)
- right key: turn on/off the camera
Signed-off-by: Leon Anavi <leon@anavi.org>
2021-04-13 11:52:13 +02:00
a28fbcda23
Terrazzo: Fix wrong LED Matrix function names ( #12561 )
2021-04-13 19:51:31 +10:00
15f7cc3bde
[Keymap] Add kzar keymap for Kinesis Advantage ( #12444 )
2021-04-13 11:39:39 +02:00
a8d64c8b89
Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite ( #12172 )
2021-04-12 21:18:52 +02:00
f5aaecfdfc
Merge remote-tracking branch 'origin/master' into develop
2021-04-12 18:41:12 +00:00
1a7a821582
Merc updates ( #12289 )
2021-04-12 20:40:38 +02:00
ebdf750cdd
Merge remote-tracking branch 'origin/master' into develop
2021-04-12 17:56:32 +00:00
50e0f5dc80
Update layout option for lazydesigners/THE40 ( #12312 )
2021-04-12 19:55:57 +02:00
f02af23973
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:47:14 +00:00
1298eab6ab
Update readme.md ( #12502 )
...
Noticed a letter missing in "compiling".
2021-04-11 12:46:43 +02:00
2e2dd3113b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 13:23:47 +00:00
03685309fd
Reverse K0E and K0G ( #12491 )
...
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-04-10 23:23:08 +10:00
11e5bb2d8a
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 05:58:04 +00:00
e09ca63317
[Keyboard] Add afternoonlabs/oceanbreeze ( #12299 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-04-09 22:57:30 -07:00
29d537ce7b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 00:38:17 +00:00
3dbb7f261d
[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps ( #12217 )
2021-04-09 17:37:49 -07:00
688fb1999b
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 21:36:55 +00:00
93e8a401df
[Keyboard] ergosaurus - add VIA support, enabled RGB ( #12126 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-09 14:36:18 -07:00
bcfa3fb9f2
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 21:32:31 +00:00
7f9409bbb3
[Keyboard] Added senselessclay had60 ( #12093 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 14:31:57 -07:00
58afb87288
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 19:05:51 +00:00
633464acfa
Add VIA keymap for Kawii9 ( #12521 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 21:05:14 +02:00
0a453194e8
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 18:49:03 +00:00
f744e22b49
Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series ( #11977 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: vuhopkep <boy9x0@gmail.com>
2021-04-09 20:48:30 +02:00
d4b3d00d88
Merge remote-tracking branch 'origin/master' into develop
2021-04-08 16:48:07 +00:00
75f83210f4
Add new handwired keyboard (Ergocheap) ( #11857 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-08 18:47:24 +02:00
52e8875eba
Merge remote-tracking branch 'origin/master' into develop
2021-04-07 13:58:12 +00:00
d1270c9d55
Update info.json to correctly. ( #12507 )
2021-04-07 09:57:36 -04:00
69bc465ace
Merge remote-tracking branch 'origin/master' into develop
2021-04-07 10:04:21 +00:00
546dfce209
Add info.json for CK60i ( #12318 )
2021-04-07 20:03:45 +10:00
96acb499d2
Fix up builds that are now too big for `develop` branch. ( #12495 )
2021-04-06 16:39:31 +10:00
3ce8c9fc8f
Merge remote-tracking branch 'origin/master' into develop
2021-04-04 09:10:07 +00:00
e0614e4f52
Disarray ProductID change ( #12440 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@gmail.com>
2021-04-04 11:09:43 +02:00
8428cedc83
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 19:43:05 +00:00
49dc332a04
[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows ( #12259 )
...
* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows
* Made the layout data easier to read.
* helix/rev2/keymaps/five_rows/keymap.c
* helix/rev3_5rows/keymaps/five_rows/keymap.c
* The following two were made the same.
* keymaps/five_rows/config.h
* keymaps/five_rows/oled_display.c
The binary of the compilation result has not changed.
* update keyboards/helix/rev2/keymaps/five_rows/rules.mk
KEYBOARD_LOCAL_FEATURES_MK was moved to the end.
* add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h
The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
2021-04-04 04:42:29 +09:00
e90ec6a474
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 13:51:51 +00:00
7d33d1bace
Added Epoch80 ( #12307 )
2021-04-03 15:51:21 +02:00
638cc50727
Merge remote-tracking branch 'upstream/master' into develop
2021-04-03 20:15:54 +11:00
4b9f5578a0
[CI] Format code according to conventions ( #12468 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-03 20:13:45 +11:00
1444ebb7f1
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 06:20:42 +00:00
59c8672f5c
kingly_keys/ave: move RGBLight config to keyboard level ( #12457 )
...
QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
2021-04-02 23:20:11 -07:00
028a0dcd3d
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 05:12:49 +00:00
a7920acff5
keymaps: fix kinesis default keymap progrm/reset keycode ( #12429 )
...
The right-most top-most key on the Kinesis Advantage keyboard is labeled
“Progrm” and was meant to enter the Teensy bootloader as per the comment.
However, the keycode was set to KC_1, which just produces a “1”.
It should be RESET instead.
This commit fixes KC_1 to RESET in all files where the fix is needed.
The other files have already been fixed independently.
2021-04-02 22:12:24 -07:00
051e23c782
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 04:45:06 +00:00
8d3581a49f
[Keymap] Remove kc keymap from khord chocopad keymap ( #12409 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 21:44:37 -07:00
887d0fca0e
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 04:21:01 +00:00
cd96377312
[Keyboard] Add GON NerD TKL VIA keymap ( #12309 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 21:20:34 -07:00
358b040157
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 04:18:44 +00:00
8b98e67643
[Keyboard] Add pkb65 keyboard ( #12230 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 21:18:15 -07:00
184c553cab
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:59:15 +00:00
6876263961
[Keyboard] KBD67 Hotswap VIA Support ( #12351 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:58:42 -07:00
fc8495a744
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:57:51 +00:00
4caeb64888
[Keyboard] Added wilba.tech WT70-JB ( #12347 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:57:18 -07:00
428e9e7886
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:48:53 +00:00
70540a1f74
[Keyboard] Added RAMA WORKS KARA ( #12346 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:48:26 -07:00
d475f04c78
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:44:40 +00:00
f0dc206784
[Keyboard] Update sixkeyboard VID/PID ( #12345 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:44:06 -07:00
39e1b5b962
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 02:04:56 +00:00
caca8949de
[Keymap] remove kc layout from levinson jyh keymap ( #12301 )
...
Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com>
2021-04-02 19:04:28 -07:00
c375ae3ec7
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 02:03:00 +00:00
0232941b1d
[Keyboard] Added VIA support to dmqdesign/spin ( #12300 )
...
Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu>
2021-04-02 19:02:26 -07:00
f561b857f2
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 00:52:10 +00:00
63445be4e5
[Keyboard] Add FoldKB ( #12255 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 17:51:39 -07:00
4c981953ac
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 00:26:01 +00:00
619885b484
[Keyboard] Add Lumberjack keyboard ( #12124 )
2021-04-02 17:25:23 -07:00
41723340de
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:45:17 +00:00
6592f83589
[Keymap] for Ibm m122 ( #11704 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 14:44:46 -07:00
56560a859b
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:26:07 +00:00
43d74d7fa5
[Keyboard] Add CherryB Studio Keyboards ( #11475 )
...
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>
2021-04-02 14:25:44 -07:00
c1ea97e15d
Merge remote-tracking branch 'origin/master' into develop
2021-04-01 01:59:03 +00:00
ac0ba832c7
change BM68 RGB USB Device descriptor device name ( #12418 )
...
* change styling USB Device descriptor device name to reflect stylistic choices of the developer
2021-03-31 18:58:23 -07:00
da51302345
Merge remote-tracking branch 'origin/master' into develop
2021-03-31 13:09:34 +00:00
c5ddada32e
Remove leftover old implementations of the lily58 split code. ( #12442 )
2021-04-01 00:09:01 +11:00
9d3b11d485
add kinesis/kint36 ( #10171 )
...
This moves the config_common.h into the files that include ../config.h,
so that the kint36/config.h does not include it (which would cause
compilation errors).
2021-03-31 10:41:41 +11:00
c738d60cef
Merge remote-tracking branch 'origin/master' into develop
2021-03-29 03:46:52 +00:00
ae59a51193
Added the 64_ansi (GK64) layout to DZ60 ( #12378 )
...
* add gk64 layout
* Apply suggestions from code review
2021-03-28 20:46:17 -07:00
ea472b46c9
Merge remote-tracking branch 'origin/master' into develop
2021-03-27 08:04:42 +00:00
a866fbf381
handwired/rs60: use LAYOUT_ortho_5x12 directly ( #12397 )
...
This commit renames the macro LAYOUT to LAYOUT_ortho_5x12, and removes the alias.
2021-03-27 19:03:42 +11:00
76f8e84edd
Merge remote-tracking branch 'origin/master' into develop
2021-03-26 17:58:46 +00:00
8af7200085
Pull Request for babyV keyboard ( #12112 )
...
* Add files via upload
* Add files via upload
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update Readme.md
* Update Readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Create CaseFiles
* Delete CaseFiles
* Create Readme.md
* Add files via upload
* Add files via upload
* Add files via upload
* Create Readme.md
* Create Readme.md
* Create Readme.md
* Delete S50-Top.dxf
* Delete S50-Top.svg
* Add files via upload
* Update Readme.md
* Update Readme.md
* Update Readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Updating encoder code.
* Update encoder code.
* Case files and encoder update.
* Update encoder code.
* Updates to encoder code.
* Syntax fixes.
* Create readme.md
* Add files via upload
* Create readme.md
* Add files via upload
* Removed case files from s50 branch
* Format changes.
* Add case files to Master branch
* Syntax fixes
* Recommended code changes for pull request into QMK.
* Recommended change for pull request.
* Delete config.h
* Delete config.h
* Delete config.h
* Delete config.h
* Delete config.h
* Delete config.h
* Add config.h and rules.mk files to the joedinkle layout for autoshift.
* Delete S50-Top-New.dxf
* Delete S50-Top-New.svg
* New case files
Revision to S50 top file.
* Added 3D printed case STL and DXF files.
* Create readme.md
* Update readme.md
* Added babyV firmware
* Update readme.md
* QMK PR preperations.
* Delete config.h
* Delete keymap.c
* Delete readme.md
* Delete rules.mk
* Delete config.h
* Delete keymap.c
* Delete readme.md
* Changes for QMK formatting.
* Removed excess files
Removed case files and schematics from the joedinkle branch. The joedinkle branch is primarily for QMK PRs. These files will remain in the master branch of this fork.
* Add SPRH keyboard
* Formatting and cleanup.
* Edits to default Layout
* Readme Update
* Formatting changes.
* Deleted obsolete code.
* Formatting changes and file removal for QMK PR
* Deleted S50
S50 is a completed keyboard and is located in the Master Branch. S50 removed from the in progress branch.
* Delete Read Me
* Replaced S50 files accidentally deleted in merge.
* Added split layout for SPRH
* Added Files for Blvd PCB
* Add PCB files for Blvd
* Added compressed kicad projects
* Removed obsolete PCB files
* Added PCB files
* Added personal babyV keymap.
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* babyV-added info.json and updated default keymap
* Added case files for babyV
* Update readme.md
* Update readme.md
* Update readme.md
* Updated default keymap.
* Cleaned up keymap folder.
* Added info.json for babyV
* babyV updates
* PR preps
* PR preps
* Update .gitignore
* Delete Backlight.png
* Delete MCU.png
* Delete Matrix.png
* Delete readme.md
* Rename Readme.md to readme.md
* Requested PR changes.
* Update rules.mk
* Update rules.mk
* readme and rules.mk updates
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/babyv/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update readme.md
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-26 13:58:13 -04:00
3d957a33fa
Merge remote-tracking branch 'origin/master' into develop
2021-03-26 12:37:54 +00:00
f028dbf179
Minor typo in comments Colemak DM-MK -> DH-MK ( #10721 )
2021-03-26 23:37:17 +11:00
56dee4acc6
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:40:23 +00:00
34205f5bb5
Add new Keyboard: SENDYYeah Bevi ( #12011 )
...
* Add bevi Keyboard
* Update readme
* Change image embed
* Update instructions to compile
* beVi initial
* Enable NKRO
* Update README
* Revert Lily58 rules.mk
* Revert h87a info.json
* Add URL and maintainer in info.json
* Update year
* Add layer 1
* Tidying up
* Fix keymap
* Add one line at end of file
* Replicate default keymap to via
* Update keyboards/sendyyeah/bevi/bevi.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove comment on layout macro definition
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-25 23:39:35 +11:00
d0d77e8c60
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:39:14 +00:00
3143846ba4
keyboards/xd60/readme.md: link to schematic on EasyEDA ( #12018 )
2021-03-25 23:38:54 +11:00
9f1608a6a2
Add unison v04 keyboard ( #11982 )
...
* Update: JonesのMIDIキーマップをベースに初期作成。AudioとMIDIの同時使用はファームウェアサイズ的に厳しい。
* Update: Unison用のIDへ変更
* Update: Audioはデフォとせず、OLEDをデフォとした。
* Update: v03基板から実際に動くものとなったため、v01からv03に変更。基本的な設定を完了。
* Update: 基本的なキーマップを作成
* Update: キーマップ、ロータリーエンコーダの感度を調整。
* TEST: BOOTMAGIC = lite でどうなるのかテスト
* Update: Jones ---> Unison
* TEST: BOOTMAGIC = lite で、TABキーでBootloaerに入る設定
* Update: インデント
* Update: QMKの一般的な表記に合わせ、 k(col)(row) から k(row)(col) へ変更。
* Update: 自前のカスタムマトリクスを使用せず、COL2ROW方式で総当たりマトリクスを動作させるテストを開始。
特に問題なく動作している。
* TEST: BOOTMAGICテスト用コード追加
* Update: 主に中央部分のキーマップ変更
* TEST: COL2ROWで、COLのピンの順番を変えてキーを読むテスト
* Update: QMKの仕様上、MacではKC_PSCRがFキーとして判定されるため、スクリーンショット用マクロを用意した。
* TEST: COL2ROWで、ROWとCOLのピン定義をずらした状態で、BOOTMAGIC = lite の（0,0)キーに引っかからない。
* Update: ロータリーエンコーダにマウスホイールを割り当て
* Update: 自明のコメントを削除
* Update: NKRO指定時は、NKRO動作を強制。
* Update: MIDIなしのとき、AUDIOのフル機能がファームウェアサイズ内に収まることをチェック。
* Update: Bootmagicテスト完了のため、無効化。
* TEST: LED動作チェック。
* Update: キーマップを、LOWER, RAISEを中心に大幅変更。
数字を左手レイヤーキーではなく、右手レイヤーキーにしたことで、CMD+Qによる誤爆アプリ終了を避ける狙いもある。
* Update: 未使用のNumレイヤとTapDanceを削除。
* Update: MIDI関連の設定を多数追加。
* New: Add Sequencer keymap
* enumの開始を明記
* TAP_DANCEを無効化
* シーケンサーで、トラック単位の有効・無効の切り替えを追加。※動作せず
* デバッグ用設定をテスト
* Change custom keycode name for classification.
* Add LED update on sequencer step.
* change LED adjusting value.
* TEST: SQ_T related things.
* DEBUG
* Increase track 6 ---> 8. Add track indicator.
* Add sequencer step viewer.
* Move Bootmagic lite position to keyboard's config.
* Revert matrix as phisically connected.
* Change default RGB lighting animation.
* Remove MIDI options from keyboard's config.
* change version
* Remove unused.
* Delete unused. Round-Robin matrix woks with COL2ROW.
* Delete unused. Round-Robin matrix woks with COL2ROW.
* Formatting.
* Formatting.
* Remove unused.
* No enum.
* LED setting for Sequencer layer.
* Add TODO flag
* Remove unused.
* change LCTL
* Update Rotary Encoder setting.
* revert to default
* Add TODO flag.
* Update to latest information.
* Update to latest information.
* Add v04
* Move keymaps directory to just under keyboard directory.
* Add music layout.
* Update to Unison layout.
* Add default keymap.
* Update readme description.
* Commenting.
* Exclude non-PR files.
* Change keymap name more general.
* Remove unused
* Commenting.
* Remove unused.
* Commenting.
* Change Macro name for consistency.
* Add tempo definition.
* Change transparent to noop for better musical play.
* Add Rotary Encoder push functions for Sequencer.
* FIX printscreen to work _WIN layer.
* Fix style name.
* Change keymap style from PC to Music.
* Adjust LED number and index to v04 PCB.
* Commenting.
* Add #ifdef block to LED config related.
* Change Sequencer display function from Rotary Encoder right-3 to right-4.
* Change default animations.
* Set LED effect range. Add LED reset on layer change.
* Remove unused.
* Commenting.
* Commenting.
* Use function to change Sequencer track indicator.
* Use function to change Sequencer track indicator.
* Remove unused
* Add PC-style keymap.
* Adjust keymap.
* Add micro volume control for Mac.
* Adjust keymap.
* Adjust cursor block.
* Adjust grave and tild in layer.
* Change magic-key position to Left-Bottom where both Music-style and Terminal-style have a key.
* Change LED settings for front-side 9 LEDs.
* Change keymap name.
* Update supported functions.
* Adjust indicator dimmer.
* Remove unused.
* Add underglow support.
* Add rotary encoder keymap at Adjust layer for test hardware function.
* Disable rotary encoders.
* Change description.
* Add support for underglow.
Disable knight animation to prevent unnatural feeling when underglow not installed.
* Commenting.
* Formatting.
* Turn on default layer indicator.
* remove duplication
* Change VID for via.
* Initial commit for VIA.
* Add layout option.
* restore AUDIO enabled.
* Removed a JSON file for VIA app, not for QMK.
* Remove non-related files for PR.
* Add keymap for music layout.
* Add photo links.
* Commenting.
* Apply PR checklist.
* Change unused function to "no".
* Add keymap image and change keymap as image shows.
* Change bootloader entering key to widely known "Left-Top".
* Turn off ENCODER by default.
* Add VIA keymap.
* Change VID unique.
https://github.com/qmk/qmk_firmware/pull/11982#discussion_r582276979
* Add config option to prepare future release, #11820 .
https://github.com/qmk/qmk_firmware/pull/11820
* Remove old defines for Audio.
Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
2021-03-25 23:38:31 +11:00
2df1b124a7
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:11:36 +00:00
666623d39a
ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs ( #11994 )
...
* added adns5050 sensor code, as well as implementations for the Ploopy Mini and the Ploopy Nano
* fixed spurious scrolling issue
* recommended fixes for pr linting and cleanup
2021-03-25 23:10:55 +11:00
f2729e8974
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:08:38 +00:00
0eabb01e27
Minor improvements to BM68RGB ( #12156 )
...
* Minor improvements to BM68RGB
* Add grave esc and LTO support
* Move comments to end of line
* Document the use of qmk script for compiling and flashing
* Revert arrow key flags back to mod
* Update keyboards/bm68rgb/bm68rgb.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/bm68rgb/bm68rgb.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Remove grave escape
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update tab spacing
Co-authored-by: Ryan <fauxpark@gmail.com>
* Reverted make default
Co-authored-by: Ryan <fauxpark@gmail.com>
* Reverted make flash
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: filterpaper <filterpaper@localhost>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 23:08:04 +11:00
aa85b5ee1e
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:05:42 +00:00
a5ecd4eb87
Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same ( #12203 )
...
* Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same
* Use NO_PIN instead of duplicate pin
2021-03-25 23:05:05 +11:00
fd24546787
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:04:35 +00:00
f3f444c1df
Add Nix Studio OXALYS80 Keyboard ( #12118 )
...
* Initial commit of OXALYS80 firmware
* Remove comments
* Add new return in info.json
* Fix pin output init for scroll lock indicator
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/oxalys80.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Delete keymaps config.h
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-25 23:04:02 +11:00
9294c5aa0a
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:03:24 +00:00
81c51ec51c
[Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c ( #12188 )
...
* update keyboards/helix/pico/keymaps/mtei/keymap.c
Stopped using the LAYOUT_kc macro. (this is response to #12160 )
There is no change in the generated binary.
* small update pico/keymaps/mtei/keymap.c
2021-03-25 23:02:54 +11:00
712c9fc848
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:02:24 +00:00
b5a12fa6d3
[Keymap] ANAVI Macro Pad 2 add git keymap ( #12212 )
...
This keymap for ANAVI Macro Pad 2 contains popular git commands
typed out and executed with a single key:
- left key: git commit -s
- right key: git push
Signed-off-by: Leon Anavi <leon@anavi.org>
2021-03-25 23:01:45 +11:00
96a6214316
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:01:35 +00:00
29c82cfb33
Add RGB Matrix suspend wake functions to BM40 ( #12246 )
...
* Add suspend wake functions for RGB Matrix
* Add suspension RGB functions to Planck/rev6 and Preonic/rev3
* Add suspend wake to Mark 65
* Revert changes to planck and preonic
* Remove changes to The Mark65
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25 23:01:03 +11:00
d2b405066d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:55:36 +00:00
2cd684f8e0
add massdrop/alt/hlmtre keymap, add .exe to gitignore ( #12191 )
...
* add massdrop/alt/hlmtre keymap, add .exe to gitignore
* changes request in PR (license header and fix gitignore)
Co-authored-by: Matt Weller <matthew.weller@nvih.org>
2021-03-25 22:55:01 +11:00
ea1ed13bc8
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:53:33 +00:00
c4d05010cb
Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md ( #12221 )
...
* Daisy first commit buggy
* buggy still underglow crash
* Daisy V1
* ReadMe Updates
2021-03-25 22:53:30 +11:00
6276f54752
Add suspend wake functions for The Mark:65's RGB Matrix ( #12245 )
...
* Add suspend wake functions for RGB Matrix
* Add USB suspend definition to config.h
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25 22:52:53 +11:00
c3483458fe
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:51:33 +00:00
572395ac20
TKC GodSpeed75: add RGB LED support ( #12278 )
...
* GodSpeed75: add RGB support
* GodSpeed75: minor updates
* GodSpeed75: minor updates
* GodSpeed75: restore chconf.h
* GodSpeed75: restore chconf.h
* GodSpeed75: restore chconf.h
2021-03-25 22:51:02 +11:00
ba5aacbb95
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:50:49 +00:00
95c74ae4ae
add via support for bm68rgb ( #12275 )
...
* add via support for bm68rgb
* add newline to keymap.c
2021-03-25 22:50:17 +11:00
a2165b38a0
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:49:40 +00:00
3fc710e0b1
Add XT65 keyboard ( #11998 )
...
* Add XT65 keyboard
* Create readme.md
* Updated readme.md and rules.mk
* Updated config.h and readme.md
* Update imgur link
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/kopibeng/xt65/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 22:49:37 +11:00
dd0a35273c
added twelvekey ( #12281 )
...
* added twelvekey
* rename layout
2021-03-25 22:48:59 +11:00
e86b7d0c13
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:47:36 +00:00
cf7404630e
ISO Layouts fix ( #12319 )
2021-03-25 22:47:03 +11:00
a3760c0891
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:39:24 +00:00
1d706bd77c
handwired/bolek: correct key object order ( #12356 )
2021-03-25 22:38:52 +11:00
87f6df0655
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:57 +00:00
a74846a0db
Added wilba.tech WT60-H2 ( #12348 )
...
* Added wilba.tech WT60-H2
* fix typo
* Fix error in keymap
2021-03-25 22:36:52 +11:00
25b7a5d531
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:29 +00:00
038d9118b6
Added wilba.tech WT65-G2 ( #12360 )
2021-03-25 22:36:24 +11:00
be771e5fd2
Added wilba.tech WT60-H3 ( #12354 )
...
* Added wilba.tech WT60-H2
* fix typo
2021-03-25 22:35:54 +11:00
c7436e667d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:49 +00:00
1fbee7c316
(Re)Fixing K-type RGB lighting ( #12084 )
...
* initial rgb driver fix
* added underglow LEDs and fixed typo in RGB locations
* removed test code
* added my key maps
* updated rgb keymap to work with changes
* refactored my code to make it more maintainable and updated keymaps.
* added GPL licence
* Turned off matrix scan rate debug info
* added checks if RGB matrix is enabled to fix errors when building keymaps without RGB matrix enabled
* Apply suggestions from code review by fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
* Renamed led driver file to be less ambiguous
* Renamed is31fl3733 driver files to is31fl3733-dual
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 22:35:18 +11:00
183dde75de
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:06 +00:00
8b39ae13c7
add equator ( #12369 )
...
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25 22:34:29 +11:00
921f1ba4cf
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 07:06:41 +00:00
c59fb1b477
feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update ( #12252 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 18:06:30 +11:00
e7cb7bc737
Roses Lite layout macro touch-up ( #12357 )
2021-03-25 18:05:59 +11:00
1bb04ea598
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 05:29:33 +00:00
1ed48c774e
add valor_frl_tkl info.json ( #12359 )
...
* add info.json
* remove macro keys to correct layout
2021-03-24 22:28:54 -07:00
c823160d94
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 01:33:46 +00:00
97a73637e0
[Keyboard] Preserve signedness from opt_encoder_handler for scroll data on ploopy devices ( #12223 )
2021-03-24 18:33:06 -07:00
743d6c430b
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 10:13:37 +00:00
723d9af04d
Add info.json for handwired/datahand ( #12320 )
2021-03-24 21:12:55 +11:00
87aa3282f0
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 09:07:46 +00:00
6edcbdca19
[Keyboard] YMDK YM68 ( #12352 )
...
* [Keyboard] YMDK YM68
Converted from a KBFirmware JSON file provided via the vendor's product listing.
PCB supports Backlight on B6 and RGB Underglow on E2, but the LEDs are not pre-soldered according to the PCB photos.
* update VENDOR_ID and PRODUCT_ID
2021-03-24 02:07:12 -07:00
bbc48b0ef5
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 04:25:05 +00:00
2882ee9f55
Configurator bugfix for GMMK Pro ( #12353 )
2021-03-24 15:24:20 +11:00
dd5a732eac
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 02:04:16 +00:00
78149505f9
Fix Uni660 linker errors ( #12341 )
2021-03-24 13:03:43 +11:00
862b01d4c0
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 02:00:40 +00:00
7b07ce3fef
Add UC-1 keypad ( #11926 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-03-24 13:00:07 +11:00
9afbbf21fd
Merge remote-tracking branch 'origin/master' into develop
2021-03-23 18:19:00 +00:00
d395c81606
Configurator fixes for handwired/concertina/64key ( #12316 )
...
* Fixed bug that was hiding a key in info.json.
* Improvements to presentation.
2021-03-23 11:18:19 -07:00
b2cfb629e4
Merge remote-tracking branch 'origin/master' into develop
2021-03-23 15:11:57 +00:00
be257b6f9f
Add Sinc Rev. 2 ( #12138 )
2021-03-23 11:11:07 -04:00
34423580e0
Merge remote-tracking branch 'origin/master' into develop
2021-03-23 07:01:25 +00:00
d4a8123267
Update readme.md on quefrency ( #12276 )
...
* Update readme.md on quefrency
Fix incorrect flashing instructions
* Update keyboards/keebio/quefrency/readme.md
2021-03-23 00:00:34 -07:00
fe58770df8
Merge remote-tracking branch 'origin/master' into develop
2021-03-21 02:43:41 +00:00
c5b0366a25
Fix Kira80 license headers ( #12303 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-03-21 13:43:04 +11:00
00a0c81f8e
Durgod keyboard refactor in preparation for adding additional durgod keyboards ( #11978 )
...
* Durgod keyboard refactor in preparation for adding additional durgod keyboards
* Moving Durgod board configuration into a common location
* Reformatting layout macro whitespace
* Moving TGUI key functionality to the keyboard level
* Replacing default keymap.c with keymap.json
* Changing default and default_toggle_mac_windows keymaps to LAYOUT_all
* Increasing EEPROM size to support more VIA layers
* Fixing media keys; KC_MRWD/KC_MFFD => KC_MPRV/KC_NXT
* Move ISO Enter key to the correct row in Durgod K320
* Minor whitespace and readme cleanup for K320
* Changing durgod/k320 debounce back to default
* Simplifying DURGOD_STM32_F070's chconf.h
Co-authored-by: Simon Arlott <sa.me.uk>
Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
2021-03-21 11:11:22 +11:00
945b7a0613
Merge remote-tracking branch 'origin/master' into develop
2021-03-20 03:53:28 +00:00
217e3a59c4
Boston: correct LAYOUT macro data ( #12282 )
...
- correct macro reference
- add missing encoder position
- correct maintainer value to reference keyboard maintainer's GitHub account
- remove trailing whitespace
2021-03-20 14:53:02 +11:00
9d547a8443
Merge remote-tracking branch 'origin/master' into develop
2021-03-20 00:13:10 +00:00
0ab88f5342
[Keyboard] Vanana, Vaguette Lite, and Waaffle ( #11441 )
...
* added Vanana / Vaguette Lite / Waaffle
* changed extra GPIO allocations of Waaffle and Vanana
* Apply suggestions from code review
changed layout name of vaguette Lite / requested by drashna
* Apply suggestions from code review
Requested keymap changes have been made.
* all changes requested by collaborators are made
* RGB config updated / keymap updated
* fixed vaguette lite info.json
* fixed vaguette lite info.json
* fixed vaguette lite info.json
* Apply suggestions from code review
request changes are made
* pre rename h
* vaguettelite reanmed to lowercases
* fixed vanana keymap
* Apply suggestions from code review
* changed Bootmagic key of VaguetteLite as suggested
* Updated via keymap of Vaguette Lite as suggested
* add vaguette lite 6.25 layout
* added vaguette lite noclew keymap
* updated vaguette lite 6.25u keymap description
* updated vanana default keymap
* updated keymap spacing
* reabased from the official repo
* Update keymap.c
fixed vaguette lite keymap
* Apply suggestions from code review
All the requested changes by a collaborator were made.
* updated info.json of Vanana and readme files of Vanana and waffle
* rename LAYOUT_waaffle to LAYOUT_ortho_5x16
Also adjusts the info.json data to put a visual gap between the extension and main PCBs.
* make rules.mk and info.json specific to rev3
Removes nckiibs/waaffle as a build target, as it redirects to the only extant revision in the repository.
* add controller board build targets
Adds build targets for Pro Micro and Elite-C builds, with appropriate defaults for each.
Running `make nckiibs/waaffle/rev3` defaults to a Pro Micro-based build.
2021-03-19 17:12:38 -07:00
c2dc3008b5
Merge remote-tracking branch 'origin/master' into develop
2021-03-19 19:37:22 +00:00
8dfe37a3a3
Sirius UniGo66 touch-up ( #12280 )
...
* un-nest layout macros
* use #pragma once include guard in unigo66.h
* unify rules.mk to QMK AVR template
- remove Bootloader selection comment block
- unify Build Option header comment
- align Build Option rules and inline comments
* remove unused LAYOUT_all macro
* update readme.md to match QMK template
2021-03-19 12:36:52 -07:00
d97a9fb4ff
Merge remote-tracking branch 'origin/master' into develop
2021-03-18 14:26:24 +00:00
a5576f9738
[Keyboard] Add Pachi ( #12132 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-19 01:25:37 +11:00
6d050b7282
Merge remote-tracking branch 'origin/master' into develop
2021-03-18 13:17:59 +00:00
c833b77646
Fixed keymap names of Noah AVR ( #12265 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-19 00:17:21 +11:00
74c89de3e9
Merge remote-tracking branch 'origin/master' into develop
2021-03-18 03:38:43 +00:00
ed446360a4
Aleblazer Zodiark touch-up ( #12279 )
2021-03-18 14:38:08 +11:00
4aa57e9e46
Merge remote-tracking branch 'origin/master' into develop
2021-03-18 00:48:52 +00:00
9331c22620
XT converter cleanup ( #12264 )
2021-03-18 11:48:09 +11:00
d0c2f3c403
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 22:33:49 +00:00
cc84831cae
Adding Keyboard: GMMK Pro ( #12030 )
...
* GMMK Pro QMK Firmware Code
* info.json added
* updated info.json for the unused keys
* redoing info.json
* readme for pro
* gmmk initial readme
* pipeline fix, issue with compiling gmmk.h
* gmmk pro code formatting changes
* removed rules.mk
* noci file
* Updates
* updated matrix function to match keymap
* updating the keymap layout, renaming matrix, updating layout name to LAYOUT
* fauxpark changes added
* PID VID updates
* removed chconfig and made rules.mk comments cleaner
Co-authored-by: Drashna Jael're <drashna@live.com>
2021-03-18 09:33:16 +11:00
31b657e8ea
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 17:08:39 +00:00
f490777502
[Keyboard] Add handwired/bolek keyboard ( #12234 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-17 10:07:56 -07:00
3367705ac2
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 17:02:38 +00:00
6e79767f5a
[Keymap] jumper149 keymap for the dztech/dz65rgb ( #12142 )
2021-03-17 10:02:00 -07:00
6671344602
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 16:44:59 +00:00
3bc7f46412
[Keymap] Add userspace rverst ( #12205 )
...
Co-authored-by: Robert Verst <robert.verst@tobit.com>
2021-03-17 09:44:21 -07:00
60837c9d0f
[Keyboard] Split RGB Matrix Zygomorph support ( #11083 )
2021-03-16 23:56:39 -07:00
d4ac56226d
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:50:58 +00:00
8a2d3a8861
[Keyboard] Add support for ortho4exent ( #11699 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-16 23:50:22 -07:00
29589ce832
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:48:33 +00:00
538194344a
[Keyboard] add oled and encoder function to lck75 ( #11825 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-16 23:48:03 -07:00
5e7a7c7e2f
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:47:59 +00:00
23765332fa
[Keyboard] Modification of ErgoArrows info.json ( #11980 )
...
The order of key descriptions in ErgoArrows info.json was wrong, so it has been corrected.
2021-03-16 23:47:18 -07:00
71b38e0cee
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:32:31 +00:00
163e9b02bf
[Keyboard] Add barleycorn smd keyboard ( #12200 )
2021-03-16 23:31:58 -07:00
8c00003466
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:23:19 +00:00
90f95de5c9
[Keyboard] add via keymap to afternoonlabs breeze keyboard ( #12247 )
2021-03-16 23:22:43 -07:00
33852d14af
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:18:20 +00:00
ffc4380b30
[Keyboard] Add KMAC VIA keymap ( #12224 )
2021-03-16 23:17:40 -07:00
6bc4528776
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 06:01:16 +00:00
314ef9df03
Pimentoso Paddino02 clean-up ( #12263 )
...
* fork rules.mk to be version-specific
* remove pimentoso/paddino02 as a keyboard target
This commit makes it so QMK API doesn't identify pimentoso/paddino02 as a build target on its own, because there's no actionable code here.
* add image to readme.md
* unify rules.mk files to QMK AVR template
- remove Bootloader selection comment block
- sort Build Option rules
- unify inline comments
2021-03-16 23:00:43 -07:00
b4b3be4f05
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 04:58:19 +00:00
563be8ca2a
Add bootmagic support for hub16 and hub20 ( #12257 )
2021-03-17 15:57:51 +11:00
6817771df7
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 04:57:18 +00:00
e527b375e8
TKC M0lly refactor ( #12227 )
2021-03-17 15:56:45 +11:00
ed8ffa4bb4
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 03:10:20 +00:00
4e8a218d17
[Keymap] Mojito - removed layer macros ( #12201 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-16 20:09:45 -07:00
3c92142f12
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 03:06:02 +00:00
57de02c9f2
[Keyboard] fix bm68rgb default keymap ( #12199 )
2021-03-16 20:05:20 -07:00
c680c84a31
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 02:50:20 +00:00
3c4972a53f
[Keyboard] Fix issue with process_record_kb in Torn ( #12189 )
2021-03-16 19:49:48 -07:00
cefa23e4eb
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 02:24:08 +00:00
554b73643d
[Keyboard] Added Roses Lite Support ( #12173 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-16 19:23:35 -07:00
07ea935533
Merge remote-tracking branch 'origin/master' into develop
2021-03-17 01:39:42 +00:00
e941ae3811
[Keyboard] Add YMDK NP24 (ATmega32U4 with 6 RGB LEDs) ( #12120 )
2021-03-16 18:39:09 -07:00
319031154d
Merge remote-tracking branch 'origin/master' into develop
2021-03-16 07:01:35 +00:00
f75420c209
box75: fix key positioning in info.json ( #12256 )
...
* fix key positioning for box75
2021-03-16 00:00:59 -07:00
2defbde5ab
Merge remote-tracking branch 'origin/master' into develop
2021-03-15 23:10:08 +00:00
d99806cc27
Pizza Keyboards Pizza65 addition ( #11604 )
...
* Added Pizza65 from Pizza Keyboards
Addition of Pizza65
* Update pizza65.h
* Update info.json
* Update mcuconf.h
* Update rules.mk
* Updated makefile
* Update keyboards/pizzakeyboards/pizza65/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/pizzakeyboards/pizza65/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/pizzakeyboards/pizza65/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Chibios Config migration
* Update keyboards/pizzakeyboards/pizza65/readme.md
Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>
* Update keyboards/pizzakeyboards/pizza65/readme.md
Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>
* Update keyboards/pizzakeyboards/pizza65/pizza65.h
Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>
* Update rules.mk
nk rollover activation
* conf updates
* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c
Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>
* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c
Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>
* Update keymap.c
thanks to Acaban
* Update pizza65.h
update to the iso_blocker_doublebs layout macro
* Delete chconf.h
Deleting after the ChibiOS-conf migration.
* Delete config.h
Deleting after the ChibiOS-conf migration.
* Revert "Delete config.h"
This reverts commit 16d64619e68578382aca3b1475968563b662d07f.
* Delete mcuconf.h
Deleting after ChibiOS-conf migration.
* Delete halconf.h
Deleting after ChibiOS-conf migrations.
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>
Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>
2021-03-16 10:09:29 +11:00
c12eae0c5e
Merge remote-tracking branch 'origin/master' into develop
2021-03-15 23:03:53 +00:00
cd8497b9fb
add support for Noah AVR PCB ( #11563 )
...
* add support for Noah AVR PCB
* Update info.json
* Update readme.md
* Update keyboards/kb_elmo/noah_avr/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keymap.c
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-16 10:03:16 +11:00
469b4b21d2
Fixes for recent info.json files ( #12248 )
2021-03-16 07:45:39 +11:00
56d193c5c8
Merge remote-tracking branch 'origin/master' into develop
2021-03-15 17:42:47 +00:00
926389f3a7
Keyboard/grandiceps ( #11933 )
...
* Add Grandiceps keyboard
* Fix info.json
* Fix typo
* Fix typo
* cleanup format
* move mcu files to root
* Updated with PR changes
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* PR issues for chibios confmigrate
* PR Changes
Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-15 17:42:09 +00:00
c3a2a7659e
Merge remote-tracking branch 'origin/master' into develop
2021-03-15 08:25:35 +00:00
52b7ebd6be
M10-A refactor ( #12242 )
2021-03-15 19:25:00 +11:00
8b9419aaf7
Merge remote-tracking branch 'origin/master' into develop
2021-03-15 08:07:38 +00:00
2e50b34c67
Add missing info.json files for keyboards ( #12239 )
...
Recent changes to QMK Configurator's API have made it so an info.json file is required for QMK Configurator to know how to render the keyboard in question.
This PR adds info.json files for keyboards that did not have them, with a few exceptions for boards whose layouts I was unable to determine.
* add info.json file for 2key2crawl
* add info.json file for 40percentclub/4x4
* add info.json file for 40percentclub/5x5
* add info.json file for 4pplet/aekiso60/rev_a
* add info.json file for 4pplet/steezy60/rev_a
* add info.json file for 6ball
* add info.json file for 7c8/framework
* add info.json file for aeboards/constellation
* add info.json file for alpine65
* add info.json file for aplyard/aplx6
* add info.json file for arch_36
* add info.json file for arisu
* add info.json file for box75
* add info.json file for butterstick
* add info.json file for four_banger
* add info.json file for geekboards/tester
* add info.json file for handwired/2x5keypad
* add info.json file for handwired/412_64
* add info.json file for handwired/42
* add info.json file for handwired/aplx2
* add info.json file for handwired/brain
* add info.json file for handwired/cans12er
* add info.json file for handwired/ck4x4
* add info.json file for handwired/d48
* add info.json file for handwired/dactyl_manuform/dmote/62key
* add info.json file for handwired/daishi
* add info.json file for handwired/hexon38
* add info.json file for handwired/jot50
* add info.json file for handwired/jotanck
* add info.json file for handwired/jotpad16
* add info.json file for handwired/k8split
* add info.json file for handwired/myskeeb
* add info.json file for handwired/nicekey
* add info.json file for handwired/onekey
* add info.json file for handwired/postageboard
* add info.json file for handwired/riblee_f401
* add info.json file for handwired/riblee_f411
* add info.json file for handwired/rs60
* add info.json file for handwired/splittest
* add info.json file for handwired/trackpoint
* add info.json file for handwired/traveller
* add info.json file for hhkb_lite_2
* add info.json file for honeycomb
* add info.json file for ivy/rev1
* add info.json file for keebio/viterbi
* add info.json file for laptreus
* add info.json file for latin47ble
* add info.json file for latin64ble
* add info.json file for launchpad/rev1
* add info.json file for lets_split_eh/eh
* add info.json file for mechmini/v1
* add info.json file for meira
* add info.json file for meishi
* add info.json file for merge/iso_macro
* add info.json file for mschwingen/modelm
* add info.json file for pabile/p20
* add info.json files for pimentoso/paddino02
rev1, rev2/left, and rev2/right
* add info.json file for rgbkb/pan
* add info.json files for runner3680
3x6, 3x7, 3x8, 4x6, 4x7, 4x8, 5x6, 5x7, and 5x8
* add info.json file for sck/gtm
* add info.json file for splitish
* add info.json file for standaside
* add info.json file for ungodly/launch_pad
* add info.json file for xelus/trinityxttkl
* Revert "add info.json file for rgbkb/pan"
This reverts commit 280b89bc6157023a621a9864f5d74d59d62bb511.
* correct maintainer for ivy/rev1
2021-03-15 01:06:55 -07:00
998c58e89b
Merge remote-tracking branch 'origin/master' into develop
2021-03-15 01:19:36 +00:00
0779c34db8
Fix keycode mappings for via and ensure they don't change within protocol ( #12130 )
...
* Fix keycode mappings for via and ensure they don't change within protocol
* Update keycodes
* Fix broken keyboards
* added the missing keycodes found in via
* Remove invalid keycodes
Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
2021-03-15 12:19:01 +11:00
35db567c9c
Merge remote-tracking branch 'origin/master' into develop
2021-03-14 21:51:52 +00:00
9e1d04fea7
[Keyboard] Added Adellein Keyboard/PCB ( #11547 )
2021-03-14 14:51:21 -07:00
93929e8d01
Merge remote-tracking branch 'origin/master' into develop
2021-03-14 20:19:39 +00:00
b44bffe954
[Keymap] Add yhaliaw keymap for Planck/Rev6.1. ( #11318 )
2021-03-14 13:19:05 -07:00
75867ff164
Merge remote-tracking branch 'origin/master' into develop
2021-03-14 20:17:43 +00:00
739925c902
Add info.json for RGBKB Pan ( #12218 )
2021-03-15 07:17:09 +11:00
78be537eff
Merge remote-tracking branch 'origin/master' into develop
2021-03-14 19:56:33 +00:00
45e6bb7add
Add Cassette42 ( #10562 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-15 06:55:59 +11:00
d036ebeaf6
Merge remote-tracking branch 'origin/master' into develop
2021-03-14 19:24:07 +00:00
7b7689d307
[Keymap] miles2go userspace update, add functions for babblepaste library, add prime_e keybard keymap ( #9196 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-14 12:23:30 -07:00
f236395176
LED Matrix: Clean up includes ( #12197 )
2021-03-13 11:38:26 +11:00
71bb07d10a
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 22:38:13 +00:00
b96c18c952
Hand 88 ( #11963 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-13 09:37:41 +11:00
e83f4e0173
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 21:58:40 +00:00
225bff226f
fix info.json layout name for boardsource/5x12 ( #12145 )
2021-03-13 08:57:50 +11:00
0ee473afd1
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 21:50:57 +00:00
5d7ad69cd8
[Bugs] Fix VIA Compiles ( #12186 )
2021-03-12 13:50:15 -08:00
f279f4731b
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 21:48:20 +00:00
b8ad5f4249
Document LED physical location index for Planck and Preonic ( #12147 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-13 08:47:45 +11:00
d95df57297
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 07:44:20 +00:00
63f9e7ee86
Enable default features on VIA keymap for Lily58 ( #12185 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-12 18:43:31 +11:00
183c49f352
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 06:34:50 +00:00
ea2a7c5ea4
ChibiOS conf upgrade for boston ( #12170 )
...
boston - 8bded9dabff58de6febd927d4ad976bb743696a3
2021-03-12 17:33:48 +11:00
97268662fe
Merge remote-tracking branch 'origin/master' into develop
2021-03-11 18:02:34 +00:00
0ad7833ca4
[Keymap] arkag Userspace updated ( #12183 )
...
Co-authored-by: Alex <alex@turncommerce.com>
2021-03-11 10:01:53 -08:00
b113772bb1
Merge remote-tracking branch 'origin/master' into develop
2021-03-10 22:48:53 +00:00
790f94533c
Refactor to use led config - Part 6 ( #12115 )
...
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* revert changes
2021-03-10 22:48:18 +00:00
bb01ea3809
Merge remote-tracking branch 'origin/master' into develop
2021-03-10 05:18:14 +00:00
9089244db7
Add VIA support to doodboard/duckboard_r2 ( #12028 )
...
* Update R1 keymap and config
* Add duckboard R2
* Add VIA support for duckboard R2
* Set bootmagic lite row and column
* Update config.h
* Update keyboards/doodboard/duckboard/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-09 21:17:35 -08:00
4496983233
Merge remote-tracking branch 'origin/master' into develop
2021-03-09 18:37:19 +00:00
4f5e0dd325
Add BFO-9000 info.json ( #12179 )
2021-03-09 10:36:38 -08:00
7d45b7f269
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 23:34:13 +00:00
2aa38f5bd3
[Keymap] add crkbd/keymaps/armand1m ( #12098 )
2021-03-07 15:33:40 -08:00
43b47495e3
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 20:20:33 +00:00
75fd6bd269
[Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support ( #12019 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-07 12:20:02 -08:00
b15288fb87
trivial change to trigger api update
2021-03-07 12:01:13 -08:00
e6e572bf5c
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 16:15:38 +00:00
86e6be342c
minor change to trigger api update
2021-03-07 08:14:43 -08:00
5fb16e3442
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 05:22:57 +00:00
01b8ef39f5
Remove stale references to "handwired/ferris"
...
The code was moved to the "ferris" directory.
Fixes the following commands:
```
qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/default/keymap.json
qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/pierrec83/keymap.json
```
Addresses this issue:
https://github.com/pierrechevalier83/ferris/issues/5
2021-03-06 21:22:24 -08:00
56d5131715
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 23:13:57 +00:00
9b85b1b638
[Keyboard] bm68rgb ( #12128 )
...
* add support for Bbm68rgb
* pull request changes filled
* pull request changes filled(this time for real)
* added new line to files that did not have new lines at end of file
* updated modifier keys for rgb effects
* Update keyboards/bm68rgb/readme.md
* Apply suggestions from code review
* Apply suggestions from code review
* add nkro suppport
* Update keyboards/bm68rgb/rules.mk
* modified keymap to better correspond to physical layout
* updated comment style
2021-03-06 15:13:20 -08:00
bee226b3ee
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 21:04:21 +00:00
788b1854b4
[Keyboard] add Soup10 support ( #11921 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-06 13:03:48 -08:00
6e19dbc923
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 18:57:16 +00:00
86e28b4db8
Adding Zodiark Split keyboard ( #11837 )
...
* Adding Files for Zodiark
* zodiark.h and keymap.c layout corrections
* Apply suggestions from code review
Applied all suggestions from zvecr.
Co-authored-by: Joel Challis <git@zvecr.com>
* Applied all suggestions from fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
* Defined matrix driver
* Update keymap with GPL2
* Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap
* Apply suggestions from code review
Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme.
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Added VIA keymap
* Corrected VIA Keymap oled.c
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-06 18:56:48 +00:00
6e938f1f24
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 22:23:19 +00:00
b16bfac107
added 0xCB/1337 keyboard ( #12089 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-03-05 23:22:42 +01:00
3acb3a09fc
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 18:43:45 +00:00
07fce7ba13
[Keyboard] add Boston keyboard ( #11273 )
...
* Added boston keyboard
* Added Boston keyboard
* Changed some keycodes, added layers, added encoder layer change, added RGB layer indicator
* Cleaned up whitespace
* Update config.h
Cleaned up whitespace
* Cleaned up whitespace
* Added keyboard_post_init_kb code for RGBLEDs so that they start on a defined color
* Modified layout so that split backspace right is at a more intuitive location for configurator
* Cleaned up whitespace, changed some labels
* Modified keymap to accommodate revised layout in boston.h
* Removed "on port C6" from Line 20 (committed suggestion)
* Removed "Encoder Enable" from Line 8 (committed suggestion)
* Removed empty #define DESCRIPTION as suggested
* Implemented lock LED changes as suggested by drashna
* Implemented lock LED changes as suggested by Drashna, changed WS2812 driver byte order
* Updated HSV color codes to reflect WS2812 byte order change
* Implemented suggestion from noroadsleft
* Implemented suggestion from noroadsleft
* Updated readm.md per suggestions from noroadsleft
* Update keyboards/boston/readme.md per noroadsleft's suggestion
* Removed empty layers from default keymap
* Stripped empty layers and much code from default keymap ; moved to RGB Light Layers keycap
2021-03-05 10:43:09 -08:00
7ca9604422
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 18:30:41 +00:00
52d8cbf092
[Keymap] Add 60_ansi_arrow_split_bs_7u_spc layout & keymap ( #11329 )
...
* Add 60_ansi_arrow_split_bs_7u_spc layout & keymap
* Update readme.md
* Minor updates
* Update dz60.h
* Update keymap.c
* Update readme.md
* Update keymap.c
* Update readme.md
* Update readme.md
* Update keymap.c
* Update layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json
* Update keymap.c
* Update readme.md
2021-03-05 10:30:06 -08:00
ebfd555ad1
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 18:26:10 +00:00
73b8f85816
[Keyboard] Lagrange handwired keyboard ( #11374 )
...
* [Keyboard] Add the Lagrange keyboard
* Covert the master side to use the SPI driver.
2021-03-05 10:25:20 -08:00
f8f2cf7500
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 18:04:50 +00:00
aadea5ab97
[Keyboard] Monstargear XO87 Solderable support ( #11716 )
...
* Support for XO87 solderable version
* cleanup
* Remove abandoned code
* replaced KEYMAP with LAYOUT and moved LAYOUT macro to solderable.h. deleted unneeded files.
* Update keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c
* update info.json with missing keys
* Apply suggestions from code review
* Apply suggestions from code review
correct layout macro
2021-03-05 10:04:14 -08:00
cc6cd394e5
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 05:16:14 +00:00
54f7708eaa
[Keyboard] NK65 rev 1.4 ( #11991 )
...
NK65 Pinout change for rev 1.4.
* Update Pinout for new PCB rev
* Create readme.md
* Update keyboards/nk65/v1_4/rules.mk
2021-03-04 21:15:41 -08:00
7e051e0619
Merge remote-tracking branch 'origin/master' into develop
2021-03-05 04:25:54 +00:00
d7aa245c33
dumbpad refactor - adding support for various PCB revisions ( #9259 )
...
* Placeholder commit - Refactored to support different PCB revisions
Individual revision folders still need:
- info.json
- readme.md
all v0x folders support up to two LEDs for layer indication
all v1x folders support up to two LEDs for layer indication
plus one extra LED for numlock indication
v0x - supports single-encoder v0.x PCB revisions
v0x_right - supports reversible, single-encoder v0.x PCB revisions
v0x_dualencoder - supports dual-encoder v0.x PCB revisions
v1x - supports single-encoder v1.x PCB revisiions
v1x_right - supports reversible, single-encoder v1.x PCB revisions
* Added info.json and readme.md files for all dumbpad revisions
* More refactoring, adding shared config.h and rules.mk
Removed config.h from default keymap folders - defining TAPPING_TOGGLE in config.h
* Minor formatting fix
* MATRIX_COL_PINS for v1x_right was not reversed - changed to match v0x_right
* adding support for v1x dual encoder PCB
* adding alt-f2 tapdance routine for personal keymaps
* adding dumbpad build using teensy 2.0 instead of Pro Micro
* matched v1x dumbpad encoder and led pins to latest PCB revisions
* updated readme, removed v1x_teensy until someone requests it
* changed device name to match tmk udev rules, removed unnecessary ifdef
* removed user keymaps and folders
* missed hotdox keymap - removing
* fixing info.json keyboard_names for all versions
* Changed biton32 to get_highest_layer in keyboards/dumbpad/v0x/v0x.c
* keyboards/dumbpad/v0x/v0x.c - remove matrix_scan_kb, process_record_kb
* /dumbpad/v0x/keymaps/default/keymap.c - remove empty functions
* /dumbpad/v0x/keymaps/default/keymap.c - changed biton32 to get_highest_layer
* keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c - remove empty functions
* keyboards/dumbpad/v0x_right/readme.md - smaller board layout image
* keyboards/dumbpad/v1x_dualencoder/readme.md - smaller board image
* keyboards/dumbpad/v1x/readme.md - smaller board image
* keyboards/dumbpad/v1x_right/readme.md - smaller board image
* Update keyboards/dumbpad/rules.mk
* Apply suggestions from code review
Batch applying suggestions from review
* fixed removal of led_set_kb
* Implementing requested changes from old pull request 9259
* removing unused rules
* removed rules.mk from dumbpad base folder
* adding templates for each layout
* testing default keymap json
* Testing applying default keymap for dumbpad
* Layout correction: v1.x are 17 position pcb's
* Update keyboards/dumbpad/v0x/rules.mk
* Update keyboards/dumbpad/v0x/rules.mk
* Update keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c
* Update keyboards/dumbpad/v0x_dualencoder/rules.mk
* Update keyboards/dumbpad/v0x_dualencoder/rules.mk
* Update keyboards/dumbpad/v1x_dualencoder/rules.mk
* Update keyboards/dumbpad/v1x_dualencoder/templates/keymap.c
* Update keyboards/dumbpad/v1x_right/rules.mk
* Update keyboards/dumbpad/v1x_right/rules.mk
* Update keyboards/dumbpad/rules.mk
* Update keyboards/dumbpad/v0x_dualencoder/templates/keymap.c
* Update keyboards/dumbpad/v0x_right/rules.mk
* Update keyboards/dumbpad/v1x/rules.mk
* Update keyboards/dumbpad/v1x/rules.mk
* Update keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
* Update keyboards/dumbpad/v1x_dualencoder/rules.mk
* Update keyboards/dumbpad/v0x_right/rules.mk
* Removing binary files
2021-03-04 20:25:19 -08:00
a71fb6057d
Merge remote-tracking branch 'origin/master' into develop
2021-03-04 23:04:36 +00:00
2cb0b41ce7
update correct layout name ( #12096 )
2021-03-04 23:03:58 +00:00
QMK Bot
AaronVerDow
jack
Wilba
Benedict Tan
Michael Stapelberg
Alexander Kagno
Eric Wood
Conor Burns
Ben Fiedler
Angel Rojas
maz0r
LIParadise
Sanctified-git
MelGeek
RinoSolutions
Ian McLinden
Oliver Gaskell
Nick Brassel
Richard Dawe
Giorgi Chavchanidze
Antoine R. Dumont
Pierre Chevalier
MarioCorona
Harshit Goel
sendmmsg
Jay Greco
MechMerlin
Jan Christoph Ebersbach
Marius Kavoliunas
J.Flanagan
James Young
Leon Anavi
Ryan
Dave Vandyke
Kyle McCreery
jackytrabbit
Joseph Whom
Álvaro A. Volpato
Eithan Shavit
Ryo Maeda
littleferris
hadi
kiwikey
mechlovin
Adrian
Kosuke Adachi
SneakboxKB
Takeshi ISHII
kb-elmo
github-actions[bot]
Dylan Khor
kaylanm
MCKeebs
Wilba
jrdsgl
Jason Yamada-Hanff
adamkraus6
Danny
Paul James
dsanchezseco
Duong Anh
peepeetee
joedinkle
Anthon van der Neut
Sendy Aditya Suryana
Liyang HU
Takeshi Nishio
ploopyco
Albert Y
Naoto Takai
Matt W
Blake
TerryMathews
kopibeng
Matteo Montemarani
Andrew-Fahmy
Brandon Claveria
Armando Magalhães
Xelus22
sbuller
duoshock
Viktor Eikman
Luca Di Bartolomeo
Donald Kjer
noclew
Salman
klausweiss
Felix Springer
Robert Verst
XScorpion2
tszaboo
im a can what do you think lmao?
Salicylic-acid3
Matthew Dias
devriesp
Mojitas
Kyle McAlpine
Gavin Austin
Simon Arlott
vattern
xyzz
NightlyBoards
yhaliaw
Monksoffunk
milestogo
yiancar
Dan Thomas
Joel Challis
somepin
Zach White
icesoup
Aleblazer
bluepylons
Sendy YK
Dimitris Papavasiliou
datafx
imchipwood
Quentin