Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel (#3173)

Browse source 
* Ergodone refactor

* Ergodox Infinity refactor

* Ergotravel refactor

* Ergotravel configurator layout update

* Fixing include on Ergodox Infinity narze keymap
This commit is contained in:
noroadsleft 2018-06-13 07:58:23 -07:00 committed by Drashna Jaelre
parent 698ce733b7
commit 1912f36177
9 changed files with 143 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
keyboards/ergodone/ergodone.h
View file

@ -67,9 +67,12 @@ inline void ergodox_right_led_3_set(uint8_t n) {}
inline void ergodox_right_led_set(uint8_t l, uint8_t n) {} inline void ergodox_right_led_set(uint8_t l, uint8_t n) {}
inline void ergodox_led_all_set(uint8_t n) {} inline void ergodox_led_all_set(uint8_t n) {}
#define KEYMAP( \ /*
* LEFT HAND: LINES 76-83
* RIGHT HAND: LINES 85-92
*/
#define LAYOUT_ergodox( \
\ \
/* left hand, spatial positions */ \
k00,k01,k02,k03,k04,k05,k06, \ k00,k01,k02,k03,k04,k05,k06, \
k10,k11,k12,k13,k14,k15,k16, \ k10,k11,k12,k13,k14,k15,k16, \
k20,k21,k22,k23,k24,k25, \ k20,k21,k22,k23,k24,k25, \
@ -79,7 +82,6 @@ inline void ergodox_led_all_set(uint8_t n) {}
k54, \ k54, \
k53,k52,k51, \ k53,k52,k51, \
\ \
/* right hand, spatial positions */ \
k07,k08,k09,k0A,k0B,k0C,k0D, \ k07,k08,k09,k0A,k0B,k0C,k0D, \
k17,k18,k19,k1A,k1B,k1C,k1D, \ k17,k18,k19,k1A,k1B,k1C,k1D, \
k28,k29,k2A,k2B,k2C,k2D, \ k28,k29,k2A,k2B,k2C,k2D, \
@ -99,9 +101,12 @@ inline void ergodox_led_all_set(uint8_t n) {}
{ KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \
} }
/*
* LEFT HAND: LINES 110-117
* RIGHT HAND: LINES 119-126
*/
#define LAYOUT_ergodox_80( \ #define LAYOUT_ergodox_80( \
\ \
/* left hand, spatial positions */ \
k00,k01,k02,k03,k04,k05,k06, \ k00,k01,k02,k03,k04,k05,k06, \
k10,k11,k12,k13,k14,k15,k16, \ k10,k11,k12,k13,k14,k15,k16, \
k20,k21,k22,k23,k24,k25, \ k20,k21,k22,k23,k24,k25, \
@ -111,7 +116,6 @@ inline void ergodox_led_all_set(uint8_t n) {}
k45,k46,k54, \ k45,k46,k54, \
k53,k52,k51, \ k53,k52,k51, \
\ \
/* right hand, spatial positions */ \
k07,k08,k09,k0A,k0B,k0C,k0D, \ k07,k08,k09,k0A,k0B,k0C,k0D, \
k17,k18,k19,k1A,k1B,k1C,k1D, \ k17,k18,k19,k1A,k1B,k1C,k1D, \
k28,k29,k2A,k2B,k2C,k2D, \ k28,k29,k2A,k2B,k2C,k2D, \
@ -131,8 +135,9 @@ inline void ergodox_led_all_set(uint8_t n) {}
{ KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \
} }
#define KEYMAP_PRETTY( \ /* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
/* left hand, spatial positions */ /* right hand, spatial positions */ \ #define LAYOUT_ergodox_pretty( \
\
L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
@ -152,8 +157,9 @@ inline void ergodox_led_all_set(uint8_t n) {}
{ KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \
} }
/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
#define LAYOUT_ergodox_pretty_80( \ #define LAYOUT_ergodox_pretty_80( \
/* left hand, spatial positions */ /* right hand, spatial positions */ \ \
L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
@ -173,7 +179,4 @@ inline void ergodox_led_all_set(uint8_t n) {}
{ KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \
} }
#define LAYOUT_ergodox KEYMAP
#define LAYOUT_ergodox_pretty KEYMAP_PRETTY
#endif #endif

