From fe2e611bb1adc71e7e79b71089fa1277111759e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Fri, 3 Nov 2017 03:22:56 +0100
Subject: [PATCH] Update KeyStates[SlotId_RightKeyboardHalf] within
 usb_report_updater.c instead of main.c

---
 right/src/main.c               | 4 ----
 right/src/usb_report_updater.c | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/right/src/main.c b/right/src/main.c
index 531dd02..8ba0060 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -28,10 +28,6 @@ void updateUsbReports(void)
     KeyMatrix_Scan(&KeyMatrix);
 #endif
 
-    for (uint8_t keyId=0; keyId < KEYBOARD_MATRIX_KEY_COUNT; keyId++) {
-        KeyStates[SlotId_RightKeyboardHalf][keyId].current = KeyMatrix.keyStates[keyId];
-    }
-
     ResetActiveUsbBasicKeyboardReport();
     ResetActiveUsbMediaKeyboardReport();
     ResetActiveUsbSystemKeyboardReport();
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 4dfa536..0077b19 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -10,6 +10,7 @@
 #include "led_pwm.h"
 #include "macros.h"
 #include "key_states.h"
+#include "key_matrix_instance.h"
 
 static uint8_t mouseWheelDivisorCounter = 0;
 static uint8_t mouseSpeedAccelDivisorCounter = 0;
@@ -98,6 +99,10 @@ void UpdateActiveUsbReports(void)
     static uint8_t previousModifiers = 0;
     uint8_t activeLayer;
 
+    for (uint8_t keyId=0; keyId < KEYBOARD_MATRIX_KEY_COUNT; keyId++) {
+        KeyStates[SlotId_RightKeyboardHalf][keyId].current = KeyMatrix.keyStates[keyId];
+    }
+
     if (MacroPlaying) {
         Macros_ContinueMacro();
         memcpy(&ActiveUsbMouseReport, &MacroMouseReport, sizeof MacroMouseReport);