diff options
Diffstat (limited to 'drivers/issi/is31fl3736.c')
| -rw-r--r-- | drivers/issi/is31fl3736.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/issi/is31fl3736.c b/drivers/issi/is31fl3736.c index 754292425..9bd8fecfb 100644 --- a/drivers/issi/is31fl3736.c +++ b/drivers/issi/is31fl3736.c | |||
| @@ -14,18 +14,9 @@ | |||
| 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 | #ifdef __AVR__ | ||
| 18 | # include <avr/interrupt.h> | ||
| 19 | # include <avr/io.h> | ||
| 20 | # include <util/delay.h> | ||
| 21 | #else | ||
| 22 | # include "wait.h" | ||
| 23 | #endif | ||
| 24 | |||
| 25 | #include "is31fl3736.h" | 17 | #include "is31fl3736.h" |
| 26 | #include <string.h> | ||
| 27 | #include "i2c_master.h" | 18 | #include "i2c_master.h" |
| 28 | #include "progmem.h" | 19 | #include "wait.h" |
| 29 | 20 | ||
| 30 | // This is a 7-bit address, that gets left-shifted and bit 0 | 21 | // This is a 7-bit address, that gets left-shifted and bit 0 |
| 31 | // set to 0 for write, 1 for read (as per I2C protocol) | 22 | // set to 0 for write, 1 for read (as per I2C protocol) |
| @@ -154,12 +145,8 @@ void IS31FL3736_init(uint8_t addr) { | |||
| 154 | // Disable software shutdown. | 145 | // Disable software shutdown. |
| 155 | IS31FL3736_write_register(addr, ISSI_REG_CONFIGURATION, 0x01); | 146 | IS31FL3736_write_register(addr, ISSI_REG_CONFIGURATION, 0x01); |
| 156 | 147 | ||
| 157 | // Wait 10ms to ensure the device has woken up. | 148 | // Wait 10ms to ensure the device has woken up. |
| 158 | #ifdef __AVR__ | ||
| 159 | _delay_ms(10); | ||
| 160 | #else | ||
| 161 | wait_ms(10); | 149 | wait_ms(10); |
| 162 | #endif | ||
| 163 | } | 150 | } |
| 164 | 151 | ||
| 165 | void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { | 152 | void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { |
| @@ -263,7 +250,7 @@ void IS31FL3736_update_pwm_buffers(uint8_t addr1, uint8_t addr2) { | |||
| 263 | IS31FL3736_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); | 250 | IS31FL3736_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); |
| 264 | 251 | ||
| 265 | IS31FL3736_write_pwm_buffer(addr1, g_pwm_buffer[0]); | 252 | IS31FL3736_write_pwm_buffer(addr1, g_pwm_buffer[0]); |
| 266 | // IS31FL3736_write_pwm_buffer( addr2, g_pwm_buffer[1] ); | 253 | // IS31FL3736_write_pwm_buffer(addr2, g_pwm_buffer[1]); |
| 267 | } | 254 | } |
| 268 | g_pwm_buffer_update_required = false; | 255 | g_pwm_buffer_update_required = false; |
| 269 | } | 256 | } |
| @@ -275,7 +262,7 @@ void IS31FL3736_update_led_control_registers(uint8_t addr1, uint8_t addr2) { | |||
| 275 | IS31FL3736_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); | 262 | IS31FL3736_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); |
| 276 | for (int i = 0; i < 24; i++) { | 263 | for (int i = 0; i < 24; i++) { |
| 277 | IS31FL3736_write_register(addr1, i, g_led_control_registers[0][i]); | 264 | IS31FL3736_write_register(addr1, i, g_led_control_registers[0][i]); |
| 278 | // IS31FL3736_write_register(addr2, i, g_led_control_registers[1][i] ); | 265 | // IS31FL3736_write_register(addr2, i, g_led_control_registers[1][i]); |
| 279 | } | 266 | } |
| 280 | } | 267 | } |
| 281 | } | 268 | } |