15
keyboards/ergodox_infinity/ergodox_infinity.h
View file

@ -80,7 +80,11 @@ inline void ergodox_led_all_set(uint8_t n) {
ergodox_right_led_3_set(n); ergodox_right_led_3_set(n);
} }
#define KEYMAP( \ /*
* LEFT HAND: LINES 88-95
* RIGHT HAND: LINES 97-104
*/
#define LAYOUT_ergodox( \
A80, A70, A60, A50, A40, A30, A20, \ A80, A70, A60, A50, A40, A30, A20, \
A81, A71, A61, A51, A41, A31, A21, \ A81, A71, A61, A51, A41, A31, A21, \
A82, A72, A62, A52, A42, A32, \ A82, A72, A62, A52, A42, A32, \
@ -89,6 +93,7 @@ inline void ergodox_led_all_set(uint8_t n) {
A13, A03, \ A13, A03, \
A04, \ A04, \
A34, A24, A14, \ A34, A24, A14, \
\
B20, B30, B40, B50, B60, B70, B80, \ B20, B30, B40, B50, B60, B70, B80, \
B21, B31, B41, B51, B61, B71, B81, \ B21, B31, B41, B51, B61, B71, B81, \
B32, B42, B52, B62, B72, B82, \ B32, B42, B52, B62, B72, B82, \
@ -118,8 +123,9 @@ inline void ergodox_led_all_set(uint8_t n) {
{ B80, B81, B82, B83, B84 } \ { B80, B81, B82, B83, B84 } \
} }
#define KEYMAP_PRETTY( \ /* -------------- LEFT HAND -------------- -------------- RIGHT HAND -------------- */
/* left hand, spatial positions */ /* right hand, spatial positions */ \ #define LAYOUT_ergodox_pretty( \
\
A80, A70, A60, A50, A40, A30, A20, B20, B30, B40, B50, B60, B70, B80, \ A80, A70, A60, A50, A40, A30, A20, B20, B30, B40, B50, B60, B70, B80, \
A81, A71, A61, A51, A41, A31, A21, B21, B31, B41, B51, B61, B71, B81, \ A81, A71, A61, A51, A41, A31, A21, B21, B31, B41, B51, B61, B71, B81, \
A82, A72, A62, A52, A42, A32, B32, B42, B52, B62, B72, B82, \ A82, A72, A62, A52, A42, A32, B32, B42, B52, B62, B72, B82, \
@ -151,7 +157,4 @@ inline void ergodox_led_all_set(uint8_t n) {
{ B80, B81, B82, B83, B84 } \ { B80, B81, B82, B83, B84 } \
} }
#define LAYOUT_ergodox KEYMAP
#define LAYOUT_ergodox_pretty KEYMAP_PRETTY
#endif /* KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ */ #endif /* KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ */

26
keyboards/ergodox_infinity/keymaps/gordon/keymap.c
View file

