Merge remote-tracking branch 'upstream/develop'

11 files changed, 38 insertions, 52 deletions

diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index d7d7faadd2..1cb88fb39f 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -13,13 +13,13 @@
         "extrakey": true,
         "mousekey": false,
         "nkro": false,
-        "unicode": false,
+        "unicode": false
     },
     "split": {
-        "enabled": true,
+        "enabled": true
     },
     "build": {
-        "lto": true,
+        "lto": true
     },
     "layouts": {
         "LAYOUT_75": {
diff --git a/keyboards/keebio/sinc/keymaps/default/keymap.c b/keyboards/keebio/sinc/keymaps/default/keymap.c
index 060bf5dc6c..20c12a4a6e 100644
--- a/keyboards/keebio/sinc/keymaps/default/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/default/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_80_with_macro(
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_HUI, RGB_HUD, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+    RGB_HUI, RGB_HUD, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
     RGB_SAI, RGB_SAD, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_VAI, RGB_VAD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/sinc/keymaps/iso/keymap.c b/keyboards/keebio/sinc/keymaps/iso/keymap.c
index dde99bbeb1..f7ad1047bf 100644
--- a/keyboards/keebio/sinc/keymaps/iso/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/iso/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_80_iso_with_macro(
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_HUI, RGB_HUD, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+    RGB_HUI, RGB_HUD, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
     RGB_SAI, RGB_SAD, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     RGB_VAI, RGB_VAD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
index 258e7d0128..e6d5291ae7 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
@@ -32,7 +32,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_80_with_macro(
-    KC_MUTE,          KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DEC,  BL_INC,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_MPLY,
+    KC_MUTE,          KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_MPLY,
     KC_F1,   KC_F2,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
     KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
     KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
diff --git a/keyboards/keebio/sinc/keymaps/sethBarberee/config.h b/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
index 2d66aefc3e..343567273d 100644
--- a/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
+++ b/keyboards/keebio/sinc/keymaps/sethBarberee/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-//
-//#define USE_SERIAL
-//#define USE_I2C
-
 //#ifdef RGBLIGHT_ENABLE
 //#   ifdef NORMAL_MODE
 //#       undef NORMAL_MODE
diff --git a/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c b/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c
index c0137a36ab..2bd560c199 100644
--- a/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/sethBarberee/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_80_with_macro_wrapper(
     RGB_TOG,          _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
-    RGB_HUI, RGB_HUD, KC_GESC, _________________FUNC_LEFT_________________,           _________________FUNC_RIGHT________________,  KC_F11,  KC_F12,  _______, _______, KC_MPRV,
+    RGB_HUI, RGB_HUD, QK_GESC, _________________FUNC_LEFT_________________,           _________________FUNC_RIGHT________________,  KC_F11,  KC_F12,  _______, _______, KC_MPRV,
     RGB_SAI, RGB_SAD, RGB_TOG, _______, _______, _______, _______, KC_LPRN,           KC_RPRN, _______, _______, _______, _______, _______, _______, _______, KC_MNXT,
     RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_LCBR,           KC_RCBR, _______, _______, _______, _______, _______,          _______, KC_VOLU,
     RGB_MOD, RGB_RMOD, _______, _______, _______, _______, _______, KC_LBRC,          KC_RBRC, _______, _______, _______, _______, _______, _______, KC_VOLD,
diff --git a/keyboards/keebio/sinc/keymaps/via/keymap.c b/keyboards/keebio/sinc/keymaps/via/keymap.c
index 946f88ee27..8101c82bfb 100644
--- a/keyboards/keebio/sinc/keymaps/via/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_all(
     _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_HUI, RGB_HUD, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+    RGB_HUI, RGB_HUD, QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
     RGB_SAI, RGB_SAD, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     RGB_VAI, RGB_VAD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 7e43746bfd..2f5ec5429a 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -10,7 +10,7 @@
     "diode_direction": "COL2ROW",
     "features": {
         "rgblight": true,
-        "backlight": true,
+        "backlight": true
     },
     "indicators": {
         "caps_lock": "B6"
@@ -24,29 +24,29 @@
         "encoder": {
             "right": {
                 "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4" },
-                ],
-            },
+                    {"pin_a": "D6", "pin_b": "D4" }
+                ]
+            }
         },
         "matrix_pins": {
             "right":{
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"],
-            },
-        },
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+            }
+        }
     },
     "matrix_pins": {
         "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
     },
     "encoder": {
         "enabled": true,
         "rotary": [
-            {"pin_a": "F5", "pin_b": "F6" },
-        ],
+            {"pin_a": "F5", "pin_b": "F6" }
+        ]
     },
     "backlight":{
-        "pin": "B5",
+        "pin": "B5"
     },
     "rgblight": {
         "pin": "E6",
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 72a3555351..107703d583 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -10,7 +10,7 @@
     "diode_direction": "COL2ROW",
     "features": {
         "rgblight": true,
-        "backlight": true,
+        "backlight": true
     },
     "indicators": {
         "caps_lock": "B6"
@@ -24,29 +24,29 @@
         "encoder": {
             "right": {
                 "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4" },
-                ],
-            },
+                    {"pin_a": "D6", "pin_b": "D4" }
+                ]
+            }
         },
         "matrix_pins": {
             "right":{
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"],
-            },
-        },
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+            }
+        }
     },
     "matrix_pins": {
         "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
     },
     "encoder": {
         "enabled": true,
         "rotary": [
-            {"pin_a": "F5", "pin_b": "F6" },
-        ],
+            {"pin_a": "F5", "pin_b": "F6" }
+        ]
     },
     "backlight":{
-        "pin": "B5",
+        "pin": "B5"
     },
     "rgblight": {
         "pin": "E6",
diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h
index 5d698b7aec..14ce6d29f1 100644
--- a/keyboards/keebio/sinc/rev3/config.h
+++ b/keyboards/keebio/sinc/rev3/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_SCL_PIN GP22
 #define I2C1_SDA_PIN GP23
 
-#define RGBLIGHT_DEFAULT_VAL 120
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
@@ -69,9 +67,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_DI_PIN GP18
+#define RGB_MATRIX_LED_COUNT 113
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index 37640dbf9b..0b4e32a6ab 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -12,7 +12,7 @@
         "console": true,
         "rgblight": false,
         "backlight": false,
-        "rgb_matrix": true,
+        "rgb_matrix": true
     },
     "split": {
         "enabled": true,
@@ -27,8 +27,8 @@
             "right":{
                 "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
                 "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
-            },
-        },
+            }
+        }
     },
     "matrix_pins": {
         "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
@@ -40,16 +40,9 @@
             {"pin_a": "GP21", "pin_b": "GP20" }
         ]
     },
-    "rgblight": {
-       "pin": "GP18",
-       "led_count": 113,
-       "max_brightness": 120,
-       "sleep": true,
-       "split": true,
-       "split_count": [56, 57]
-    },
     "rgb_matrix": {
         "driver": "WS2812",
+        "split_count": [56, 57],
         "layout": [
             { "flags": 4, "matrix": [5, 2], "x": 30,  "y": 0 },
             { "flags": 2, "x": 42, "y": 6 },
@@ -178,5 +171,5 @@
             { "flags": 4, "matrix": [10, 7], "x": 224, "y": 64 },
             { "flags": 2, "x": 224, "y": 55 }
           ]
-    },
+    }
 }