Merge branch 'avoid-slave-side-encoder-setup' into variants

kermite-org · Dec 3, 2024 · 977f335 · 977f335
2 parents 6e14dda + 3897a5d
commit 977f335
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/firmware/src/modules/km0/wrapper/splitKeyboard.c b/firmware/src/modules/km0/wrapper/splitKeyboard.c
@@ -76,7 +76,7 @@ static uint8_t sw_txbuf[SingleWireMaxPacketSize] = { 0 };
 static uint8_t sw_rxbuf[SingleWireMaxPacketSize] = { 0 };
 
 bool isRightHand = false;
-void (*boardConfigCallback)(int8_t side) = NULL;
+void (*boardConfigCallback)(int8_t side, bool isMaster) = NULL;
 
 int8_t configuredBoardSide = -1;
 
@@ -97,12 +97,12 @@ static void taskForEach100ms(void (*taskFunc)(uint32_t)) {
 
 //-------------------------------------------------------
 
-static void setBoardSide(int8_t side) {
+static void setBoardSide(int8_t side, bool isMaster) {
   if (side != configuredBoardSide) {
     isRightHand = side == 1;
     printf("board side: %s\n", isRightHand ? "RIGHT" : "LEFT");
     if (boardConfigCallback) {
-      boardConfigCallback(side);
+      boardConfigCallback(side, isMaster);
     }
     configuredBoardSide = side;
   }
@@ -254,7 +254,7 @@ static void master_handleMasterParameterChanged(uint8_t eventType, uint8_t param
     enqueueMasterStatePacket(SplitOp_MasterParameterChanged, parameterIndex, value);
   }
   if (pi == SystemParameter_MasterSide) {
-    setBoardSide(value);
+    setBoardSide(value, true);
   }
 }
 
@@ -264,7 +264,7 @@ static void master_handleMasterKeySlotStateChanged(uint8_t slotIndex, bool isDow
 
 static void master_setupBoard() {
   uint8_t side = configManager_readParameter(SystemParameter_MasterSide);
-  setBoardSide(side);
+  setBoardSide(side, true);
 }
 
 static void master_ledTask(uint32_t step) {
@@ -424,7 +424,7 @@ static void slave_consumeMasterStatePackets() {
       if (parameterIndex == SystemParameter_MasterSide) {
         uint8_t masterSide = value;
         uint8_t slaveSide = (masterSide == 0) ? 1 : 0;
-        setBoardSide(slaveSide);
+        setBoardSide(slaveSide, false);
       }
     }
   }
@@ -609,7 +609,7 @@ void splitKeyboard_setNumScanSlots(uint8_t _numScanSlotsLeft, uint8_t _numScanSl
   numScanSlotBytesRight = (numScanSlotsRight + 7) / 8;
 }
 
-void splitKeyboard_setBoardConfigCallback(void (*callback)(int8_t side)) {
+void splitKeyboard_setBoardConfigCallback(void (*callback)(int8_t side, bool isMaster)) {
   boardConfigCallback = callback;
 }
 

diff --git a/firmware/src/modules/km0/wrapper/splitKeyboard.h b/firmware/src/modules/km0/wrapper/splitKeyboard.h
@@ -3,5 +3,5 @@
 #include "km0/types.h"
 
 void splitKeyboard_setNumScanSlots(uint8_t numScanSlotsLeft, uint8_t numScanSlotsRight);
-void splitKeyboard_setBoardConfigCallback(void (*callback)(int8_t side));
+void splitKeyboard_setBoardConfigCallback(void (*callback)(int8_t side, bool isMaster));
 void splitKeyboard_start();
diff --git a/firmware/src/projects/standard/common/main_split.c b/firmware/src/projects/standard/common/main_split.c
@@ -75,7 +75,7 @@ KermiteKeyboardDefinitionData defs = {
 static EncoderConfig encoderConfigs[1] = { { .pinA = 0, .pinB = 0, .scanIndexBase = 0 } };
 static EncoderConfig encoderConfigsR[1] = { { .pinA = 0, .pinB = 0, .scanIndexBase = 0 } };
 
-static void setupBoard(int8_t side) {
+static void setupBoard(int8_t side, bool isMaster) {
 
   uint8_t *pins = defs.keyScannerPins;
 
@@ -139,17 +139,25 @@ static void setupBoard(int8_t side) {
       config->pinA = encoderPins[0];
       config->pinB = encoderPins[1];
       config->scanIndexBase = scanIndexBaseL;
-      keyScanner_encoders_initialize(1, encoderConfigs);
-      keyboardMain_useKeyScanner(keyScanner_encoders_update);
+      if (isMaster) {
+        keyScanner_encoders_initialize(1, encoderConfigs);
+        keyboardMain_useKeyScanner(keyScanner_encoders_update);
+      } else {
+        //encoders are not supported in slave side
+      }
       scanIndexBaseL += 2;
     }
     if (side == 1 && defs.numEncoderRight == 1) {
       EncoderConfig *config = &encoderConfigsR[0];
       config->pinA = encoderPinsR[0];
       config->pinB = encoderPinsR[1];
       config->scanIndexBase = scanIndexBaseR;
-      keyScanner_encoders_initialize(1, encoderConfigs);
-      keyboardMain_useKeyScanner(keyScanner_encoders_update);
+      if (isMaster) {
+        keyScanner_encoders_initialize(1, encoderConfigs);
+        keyboardMain_useKeyScanner(keyScanner_encoders_update);
+      } else {
+        //encoders are not supported in slave side
+      }
       scanIndexBaseR += 2;
     }
   }