summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2020-01-19 18:00:32 +1100
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-01-18 23:00:32 -0800
commitf5209aa4e941c7f3a942ef4a7e256ab432ec98ce (patch)
tree29c2a0d197050ff2accb920731ddb1d022cb2a90 /keyboards
parenteb5d267e637db4c2c639932b8c8176bf47dff78f (diff)
Remove custom backlight code for PS2AVRGB boards (#7775)
* Remove custom backlight code for PS2AVRGB boards * Remove custom driver setting * BACKLIGHT_BREATHING goes in config.h, not here * Don't need to include backlight.c again here either * Turn on backlight for Canoe * Disable console on a few boards due to oversize
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ares/ares.c34
-rw-r--r--keyboards/ares/config.h3
-rw-r--r--keyboards/ares/rules.mk2
-rw-r--r--keyboards/bfake/bfake.c35
-rw-r--r--keyboards/bfake/config.h8
-rw-r--r--keyboards/bfake/rules.mk2
-rw-r--r--keyboards/donutcables/budget96/budget96.c32
-rw-r--r--keyboards/donutcables/budget96/config.h3
-rw-r--r--keyboards/donutcables/budget96/rules.mk2
-rw-r--r--keyboards/eve/meteor/config.h3
-rw-r--r--keyboards/eve/meteor/meteor.c33
-rw-r--r--keyboards/exclusive/e6v2/le_bmc/config.h3
-rw-r--r--keyboards/exclusive/e6v2/le_bmc/le_bmc.c33
-rw-r--r--keyboards/exclusive/e6v2/le_bmc/rules.mk4
-rw-r--r--keyboards/exclusive/e6v2/oe_bmc/config.h3
-rw-r--r--keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c33
-rw-r--r--keyboards/exclusive/e6v2/oe_bmc/rules.mk4
-rw-r--r--keyboards/exent/config.h3
-rw-r--r--keyboards/exent/exent.c23
-rw-r--r--keyboards/exent/rules.mk2
-rw-r--r--keyboards/facew/config.h3
-rw-r--r--keyboards/facew/facew.c37
-rw-r--r--keyboards/facew/rules.mk2
-rw-r--r--keyboards/ft/mars80/config.h3
-rw-r--r--keyboards/ft/mars80/mars80.c32
-rw-r--r--keyboards/gray_studio/hb85/hb85.c31
-rw-r--r--keyboards/gray_studio/hb85/rules.mk2
-rw-r--r--keyboards/jc65/v32a/config.h4
-rw-r--r--keyboards/jc65/v32a/v32a.c37
-rw-r--r--keyboards/jj40/config.h2
-rw-r--r--keyboards/jj4x4/config.h2
-rw-r--r--keyboards/jj50/backlight.c213
-rw-r--r--keyboards/jj50/backlight_custom.h15
-rw-r--r--keyboards/jj50/breathing_custom.h140
-rw-r--r--keyboards/jj50/config.h2
-rw-r--r--keyboards/jj50/jj50.c17
-rw-r--r--keyboards/jj50/rules.mk2
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/mk1.c19
-rw-r--r--keyboards/mechmini/v1/config.h8
-rw-r--r--keyboards/mechmini/v1/rules.mk2
-rw-r--r--keyboards/mehkee96/config.h3
-rw-r--r--keyboards/mehkee96/mehkee96.c20
-rw-r--r--keyboards/mehkee96/rules.mk4
-rw-r--r--keyboards/panc60/config.h4
-rw-r--r--keyboards/panc60/panc60.c35
-rw-r--r--keyboards/pearl/config.h3
-rw-r--r--keyboards/pearl/pearl.c31
-rw-r--r--keyboards/percent/canoe/canoe.c37
-rw-r--r--keyboards/percent/canoe/config.h4
-rw-r--r--keyboards/percent/canoe/rules.mk2
-rw-r--r--keyboards/percent/skog/backlight.c211
-rw-r--r--keyboards/percent/skog/backlight_custom.h13
-rw-r--r--keyboards/percent/skog/breathing_custom.h140
-rw-r--r--keyboards/percent/skog/config.h6
-rw-r--r--keyboards/percent/skog/rules.mk4
-rw-r--r--keyboards/percent/skog/skog.c26
-rw-r--r--keyboards/percent/skog_lite/config.h4
-rw-r--r--keyboards/percent/skog_lite/skog_lite.c32
-rw-r--r--keyboards/singa/config.h4
-rw-r--r--keyboards/singa/rules.mk2
-rw-r--r--keyboards/singa/singa.c33
-rw-r--r--keyboards/tgr/alice/alice.c23
-rw-r--r--keyboards/tgr/alice/config.h3
-rw-r--r--keyboards/tgr/alice/rules.mk2
-rw-r--r--keyboards/tgr/jane/config.h3
-rw-r--r--keyboards/tgr/jane/jane.c32
-rw-r--r--keyboards/unikorn/config.h4
-rw-r--r--keyboards/unikorn/unikorn.c33
-rw-r--r--keyboards/winkeyless/bface/bface.c31
-rw-r--r--keyboards/winkeyless/bface/config.h9
-rw-r--r--keyboards/winkeyless/bface/rules.mk2
-rw-r--r--keyboards/winkeyless/bmini/bmini.c23
-rw-r--r--keyboards/winkeyless/bmini/config.h8
-rw-r--r--keyboards/winkeyless/bmini/rules.mk2
-rw-r--r--keyboards/winkeyless/bminiex/backlight.c211
-rw-r--r--keyboards/winkeyless/bminiex/backlight_custom.h13
-rw-r--r--keyboards/winkeyless/bminiex/bminiex.c29
-rw-r--r--keyboards/winkeyless/bminiex/breathing_custom.h140
-rw-r--r--keyboards/winkeyless/bminiex/config.h1
-rw-r--r--keyboards/winkeyless/bminiex/rules.mk3
-rw-r--r--keyboards/ymd75/backlight.c216
-rw-r--r--keyboards/ymd75/backlight_custom.h15
-rw-r--r--keyboards/ymd75/breathing_custom.h140
-rw-r--r--keyboards/ymd75/config.h6
-rw-r--r--keyboards/ymd75/rules.mk6
-rw-r--r--keyboards/ymd75/ymd75.c23
-rw-r--r--keyboards/ymd96/backlight.c214
-rw-r--r--keyboards/ymd96/backlight_custom.h15
-rw-r--r--keyboards/ymd96/breathing_custom.h140
-rw-r--r--keyboards/ymd96/config.h8
-rw-r--r--keyboards/ymd96/rules.mk3
-rw-r--r--keyboards/ymd96/ymd96.c26
-rw-r--r--keyboards/ymdk/bface/bface.c27
-rw-r--r--keyboards/ymdk/bface/config.h2
-rw-r--r--keyboards/ymdk/bface/rules.mk3
-rw-r--r--keyboards/ymdk_np21/backlight.c213
-rw-r--r--keyboards/ymdk_np21/backlight_custom.h15
-rw-r--r--keyboards/ymdk_np21/breathing_custom.h140
-rw-r--r--keyboards/ymdk_np21/config.h10
-rw-r--r--keyboards/ymdk_np21/rules.mk3
-rw-r--r--keyboards/ymdk_np21/ymdk_np21.c23
101 files changed, 474 insertions, 2802 deletions
diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c
index 07276491c5..e6379cb18d 100644
--- a/keyboards/ares/ares.c
+++ b/keyboards/ares/ares.c
@@ -17,27 +17,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ares.h"
-#ifdef BACKLIGHT_ENABLE
-void backlight_init_ports(void) {
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(D4);
- setPinOutput(D6);
+void keyboard_pre_init_kb(void) {
+ led_init_ports();
+ keyboard_pre_init_user();
}
-void backlight_set(uint8_t level) {
- if (level == 0) {
- // Turn out the lights
- writePinLow(D0);
- writePinLow(D1);
- writePinLow(D4);
- writePinLow(D6);
- } else {
- // Turn on the lights
- writePinHigh(D0);
- writePinHigh(D1);
- writePinHigh(D4);
- writePinHigh(D6);
- }
+void led_init_ports(void) {
+ setPinOutput(D1);
+ writePinHigh(D1);
+}
+
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ writePin(D1, !led_state.caps_lock);
+ }
+ return true;
}
-#endif
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index f0aa926ea5..c50587db9c 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -37,7 +37,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define DEBOUNCE 5
-#define BACKLIGHT_LEVELS 1
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS
#define NO_UART 1
diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk
index 58d36bc673..f540741721 100644
--- a/keyboards/ares/rules.mk
+++ b/keyboards/ares/rules.mk
@@ -17,7 +17,7 @@ MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no
WS2812_DRIVER = i2c
diff --git a/keyboards/bfake/bfake.c b/keyboards/bfake/bfake.c
index 9039fe5465..eb328ba833 100644
--- a/keyboards/bfake/bfake.c
+++ b/keyboards/bfake/bfake.c
@@ -17,30 +17,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "bfake.h"
-void backlight_init_ports(void) {
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(D4);
- setPinOutput(D6);
+void keyboard_pre_init_kb(void) {
+ led_init_ports();
+ keyboard_pre_init_user();
+}
- writePinLow(D0);
- writePinLow(D1);
- writePinLow(D4);
- writePinLow(D6);
+void led_init_ports(void) {
+ setPinOutput(D1);
+ writePinHigh(D1);
}
-void backlight_set(uint8_t level) {
- if (level == 0) {
- // Turn out the lights
- writePinLow(D0);
- writePinLow(D1);
- writePinLow(D4);
- writePinLow(D6);
- } else {
- // Turn on the lights
- writePinHigh(D0);
- writePinHigh(D1);
- writePinHigh(D4);
- writePinHigh(D6);
- }
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ writePin(D1, !led_state.caps_lock);
+ }
+ return true;
}
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 65f1f3a759..7c814ccc93 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BFAKE_CONFIG_H
-#define BFAKE_CONFIG_H
+#pragma once
#include "config_common.h"
@@ -38,9 +37,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define DEBOUNCE 5
-#define BACKLIGHT_LEVELS 1
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS
#define NO_UART 1
-
-#endif
diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk
index 107bb4fa90..ab6af983ce 100644
--- a/keyboards/bfake/rules.mk
+++ b/keyboards/bfake/rules.mk
@@ -17,7 +17,7 @@ MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no
WS2812_DRIVER = i2c
diff --git a/keyboards/donutcables/budget96/budget96.c b/keyboards/donutcables/budget96/budget96.c
index e9125a3e60..7317e24e26 100644
--- a/keyboards/donutcables/budget96/budget96.c
+++ b/keyboards/donutcables/budget96/budget96.c
@@ -16,32 +16,22 @@
#include "budget96.h"
-void backlight_init_ports(void) {
- // initialize pins D0, D1, D4 and D6 as output
+void keyboard_pre_init_kb(void) {
+ led_init_ports();
+ keyboard_pre_init_user();
+}
+
+void led_init_ports(void) {
setPinOutput(D0);
setPinOutput(D1);
- setPinOutput(D4);
- setPinOutput(D6);
-
- // turn backlight LEDs on
writePinHigh(D0);
writePinHigh(D1);
- writePinHigh(D4);
- writePinHigh(D6);
}
-void backlight_set(uint8_t level) {
- if (level == 0) {
- // turn backlight LEDs off
- writePinLow(D0);
- writePinLow(D1);
- writePinLow(D4);
- writePinLow(D6);
- } else {
- // turn backlight LEDs on
- writePinHigh(D0);
- writePinHigh(D1);
- writePinHigh(D4);
- writePinHigh(D6);
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ writePin(D0, !led_state.num_lock);
+ writePin(D1, !led_state.caps_lock);
}
+ return true;
}
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index 127e542f1c..dddc8075b1 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -37,5 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define DEBOUNCE 5
-#define BACKLIGHT_LEVELS 1
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk
index 54328d248d..84eace5ed6 100644
--- a/keyboards/donutcables/budget96/rules.mk
+++ b/keyboards/donutcables/budget96/rules.mk
@@ -15,7 +15,7 @@ BOOTLOADER = bootloadHID
BOOTMAGIC_ENABLE = no
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = yes
+CONSOLE_ENABLE = no
COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h
index b23bc877fe..2100c3a458 100644
--- a/keyboards/eve/meteor/config.h
+++ b/keyboards/eve/meteor/config.h
@@ -36,4 +36,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define DEBOUNCE 5
-#define BACKLIGHT_LEVELS 1
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/eve/meteor/meteor.c b/keyboards/eve/meteor/meteor.c
index f5ecbad025..ac1ca5d643 100644
--- a/keyboards/eve/meteor/meteor.c
+++ b/keyboards/eve/meteor/meteor.c
@@ -16,32 +16,19 @@
#include "meteor.h"
-void backlight_init_ports(void) {
- // initialize pins D0, D1, D4 and D6 as output
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(D4);
- setPinOutput(D6);
+void keyboard_pre_init_kb(void) {
+ led_init_ports();
+ keyboard_pre_init_user();
+}
- // turn backlight LEDs on
- writePinHigh(D0);
+void led_init_ports(void) {
+ setPinOutput(D1);
writePinHigh(D1);
- writePinHigh(D4);
- writePinHigh(D6);
}
-void backlight_set(uint8_t level) {
- if (level == 0) {
- // turn backlight LEDs off
- writePinLow(D0);
- writePinLow(D1);
- writePinLow(D4);
- writePinLow(D6);
- } else {
- // turn backlight LEDs on
- writePinHigh(D0);
- writePinHigh(D1);
- writePinHigh(D4);
- writePinHigh(D6);
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ writePin(D1, !led_state.caps_lock);
}
+ return true;
}
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index d0b976c1ec..ca680f5029 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -45,5 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
#d