From aab69c00127dd7d1740b47a118e868ea548d0c0c Mon Sep 17 00:00:00 2001 From: Jack Sangdahl <0x6A73@pm.me> Date: Mon, 19 Jun 2023 13:57:02 -0600 Subject: [PATCH 1/2] initial --- keyboards/jones/readme.md | 23 -------- keyboards/jones/v03/config.h | 56 ------------------- keyboards/jones/v03/info.json | 26 ++++++++- keyboards/jones/v03/keymaps/default/keymap.c | 2 +- keyboards/jones/v03/keymaps/default/readme.md | 1 - .../jones/v03/keymaps/default_jp/readme.md | 1 - keyboards/jones/v03/rules.mk | 19 +------ keyboards/jones/v03_1/config.h | 56 ------------------- keyboards/jones/v03_1/info.json | 25 ++++++++- .../jones/v03_1/keymaps/default/readme.md | 1 - .../v03_1/keymaps/default_ansi/readme.md | 1 - .../jones/v03_1/keymaps/default_jp/readme.md | 1 - keyboards/jones/v03_1/rules.mk | 19 +------ keyboards/jones/v1/config.h | 5 -- keyboards/jones/v1/info.json | 13 +++++ keyboards/jones/v1/keymaps/default/readme.md | 10 ---- keyboards/jones/v1/keymaps/via/keymap.c | 1 - keyboards/jones/v1/rules.mk | 17 ------ 18 files changed, 65 insertions(+), 212 deletions(-) delete mode 100644 keyboards/jones/readme.md delete mode 100644 keyboards/jones/v03/keymaps/default/readme.md delete mode 100644 keyboards/jones/v03/keymaps/default_jp/readme.md delete mode 100644 keyboards/jones/v03_1/keymaps/default/readme.md delete mode 100644 keyboards/jones/v03_1/keymaps/default_ansi/readme.md delete mode 100644 keyboards/jones/v03_1/keymaps/default_jp/readme.md delete mode 100644 keyboards/jones/v1/keymaps/default/readme.md diff --git a/keyboards/jones/readme.md b/keyboards/jones/readme.md deleted file mode 100644 index 43500d0a1d3f..000000000000 --- a/keyboards/jones/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Jones - -![Jones, "Wide" layout](https://raw.githubusercontent.com/jpskenn/Jones/master/assets/_DSF0714.jpeg) - -A symmetrical 60% keyboard combined with Ortho-Linear and Row-staggered. It has gapless Row 2 - Row 3. -GH60 case compatible PCB and keyplate. -[More info](https://github.com/jpskenn/Jones) - -* Keyboard Maintainer: [jpskenn](https://github.com/jpskenn) -* Hardware Supported: PCB, Key plate, Bottom plate -* Hardware Availability: [GitHub](https://github.com/jpskenn/Jones), [BOOTH](https://jpskenn.booth.pm), [Yushakobo](https://yushakobo.jp) - -Make example for this keyboard (after setting up your build environment): - - make jones/v1:default - -Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)): - - make jones/v1:default:flash - -To reset the keyboard into bootloader mode, press the reset switch on the underside. - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h index 4589e42ad25a..6e9205cf1b87 100644 --- a/keyboards/jones/v03/config.h +++ b/keyboards/jones/v03/config.h @@ -17,66 +17,10 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -// Same size for Jones' custom Round-Robin matrix. #define MATRIX_ROWS 11 #define MATRIX_COLS 11 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -// Same pins for Jones' custom Round-Robin matrix. -#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } -#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } - -/* COL2ROW, ROW2COL*/ -// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix. -//#define DIODE_DIRECTION COL2ROW - /* Audio */ #ifdef AUDIO_ENABLE - #define AUDIO_PIN C6 - #define AUDIO_PIN_ALT B6 // 2nd pin for simultaneous audio. #define AUDIO_CLICKY #endif - - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - /*== Lighting Layers ==*/ - #define RGBLIGHT_LAYERS - // #define RGBLIGHT_MAX_LAYERS 2 - #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status - // #define RGBLIGHT_EFFECT_BREATHING - // #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - // #define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT - // #define RGBLIGHT_EFFECT_CHRISTMAS - // #define RGBLIGHT_EFFECT_STATIC_GRADIENT - // #define RGBLIGHT_EFFECT_RGB_TEST - // #define RGBLIGHT_EFFECT_ALTERNATING - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index c01e6a4673d0..ba36ad4f7216 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -3,11 +3,24 @@ "manufacturer": "jpskenn", "url": "https://github.com/jpskenn/Jones", "maintainer": "jpskenn", + "features": { + "extrakey": true, + "mousekey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "usb": { "vid": "0xB9DD", "pid": "0x175A", "device_version": "0.3.0" }, + "matrix_pins": { + "cols": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"], + "rows": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"] + }, "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7"}, @@ -15,11 +28,22 @@ ] }, "rgblight": { - "led_count": 6 + "led_count": 6, + "layers": { + "enabled": true, + "override_rgb": false + }, + "animations": { + "rainbow_swirl": true, + "knight": true + } }, "ws2812": { "pin": "B7" }, + "audio": { + "pins": ["C6", "B6"] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jones/v03/keymaps/default/keymap.c b/keyboards/jones/v03/keymaps/default/keymap.c index d051bd781ed1..c81e300cf1d0 100644 --- a/keyboards/jones/v03/keymaps/default/keymap.c +++ b/keyboards/jones/v03/keymaps/default/keymap.c @@ -24,4 +24,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM,JP_DOT, JP_SLSH,JP_BSLS,KC_UP, XXXXXXX, KC_MUTE,KC_LALT,KC_LGUI,KC_LNG2, KC_SPC, KC_SPC, KC_LNG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT ) -}; \ No newline at end of file +}; diff --git a/keyboards/jones/v03/keymaps/default/readme.md b/keyboards/jones/v03/keymaps/default/readme.md deleted file mode 100644 index a23bc4c15a0b..000000000000 --- a/keyboards/jones/v03/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut keymap for Jones diff --git a/keyboards/jones/v03/keymaps/default_jp/readme.md b/keyboards/jones/v03/keymaps/default_jp/readme.md deleted file mode 100644 index a5d679aefdd4..000000000000 --- a/keyboards/jones/v03/keymaps/default_jp/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default JP-style keymap for Jones diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk index 0afd3b816aa8..30ce5d293b76 100644 --- a/keyboards/jones/v03/rules.mk +++ b/keyboards/jones/v03/rules.mk @@ -1,19 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h index b8e85c88a1c8..6e9205cf1b87 100644 --- a/keyboards/jones/v03_1/config.h +++ b/keyboards/jones/v03_1/config.h @@ -17,66 +17,10 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -// Same size for Jones' custom Round-Robin matrix. #define MATRIX_ROWS 11 #define MATRIX_COLS 11 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -// Same pins for Jones' custom Round-Robin matrix. -#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } -#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } - -/* COL2ROW, ROW2COL*/ -// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix. -//#define DIODE_DIRECTION COL2ROW - /* Audio */ #ifdef AUDIO_ENABLE - #define AUDIO_PIN C6 - #define AUDIO_PIN_ALT B7 // 2nd pin for simultaneous audio. #define AUDIO_CLICKY #endif - - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - /*== Lighting Layers ==*/ - #define RGBLIGHT_LAYERS - // #define RGBLIGHT_MAX_LAYERS 2 - #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status - // #define RGBLIGHT_EFFECT_BREATHING - // #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - // #define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT - // #define RGBLIGHT_EFFECT_CHRISTMAS - // #define RGBLIGHT_EFFECT_STATIC_GRADIENT - // #define RGBLIGHT_EFFECT_RGB_TEST - // #define RGBLIGHT_EFFECT_ALTERNATING - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 7847aec9c2cb..53566c7cbb71 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -3,11 +3,23 @@ "manufacturer": "jpskenn", "url": "https://github.com/jpskenn/Jones", "maintainer": "jpskenn", + "features": { + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, "usb": { "vid": "0xB9DD", "pid": "0x175A", "device_version": "0.3.1" }, + "matrix_pins": { + "cols": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"], + "rows": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"] + }, "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7"}, @@ -16,11 +28,22 @@ }, "rgblight": { "led_count": 14, - "led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11] + "led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11], + "layers": { + "enabled": true, + "override_rgb": false + }, + "animations": { + "rainbow_swirl": true, + "knight": true + } }, "ws2812": { "pin": "F0" }, + "audio": { + "pins": ["C6", "B7"] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jones/v03_1/keymaps/default/readme.md b/keyboards/jones/v03_1/keymaps/default/readme.md deleted file mode 100644 index a23bc4c15a0b..000000000000 --- a/keyboards/jones/v03_1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut keymap for Jones diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/readme.md b/keyboards/jones/v03_1/keymaps/default_ansi/readme.md deleted file mode 100644 index 1838a84adc1b..000000000000 --- a/keyboards/jones/v03_1/keymaps/default_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut ANSI-style keymap for Jones diff --git a/keyboards/jones/v03_1/keymaps/default_jp/readme.md b/keyboards/jones/v03_1/keymaps/default_jp/readme.md deleted file mode 100644 index 0cb2c18a4ccf..000000000000 --- a/keyboards/jones/v03_1/keymaps/default_jp/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut JP-style keymap for Jones diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk index eff64d9a5844..30ce5d293b76 100644 --- a/keyboards/jones/v03_1/rules.mk +++ b/keyboards/jones/v03_1/rules.mk @@ -1,19 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index 6d72d8e7b66d..73268ab4aafd 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -19,15 +19,10 @@ along with this program. If not, see . /* Audio */ #ifdef AUDIO_ENABLE - #define AUDIO_PIN C6 #define AUDIO_CLICKY #define MUSIC_MAP #endif -/* RGBLIGHT */ - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 /*== Lighting Layers ==*/ #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index a2b94543c386..c9e4118d146e 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -8,6 +8,16 @@ "pid": "0x175A", "device_version": "1.0.0" }, + "features": { + "mousekey": true, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] @@ -18,6 +28,9 @@ "ws2812": { "pin": "F1" }, + "audio": { + "pins": ["C6"] + }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/jones/v1/keymaps/default/readme.md b/keyboards/jones/v1/keymaps/default/readme.md deleted file mode 100644 index 453d9e858c65..000000000000 --- a/keyboards/jones/v1/keymaps/default/readme.md +++ /dev/null @@ -1,10 +0,0 @@ -# Defalut keymap for Jones - -Simple keymap. - -## Layers - -- Base -- Lower -- Raise -- Adjust diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c index 805d887b1df4..81265f2ba6be 100644 --- a/keyboards/jones/v1/keymaps/via/keymap.c +++ b/keyboards/jones/v1/keymaps/via/keymap.c @@ -173,7 +173,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { // Keyboard Initialization //------------------------------------------------------------------------------ void keyboard_post_init_user(void) { -debug_enable=true; #ifdef RGBLIGHT_LAYERS // Enable the LED layers. rgblight_layers = my_rgb_layers; diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk index cfc8879b74b2..44adba039b51 100644 --- a/keyboards/jones/v1/rules.mk +++ b/keyboards/jones/v1/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes # Rotary Encoder - -# Use I2C connected External EEPROM EEPROM_DRIVER = i2c - -LTO_ENABLE = yes From 86eb40220851fcd4ef56679e6a05bfdfb4ad6db0 Mon Sep 17 00:00:00 2001 From: Jack Sangdahl <0x6A73@pm.me> Date: Mon, 19 Jun 2023 14:23:58 -0600 Subject: [PATCH 2/2] misc --- keyboards/jones/v03/config.h | 3 +++ keyboards/jones/v03/info.json | 8 +++----- keyboards/jones/v03_1/config.h | 3 +++ keyboards/jones/v03_1/info.json | 8 +++----- keyboards/jones/v1/config.h | 4 ---- keyboards/jones/v1/info.json | 8 +++++++- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h index 6e9205cf1b87..605237e1224a 100644 --- a/keyboards/jones/v03/config.h +++ b/keyboards/jones/v03/config.h @@ -20,6 +20,9 @@ along with this program. If not, see . #define MATRIX_ROWS 11 #define MATRIX_COLS 11 +#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } +#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } + /* Audio */ #ifdef AUDIO_ENABLE #define AUDIO_CLICKY diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index ba36ad4f7216..2a107183239a 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -17,10 +17,6 @@ "pid": "0x175A", "device_version": "0.3.0" }, - "matrix_pins": { - "cols": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"], - "rows": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"] - }, "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7"}, @@ -29,9 +25,11 @@ }, "rgblight": { "led_count": 6, + "saturation_steps": 8, + "brightness_steps": 8, "layers": { "enabled": true, - "override_rgb": false + "override_rgb": true }, "animations": { "rainbow_swirl": true, diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h index 6e9205cf1b87..605237e1224a 100644 --- a/keyboards/jones/v03_1/config.h +++ b/keyboards/jones/v03_1/config.h @@ -20,6 +20,9 @@ along with this program. If not, see . #define MATRIX_ROWS 11 #define MATRIX_COLS 11 +#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } +#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } + /* Audio */ #ifdef AUDIO_ENABLE #define AUDIO_CLICKY diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 53566c7cbb71..58ad6488fc23 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -16,10 +16,6 @@ "pid": "0x175A", "device_version": "0.3.1" }, - "matrix_pins": { - "cols": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"], - "rows": ["D4", "D7", "C7", "F1", "F4", "F5", "D6", "D5", "E6", "B0", "B1"] - }, "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F7"}, @@ -28,10 +24,12 @@ }, "rgblight": { "led_count": 14, + "saturation_steps": 8, + "brightness_steps": 8, "led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11], "layers": { "enabled": true, - "override_rgb": false + "override_rgb": true }, "animations": { "rainbow_swirl": true, diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index 73268ab4aafd..705f489ad02e 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -23,10 +23,6 @@ along with this program. If not, see . #define MUSIC_MAP #endif - /*== Lighting Layers ==*/ - #define RGBLIGHT_LAYERS - #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status - /* External EEPROM */ // Use 24LC64 EEPROM #define EEPROM_I2C_24LC64 diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index c9e4118d146e..b201df7cf83c 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -23,7 +23,13 @@ "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] }, "rgblight": { - "led_count": 4 + "led_count": 4, + "saturation_steps": 8, + "brightness_steps": 8, + "layers": { + "enabled": true, + "override_rgb": true + } }, "ws2812": { "pin": "F1"