diff options
author | fauxpark <fauxpark@gmail.com> | 2019-11-05 11:05:03 +1100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-11-04 16:05:03 -0800 |
commit | efa28d0f5cca55b0dfecaddd0860ec3dfeab8bb0 (patch) | |
tree | aab048a027771fa8ab55b535bce64e101e861680 /keyboards/ares | |
parent | 0a9a69394e132c3d00eddffd2e345f48113e56c4 (diff) | |
download | qmk_firmware-efa28d0f5cca55b0dfecaddd0860ec3dfeab8bb0.tar.gz qmk_firmware-efa28d0f5cca55b0dfecaddd0860ec3dfeab8bb0.zip |
Convert some PS2AVRGB boards to I2C WS2812 driver (#7241)
* Convert some PS2AVRGB boards to I2C WS2812 driver
* Fix Travis failure for bface
Diffstat (limited to 'keyboards/ares')
-rw-r--r-- | keyboards/ares/ares.c | 72 | ||||
-rw-r--r-- | keyboards/ares/rules.mk | 19 |
2 files changed, 5 insertions, 86 deletions
diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c index 85c7435ed..07276491c 100644 --- a/keyboards/ares/ares.c +++ b/keyboards/ares/ares.c | |||
@@ -17,50 +17,12 @@ 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 RGBLIGHT_ENABLE | ||
21 | |||
22 | #include <string.h> | ||
23 | #include "i2c_master.h" | ||
24 | #include "rgblight.h" | ||
25 | |||
26 | extern rgblight_config_t rgblight_config; | ||
27 | |||
28 | void matrix_init_kb(void) { | ||
29 | i2c_init(); | ||
30 | // call user level keymaps, if any | ||
31 | matrix_init_user(); | ||
32 | } | ||
33 | |||
34 | // custom RGB driver | ||
35 | void rgblight_set(void) { | ||
36 | if (!rgblight_config.enable) { | ||
37 | memset(led, 0, 3 * RGBLED_NUM); | ||
38 | } | ||
39 | |||
40 | i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100); | ||
41 | } | ||
42 | |||
43 | bool rgb_init = false; | ||
44 | |||
45 | void matrix_scan_kb(void) { | ||
46 | // if LEDs were previously on before poweroff, turn them back on | ||
47 | if (rgb_init == false && rgblight_config.enable) { | ||
48 | i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100); | ||
49 | rgb_init = true; | ||
50 | } | ||
51 | |||
52 | rgblight_task(); | ||
53 | matrix_scan_user(); | ||
54 | } | ||
55 | |||
56 | #endif | ||
57 | |||
58 | #ifdef BACKLIGHT_ENABLE | 20 | #ifdef BACKLIGHT_ENABLE |
59 | void backlight_init_ports(void) { | 21 | void backlight_init_ports(void) { |
60 | setPinOutput(D0); | 22 | setPinOutput(D0); |
61 | setPinOutput(D1); | 23 | setPinOutput(D1); |
62 | setPinOutput(D4); | 24 | setPinOutput(D4); |
63 | setPinOutput(D6); | 25 | setPinOutput(D6); |
64 | } | 26 | } |
65 | 27 | ||
66 | void backlight_set(uint8_t level) { | 28 | void backlight_set(uint8_t level) { |
@@ -79,29 +41,3 @@ void backlight_set(uint8_t level) { | |||
79 | } | 41 | } |
80 | } | 42 | } |
81 | #endif | 43 | #endif |
82 | |||
83 | // Optional override functions below. | ||
84 | // You can leave any or all of these undefined. | ||
85 | // These are only required if you want to perform custom actions. | ||
86 | |||
87 | /* | ||
88 | void matrix_init_kb(void) { | ||
89 | // put your keyboard start-up code here | ||
90 | // runs once when the firmware starts up | ||
91 | matrix_init_user(); | ||
92 | } | ||
93 | void matrix_scan_kb(void) { | ||
94 | // put your looping keyboard code here | ||
95 | // runs every cycle (a lot) | ||
96 | matrix_scan_user(); | ||
97 | } | ||
98 | bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||
99 | // put your per-action keyboard code here | ||
100 | // runs for every action, just before processing by the firmware | ||
101 | return process_record_user(keycode, record); | ||
102 | } | ||
103 | void led_set_kb(uint8_t usb_led) { | ||
104 | // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here | ||
105 | led_set_user(usb_led); | ||
106 | } | ||
107 | */ \ No newline at end of file | ||
diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk index 3ac90cf97..58d36bc67 100644 --- a/keyboards/ares/rules.mk +++ b/keyboards/ares/rules.mk | |||
@@ -1,18 +1,3 @@ | |||
1 | # Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> | ||
2 | # | ||
3 | # This program is free software: you can redistribute it and/or modify | ||
4 | # it under the terms of the GNU General Public License as published by | ||
5 | # the Free Software Foundation, either version 2 of the License, or | ||
6 | # (at your option) any later version. | ||
7 | # | ||
8 | # This program is distributed in the hope that it will be useful, | ||
9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | # GNU General Public License for more details. | ||
12 | # | ||
13 | # You should have received a copy of the GNU General Public License | ||
14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | |||
16 | # MCU name | 1 | # MCU name |
17 | MCU = atmega32a | 2 | MCU = atmega32a |
18 | 3 | ||
@@ -34,8 +19,6 @@ CONSOLE_ENABLE = yes | |||
34 | COMMAND_ENABLE = yes | 19 | COMMAND_ENABLE = yes |
35 | BACKLIGHT_ENABLE = no | 20 | BACKLIGHT_ENABLE = no |
36 | RGBLIGHT_ENABLE = no | 21 | RGBLIGHT_ENABLE = no |
37 | RGBLIGHT_CUSTOM_DRIVER = yes | 22 | WS2812_DRIVER = i2c |
38 | 23 | ||
39 | OPT_DEFS = -DDEBUG_LEVEL=0 | 24 | OPT_DEFS = -DDEBUG_LEVEL=0 |
40 | |||
41 | SRC += i2c_master.c | ||