Skip to content

Commit 64defca

Browse files
Architeuthis-FluxArchiteuthis-Flux
committed
add canonical defines and an option to print the long or short versions
1 parent 5b7dd6f commit 64defca

8 files changed

Lines changed: 146 additions & 69 deletions

File tree

‎JumperlessNano/src/FileParsing.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ void changeWokwiDefinesToJumperless(void)
379379
}
380380
else if (connString1.startsWith("pot1:"))
381381
{
382-
nodeNumber = DAC0_5V;
382+
nodeNumber = DAC0;
383383
}
384384
else
385385
{
@@ -590,6 +590,8 @@ void replaceSFNamesWithDefinedInts(void)
590590
specialFunctionsString.replace("I_P", "108");
591591
specialFunctionsString.replace("CURRENT_SENSE_MINUS", "109");
592592
specialFunctionsString.replace("CURRENT_SENSE_PLUS", "108");
593+
specialFunctionsString.replace("ISENSE_MINUS", "109");
594+
specialFunctionsString.replace("IENSE_PLUS", "108");
593595

594596
specialFunctionsString.replace("EMPTY_NET", "127");
595597

‎JumperlessNano/src/JumperlessDefinesRP2040.h‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,21 +191,71 @@
191191
#define SUPPLY_3V3 103
192192
#define SUPPLY_5V 105
193193

194-
#define DAC0_5V 106
195-
#define DAC1_8V 107
194+
#define DAC0 106
195+
#define DAC1 107
196196

197-
#define CURRENT_SENSE_PLUS 108
198-
#define CURRENT_SENSE_MINUS 109
197+
#define ISENSE_PLUS 108
198+
#define ISENSE_MINUS 109
199199

200-
#define ADC0_5V 110
201-
#define ADC1_5V 111
202-
#define ADC2_5V 112
203-
#define ADC3_8V 113
200+
#define ADC0 110
201+
#define ADC1 111
202+
#define ADC2 112
203+
#define ADC3 113
204204

205205
#define RP_GPIO_0 114
206-
#define RP_UART_TX 116
207-
#define RP_UART_RX 117
208206

207+
#define RP_UART_TX 116 //also GPIO_16
208+
#define RP_GPIO_16 116 //these are the same as the UART pins
209+
210+
#define RP_UART_RX 117 //also GPIO_17
211+
#define RP_GPIO_17 117 //but if we want to use them as GPIO we should use these names
212+
213+
214+
215+
#define RP_GPIO_18 118 //these aren't actually connected to anything
216+
#define RP_GPIO_19 119 //but we might as well define names for them
217+
218+
#define SUPPLY_8V_P 120 //not actually connected to anything
219+
#define SUPPLY_8V_N 121 //not actually connected to anything
220+
221+
222+
223+
/*
224+
225+
#define GND 100
226+
#define 3V3 103
227+
#define 5V 105
228+
229+
#define 8V 120
230+
231+
#define DAC0 106
232+
#define DAC1 107
233+
234+
#define I_P 108
235+
#define I_N 109
236+
237+
#define ADC0 110
238+
#define ADC1 111
239+
#define ADC2 112
240+
#define ADC3 113
241+
242+
#define GPIO_0 114
243+
244+
#define UART_TX 116
245+
#define GPIO_16 116 //these are the same as the UART pins
246+
247+
#define UART_RX 117
248+
#define GPIO_17 117 //but if we want to use them as GPIO we should use these names
249+
250+
251+
#define GPIO_18 118 //these aren't actually connected to anything
252+
#define GPIO_19 119 //but we might as well define names for them
253+
254+
255+
256+
257+
258+
*/
209259

210260
#define EMPTY_NET 127
211261

‎JumperlessNano/src/MachineCommands.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ void listNetsMachine(void)
750750
{
751751
Serial.print(';');
752752
}
753-
printNodeOrName(n->nodes[j]);
753+
printNodeOrName(n->nodes[j], 1);
754754
}
755755
Serial.print(',');
756756

@@ -803,9 +803,9 @@ void listBridgesMachine(void)
803803
{
804804
started = true;
805805
}
806-
printNodeOrName(n->bridges[j][0]);
806+
printNodeOrName(n->bridges[j][0],1);
807807
Serial.print("-");
808-
printNodeOrName(n->bridges[j][1]);
808+
printNodeOrName(n->bridges[j][1],1);
809809
}
810810
}
811811
Serial.println("]");

‎JumperlessNano/src/MatrixStateRP2040.cpp‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010

