Skip to content

Commit 2914268

Browse files
0xcharlynsi-inco
0xcharly
authored and
nsi-inco
committed
Replace EEP_RST with EE_CLR
`EEP_RST` is deprecated and should be replaced with `EE_CLR`. Deprecated in qmk#15968. Fixes qmk#34.
1 parent 3ce047e commit 2914268

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5050
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
5151
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_4, KC_5, KC_6, KC_PMNS,
5252
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
53-
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS,
53+
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS,
5454
// ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
5555
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______
5656
// ╰───────────────────────────╯ ╰──────────────────╯
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
6262
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
6363
KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI,
6464
// ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
65-
KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX,
65+
KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX,
6666
// ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
6767
_______, _______, XXXXXXX, _______, XXXXXXX
6868
// ╰───────────────────────────╯ ╰──────────────────╯

‎keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static uint16_t auto_pointer_layer_timer = 0;
9292
*/
9393
#define LAYOUT_LAYER_FUNCTION \
9494
_______________DEAD_HALF_ROW_______________, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12, \
95-
______________HOME_ROW_GACS_L______________, KC_SCRL, KC_F4, KC_F5, KC_F6, KC_F11, \
95+
______________HOME_ROW_GACS_L______________, KC_SLCK, KC_F4, KC_F5, KC_F6, KC_F11, \
9696
_______________DEAD_HALF_ROW_______________, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10, \
9797
XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX
9898

@@ -105,14 +105,14 @@ static uint16_t auto_pointer_layer_timer = 0;
105105
#define LAYOUT_LAYER_MEDIA \
106106
XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, \
107107
KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, \
108-
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, \
108+
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, \
109109
_______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY
110110

111111
/** \brief Mouse emulation and pointer functions. */
112112
#define LAYOUT_LAYER_POINTER \
113113
XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, \
114114
______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
115-
_______, DRGSCRL, SNIPING, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, SNIPING, DRGSCRL, _______, \
115+
_______, DRGSCRL, SNIPING, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, SNIPING, DRGSCRL, _______, \
116116
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
117117

118118
/**
@@ -125,7 +125,7 @@ static uint16_t auto_pointer_layer_timer = 0;
125125
*/
126126
#define LAYOUT_LAYER_NAVIGATION \
127127
_______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \
128-
______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \
128+
______________HOME_ROW_GACS_L______________, KC_CLCK, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \
129129
_______________DEAD_HALF_ROW_______________, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \
130130
XXXXXXX, _______, XXXXXXX, KC_ENT, KC_BSPC
131131

@@ -236,7 +236,7 @@ void matrix_scan_user(void) {
236236
auto_pointer_layer_timer = 0;
237237
layer_off(LAYER_POINTER);
238238
# ifdef RGB_MATRIX_ENABLE
239-
rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
239+
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
240240
# endif // RGB_MATRIX_ENABLE
241241
}
242242
}
@@ -260,7 +260,7 @@ void shutdown_user(void) {
260260
#ifdef RGBLIGHT_ENABLE
261261
rgblight_enable_noeeprom();
262262
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
263-
rgblight_setrgb(RGB_RED);
263+
rgblight_setrgb_red();
264264
#endif // RGBLIGHT_ENABLE
265265
#ifdef RGB_MATRIX_ENABLE
266266
rgb_matrix_set_color_all(RGB_RED);

‎keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4545
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
4646
XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_4, KC_5, KC_6, KC_PMNS, XXXXXXX,
4747
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
48-
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS, XXXXXXX,
48+
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS, XXXXXXX,
4949
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
5050
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______
5151
// ╰───────────────────────────╯ ╰──────────────────╯
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5757
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
5858
XXXXXXX, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
5959
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
60-
XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
60+
XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
6161
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
6262
_______, _______, XXXXXXX, _______, XXXXXXX
6363
// ╰───────────────────────────╯ ╰──────────────────╯

‎keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
6363
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
6464
XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_4, KC_5, KC_6, KC_PMNS, XXXXXXX,
6565
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
66-
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS, XXXXXXX,
66+
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS, XXXXXXX,
6767
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
6868
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______
6969
// ╰───────────────────────────╯ ╰──────────────────╯
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7575
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
7676
XXXXXXX, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
7777
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
78-
XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
78+
XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
7979
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
8080
_______, _______, XXXXXXX, _______, XXXXXXX
8181
// ╰───────────────────────────╯ ╰──────────────────╯
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8787
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
8888
XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
8989
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
90-
XXXXXXX, _______, DRGSCRL, SNIPING, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, SNIPING, DRGSCRL, _______, XXXXXXX,
90+
XXXXXXX, _______, DRGSCRL, SNIPING, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, SNIPING, DRGSCRL, _______, XXXXXXX,
9191
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
9292
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
9393
// ╰───────────────────────────╯ ╰──────────────────╯
@@ -116,7 +116,7 @@ void matrix_scan_user(void) {
116116
auto_pointer_layer_timer = 0;
117117
layer_off(LAYER_POINTER);
118118
# ifdef RGB_MATRIX_ENABLE
119-
rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE);
119+
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
120120
# endif // RGB_MATRIX_ENABLE
121121
}
122122
}
@@ -139,7 +139,7 @@ void shutdown_user(void) {
139139
#ifdef RGBLIGHT_ENABLE
140140
rgblight_enable_noeeprom();
141141
rgblight_mode_noeeprom(1);
142-
rgblight_setrgb(RGB_RED);
142+
rgblight_setrgb_red();
143143
#endif // RGBLIGHT_ENABLE
144144
#ifdef RGB_MATRIX_ENABLE
145145
rgb_matrix_set_color_all(RGB_RED);

‎keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5050
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
5151
RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL,
5252
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
53-
RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
53+
RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
5454
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
5555
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______,
5656
XXXXXXX, XXXXXXX, KC_P0
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
6565
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
6666
KC_MPLY, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
6767
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
68-
KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
68+
KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
6969
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
7070
_______, _______, XXXXXXX, _______, XXXXXXX,
7171
_______, _______, XXXXXXX

0 commit comments

Comments
 (0)