Fixed define collision with tusb_common.h so you won't need to edit the library

Jumperless Wokwi Bridge App/JumperlessWokwiBridge.py

@@ -59,8 +59,8 @@ def openSerial():
         sortedports = sorted(foundports,key = lambda x:x[-1])
         #print(sortedports)
 
-        #if autodetected != -1:
+        if autodetected != -1:
-        if False:    
+        #if False:    
             
             
             selection = autodetected

JumperlessNano/src/JumperlessDefinesRP2040.h

@@ -91,68 +91,68 @@
 #define B_RAIL_NEG 32
 
 
-#define t1  1
+#define TOP_1  1
-#define t2  2
+#define TOP_2  2
-#define t3  3
+#define TOP_3  3
-#define t4  4
+#define TOP_4  4
-#define t5  5
+#define TOP_5  5
-#define t6  6
+#define TOP_6  6
-#define t7  7
+#define TOP_7  7
-#define t8  8
+#define TOP_8  8
-#define t9  9
+#define TOP_9  9
-#define t10 10
+#define TOP_10 10
-#define t11 11
+#define TOP_11 11
-#define t12 12
+#define TOP_12 12
-#define t13 13
+#define TOP_13 13
-#define t14 14
+#define TOP_14 14
-#define t15 15
+#define TOP_15 15
-#define t16 16
+#define TOP_16 16
-#define t17 17
+#define TOP_17 17
-#define t18 18
+#define TOP_18 18
-#define t19 19
+#define TOP_19 19
-#define t20 20
+#define TOP_20 20
-#define t21 21
+#define TOP_21 21
-#define t22 22
+#define TOP_22 22
-#define t23 23
+#define TOP_23 23
-#define t24 24
+#define TOP_24 24
-#define t25 25
+#define TOP_25 25
-#define t26 26
+#define TOP_26 26
-#define t27 27
+#define TOP_27 27
-#define t28 28
+#define TOP_28 28
-#define t29 29
+#define TOP_29 29
-#define t30 30
+#define TOP_30 30
 
 
-#define b1 31
+#define BOTTOM_1 31
-#define b2 32
+#define BOTTOM_2 32
-#define b3 33
+#define BOTTOM_3 33
-#define b4 34
+#define BOTTOM_4 34
-#define b5 35
+#define BOTTOM_5 35
-#define b6 36
+#define BOTTOM_6 36
-#define b7 37
+#define BOTTOM_7 37
-#define b8 38
+#define BOTTOM_8 38
-#define b9 39
+#define BOTTOM_9 39
-#define b10 40
+#define BOTTOM_10 40
-#define b11 41
+#define BOTTOM_11 41
-#define b12 42
+#define BOTTOM_12 42
-#define b13 43
+#define BOTTOM_13 43
-#define b14 44
+#define BOTTOM_14 44
-#define b15 45
+#define BOTTOM_15 45
-#define b16 46
+#define BOTTOM_16 46
-#define b17 47
+#define BOTTOM_17 47
-#define b18 48
+#define BOTTOM_18 48
-#define b19 49
+#define BOTTOM_19 49
-#define b20 50
+#define BOTTOM_20 50
-#define b21 51
+#define BOTTOM_21 51
-#define b22 52
+#define BOTTOM_22 52
-#define b23 53
+#define BOTTOM_23 53
-#define b24 54
+#define BOTTOM_24 54
-#define b25 55
+#define BOTTOM_25 55
-#define b26 56
+#define BOTTOM_26 56
-#define b27 57
+#define BOTTOM_27 57
-#define b28 58
+#define BOTTOM_28 58
-#define b29 59
+#define BOTTOM_29 59
-#define b30 60
+#define BOTTOM_30 60
 
 
 

JumperlessNano/src/MatrixStateRP2040.cpp