1111
struct netStruct net[MAX_NETS] = { //these are the special function nets that will always be made
12-
//netNumber, ,netName ,memberNodes[] ,memberBridges[][2] ,specialFunction ,intsctNet[] ,doNotIntersectNodes[] ,priority
12+
//netNumber, ,netName ,memberNodes[] ,memberBridges[][2] ,specialFunction ,intsctNet[] ,doNotIntersectNodes[] ,priority (unused)
1313
{ 127 ,"Empty Net" ,{EMPTY_NET} ,{{}} ,EMPTY_NET ,{} ,{EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET,EMPTY_NET} , 0},
14-
{ 1 ,"GND" ,{GND} ,{{}} ,GND ,{} ,{SUPPLY_3V3,SUPPLY_5V,DAC0_5V,DAC1_8V} , 1},
15-
{ 2 ,"+5V" ,{SUPPLY_5V} ,{{}} ,SUPPLY_5V ,{} ,{GND,SUPPLY_3V3,DAC0_5V,DAC1_8V} , 1},
16-
{ 3 ,"+3.3V" ,{SUPPLY_3V3} ,{{}} ,SUPPLY_3V3 ,{} ,{GND,SUPPLY_5V,DAC0_5V,DAC1_8V} , 1},
17-
{ 4 ,"DAC 0" ,{DAC0_5V} ,{{}} ,DAC0_5V ,{} ,{GND,SUPPLY_5V,SUPPLY_3V3,DAC1_8V} , 1},
18-
{ 5 ,"DAC 1" ,{DAC1_8V} ,{{}} ,DAC1_8V ,{} ,{GND,SUPPLY_5V,SUPPLY_3V3,DAC0_5V} , 1},
19-
{ 6 ,"I Sense +" ,{CURRENT_SENSE_PLUS} ,{{}} ,CURRENT_SENSE_PLUS ,{} ,{CURRENT_SENSE_MINUS} , 2},
20-
{ 7 ,"I Sense -" ,{CURRENT_SENSE_MINUS} ,{{}} ,CURRENT_SENSE_MINUS ,{} ,{CURRENT_SENSE_PLUS} , 2},
14+
{ 1 ,"GND" ,{GND} ,{{}} ,GND ,{} ,{SUPPLY_3V3,SUPPLY_5V,DAC0,DAC1} , 1},
15+
{ 2 ,"+5V" ,{SUPPLY_5V} ,{{}} ,SUPPLY_5V ,{} ,{GND,SUPPLY_3V3,DAC0,DAC1} , 1},
16+
{ 3 ,"+3.3V" ,{SUPPLY_3V3} ,{{}} ,SUPPLY_3V3 ,{} ,{GND,SUPPLY_5V,DAC0,DAC1} , 1},
17+
{ 4 ,"DAC 0" ,{DAC0} ,{{}} ,DAC0 ,{} ,{GND,SUPPLY_5V,SUPPLY_3V3,DAC1} , 1},
18+
{ 5 ,"DAC 1" ,{DAC1} ,{{}} ,DAC1 ,{} ,{GND,SUPPLY_5V,SUPPLY_3V3,DAC0} , 1},
19+
{ 6 ,"I Sense +" ,{ISENSE_PLUS} ,{{}} ,ISENSE_PLUS ,{} ,{ISENSE_MINUS} , 2},
20+
{ 7 ,"I Sense -" ,{ISENSE_MINUS} ,{{}} ,ISENSE_MINUS ,{} ,{ISENSE_PLUS} , 2},
2121
};
2222

