From 48bcafebd009cf5d71062a657deecac19c5ebac3 Mon Sep 17 00:00:00 2001 From: Drew Whitney Date: Sun, 11 Jan 2026 18:29:05 -0700 Subject: [PATCH] Updated the keymap for the new repaired PCB --- flash.sh | 4 +- keyboards/keebio/iris_lm/keymaps/drew/alias.h | 3 +- .../iris_lm/keymaps/drew/combos/combos.c | 108 +++++++++--------- .../keebio/iris_lm/keymaps/drew/config.h | 8 +- .../keebio/iris_lm/keymaps/drew/keymap.c | 30 ++--- 5 files changed, 76 insertions(+), 77 deletions(-) diff --git a/flash.sh b/flash.sh index 114f642d..c9c59891 100755 --- a/flash.sh +++ b/flash.sh @@ -1,2 +1,2 @@ -# qmk flash -kb keebio/iris_lm/g1 -km drew -j 0 -qmk flash -kb keebio/nyquist/rev4 -km drew -j 0 +qmk flash -kb keebio/iris_lm/g1 -km drew -j 0 +# qmk flash -kb keebio/nyquist/rev4 -km drew -j 0 diff --git a/keyboards/keebio/iris_lm/keymaps/drew/alias.h b/keyboards/keebio/iris_lm/keymaps/drew/alias.h index 53f4f0d1..1134823d 100644 --- a/keyboards/keebio/iris_lm/keymaps/drew/alias.h +++ b/keyboards/keebio/iris_lm/keymaps/drew/alias.h @@ -24,8 +24,7 @@ enum CustomKeycodes { #define SYM_BSPC LT(_SYM, KC_BSPC) #define NAV_TAB LT(_NAV, KC_TAB) #define ARROW MO(_SH_ARROW) -#define FN_SPC LT(_FUNC, KC_SPC) -#define FUNC MO(_FUNC) +#define FN_ESC LT(_FUNC, KC_ESC) // trigger mods #define OBLITERATE_TRIGGER_MODS MOD_MASK_GUI diff --git a/keyboards/keebio/iris_lm/keymaps/drew/combos/combos.c b/keyboards/keebio/iris_lm/keymaps/drew/combos/combos.c index b2307206..2347ab68 100644 --- a/keyboards/keebio/iris_lm/keymaps/drew/combos/combos.c +++ b/keyboards/keebio/iris_lm/keymaps/drew/combos/combos.c @@ -2,63 +2,63 @@ #include "../alias.h" #include "../layers/layers.h" -uint16_t get_combo_term(uint16_t combo_index, combo_t* combo) { - switch (combo_index) { - case NumCombo: - return 150; // make a larger window for triggering the combo - break; - } - return COMBO_TERM; -} +// uint16_t get_combo_term(uint16_t combo_index, combo_t* combo) { +// switch (combo_index) { +// case NumCombo: +// return 150; // make a larger window for triggering the combo +// break; +// } +// return COMBO_TERM; +// } // necessary to make sure the layers are turned off for the NUM layer combo, since the original // layer keys are consumed by the combo activation -bool process_combo_key_release( - uint16_t combo_index, combo_t* combo, uint8_t key_index, uint16_t keycode -) { - switch (combo_index) { - case NumCombo: - // whenever one of the layer keys is released, turn off that layer (this will - // automatically turn off the NUM layer because of the layer_state_set_user() callback) - switch (keycode) { - case SYM_BSPC: - layer_off(_SYM); - break; - case NAV_TAB: - layer_off(_NAV); - break; - } - break; - } - return false; -} +// bool process_combo_key_release( +// uint16_t combo_index, combo_t* combo, uint8_t key_index, uint16_t keycode +// ) { +// switch (combo_index) { +// case NumCombo: +// // whenever one of the layer keys is released, turn off that layer (this will +// // automatically turn off the NUM layer because of the layer_state_set_user() callback) +// switch (keycode) { +// case SYM_BSPC: +// layer_off(_SYM); +// break; +// case NAV_TAB: +// layer_off(_NAV); +// break; +// } +// break; +// } +// return false; +// } // necessary for the NUM layer combo, since it shouldn't trigger on a tap -bool get_combo_must_hold(uint16_t combo_index, combo_t* combo) { - switch (combo_index) { - case NumCombo: // make the NUM layer combo hold-only - return true; - break; - } - return false; -} +// bool get_combo_must_hold(uint16_t combo_index, combo_t* combo) { +// switch (combo_index) { +// case NumCombo: // make the NUM layer combo hold-only +// return true; +// break; +// } +// return false; +// } -bool process_combo_key_repress( - uint16_t combo_index, combo_t* combo, uint8_t key_index, uint16_t keycode -) { - switch (combo_index) { - case WinSwapCombo: - // implement the tab left and tab right part of alt-tab - switch (keycode) { - case TAB_LEFT: - tap_code16(S(KC_TAB)); - break; - case TAB_RIGHT: - tap_code(KC_TAB); - break; - } - return true; - break; - } - return false; -} \ No newline at end of file +// bool process_combo_key_repress( +// uint16_t combo_index, combo_t* combo, uint8_t key_index, uint16_t keycode +// ) { +// switch (combo_index) { +// case WinSwapCombo: +// // implement the tab left and tab right part of alt-tab +// switch (keycode) { +// case TAB_LEFT: +// tap_code16(S(KC_TAB)); +// break; +// case TAB_RIGHT: +// tap_code(KC_TAB); +// break; +// } +// return true; +// break; +// } +// return false; +// } \ No newline at end of file diff --git a/keyboards/keebio/iris_lm/keymaps/drew/config.h b/keyboards/keebio/iris_lm/keymaps/drew/config.h index e8a8f428..ba5c6082 100644 --- a/keyboards/keebio/iris_lm/keymaps/drew/config.h +++ b/keyboards/keebio/iris_lm/keymaps/drew/config.h @@ -9,10 +9,10 @@ // #define PERMISSIVE_HOLD_PER_KEY // combos -#define COMBO_PROCESS_KEY_RELEASE -#define COMBO_PROCESS_KEY_REPRESS -#define COMBO_TERM_PER_COMBO -#define COMBO_MUST_HOLD_PER_COMBO +// #define COMBO_PROCESS_KEY_RELEASE +// #define COMBO_PROCESS_KEY_REPRESS +// #define COMBO_TERM_PER_COMBO +// #define COMBO_MUST_HOLD_PER_COMBO #define CAPS_WORD_IDLE_TIMEOUT 0 diff --git a/keyboards/keebio/iris_lm/keymaps/drew/keymap.c b/keyboards/keebio/iris_lm/keymaps/drew/keymap.c index d4c03d22..2f933f89 100644 --- a/keyboards/keebio/iris_lm/keymaps/drew/keymap.c +++ b/keyboards/keebio/iris_lm/keymaps/drew/keymap.c @@ -17,9 +17,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ KC_NO, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_NO, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┐ ┌───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_NO, KC_Z, KC_X, KC_C, KC_D, KC_V, TD_CLS, KC_NO, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_NO, + KC_NO, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_NO, KC_NO, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_NO, //└───────────┴───────────┴───────────┴─────┬─────┴─────┬─────┴─────┬─────┴────┬──────┘ └─────┬─────┴─────┬─────┴─────┬─────┴─────┬─────┴───────────┴───────────┴───────────┘ - KC_NO, NAV_TAB, KC_SPC, OS_LSFT, SYM_BSPC, KC_NO + FN_ESC, NAV_TAB, KC_SPC, OS_LSFT, SYM_BSPC, ARROW // └───────────┴───────────┴──────────┘ └───────────┴───────────┴───────────┘ ), @@ -27,13 +27,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌───────────┬───────────┬───────────┬───────────┬───────────┬───────────┐ ┌───────────┬───────────┬───────────┬───────────┬───────────┬───────────┐ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_J, KC_L, KC_UP, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┐ ┌───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TD_CLS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, //└───────────┴───────────┴───────────┴─────┬─────┴─────┬─────┴─────┬─────┴────┬──────┘ └─────┬─────┴─────┬─────┴─────┬─────┴─────┬─────┴───────────┴───────────┴───────────┘ - KC_NO, KC_TRNS, KC_TRNS, OS_LSFT, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // └───────────┴───────────┴──────────┘ └───────────┴───────────┴───────────┘ ), @@ -41,13 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌───────────┬───────────┬───────────┬───────────┬───────────┬───────────┐ ┌───────────┬───────────┬───────────┬───────────┬───────────┬───────────┐ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_GRV, KC_TRNS, + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_TILD, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ KC_TRNS, KC_PIPE, KC_PLUS, KC_UNDS, KC_MINS, KC_EQL, KC_DQUO, OS_LSFT, OS_LCTL, OS_LALT, OS_LGUI, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┐ ┌───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_BSLS, TD_CLS, KC_TRNS, KC_SCLN, KC_COLN, KC_LCBR, KC_RCBR, KC_TILD, KC_TRNS, + KC_TRNS, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_BSLS, KC_TRNS, KC_TRNS, KC_SCLN, KC_COLN, KC_LCBR, KC_RCBR, KC_GRV, KC_TRNS, //└───────────┴───────────┴───────────┴─────┬─────┴─────┬─────┴─────┬─────┴────┬──────┘ └─────┬─────┴─────┬─────┴─────┬─────┴─────┬─────┴───────────┴───────────┴───────────┘ - KC_NO, KC_TRNS, KC_TRNS, ARROW, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // └───────────┴───────────┴──────────┘ └───────────┴───────────┴───────────┘ ), @@ -55,13 +55,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌───────────┬───────────┬───────────┬───────────┬───────────┬───────────┐ ┌───────────┬───────────┬───────────┬───────────┬───────────┬───────────┐ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_ESC, C(KC_Y), TAB_LEFT, TAB_RIGHT, LAUNCH, COMPOSE, KC_HOME, KC_UP, KC_END, KC_DEL, KC_TRNS, + KC_TRNS, KC_ESC, C(KC_Y), TAB_LEFT, TAB_RIGHT, LAUNCH, COMPOSE, KC_HOME, KC_UP, KC_END, KC_DEL, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ KC_TRNS, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, KC_F2, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┐ ┌───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, C(KC_Z), C(KC_X), C(KC_C), KC_SPC, C(KC_V), TD_CLS, KC_TRNS, KC_NO, CW_TOGG, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, + KC_TRNS, C(KC_Z), C(KC_X), C(KC_C), KC_SPC, C(KC_V), KC_TRNS, KC_TRNS, KC_NO, CW_TOGG, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, //└───────────┴───────────┴───────────┴─────┬─────┴─────┬─────┴─────┬─────┴────┬──────┘ └─────┬─────┴─────┬─────┴─────┬─────┴─────┬─────┴───────────┴───────────┴───────────┘ - KC_NO, KC_TRNS, FN_SPC, OS_LSFT, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // └───────────┴───────────┴──────────┘ └───────────┴───────────┴───────────┘ ), @@ -73,9 +73,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┐ ┌───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_LPRN, KC_RPRN, KC_NO, KC_SPC, KC_NO, KC_DOT, KC_TRNS, KC_SCLN, KC_COLN, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, + KC_TRNS, KC_LPRN, KC_RPRN, KC_NO, KC_SPC, KC_NO, KC_TRNS, KC_TRNS, KC_SCLN, KC_COLN, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, //└───────────┴───────────┴───────────┴─────┬─────┴─────┬─────┴─────┬─────┴────┬──────┘ └─────┬─────┴─────┬─────┴─────┬─────┴─────┬─────┴───────────┴───────────┴───────────┘ - KC_NO, KC_TRNS, KC_TRNS, OS_LSFT, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // └───────────┴───────────┴──────────┘ └───────────┴───────────┴───────────┘ ), @@ -87,9 +87,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ ├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ KC_TRNS, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, CAD, KC_F5, KC_F6, KC_F7, KC_F8, KC_TRNS, //├───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┐ ┌───────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────┤ - KC_TRNS, KC_BRID, KC_BRIU, KC_WBAK, KC_WFWD, KC_MUTE, TD_CLS, KC_TRNS, KC_SLEP, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, + KC_TRNS, KC_BRID, KC_BRIU, KC_WBAK, KC_WFWD, KC_MUTE, KC_TRNS, KC_TRNS, KC_SLEP, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, //└───────────┴───────────┴───────────┴─────┬─────┴─────┬─────┴─────┬─────┴────┬──────┘ └─────┬─────┴─────┬─────┴─────┬─────┴─────┬─────┴───────────┴───────────┴───────────┘ - KC_NO, KC_TRNS, KC_TRNS, OS_LSFT, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // └───────────┴───────────┴──────────┘ └───────────┴───────────┴───────────┘ ),