From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- keyboards/40percentclub/gherkin/config.h | 2 -- keyboards/40percentclub/gherkin/info.json | 3 +++ keyboards/40percentclub/luddite/config.h | 5 ----- keyboards/40percentclub/luddite/info.json | 4 ++++ keyboards/40percentclub/mf68/config.h | 3 --- keyboards/40percentclub/mf68/info.json | 4 ++++ keyboards/40percentclub/nori/config.h | 2 -- keyboards/40percentclub/nori/info.json | 3 +++ keyboards/40percentclub/sixpack/config.h | 22 ---------------------- keyboards/40percentclub/sixpack/info.json | 4 +++- 10 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 keyboards/40percentclub/sixpack/config.h (limited to 'keyboards/40percentclub') diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h index 18724c8966..3d6c38ec80 100644 --- a/keyboards/40percentclub/gherkin/config.h +++ b/keyboards/40percentclub/gherkin/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index c93e8734e8..ee85708f19 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h index 4028b0cf1a..2848c7a32c 100644 --- a/keyboards/40percentclub/luddite/config.h +++ b/keyboards/40percentclub/luddite/config.h @@ -7,11 +7,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 4 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json index 704b30479b..948ef091bd 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/info.json @@ -8,6 +8,10 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "backlight": { + "pin": "B5", + "levels": 4 + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["60_ansi"], diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h index 0daccc09ab..0a07934e75 100644 --- a/keyboards/40percentclub/mf68/config.h +++ b/keyboards/40percentclub/mf68/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json index 89df2e1958..2c8a4c92d6 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/info.json @@ -8,6 +8,10 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["68_ansi"], diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h index 490dcf629a..6bdf5db350 100644 --- a/keyboards/40percentclub/nori/config.h +++ b/keyboards/40percentclub/nori/config.h @@ -33,8 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - // enable RGB underglow #define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index 5bb4a0bf08..fa12a8ef03 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -8,6 +8,9 @@ "pid": "0x0A0C", "device_version": "4.4.4" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h deleted file mode 100644 index acf61f0017..0000000000 --- a/keyboards/40percentclub/sixpack/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 - -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 - -/* Backlight */ -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 6 diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json index 65f16021dd..f0ba7f1aff 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/info.json @@ -9,7 +9,9 @@ "device_version": "10.0.1" }, "backlight": { - "pins": ["F4", "F5"] + "pins": ["F4", "F5"], + "levels": 6, + "breathing": true }, "indicators": { "caps_lock": "B0", -- cgit v1.2.3