Merge branch 'master' into develop

1 files changed, 8 insertions, 12 deletions

diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c
index 8338453430..544c8dc538 100644
--- a/keyboards/dc01/right/matrix.c
+++ b/keyboards/dc01/right/matrix.c
@@ -31,8 +31,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "i2c_slave.h"
 #include "lufa.h"
+#include "quantum.h"
 
-#define SLAVE_I2C_ADDRESS 0x19
+#define SLAVE_I2C_ADDRESS 0x32
 
 /* Set 0 if debouncing isn't needed */
 
@@ -196,12 +197,10 @@ uint8_t matrix_scan(void)
         }
 #   endif
 
-        if (USB_DeviceState != DEVICE_STATE_Configured){
-            i2c_slave_reg[1] = 0x55;
-            for (uint8_t i = 0; i < MATRIX_ROWS; i++){
-                i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
-            }
-        }
+    i2c_slave_reg[1] = 0x55;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++){
+        i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
+    }
 
     matrix_scan_quantum();
     return 1;
@@ -396,9 +395,6 @@ static void unselect_cols(void)
 
 //this replases tmk code
 void matrix_setup(void){
-
-    if (USB_DeviceState != DEVICE_STATE_Configured){
-        i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
-        sei(); //enable interupts
-    }
+    i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
+    sei(); //enable interupts
 }
\ No newline at end of file