@@ -48,49 +48,49 @@ struct chipStatus ch[12] = {
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_I, CHIP_J, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_K, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H},//X MAP constant
-  {CHIP_L,  t2,t3, t4, t5, t6, t7, t8}},  // Y MAP constant
+  {CHIP_L,  TOP_2,TOP_3, TOP_4, TOP_5, TOP_6, TOP_7, TOP_8}},  // Y MAP constant
 
   {1,'B',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_A, CHIP_I, CHIP_J, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_K, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
-  {CHIP_L,  t9,t10,t11,t12,t13,t14,t15}},//yMap
+  {CHIP_L,  TOP_9,TOP_10,TOP_11,TOP_12,TOP_13,TOP_14,TOP_15}},//yMap
 
   {2,'C',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_I, CHIP_J, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_K, CHIP_H, CHIP_H},
-  {CHIP_L, t16,t17,t18,t19,t20,t21,t22}},
+  {CHIP_L, TOP_16,TOP_17,TOP_18,TOP_19,TOP_20,TOP_21,TOP_22}},
 
   {3,'D',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_I, CHIP_J, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_K},
-  {CHIP_L, t23,t24,t25,t26,t27,t28,t29}},
+  {CHIP_L, TOP_23,TOP_24,TOP_25,TOP_26,TOP_27,TOP_28,TOP_29}},
 
   {4,'E',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_K, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_I, CHIP_J, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
-  {CHIP_L,   b2, b3, b4, b5, b6, b7, b8}},
+  {CHIP_L,   BOTTOM_2, BOTTOM_3, BOTTOM_4, BOTTOM_5, BOTTOM_6, BOTTOM_7, BOTTOM_8}},
 
   {5,'F',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_A, CHIP_B, CHIP_K, CHIP_C, CHIP_C, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_I, CHIP_J, CHIP_G, CHIP_G, CHIP_H, CHIP_H},
-  {CHIP_L,  b9, b10,b11,b12,b13,b14,b15}},
+  {CHIP_L,  BOTTOM_9, BOTTOM_10,BOTTOM_11,BOTTOM_12,BOTTOM_13,BOTTOM_14,BOTTOM_15}},
 
   {6,'G',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_K, CHIP_D, CHIP_D, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_I, CHIP_J, CHIP_H, CHIP_H},
-  {CHIP_L,  b16,b17,b18,b19,b20,b21,b22}},
+  {CHIP_L,  BOTTOM_16,BOTTOM_17,BOTTOM_18,BOTTOM_19,BOTTOM_20,BOTTOM_21,BOTTOM_22}},
 
   {7,'H',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
   {CHIP_A, CHIP_A, CHIP_B, CHIP_B, CHIP_C, CHIP_C, CHIP_D, CHIP_K, CHIP_E, CHIP_E, CHIP_F, CHIP_F, CHIP_G, CHIP_G, CHIP_I, CHIP_J},
-  {CHIP_L,  b23,b24,b25,b26,b27,b28,b29}},
+  {CHIP_L,  BOTTOM_23,BOTTOM_24,BOTTOM_25,BOTTOM_26,BOTTOM_27,BOTTOM_28,BOTTOM_29}},
 
   {8,'I',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
@@ -113,7 +113,7 @@ struct chipStatus ch[12] = {
   {11,'L',
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
   {-1,-1,-1,-1,-1,-1,-1,-1}, //y status
-  {CURRENT_SENSE_MINUS, CURRENT_SENSE_PLUS, ADC0_5V, ADC1_5V, ADC2_5V, ADC3_8V, DAC1_8V, DAC0_5V, t1, t30, b1, b30, RP_UART_TX, RP_UART_RX, SUPPLY_5V, RP_GPIO_0},
+  {CURRENT_SENSE_MINUS, CURRENT_SENSE_PLUS, ADC0_5V, ADC1_5V, ADC2_5V, ADC3_8V, DAC1_8V, DAC0_5V, TOP_1, TOP_30, BOTTOM_1, BOTTOM_30, RP_UART_TX, RP_UART_RX, SUPPLY_5V, RP_GPIO_0},
   {CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}}
   };