diff options
| author | QMK Bot <hello@qmk.fm> | 2022-01-23 20:38:05 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-01-23 20:38:05 +0000 |
| commit | 0f53e1333fc2f136fb64b6f286d19f8963a46fe4 (patch) | |
| tree | 6135b7109a009ffcc5be41c3b3553d23b3c82c0d /keyboards | |
| parent | 8776b4b08891b1aea88af5bc280296e5dec41712 (diff) | |
| parent | c30bdcbca8afe1d8d005843acec075f921813d44 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
3 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c index d8f581df6e..8b51920b81 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c @@ -22,7 +22,7 @@ led_config_t g_led_config = { { { 15, NO_LED, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, { 30, NO_LED, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43 }, { NO_LED, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, NO_LED, 55, 56, 57 }, - { 58, 59, NO_LED, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 64, 62, 63, 65, 66, 67 } + { 58, 59, NO_LED, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 } }, { // Key matrix (0 -> 67) {0 , 0}, {15 , 0}, {30 , 0}, {45 , 0}, {60 , 0}, {75 , 0}, {90 , 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {202, 0}, {224, 0}, diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c index b110cf8546..48416c84c9 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -void keyboard_post_init_kb(void) { +void keyboard_post_init_user(void) { user_config.raw = eeconfig_read_user(); switch (user_config.rgb_mode) { case RGB_MODE_ALL: diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c index b110cf8546..48416c84c9 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -void keyboard_post_init_kb(void) { +void keyboard_post_init_user(void) { user_config.raw = eeconfig_read_user(); switch (user_config.rgb_mode) { case RGB_MODE_ALL: |