@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//**************************FIRST LAYER - LAYER ZERO ************************************** //**************************FIRST LAYER - LAYER ZERO **************************************
[_QWERTY] = KEYMAP( [_QWERTY] = LAYOUT_ergodox(
SHF6_AF7, F1_F13 , F2_F14, TD(F3D), F4_ALTF4, F5_F15, KC_F11, SHF6_AF7, F1_F13 , F2_F14, TD(F3D), F4_ALTF4, F5_F15, KC_F11,
SPRK_TCK , Q_ESC , CTR_SH_W, NAV_E, ALT_SH_R, KC_T, PRINTSCR, SPRK_TCK , Q_ESC , CTR_SH_W, NAV_E, ALT_SH_R, KC_T, PRINTSCR,
@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//**************************SYMBOLS LAYER************************** //**************************SYMBOLS LAYER**************************
[_SYMBOLS] = KEYMAP( [_SYMBOLS] = LAYOUT_ergodox(
________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________,
________, DEREF , KC_AT, KC_LCBR, KC_RCBR, KC_CIRC, ________, ________, DEREF , KC_AT, KC_LCBR, KC_RCBR, KC_CIRC, ________,
________, KC_EXLM, KC_HASH, KC_LPRN, KC_RPRN, ________, ________, KC_EXLM, KC_HASH, KC_LPRN, KC_RPRN, ________,
@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________,________,_XXXXXX_), ________,________,_XXXXXX_),
//**************************MOUSE MOVEMENT LAYER************************** //**************************MOUSE MOVEMENT LAYER**************************
[_MOUSE] = KEYMAP(UP_ENTER_RESET,________,________,________,________,________,MODRESET, [_MOUSE] = LAYOUT_ergodox(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
RESET,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________, RESET,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN, ________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_, KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_,
@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//**************************WINDOWS NAVIGATION LAYER************************** //**************************WINDOWS NAVIGATION LAYER**************************
[_NAV] = KEYMAP(________,________,________,________,________,________,________, [_NAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________, ________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________,
________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP, ________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP,
________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________, ________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________,
@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________,________,________), ________,________,________),
//****************************NUMPAD LAYER**************************** //****************************NUMPAD LAYER****************************
[_NUMPAD] = KEYMAP(________,________,________,________,________,________,________, [_NUMPAD] = LAYOUT_ergodox(________,________,________,________,________,________,________,
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,KC_DOT ,KC_SPACE,_XXXXXX_, KC_ESC ,________, ________,KC_DOT ,KC_SPACE,_XXXXXX_, KC_ESC ,________,
________,DBMS_OUT,________,________,________,________,________, ________,DBMS_OUT,________,________,________,________,________,
@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________,________,KC_0), ________,________,KC_0),
//****************************APP SWITCH LAYER**************************** //****************************APP SWITCH LAYER****************************
[_APPSWITCH] = KEYMAP(________,________,________,________,________,________,________, [_APPSWITCH] = LAYOUT_ergodox(________,________,________,________,________,________,________,
________,________ , ________ , ________ ,________ ,________,________, ________,________ , ________ , ________ ,________ ,________,________,
________,APP_5,APP_6,APP_7,APP_8,________, ________,APP_5,APP_6,APP_7,APP_8,________,
________,DBMS_OUT,________,________,________,________,________, ________,DBMS_OUT,________,________,________,________,________,
@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________,________,________), ________,________,________),
[_ONESHOT] = KEYMAP( UP_ENTER_RESET , ________, ________, ________, ________, ________, ________, [_ONESHOT] = LAYOUT_ergodox( UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
________, ________, ________, KC_UP , ________, ________, ________, ________, ________, ________, KC_UP , ________, ________, ________,
________, ________, KC_LEFT , KC_DOWN , KC_RIGHT, ________, ________, ________, KC_LEFT , KC_DOWN , KC_RIGHT, ________,
MAGIC_TOGGLE_NKRO, ________, ________, ________, ________, ________, ________, MAGIC_TOGGLE_NKRO, ________, ________, ________, ________, ________, ________,
@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________, ________,
________, ________, ________), ________, ________, ________),
//****************************TEXT/INTELLIJ NAVIGATION LAYER**************************** //****************************TEXT/INTELLIJ NAVIGATION LAYER****************************
[_TEXTNAV] = KEYMAP(________,________,________,________,________,________,________, [_TEXTNAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________, ________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________,
________,________,LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)), ________,________,LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________, ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,
@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)), ________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),
LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________, LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,
________,________,________,________,________,________,________,________,________,_XXXXXX_), ________,________,________,________,________,________,________,________,________,_XXXXXX_),
[_QWERTY_KIDS] = KEYMAP( [_QWERTY_KIDS] = LAYOUT_ergodox(
KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO ,
KC_NO , KC_Q , KC_W, KC_E, KC_R, KC_T, KC_NO , KC_NO , KC_Q , KC_W, KC_E, KC_R, KC_T, KC_NO ,
@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, KC_NO,
KC_NO, KC_ENTER, KC_SPACE), KC_NO, KC_ENTER, KC_SPACE),
[_STREET_FIGHTER] = KEYMAP( [_STREET_FIGHTER] = LAYOUT_ergodox(
KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO ,
KC_NO , KC_NO , DIE_1000X_LEFT, KC_UP, DIE_1000X_RIGHT, KC_NO, KC_NO , KC_NO , KC_NO , DIE_1000X_LEFT, KC_UP, DIE_1000X_RIGHT, KC_NO, KC_NO ,
@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//************************Windows navigation to directories************************* //************************Windows navigation to directories*************************
[_DIRNAV] = KEYMAP( [_DIRNAV] = LAYOUT_ergodox(
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,________,KC_A,________,________,________, ________,________,KC_A,________,________,________,
@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
________,________,________), ________,________,________),
[_TEXT_MACROS] = KEYMAP( [_TEXT_MACROS] = LAYOUT_ergodox(
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,________,KC_A,________,________,________, ________,________,KC_A,________,________,________,
@ -305,7 +305,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* FOR FORMATTING FUTURE LAYERS /* FOR FORMATTING FUTURE LAYERS
NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS
GOES LEFT HAND THEN RIGHT HAND GOES LEFT HAND THEN RIGHT HAND
[_DIRNAV] = KEYMAP( [_DIRNAV] = LAYOUT_ergodox(
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,________,________,________,________,________,________, ________,________,________,________,________,________,________,
________,________,________,________,________,________, ________,________,________,________,________,________,

2
keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
View file

@ -304,7 +304,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
[PLVR] = KEYMAP( // layout: layer 7: Steno for Plover [PLVR] = LAYOUT_ergodox( // layout: layer 7: Steno for Plover
// left hand // left hand
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,

28
keyboards/ergodox_infinity/keymaps/narze/keymap.c
View file

@ -1,4 +1,4 @@
#include "ergodox.h" #include QMK_KEYBOARD_H
// #include "debug.h" // #include "debug.h"
#include "action_layer.h" #include "action_layer.h"
#include "version.h" #include "version.h"
@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | Space| End | | PgDn | Space | | * | | Space| End | | PgDn | Space | |
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[_QWERTY] = KEYMAP( [_QWERTY] = LAYOUT_ergodox(
// left hand // left hand
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_MDIA, KC_NO), KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_MDIA, KC_NO),
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, LT(_SYMB, KC_NO), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, LT(_SYMB, KC_NO),
@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | Space| End | | PgDn | Space | | * | | Space| End | | PgDn | Space | |
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[_COLEMAK] = KEYMAP( [_COLEMAK] = LAYOUT_ergodox(
// left hand // left hand
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_MDIA, KC_NO), KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_MDIA, KC_NO),
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, LT(_SYMB, KC_NO), KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, LT(_SYMB, KC_NO),
@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PGDN,KC_BSPC, KC_ENT KC_PGDN,KC_BSPC, KC_ENT
), ),
/* Qwerty on software Colemak : Useful for gaming with qwerty keymaps! */ /* Qwerty on software Colemak : Useful for gaming with qwerty keymaps! */
[_QWOC] = KEYMAP( [_QWOC] = LAYOUT_ergodox(
// left hand // left hand
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_MDIA, KC_NO), KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_MDIA, KC_NO),
KC_TAB, CM_Q, CM_W, CM_E, CM_R, CM_T, LT(_SYMB, KC_NO), KC_TAB, CM_Q, CM_W, CM_E, CM_R, CM_T, LT(_SYMB, KC_NO),
@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | * | | | | | | | |
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
[_LOWER] = KEYMAP( [_LOWER] = LAYOUT_ergodox(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
@ -258,7 +258,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | * | | | | | | | |
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
[_RAISE] = KEYMAP( [_RAISE] = LAYOUT_ergodox(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
@ -299,7 +299,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | Space| End | | PgDn | Space | | * | | Space| End | | PgDn | Space | |
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[_PLOVER] = KEYMAP( [_PLOVER] = LAYOUT_ergodox(
// left hand // left hand
KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, XXXXXXX, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, XXXXXXX,
XXXXXXX, KC_1, KC_1, KC_1, KC_1, KC_1, XXXXXXX, XXXXXXX, KC_1, KC_1, KC_1, KC_1, KC_1, XXXXXXX,
@ -341,7 +341,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | * | | | | | | | |
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[_SUPERDUPER] = KEYMAP( [_SUPERDUPER] = LAYOUT_ergodox(
// left hand // left hand
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -362,7 +362,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______, KC_LSFT _______,_______, KC_LSFT
), ),
// Intermediate keymaps for SuperDuper (Combo keys does not work on Infinity yet) // Intermediate keymaps for SuperDuper (Combo keys does not work on Infinity yet)
[_SUPER] = KEYMAP( [_SUPER] = LAYOUT_ergodox(
// left hand // left hand
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -382,7 +382,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______,
_______,_______, _______ _______,_______, _______
), ),
[_DUPER] = KEYMAP( [_DUPER] = LAYOUT_ergodox(
// left hand // left hand
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -424,7 +424,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | Click| | | | | | Click| * | Click| | | | | | Click|
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[_MOUSE] = KEYMAP( [_MOUSE] = LAYOUT_ergodox(
// left hand // left hand
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______,
@ -466,7 +466,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | * | | | | | | | |
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[_ADJUST] = KEYMAP( [_ADJUST] = LAYOUT_ergodox(
// left hand // left hand
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RESET, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______,
@ -510,7 +510,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
// SYMBOLS // SYMBOLS
[_SYMB] = KEYMAP( [_SYMB] = LAYOUT_ergodox(
// left hand // left hand
VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
_______,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,_______, _______,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,_______,
@ -552,7 +552,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
// MEDIA AND MOUSE // MEDIA AND MOUSE
[_MDIA] = KEYMAP( [_MDIA] = LAYOUT_ergodox(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, KC_MS_U, _______, _______, _______,
_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,

5
keyboards/ergotravel/info.json
View file

@ -5,11 +5,12 @@
"url": "https://github.com/jpconstantineau/ErgoTravel", "url": "https://github.com/jpconstantineau/ErgoTravel",
"maintainer": "qmk", "maintainer": "qmk",
"processor": "atmega32u4", "processor": "atmega32u4",
"width": 14.5, "width": 16,
"height": 5, "height": 5,
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7.5, "y":4}, {"x":8.5, "y":4}, {"x":9.5, "y":4}] "key_count": 54,
"layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.25}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.5}, {"label":"R00", "x":9, "y":0.5}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.25}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.25}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.5}, {"label":"R10", "x":9, "y":1.5}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.25}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.25}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6.5, "y":3}, {"label":"R20", "x":8.5, "y":3}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.25}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.25}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":5.5, "y":4}, {"label":"L35", "x":6.5, "y":4}, {"label":"R30", "x":8.5, "y":4}, {"label":"R31", "x":9.5, "y":4}, {"label":"R32", "x":12, "y":3}, {"label":"R33", "x":13, "y":3.125}, {"label":"R34", "x":14, "y":3.25}, {"label":"R35", "x":15, "y":3.375}]
} }
} }
} }

96
keyboards/ergotravel/keymaps/default/keymap.c
View file

@ -14,72 +14,58 @@ enum custom_keycodes {
ADJUST, ADJUST,
}; };
#define KC_ KC_TRNS // #define KC_ KC_TRNS
#define _______ KC_TRNS #define _______ KC_TRNS
#define KC_LOWR LOWER
#define KC_RASE RAISE
#define KC_ADJT ADJUST
#define KC_RST RESET
#define KC_BL_S BL_STEP
#define KC_DBUG DEBUG
#define KC_RTOG RGB_TOG
#define KC_RMOD RGB_MOD
#define KC_RHUI RGB_HUI
#define KC_RHUD RGB_HUD
#define KC_RSAI RGB_SAI
#define KC_RSAD RGB_SAD
#define KC_RVAI RGB_VAI
#define KC_RVAD RGB_VAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_kc( [_QWERTY] = LAYOUT(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
ESC , Q , W , E , R , T ,LBRC, RBRC, Y , U , I , O , P ,BSPC, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
TAB , A , S , D , F , G , A, A, H , J , K , L ,SCLN,QUOT, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_A, KC_A, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LSFT, Z , X , C , V , B , A, SPC, N , M ,COMM,DOT ,SLSH,ENT , KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_A, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
//|----+----+----+----+----+----+----. .----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LCTL,LGUI,LALT,ADJT,LOWR,SPC, SPC, RASE,LEFT, UP ,DOWN,RIGHT KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
//`----+----+----+--+-+----/----/ \----\----+----+----+----+----' //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
), ),
[_LOWER] = LAYOUT_kc( [_LOWER] = LAYOUT(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
GRAVE, 1 , 2 , 3 , 4 , 5 , A, B, 6 , 7 , 8 , 9 , 0 ,DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_A, KC_B, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
TAB , F1 , F2 , F3 , F4 , F5 , F6 , D, Y ,MINS, EQL,LBRC,RBRC,BSLS, KC_TAB, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_D, KC_Y, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LSFT, F7 , F8 , F9 , F10, F11, F12, SPC, N , M ,COMM,DOT ,SLSH,ENT , KC_LSFT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
//|----+----+----+----+----+----+----. .----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LCTL,LGUI,LALT,ADJT,LOWR,SPC, SPC, RASE,LEFT, UP ,DOWN,RIGHT KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
//`----+----+----+--+-+----/----/ \----\----+----+----+----+----' //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
), ),
[_RAISE] = LAYOUT_kc( [_RAISE] = LAYOUT(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
ESC , 1 , 2 , 3 , 4 , 5 , A, B, 6 , 7 , 8 , 9 , 0 ,BSPC, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_A, KC_B, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
TAB , Q , W , E , R , T , C , D, Y , U , I , O , P ,DEL , KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_C, KC_D, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LSFT, Z , X , C , V , B , A, SPC, N , M ,COMM,DOT ,SLSH,ENT , KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_A, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
//|----+----+----+----+----+----+----. .----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LCTL,LGUI,LALT,ADJT,LOWR,SPC, SPC, RASE,LEFT, UP ,DOWN,RIGHT KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
//`----+----+----+--+-+----/----/ \----\----+----+----+----+----' //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
), ),
[_ADJUST] = LAYOUT_kc( [_ADJUST] = LAYOUT(
//,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
ESC , F1 , F2 , F3 , F4 , F5 , F6, F7, F8, F9 ,F10 , F11, F12,BSPC, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
TAB , Q , W , E , R , T , C , D, Y , U , I , O , P ,DEL , KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_C, KC_D, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LSFT, Z , X , C , V , B , A, SPC, N , M ,COMM,DOT ,SLSH,ENT , KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_A, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
//|----+----+----+----+----+----+----. .----+----+----+----+----+----+----| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LCTL,LGUI,LALT,ADJT,LOWR,SPC, SPC, RASE,LEFT, UP ,DOWN,RIGHT KC_LCTL, KC_LGUI, KC_LALT, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
//`----+----+----+--+-+----/----/ \----\----+----+----+----+----' //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
) )
}; };