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

fixed not clearing connections between Wokwi updates

Browse Source
This commit is contained in:
Kevin Santo Cappuccio 2024-11-21 20:28:22 -08:00
parent de4b0a323c
commit c957b0e754
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Hardware/KiCAD/JumperlessRev3point1/~JumperlessRev3point1.kicad_sch.lck Normal file
View File

@ -0,0 +1 @@
{"hostname":"Kevins-MacBook-Pro","username":"kevinsanto"}

2
JumperlessNano/src/FileParsing.cpp
View File

@ -309,7 +309,7 @@ void inputNodeFileList(int addRotaryConnections) {
void savePreformattedNodeFile(int source, int slot, int keepEncoder) { void savePreformattedNodeFile(int source, int slot, int keepEncoder) {
nodeFile = LittleFS.open("nodeFileSlot" + String(slot) + ".txt", "w+"); nodeFile = LittleFS.open("nodeFileSlot" + String(slot) + ".txt", "w");
// Serial.println("Slot " + String(slot)); // Serial.println("Slot " + String(slot));
// Serial.println(nodeFile); // Serial.println(nodeFile);

17
JumperlessNano/src/main.cpp
View File

@ -171,7 +171,7 @@ int readInNodesArduino = 0;
int restoredNodeFile = 0; int restoredNodeFile = 0;
const char firmwareVersion[] = "1.3.18"; //// remember to update this const char firmwareVersion[] = "1.3.19"; //// remember to update this
int firstLoop = 1; int firstLoop = 1;
volatile int probeActive = 1; volatile int probeActive = 1;
@ -731,7 +731,7 @@ skipinput:
// leds.clear(); // leds.clear();
// assignNetColors(); // assignNetColors();
digitalWrite(RESETPIN, HIGH); digitalWrite(RESETPIN, HIGH);
delayMicroseconds(100); delayMicroseconds(3900);
// Serial.print("bridgesToPaths\n\r"); // Serial.print("bridgesToPaths\n\r");
digitalWrite(RESETPIN, LOW); digitalWrite(RESETPIN, LOW);
// showNets(); // showNets();
@ -759,8 +759,8 @@ skipinput:
// sendAllPathsCore2 = 1; // sendAllPathsCore2 = 1;
timer = millis(); timer = millis();
// clearNodeFile(netSlot); //clearNodeFile(netSlot);
digitalWrite(RESETPIN, HIGH);
if (connectFromArduino != '\0') { if (connectFromArduino != '\0') {
serSource = 1; serSource = 1;
} else { } else {
@ -773,11 +773,11 @@ skipinput:
openNodeFile(netSlot); openNodeFile(netSlot);
getNodesToConnect(); getNodesToConnect();
// Serial.print("openNF\n\r"); // Serial.print("openNF\n\r");
digitalWrite(RESETPIN, HIGH);
bridgesToPaths(); bridgesToPaths();
clearLEDs(); clearLEDs();
assignNetColors(); assignNetColors();
delay(1); delay(10);
// Serial.print("bridgesToPaths\n\r"); // Serial.print("bridgesToPaths\n\r");
digitalWrite(RESETPIN, LOW); digitalWrite(RESETPIN, LOW);
// showNets(); // showNets();
@ -1224,7 +1224,7 @@ void loadFile(int slot) {
clearLEDs(); clearLEDs();
assignNetColors(); assignNetColors();
digitalWrite(RESETPIN, HIGH); digitalWrite(RESETPIN, HIGH);
delayMicroseconds(100); delayMicroseconds(2000);
// Serial.print("bridgesToPaths\n\r"); // Serial.print("bridgesToPaths\n\r");
digitalWrite(RESETPIN, LOW); digitalWrite(RESETPIN, LOW);
// showNets(); // showNets();
@ -1271,6 +1271,9 @@ void loop1() // core 2 handles the LEDs and the CH446Q8
} }
if (sendAllPathsCore2 == 1) { if (sendAllPathsCore2 == 1) {
digitalWrite(RESETPIN, HIGH);
delayMicroseconds(3900);
digitalWrite(RESETPIN, LOW);
delayMicroseconds(6200); delayMicroseconds(6200);
sendAllPaths(); sendAllPaths();
delayMicroseconds(2200); delayMicroseconds(2200);