2323
char *netNameConstants[MAX_NETS] = {(char*)"Net 0",(char*)"Net 1",(char*)"Net 2",(char*)"Net 3",(char*)"Net 4",(char*)"Net 5",(char*)"Net 6",(char*)"Net 7",(char*)"Net 8",(char*)"Net 9",(char*)"Net 10",(char*)"Net 11",(char*)"Net 12",(char*)"Net 13",(char*)"Net 14",(char*)"Net 15",(char*)"Net 16",(char*)"Net 17",(char*)"Net 18",(char*)"Net 19",(char*)"Net 20",(char*)"Net 21",(char*)"Net 22",(char*)"Net 23",(char*)"Net 24",(char*)"Net 25",(char*)"Net 26",(char*)"Net 27",(char*)"Net 28",(char*)"Net 29",(char*)"Net 30",(char*)"Net 31",(char*)"Net 32",(char*)"Net 33",(char*)"Net 34",(char*)"Net 35",(char*)"Net 36",(char*)"Net 37",(char*)"Net 38",(char*)"Net 39",(char*)"Net 40",(char*)"Net 41",(char*)"Net 42",(char*)"Net 43",(char*)"Net 44",(char*)"Net 45",(char*)"Net 46",(char*)"Net 47",(char*)"Net 48",(char*)"Net 49",(char*)"Net 50",(char*)"Net 51",(char*)"Net 52",(char*)"Net 53",(char*)"Net 54",(char*)"Net 55",(char*)"Net 56",(char*)"Net 57",(char*)"Net 58",(char*)"Net 59",(char*)"Net 60",(char*)"Net 61",(char*)"Net 62"};//,{"Net 63",(char*)"Net 64",(char*)"Net 65",(char*)"Net 66",(char*)"Net 67",(char*)"Net 68",(char*)"Net 69",(char*)"Net 70",(char*)"Net 71",(char*)"Net 72",(char*)"Net 73",(char*)"Net 74",(char*)"Net 75",(char*)"Net 76",(char*)"Net 77",(char*)"Net 78",(char*)"Net 79",(char*)"Net 80",(char*)"Net 81",(char*)"Net 82",(char*)"Net 83",(char*)"Net 84",(char*)"Net 85",(char*)"Net 86",(char*)"Net 87",(char*)"Net 88",(char*)"Net 89",(char*)"Net 90",(char*)"Net 91",(char*)"Net 92",(char*)"Net 93",(char*)"Net 94",(char*)"Net 95",(char*)"Net 96",(char*)"Net 97",(char*)"Net 98",(char*)"Net 99",(char*)"Net 100",(char*)"Net 101",(char*)"Net 102",(char*)"Net 103",(char*)"Net 104",(char*)"Net 105",(char*)"Net 106",(char*)"Net 107",(char*)"Net 108",(char*)"Net 109",(char*)"Net 110",(char*)"Net 111",(char*)"Net 112",(char*)"Net 113",(char*)"Net 114",(char*)"Net 115",(char*)"Net 116",(char*)"Net 117",(char*)"Net 118",(char*)"Net 119",(char*)"Net 120",(char*)"Net 121",(char*)"Net 122",(char*)"Net 123",(char*)"Net 124",(char*)"Net 125",(char*)"Net 126",(char*)"Net 127"}};
@@ -96,25 +96,25 @@ struct chipStatus ch[12] = {
9696
{8,'I',
9797
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
9898
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
99-
{NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, DAC0_5V, ADC0_5V, SUPPLY_3V3, GND},
99+
{NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, DAC0, ADC0, SUPPLY_3V3, GND},
100100
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
101101

102102
{9,'J',
103103
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
104104
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
105-
{NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, DAC1_8V, ADC1_5V, SUPPLY_5V, GND},
105+
{NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, DAC1, ADC1, SUPPLY_5V, GND},
106106
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
107107

108108
{10,'K',
109109
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
110110
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
111-
{NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, ADC2_5V},
111+
{NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, ADC2},
112112
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}},
113113

114114
{11,'L',
115115
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, // x status
116116
{-1,-1,-1,-1,-1,-1,-1,-1}, //y status
117-
{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},
117+
{ISENSE_MINUS, ISENSE_PLUS, ADC0, ADC1, ADC2, ADC3, DAC1, DAC0, TOP_1, TOP_30, BOTTOM_1, BOTTOM_30, RP_UART_TX, RP_UART_RX, SUPPLY_5V, RP_GPIO_0},
118118
{CHIP_A,CHIP_B,CHIP_C,CHIP_D,CHIP_E,CHIP_F,CHIP_G,CHIP_H}}
119119
};
120120

@@ -151,7 +151,7 @@ struct nanoStatus nano = { //there's only one of these so ill declare and inita
151151
// xMapIJKL[] will tell you the X pin that it's connected to on that sf chip
152152
// xStatusIJKL[] says whether that x pin is being used (this should be the same as mt[8-10].xMap[] if theyre all stacked on top of each other)
153153
// I haven't decided whether to make this just a flag, or store that signal's destination
154-
{NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,GND,101,102,SUPPLY_3V3,104,SUPPLY_5V,DAC0_5V,DAC1_8V,CURRENT_SENSE_PLUS,CURRENT_SENSE_MINUS}
154+
{NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,GND,101,102,SUPPLY_3V3,104,SUPPLY_5V,DAC0,DAC1,ISENSE_PLUS,ISENSE_MINUS}
155155

156156
};
157157

@@ -172,6 +172,8 @@ struct pathStruct path[MAX_BRIDGES]; // node1, node2, net, chip[3], x[3], y[3]
172172
{"INA_P", 108},
173173
{"I_N", 109},
174174
{"I_P", 108},
175+
{"ISENSE_MINUS", 109},
176+
{"ISENSE_PLUS", 108},
175177
{"CURRENT_SENSE_MINUS", 109},
176178
{"CURRENT_SENSE_PLUS", 108},
177179
{"EMPTY_NET", 127},
@@ -275,7 +277,7 @@ int8_t xMapL[24] = { -1 , -1 , -1 , -1 , -1 , -1 , -1
275277
// xMapIJKL[] will tell you the X pin that it's connected to on that sf chip
276278
// xStatusIJKL[] says whether that x pin is being used (this should be the same as mt[8-10].xMap[] if theyre all stacked on top of each other)
277279
// I haven't decided whether to make this just a flag, or store that signal's destination
278-
const int8_t reversePinMap[110] = {NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,GND,101,102,SUPPLY_3V3,104,SUPPLY_5V,DAC0_5V,DAC1_8V,CURRENT_SENSE_PLUS,CURRENT_SENSE_MINUS};
280+
const int8_t reversePinMap[110] = {NANO_D0, NANO_D1, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9, NANO_D10, NANO_D11, NANO_D12, NANO_D13, NANO_RESET, NANO_AREF, NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,GND,101,102,SUPPLY_3V3,104,SUPPLY_5V,DAC0,DAC1_8V,ISENSE_PLUS,ISENSE_MINUS};
279281
280282
};
281283
@@ -362,10 +364,10 @@ const int8_t yConnectionMapG[8] = {-1, 47, 48, 49, 50, 51, 52, 53}; //
362364
const int8_t yConnectionMapH[8] = {-1, 54, 55, 56, 57, 58, 59, 60}; //
363365
364366
365-
const int8_t xConnectionMapI[16] = {NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, DAC0_5V, ADC0_5V, SUPPLY_3V3, GND};
367+
const int8_t xConnectionMapI[16] = {NANO_A0, NANO_D1, NANO_A2, NANO_D3, NANO_A4, NANO_D5, NANO_A6, NANO_D7, NANO_D11, NANO_D9, NANO_D13, NANO_RESET, DAC0, ADC0, SUPPLY_3V3, GND};
366368
const int8_t xConnectionMapJ[16] = {NANO_D0, NANO_A1, NANO_D2, NANO_A3, NANO_D4, NANO_A5, NANO_D6, NANO_A7, NANO_D8, NANO_D10, NANO_D12, NANO_AREF, DAC1_8V, ADC1_5V, SUPPLY_5V, GND};
367369
const int8_t xConnectionMapK[16] = {NANO_A0, NANO_A1, NANO_A2, NANO_A3, NANO_A4, NANO_A5, NANO_A6, NANO_A7, NANO_D2, NANO_D3, NANO_D4, NANO_D5, NANO_D6, NANO_D7, NANO_D8, NANO_D9};
368-
const int8_t xConnectionMapK[16] = {CURRENT_SENSE_MINUS, CURRENT_SENSE_PLUS, ADC0_5V, ADC1_5V, ADC2_5V, ADC3_8V, DAC1_8V, DAC0_5V, t1, t30, b1, b30, NANO_A4, NANO_A5, SUPPLY_5V, GND};
370+
const int8_t xConnectionMapK[16] = {ISENSE_MINUS, ISENSE_PLUS, ADC0, ADC1_5V, ADC2_5V, ADC3, DAC1_8V, DAC0, t1, t30, b1, b30, NANO_A4, NANO_A5, SUPPLY_5V, GND};
369371
370372
//nanoConnectionMap[0] is the list of pin numbers, [1] and [3] are which special function chips they're connected to, [2] and [4] is the X pin on that chip, -1 for none
371373

‎JumperlessNano/src/NetManager.cpp‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -884,16 +884,16 @@ void printBridgeArray(void)
884884
Serial.print("ms to run net manager\n\r");
885885
}
886886

