diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default/keymap.c b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c similarity index 78% rename from keyboards/splitkb/halcyon/elora/keymaps/default/keymap.c rename to keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c index d75ac928..bbde0cdb 100644 --- a/keyboards/splitkb/halcyon/elora/keymaps/default/keymap.c +++ b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/keymap.c @@ -49,13 +49,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Adjust| LGUI | LAlt/| Space| Nav | | Sym | Space| AltGr| RGUI | Menu | * | | | Enter| | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | MUTE | ____ | _____ | ____ | ____ | | MUTE | ____ | _____ | ____ | ____ | + * `-----------------------------------' `-----------------------------------' */ - [_QWERTY] = LAYOUT( + [_QWERTY] = LAYOUT_split_4x6_5_hlc( KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_ESC , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y, KC_U , KC_I , KC_O , KC_P , KC_BSPC, CTL_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H, KC_J , KC_K , KC_L ,KC_SCLN,CTL_QUOT, KC_LSFT , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_LBRC,KC_CAPS, FKEYS , KC_RBRC, KC_N, KC_M ,KC_COMM, KC_DOT ,KC_SLSH, KC_RSFT, - ADJUST , KC_LGUI, ALT_ENT, KC_SPC , NAV , SYM , KC_SPC ,KC_RALT, KC_RGUI, KC_APP + ADJUST , KC_LGUI, ALT_ENT, KC_SPC , NAV , SYM , KC_SPC ,KC_RALT, KC_RGUI, KC_APP, + KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO ), /* @@ -73,13 +77,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Adjust| LGUI | LAlt/| Space| Nav | | Sym | Space| AltGr| RGUI | Menu | * | | | Enter| | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | MUTE | ____ | _____ | ____ | ____ | | MUTE | ____ | _____ | ____ | ____ | + * `-----------------------------------' `-----------------------------------' */ - [_DVORAK] = LAYOUT( + [_DVORAK] = LAYOUT_split_4x6_5_hlc( KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_ESC , KC_TAB ,KC_QUOTE,KC_COMM, KC_DOT, KC_P , KC_Y , KC_F, KC_G , KC_C , KC_R , KC_L , KC_BSPC, CTL_ESC , KC_A , KC_O , KC_E , KC_U , KC_I , KC_D, KC_H , KC_T , KC_N , KC_S , CTL_MINS, KC_LSFT ,KC_SCLN, KC_Q , KC_J , KC_K , KC_X , KC_LBRC,KC_CAPS, FKEYS , KC_RBRC, KC_B, KC_M , KC_W , KC_V , KC_Z , KC_RSFT, - ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV , SYM , KC_SPC ,KC_RALT, KC_RGUI, KC_APP + ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV , SYM , KC_SPC ,KC_RALT, KC_RGUI, KC_APP, + KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO ), /* @@ -97,13 +105,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Adjust| LGUI | LAlt/| Space| Nav | | Sym | Space| AltGr| RGUI | Menu | * | | | Enter| | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | MUTE | ____ | _____ | ____ | ____ | | MUTE | ____ | _____ | ____ | ____ | + * `-----------------------------------' `-----------------------------------' */ - [_COLEMAK_DH] = LAYOUT( + [_COLEMAK_DH] = LAYOUT_split_4x6_5_hlc( KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_ESC , KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_B , KC_J, KC_L , KC_U , KC_Y ,KC_SCLN, KC_BSPC, CTL_ESC , KC_A , KC_R , KC_S , KC_T , KC_G , KC_M, KC_N , KC_E , KC_I , KC_O , CTL_QUOT, KC_LSFT , KC_Z , KC_X , KC_C , KC_D , KC_V , KC_LBRC,KC_CAPS, FKEYS , KC_RBRC, KC_K, KC_H ,KC_COMM, KC_DOT ,KC_SLSH, KC_RSFT, - ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV , SYM , KC_SPC ,KC_RALT, KC_RGUI, KC_APP + ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV , SYM , KC_SPC ,KC_RALT, KC_RGUI, KC_APP, + KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO ), /* @@ -121,13 +133,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | | | | | | | | | | | | + * `-----------------------------------' `-----------------------------------' */ - [_NAV] = LAYOUT( + [_NAV] = LAYOUT_split_4x6_5_hlc( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_VOLU, KC_DEL, _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* @@ -145,13 +161,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | | | | | | | | | | | | + * `-----------------------------------' `-----------------------------------' */ - [_SYM] = LAYOUT( + [_SYM] = LAYOUT_split_4x6_5_hlc( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL , KC_TILD , KC_EXLM, KC_AT , KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS, KC_PIPE , KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______, _______, KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT, KC_SLSH, KC_QUES, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* @@ -169,13 +189,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | | | | | | | | | | | | + * `-----------------------------------' `-----------------------------------' */ - [_FUNCTION] = LAYOUT( + [_FUNCTION] = LAYOUT_split_4x6_5_hlc( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F9 , KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , _______, _______, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______, _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* @@ -193,13 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' + * ,-----------------------------------. ,-----------------------------------. + * | | | | | | | | | | | | + * `-----------------------------------' `-----------------------------------' */ - [_ADJUST] = LAYOUT( + [_ADJUST] = LAYOUT_split_4x6_5_hlc( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DVORAK , _______, _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, _______, - _______, _______, _______,_______, _______, _______, _______, _______, _______, _______ + _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), // /* @@ -217,13 +245,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // * | | | | | | | | | | | | // * | | | | | | | | | | | | // * `----------------------------------' `----------------------------------' +// * ,-----------------------------------. ,-----------------------------------. +// * | | | | | | | | | | | | +// * `-----------------------------------' `-----------------------------------' // */ -// [_LAYERINDEX] = LAYOUT( +// [_LAYERINDEX] = LAYOUT_split_4x6_5_hlc( // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ // ), // }; \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default/readme.md b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/readme.md similarity index 100% rename from keyboards/splitkb/halcyon/elora/keymaps/default/readme.md rename to keyboards/splitkb/halcyon/elora/keymaps/default_hlc/readme.md diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk new file mode 100644 index 00000000..70ffc544 --- /dev/null +++ b/keyboards/splitkb/halcyon/elora/keymaps/default_hlc/rules.mk @@ -0,0 +1,2 @@ +# This adds module functionality to your keyboard (files found in users/halcyon_modules) +USER_NAME := halcyon_modules \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial/rules.mk b/keyboards/splitkb/halcyon/elora/keymaps/vial/rules.mk deleted file mode 100644 index 7df278d5..00000000 --- a/keyboards/splitkb/halcyon/elora/keymaps/vial/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes -VIALRGB_ENABLE = yes - -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial/config.h b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/config.h similarity index 100% rename from keyboards/splitkb/halcyon/elora/keymaps/vial/config.h rename to keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/config.h diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial/keymap.json b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json similarity index 99% rename from keyboards/splitkb/halcyon/elora/keymaps/vial/keymap.json rename to keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json index 2a70c9e4..dff72814 100644 --- a/keyboards/splitkb/halcyon/elora/keymaps/vial/keymap.json +++ b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/keymap.json @@ -1,8 +1,8 @@ { "keyboard": "splitkb/halcyon/elora/rev2", - "keymap": "vial-halcyon", + "keymap": "vial-hlc", "version": 1, - "layout": "LAYOUT_hlc", + "layout": "LAYOUT_split_4x6_5_hlc", "layers": [ ["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_ESC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", "MT(MOD_LCTL, KC_ESC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "MT(MOD_RCTL, KC_QUOTE)", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_LBRC", "KC_CAPS", "MO(5)", "KC_RBRC", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(6)", "KC_LGUI", "MT(MOD_LALT, KC_ENT)", "KC_SPC", "MO(3)", "MO(4)", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_APP", "KC_MUTE", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_MUTE", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_ESC", "KC_TAB", "KC_QUOTE", "KC_COMM", "KC_DOT", "KC_P", "KC_Y", "KC_F", "KC_G", "KC_C", "KC_R", "KC_L", "KC_BSPC", "MT(MOD_LCTL, KC_ESC)", "KC_A", "KC_O", "KC_E", "KC_U", "KC_I", "KC_D", "KC_H", "KC_T", "KC_N", "KC_S", "MT(MOD_RCTL, KC_MINUS)", "KC_LSFT", "KC_SCLN", "KC_Q", "KC_J", "KC_K", "KC_X", "KC_LBRC", "KC_CAPS", "MO(5)", "KC_RBRC", "KC_B", "KC_M", "KC_W", "KC_V", "KC_Z", "KC_RSFT", "MO(6)", "KC_LGUI", "MT(MOD_LALT, KC_ENT)", "KC_SPC", "MO(3)", "MO(4)", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_APP", "KC_MUTE", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_MUTE", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/rules.mk b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/rules.mk new file mode 100644 index 00000000..b8636a7a --- /dev/null +++ b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/rules.mk @@ -0,0 +1,8 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes + +ENCODER_MAP_ENABLE = yes + +# This adds module functionality to your keyboard (files found in users/halcyon_modules) +USER_NAME := halcyon_modules \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/elora/keymaps/vial/vial.json b/keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/vial.json similarity index 100% rename from keyboards/splitkb/halcyon/elora/keymaps/vial/vial.json rename to keyboards/splitkb/halcyon/elora/keymaps/vial_hlc/vial.json diff --git a/qmk.json b/qmk.json index 49a7f4c5..886fb669 100644 --- a/qmk.json +++ b/qmk.json @@ -1,69 +1,69 @@ { "userspace_version": "1.1", "build_targets": [ - [ - "splitkb/halcyon/kyria/rev4", - "vial_hlc", - { - "HLC_TFT_DISPLAY": "1", - "TARGET": "halcyon_kyria_rev4_vial_hlc_display" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "vial_hlc", - { - "HLC_ENCODER": "1", - "TARGET": "halcyon_kyria_rev4_vial_hlc_encoder" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "vial_hlc", - { - "HLC_CIRQUE_TRACKPAD": "1", - "TARGET": "halcyon_kyria_rev4_vial_hlc_cirque_trackpad" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "vial_hlc", - { - "HLC_NONE": "1", - "TARGET": "halcyon_kyria_rev4_vial_hlc" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_TFT_DISPLAY": "1", - "TARGET": "halcyon_kyria_rev4_default_hlc_display" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_ENCODER": "1", - "TARGET": "halcyon_kyria_rev4_default_hlc_encoder" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_CIRQUE_TRACKPAD": "1", - "TARGET": "halcyon_kyria_rev4_default_hlc_cirque_trackpad" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_NONE": "1", - "TARGET": "halcyon_kyria_rev4_default_hlc" - } - ] + // [ + // "splitkb/halcyon/elora/rev2", + // "vial_hlc", + // { + // "HLC_TFT_DISPLAY": "1", + // "TARGET": "halcyon_elora_rev2_vial_hlc_display" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "vial_hlc", + // { + // "HLC_ENCODER": "1", + // "TARGET": "halcyon_elora_rev2_vial_hlc_encoder" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "vial_hlc", + // { + // "HLC_CIRQUE_TRACKPAD": "1", + // "TARGET": "halcyon_elora_rev2_vial_hlc_cirque_trackpad" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "vial_hlc", + // { + // "HLC_NONE": "1", + // "TARGET": "halcyon_elora_rev2_vial_hlc" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "default_hlc", + // { + // "HLC_TFT_DISPLAY": "1", + // "TARGET": "halcyon_elora_rev2_default_hlc_display" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "default_hlc", + // { + // "HLC_ENCODER": "1", + // "TARGET": "halcyon_elora_rev2_default_hlc_encoder" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "default_hlc", + // { + // "HLC_CIRQUE_TRACKPAD": "1", + // "TARGET": "halcyon_elora_rev2_default_hlc_cirque_trackpad" + // } + // ], + // [ + // "splitkb/halcyon/elora/rev2", + // "default_hlc", + // { + // "HLC_NONE": "1", + // "TARGET": "halcyon_elora_rev2_default_hlc" + // } + // ] ] } \ No newline at end of file diff --git a/users/halcyon_modules/config.h b/users/halcyon_modules/config.h index 7ed00fd5..2363438d 100644 --- a/users/halcyon_modules/config.h +++ b/users/halcyon_modules/config.h @@ -79,4 +79,28 @@ {k8A, k8B, k8C, k8D, k8E, k8F, KC_NO}, \ {k9A, k9B, k9C, k9D, k9E, KC_NO, KC_NO} \ } +#endif + +// Elora +#if PRODUCT_ID == 0xA392 + #undef ENCODER_A_PINS + #define ENCODER_A_PINS { GP22, HLC_ENCODER_A } + #undef ENCODER_B_PINS + #define ENCODER_B_PINS { GP18, HLC_ENCODER_B } + #undef MATRIX_ROWS + #define MATRIX_ROWS 12 + #define LAYOUT_split_4x6_5_hlc(k0G, k0F, k0E, k0D, k0C, k0B, k6B, k6C, k6D, k6E, k6F, k6G, k1G, k1F, k1E, k1D, k1C, k1B, k7B, k7C, k7D, k7E, k7F, k7G, k2G, k2F, k2E, k2D, k2C, k2B, k8B, k8C, k8D, k8E, k8F, k8G, k3G, k3F, k3E, k3D, k3C, k3B, k4D, k3A, k9A, k10D, k9B, k9C, k9D, k9E, k9F, k9G, k4E, k4C, k4B, k4F, k4A, k10A, k10F, k10B, k10C, k10E, k5A, k5B, k5C, k5D, k5E, k11A, k11B, k11C, k11D, k11E) { \ + {KC_NO, k0B, k0C, k0D, k0E, k0F, k0G}, \ + {KC_NO, k1B, k1C, k1D, k1E, k1F, k1G}, \ + {KC_NO, k2B, k2C, k2D, k2E, k2F, k2G}, \ + {k3A, k3B, k3C, k3D, k3E, k3F, k3G}, \ + {k4A, k4B, k4C, k4D, k4E, k4F, KC_NO}, \ + {k5A, k5B, k5C, k5D, k5E, KC_NO, KC_NO}, \ + {KC_NO, k6B, k6C, k6D, k6E, k6F, k6G}, \ + {KC_NO, k7B, k7C, k7D, k7E, k7F, k7G}, \ + {KC_NO, k8B, k8C, k8D, k8E, k8F, k8G}, \ + {k9A, k9B, k9C, k9D, k9E, k9F, k9G}, \ + {k10A, k10B, k10C, k10D, k10E, k10F, KC_NO}, \ + {k11A, k11B, k11C, k11D, k11E, KC_NO, KC_NO} \ +} #endif \ No newline at end of file diff --git a/users/halcyon_modules/halcyon.c b/users/halcyon_modules/halcyon.c index 8b00e678..d5593378 100644 --- a/users/halcyon_modules/halcyon.c +++ b/users/halcyon_modules/halcyon.c @@ -129,4 +129,46 @@ const matrix_row_t matrix_mask[] = { 0b0011111, }; #endif +#endif + +// Elora +#if PRODUCT_ID == 0xA392 +#ifdef RGB_MATRIX_ENABLE +#include "rgb_matrix.h" +led_config_t g_led_config = { + { + { NO_LED, 31, 32, 33, 34, 35, 36 }, + { NO_LED, 25, 26, 27, 28, 29, 30 }, + { NO_LED, 19, 20, 21, 22, 23, 24 }, + { 11, 13, 14, 15, 16, 17, 18 }, + { 6, 8, 9, 12, 10, 7, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, 68, 69, 70, 71, 72, 73 }, + { NO_LED, 62, 63, 64, 65, 66, 67 }, + { NO_LED, 56, 57, 58, 59, 60, 61 }, + { 48, 50, 51, 52, 53, 54, 55 }, + { 43, 45, 46, 49, 47, 44, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + }, + { {75, 2}, {50, 1}, {14, 4}, {25, 45}, {58, 49}, {94, 53}, {94, 64}, {79, 61}, {65, 55}, {51, 52}, {36, 52}, {101, 52}, {87, 49}, {72, 43}, {58, 40}, {43, 37}, {29, 40}, {14, 46}, {0, 46}, {72, 30}, {58, 27}, {43, 24}, {29, 27}, {14, 34}, {0, 34}, {72, 18}, {58, 15}, {43, 12}, {29, 15}, {14, 21}, {0, 21}, {72, 6}, {48, 3}, {43, 0}, {29, 3}, {14, 9}, {0, 9}, {149, 2}, {174, 1}, {210, 4}, {199, 45}, {166, 49}, {130, 53}, {130, 64}, {145, 61}, {159, 55}, {173, 52}, {188, 52}, {123, 52}, {137, 49}, {152, 43}, {166, 40}, {181, 37}, {195, 40}, {210, 46}, {224, 46}, {152, 30}, {166, 27}, {181, 24}, {195, 27}, {210, 34}, {224, 34}, {152, 18}, {166, 15}, {181, 12}, {195, 15}, {210, 21}, {224, 21}, {152, 6}, {166, 3}, {181, 0}, {195, 3}, {210, 9}, {224, 9} }, + { 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }, +}; +#endif + +#ifdef MATRIX_MASKED +const matrix_row_t matrix_mask[] = { + 0b1111110, + 0b1111110, + 0b1111110, + 0b1111111, + 0b0111111, + 0b0011111, + 0b1111110, + 0b1111110, + 0b1111110, + 0b1111111, + 0b0111111, + 0b0011111, +}; +#endif #endif \ No newline at end of file