Commit graph

8291 commits

Author SHA1 Message Date
IFo Hancroft
bb9316a2f9
[Keymap] My Idobo Keymap (#11897) 2021-02-20 21:52:20 -08:00
IFo Hancroft
516afb0343
[Keymap] My ErgoDash Keymap (#11895) 2021-02-20 21:51:52 -08:00
QMK Bot
8463553d71 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:28:20 +00:00
Jonathan Law
8760ff523d
[Keymap] Bongo Cat + WPM Counter OLED keymap (#11871) 2021-02-20 21:27:48 -08:00
QMK Bot
72965a7106 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:06:12 +00:00
MelGeek
df7d3a1794
[Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785)
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-02-20 21:05:41 -08:00
QMK Bot
f3cf9c5c07 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:00:06 +00:00
MelGeek
6e59fe0b4a
[Keyboard] Update MJ63 architecture to support multi version (#11788)
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-02-20 20:59:32 -08:00
QMK Bot
17ef79a067 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 04:49:28 +00:00
James Skeen
03679f0532
[Keyboard] Add DimplePlus 7u Layout (#11816)
Co-authored-by: James Skeen <skeen@macbook.attlocal.net>
2021-02-20 20:49:24 -08:00
Naoto Takai
f6e909600d
[Keyboard] Add MIO keyboard (#11852)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-20 20:48:52 -08:00
QMK Bot
076dd3619e Merge remote-tracking branch 'origin/master' into develop 2021-02-21 04:30:51 +00:00
Ethan Madden
fe4f7e6c73
[Keyboard] Added Ketch support (#11656) 2021-02-20 20:30:17 -08:00
QMK Bot
1f7f4ec4cf Merge remote-tracking branch 'origin/master' into develop 2021-02-21 04:10:21 +00:00
LucW
b5e382cbc4
ergodox_ez / dvorak_42_key layout: convert macros to new format (#11139)
Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
2021-02-20 20:09:49 -08:00
mkdl
f6de4085a0
added unix60, moved togehter with southpaw75 into fr4 folder (#11195)
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>
2021-02-20 20:06:51 -08:00
QMK Bot
cec56b35b9 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 22:47:14 +00:00
gazeddy
d35d65f2e0
Added ConsoleKeyboard (#11950)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-21 09:46:43 +11:00
QMK Bot
b423ebff8b Merge remote-tracking branch 'origin/master' into develop 2021-02-20 20:43:55 +00:00
Jonathan Haddock
8efc3b39de
Fix minor typo (#11962) 2021-02-20 20:43:24 +00:00
QMK Bot
2e4f087615 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 19:47:34 +00:00
Leon Anavi
9682fca47b
[Keyboard] keyboards/anavi: Add ANAVI Macro Pad 2 (#11821)
ANAVI Macro Pad 2 is an open source mini mechanical keyboard with
2 keys and backlit. Powered by ATtiny 85 microcontroller and with
microUSB connector. Designed with KiCad.

Provides the following keymaps for ANAVI Macro Pad 2:

- Default (with a, b and combo to control the LEDs)
- Copy & paste
- Tap dance example with a, b and c
- Mute
- Volume
- Zoom
- Jitsi Meet

Co-authored-by: Drashna Jaelre <drashna@live.com>
Signed-off-by: Leon Anavi <leon@anavi.org>

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-20 14:47:05 -05:00
QMK Bot
1a97f29f5d Merge remote-tracking branch 'origin/master' into develop 2021-02-20 19:32:47 +00:00
Viktor Eikman
5655d6e5f5
[Keyboard] Concertina (#11922)
* [Keyboard] Concertina

* Added a novel handwired keyboard.

* Concertina lint

* Perfunctory changes to pass CI.

* Concertina line width

* Changes from code review: GPL headers, modernization, full-width
  representation of matrix to match info.json.
2021-02-20 14:32:04 -05:00
QMK Bot
23c6d7ac52 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 19:12:08 +00:00
yynmt
07100d5d4d
Add via support to Dozen0 (#11932)
* Change VID and PID

* Add via kyemap

* Update keymap.c

* Update keymap.c

Co-authored-by: yynmt <yynmt@yynmt.com>
2021-02-20 14:11:36 -05:00
QMK Bot
720597d7f8 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 19:09:50 +00:00
melonbred
c588cb4299
Update ortho.h (#11945) 2021-02-20 14:09:16 -05:00
QMK Bot
6b1c3e6283 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 18:35:43 +00:00
stanrc85
9853e35f69
assign each key an LED for reactive modes (#11949) 2021-02-20 13:35:09 -05:00
QMK Bot
a6a93bc38a Merge remote-tracking branch 'origin/master' into develop 2021-02-20 18:29:35 +00:00
Chase Nordengren
a0a67d4f85
adding personal keymaps (#11952)
* adding personal keymaps

* Update keyboards/xd60/keymaps/semicolonsnet/keymap.c

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

* added license

* added license

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-20 13:29:08 -05:00
QMK Bot
4794f6ac4d Merge remote-tracking branch 'origin/master' into develop 2021-02-20 07:10:22 +00:00
James Young
6a8379111c
Iron180: layout macro and Configurator rework (#11948) 2021-02-20 18:09:52 +11:00
QMK Bot
9f6ac28d13 Merge remote-tracking branch 'origin/master' into develop 2021-02-20 05:42:13 +00:00
Richard Nunez
73e2bf54f8
Adding new handwired ortho 5x14 keyboard (#11597)
Co-authored-by: Richard Nunez <richard.nunez@macrossplusinc.com>
2021-02-20 16:41:40 +11:00
QMK Bot
fa4449283d Merge remote-tracking branch 'origin/master' into develop 2021-02-19 20:52:46 +00:00
Franco Rosi
1ff18920a2
[Keymap] Adding fraanrosi keymap. (changes applied) (#11862)
* Latam version of Helix/rev2/back

 . Latam adaptation of keymap(whit "ñ")
 . 3 layers (Qwerty, Lower, Raise)
 . Underglow light changes while pressing Lower(BLUE) and  Raise(RED), then it returns to prior mode.

(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)

* Se añade Keymap.

* Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.

* Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping"  para guardar lo correspondiente a mapeo.

* Update keymap.md

* Rename keymap.md to readme.md

* Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.

* -Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.

* Update readme.md

* Update readme.md

* Update readme.md

* adding helix-keyboard.png

* Update readme.md

* -Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).

* Cambios en el Keymap para mayor comodidad del uso del mouse.

* Update readme.md

* Update readme.md

* -Fixeo de comportamiento del "Bloq. Mayús":
  Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
  Cambié las mouse keys y las de teclas de brillo.

* Update readme.md

* Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".

* Quito cambio de helix.h

Quito lo que ya no es necesario, para hacer el pull request limpio.

* Update Readme.mp

* Revert "Update Readme.mp"

This reverts commit eb9a2712b0f22b44032f5123227b7bc8af37b89f.

* Update readme.md

* Clean up, organization, indent fixes

* Update readme.md

* Latam version of Helix/rev2/back

 . Latam adaptation of keymap(whit "ñ")
 . 3 layers (Qwerty, Lower, Raise)
 . Underglow light changes while pressing Lower(BLUE) and  Raise(RED), then it returns to prior mode.

(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)

* Se añade Keymap.

* Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.

* Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping"  para guardar lo correspondiente a mapeo.

* Update keymap.md

* Rename keymap.md to readme.md

* Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.

* -Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.

* Update readme.md

* Update readme.md

* Update readme.md

* adding helix-keyboard.png

* Update readme.md

* -Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).

* Cambios en el Keymap para mayor comodidad del uso del mouse.

* Update readme.md

* Update readme.md

* -Fixeo de comportamiento del "Bloq. Mayús":
  Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
  Cambié las mouse keys y las de teclas de brillo.

* Update readme.md

* Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".

* Quito cambio de helix.h

Quito lo que ya no es necesario, para hacer el pull request limpio.

* Update Readme.mp

* Revert "Update Readme.mp"

This reverts commit eb9a2712b0f22b44032f5123227b7bc8af37b89f.

* Update readme.md

* Update readme.md

* Clean up, organization, indent fixes

* Update readme.md

Latam version of Helix/rev2/back

 . Latam adaptation of keymap(whit "ñ")
 . 3 layers (Qwerty, Lower, Raise)
 . Underglow light changes while pressing Lower(BLUE) and  Raise(RED), then it returns to prior mode.

(cherry picked from commit 974be350115b2d33b55edbc02e3b5281e1f856d7)

Se añade Keymap.

Agrego un pdf preliminar del mapeo y reubico el keymap a carpeta correspondiente.

Ajustes en mapeo para simplificar.
Agrego Mark Down con mapeo.
Creo carpeta "layers mapping"  para guardar lo correspondiente a mapeo.

Update keymap.md

Rename keymap.md to readme.md

Organización en general y cambio de configuración de "back" a "under"(que era la que correspondía).
.Ahora los leds underglow responden mejor.

-Se agrega indicador rgb para el bloq mayús.
-Se agrega manejo del rgb_tog.
-Se agrega botón para reset(del teclado).
-Ajustes de keymap varios.
-Limpieza de código.

Update readme.md

Update readme.md

Update readme.md

adding helix-keyboard.png

Update readme.md

-Se agregan Mouse Keys (para manejo del mouse con el teclado).
-Se hace fix en el modo "Bloq. Mayús" (Se persiste el cambio de RGB mode mientras el Bloq. Mayús está activado).

Cambios en el Keymap para mayor comodidad del uso del mouse.

Update readme.md

Update readme.md

-Fixeo de comportamiento del "Bloq. Mayús":
  Cuando se presionaba una Layer mientras estaba activado Bloq. Mayús, quedaba el rgb_mode como el de la capa LOWER o RAISE.
-Ajuste en mapeo:
  Cambié las mouse keys y las de teclas de brillo.

Update readme.md

Se borra carpeta /rev2_latam, para dejar todo enlatado y andando desde /rev2.
Esto para que el PR solo sea agregar el keymap "fraanrosi".

Quito cambio de helix.h

Quito lo que ya no es necesario, para hacer el pull request limpio.

Update Readme.mp

Revert "Update Readme.mp"

This reverts commit eb9a2712b0f22b44032f5123227b7bc8af37b89f.

Update readme.md

Clean up, organization, indent fixes

Update readme.md

* Changes and corrections were made to Pull Request.

* Since the last change, readme.md and comment in keymap.c were to be updated.
2021-02-19 15:52:08 -05:00
QMK Bot
8c317c49bb Merge remote-tracking branch 'origin/master' into develop 2021-02-19 20:27:50 +00:00
4pplet
fd6f7b56cd
enable rgb underglow for VIA-firmware (#11746) 2021-02-19 15:27:16 -05:00
QMK Bot
161cea77ba Merge remote-tracking branch 'origin/master' into develop 2021-02-19 06:12:38 +00:00
James Young
fdff75342b
[Keyboard] Xealous Brown handwired Refactor (#11929) 2021-02-18 22:12:05 -08:00
QMK Bot
7713f8f820 Merge remote-tracking branch 'origin/master' into develop 2021-02-19 05:41:36 +00:00
Albert Y
63f8620d95
[Keyboard] Add swap-hands array for CRKBD (Corne) (#11915)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-02-18 21:40:44 -08:00
QMK Bot
6136cd3cd9 Merge remote-tracking branch 'origin/master' into develop 2021-02-19 03:38:34 +00:00
CMMS-Freather
bb11e726b8
[Keyboard] change to saka68 solder firmware config. add sam's s80 firmware (#11834)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joshua Diamond <josh@windowoffire.com>
2021-02-18 19:38:02 -08:00
QMK Bot
7852f4f7ec Merge remote-tracking branch 'origin/master' into develop 2021-02-19 03:20:28 +00:00
Kosuke Adachi
e3f0157f6e
[Keyboard] Add new keyboard Cornelius (#11719)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-18 19:19:53 -08:00
QMK Bot
64e162af25 Merge remote-tracking branch 'origin/master' into develop 2021-02-19 03:16:10 +00:00
Nuno Costa
307c97445b
[Keyboard] Quadrant by Ealdin (#11747)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-18 19:15:38 -08:00
QMK Bot
84ee7e4fa8 Merge remote-tracking branch 'origin/master' into develop 2021-02-18 23:44:10 +00:00
Drashna Jaelre
cd8c71a0eb
[Keyboard] Phase Studio's Titan 65 (#11920) 2021-02-18 23:43:34 +00:00
QMK Bot
3716b2938c Merge remote-tracking branch 'origin/master' into develop 2021-02-18 23:33:35 +00:00
James Young
8c1cdceb8b
Beegboy handwired by swiftrax: correct info.json object order (#11924)
* human-friendly formatting

* correct key object order
2021-02-18 23:33:02 +00:00
QMK Bot
9407392b14 Merge remote-tracking branch 'origin/master' into develop 2021-02-18 20:32:29 +00:00
qpockets
890f3a57b6
add eggman keyboard (#11701)
* add eggman keyboard

* Update info.json

* Update eggman.h

correct copyright info

* Update eggman.c

correct copyright info

* Update config.h

correct copyright info

* Update keymap.c

correct copyright info

* Update keyboards/eggman/readme.md

reduce image size

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

* Update keyboards/eggman/keymaps/default/config.h

correct copyright

Co-authored-by: Joshua Diamond <josh@windowoffire.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joshua Diamond <josh@windowoffire.com>
2021-02-18 15:31:58 -05:00
QMK Bot
8b6a9e2ae9 Merge remote-tracking branch 'origin/master' into develop 2021-02-18 20:31:38 +00:00
MechMerlin
9e05810cfe
Budget96 VIA (#11737)
* add budget96 via keymap and adjust vid and pids

* update dates

* Update keyboards/donutcables/budget96/keymaps/default/keymap.c

Co-authored-by: Joshua Diamond <josh@windowoffire.com>

Co-authored-by: Joshua Diamond <josh@windowoffire.com>
2021-02-18 15:31:09 -05:00
Dominic Gan
f4f5ddfec2
Add UTD80 PCB (#11799)
* Create readme.md

* Add files via upload

* Create readme.md

* Add files via upload

* Update utd80.h

* Update utd80.c

* Update keymap.c

Change 6 length underscore to 7.

* Update keyboards/utd80/readme.md

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/utd80/readme.md

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/utd80/readme.md

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/utd80/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/utd80/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update utd80.c

* Update utd80.c

* Update keymap.c

* Apply #7701 PR review suggestions

* Add GPL license headers

* Replace led implementation with definition

* Add VIA keymap for UTD80

* Update attributions

Co-authored-by: UTDKeyboard <59077857+utdkeyboard@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: fauxpark <fauxpark@gmail.com>
2021-02-18 15:30:16 -05:00
QMK Bot
381429c039 Merge remote-tracking branch 'origin/master' into develop 2021-02-17 22:43:50 +00:00
Sid Carter
50c4afa841
Personal keymap for kbd67 and some cleanup (#11937)
Co-authored-by: Khader Syed <khader.syed@aicure.com>
2021-02-18 09:43:14 +11:00
QMK Bot
f89708c942 Merge remote-tracking branch 'origin/master' into develop 2021-02-17 22:25:55 +00:00
Donald Kjer
1d44715d9d
Fixing typos in durgod/k320 readme (#11931) 2021-02-18 09:25:03 +11:00
QMK Bot
fad659650b Merge remote-tracking branch 'origin/master' into develop 2021-02-17 06:29:48 +00:00
shela
fe7240628a
fix build error (#11939) 2021-02-17 17:29:15 +11:00
QMK Bot
5688655971 Merge remote-tracking branch 'origin/master' into develop 2021-02-16 23:14:03 +00:00
Konstantin Shpits
bf3ee94b9a
[Keyboard] Add VIA support for YMD 75 (#11811)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-16 15:13:30 -08:00
QMK Bot
842a8b35dd Merge remote-tracking branch 'origin/master' into develop 2021-02-16 23:10:57 +00:00
Alabahuy
e43ead8e96
[Keyboard] Add Rartand keyboard and support via (#11828) 2021-02-16 15:10:26 -08:00
QMK Bot
cdb9d55956 Merge remote-tracking branch 'origin/master' into develop 2021-02-16 19:27:59 +00:00
Rozakiin
2d55f34413
[Keyboard] Add Noxary 268.2 RGB (#11772)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ruari <ruari.armstrong@gmail.com>
2021-02-16 11:27:20 -08:00
QMK Bot
899f8b0cde Merge remote-tracking branch 'origin/master' into develop 2021-02-16 18:11:23 +00:00
andresteare
d754266a6d
[Keyboard] Added two handwired keyboards (#11696)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-16 10:10:49 -08:00
QMK Bot
d565586e46 Merge remote-tracking branch 'origin/master' into develop 2021-02-16 18:10:43 +00:00
Max Bridgland
ac33dc12da
[Keyboard] Add VIA keymap to duckyPad, update M4cs keymap for duckyPad (#11703)
Co-authored-by: M4cs <mabridgland@protonmail.com>
2021-02-16 10:10:07 -08:00
QMK Bot
65326f7d1f Merge remote-tracking branch 'origin/master' into develop 2021-02-16 17:46:35 +00:00
mrT1ddl3s
9a2b0a5db1
[Keyboard] Knob Goblin add via support (#11831)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-02-16 09:46:02 -08:00
QMK Bot
02b5bb9b17 Merge remote-tracking branch 'origin/master' into develop 2021-02-16 15:50:59 +00:00
Daniil Kivenko
95304f269b
[Keymap] Adding HHKB Keymap for dz60rgb_wkl:v2 (#11840)
* adding new hhkb layout

* adding license header

* fix end of lines symbol

Co-authored-by: Daniil Kivenko <d.kivenko@evrone.com>
Co-authored-by: Daniil macbet Kivenko <macbet@wisebits.com>
2021-02-16 10:50:15 -05:00
QMK Bot
b492d8499c Merge remote-tracking branch 'origin/master' into develop 2021-02-16 15:46:05 +00:00
Matt Gilbert
43e314b64e
Add mattir2 keymap for Kyria (#11752)
* added files to support my 2nd kyria

* fixed missing line

* swapped thumb keys

* Update keyboards/kyria/keymaps/mattir2/keymap.c

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-16 10:45:28 -05:00
Joshua Diamond
d36dbe66e1 Merge branch 'master' into develop 2021-02-15 20:55:54 -05:00
yiancar
3fed8bced7
Dc01 fixes (#11843)
* dc01-fixes

* dc01-fixes

* Cleanup and add VIA

* Updated JSONs

* fix
2021-02-15 20:36:58 -05:00
Nick Brassel
1bc8a6e5d4
ChibiOS conf migrations... take 14 (#11927)
* ChibiOS conf upgrade for geminate60

 geminate60 - a2765e46491151a8de309bc1cc8ce7e953ee1e50

* ChibiOS conf upgrade for sowbug/68keys

 sowbug/68keys - 7475a03ff2d704497d503a002b6c5dbac12f0a84

* ChibiOS conf upgrade for sowbug/ansi_tkl

 sowbug/ansi_tkl - 87be98eb6ed03a8752c1082c872a8a75b1d00ae7
2021-02-16 11:28:42 +11:00
James Young
fa740f8129
AMJ40 Refactor (#11854)
* update keyboard source files

- add license headers (attributed to original keyboard submitter)
- #pragma once include guards
- file template matching
- readme update and template matching

* set sensible default keyboard settings

- enable Bootmagic Lite and Mouse Keys
- disable Console and Command
- remove default keymap's rules.mk file

* remove unnecessary files from default keymap

* refactor default keymap

* add additional layouts/keymaps

* update keyboard readme

- add images and bootloader instructions
- reformat link list

* convert tabs to spaces in default keymap
2021-02-14 23:21:45 -08:00
QMK Bot
26ee9360bf Merge remote-tracking branch 'origin/master' into develop 2021-02-15 04:09:53 +00:00
Drashna Jaelre
e768fb83bd
[Keyboard] PloopyCo VIA updates (#11290)
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Glen D'souza <gdsouza@linuxmail.org>
2021-02-14 20:09:24 -08:00
Joshua Diamond
0b63fb5e81 Merge branch 'master' into develop 2021-02-14 20:26:22 -05:00
Joshua Diamond
f1a3ce49cc Merge branch 'master' into develop 2021-02-14 19:59:26 -05:00
Ryan
9ee1282019
LED Matrix: rename LED_DRIVER_LED_COUNT to DRIVER_LED_TOTAL (#11858) 2021-02-15 11:55:13 +11:00
Drashna Jaelre
c80e5f9f88
Audio system overhaul (#11820)
* Redo Arm DAC implementation for additive, wavetable synthesis, sample playback

changes by Jack Humbert on an implementation for DAC audio on arm/chibios platforms
this commits bundles the changes from the arm-dac-work branch focused on audio/audio_arm.* into one commit (leaving out the test-keyboard)

f52faeb5d (origin/arm-dac-work) add sample and wavetable examples, parsers for both
  -> only the changes on audio_arm_.*, the keyboard related parts are split off to a separate commit
bfe468ef1 start morphing wavetable
474d100b5 refined a bit
208bee10f play_notes working
3e6478b0b start in-place documentation of dac settings
3e1826a33 fixed blip (rounding error), other waves, added key selection (left/right)
73853d651 5 voices at 44.1khz
dfb401b95 limit voices to working number
9632b3379 configuration for the ez
6241f3f3b notes working in a new way

* Redo Arm DAC implementation for additive, wavetable synthesis, sample playback

changes by Jack Humbert on an implementation for DAC audio on arm/chibios platforms

this commit splits off the plank example keymap from commit
    f52faeb5d (origin/arm-dac-work) add sample and wavetable examples, parsers for both

* refactoring: rename audio_ to reflect their supported hardware-platform and audio-generation method: avr vs arm, and pwm vs dac

* refactoring: deducplicate ISR code to update the pwm duty-cycle and period in the avr-pwm-implementation

pulls three copies of the same code into one function
which should improve readability and maintainability :-)

* refactoring: move common code of arm and avr implementation into a separate/new file

* refactoring: audio_avr_pwm, renaming defines to decouple them from actually used timers, registers and ISRs

* refactoring: audio_avr_pwm - replacing function defines with plain register defines

aligns better with other existing qmk code (and the new audio_arm_pwm) doing similar pwm thing

* add audio-arm-pwm

since not all STM32 have a DAC onboard (STM32F2xx and STM32F3xx), pwm-audio is an alternative (STM32F1xx)
this code works on a "BluePill" clone, with an STM32F103C8B

* clang-format changes on quantum/audio/* only

* audio_arm_dac: stopping the notes caused screeching when using the DAC audio paths

* audio_arm_pwm: use pushpull on the pin; so that a piezzo can be hooked up direclty without additional components (opendrain would require an external pullup)

* refactoring: remove unused file from/for atmel-avr chips

* refactoring: remove unused (avr) wavetable file

* audio_arm_dac: adapt dac_end callback to changed chibios DAC api

the previous chibios (17.6.0) passed along a pointer into the buffer plus a sample_count (which are/already where included in the DACDrivre object) - the current chibios (19.1.0) only passes the driver object.
this patch ports more or less exactly what the previous chibios ISR code did: either have the user-callback work the first or second half of the buffer (dacsample_t pointer, with half the DAC_BUFFER_SIZE samples) by adjusting the pointer and sample count

* audio-arm-dac: show a compile-warning on undefined audio-pins

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* audio_arm_dac: switch from exemplary wavetable generation to sine only

sine+triangle+squrare is exemplary, and not realy fit for "production" use
'stairs' are usefull for debugging (hardware, with an oscilloscope)

* audio_arm_dac: enable output buffers in the STM32

to drive external loads without any additional ciruitry - external opamps and such

* audio: prevent out-of-bounds array access

* audio_arm_dac: add output-frequency correcting factor

* audio_arm_pwm: get both the alternate-function and pm-callback variants back into working condition

and do some code-cleanup, refine documentation, ...

* audio_arm_pwm: increase pwm frequency for "higher fidelity"

on the previous .frequency=100000 higher frequency musical notes came out wrong
(frequency measured on a Tektronix TDS2014B)
note | freq | arm-pwm
C2 | 65.4 | 65.491
C5 | 523.25 | 523.93
C6 | 1046.5 | 1053.38
C7 | 2093 | 2129
C8 | 4186 | 4350.91

with .frequency = 500000
C8 | 4186 | 4204.6

* audio refactoring: remove unused variables

* audio_arm_dac: calibrate note tempo: with a tempo of 60beats-per-second a whole-note should last for exactly one second

* audio: allow feature selection in rules.mk

so the user can switch the audio driver between DAC and PWM on STM32 boards which support both (STM32F2 and up)
or select the "pin alternate" pwm mode, for example on STM32F103

* audio-refactoring: move codeblocks in audio.[ch] into more coherent groups

and add some inline documentation

* audio-refactoring: cleanup and streamline common code between audio_arm_[dac|pwm]

untangeling the relation between audio.c and the two drivers
and adding more documenting comments :-)

* audio_avr_pwm: getting it back into working condition, and cleanup+refactor

* audio-refactoring: documentation and typo fixes

Co-Authored-By: Nick Brassel <nick@tzarc.org>

* audio-refactoring: cleanup defines, inludes and remove debug-prints

* audio_chibios_dac: define&use a minimal sampling rate, based on the available tone-range

to ease up on the cpu-load, while still rendering the higher notes/tones sufficiently
also reenable the lower tones, since with the new implementation there is no evidence of them still beeing 'bugged'

* audio-refactoring: one common AUDIO_MAX_VOICES define for all audio-drivers

* audio-chibios-pwm: pwm-pin-allternate: make the the timer, timer-channel and alternate function user-#definable

* audio_chibios_dac: math.h has fmod for this

* Redo Arm DAC implementation for additive, wavetable synthesis, sample playback

update Jack Humberts dac-example keymaps for the slight changes in the audio-dac interface

* audio-refactoring: use a common AUDIO_PIN configuration switch instead of defines

have the user select a pin by configuration in rules.mk instead of a define in config.h
has the advantage of beeing in a common form/pattern across all audio-driver implementations

* audio-refactoring: switch backlight_avr.c to the new AUDIO_PIN defines

* audio-common: have advance_note return a boolean if the note changed, to the next one in the melody beeing played

* audio-chibios-pwm: fix issue with ~130ms silence between note/frequency changes while playing a SONG

through trial,error and a scope/logic analyzer figured out Chibios-PWMDriver (at least in the current version) misbehaves if the initial period is set to zero (or one; two seems to work); when thats the case subsequent calls to 'pwmChhangePeriod' + pwmEnableChannel took ~135ms of silence, before the PWM continued with the new frequency...

* audio-refactoring: get 'play_note' working again

with a limited number of available voices (say AUDIO_VOICES_MAX=1) allow new frequencies to be played, by discarding the oldest one in the 'frequencies' queue

* audio: set the fallback driver to DAC for chibios and PWM for all others (==avr at the moment)

* audio-refactoring: moore documentation

and some cleanup

* audio-avr-pwm: no fallback on unset AUDIO_PIN

this seems to be the expected behaviour by some keyboards (looking at ckeys/handwire_101:default) which otherwise fail to build because the firmware-image ends up beeing too large for the atmega... so we fail silently instead to keep travis happy

* audio-refactoring: untangling terminology: voice->tone

the code actually was working on tones (combination of pitch/frequency, duration, timbre, intensity/volume) and not voices (characteristic sound of an instrument; think piano vs guitar, which can be played together, each having its own "track" = voice on a music sheet)

* audio-pwm: allow freq=0 aka a pause/rest in a SONG

continue processing, but do not enable pwm units, since freq=0 wouldn't produce any sound anyway (and lead to division by zero on that occasion)

* audio-refactoring: audio_advance_note -> audio_advance_state

since it does not only affect 'one note', but the internally kept state as a whole

* audio-refactoring: untangling terminology: polyphony

the feature om the "inherited" avr code has little to do with polyphony (see wikipedia), but is more a time-multiplexing feature, to work around hardware limitations - like only having one pwm channel, that could on its own only reproduce one voice/instrument at a time

* audio-chibios-dac: add zero-crossing feature

have tones only change/stop when the waveform approaches zero - to avoid audible clicks
note that this also requires the samples to start at zero, since the internally kept index into the samples is reset to zero too

* audio-refactoring: feature: time-multiplexing of tones on a single output channel

this feature was in the original avr-pwm implementation misnomed as "polyphony"
with polyphony_rate and so on; did the same thing though: time-multiplexing multiple active notes so that a single output channel could reproduce more than one note at a time (which is not the same as a polyphony - see wikipedia :-) )

* audio-avr-pwm: get music-mode working (again) on AVRs

with both pwm channels, or either one of the two :-)
play_notes worked already - but music_mode uses play_note

* audio-refactoring: split define MAX_SIMULTANEOUS_TONES -> TONE_STACKSIZE

since the two cases are independant from one another, the hardware might impose limitations on the number of simultaneously reproducable tones, but the audio state should be able to track an unrelated number of notes recently started by play_note

* audio-arm-dac: per define selectable sample-luts

plus generation script in ./util

* audio-refactoring: heh, avr has a MIN...

* audio-refactoring: add basic dac audio-driver based on the current/master implementation

whereas current=d96380e65496912e0f68e6531565f4b45efd1623
which is the state of things before this whole audio-refactoring branch

boiled down to interface with the refactored audio system = removing all
redundant state-managing and frequency calculation

* audio-refactoring: rename audio-drivers to driver_$PLATFORM_$DRIVER

* audio-arm-pwm: split the software/hardware implementations into separate files

which saves us partially from a 'define hell', with the tradeoff that now two somewhat similar chibios_pwm implementations have to be maintained

* audio-refactoring: update documentation

* audio-arm-dac: apply AUDIO_PIN defines to driver_chibios_dac_basic

* audio-arm-dac: dac_additive: stop the hardware when the last sample completed

the audio system calls for a driver_stop, which is delayed until the current sample conversion finishes

* audio-refactoring: make function-namespace consistent

- all (public) audio functions start with audio_
- also refactoring play*_notes/tones to play*_melody, to visually distance it a bit from play*_tone/_note

* audio-refactoring: consistent define namespace: DAC_ -> AUDIO_DAC_

* audio-arm-dac: update (inline) documentation regarding MAX for sample values

* audio-chibios-dac: remove zero-crossing feature

didn't quite work as intended anyway, and stopping the hardware on close-to-zero seems to be enought anyway

* audio-arm-dac: dac_basic: respect the configured sample-rate

* audio-arm-pwm: have 'note_timbre' influence the pwm-duty cycle

like it already does in the avr implementation

* audio-refactoring: get VIBRATO working (again)

with all drivers (verified with chibios_[dac|pwm])

* audio-arm-dac: zero-crossing feature (Mk II)

wait for the generated waveform to approach 'zero' before either turning off the output+timer or switching to the current set of active_tones

* audio-refactoring: re-add note-resting -> introduce short_rest inbetween

- introduce a short pause/rest between two notes of the same frequency, to separate them audibly
- also updating the refactoring comments

* audio-refactoring: cleanup refactoring remnants

remove the former avr-isr code block - since all its features are now refactored into the different parts of the current system

also updates the TODOS

* audio-refactoring: reserve negative numbers as unitialized frequencies

to allow the valid tone/frequency f=0Hz == rest/pause

* audio-refactoring: FIX: first note of melody was missing

the first note was missing because 'goto_next_note'=false overrode a state_change=true of the initial play_tone
and some code-indentations/cleanup of related parts

* audio-arm-dac: fix hardware init-click

due to wron .init= value

* audio-refactoring: new conveniance function: audio_play_click

which can be used to further refactor/remove fauxclicky (avr only) and/or the 'clicky' features

* audio-refactoring: clang-format on quantum/audio/*

* audio-avr-pwm: consecutive notes of the same frequency get a pause inserted inbetween by audio.c

* audio-refactoring: use milliseconds instead of seconds for 'click' parameters

clicks are supposed to be short, seconds make little sense

* audio-refactoring: use timer ticks instead of counters

local counters were used in the original (avr)ISR to advance an index into the lookup tables (for vibrato), and something similar was used for the tone-multiplexing feature
decoupling these from the (possibly irregular) calls to advance_state made sesne, since those counters/lookups need to be in relation to a wall-time anyway

* audio-refactoring: voices.c: drop 'envelope_index' counter in favour of timer ticks

* audio-refactoring: move vibrato and timbre related parts from audio.c to voices.c

also drops the now (globally) unused AUDIO_VIBRATO/AUDIO_ENABLE_VIBRATO defines

* audio.c: use system-ticks instead of counters the drivers have to take care of for the internal state posision

since there already is a system-tick with ms resolution, keeping count separatly with each driver implementation makes little sense; especially since they had to take special care to call audio_advance_state with the correct step/end parameters for the audio state to advance regularly and with the correct pace

* audio.c: stop notes after new ones have been started

avoids brief states of with no notes playing that would otherwise stop the hardware and might lead to clicks

* audio.c: bugfix: actually play a pause

instead of just idling/stopping which lead the pwm drivers to stop entirely...

* audio-arm-pwm: pwm-software: add inverted output

new define AUDIO_PIN_ALT_AS_NEGATIVE will generate an inverted signal on the alternate pin, which boosts the volume if a piezo is connected to both AUDIO_PIN and AUDIO_PIN_ALT

* audio-arm-dac: basic: handle piezo configured&wired to both audio pins

* audio-refactoring: docs: update for AUDIO_PIN_ALT_AS_NEGATIVE and piezo wiring

* audio.c: bugfix: use timer_elapsed32 instad of keeping timestamps

avoids running into issues when the uint32 of the timer overflows

* audio-refactoring: add 'pragma once' and remove deprecated NOTE_REST

* audio_arm_dac: basic: add missing bracket

* audio.c: fix delta calculation

was in the wrong place, needs to use the 'last_timestamp' before it was reset

* audio-refactoring: buildfix: wrong legacy macro for set_timbre

* audio.c: 16bit timerstamps suffice

* audio-refactoring: separate includes for AVR and chibios

* audio-refactoring: timbre: use uint8 instead of float

* audio-refactoring: duration: use uint16 for internal per-tone/note state

* audio-refactoring: tonemultiplexing: use uint16 instead of float

* audio-arm-dac: additive: set second pin output-low

used when a piezo is connected to AUDIO_PIN and AUDIO_PIN_ALT, with PIN_ALT_AS_NEGATIVE

* audio-refactoring: move AUDIO_PIN selection from rules.mk to config.h

to be consistent with how other features are handled in QMK

* audio-refactoring: buildfix: wrong legacy macro for set_tempo

* audio-arm-dac: additive: set second pin output-low -- FIXUP

* audio.c: do duration<>ms conversion in uint instead of float

on AVR, to save a couple of bytes in the firmware size

* audio-refactoring: cleanup eeprom defines/usage

for ARM, avr is handled automagically through the avr libc and common_features.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* audio.h: throw an error if OFF is larger than MAX

* audio-arm-dac: basic: actually stop the dac-conversion on a audio_driver_stop

to put the output pin in a known state == AUDIO_DAC_OFF_VALUE, instead of just leaving them where the last conversion was... with AUDIO_PIN_ALT_AS_NEGATIVE this meant one output was left HIGH while the other was left LOW

one CAVEAT: due to this change the opposing squarewave when using both A4 and A5 with AUDIO_PIN_ALT_AS_NEGATIVE
show extra pulses at the beginning/end on one of the outputs, the two waveforms are in sync otherwise.
the extra pusles probably matter little, since this is no high-fidelity sound generation :P

* audio-arm-dac: additive: move zero-crossing code out of dac_value_generate

which is/should be user-overridable == simple, and doing one thing: providing sample values
state-transitions necessary for the zero crossing are better handled in the surrounding loop in the dac_end callback

* audio-arm-dac: dac-additive: zero-crossing: ramping up or down

after a start trigger ramp up: generate values until zero=OFF_VALUE is reached, then continue normally
same in reverse for strop trigger: output values until zero is reached/crossed, then keep OFF_VALUE on the output

* audio-arm-dac: dac-additive: BUGFIX: return OFF_VALUE when a pause is playing

fixes a bug during SONG playback, which suddenly stopped when it encoutnered a pause

* audio-arm-dac: set a sensible default for AUDIO_DAC_VALUE_OFF

1/2 MAX was probably exemplary, can't think of  a setup where that would make sense :-P

* audio-arm-dac: update synth_sample/_wavetable for new pin-defines

* audio-arm-dac:  default for AUDIO_DAC_VALUE_OFF

turned out that zero or max are bad default choices:
when multiple tones are played (>>5) and released at the same time (!), due to the complex waveform never reaching 'zero' the output can take quite a while to reach zero, and hence the zero-crossing code only "releases" the output waaay to late

* audio-arm-dac: additive: use DAC for negative pin

instead of PAL, which only allows the pin to be configured as output; LOW or HIGH

* audio-arm-dac: more compile-time configuration checks

* audio-refactoring: typo fixed

* audio-refactoring: clang-format on quantum/audio/*

* audio-avr-pwm: add defines for B-pin as primary/only speaker

also updates documentation.

* audio-refactoring: update documentation with proton-c config.h example

* audio-refactoring: move glissando (TODO) to voices.c

refactored/saved from the original glissando implementation in then upstream-master:audio_avr.c

still needs some work though, as it is now the calculation *should* work, but the start-frequency needs to be tracked somewhere/somehow; not only during a SONG playback but also with user input?

* audio-refactoring: cleanup: one round of aspell -c

* audio-avr-pwm: back to AUDIO_PIN

since config_common.h expands them to plain integers, the AUDIO_PIN define can directly be compared to e.g. B5
so there is no need to deal with separate defines like AUDIO_PIN_B5

* audio-refactoring: add technical documentation audio_driver.md

which moves some in-code documentation there

* audio-arm-dac: move AUDIO_PIN checks into c-code

instead of doing everything with the preprocessor, since A4/A5 do not expand to simple integers, preprocessor int-comparison is not possible. but necessary to get a consistent configuration scheme going throughout the audio-code... solution: let c-code handle the different AUDIO_PIN configurations instead (and leave code/size optimizations to the compiler)

* audio-arm-dac: compile-fix: set AUDIO_PIN if unset

workaround to get the build going again, and be backwarts compatible to arm-keyboards which not yet set the AUDIO_PIN define. until the define is enforced through an '#error"

* audio-refactoring: document tone-multiplexing feature

* audio-refactoring: Apply suggestions from documentation review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* audio-refactoring: Update docs/audio_driver.md

* audio-refactoring: docs: fix markdown newlines

Terminating a line in Markdown with <space>-<space>-<linebreak> creates an HTML single-line break (<br>).

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* audio-arm-dac: additive: fix AUDIO_PIN_ALT handling

* audio-arm-pwm: align define naming with other drivers

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

* audio-refactoring: set detault tempo to 120

and add documentation for the override

* audio-refactoring: update backlight define checks to new AUDIO_PIN names

* audio-refactoring: reworking PWM related defines

to be more consistent with other QMK code

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

* audio-arm: have the state-update-timer user configurable

defaulting to GPTD6 or GPTD8 for stm32f2+ (=proton-c)
stm32f1 might need to set this to GPTD4, since 6 and 8 are not available

* audio-refactoring: PLAY_NOTE_ARRAY was already removed in master

* Add prototype for startup

* Update chibiOS dac basic to disable pins on stop

* Add defaults for Proton C

* avoid hanging audio if note is completely missed

* Don't redefine pins if they're already defined

* Define A4 and A5 for CTPC support

* Add license headers to keymap files

* Remove figlet? comments

* Add DAC config to audio driver docs

* Apply suggestions from code review

Co-authored-by: Jack Humbert <jack.humb@gmail.com>

* Add license header to py files

* correct license header

* Add JohSchneider's name to modified files

AKA credit where credit's due

* Set executable permission and change interpeter

* Add 'wave' to pip requirements

* Improve documentation

* Add some settings I missed

* Strip AUDIO_DRIVER to parse the name correctly

* fix depreciated

* Update util/audio_generate_dac_lut.py

Co-authored-by: Jack Humbert <jack.humb@gmail.com>

* Fix type in clueboard config

* Apply suggestions from tzarc

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

Co-authored-by: Johannes <you@example.com>
Co-authored-by: JohSchneider <JohSchneider@googlemail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joshua Diamond <josh@windowoffire.com>
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
2021-02-15 09:40:38 +11:00
Atsushi NAGASE
6f44c2ec31
[Keymap] Add MOC keymap for meishi2 (#11833) 2021-02-14 13:19:48 -08:00
Galib, Muhammad
3134698ad2
initial add S20 keyboard into polycarbdiet folder (#11865) 2021-02-14 17:48:54 +00:00
csc027
5a37c1bd5c
csc027/windows-terminal-shortcuts (#11867)
* Fixed some comments in the defines file.

* Replaced the Git command layer with a Windows Terminal shortcut layer.

* Added numbered tab switching to the Windows Terminal layer.

* Added 'new tab' and 'command pane' commands to the Windows Terminal layer.

* Shortened the USB polling interval for the Iris to 1 millisecond.

* Disabled old style macros and functions for the Iris.
2021-02-14 11:46:11 -05:00
Nick Brassel
557cfecc15
ChibiOS conf upgrade for keebio/dsp40/rev1 (#11846) 2021-02-14 21:41:03 +11:00
James Young
ecbbdbcd4e
[Keyboard] YMDK YMD40 v2 (#11835)
* [Keyboard] YMDK YMD40 v2

* fork default keymap into default and factory

- factory keymap is as assigned by the extracted JSON provided by the vendor
- default keymap is based on the Planck

* add AUDIO_SUPPORTED rule per drashna

* modify factory keymap's readme

Recommend users copy the default keymap instead.
2021-02-13 23:17:05 -08:00
James Young
d035bb51f4
[Keyboard] NEO Keys Palette G67 Hotswap & Soldered (#11850) 2021-02-13 18:16:23 -08:00
Joshua Diamond
537b7614b9
unscramble Durgod k320 keymap / fix Issue #11883 (#11885)
* unscramble Durgod k320 keymap / fix Issue #11883

* fix a few keymaps
2021-02-13 20:49:26 -05:00
Ryan
7ce5ba645a
LED Matrix: add led_matrix_types.h and implement g_led_config (#11741)
* LED Matrix: add led_matrix_types.h and implement g_led_config

* Set correct flags for non-"modifier" LEDs

* Clean up docs a little

* Add license headers for [led,rgb]_matrix_types.h
2021-02-14 12:15:08 +11:00
QMK Bot
57d2409c08 Merge remote-tracking branch 'origin/master' into develop 2021-02-13 17:06:25 +00:00
Al Cutter
8af7e5ea81
Add basic ISO {Win,Mac} layouts for Durgod/K320 (#11778)
* Add default ISO Windows layout for Durgod/K320

* Duplicate default_iso to default_iso_mac

Swap the L{GUI,ALT} keys to match the mac layout, and remove the
windows key lock functionality.

* Remove windows-key lock in default_iso

* Fixup wonky macro layout inherited from ansi keymap
2021-02-13 12:05:53 -05:00
fauxpark
6573f24cd9 Merge remote-tracking branch 'upstream/master' into develop 2021-02-13 14:56:11 +11:00
Ryan
a716517705
Fix line endings for geminate60.[ch] (#11878) 2021-02-12 22:35:32 -05:00
QMK Bot
6680aa6bdf Merge remote-tracking branch 'origin/master' into develop 2021-02-13 02:35:08 +00:00
MelGeek
c2b0bd2a0a
[Keyboard] Update MOJO75 to support multi version (#11790)
* Add Z70Ultra which is a Hotsawp RGB 65% keyboard

* Update keyboards/melgeek/z70ultra/z70ultra.h

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

* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

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

* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

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

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/readme.md

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

* Update keyboards/melgeek/z70ultra/rev1/rules.mk

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

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/z70ultra.h

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

* Update readme.md

* Update info.json

update the name of layout to consistent the keyboard.

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/info.json

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

* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

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

* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

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

* Add Z70Ultra

* Support Z70Ultra
  [Modified] info.json to support two different layouts
  [Add]      rules.mk to support default folder

* Update keyboards/melgeek/z70ultra/rev1/rules.mk

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

* Update keyboards/melgeek/z70ultra/config.h

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

* remove excessive arguments from LAYOUT_split_space

* Update keyboards/melgeek/z70ultra/info.json

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/info.json

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/z70ultra.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/z70ultra.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/rev1/rules.mk

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Use macro replace with the literal for CS & SW

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* [Keyboard]  Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

* Update keyboards/melgeek/mj61/mj61.c

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

* Update keyboards/melgeek/mj61/mj61.c

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

* [Keyboard] MJ61 Add license header for files and the link for readme

* Update keyboards/melgeek/mj61/readme.md

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

* Update keyboards/melgeek/mj61/rev1/config.h

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

* Update keyboards/melgeek/mj61/rev1/rules.mk

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

* Update keyboards/melgeek/mj61/mj61.c

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

* Update keyboards/melgeek/mj61/mj61.c

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

* Add GPL for files

* Update keymaps/default/keymap.c

* Update keymaps/via/keymap.c

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* Update keyboards/melgeek/z70ultra/z70ultra.c

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

* [Keyboard] Update MOJO75 to support multi version and Update the LED's
ID of RGB Matrix

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-02-12 21:34:34 -05:00
QMK Bot
5e3cd884eb Merge remote-tracking branch 'origin/master' into develop 2021-02-13 00:59:41 +00:00
James Young
6e74abc643
[Keyboard] tunks/ergo33: define RGBLight config at kb level (#11855) 2021-02-12 16:59:10 -08:00
QMK Bot
0edb99a255 Merge remote-tracking branch 'origin/master' into develop 2021-02-12 22:55:06 +00:00
Weirdo
548b874a16
[Keyboard] geminate60 keyboard (#11670)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-12 14:54:37 -08:00
QMK Bot
06a28d024f Merge remote-tracking branch 'origin/master' into develop 2021-02-12 20:51:59 +00:00
Brian Marsh
519032c61b
Adding custom keymap for Quark keyboard (#11744)
* adding pezhore keymap

* Adding sarcasm/irony mark, unicode emoji

* removing numpad layer enum

Co-authored-by: Brian Marsh <brian.marsh@rangelabs.io>
2021-02-12 15:51:23 -05:00
QMK Bot
85dd86c64e Merge remote-tracking branch 'origin/master' into develop 2021-02-12 19:16:13 +00:00
Stuart Fong
bedb72b0bc
Add stuartfong1 Planck Layout (#11814)
* Add files via upload

* Update readme.md

* Update readme.md

* Add GPL2+ compatible license header to config.h

* Update keyboards/planck/keymaps/stuartfong1/keymap.c

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-12 14:15:38 -05:00
QMK Bot
e617f1cfcc Merge remote-tracking branch 'origin/master' into develop 2021-02-12 18:47:01 +00:00
Christian Gurholt
22368ee49e
Rename ki folder to kifinnsson (#11853)
In preparation for migrating keymaps to userspace
2021-02-12 13:46:27 -05:00
QMK Bot
b3c647bf7c Merge remote-tracking branch 'origin/master' into develop 2021-02-12 18:44:55 +00:00
Timothy Beck
3f71bc8e79
added dear_vehicle_owner meme keymap to planck keyboard (#11478)
* added default as a starting point

* added readme per guidelines

* made necessary changed to keymap to follow guidelines

* changed debounce mode for more smooth usage at the cost of mem

* increased polling interval

* Revert "made necessary changed to keymap to follow guidelines"
yikes! I modified the WRONG directory. reverted.
This reverts commit 8ba3d97af538796d765c47b48537dbcf55c3dbc1.

* reverted commit that modified file in incorrect directory. modified intended file.

* added license tp config.h
2021-02-12 13:43:52 -05:00
QMK Bot
393f1ea38a Merge remote-tracking branch 'origin/master' into develop 2021-02-12 02:34:22 +00:00
Quentin
550359a4b4
[Keyboard] Add bastyl mini keyboard (#11782)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: NullSense <matas234@gmail.com>
2021-02-11 18:33:50 -08:00
QMK Bot
0b68c7441a Merge remote-tracking branch 'origin/master' into develop 2021-02-12 01:03:00 +00:00
Rozakiin
bc74027f39
[Keyboard] Fix noxary Product IDs (#11771)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ruari <ruari.armstrong@gmail.com>
2021-02-11 17:02:28 -08:00
QMK Bot
02654ad2d7 Merge remote-tracking branch 'origin/master' into develop 2021-02-12 00:56:39 +00:00
MelGeek
068e11f7e2
[Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)
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-02-11 16:56:07 -08:00
QMK Bot
986dc7f0e9 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 19:18:29 +00:00
James Young
5a73558a21
[Keymap] add noroadsleft userspace; add and update keymaps (#11686) 2021-02-10 20:17:42 +01:00
QMK Bot
7ff713f35f Merge remote-tracking branch 'origin/master' into develop 2021-02-10 19:06:05 +00:00
Joschua Gandert
4b2ab84c71
[Keymap] Added german_gaming keymap for hidtech/bastyl (#11446)
* Added german_gaming keymap for hidtech/bastyl

* Apply suggestions from code review

* Added missing brace
2021-02-10 11:05:20 -08:00
QMK Bot
8d06a230c2 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 14:22:21 +00:00
stanrc85
7ef4aba52c
Userspace updates (#11841)
* enable LTO for smaller firmware size

* delete since this was added to userspace rules.mk

* readme updates and new images

* Add -j to compile and flash commands in userpsace

* Enable NKRO

* Enable NKRO, VIA, LTO by default

* Stanrc85-ansi readme update

* Stanrc85-alice readme

* quick RGB layer indicator fix in keymap
2021-02-10 09:21:46 -05:00
QMK Bot
0cd00b6c09 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 05:19:52 +00:00
Spaceman
0aed8746be
[Keyboard] Add keyboard yun65 (#11714) 2021-02-09 21:18:53 -08:00
QMK Bot
527cf2f3cf Merge remote-tracking branch 'origin/master' into develop 2021-02-10 04:46:39 +00:00
Mike Tsao
872f656c3b
[Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589) 2021-02-09 20:45:42 -08:00
QMK Bot
ded7b215be Merge remote-tracking branch 'origin/master' into develop 2021-02-10 02:00:17 +00:00
LSChyi
fb9f619d89
Play Keyboard Helen 80: fix matrix mapping (#11585) 2021-02-09 17:58:59 -08:00
QMK Bot
36c7c66831 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 22:40:48 +00:00
Konstantin Shpits
955eb58af5
Fix VENDOR_ID for ymd67 (#11838) 2021-02-10 09:40:16 +11:00
Drashna Jaelre
7161d65070
Remove FAUXCLICKY feature (deprecated) (#11829) 2021-02-09 09:49:05 -08:00
QMK Bot
738bd263c1 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 17:11:54 +00:00
Nicolas Schodet
7d5902752e
[Keyboard] Add Splitty keyboard (#11613) 2021-02-09 09:10:54 -08:00
QMK Bot
9aed856d78 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 14:59:41 +00:00
Jay Greco
4107856b70
Simplify NIBBLE encoder code and clean up keymaps (#11808)
* Simplify encoder code and clean up keymaps.

-Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps.
-Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build.
-Move layer names to enum

* Change encoder_update_kb to encoder_update_user per PR feedback
2021-02-09 14:50:16 +00:00
QMK Bot
248413489f Merge remote-tracking branch 'origin/master' into develop 2021-02-08 09:13:10 +00:00
Ryan
d2f204c1e3
Fix RGBLIGHT_LIMIT_VAL typo (#11826) 2021-02-08 20:12:33 +11:00
QMK Bot
3a98bd75c8 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 23:16:47 +00:00
Joel Challis
99bffc2a21
Migrate some tmk_core files to quantum (#11791)
* Migrate some tmk_core files to quantum

* Fix build errors
2021-02-07 23:16:15 +00:00
QMK Bot
b8031a1613 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 22:52:50 +00:00
yfuku
7e82879553
via support for bat43 (#11729)
* via support for bat43

* add adjust layer for via
2021-02-07 22:52:19 +00:00
QMK Bot
51d40e0ef0 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 22:35:56 +00:00
Xelus22
4d8161cff5
[Update] Allow APM32 on TrinityXTtkl (#11715)
* amp32  initial change

* fix spacing
2021-02-07 22:35:20 +00:00