fixing dust

youknowfred · Dec 6, 2022 · 348c978 · 348c978
1 parent 15346f4
commit 348c978
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 deletions.
diff --git a/keyboards/jasonhazel/bad_wings/config.h b/keyboards/jasonhazel/bad_wings/config.h
@@ -23,12 +23,8 @@
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
 
-#ifdef TRACKPAD_ENABLED
-  #define POINTING_DEVICE_CS_PIN GP1
+#define POINTING_DEVICE_CS_PIN GP1
 
-  #define POINTING_DEVICE_ROTATION_90
+#define POINTING_DEVICE_ROTATION_90
 
-  #ifndef CIRQUE_PINNACLE_DIAMETER_MM
-    #define CIRQUE_PINNACLE_DIAMETER_MM 35
-  #endif
-#endif
+#define CIRQUE_PINNACLE_DIAMETER_MM 35
diff --git a/keyboards/jasonhazel/bad_wings/keymaps/default/config.h b/keyboards/jasonhazel/bad_wings/keymaps/default/config.h
@@ -20,8 +20,6 @@
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 
-#ifdef TRACKPAD_ENABLED
-  #define CIRQUE_PINNACLE_TAP_ENABLE
-  #define CIRQUE_PINNACLE_POSITION_MODE  CIRQUE_PINNACLE_ABSOLUTE_MODE 
-  #define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE 
-#endif
+#define CIRQUE_PINNACLE_TAP_ENABLE
+#define CIRQUE_PINNACLE_POSITION_MODE  CIRQUE_PINNACLE_ABSOLUTE_MODE 
+#define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE 
diff --git a/keyboards/jasonhazel/bad_wings/rules.mk b/keyboards/jasonhazel/bad_wings/rules.mk
@@ -23,8 +23,5 @@ SRC += matrix.c
 QUANTUM_LIB_SRC += spi_master.c
 CUSTOM_MATRIX = lite
 
-ifeq ($(strip $(TRACKPAD_ENABLE)), yes)
-	POINTING_DEVICE_DRIVER := cirque_pinnacle_spi
-	POINTING_DEVICE_ENABLE := yes
-	OPT_DEFTS += -DTRACKPAD_ENABLED
-endif
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
+POINTING_DEVICE_ENABLE = yes
diff --git a/keyboards/jasonhazel/dust/config.h b/keyboards/jasonhazel/dust/config.h
@@ -15,7 +15,7 @@
 
 #define DIODE_DIRECTION COL2ROW
 #define MATRIX_ROW_PINS { GP3, GP4, GP2, GP1 }
-#define MATRIX_COL_PINS { GP26, GP27, GP28, GP29, GP6 }
+#define MATRIX_COL_PINS { GP6, GP29, GP28, GP27, GP26 }
 
 #define SOFT_SERIAL_PIN GP0
 #define USE_SERIAL

diff --git a/keyboards/jasonhazel/dust/dust.h b/keyboards/jasonhazel/dust/dust.h
@@ -9,14 +9,14 @@
     L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
                    L33, L34, R34, R33       \
 ) { \
-  { L00, L01, L02, L03, L04 }, \
-  { L10, L11, L12, L13, L14 }, \
-  { L20, L21, L22, L23, L24 }, \
-  { ___, ___, ___, L33, L34 }, \
   { R00, R01, R02, R03, R04 }, \
   { R10, R11, R12, R13, R14 }, \
   { R20, R21, R22, R23, R24 }, \
   { ___, ___, ___, R33, R34 }, \
+  { L00, L01, L02, L03, L04 }, \
+  { L10, L11, L12, L13, L14 }, \
+  { L20, L21, L22, L23, L24 }, \
+  { ___, ___, ___, L33, L34 }, \
 }
 
 #define LAYOUT LAYOUT_3x5_2