diff options
author | fauxpark <fauxpark@gmail.com> | 2020-01-19 18:00:32 +1100 |
---|---|---|
committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-01-18 23:00:32 -0800 |
commit | f5209aa4e941c7f3a942ef4a7e256ab432ec98ce (patch) | |
tree | 29c2a0d197050ff2accb920731ddb1d022cb2a90 /keyboards/ares | |
parent | eb5d267e637db4c2c639932b8c8176bf47dff78f (diff) | |
download | qmk_firmware-f5209aa4e941c7f3a942ef4a7e256ab432ec98ce.tar.gz qmk_firmware-f5209aa4e941c7f3a942ef4a7e256ab432ec98ce.zip |
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/ares')
-rw-r--r-- | keyboards/ares/ares.c | 34 | ||||
-rw-r--r-- | keyboards/ares/config.h | 3 | ||||
-rw-r--r-- | keyboards/ares/rules.mk | 2 |
3 files changed, 16 insertions, 23 deletions
diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c index 07276491c..e6379cb18 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/>. | |||
17 | 17 | ||
18 | #include "ares.h" | 18 | #include "ares.h" |
19 | 19 | ||
20 | #ifdef BACKLIGHT_ENABLE | 20 | void keyboard_pre_init_kb(void) { |
21 | void backlight_init_ports(void) { | 21 | led_init_ports(); |
22 | setPinOutput(D0); | 22 | keyboard_pre_init_user(); |
23 | setPinOutput(D1); | ||
24 | setPinOutput(D4); | ||
25 | setPinOutput(D6); | ||
26 | } | 23 | } |
27 | 24 | ||
28 | void backlight_set(uint8_t level) { | 25 | void led_init_ports(void) { |
29 | if (level == 0) { | 26 | setPinOutput(D1); |
30 | // Turn out the lights | 27 | writePinHigh(D1); |
31 | writePinLow(D0); | 28 | } |
32 | writePinLow(D1); | 29 | |
33 | writePinLow(D4); | 30 | bool led_update_kb(led_t led_state) { |
34 | writePinLow(D6); | 31 | if (led_update_user(led_state)) { |
35 | } else { | 32 | writePin(D1, !led_state.caps_lock); |
36 | // Turn on the lights | 33 | } |
37 | writePinHigh(D0); | 34 | return true; |
38 | writePinHigh(D1); | ||
39 | writePinHigh(D4); | ||
40 | writePinHigh(D6); | ||
41 | } | ||
42 | } | 35 | } |
43 | #endif | ||
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h index f0aa926ea..c50587db9 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/>. | |||
37 | #define DIODE_DIRECTION COL2ROW | 37 | #define DIODE_DIRECTION COL2ROW |
38 | #define DEBOUNCE 5 | 38 | #define DEBOUNCE 5 |
39 | 39 | ||
40 | #define BACKLIGHT_LEVELS 1 | 40 | #define BACKLIGHT_PIN D4 |
41 | #define BACKLIGHT_LEVELS 3 | ||
41 | #define RGBLIGHT_ANIMATIONS | 42 | #define RGBLIGHT_ANIMATIONS |
42 | 43 | ||
43 | #define NO_UART 1 | 44 | #define NO_UART 1 |
diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk index 58d36bc67..f54074172 100644 --- a/keyboards/ares/rules.mk +++ b/keyboards/ares/rules.mk | |||
@@ -17,7 +17,7 @@ MOUSEKEY_ENABLE = no | |||
17 | EXTRAKEY_ENABLE = yes | 17 | EXTRAKEY_ENABLE = yes |
18 | CONSOLE_ENABLE = yes | 18 | CONSOLE_ENABLE = yes |
19 | COMMAND_ENABLE = yes | 19 | COMMAND_ENABLE = yes |
20 | BACKLIGHT_ENABLE = no | 20 | BACKLIGHT_ENABLE = yes |
21 | RGBLIGHT_ENABLE = no | 21 | RGBLIGHT_ENABLE = no |
22 | WS2812_DRIVER = i2c | 22 | WS2812_DRIVER = i2c |
23 | 23 | ||