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/unikorn | |
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/unikorn')
-rw-r--r-- | keyboards/unikorn/readme.md | 1 | ||||
-rw-r--r-- | keyboards/unikorn/rules.mk | 19 | ||||
-rw-r--r-- | keyboards/unikorn/unikorn.c | 50 |
3 files changed, 5 insertions, 65 deletions
diff --git a/keyboards/unikorn/readme.md b/keyboards/unikorn/readme.md index 3175cddc2..1f8b16d64 100644 --- a/keyboards/unikorn/readme.md +++ b/keyboards/unikorn/readme.md | |||
@@ -18,7 +18,6 @@ To enable RGB lighting support, install the necessary components and set RGBLIGH | |||
18 | 18 | ||
19 | ``` | 19 | ``` |
20 | RGBLIGHT_ENABLE = yes | 20 | RGBLIGHT_ENABLE = yes |
21 | RGBLIGHT_CUSTOM_DRIVER = yes | ||
22 | ``` | 21 | ``` |
23 | 22 | ||
24 | 23 | ||
diff --git a/keyboards/unikorn/rules.mk b/keyboards/unikorn/rules.mk index d4f4d2aaf..e57c21c85 100644 --- a/keyboards/unikorn/rules.mk +++ b/keyboards/unikorn/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 = yes | 20 | BACKLIGHT_ENABLE = yes |
36 | RGBLIGHT_ENABLE = no | 21 | RGBLIGHT_ENABLE = no |
37 | RGBLIGHT_CUSTOM_DRIVER = no | 22 | WS2812_DRIVER = i2c |
38 | 23 | ||
39 | OPT_DEFS = -DDEBUG_LEVEL=0 | 24 | OPT_DEFS = -DDEBUG_LEVEL=0 |
40 | |||
41 | SRC = i2c_master.c | ||
diff --git a/keyboards/unikorn/unikorn.c b/keyboards/unikorn/unikorn.c index 1bd47ef9e..70bc5a988 100644 --- a/keyboards/unikorn/unikorn.c +++ b/keyboards/unikorn/unikorn.c | |||
@@ -14,49 +14,7 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "i2c_master.h" | 17 | #include "unikorn.h" |
18 | #include "quantum.h" | ||
19 | |||
20 | #ifdef RGBLIGHT_ENABLE | ||
21 | #include "rgblight.h" | ||
22 | extern rgblight_config_t rgblight_config; | ||
23 | |||
24 | void rgblight_set(void) { | ||
25 | if (!rgblight_config.enable) { | ||
26 | for (uint8_t i = 0; i < RGBLED_NUM; i++) { | ||
27 | led[i].r = 0; | ||
28 | led[i].g = 0; | ||
29 | led[i].b = 0; | ||
30 | } | ||
31 | } | ||
32 | |||
33 | i2c_init(); | ||
34 | i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100); | ||
35 | } | ||
36 | #endif | ||
37 | |||
38 | void matrix_init_kb(void) { | ||
39 | #ifdef RGBLIGHT_ENABLE | ||
40 | if (rgblight_config.enable) { | ||
41 | i2c_init(); | ||
42 | i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100); | ||
43 | } | ||
44 | #endif | ||
45 | // call user level keymaps, if any | ||
46 | matrix_init_user(); | ||
47 | } | ||
48 | |||
49 | void matrix_scan_kb(void) { | ||
50 | #ifdef RGBLIGHT_ENABLE | ||
51 | rgblight_task(); | ||
52 | #endif | ||
53 | matrix_scan_user(); | ||
54 | /* Nothing else for now. */ | ||
55 | } | ||
56 | |||
57 | __attribute__ ((weak)) | ||
58 | void matrix_scan_user(void) { | ||
59 | } | ||
60 | 18 | ||
61 | void backlight_init_ports(void) { | 19 | void backlight_init_ports(void) { |
62 | // initialize pins D0, D1, D4 and D6 as output | 20 | // initialize pins D0, D1, D4 and D6 as output |
@@ -73,17 +31,17 @@ void backlight_init_ports(void) { | |||
73 | } | 31 | } |
74 | 32 | ||
75 | void backlight_set(uint8_t level) { | 33 | void backlight_set(uint8_t level) { |
76 | if (level == 0) { | 34 | if (level == 0) { |
77 | // turn backlight LEDs off | 35 | // turn backlight LEDs off |
78 | writePinLow(D0); | 36 | writePinLow(D0); |
79 | writePinLow(D1); | 37 | writePinLow(D1); |
80 | writePinLow(D4); | 38 | writePinLow(D4); |
81 | writePinLow(D6); | 39 | writePinLow(D6); |
82 | } else { | 40 | } else { |
83 | // turn backlight LEDs on | 41 | // turn backlight LEDs on |
84 | writePinHigh(D0); | 42 | writePinHigh(D0); |
85 | writePinHigh(D1); | 43 | writePinHigh(D1); |
86 | writePinHigh(D4); | 44 | writePinHigh(D4); |
87 | writePinHigh(D6); | 45 | writePinHigh(D6); |
88 | } | 46 | } |
89 | } | 47 | } |