summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authoryiancar <yiangosyiangou@cytanet.com.cy>2018-05-14 16:17:24 +0200
committerJack Humbert <jack.humb@gmail.com>2018-05-14 16:17:24 +0200
commita98a91cf1b923107e9f26df316c1ef2192ff14f7 (patch)
tree112b22b9ee2f212b4a58e57d2e4b4906d1ef7636 /quantum
parentf42ec8aa866386ed0ab8faf7acf9c396aa482519 (diff)
downloadqmk_firmware-a98a91cf1b923107e9f26df316c1ef2192ff14f7.tar.gz
qmk_firmware-a98a91cf1b923107e9f26df316c1ef2192ff14f7.tar.xz
Rgb matrix fixes, I2C library can now retry if it has failed (#2943)
* Added Modular keyboards L,R and NUM Created code modules for the 3 modules of the modular keyboard. Original idea by MechboardsUK. Uses i2c implementation similar to lets split * Remove modular from master This is to fix incorrect branching * General fixes for RGB_matrix - Complited speed support for all effects - Fixed raindrop effects to initialized after toggle - Fixed raindrop effects to use all available LEDs - Fixed effect step reverse function - Moved RGB_MATRIX_SOLID_REACTIVE under correct flag * Documentation update for RGBmatrix * More doc updates * I2C library can now retry if it has failed - Replaced the original TWIlib by LFKeyboard's modified version - Allows for an extra argument on TWITransmitData, if blocking is set to 1 function will retry to transmit on failure. Good for noisy boards. * RGB Matrix, use alternative I2C library TWIlib seems to be hanging for me sometimes probably due to ISR routine. I have used i2c_master as a good alternative. Note: this commit is for Wilba6582 to verify before merge * Update rgb_matrix.c * RGB matrix cleanup - Remove TWIlib
Diffstat (limited to 'quantum')
-rw-r--r--quantum/rgb_matrix.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c
index f3d012bc3..992ce99de 100644
--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -18,7 +18,7 @@
#include "rgb_matrix.h"
#include <avr/io.h>
-#include "TWIlib.h"
+#include "i2c_master.h"
#include <util/delay.h>
#include <avr/interrupt.h>
#include "progmem.h"
@@ -722,10 +722,8 @@ void rgb_matrix_indicators_user(void) {}
// }
void rgb_matrix_init_drivers(void) {
- //sei();
-
// Initialize TWI
- TWIInit();
+ i2c_init();
IS31FL3731_init( DRIVER_ADDR_1 );
IS31FL3731_init( DRIVER_ADDR_2 );