vik module split dual pointing support fix, right pointing side wasn'…

…t working
sadekbaroudi · Jun 27, 2024 · ebf4866 · ebf4866
1 parent 48b67e9
commit ebf4866
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 14 deletions.
diff --git a/keyboards/fingerpunch/src/vik/rules.vik.main.pointing.mk b/keyboards/fingerpunch/src/vik/rules.vik.main.pointing.mk
@@ -1,43 +1,68 @@
-ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
-	ifeq ($(strip $(VIK_BUILD_LEFT)), yes)
-	endif
-else
-endif
-
 # Point devices left
 ifeq ($(strip $(VIK_AZOTEQ)), yes)
-	POINTING_DEVICE_ENABLE := yes
-	POINTING_DEVICE_DRIVER := azoteq_iqs5xx
+	ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
+		ifeq ($(strip $(VIK_BUILD_LEFT)), yes)
+			POINTING_DEVICE_ENABLE := yes
+			POINTING_DEVICE_DRIVER := azoteq_iqs5xx
+		endif
+	else
+		POINTING_DEVICE_ENABLE := yes
+		POINTING_DEVICE_DRIVER := azoteq_iqs5xx
+	endif
 	VIK_POINTING_LEFT := yes
 	OPT_DEFS += -DVIK_AZOTEQ
 	OPT_DEFS += -DVIK_POINTING_LEFT
 endif
 
 ifeq ($(strip $(VIK_CIRQUE)), yes)
-	CIRQUE_ENABLE := yes
+	ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
+		ifeq ($(strip $(VIK_BUILD_LEFT)), yes)
+			CIRQUE_ENABLE := yes
+		endif
+	else
+		CIRQUE_ENABLE := yes
+	endif
 	VIK_POINTING_LEFT := yes
 	OPT_DEFS += -DVIK_CIRQUE
 	OPT_DEFS += -DVIK_POINTING_LEFT
 endif
 
 ifeq ($(strip $(VIK_PER56_CIRQUE_LEDS)), yes)
-	CIRQUE_ENABLE = yes
+	ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
+		ifeq ($(strip $(VIK_BUILD_LEFT)), yes)
+			CIRQUE_ENABLE = yes
+		endif
+	else
+		CIRQUE_ENABLE = yes
+	endif
 	VIK_POINTING_LEFT := yes
 	ENCODER_ENABLE = yes
 	OPT_DEFS += -DVIK_PER56_CIRQUE_LEDS
 	OPT_DEFS += -DVIK_POINTING_LEFT
 endif
 
 ifeq ($(strip $(VIK_PER56_PMW3360_LEDS)), yes)
-	PMW3360_ENABLE = yes
+	ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
+		ifeq ($(strip $(VIK_BUILD_LEFT)), yes)
+			PMW3360_ENABLE = yes
+		endif
+	else
+		PMW3360_ENABLE = yes
+	endif
 	VIK_POINTING_LEFT := yes
 	ENCODER_ENABLE = yes
 	OPT_DEFS += -DVIK_PER56_PMW3360_LEDS
 	OPT_DEFS += -DVIK_POINTING_LEFT
 endif
 
 ifeq ($(strip $(VIK_PMW3360)), yes)
-	PMW3360_ENABLE = yes
+	ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
+		ifeq ($(strip $(VIK_BUILD_LEFT)), yes)
+			PMW3360_ENABLE = yes
+		endif
+	else
+		PMW3360_ENABLE = yes
+	endif
 	VIK_POINTING_LEFT := yes
 	OPT_DEFS += -DVIK_PMW3360
 	OPT_DEFS += -DVIK_POINTING_LEFT

diff --git a/keyboards/fingerpunch/ximega/config.h b/keyboards/fingerpunch/ximega/config.h
@@ -161,9 +161,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(VIK_PMW3360_RIGHT) || defined(VIK_PER56_PMW3360_LEDS_RIGHT)
     #ifdef POINTING_DEVICE_COMBINED
-        #define POINTING_DEVICE_INVERT_Y_RIGHT
+        #define POINTING_DEVICE_INVERT_X_RIGHT
     #else
-        #define POINTING_DEVICE_INVERT_Y
+        #define POINTING_DEVICE_INVERT_X
     #endif
 #endif