887-
int printNodeOrName(int node) // returns number of characters printed (for tabs)
887+
int printNodeOrName(int node, int longOrShort) // returns number of characters printed (for tabs)
888888
{
889889

890890
if (node >= 100)
891891
{
892-
return Serial.print(definesToChar(node));
892+
return Serial.print(definesToChar(node, longOrShort));
893893
}
894894
else if (node >= NANO_D0)
895895
{
896-
return Serial.print(definesToChar(node));
896+
return Serial.print(definesToChar(node, longOrShort));
897897
}
898898
else
899899
{
@@ -903,25 +903,48 @@ int printNodeOrName(int node) // returns number of characters printed (for tabs)
903903

904904

905905
char same[12] = " ";
906-
const char *definesToChar(int defined) // converts the internally used #defined numbers into human readable strings
906+
const char *definesToChar(int defined, int longOrShort) // converts the internally used #defined numbers into human readable strings
907907
{
908908
// Serial.print("defined = ");
909909
//Serial.println(defined);
910910

911-
const char *defNanoToChar[26] = {"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "D8", "D9", "D10", "D11", "D12", "D13", "RESET", "AREF", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"};
912911

913-
const char *defSpecialToChar[20] = {"GND", "NOT_DEFINED", "NOT_DEFINED", "3V3", "NOT_DEFINED", "5V", "DAC_0", "DAC_1", "I_POS", "I_NEG", "ADC_0" , "ADC_1" , "ADC_2" , "ADC_3", "GPIO_0", "NOT_DEFINED", "UART_Tx", "UART_Rx"};
912+
const char *defNanoToCharShort[26] = {"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "D8", "D9", "D10", "D11", "D12", "D13", "RESET", "AREF", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"};
913+
914+
const char *defSpecialToCharShort[20] = {"GND", "NOT_DEFINED", "NOT_DEFINED", "3V3", "NOT_DEFINED", "5V", "DAC_0", "DAC_1", "I_POS", "I_NEG", "ADC_0" , "ADC_1" , "ADC_2" , "ADC_3", "GPIO_0", "NOT_DEFINED", "UART_Tx", "UART_Rx", "GPIO_18", "GPIO_19"};
915+
916+
917+
const char *defNanoToCharLong[26] = {"NANO_D0", "NANO_D1", "NANO_D2", "NANO_D3", "NANO_D4", "NANO_D5", "NANO_D6", "NANO_D7", "NANO_D8", "NANO_D9", "NANO_D10", "NANO_D11", "NANO_D12", "NANO_D13", "NANO_RESET", "NANO_AREF", "NANO_A0", "NANO_A1", "NANO_A2", "NANO_A3", "NANO_A4", "NANO_A5", "NANO_A6", "NANO_A7"};
918+
919+
const char *defSpecialToCharLong[20] = {"GND", "NOT_DEFINED", "NOT_DEFINED", "SUPPLY_3V3", "NOT_DEFINED", "SUPPLY_5V", "DAC0", "DAC1", "ISENSE_PLUS", "ISENSE_MINUS", "ADC0" , "ADC1" , "ADC2" , "ADC3", "RP_GPIO_0", "NOT_DEFINED", "RP_UART_Tx", "RP_UART_Rx", "RP_GPIO_18", "RP_GPIO_19"};
920+
914921

915922
const char *emptyNet[] = {"EMPTY_NET", "?"};
916923

917924
if (defined >= 70 && defined <= 93)
918925
{
919-
return defNanoToChar[defined - 70];
926+
if (longOrShort == 1)
927+
{
928+
return defNanoToCharLong[defined - 70];
929+
}
930+
else
931+
{
932+
return defNanoToCharShort[defined - 70];
933+
}
934+
920935
}
921-
else if (defined >= 100 && defined <= RP_UART_RX)
936+
else if (defined >= 100 && defined <= RP_GPIO_19)
922937
{
923938

924-
return defSpecialToChar[defined - 100];
939+
if (longOrShort == 1)
940+
{
941+
return defSpecialToCharLong[defined - 100];
942+
}
943+
else
944+
{
945+
return defSpecialToCharShort[defined - 100];
946+
}
947+
925948
}
926949
else if (defined == EMPTY_NET)
927950
{

‎JumperlessNano/src/NetManager.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extern bool debugNMtime;
1616

1717
void writeJSONtoFile();
1818

19-
int printNodeOrName(int node);
19+
int printNodeOrName(int node, int longOrShort = 0); //0 = short, 1 = long
2020

2121
void getNodesToConnect(); //read in the nodes you'd like to connect
2222

@@ -50,7 +50,7 @@ void deleteBridge();
5050

5151
void deleteNode(); //disconnects everything connected to that one node
5252

53-
const char* definesToChar (int defined);
53+
const char* definesToChar (int defined, int longOrShort = 0); //0 = short, 1 = long
5454

5555
void printBridgeArray();
5656

0 commit comments

Comments
 (0)