Cool_Tools/Jumperless
1
0
Fork 0
mirror of https://github.com/Architeuthis-Flux/Jumperless.git synced 2024-11-23 23:00:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

tiny tweaks to probing

Browse Source
This commit is contained in:
Kevin Santo Cappuccio 2024-02-17 21:53:39 -08:00
parent f9640cedd1
commit 85a915fb72
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JumperlessNano/src/NetsToChipConnections.cpp
View File

@ -2226,7 +2226,7 @@ void couldntFindPath(int forcePrint)
unconnectablePaths[numberOfUnconnectablePaths][0] = path[i].node1; unconnectablePaths[numberOfUnconnectablePaths][0] = path[i].node1;
unconnectablePaths[numberOfUnconnectablePaths][1] = path[i].node2; unconnectablePaths[numberOfUnconnectablePaths][1] = path[i].node2;
numberOfUnconnectablePaths++; numberOfUnconnectablePaths++;
path[i].skip = true; //path[i].skip = true;
} }
} }
if (debugNTCC2 || forcePrint) if (debugNTCC2 || forcePrint)

33
JumperlessNano/src/Probing.cpp
View File

@ -132,6 +132,7 @@ int probeMode(int pin, int setOrClear)
if (row[0] != -1 && row[0] != row[1]) if (row[0] != -1 && row[0] != row[1])
{ {
row[1] = row[0];
if (connectedRowsIndex > 1) if (connectedRowsIndex > 1)
@ -224,8 +225,10 @@ int probeMode(int pin, int setOrClear)
// Serial.print("bridgesToPaths\n\r"); // Serial.print("bridgesToPaths\n\r");
// delay(18); // delay(18);
// showNets(); // showNets();
showLEDsCore2 = 1; //showLEDsCore2 = 1;
sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
delay(25);
} }
else else
{ {
@ -247,8 +250,10 @@ int probeMode(int pin, int setOrClear)
// Serial.print("bridgesToPaths\n\r"); // Serial.print("bridgesToPaths\n\r");
//delay(18); //delay(18);
// showNets(); // showNets();
showLEDsCore2 = 1; //showLEDsCore2 = 1;
sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
//logoFlash = 1;
delay(25);
} }
node1or2 = 0; node1or2 = 0;
nodesToConnect[0] = -1; nodesToConnect[0] = -1;
@ -269,15 +274,15 @@ int probeMode(int pin, int setOrClear)
probeTimeout = millis(); probeTimeout = millis();
} }
digitalWrite(RESETPIN, LOW);
clearAllNTCC();
openNodeFile();
getNodesToConnect();
// clearAllNTCC(); bridgesToPaths();
// openNodeFile(); // clearLEDs();
// getNodesToConnect(); //leds.clear();
assignNetColors();
// bridgesToPaths();
// // clearLEDs();
// leds.clear();
// assignNetColors();
// // Serial.print("bridgesToPaths\n\r"); // // Serial.print("bridgesToPaths\n\r");
// delay(18); // delay(18);
// // showNets(); // // showNets();
@ -285,10 +290,10 @@ int probeMode(int pin, int setOrClear)
rawOtherColors[1] = 0x550004; rawOtherColors[1] = 0x550004;
showLEDsCore2 = 1; showLEDsCore2 = 1;
// sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
// delay(25); // delay(25);
// pinMode(19, INPUT); // pinMode(19, INPUT);
// delay(300); delay(300);
return 1; return 1;
} }
@ -616,7 +621,7 @@ int scanRows(int pin)
found = SUPPLY_5V; found = SUPPLY_5V;
connectedRows[connectedRowsIndex] = found; connectedRows[connectedRowsIndex] = found;
connectedRowsIndex++; connectedRowsIndex++;
return connectedRows[connectedRowsIndex]; //return connectedRows[connectedRowsIndex];
} }
else if (probeRead == low) else if (probeRead == low)
@ -626,7 +631,7 @@ int scanRows(int pin)
connectedRowsIndex++; connectedRowsIndex++;
// Serial.print(connectedRows[connectedRowsIndex]); // Serial.print(connectedRows[connectedRowsIndex]);
return connectedRows[connectedRowsIndex]; //return connectedRows[connectedRowsIndex];
} }
startProbe(); startProbe();