summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-211-157/+162
|\
| * ergodox_ez / dvorak_42_key layout: convert macros to new format (#11139)LucW2021-02-201-157/+162
| | | | | | Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
* | added unix60, moved togehter with southpaw75 into fr4 folder (#11195)mkdl2021-02-2014-0/+182
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-209-0/+243
|\|
| * Added ConsoleKeyboard (#11950)gazeddy2021-02-219-0/+243
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-201-2/+2
|\|
| * Fix minor typo (#11962)Jonathan Haddock2021-02-201-2/+2
| |
* | tmk_core/common/action.c: refactor for code size; merge multiple `case`s ↵Liyang HU2021-02-202-72/+21
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2021-0/+447
|\|
| * [Keyboard] keyboards/anavi: Add ANAVI Macro Pad 2 (#11821)Leon Anavi2021-02-2021-0/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2011-0/+339
|\|
| * [Keyboard] Concertina (#11922)Viktor Eikman2021-02-2011-0/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-203-2/+51
|\|
| * Add via support to Dozen0 (#11932)yynmt2021-02-203-2/+51
| | | | | | | | | | | | | | | | | | | | | | * Change VID and PID * Add via kyemap * Update keymap.c * Update keymap.c Co-authored-by: yynmt <yynmt@yynmt.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-201-2/+2
|\|
| * Update ortho.h (#11945)melonbred2021-02-201-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-201-4/+4
|\|
| * assign each key an LED for reactive modes (#11949)stanrc852021-02-201-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-204-0/+108
|\|
| * adding personal keymaps (#11952)Chase Nordengren2021-02-204-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Output selection: Remove "USB and BT" option (#11940)Ryan2021-02-202-30/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-205-66/+184
|\|
| * Iron180: layout macro and Configurator rework (#11948)James Young2021-02-205-66/+184
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2013-0/+1711
|\|
| * Adding new handwired ortho 5x14 keyboard (#11597)Richard Nunez2021-02-2013-0/+1711
| | | | | | Co-authored-by: Richard Nunez <richard.nunez@macrossplusinc.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-194-0/+415
|\|
| * [Keymap] Adding fraanrosi keymap. (changes applied) (#11862)Franco Rosi2021-02-194-0/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-192-0/+2
|\|
| * enable rgb underglow for VIA-firmware (#11746)4pplet2021-02-192-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-196-48/+88
|\|
| * [Keyboard] Xealous Brown handwired Refactor (#11929)James Young2021-02-186-48/+88
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-191-0/+17
|\|
| * [Keyboard] Add swap-hands array for CRKBD (Corne) (#11915)Albert Y2021-02-181-0/+17
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1910-10/+370
|\|
| * [Keyboard] change to saka68 solder firmware config. add sam's s80 firmware ↵CMMS-Freather2021-02-1810-10/+370
| | | | | | | | | | | | | | (#11834) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joshua Diamond <josh@windowoffire.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1911-0/+352
|\|
| * [Keyboard] Add new keyboard Cornelius (#11719)Kosuke Adachi2021-02-1811-0/+352
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1911-0/+534
|\|
| * [Keyboard] Quadrant by Ealdin (#11747)Nuno Costa2021-02-1811-0/+534
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-189-0/+355
|\|
| * [Keyboard] Phase Studio's Titan 65 (#11920)Drashna Jaelre2021-02-189-0/+355
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-181-2/+106
|\|
| * Beegboy handwired by swiftrax: correct info.json object order (#11924)James Young2021-02-181-2/+106
| | | | | | | | | | * human-friendly formatting * correct key object order
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-189-0/+318
|\|
| * add eggman keyboard (#11701)qpockets2021-02-189-0/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1815-4/+356
|\|
| * Budget96 VIA (#11737)MechMerlin2021-02-185-4/+82
| | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add UTD80 PCB (#11799)Dominic Gan2021-02-1810-0/+274
| | | | | | | | | | | | | | | | | | | |