From 7b3ad56f13f83e1b688f6330898b5234cda7168e Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 8 Oct 2022 15:52:38 +1100 Subject: Fix future naming collisions. (#18645) --- keyboards/elephant42/keymaps/via/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/elephant42/keymaps') diff --git a/keyboards/elephant42/keymaps/via/keymap.c b/keyboards/elephant42/keymaps/via/keymap.c index 4ecf5d86ab..32b9dc1fcb 100644 --- a/keyboards/elephant42/keymaps/via/keymap.c +++ b/keyboards/elephant42/keymaps/via/keymap.c @@ -18,8 +18,8 @@ #define KC_VU KC_AUDIO_VOL_UP #define KC_VD KC_AUDIO_VOL_DOWN #define KC_MU KC_AUDIO_MUTE -#define KC_LSPC LT(_LOWER, KC_SPC) -#define KC_RSPC LT(_RAISE, KC_SPC) +#define KC_LWSP LT(_LOWER, KC_SPC) +#define KC_RSSP LT(_RAISE, KC_SPC) enum layer_names { _QWERTY, @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT, KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN, KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL , // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT, KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD, KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT, KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), -- cgit v1.2.3 From 002b58f0e4ea64eb5b06e36d988160bbb907cb83 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Oct 2022 21:19:16 +1100 Subject: Normalise Space Cadet keycodes (#18864) --- keyboards/elephant42/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/elephant42/keymaps') diff --git a/keyboards/elephant42/keymaps/default/keymap.c b/keyboards/elephant42/keymaps/default/keymap.c index e0235d75bb..7cb90fe35e 100644 --- a/keyboards/elephant42/keymaps/default/keymap.c +++ b/keyboards/elephant42/keymaps/default/keymap.c @@ -18,8 +18,8 @@ #define KC_VU KC_AUDIO_VOL_UP #define KC_VD KC_AUDIO_VOL_DOWN #define KC_MU KC_AUDIO_MUTE -#define KC_LSPC LT(_LOWER, KC_SPC) -#define KC_RSPC LT(_RAISE, KC_SPC) +#define SC_LSPC LT(_LOWER, KC_SPC) +#define SC_RSPC LT(_RAISE, KC_SPC) enum layer_names { _QWERTY, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT, KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN, KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL , // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT, KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD, KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT, KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ) }; -- cgit v1.2.3 From 7b888fb3287b939af5ae12688e2e808a81c91427 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 28 Oct 2022 05:34:00 +1100 Subject: elephant42: fix default keymap (#18884) --- keyboards/elephant42/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/elephant42/keymaps') diff --git a/keyboards/elephant42/keymaps/default/keymap.c b/keyboards/elephant42/keymaps/default/keymap.c index 7cb90fe35e..e0235d75bb 100644 --- a/keyboards/elephant42/keymaps/default/keymap.c +++ b/keyboards/elephant42/keymaps/default/keymap.c @@ -18,8 +18,8 @@ #define KC_VU KC_AUDIO_VOL_UP #define KC_VD KC_AUDIO_VOL_DOWN #define KC_MU KC_AUDIO_MUTE -#define SC_LSPC LT(_LOWER, KC_SPC) -#define SC_RSPC LT(_RAISE, KC_SPC) +#define KC_LSPC LT(_LOWER, KC_SPC) +#define KC_RSPC LT(_RAISE, KC_SPC) enum layer_names { _QWERTY, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT, KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN, KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL , // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT, KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD, KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,SC_LSPC,KC_LSFT, KC_DEL ,SC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ) }; -- cgit v1.2.3 From 594dcbf66c5ddc9865bd0243f8d4215e8c034707 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 31 Oct 2022 02:34:24 +1100 Subject: Properly fix elephant42 (#18908) --- keyboards/elephant42/keymaps/default/keymap.c | 12 ++++++------ keyboards/elephant42/keymaps/via/keymap.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/elephant42/keymaps') diff --git a/keyboards/elephant42/keymaps/default/keymap.c b/keyboards/elephant42/keymaps/default/keymap.c index e0235d75bb..21f743a6ee 100644 --- a/keyboards/elephant42/keymaps/default/keymap.c +++ b/keyboards/elephant42/keymaps/default/keymap.c @@ -18,8 +18,8 @@ #define KC_VU KC_AUDIO_VOL_UP #define KC_VD KC_AUDIO_VOL_DOWN #define KC_MU KC_AUDIO_MUTE -#define KC_LSPC LT(_LOWER, KC_SPC) -#define KC_RSPC LT(_RAISE, KC_SPC) +#define KC_LWSP LT(_LOWER, KC_SPC) +#define KC_RSSP LT(_RAISE, KC_SPC) enum layer_names { _QWERTY, @@ -30,7 +30,7 @@ enum layer_names { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT( //,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------. KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSLS, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT, KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| XXXXXXX,XXXXXXX,KC_LCBR,KC_LBRC,KC_LPRN, KC_RPRN,KC_RBRC,KC_RCBR,KC_UNDS,KC_EQL , // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT, KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ), @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------' KC_BRMD,KC_BRMU,RGB_TOG,RGB_MOD,RGB_VAD, KC_HOME,KC_PGDN,KC_PGUP,KC_END ,XXXXXXX, // `-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------' - KC_LALT,KC_LCMD,KC_LSPC,KC_LSFT, KC_DEL ,KC_RSPC,KC_ENT ,KC_BSPC + KC_LALT,KC_LCMD,KC_LWSP,KC_LSFT, KC_DEL ,KC_RSSP,KC_ENT ,KC_BSPC // `-------+-------+-------+-------' `-------+-------+-------+-------' ) }; diff --git a/keyboards/elephant42/keymaps/via/keymap.c b/keyboards/elephant42/keymaps/via/keymap.c index 32b9dc1fcb..86d28e1930 100644 --- a/keyboards/elephant42/keymaps/via/keymap.c +++ b/keyboards/elephant42/keymaps/via/keymap.c @@ -31,7 +31,7 @@ enum layer_names { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT( //,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------. KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSLS, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| -- cgit v1.2.3