summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/iris/matrix.c11
-rw-r--r--keyboards/levinson/matrix.c25
2 files changed, 28 insertions, 8 deletions
diff --git a/keyboards/iris/matrix.c b/keyboards/iris/matrix.c
index dcfc0216e..7195fb0ea 100644
--- a/keyboards/iris/matrix.c
+++ b/keyboards/iris/matrix.c
@@ -30,7 +30,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pro_micro.h"
#include "config.h"
#include "timer.h"
-#include "backlight.h"
+
+#ifdef BACKLIGHT_ENABLE
+ #include "backlight.h"
+ extern backlight_config_t backlight_config;
+#endif
#ifdef USE_I2C
# include "i2c.h"
@@ -86,7 +90,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
static void select_col(uint8_t col);
#endif
-
__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
@@ -202,7 +205,7 @@ int i2c_transaction(void) {
#ifdef BACKLIGHT_ENABLE
// Write backlight level for slave to read
- err = i2c_master_write(get_backlight_level());
+ err = i2c_master_write(backlight_config.enable ? backlight_config.level : 0);
#else
// Write zero, so our byte index is the same
err = i2c_master_write(0x00);
@@ -244,7 +247,7 @@ int serial_transaction(void) {
#ifdef BACKLIGHT_ENABLE
// Write backlight level for slave to read
- serial_master_buffer[SERIAL_LED_ADDR] = get_backlight_level();
+ serial_master_buffer[SERIAL_LED_ADDR] = backlight_config.enable ? backlight_config.level : 0;
#endif
return 0;
}
diff --git a/keyboards/levinson/matrix.c b/keyboards/levinson/matrix.c
index ed913f34b..7195fb0ea 100644
--- a/keyboards/levinson/matrix.c
+++ b/keyboards/levinson/matrix.c
@@ -1,5 +1,5 @@
/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2017 Danny Nguyen <danny@keeb.io>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,7 +30,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pro_micro.h"
#include "config.h"
#include "timer.h"
-#include "backlight.h"
+
+#ifdef BACKLIGHT_ENABLE
+ #include "backlight.h"
+ extern backlight_config_t backlight_config;
+#endif
#ifdef USE_I2C
# include "i2c.h"
@@ -199,6 +203,15 @@ int i2c_transaction(void) {
err = i2c_master_write(0x00);
if (err) goto i2c_error;
+#ifdef BACKLIGHT_ENABLE
+ // Write backlight level for slave to read
+ err = i2c_master_write(backlight_config.enable ? backlight_config.level : 0);
+#else
+ // Write zero, so our byte index is the same
+ err = i2c_master_write(0x00);
+#endif
+ if (err) goto i2c_error;
+
// Start read
err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
if (err) goto i2c_error;
@@ -234,7 +247,7 @@ int serial_transaction(void) {
#ifdef BACKLIGHT_ENABLE
// Write backlight level for slave to read
- serial_master_buffer[SERIAL_LED_ADDR] = get_backlight_level();
+ serial_master_buffer[SERIAL_LED_ADDR] = backlight_config.enable ? backlight_config.level : 0;
#endif
return 0;
}
@@ -276,8 +289,12 @@ void matrix_slave_scan(void) {
int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
#ifdef USE_I2C
+#ifdef BACKLIGHT_ENABLE
+ // Read backlight level sent from master and update level on slave
+ backlight_set(i2c_slave_buffer[0]);
+#endif
for (int i = 0; i < ROWS_PER_HAND; ++i) {
- i2c_slave_buffer[i] = matrix[offset+i];
+ i2c_slave_buffer[i+1] = matrix[offset+i];
}
#else // USE_SERIAL
for (int i = 0; i < ROWS_PER_HAND; ++i) {