Merge remote-tracking branch 'upstream/develop'

3 files changed, 9 insertions, 8 deletions

diff --git a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
index bb7b627ce4..374152b945 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
-  DEBUG,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  DB_TOGG, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
 /* Lower
@@ -93,11 +93,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(25, 0, 0, 0);
     rgb_matrix_set_color(36, 0, 0, 0);
     rgb_matrix_set_color(42, 0, 0, 0);
+    return false;
 }
 
 void keyboard_pre_init_user(void) {
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
index 41e3062dc2..d1eba4e568 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
-  DEBUG,   _______,  _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+  DB_TOGG, _______,  _______, _______, _______,     _______,      _______, _______, _______, _______, _______
 ),
 
 /* Lower
@@ -93,12 +93,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void)
+bool rgb_matrix_indicators_user(void)
 {
     rgb_matrix_set_color(25, 0, 0, 0);
     rgb_matrix_set_color(30, 0, 0, 0);
     rgb_matrix_set_color(35, 0, 0, 0);
     rgb_matrix_set_color(42, 0, 0, 0);
+    return false;
 }
 
 void keyboard_pre_init_user(void) {
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
index ad357648ac..84624ff032 100755
--- a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
+++ b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
   _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
   _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
-  DEBUG,   _______,  _______, _______,    _______,          _______,       _______, _______, _______, KC_RALT
+  DB_TOGG, _______,  _______, _______,    _______,          _______,       _______, _______, _______, KC_RALT
 ),
 
 /* Lower
@@ -93,12 +93,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void)
-{
+bool rgb_matrix_indicators_user(void) {
     rgb_matrix_set_color(24, 0, 0, 0);
     rgb_matrix_set_color(30, 0, 0, 0);
     rgb_matrix_set_color(35, 0, 0, 0);
     rgb_matrix_set_color(36, 0, 0, 0);
     rgb_matrix_set_color(41, 0, 0, 0);
+    return false;
 }
 #endif