From 00feff656f80d9c9bf57cb1c6ad94ef2f69f1440 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Sep 2023 00:13:19 +0100 Subject: Migrate WEAR_LEVELING_*_SIZE to info.json (#22010) --- keyboards/rgbkb/sol3/config.h | 3 --- keyboards/rgbkb/sol3/rev1/info.json | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 3a0b61bfd5..575e5bcd95 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -125,6 +125,3 @@ #define AUDIO_CLICKY #define AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE #define AUDIO_DAC_OFF_VALUE 0 - -#define WEAR_LEVELING_BACKING_SIZE 4096 -#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index b80161995f..7d3db933a8 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -37,6 +37,11 @@ "io_delay": 5 }, "diode_direction": "COL2ROW", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, "encoder": { "rotary": [ {"pin_a": "A1", "pin_b": "A2"}, -- cgit v1.2.3 From c157c19b81fbd8b516de0eb5e854d278669cff1a Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 13 Oct 2023 17:25:32 +1100 Subject: Dedupe I2C, SPI, UART driver inclusions (#22253) --- keyboards/rgbkb/sol3/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index 9cb54cfa15..227219e302 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -2,7 +2,7 @@ VPATH += keyboards/rgbkb/common SRC += touch_encoder.c SRC += common_oled.c -QUANTUM_LIB_SRC += i2c_master.c +I2C_DRIVER_REQUIRED = yes # Build Options # change yes to no to disable -- cgit v1.2.3 From 3f1b3a512532b8e6ebd2f73df5222ae146b1f490 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 21 Oct 2023 12:21:23 +0100 Subject: Migrate recently introduced sync items (#22305) --- keyboards/rgbkb/sol3/config.h | 3 --- keyboards/rgbkb/sol3/rev1/info.json | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 575e5bcd95..4ce1c60343 100644 --- 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 index 7d3db933a8..19e5719cd6 100644 --- 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": { -- cgit v1.2.3 From bf6f13a2b0a185e935b8554e41317ab471a4c0ec Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 23 Oct 2023 00:37:27 +0100 Subject: Consolidate some EEPROM Driver configuration (#22321) --- keyboards/rgbkb/sol3/keymaps/default/config.h | 3 --- keyboards/rgbkb/sol3/keymaps/via/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/keymaps/default/config.h b/keyboards/rgbkb/sol3/keymaps/default/config.h index 7e46726115..88bdc06dee 100644 --- a/keyboards/rgbkb/sol3/keymaps/default/config.h +++ b/keyboards/rgbkb/sol3/keymaps/default/config.h @@ -19,6 +19,3 @@ // 20m timeout (20m * 60s * 1000mil) // #define RGB_MATRIX_TIMEOUT 1200000 #define RGB_DISABLE_WHEN_USB_SUSPENDED - -#define STM32_ONBOARD_EEPROM_SIZE 2048 - diff --git a/keyboards/rgbkb/sol3/keymaps/via/config.h b/keyboards/rgbkb/sol3/keymaps/via/config.h index ff1ff77472..7b7f806261 100644 --- a/keyboards/rgbkb/sol3/keymaps/via/config.h +++ b/keyboards/rgbkb/sol3/keymaps/via/config.h @@ -25,6 +25,3 @@ // 224B per layer right now #define DYNAMIC_KEYMAP_LAYER_COUNT 8 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 - -#define STM32_ONBOARD_EEPROM_SIZE 2048 - -- cgit v1.2.3 From a0a6820c1b46d04bc146e0723fd47265e6afe67f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Nov 2023 21:33:59 +0000 Subject: Migrate some dip switch config to info.json (#22437) --- keyboards/rgbkb/sol3/config.h | 4 ---- keyboards/rgbkb/sol3/rev1/info.json | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 4ce1c60343..102ebcda95 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -43,10 +43,6 @@ /* Split Transport Features */ #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC -/* LED Turbo DIP Switch */ -#define DIP_SWITCH_PINS { A14, B13 } -#define DIP_SWITCH_PINS_RIGHT { A14, B0 } - #define RGB_MATRIX_LED_COUNT 156 #define RGB_MATRIX_SPLIT { 78, 78 } #define RGB_MATRIX_CENTER { 81, 28 } diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index 19e5719cd6..c76e1f84dc 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -37,6 +37,9 @@ "io_delay": 5 }, "diode_direction": "COL2ROW", + "dip_switch": { + "pins": ["A14", "B13"] + }, "eeprom": { "wear_leveling": { "backing_size": 4096 @@ -50,6 +53,11 @@ ] }, "split": { + "dip_switch": { + "right": { + "pins": ["A14", "B0"] + } + }, "soft_serial_pin": "A9", "encoder": { "right": { -- cgit v1.2.3 From 1ed03f498fa204178c2696c510ac6a2cd8524e2d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 26 Nov 2023 18:36:45 +0000 Subject: Remove userspace keymaps (#22544) --- keyboards/rgbkb/sol3/keymaps/kageurufu/config.h | 30 ----------- keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c | 69 ------------------------- keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk | 2 - 3 files changed, 101 deletions(-) delete mode 100644 keyboards/rgbkb/sol3/keymaps/kageurufu/config.h delete mode 100644 keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c delete mode 100644 keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h deleted file mode 100644 index b6416d9bf8..0000000000 --- a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. Frank Tackitt - * ---------------------------------------------------------------------------- - */ - -#pragma once - -// No need for the single versions when multi performance isn't a problem =D -#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#define DISABLE_RGB_MATRIX_SPLASH -#define DISABLE_RGB_MATRIX_SOLID_SPLASH - -// 20m timeout (20m * 60s * 1000mil) -// #define RGB_MATRIX_TIMEOUT 1200000 -#define RGB_DISABLE_WHEN_USB_SUSPENDED - - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 -// 224B per layer right now -#define DYNAMIC_KEYMAP_LAYER_COUNT 8 -#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 - -#define STM32_ONBOARD_EEPROM_SIZE 2048 - diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c deleted file mode 100644 index 0f92110ff4..0000000000 --- a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. Frank Tackitt - * ---------------------------------------------------------------------------- - */ - -#include QMK_KEYBOARD_H -#include "kageurufu.h" - -extern keymap_config_t keymap_config; - -/* Base Layout - * ,------------------------------------------------. ,------------------------------------------------. - * | ` | | | | | | | | | | | | | | BkSp | - * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | Tab | | | | | | | | | | | | | | \ | - * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | Esc | | | | | | | | | | | | | | ' | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | Sft( | | | | | | | | | | | | | | Sft) | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | Ctrl | Win | Win | Alt | FN | Space| RGB | | FN | FN | - | = | Down | PgUp | PgDn | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | Space| Bksp | | Enter| Space| - * `-------------' `--------=----' - */ -#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__, \ - KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU ) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = EXPAND_LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RGB_MOD, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_TAB, _________________QWERTY_L1_________________, KC_LBRC, KC_RBRC, _________________QWERTY_R1_________________, KC_BSLS, - FN_ESC, _________________QWERTY_L2_________________, RGB_SAI, RGB_VAI, _________________QWERTY_R2_________________, KC_QUOT, - SC_LSPO, _________________QWERTY_L3_________________, RGB_SAD, RGB_VAD, _________________QWERTY_R3_________________, SC_RSPC, - KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN, KC_SPC, KC_MUTE, KC_BSPC, KC_ENT, FN, KC_SPC, KC_MINS, KC_EQL, KC_DOWN, KC_PGUP, KC_PGDN - ), - - [_FN] = EXPAND_LAYOUT( - ________________FUNCTION_L1________________, _______, KC_PSCR, ________________FUNCTION_R1________________, - ________________FUNCTION_L2________________, _______, _______, ________________FUNCTION_R2________________, - ________________FUNCTION_L3________________, _______, _______, ________________FUNCTION_R3________________, - ________________FUNCTION_L4________________, _______, _______, ________________FUNCTION_R4________________, - ________________FUNCTION_L5________________, ADJ, KC_DEL, _______, ADJ, ________________FUNCTION_R5________________ - ), - - [_ADJ] = EXPAND_LAYOUT( - _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, - _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________, - _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, - _________________ADJUST_L4_________________, _______, _______, _________________ADJUST_R4_________________, - _________________ADJUST_L5_________________, _______, _______, _______, _______, _________________ADJUST_R5_________________ - - ) - -}; - -#ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), - ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1 ... 4] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), - ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) } -}; -#endif diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk deleted file mode 100644 index f1adcab005..0000000000 --- a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes -- cgit v1.2.3