Commit Graph

15956 Commits

Author SHA1 Message Date
Ikta
311bff3d56
[Keyboard] Pill60: fix default keymap shift key, fix info.json to default keymap (#11919) 2021-02-20 22:19:06 -08:00
QMK Bot
14f0f8ce65 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 06:13:32 +00:00
IFo Hancroft
a3934664dd
[Keymap] Adding my v60 Type R keymap (#11911) 2021-02-20 22:12:50 -08:00
QMK Bot
3b4b3c827c Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:52:48 +00:00
IFo Hancroft
46a22c9e70
[Keymap] My Prime_E Keymap (#11899) 2021-02-20 21:52:40 -08:00
QMK Bot
1216e807c0 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:52:26 +00:00
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
Liyang HU
c4bd6af837
tmk_core/common/action.c: refactor for code size; merge multiple cases into one (#11943)
* tmk_core/common/report.h: define `enum mouse_buttons` in terms of `#define MOUSE_BTN_MASK()`

* tmk_core/common/action.c: collapse multiple `case KC_MS_BTN[1-8]:` into single `MOUSE_BTN_MASK(action.key.code - KC_MS_BTN1)`

We all love tapping on our keyboards but this is taking the piss.

This saves ~134 bytes on my ATmega32.
2021-02-20 14:53:53 -05: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
Ryan
7ab9f6a101
Output selection: Remove "USB and BT" option (#11940) 2021-02-20 18:11:02 +11: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