commit 3f1b3a512532b8e6ebd2f73df5222ae146b1f490 parent 87b4bc17edcf46f06a085a38130b9ff865b5bd39 Author: Joel Challis <git@zvecr.com> Date: Sat, 21 Oct 2023 12:21:23 +0100 Migrate recently introduced sync items (#22305) Diffstat:
57 files changed, 195 insertions(+), 111 deletions(-)
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h @@ -19,9 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SELECT_SOFT_SERIAL_SPEED 1 -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_LAYER_STATE_ENABLE - #define SPLIT_HAND_PIN D5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json @@ -23,6 +23,12 @@ "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"], "rows": ["B6", "B5", "B4", "D7", "E6"] } + }, + "transport":{ + "sync" :{ + "indicators": true, + "layer_state": true + } } }, "processor": "atmega32u4", diff --git a/keyboards/boardsource/unicorne/config.h b/keyboards/boardsource/unicorne/config.h @@ -8,8 +8,6 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET -#define SPLIT_LAYER_STATE_ENABLE - #define I2C_DRIVER I2CD1 #define I2C1_SDA_PIN GP22 #define I2C1_SCL_PIN GP23 diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/info.json @@ -20,7 +20,12 @@ }, "split": { "enabled": true, - "soft_serial_pin": "GP0" + "soft_serial_pin": "GP0", + "transport": { + "sync": { + "layer_state": true + } + } }, "usb": { "device_version": "1.0.0", diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h @@ -10,7 +10,6 @@ #ifdef OLED_ENABLE #define OLED_DISPLAY_128X32 -#define SPLIT_OLED_ENABLE #endif #ifdef PS2_DRIVER_INTERRUPT diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json @@ -14,7 +14,12 @@ }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "transport": { + "sync": { + "oled": true + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/clickety_split/leeloo/rev2/info.json b/keyboards/clickety_split/leeloo/rev2/info.json @@ -8,7 +8,9 @@ }, "split": { "transport": { - "sync_matrix_state": true + "sync" :{ + "matrix_state": true + } } }, "rgblight": { diff --git a/keyboards/clickety_split/leeloo/rev3/info.json b/keyboards/clickety_split/leeloo/rev3/info.json @@ -7,9 +7,11 @@ "rgb_matrix": true }, "split": { - "transport": { - "sync_matrix_state": true + "transport": { + "sync" :{ + "matrix_state": true } + } }, "rgblight": { "led_count": 58, diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h @@ -22,11 +22,6 @@ #define RGB_MATRIX_SPLIT \ { 24, 24 } -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE - #define I2C_DRIVER I2CD0 #define I2C1_SCL_PIN GP25 #define I2C1_SDA_PIN GP24 diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json @@ -41,7 +41,13 @@ }, "soft_serial_pin": "GP1", "transport": { - "protocol": "serial" + "protocol": "serial", + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true, + "modifiers": true + } } }, "features": { diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h @@ -20,11 +20,6 @@ #define WS2812_PIO_USE_PIO1 #define RGB_MATRIX_LED_COUNT 54 -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE - #undef I2C_DRIVER #define I2C_DRIVER I2CD0 #undef I2C1_SCL_PIN diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json @@ -42,7 +42,13 @@ }, "soft_serial_pin": "GP1", "transport": { - "protocol": "serial" + "protocol": "serial", + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true, + "modifiers": true + } } }, "features": { diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h @@ -17,6 +17,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #define MASTER_RIGHT - -#define SPLIT_WPM_ENABLE -#define SPLIT_LAYER_STATE_ENABLE diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json @@ -38,6 +38,12 @@ {"pin_a": "F4", "pin_b": "F5"} ] } + }, + "transport": { + "sync": { + "layer_state": true, + "wpm": true + } } }, "layouts": { diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h @@ -21,9 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define QUICK_TAP_TERM 0 -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE - /* Select hand configuration */ #define MASTER_LEFT // #define MASTER_RIGHT diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json @@ -14,7 +14,13 @@ }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "transport": { + "sync": { + "indicators": true, + "layer_state": true + } + } }, "tapping": { "term": 100 diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h @@ -30,11 +30,6 @@ #define RGB_MATRIX_CENTER \ { 112, 32 } -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_MODS_ENABLE -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_OLED_ENABLE #define SPLIT_TRANSACTION_IDS_KB KEYBOARD_CURRENT_ALPA_SYNC #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json @@ -27,7 +27,16 @@ }, "split": { "enabled": true, - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true, + "modifiers": true, + "oled": true + } + } }, "ws2812": { "pin": "D3" diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h @@ -7,5 +7,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json @@ -14,7 +14,13 @@ }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "transport": { + "sync": { + "indicators": true, + "layer_state": true + } + } }, "rgblight": { "led_count": 56, diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h @@ -8,7 +8,6 @@ #define RGB_MATRIX_LED_COUNT 88 #define RGB_MATRIX_SPLIT { 44, 44 } #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -#define SPLIT_TRANSPORT_MIRROR #ifdef RGB_MATRIX_ENABLE // EFFECTS @@ -41,6 +40,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json @@ -36,7 +36,14 @@ }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/info.json @@ -31,7 +31,9 @@ } }, "transport": { - "sync_matrix_state": true + "sync" :{ + "matrix_state": true + } } }, "processor": "RP2040", diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/info.json @@ -28,7 +28,9 @@ } }, "transport": { - "sync_matrix_state": true + "sync" :{ + "matrix_state": true + } } }, "matrix_pins": { diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h @@ -23,8 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Synchronize Caps Lock LED across halves */ -#define SPLIT_LED_STATE_ENABLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json @@ -18,7 +18,10 @@ "enabled": true, "soft_serial_pin": "D0", "transport": { - "protocol": "serial" + "protocol": "serial", + "sync" :{ + "indicators": true + } }, "encoder": { "right": { diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h @@ -23,8 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Synchronize Caps Lock LED across halves */ -#define SPLIT_LED_STATE_ENABLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json @@ -18,7 +18,10 @@ "enabled": true, "soft_serial_pin": "D0", "transport": { - "protocol": "serial" + "protocol": "serial", + "sync" :{ + "indicators": true + } }, "encoder": { "right": { diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json @@ -44,7 +44,9 @@ }, "transport": { "protocol": "serial_usart", - "sync_matrix_state": true + "sync" :{ + "matrix_state": true + } }, "bootmagic": { "matrix": [6, 7] diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h @@ -24,8 +24,3 @@ #endif #define SPLIT_USB_DETECT - -#ifdef WPM_ENABLE -# define SPLIT_WPM_ENABLE -#endif - diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json @@ -26,6 +26,11 @@ {"pin_a": "F4", "pin_b": "F5", "resolution": 2} ] } + }, + "transport": { + "sync": { + "wpm": true + } } }, "tapping": { diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h @@ -7,10 +7,6 @@ #define MASTER_LEFT //#define MASTER_RIGHT -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_OLED_ENABLE /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json @@ -22,7 +22,15 @@ "tap_keycode_delay": 10 }, "split": { - "soft_serial_pin": "D3" + "soft_serial_pin": "D3", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "modifiers": true, + "oled": true + } + } }, "rgblight": { "saturation_steps": 8, diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h @@ -7,10 +7,6 @@ #define MASTER_LEFT //#define MASTER_RIGHT -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_OLED_ENABLE /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json @@ -22,7 +22,15 @@ "tap_keycode_delay": 10 }, "split": { - "soft_serial_pin": "D3" + "soft_serial_pin": "D3", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "modifiers": true, + "oled": true + } + } }, "rgblight": { "saturation_steps": 8, diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE - - #define SPLIT_HAND_PIN B9 #define SERIAL_USART_TX_PIN B6 #define SERIAL_USART_SPEED 921600 diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json @@ -47,6 +47,12 @@ "cols": ["B0", "A3", "A2", "A1", "B7", "B5"], "rows": ["B1", "A4", "A5", "A6", "A7"] } + }, + "transport": { + "sync": { + "indicators": true, + "layer_state": true + } } }, "processor": "STM32F401", diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE - - #define SPLIT_HAND_PIN B9 #define SERIAL_USART_TX_PIN B6 diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json @@ -46,6 +46,12 @@ "cols": ["B0", "A3", "A2", "A1", "B7", "B5"], "rows": ["B1", "A4", "A5", "A6", "A7"] } + }, + "transport": { + "sync": { + "indicators": true, + "layer_state": true + } } }, "processor": "STM32F411", diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h @@ -59,6 +59,3 @@ /* Optional speaker pin */ #define AUDIO_PIN B6 - -/* Optional split transactions */ -#define SPLIT_OLED_ENABLE diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json @@ -37,6 +37,11 @@ {"pin_a": "B4", "pin_b": "B5"} ] } + }, + "transport": { + "sync": { + "oled": true + } } }, "ws2812": { diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h @@ -41,9 +41,6 @@ #endif /* Split Transport Features */ -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC #define RGB_MATRIX_LED_COUNT 98 diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json @@ -52,7 +52,14 @@ "tap_keycode_delay": 5 }, "split": { - "soft_serial_pin": "A9" + "soft_serial_pin": "A9", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true + } + } }, "processor": "STM32F303", "bootloader": "stm32-dfu", diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h @@ -41,9 +41,6 @@ #endif /* Split Transport Features */ -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC /* LED Turbo DIP Switch */ diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json @@ -65,6 +65,13 @@ "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"], "rows": ["B15", "B14", "A8", "A13", "A7", null] } + }, + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true + } } }, "qmk": { diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h @@ -21,7 +21,3 @@ // OLED settings #define OLED_TIMEOUT 80000 #define OLED_BRIGHTNESS 90 - -#define SPLIT_WPM_ENABLE -#define SPLIT_OLED_ENABLE -#define SPLIT_TRANSPORT_MIRROR diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json @@ -41,6 +41,13 @@ "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null], "rows": ["C6", "D7", "E6", "B4", "B5"] } + }, + "transport": { + "sync": { + "matrix_state": true, + "oled": true, + "wpm": true + } } }, "qmk": { diff --git a/keyboards/spleeb/config.h b/keyboards/spleeb/config.h @@ -7,10 +7,6 @@ // the touch sensor to be on the master side #define MASTER_RIGHT -// Sync later, led, and mod state for use on OLED on slave side -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE // Transport dpi and enc mode for display on oled #define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC diff --git a/keyboards/spleeb/info.json b/keyboards/spleeb/info.json @@ -36,6 +36,13 @@ {"pin_a": "GP21", "pin_b": "GP4"} ] } + }, + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "modifiers": true + } } }, "url": "https://github.com/chrishoage/spleeb", diff --git a/keyboards/stront/config.h b/keyboards/stront/config.h @@ -13,8 +13,6 @@ /* any side can be master by default, enable split sync to support it */ #define EE_HANDS -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE #define SPLIT_POINTING_ENABLE /* SPI config for display/touchpad */ diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json @@ -61,7 +61,13 @@ "rows": ["GP28", "GP27", "GP26", "GP15"] }, "split": { - "enabled": true + "enabled": true, + "transport": { + "sync": { + "indicators": true, + "modifiers": true + } + } }, "encoder": { "rotary": [ diff --git a/keyboards/tweetydabird/lotus58/config.h b/keyboards/tweetydabird/lotus58/config.h @@ -7,6 +7,3 @@ #define RGBLIGHT_DEFAULT_VAL 87 #define SPLIT_HAND_PIN B5 -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_OLED_ENABLE diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json @@ -56,8 +56,13 @@ "soft_serial_pin": "D2", "transport": { "protocol": "serial", - "sync_matrix_state": true, - "sync_modifiers": true + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true, + "modifiers": true, + "oled": true + } }, "usb_detect": { "enabled": true diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h @@ -11,12 +11,6 @@ // Split configuration #define SPLIT_TRANSACTION_IDS_KB RPC_ID_SYNC_STATE_KB -#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_WPM_ENABLE -#define SPLIT_ACTIVITY_ENABLE // SPI Configuration #define SPI_DRIVER SPID3 diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json @@ -52,6 +52,16 @@ {"pin_a": "C15", "pin_b": "C14", "resolution": 2} ] } + }, + "transport": { + "sync": { + "activity": true, + "indicators": true, + "layer_state": true, + "matrix_state": true, + "modifiers": true, + "wpm": true + } } }, "encoder": { diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h @@ -17,6 +17,5 @@ #pragma once #define OLED_DISPLAY_128X64 -#define SPLIT_MODS_ENABLE -#define SPLIT_WPM_ENABLE + #define SPLIT_USB_DETECT diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json @@ -20,7 +20,13 @@ ] }, "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "transport": { + "sync": { + "modifiers": true, + "wpm": true + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu",