aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/tgr
diff options
context:
space:
mode:
authorGravatar fauxpark <fauxpark@gmail.com>2020-01-19 18:00:32 +1100
committerGravatar James Young <18669334+noroadsleft@users.noreply.github.com>2020-01-18 23:00:32 -0800
commitf5209aa4e941c7f3a942ef4a7e256ab432ec98ce (patch)
tree29c2a0d197050ff2accb920731ddb1d022cb2a90 /keyboards/tgr
parenteb5d267e637db4c2c639932b8c8176bf47dff78f (diff)
downloadqmk_firmware-f5209aa4e941c7f3a942ef4a7e256ab432ec98ce.tar.gz
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/tgr')
-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
5 files changed, 40 insertions, 23 deletions
diff --git a/keyboards/tgr/alice/alice.c b/keyboards/tgr/alice/alice.c
index 39aed2cf5..9fb4957ac 100644
--- a/keyboards/tgr/alice/alice.c
+++ b/keyboards/tgr/alice/alice.c
@@ -16,3 +16,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "alice.h"
+
+void keyboard_pre_init_kb(void) {
+ led_init_ports();
+ keyboard_pre_init_user();
+}
+
+void led_init_ports(void) {
+ setPinOutput(D0);
+ setPinOutput(D1);
+ setPinOutput(D6);
+ writePinHigh(D0);
+ writePinHigh(D1);
+ 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);
+ writePin(D6, !led_state.scroll_lock);
+ }
+ return true;
+}
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
index 4c36896b7..1f1b32d4e 100644
--- a/keyboards/tgr/alice/config.h
+++ b/keyboards/tgr/alice/config.h
@@ -33,6 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
#define DIODE_DIRECTION COL2ROW
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 3
+
#define RGBLED_NUM 18
#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk
index 530e8ea32..a8fea7efa 100644
--- a/keyboards/tgr/alice/rules.mk
+++ b/keyboards/tgr/alice/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 = yes
WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/jane/config.h b/keyboards/tgr/jane/config.h
index dd119d3b0..5fb9a9056 100644
--- a/keyboards/tgr/jane/config.h
+++ b/keyboards/tgr/jane/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/tgr/jane/jane.c b/keyboards/tgr/jane/jane.c
index 4ab0b3007..24183a0f7 100644
--- a/keyboards/tgr/jane/jane.c
+++ b/keyboards/tgr/jane/jane.c
@@ -16,32 +16,22 @@
#include "jane.h"
-void backlight_init_ports(void) {
- // initialize pins D0, D1, D4 and D6 as output
- setPinOutput(D0);
+void keyboard_pre_init_kb(void) {
+ led_init_ports();
+ keyboard_pre_init_user();
+}
+
+void led_init_ports(void) {
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(D1, !led_state.caps_lock);
+ writePin(D6, !led_state.scroll_lock);
}
+ return true;
}