jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly fix i2c leds for ergodox shine (#356)

Browse Source
This commit is contained in:
Drashna Jaelre
2022-08-04 17:32:04 -07:00
committed by GitHub
parent e14aa9223b
commit b6657f6a7b
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
keyboards/ergodox_ez/led_i2c.c
View File

@@ -21,35 +21,38 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
# include "ergodox_ez.h" # include "ergodox_ez.h"
i2c_status_t i2c_rgblight = 0x20; bool i2c_rgblight = true;
extern bool i2c_initialized; extern bool i2c_initialized;
void rgblight_call_driver(LED_TYPE *led, uint8_t led_num) { void rgblight_call_driver(LED_TYPE *led, uint8_t led_num) {
if (i2c_initialized && !mcp23018_status) { if (i2c_initialized && !mcp23018_status && i2c_rgblight) {
if (!i2c_rgblight) i2c_rgblight = i2c_start(0x84, ERGODOX_EZ_I2C_TIMEOUT); if (i2c_start(0x84, ERGODOX_EZ_I2C_TIMEOUT)) {
i2c_rgblight = false;
uint8_t i = 0; i2c_stop();
} else {
uint8_t i = 0;
# if defined(ERGODOX_LED_30) # if defined(ERGODOX_LED_30)
// prevent right-half code from trying to bitbang all 30 // prevent right-half code from trying to bitbang all 30
// so with 30 LEDs, we count from 29 to 15 here, and the // so with 30 LEDs, we count from 29 to 15 here, and the
// other half does 0 to 14. // other half does 0 to 14.
uint8_t half_led_num = RGBLED_NUM / 2; uint8_t half_led_num = RGBLED_NUM / 2;
for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i) for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i)
# elif defined(ERGODOX_LED_15_MIRROR) # elif defined(ERGODOX_LED_15_MIRROR)
for (i = 0; i < led_num; ++i) for (i = 0; i < led_num; ++i)
# else // ERGDOX_LED_15 non-mirrored # else // ERGDOX_LED_15 non-mirrored
for (i = led_num - 1; i >= 0; --i) for (i = led_num - 1; i >= 0; --i)
# endif # endif
{ {
uint8_t *data = (uint8_t *)(led + i); uint8_t *data = (uint8_t *)(led + i);
if (!i2c_rgblight) i2c_rgblight = i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT); i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
if (!i2c_rgblight) i2c_rgblight = i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT); i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
if (!i2c_rgblight) i2c_rgblight = i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT); i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
# ifdef RGBW # ifdef RGBW
if (!i2c_rgblight) i2c_rgblight = i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT); i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
# endif # endif
}
i2c_stop();
} }
i2c_stop();
} }
ws2812_setleds(led, led_num); ws2812_setleds(led, led_num);

5
keyboards/ergodox_ez/matrix.c
View File

@@ -64,7 +64,7 @@ static void select_row(uint8_t row);
static uint8_t mcp23018_reset_loop; static uint8_t mcp23018_reset_loop;
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
extern i2c_status_t i2c_rgblight; extern bool i2c_rgblight;
#endif #endif
void matrix_init_custom(void) { void matrix_init_custom(void) {
@@ -101,7 +101,8 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
rgb_matrix_init(); // re-init driver on reconnect rgb_matrix_init(); // re-init driver on reconnect
#endif #endif
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
i2c_rgblight = 0x20; // re-enable rgb light i2c_rgblight = true; // re-enable rgb light
rgblight_init();
#endif #endif
} }
} }