From a8f9cb37a4129a57aae8d1070f50708fd727e2de Mon Sep 17 00:00:00 2001 From: Raphael Mor Date: Tue, 10 Jun 2025 19:06:08 +0200 Subject: [PATCH] Added the missing four keys of corne --- .../standard/keymaps/raphaelmor/keymap.c | 10 ++++---- users/raphaelmor/layers/CMK-defs.h | 4 ++++ users/raphaelmor/layers/FUN-defs.h | 5 ++++ users/raphaelmor/layers/HDG-defs.h | 24 ++++++++++++------- users/raphaelmor/layers/MED-defs.h | 4 ++++ users/raphaelmor/layers/MOS-defs.h | 4 ++++ users/raphaelmor/layers/NAV-defs.h | 4 ++++ users/raphaelmor/layers/NUM-defs.h | 6 +++++ users/raphaelmor/layers/SYM-defs.h | 4 ++++ users/raphaelmor/raphaelmor.c | 8 +++---- 10 files changed, 54 insertions(+), 19 deletions(-) diff --git a/keyboards/crkbd/rev4_1/standard/keymaps/raphaelmor/keymap.c b/keyboards/crkbd/rev4_1/standard/keymaps/raphaelmor/keymap.c index 0e0b1d3e..700a96ba 100644 --- a/keyboards/crkbd/rev4_1/standard/keymaps/raphaelmor/keymap.c +++ b/keyboards/crkbd/rev4_1/standard/keymaps/raphaelmor/keymap.c @@ -47,11 +47,11 @@ along with this program. If not, see . // } // const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -#define RAMO_DO(LAYER, STR) [L_##LAYER] = LAYOUT_split_3x6_3( \ - STR##_LT5 , STR##_LT4 , STR##_LT3 , STR##_LT2 , STR##_LT1 , STR##_LT0 , STR##_RT0 , STR##_RT1 , STR##_RT2 , STR##_RT3 , STR##_RT4 , STR##_RT5 , \ - STR##_LM5 , STR##_LM4 , STR##_LM3 , STR##_LM2 , STR##_LM1 , STR##_LM0 , STR##_RM0 , STR##_RM1 , STR##_RM2 , STR##_RM3 , STR##_RM4 , STR##_RM5 , \ - STR##_LB5 , STR##_LB4 , STR##_LB3 , STR##_LB2 , STR##_LB1 , STR##_LB0 , STR##_RB0 , STR##_RB1 , STR##_RB2 , STR##_RB3 , STR##_RB4 , STR##_RB5 , \ - STR##_LH2 , STR##_LH1 , STR##_LH0 , STR##_RH0 , STR##_RH1 , STR##_RH2 \ +#define RAMO_DO(LAYER, STR) [L_##LAYER] = LAYOUT_split_3x6_3_ex2( \ + STR##_LT5 , STR##_LT4 , STR##_LT3 , STR##_LT2 , STR##_LT1 , STR##_LT0 , STR##_LTA , STR##_RTA , STR##_RT0 , STR##_RT1 , STR##_RT2 , STR##_RT3 , STR##_RT4 , STR##_RT5 , \ + STR##_LM5 , STR##_LM4 , STR##_LM3 , STR##_LM2 , STR##_LM1 , STR##_LM0 , STR##_LMA , STR##_RMA , STR##_RM0 , STR##_RM1 , STR##_RM2 , STR##_RM3 , STR##_RM4 , STR##_RM5 , \ + STR##_LB5 , STR##_LB4 , STR##_LB3 , STR##_LB2 , STR##_LB1 , STR##_LB0 , STR##_RB0 , STR##_RB1 , STR##_RB2 , STR##_RB3 , STR##_RB4 , STR##_RB5 , \ + STR##_LH2 , STR##_LH1 , STR##_LH0 , STR##_RH0 , STR##_RH1 , STR##_RH2 \ ), RAMO_FOR_EACH_LAYER #undef RAMO_DO diff --git a/users/raphaelmor/layers/CMK-defs.h b/users/raphaelmor/layers/CMK-defs.h index d26c7774..8c92eb4a 100644 --- a/users/raphaelmor/layers/CMK-defs.h +++ b/users/raphaelmor/layers/CMK-defs.h @@ -77,7 +77,9 @@ #define CMK_LT2 CMK_F #define CMK_LT1 CMK_P #define CMK_LT0 CMK_G +#define CMK_LTA CMK_A // TODO: should be a real key once a use is found +#define CMK_RTA CMK_A // TODO: should be a real key once a use is found #define CMK_RT0 CMK_J #define CMK_RT1 CMK_L #define CMK_RT2 CMK_U @@ -91,7 +93,9 @@ #define CMK_LM2 CMK_S #define CMK_LM1 CMK_T #define CMK_LM0 CMK_D +#define CMK_LMA CMK_A // TODO: should be a real key once a use is found +#define CMK_RMA CMK_A // TODO: should be a real key once a use is found #define CMK_RM0 CMK_H #define CMK_RM1 CMK_N #define CMK_RM2 CMK_E diff --git a/users/raphaelmor/layers/FUN-defs.h b/users/raphaelmor/layers/FUN-defs.h index 0df1d264..16cac762 100644 --- a/users/raphaelmor/layers/FUN-defs.h +++ b/users/raphaelmor/layers/FUN-defs.h @@ -23,7 +23,9 @@ #define FUN_LT2 KC_F8 #define FUN_LT1 KC_F9 #define FUN_LT0 KC_PSCR +#define FUN_LTA KC_NO // TODO: should be a real key once a use is found +#define FUN_RTA KC_NO // TODO: should be a real key once a use is found #define FUN_RT0 FUN_NO #define FUN_RT1 FUN_NO #define FUN_RT2 FUN_NO @@ -37,6 +39,9 @@ #define FUN_LM2 KC_F5 #define FUN_LM1 KC_F6 #define FUN_LM0 KC_SCRL +#define FUN_LMA KC_NO // TODO: should be a real key once a use is found + +#define FUN_RMA KC_NO // TODO: should be a real key once a use is found #define FUN_RM0 FUN_NO #define FUN_RM1 KC_RSFT #define FUN_RM2 KC_RGUI diff --git a/users/raphaelmor/layers/HDG-defs.h b/users/raphaelmor/layers/HDG-defs.h index 6591556a..6229a1b9 100644 --- a/users/raphaelmor/layers/HDG-defs.h +++ b/users/raphaelmor/layers/HDG-defs.h @@ -39,12 +39,12 @@ #define HDG_MINS KC_MINS #define HDG_MEH KC_MEH -#define HDG_TAB KC_TAB +#define HDG_TAB LT(L_NAV,KC_TAB) #define HDG_ESC LT(L_MEDIA, KC_ESC) -#define HDG_SPC LT(L_NAV,KC_SPC) -#define HDG_ENT LT(L_SYM,KC_ENT) -#define HDG_BSPC LT(L_NUM,KC_BSPC) -#define HDG_DEL LT(L_FUN,KC_DEL) +#define HDG_SPC LT(L_SYM,KC_SPC) +#define HDG_ENT LT(L_NUM,KC_ENT) +#define HDG_BSPC LT(L_FUN,KC_BSPC) +#define HDG_DEL KC_DEL // Now let's place these HD keycodes on the keymap // for variation independent spatial referencing by key position @@ -74,6 +74,9 @@ #define HDG_LT2 HDG_M #define HDG_LT1 HDG_P #define HDG_LT0 HDG_V +#define HDG_LTA KC_NO // TODO: should be a real key once a use is found + +#define HDG_RTA KC_NO // TODO: should be a real key once a use is found #define HDG_RT0 HDG_SCLN #define HDG_RT1 HDG_DOT #define HDG_RT2 HDG_SLSH @@ -88,6 +91,9 @@ #define HDG_LM2 HDG_N #define HDG_LM1 HDG_D #define HDG_LM0 HDG_B +#define HDG_LMA KC_NO // TODO: should be a real key once a use is found + +#define HDG_RMA KC_NO // TODO: should be a real key once a use is found #define HDG_RM0 HDG_COMM #define HDG_RM1 HDG_A #define HDG_RM2 HDG_E @@ -110,8 +116,8 @@ //Primary Thumbs 1-3 (others are unique to the board) #define HDG_LH2 HDG_ESC -#define HDG_LH1 HDG_SPC +#define HDG_LH1 HDG_TAB #define HDG_LH0 HDG_T -#define HDG_RH0 HDG_ENT -#define HDG_RH1 HDG_BSPC -#define HDG_RH2 HDG_DEL +#define HDG_RH0 HDG_SPC +#define HDG_RH1 HDG_ENT +#define HDG_RH2 HDG_BSPC diff --git a/users/raphaelmor/layers/MED-defs.h b/users/raphaelmor/layers/MED-defs.h index 95e30a6a..81dea3d8 100644 --- a/users/raphaelmor/layers/MED-defs.h +++ b/users/raphaelmor/layers/MED-defs.h @@ -23,7 +23,9 @@ #define MED_LT2 MED_NO #define MED_LT1 MED_NO #define MED_LT0 MED_NO +#define MED_LTA KC_NO // TODO: should be a real key once a use is found +#define MED_RTA KC_NO // TODO: should be a real key once a use is found #define MED_RT0 RGB_TOG #define MED_RT1 RGB_MOD #define MED_RT2 RGB_HUI @@ -37,7 +39,9 @@ #define MED_LM2 KC_LGUI #define MED_LM1 KC_LSFT #define MED_LM0 NAV_NO +#define MED_LMA KC_NO // TODO: should be a real key once a use is found +#define MED_RMA KC_NO // TODO: should be a real key once a use is found #define MED_RM0 MED_NO #define MED_RM1 MED_NO #define MED_RM2 KC_MPRV diff --git a/users/raphaelmor/layers/MOS-defs.h b/users/raphaelmor/layers/MOS-defs.h index 8617c024..0ced259d 100644 --- a/users/raphaelmor/layers/MOS-defs.h +++ b/users/raphaelmor/layers/MOS-defs.h @@ -22,7 +22,9 @@ #define MOS_LT2 NAV_NO #define MOS_LT1 NAV_NO #define MOS_LT0 NAV_NO +#define MOS_LTA KC_NO // TODO: should be a real key once a use is found +#define MOS_RTA KC_NO // TODO: should be a real key once a use is found #define MOS_RT0 SCMD(KC_Z) #define MOS_RT1 LCMD(KC_V) #define MOS_RT2 LCMD(KC_C) @@ -36,7 +38,9 @@ #define MOS_LM2 KC_LGUI #define MOS_LM1 KC_LSFT #define MOS_LM0 NAV_NO +#define MOS_LMA KC_NO // TODO: should be a real key once a use is found +#define MOS_RMA KC_NO // TODO: should be a real key once a use is found #define MOS_RM0 MOS_NO #define MOS_RM1 KC_MS_L #define MOS_RM2 KC_MS_D diff --git a/users/raphaelmor/layers/NAV-defs.h b/users/raphaelmor/layers/NAV-defs.h index 6fad346e..db6bcd75 100644 --- a/users/raphaelmor/layers/NAV-defs.h +++ b/users/raphaelmor/layers/NAV-defs.h @@ -23,7 +23,9 @@ #define NAV_LT2 TD(RAMO_TD_CMK) #define NAV_LT1 TD(RAMO_TD_HDG) #define NAV_LT0 NAV_NO +#define NAV_LTA KC_NO // TODO: should be a real key once a use is found +#define NAV_RTA KC_NO // TODO: should be a real key once a use is found #define NAV_RT0 SCMD(KC_Z) #define NAV_RT1 LCMD(KC_V) #define NAV_RT2 LCMD(KC_C) @@ -37,7 +39,9 @@ #define NAV_LM2 KC_LGUI #define NAV_LM1 KC_LSFT #define NAV_LM0 NAV_NO +#define NAV_LMA KC_NO // TODO: should be a real key once a use is found +#define NAV_RMA KC_NO // TODO: should be a real key once a use is found #define NAV_RM0 CW_TOGG #define NAV_RM1 KC_LEFT #define NAV_RM2 KC_DOWN diff --git a/users/raphaelmor/layers/NUM-defs.h b/users/raphaelmor/layers/NUM-defs.h index 02172b4d..eade1d4f 100644 --- a/users/raphaelmor/layers/NUM-defs.h +++ b/users/raphaelmor/layers/NUM-defs.h @@ -23,6 +23,9 @@ #define NUM_LT2 KC_8 #define NUM_LT1 KC_9 #define NUM_LT0 KC_RBRC +#define NUM_LTA KC_NO // TODO: should be a real key once a use is found + +#define NUM_RTA KC_NO // TODO: should be a real key once a use is found #define NUM_RT0 NUM_NO #define NUM_RT1 NUM_NO #define NUM_RT2 NUM_NO @@ -36,6 +39,9 @@ #define NUM_LM2 KC_5 #define NUM_LM1 KC_6 #define NUM_LM0 KC_EQL +#define NUM_LMA KC_NO // TODO: should be a real key once a use is found + +#define NUM_RMA KC_NO // TODO: should be a real key once a use is found #define NUM_RM0 NUM_NO #define NUM_RM1 KC_RSFT #define NUM_RM2 KC_RGUI diff --git a/users/raphaelmor/layers/SYM-defs.h b/users/raphaelmor/layers/SYM-defs.h index db08cb80..3c91634c 100644 --- a/users/raphaelmor/layers/SYM-defs.h +++ b/users/raphaelmor/layers/SYM-defs.h @@ -23,7 +23,9 @@ #define SYM_LT2 KC_ASTR #define SYM_LT1 KC_LPRN #define SYM_LT0 KC_RCBR +#define SYM_LTA KC_NO // TODO: should be a real key once a use is found +#define SYM_RTA KC_NO // TODO: should be a real key once a use is found #define SYM_RT0 SYM_NO #define SYM_RT1 SYM_NO #define SYM_RT2 SYM_NO @@ -37,7 +39,9 @@ #define SYM_LM2 KC_PERC #define SYM_LM1 KC_CIRC #define SYM_LM0 KC_PLUS +#define SYM_LMA KC_NO // TODO: should be a real key once a use is found +#define SYM_RMA KC_NO // TODO: should be a real key once a use is found #define SYM_RM0 SYM_NO #define SYM_RM1 KC_RSFT #define SYM_RM2 KC_RGUI diff --git a/users/raphaelmor/raphaelmor.c b/users/raphaelmor/raphaelmor.c index fa60ef95..7c72ce4a 100644 --- a/users/raphaelmor/raphaelmor.c +++ b/users/raphaelmor/raphaelmor.c @@ -31,15 +31,13 @@ void keyboard_post_init_user(void) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool return_state = true; - uint8_t saved_mods; - - saved_mods = get_mods(); + // uint8_t saved_mods; + // saved_mods = get_mods(); if (record->event.pressed == true) { println("ramo: key pressed"); } else { println("ramo: key released"); } - - return true; + return return_state; }