_/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix led enabled slave (#3022)

Browse source 
* Account for backlight enabled flag when passing backlight level to slave

* Add BL_TOGG to keymap for testing

* Apply backlight fix to Iris

* Port I2C LED backlight control from Iris to Levinson
This commit is contained in:
Danny 2018-05-22 15:40:43 -04:00 committed by Drashna Jaelre
parent 4b1f60a3f5
commit 7658f10fba
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
keyboards/iris/matrix.c
View file

@ -30,7 +30,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pro_micro.h" #include "pro_micro.h"
#include "config.h" #include "config.h"
#include "timer.h" #include "timer.h"
#include "backlight.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
extern backlight_config_t backlight_config;
#endif
#ifdef USE_I2C #ifdef USE_I2C
# include "i2c.h" # include "i2c.h"
@ -86,7 +90,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
static void select_col(uint8_t col); static void select_col(uint8_t col);
#endif #endif
__attribute__ ((weak)) __attribute__ ((weak))
void matrix_init_kb(void) { void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
@ -202,7 +205,7 @@ int i2c_transaction(void) {
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
// Write backlight level for slave to read // 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 #else
// Write zero, so our byte index is the same // Write zero, so our byte index is the same
err = i2c_master_write(0x00); err = i2c_master_write(0x00);
@ -244,7 +247,7 @@ int serial_transaction(void) {
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
// Write backlight level for slave to read // 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 #endif
return 0; return 0;
} }

25
keyboards/levinson/matrix.c
View file

@ -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 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 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 "pro_micro.h"
#include "config.h" #include "config.h"
#include "timer.h" #include "timer.h"
#include "backlight.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
extern backlight_config_t backlight_config;
#endif
#ifdef USE_I2C #ifdef USE_I2C
# include "i2c.h" # include "i2c.h"
@ -199,6 +203,15 @@ int i2c_transaction(void) {
err = i2c_master_write(0x00); err = i2c_master_write(0x00);
if (err) goto i2c_error; 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 // Start read
err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ); err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
if (err) goto i2c_error; if (err) goto i2c_error;
@ -234,7 +247,7 @@ int serial_transaction(void) {
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
// Write backlight level for slave to read // 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 #endif
return 0; return 0;
} }
@ -276,8 +289,12 @@ void matrix_slave_scan(void) {
int offset = (isLeftHand) ? 0 : ROWS_PER_HAND; int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
#ifdef USE_I2C #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) { 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 #else // USE_SERIAL
for (int i = 0; i < ROWS_PER_HAND; ++i) { for (int i = 0; i < ROWS_PER_HAND; ++i) {

3
layouts/community/ortho_4x12/bakingpy/keymap.c
View file

@ -34,6 +34,7 @@ enum custom_keycodes {
#define KC_GRVF LT(_FKEYS, KC_GRV) #define KC_GRVF LT(_FKEYS, KC_GRV)
#define KC_ENTS MT(MOD_LSFT, KC_ENT) #define KC_ENTS MT(MOD_LSFT, KC_ENT)
#define KC_BL_S BL_STEP #define KC_BL_S BL_STEP
#define KC_BL_T BL_TOGG
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@ -81,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, , ,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
BL_S, , , , ,DEL , DEL , , P0 ,PDOT, , BL_S,BL_T, , , ,DEL , DEL , , P0 ,PDOT, ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),