From a498daf6277b334f5bc71ba0b51f991bc4d67beb Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 7 May 2026 22:32:38 +0100 Subject: [PATCH] Migrate SPLIT_OLED_ENABLE (#26194) --- keyboards/splitkb/aurora/corne/rev1/config.h | 22 ------------------- .../splitkb/aurora/corne/rev1/keyboard.json | 3 ++- keyboards/splitkb/aurora/helix/rev1/config.h | 19 ---------------- .../splitkb/aurora/helix/rev1/keyboard.json | 5 +++++ keyboards/splitkb/aurora/lily58/rev1/config.h | 22 ------------------- .../splitkb/aurora/lily58/rev1/keyboard.json | 3 ++- .../splitkb/aurora/sofle_v2/rev1/config.h | 19 ---------------- .../aurora/sofle_v2/rev1/keyboard.json | 5 +++++ keyboards/splitkb/aurora/sweep/rev1/config.h | 22 ------------------- .../splitkb/aurora/sweep/rev1/keyboard.json | 3 ++- keyboards/splitkb/elora/rev1/config.h | 2 -- keyboards/splitkb/elora/rev1/keyboard.json | 3 ++- keyboards/splitkb/kyria/rev1/config.h | 1 - keyboards/splitkb/kyria/rev1/info.json | 3 ++- keyboards/splitkb/kyria/rev2/config.h | 1 - keyboards/splitkb/kyria/rev2/info.json | 3 ++- keyboards/splitkb/kyria/rev3/config.h | 1 - keyboards/splitkb/kyria/rev3/keyboard.json | 3 ++- 18 files changed, 24 insertions(+), 116 deletions(-) delete mode 100644 keyboards/splitkb/aurora/corne/rev1/config.h delete mode 100644 keyboards/splitkb/aurora/helix/rev1/config.h delete mode 100644 keyboards/splitkb/aurora/lily58/rev1/config.h delete mode 100644 keyboards/splitkb/aurora/sofle_v2/rev1/config.h delete mode 100644 keyboards/splitkb/aurora/sweep/rev1/config.h diff --git a/keyboards/splitkb/aurora/corne/rev1/config.h b/keyboards/splitkb/aurora/corne/rev1/config.h deleted file mode 100644 index 4bcdc564ac..0000000000 --- a/keyboards/splitkb/aurora/corne/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 splitkb.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// Not yet available in `info.json` -#ifdef OLED_ENABLE -# define SPLIT_OLED_ENABLE -#endif diff --git a/keyboards/splitkb/aurora/corne/rev1/keyboard.json b/keyboards/splitkb/aurora/corne/rev1/keyboard.json index 40983ec28d..9cbc2065ba 100644 --- a/keyboards/splitkb/aurora/corne/rev1/keyboard.json +++ b/keyboards/splitkb/aurora/corne/rev1/keyboard.json @@ -103,7 +103,8 @@ }, "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true } } }, diff --git a/keyboards/splitkb/aurora/helix/rev1/config.h b/keyboards/splitkb/aurora/helix/rev1/config.h deleted file mode 100644 index 56e9763f78..0000000000 --- a/keyboards/splitkb/aurora/helix/rev1/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2023 splitkb.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#define SPLIT_OLED_ENABLE diff --git a/keyboards/splitkb/aurora/helix/rev1/keyboard.json b/keyboards/splitkb/aurora/helix/rev1/keyboard.json index 5921ec4af9..3091bf9407 100644 --- a/keyboards/splitkb/aurora/helix/rev1/keyboard.json +++ b/keyboards/splitkb/aurora/helix/rev1/keyboard.json @@ -129,6 +129,11 @@ }, "serial": { "pin": "D2" + }, + "transport": { + "sync": { + "oled": true + } } }, "usb": { diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h deleted file mode 100644 index 4bcdc564ac..0000000000 --- a/keyboards/splitkb/aurora/lily58/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 splitkb.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// Not yet available in `info.json` -#ifdef OLED_ENABLE -# define SPLIT_OLED_ENABLE -#endif diff --git a/keyboards/splitkb/aurora/lily58/rev1/keyboard.json b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json index 60645f9deb..74e30126fc 100644 --- a/keyboards/splitkb/aurora/lily58/rev1/keyboard.json +++ b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json @@ -114,7 +114,8 @@ }, "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true } } }, diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/config.h b/keyboards/splitkb/aurora/sofle_v2/rev1/config.h deleted file mode 100644 index 56e9763f78..0000000000 --- a/keyboards/splitkb/aurora/sofle_v2/rev1/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2023 splitkb.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#define SPLIT_OLED_ENABLE diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json index 6c72888b10..70dcae5aa6 100644 --- a/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json +++ b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json @@ -123,6 +123,11 @@ }, "serial": { "pin": "D2" + }, + "transport": { + "sync": { + "oled": true + } } }, "usb": { diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h deleted file mode 100644 index 4bcdc564ac..0000000000 --- a/keyboards/splitkb/aurora/sweep/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 splitkb.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// Not yet available in `info.json` -#ifdef OLED_ENABLE -# define SPLIT_OLED_ENABLE -#endif diff --git a/keyboards/splitkb/aurora/sweep/rev1/keyboard.json b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json index e90995b207..69f1074ad2 100644 --- a/keyboards/splitkb/aurora/sweep/rev1/keyboard.json +++ b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json @@ -100,7 +100,8 @@ }, "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true } } }, diff --git a/keyboards/splitkb/elora/rev1/config.h b/keyboards/splitkb/elora/rev1/config.h index 7633cf00af..a18edb2842 100644 --- a/keyboards/splitkb/elora/rev1/config.h +++ b/keyboards/splitkb/elora/rev1/config.h @@ -55,6 +55,4 @@ // including some code in rev1.c but makes // it so the timeout's are not synced // between halves. -#undef SPLIT_OLED_ENABLE #define OLED_TIMEOUT 0 - diff --git a/keyboards/splitkb/elora/rev1/keyboard.json b/keyboards/splitkb/elora/rev1/keyboard.json index 7996fdccb9..a7921c4e1f 100644 --- a/keyboards/splitkb/elora/rev1/keyboard.json +++ b/keyboards/splitkb/elora/rev1/keyboard.json @@ -91,7 +91,8 @@ }, "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true }, "watchdog": true, "watchdog_timeout": 3000 diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 615d93496d..f20ce9a11a 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -18,4 +18,3 @@ along with this program. If not, see . #pragma once #define OLED_DISPLAY_128X64 -#define SPLIT_OLED_ENABLE diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 54758180fa..5dc8876060 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -48,7 +48,8 @@ "split": { "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true } } }, diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index fb9e7bb959..df50b21b94 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -22,4 +22,3 @@ along with this program. If not, see . #define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `rev2.c` #define OLED_DISPLAY_128X64 -#define SPLIT_OLED_ENABLE diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index 41c55cc025..5da17b48c0 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -48,7 +48,8 @@ "split": { "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true } } }, diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h index 3f731859fc..2bfa92b310 100644 --- a/keyboards/splitkb/kyria/rev3/config.h +++ b/keyboards/splitkb/kyria/rev3/config.h @@ -17,4 +17,3 @@ #pragma once #define OLED_DISPLAY_128X64 -#define SPLIT_OLED_ENABLE diff --git a/keyboards/splitkb/kyria/rev3/keyboard.json b/keyboards/splitkb/kyria/rev3/keyboard.json index 580aa821db..2c40ac4572 100644 --- a/keyboards/splitkb/kyria/rev3/keyboard.json +++ b/keyboards/splitkb/kyria/rev3/keyboard.json @@ -116,7 +116,8 @@ }, "transport": { "sync": { - "matrix_state": true + "matrix_state": true, + "oled": true } } },