Cool_Tools/Jumperless
1
0
Fork 0
mirror of https://github.com/Architeuthis-Flux/Jumperless.git synced 2025-02-17 11:08:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add voltage selection to probing, more colors on status led

Browse Source
This commit is contained in:
Kevin Santo Cappuccio 2024-02-20 14:33:33 -08:00
parent a964b61905
commit ce13ca26fb
5 changed files with 373 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
JumperlessNano/src/LEDs.cpp
View File

@ -33,7 +33,7 @@ bool debugLEDs = EEPROM.read(DEBUG_LEDSADDRESS);
bool debugLEDs = 1; bool debugLEDs = 1;
#endif #endif
uint32_t rawSpecialNetColors[8] = //dim uint32_t rawSpecialNetColors[8] = // dim
{0x000000, {0x000000,
0x001C04, 0x001C04,
0x1C0702, 0x1C0702,
@ -43,14 +43,14 @@ uint32_t rawSpecialNetColors[8] = //dim
0x232323, 0x232323,
0x232323}; 0x232323};
uint32_t rawOtherColors[8] = uint32_t rawOtherColors[8] =
{0x020008, // headerglow {0x020008, // headerglow
0x550008, // logo / status 0x550008, // logo / status
0x0055AA, // logoflash / statusflash 0x0055AA, // logoflash / statusflash
0x301A02, // +8V 0x301A02, // +8V
0x120932, // -8V 0x120932, // -8V
0x443434, // UART TX 0x443434, // UART TX
0x324244, // UART RX 0x324244, // UART RX
0x232323}; // unassigned 0x232323}; // unassigned
rgbColor specialNetColors[8] = rgbColor specialNetColors[8] =
@ -561,7 +561,7 @@ void assignNetColors(void)
// if(net[i].nodes[0] == -1){ // if(net[i].nodes[0] == -1){
// continue; // continue;
// } // }
if (net[i].machine == true) if (net[i].machine == true)
{ {
// Serial.println("number of nets: "); // Serial.println("number of nets: ");
@ -573,9 +573,8 @@ void assignNetColors(void)
// netColors[i] = specialNetRgb; // netColors[i] = specialNetRgb;
// continue; // continue;
//leds.setPixelColor(nodesToPixelMap[i], net[i].rawColor); // leds.setPixelColor(nodesToPixelMap[i], net[i].rawColor);
netColors[i] = unpackRgb(net[i].rawColor); netColors[i] = unpackRgb(net[i].rawColor);
} }
else else
{ {
@ -701,14 +700,11 @@ void lightUpNet(int netNumber, int node, int onOff, int brightness2, int hueShif
if (net[netNumber].nodes[j] <= 0) if (net[netNumber].nodes[j] <= 0)
{ {
break; break;
} }
if (net[netNumber].machine == true) if (net[netNumber].machine == true)
{ {
if (net[netNumber].nodes[j] == node || node == -1) if (net[netNumber].nodes[j] == node || node == -1)
{ {
if (onOff == 1) if (onOff == 1)
@ -716,21 +712,20 @@ void lightUpNet(int netNumber, int node, int onOff, int brightness2, int hueShif
if (nodesToPixelMap[net[netNumber].nodes[j]] > 0) if (nodesToPixelMap[net[netNumber].nodes[j]] > 0)
{ {
leds.setPixelColor(nodesToPixelMap[net[netNumber].nodes[j]], scaleDownBrightness(net[netNumber].rawColor)); leds.setPixelColor(nodesToPixelMap[net[netNumber].nodes[j]], scaleDownBrightness(net[netNumber].rawColor));
if (debugLEDs) if (debugLEDs)
{ {
Serial.print("net: "); Serial.print("net: ");
Serial.print(netNumber); Serial.print(netNumber);
Serial.print(" node: "); Serial.print(" node: ");
Serial.print(net[netNumber].nodes[j]); Serial.print(net[netNumber].nodes[j]);
Serial.print(" mapped to LED:"); Serial.print(" mapped to LED:");
Serial.println(nodesToPixelMap[net[netNumber].nodes[j]]); Serial.println(nodesToPixelMap[net[netNumber].nodes[j]]);
Serial.print("rawColor: "); Serial.print("rawColor: ");
Serial.println(net[netNumber].rawColor, HEX); Serial.println(net[netNumber].rawColor, HEX);
}
} }
}
// leds.setPixelColor(nodesToPixelMap[net[netNumber].nodes[j]], net[netNumber].color.r, net[netNumber].color.g, net[netNumber].color.b); // leds.setPixelColor(nodesToPixelMap[net[netNumber].nodes[j]], net[netNumber].color.r, net[netNumber].color.g, net[netNumber].color.b);
} }
else else
@ -914,7 +909,6 @@ uint32_t scaleDownBrightness(uint32_t hexColor, int scaleFactor, int maxBrightne
} }
return scaledBrightness; return scaledBrightness;
} }
uint32_t scaleUpBrightness(uint32_t hexColor, int scaleFactor, int minBrightness) uint32_t scaleUpBrightness(uint32_t hexColor, int scaleFactor, int minBrightness)
@ -954,9 +948,7 @@ uint32_t scaleUpBrightness(uint32_t hexColor, int scaleFactor, int minBrightness
scaledBrightness = scaledBrightness | b; scaledBrightness = scaledBrightness | b;
} }
return scaledBrightness; return scaledBrightness;
} }
struct rgbColor pcbColorCorrect(rgbColor colorToShift) struct rgbColor pcbColorCorrect(rgbColor colorToShift)
@ -1194,10 +1186,8 @@ struct rgbColor shiftHue(struct rgbColor colorToShift, int hueShift, int brightn
void lightUpNode(int node, uint32_t color) void lightUpNode(int node, uint32_t color)
{ {
leds.setPixelColor(nodesToPixelMap[node], color);
leds.setPixelColor(nodesToPixelMap[node],color);
showLEDsCore2 = 1; showLEDsCore2 = 1;
} }
void lightUpRail(int logo, int rail, int onOff, int brightness2, int switchPosition) void lightUpRail(int logo, int rail, int onOff, int brightness2, int switchPosition)
@ -1224,13 +1214,11 @@ void lightUpRail(int logo, int rail, int onOff, int brightness2, int switchPosit
if (leds.getPixelColor(i) == 0 && leds.getPixelColor(i) != rawOtherColors[0]) if (leds.getPixelColor(i) == 0 && leds.getPixelColor(i) != rawOtherColors[0])
{ {
leds.setPixelColor(i, rawOtherColors[0]); leds.setPixelColor(i, rawOtherColors[0]);
} }
} }
leds.setPixelColor(83, scaleDownBrightness( rawSpecialNetColors[1])); leds.setPixelColor(83, scaleDownBrightness(rawSpecialNetColors[1]));
leds.setPixelColor(108,scaleDownBrightness( rawSpecialNetColors[1])); leds.setPixelColor(108, scaleDownBrightness(rawSpecialNetColors[1]));
leds.setPixelColor(109, scaleDownBrightness(rawSpecialNetColors[2])); leds.setPixelColor(109, scaleDownBrightness(rawSpecialNetColors[2]));
leds.setPixelColor(96, scaleDownBrightness(rawSpecialNetColors[3])); leds.setPixelColor(96, scaleDownBrightness(rawSpecialNetColors[3]));
leds.setPixelColor(106, scaleDownBrightness(rawSpecialNetColors[2])); leds.setPixelColor(106, scaleDownBrightness(rawSpecialNetColors[2]));
@ -1247,7 +1235,7 @@ void lightUpRail(int logo, int rail, int onOff, int brightness2, int switchPosit
// rgbColor rgbRail = railColors[j]; // rgbColor rgbRail = railColors[j];
// hsvColor hsvRail = RgbToHsv(rgbRail); // hsvColor hsvRail = RgbToHsv(rgbRail);
// hsvRail.v = brightness2; // hsvRail.v = brightness2;
//Serial.println (rawOtherColors[0], HEX); // Serial.println (rawOtherColors[0], HEX);
// rgbRail = HsvToRgb(hsvRail); // rgbRail = HsvToRgb(hsvRail);
// Serial.println (hsvRail.h); // Serial.println (hsvRail.h);
// Serial.println (hsvRail.s); // Serial.println (hsvRail.s);
@ -1282,7 +1270,7 @@ void showNets(void)
for (int i = 0; i <= numberOfNets; i++) for (int i = 0; i <= numberOfNets; i++)
{ {
//Serial.print(i); // Serial.print(i);
lightUpNet(i); lightUpNet(i);
} }
@ -1647,3 +1635,21 @@ void clearLEDs(void)
// showLEDsCore2 = 1; // showLEDsCore2 = 1;
} }
void clearLEDsExceptRails(void)
{
for (int i = 0; i <= 109; i++)
{
if (i >= 60 && i <= 80)
{
continue;
}
if (i == 108 || i == 109 || i == 83 || i == 96 || i == 106)
{
continue;
}
leds.setPixelColor(i, 0);
}
}

6
JumperlessNano/src/LEDs.h
View File

@ -84,7 +84,7 @@ const int nodesToPixelMap[120] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,1
}; };
const int bbPixelToNodesMap[120] = { 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30, const int bbPixelToNodesMap[120] = { 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,25,26,27,28,29,30,
32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,
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,
@ -105,6 +105,8 @@ const int railsToPixelMap[4][5] = {{70,73,74,77,78},//top positive rail
{68,67,64,63,60}};//bottom negative rail {68,67,64,63,60}};//bottom negative rail
//int nodeColors[MAX_PATHS] = {0}; //int nodeColors[MAX_PATHS] = {0};
const int pixelsToRails[20] = {B_RAIL_NEG, B_RAIL_POS, B_RAIL_POS, B_RAIL_NEG, B_RAIL_NEG, B_RAIL_POS, B_RAIL_POS, B_RAIL_NEG, B_RAIL_NEG, B_RAIL_POS, const int pixelsToRails[20] = {B_RAIL_NEG, B_RAIL_POS, B_RAIL_POS, B_RAIL_NEG, B_RAIL_NEG, B_RAIL_POS, B_RAIL_POS, B_RAIL_NEG, B_RAIL_NEG, B_RAIL_POS,
T_RAIL_POS, T_RAIL_NEG, T_RAIL_NEG, T_RAIL_POS, T_RAIL_POS, T_RAIL_NEG, T_RAIL_NEG, T_RAIL_POS, T_RAIL_POS, T_RAIL_NEG}; T_RAIL_POS, T_RAIL_NEG, T_RAIL_NEG, T_RAIL_POS, T_RAIL_POS, T_RAIL_NEG, T_RAIL_NEG, T_RAIL_POS, T_RAIL_POS, T_RAIL_NEG};
@ -130,7 +132,7 @@ rgbColor unpackRgb(uint32_t color);
uint32_t scaleUpBrightness(uint32_t hexColor, int scaleFactor = 8, int minBrightness = 0x45); uint32_t scaleUpBrightness(uint32_t hexColor, int scaleFactor = 8, int minBrightness = 0x45);
uint32_t scaleDownBrightness(uint32_t hexColor, int scaleFactor = 5, int maxBrightness = 0x45); uint32_t scaleDownBrightness(uint32_t hexColor, int scaleFactor = 5, int maxBrightness = 0x45);
void turnOffSkippedNodes(); void turnOffSkippedNodes();
void clearLEDsExceptRails();
uint32_t packRgb(uint8_t r, uint8_t g, uint8_t b); uint32_t packRgb(uint8_t r, uint8_t g, uint8_t b);
void startupColors(void); void startupColors(void);

392
JumperlessNano/src/Probing.cpp
View File

@ -15,7 +15,6 @@
#include "hardware/pwm.h" #include "hardware/pwm.h"
#include <EEPROM.h> #include <EEPROM.h>
int probeSwap = 0; int probeSwap = 0;
int probeHalfPeriodus = 20; int probeHalfPeriodus = 20;
@ -39,9 +38,14 @@ int nodesToConnect[2] = {-1, -1};
int node1or2 = 0; int node1or2 = 0;
int probePin = 19; int probePin = 19;
int buttonPin = 18; int buttonPin = 18;
unsigned long probeButtonTimer = 0;
int justSelectedConnectedNodes = 0;
int voltageSelection = SUPPLY_3V3;
int voltageChosen = 0;
int rainbowList[13][3] = { int rainbowList[13][3] = {
{40, 50, 80}, {40, 50, 80},
@ -66,19 +70,18 @@ int justCleared = 1;
int probeMode(int pin, int setOrClear) int probeMode(int pin, int setOrClear)
{ {
probeSwap = EEPROM.read(PROBESWAPADDRESS); probeSwap = EEPROM.read(PROBESWAPADDRESS);
if (probeSwap == 0)
if (probeSwap == 0) {
{ probePin = 19;
probePin = 19; buttonPin = 18;
buttonPin = 18; }
else
} else {
{ probePin = 18;
probePin = 18; buttonPin = 19;
buttonPin = 19; }
}
restartProbing: restartProbing:
int lastRow[10]; int lastRow[10];
@ -129,8 +132,6 @@ restartProbing:
rainbowIndex = 12; rainbowIndex = 12;
} }
unsigned long probeButtonTimer = 0;
if (setOrClear == 0) if (setOrClear == 0)
{ {
probeButtonTimer = millis(); probeButtonTimer = millis();
@ -149,7 +150,7 @@ restartProbing:
row[0] = scanRows(ADC0_PIN); row[0] = scanRows(ADC0_PIN);
if (row[0] == -18 && (millis() - probingTimer > 500) && checkProbeButton() == 1 && millis() - probeButtonTimer > 1000) if (row[0] == -18 && (millis() - probingTimer > 500) && checkProbeButton() == 1 && (millis() - probeButtonTimer) > 1000)
{ {
if (longShortPress(750) == 1) if (longShortPress(750) == 1)
{ {
@ -166,14 +167,11 @@ restartProbing:
connectedRowsIndex = 0; connectedRowsIndex = 0;
node1or2 = 0; node1or2 = 0;
nodesToConnect[0] = -1; nodesToConnect[0] = -1;
nodesToConnect[1] = -1; nodesToConnect[1] = -1;
//showLEDsCore2 = 1;
// showLEDsCore2 = 1;
break; break;
} }
@ -189,18 +187,25 @@ restartProbing:
if (connectedRowsIndex > 1) if (connectedRowsIndex > 1)
{ {
for (int k = 0; k < 4; k++) for (int k = 0; k < 3; k++) // check a few more times to make sure we got all of them
{ {
connectedRows2Index[k] = 0;
for (int i = 0; i < connectedRowsIndex; i++) for (int i = 0; i < connectedRowsIndex; i++)
{ {
connectedRows2[k][i] = connectedRows[i]; if (connectedRows[i] != SUPPLY_5V && connectedRows[i] != GND && connectedRows[i] != SUPPLY_3V3)
{
connectedRows2[k][connectedRows2Index[k]] = connectedRows[i];
connectedRows2Index[k]++;
}
} }
connectedRows2Index[k] = connectedRowsIndex; // connectedRows2Index[k] = connectedRowsIndex;
connectedRowsIndex = 0; connectedRowsIndex = 0;
scanRows(ADC0_PIN); scanRows(ADC0_PIN);
delayMicroseconds(10);
} }
int maxIndex = 0; int maxIndex = 0;
for (int i = 0; i < 4; i++) for (int i = 0; i < 3; i++)
{ {
if (connectedRows2Index[i] > connectedRows2Index[maxIndex]) if (connectedRows2Index[i] > connectedRows2Index[maxIndex])
{ {
@ -209,25 +214,46 @@ restartProbing:
} }
for (int i = 0; i < connectedRows2Index[maxIndex]; i++) for (int i = 0; i < connectedRows2Index[maxIndex]; i++)
{ {
connectedRows[i] = connectedRows2[maxIndex][i]; if (connectedRows2[maxIndex][i] != SUPPLY_5V && connectedRows2[maxIndex][i] != GND && connectedRows2[maxIndex][i] != SUPPLY_3V3)
{
connectedRows[i] = connectedRows2[maxIndex][i];
}
} }
connectedRowsIndex = connectedRows2Index[maxIndex]; connectedRowsIndex = connectedRows2Index[maxIndex];
}
if (connectedRowsIndex > 1) // if GND or 5V, we're not including them in the multiple nodes found
{
std::sort(connectedRows, connectedRows + connectedRowsIndex); std::sort(connectedRows, connectedRows + connectedRowsIndex);
nodesToConnect[node1or2] = selectFromLastFound(); nodesToConnect[node1or2] = selectFromLastFound();
// leds.setPixelColor(nodesToPixelMap[nodesToConnect[node1or2]], rainbowList[0][0], rainbowList[0][1], rainbowList[0][2]);
connectedRows[0] = nodesToConnect[node1or2];
node1or2++; node1or2++;
probingTimer = millis(); probingTimer = millis();
probeButtonTimer = millis(); // probeButtonTimer = millis();
showLEDsCore2 = 2; doubleSelectTimeout = millis();
delay(30); doubleSelectCountdown = 1000;
showLEDsCore2 = 2;
delay(10);
} }
else if (connectedRowsIndex == 1) else if (connectedRowsIndex == 1)
{ {
nodesToConnect[node1or2] = connectedRows[0]; nodesToConnect[node1or2] = connectedRows[0];
printNodeOrName(nodesToConnect[0]); printNodeOrName(nodesToConnect[0]);
Serial.print("\r\t"); Serial.print("\r\t");
if (nodesToConnect[node1or2] == SUPPLY_3V3 || nodesToConnect[node1or2] == SUPPLY_5V && voltageChosen == 0)
{
voltageSelection = voltageSelect();
nodesToConnect[node1or2] = voltageSelection;
voltageChosen = 1;
showLEDsCore2 = 2;
}
if (node1or2 == 1 && setOrClear == 1 && nodesToConnect[0] == GND) if (node1or2 == 1 && setOrClear == 1 && nodesToConnect[0] == GND)
{ {
leds.setPixelColor(nodesToPixelMap[nodesToConnect[1]], 0, 45, 5); leds.setPixelColor(nodesToPixelMap[nodesToConnect[1]], 0, 45, 5);
@ -247,13 +273,15 @@ restartProbing:
else else
{ {
// Serial.print("!!!!!"); // Serial.print("!!!!!");
leds.setPixelColor(nodesToPixelMap[connectedRows[0]], rainbowList[rainbowIndex][0], rainbowList[rainbowIndex][1], rainbowList[rainbowIndex][2]); leds.setPixelColor(nodesToPixelMap[nodesToConnect[node1or2]], rainbowList[rainbowIndex][0], rainbowList[rainbowIndex][1], rainbowList[rainbowIndex][2]);
// leds.show(); // leds.show();
} }
node1or2++; node1or2++;
probingTimer = millis(); probingTimer = millis();
showLEDsCore2 = 2; showLEDsCore2 = 2;
doubleSelectTimeout = millis();
doubleSelectCountdown = 1500;
delay(10); delay(10);
// delay(3); // delay(3);
@ -264,8 +292,13 @@ restartProbing:
if (node1or2 >= 2 || (setOrClear == 0 && node1or2 >= 1)) if (node1or2 >= 2 || (setOrClear == 0 && node1or2 >= 1))
{ {
// Serial.print("\n\n\n\r!!!!!!!!!\n\n\n\r");
// if (nodesToConnect[0] != nodesToConnect[1])
// {
if (setOrClear == 1) // }
if (setOrClear == 1 && (nodesToConnect[0] != nodesToConnect[1]) && nodesToConnect[0] != -1 && nodesToConnect[1] != -1)
{ {
Serial.print("\r \r"); Serial.print("\r \r");
printNodeOrName(nodesToConnect[0]); printNodeOrName(nodesToConnect[0]);
@ -298,7 +331,7 @@ restartProbing:
// sendAllPathsCore2 = 1; // sendAllPathsCore2 = 1;
// digitalWrite(RESETPIN, LOW); // digitalWrite(RESETPIN, LOW);
delay(25); delay(35);
// row[1] = -1; // row[1] = -1;
@ -307,7 +340,7 @@ restartProbing:
doubleSelectTimeout = millis(); doubleSelectTimeout = millis();
doubleSelectCountdown = 2000; doubleSelectCountdown = 2000;
} }
else else if (setOrClear == 0)
{ {
Serial.print("\r \r"); Serial.print("\r \r");
printNodeOrName(nodesToConnect[0]); printNodeOrName(nodesToConnect[0]);
@ -315,9 +348,9 @@ restartProbing:
removeBridgeFromNodeFile(nodesToConnect[0]); removeBridgeFromNodeFile(nodesToConnect[0]);
leds.setPixelColor(nodesToPixelMap[nodesToConnect[0]], 0, 0, 0); leds.setPixelColor(nodesToPixelMap[nodesToConnect[0]], 0, 0, 0);
//leds.setPixelColor(nodesToPixelMap[nodesToConnect[1]], 0, 0, 0); // leds.setPixelColor(nodesToPixelMap[nodesToConnect[1]], 0, 0, 0);
rainbowIndex = 12; rainbowIndex = 12;
//printNodeFile(); // printNodeFile();
clearAllNTCC(); clearAllNTCC();
openNodeFile(); openNodeFile();
getNodesToConnect(); getNodesToConnect();
@ -345,11 +378,57 @@ restartProbing:
row[1] = row[0]; row[1] = row[0];
} }
// Serial.print("\n\r");
// Serial.print(" ");
// Serial.print(row[0]);
if (node1or2 == 0 && doubleSelectCountdown <= 0) if (justSelectedConnectedNodes == 1)
{
justSelectedConnectedNodes = 0;
}
if (setOrClear == 1) // makes the LED brighter when you have one node selected
{ {
if (node1or2 == 0)
{
rawOtherColors[1] = 0x4500e8;
}
else
{
if (nodesToConnect[0] == GND)
{
rawOtherColors[1] = 0x00ff00;
}
else if (nodesToConnect[0] == SUPPLY_5V)
{
rawOtherColors[1] = 0xff0000;
}
else if (nodesToConnect[1] == SUPPLY_3V3)
{
rawOtherColors[1] = 0xff0066;
}
else
{
rawOtherColors[1] = 0x8510f8;
}
// rawOtherColors[1] = 0x8510f8;
}
showLEDsCore2 = 2;
}
else
{
rawOtherColors[1] = 0x6644A8;
showLEDsCore2 = 2;
}
if ((node1or2 == 0 && doubleSelectCountdown <= 0))
{
// Serial.println("doubleSelectCountdown");
row[1] = -2; row[1] = -2;
doubleSelectTimeout = millis();
doubleSelectCountdown = 1000;
} }
// Serial.println(doubleSelectCountdown); // Serial.println(doubleSelectCountdown);
@ -375,7 +454,7 @@ restartProbing:
bridgesToPaths(); bridgesToPaths();
// clearLEDs(); // clearLEDs();
leds.clear(); leds.clear();
assignNetColors(); assignNetColors();
// // Serial.print("bridgesToPaths\n\r"); // // Serial.print("bridgesToPaths\n\r");
// delay(18); // delay(18);
@ -395,12 +474,101 @@ restartProbing:
unsigned long blinkTimer = 0; unsigned long blinkTimer = 0;
int voltageSelect(void)
{
int selected = SUPPLY_3V3;
int selectionConfirmed = 0;
int selected2 = 0;
int lastSelected = 0;
connectedRows[0] = -1;
Serial.print("\r \r");
Serial.print("\n\r");
Serial.print(" select voltage\n\n\r");
Serial.print(" short press = cycle through voltages\n\r");
Serial.print(" long press = select\n\r");
Serial.print("\n\r ");
while (selectionConfirmed == 0)
{
if (lastSelected != selected)
{
if (selected == SUPPLY_3V3)
{
Serial.print("\r3.3V ");
clearLEDsExceptRails();
leds.setPixelColor(nodesToPixelMap[1], 55, 0, 12);
leds.setPixelColor(nodesToPixelMap[2], 55, 0, 12);
leds.setPixelColor(nodesToPixelMap[3], 55, 0, 12);
leds.setPixelColor(nodesToPixelMap[31], 15, 0, 0);
leds.setPixelColor(nodesToPixelMap[32], 15, 0, 0);
leds.setPixelColor(nodesToPixelMap[33], 15, 0, 0);
leds.setPixelColor(nodesToPixelMap[34], 15, 0, 0);
leds.setPixelColor(nodesToPixelMap[35], 15, 0, 0);
}
else if (selected == SUPPLY_5V)
{
Serial.print("\r5V ");
clearLEDsExceptRails();
leds.setPixelColor(nodesToPixelMap[1], 15, 0, 6);
leds.setPixelColor(nodesToPixelMap[2], 15, 0, 6);
leds.setPixelColor(nodesToPixelMap[3], 15, 0, 6);
leds.setPixelColor(nodesToPixelMap[31], 55, 0, 0);
leds.setPixelColor(nodesToPixelMap[32], 55, 0, 0);
leds.setPixelColor(nodesToPixelMap[33], 55, 0, 0);
leds.setPixelColor(nodesToPixelMap[34], 55, 0, 0);
leds.setPixelColor(nodesToPixelMap[35], 55, 0, 0);
}
// showLEDsCore2 = 1;
leds.show();
lastSelected = selected;
}
delay(30);
int longShort = longShortPress();
if (longShort == 1)
{
selectionConfirmed = 1;
voltageSelection = selected;
// break;
}
else if (longShort == 0)
{
if (selected == SUPPLY_3V3)
{
selected = SUPPLY_5V;
}
else
{
selected = SUPPLY_3V3;
}
}
}
// Serial.print("\n\r");
leds.clear();
showNets();
showLEDsCore2 = 2;
return voltageSelection;
}
int selectFromLastFound(void) int selectFromLastFound(void)
{ {
rawOtherColors[1] = 0x0010ff;
blinkTimer = 0; blinkTimer = 0;
int selected = 0; int selected = 0;
int selectionConfirmed = 0; int selectionConfirmed = 0;
int selected2 = connectedRows[selected];
Serial.print("\n\r"); Serial.print("\n\r");
Serial.print(" multiple nodes found\n\n\r"); Serial.print(" multiple nodes found\n\n\r");
Serial.print(" short press = cycle through nodes\n\r"); Serial.print(" short press = cycle through nodes\n\r");
@ -416,7 +584,8 @@ int selectFromLastFound(void)
Serial.print(", "); Serial.print(", ");
} }
} }
Serial.print("\n\n\r "); Serial.print("\n\n\r");
delay(10);
uint32_t previousColor[connectedRowsIndex]; uint32_t previousColor[connectedRowsIndex];
@ -424,13 +593,15 @@ int selectFromLastFound(void)
{ {
previousColor[i] = leds.getPixelColor(nodesToPixelMap[connectedRows[i]]); previousColor[i] = leds.getPixelColor(nodesToPixelMap[connectedRows[i]]);
} }
int lastSelected = -1;
while (selectionConfirmed == 0) while (selectionConfirmed == 0)
{ {
probeTimeout = millis(); probeTimeout = millis();
// if (millis() - blinkTimer > 100) // if (millis() - blinkTimer > 100)
// { // {
if (lastSelected != selected && selectionConfirmed == 0)
{
for (int i = 0; i < connectedRowsIndex; i++) for (int i = 0; i < connectedRowsIndex; i++)
{ {
if (i == selected) if (i == selected)
@ -445,7 +616,7 @@ int selectFromLastFound(void)
int r = (previousColor[i] >> 16) & 0xFF; int r = (previousColor[i] >> 16) & 0xFF;
int g = (previousColor[i] >> 8) & 0xFF; int g = (previousColor[i] >> 8) & 0xFF;
int b = (previousColor[i] >> 0) & 0xFF; int b = (previousColor[i] >> 0) & 0xFF;
leds.setPixelColor(nodesToPixelMap[connectedRows[i]], (r / 3) + 3, (g / 3) + 3, (b / 3) + 3); leds.setPixelColor(nodesToPixelMap[connectedRows[i]], (r / 4) + 5, (g / 4) + 5, (b / 4) + 5);
} }
else else
{ {
@ -454,40 +625,43 @@ int selectFromLastFound(void)
} }
} }
} }
Serial.print("\r"); lastSelected = selected;
Serial.print("");
Serial.print(" \r");
// Serial.print("");
printNodeOrName(connectedRows[selected]); printNodeOrName(connectedRows[selected]);
Serial.print(" "); Serial.print(" ");
//leds.show(); }
showLEDsCore2 = 2; // leds.show();
blinkTimer = millis(); showLEDsCore2 = 2;
// } blinkTimer = millis();
// }
delay(30); delay(30);
int longShort = longShortPress(); int longShort = longShortPress();
delay(5); delay(5);
if (longShort == 1) if (longShort == 1)
{ {
selectionConfirmed = 1; selectionConfirmed = 1;
for (int i = 0; i < connectedRowsIndex; i++) // for (int i = 0; i < connectedRowsIndex; i++)
{ // {
if (i == selected) // if (i == selected)
// if (0) // // if (0)
{ // {
leds.setPixelColor(nodesToPixelMap[connectedRows[i]], rainbowList[rainbowIndex][0], rainbowList[rainbowIndex][1], rainbowList[rainbowIndex][2]); // leds.setPixelColor(nodesToPixelMap[connectedRows[i]], rainbowList[rainbowIndex][0], rainbowList[rainbowIndex][1], rainbowList[rainbowIndex][2]);
} // }
else // else
{ // {
leds.setPixelColor(nodesToPixelMap[connectedRows[i]], 0, 0, 0); // leds.setPixelColor(nodesToPixelMap[connectedRows[i]], 0, 0, 0);
} // }
} // }
showLEDsCore2 = 1; // showLEDsCore2 = 1;
// selected = lastFound[node1or2][selected]; // selected = lastFound[node1or2][selected];
// clearLastFound(); // clearLastFound();
// delay(500); // delay(500);
int selected2 = connectedRows[selected]; selected2 = connectedRows[selected];
return selected2; // return selected2;
// break; break;
} }
else if (longShort == 0) else if (longShort == 0)
{ {
@ -495,26 +669,12 @@ int selectFromLastFound(void)
selected++; selected++;
blinkTimer = 0; blinkTimer = 0;
// break;
//}
// delay(5);
// Serial.print("\n\r");
// Serial.print("node1or2: ");
// Serial.println(node1or2);
// Serial.print("selected: ");
// Serial.println(selected);
// Serial.print("lastFoundIndex[");
// Serial.print(node1or2);
// Serial.print("]: ");
// Serial.println(connectedRowsIndex);
// delay(5);
if (selected >= connectedRowsIndex) if (selected >= connectedRowsIndex)
{ {
selected = 0; selected = 0;
} }
//delay(100); // delay(100);
} }
delay(15); delay(15);
// } // }
@ -522,7 +682,35 @@ int selectFromLastFound(void)
// showLEDsCore2 = 1; // showLEDsCore2 = 1;
} }
int selected2 = connectedRows[selected]; selected2 = connectedRows[selected];
for (int i = 0; i < connectedRowsIndex; i++)
{
if (i == selected)
{
leds.setPixelColor(nodesToPixelMap[connectedRows[selected]], rainbowList[0][0], rainbowList[0][1], rainbowList[0][2]);
}
else if (previousColor[i] != 0)
{
int r = (previousColor[i] >> 16) & 0xFF;
int g = (previousColor[i] >> 8) & 0xFF;
int b = (previousColor[i] >> 0) & 0xFF;
leds.setPixelColor(nodesToPixelMap[connectedRows[i]], r, g, b);
}
else
{
leds.setPixelColor(nodesToPixelMap[connectedRows[i]], 0, 0, 0);
}
}
// leds.setPixelColor(nodesToPixelMap[selected2], rainbowList[0][0], rainbowList[0][1], rainbowList[0][2]);
// leds.show();
// showLEDsCore2 = 1;
probeButtonTimer = millis();
// connectedRowsIndex = 0;
justSelectedConnectedNodes = 1;
return selected2; return selected2;
} }
@ -658,7 +846,6 @@ int readFloatingOrState(int pin, int rowBeingScanned)
else else
{ {
if (readingPullup2 == 1 && readingPulldown2 == 0) if (readingPullup2 == 1 && readingPulldown2 == 0)
{ {
@ -666,27 +853,27 @@ int readFloatingOrState(int pin, int rowBeingScanned)
} }
else if (readingPullup2 == 1 && readingPulldown2 == 1) else if (readingPullup2 == 1 && readingPulldown2 == 1)
{ {
// Serial.print(readingPullup); // Serial.print(readingPullup);
// // Serial.print(readingPullup2); // // Serial.print(readingPullup2);
// // Serial.print(readingPullup3); // // Serial.print(readingPullup3);
// // //Serial.print(" "); // // //Serial.print(" ");
// Serial.print(readingPulldown); // Serial.print(readingPulldown);
// // Serial.print(readingPulldown2); // // Serial.print(readingPulldown2);
// // Serial.print(readingPulldown3); // // Serial.print(readingPulldown3);
// Serial.print("\n\r"); // Serial.print("\n\r");
state = high; state = high;
} }
else if (readingPullup2 == 0 && readingPulldown2 == 0) else if (readingPullup2 == 0 && readingPulldown2 == 0)
{ {
// Serial.print(readingPullup); // Serial.print(readingPullup);
// // Serial.print(readingPullup2); // // Serial.print(readingPullup2);
// // Serial.print(readingPullup3); // // Serial.print(readingPullup3);
// // //Serial.print(" "); // // //Serial.print(" ");
// Serial.print(readingPulldown); // Serial.print(readingPulldown);
// // Serial.print(readingPulldown2); // // Serial.print(readingPulldown2);
// // Serial.print(readingPulldown3); // // Serial.print(readingPulldown3);
// Serial.print("\n\r"); // Serial.print("\n\r");
state = low; state = low;
} }
else if (readingPullup == 0 && readingPulldown == 1) else if (readingPullup == 0 && readingPulldown == 1)
@ -737,6 +924,7 @@ int scanRows(int pin)
{ {
int found = -1; int found = -1;
connectedRows[0] = -1;
if (checkProbeButton() == 1) if (checkProbeButton() == 1)
{ {
@ -751,17 +939,18 @@ int scanRows(int pin)
// delayMicroseconds(20); // delayMicroseconds(20);
pinMode(probePin, INPUT); pinMode(probePin, INPUT);
delayMicroseconds(400); delayMicroseconds(400);
int probeRead = readFloatingOrState(probePin, -1); int probeRead = readFloatingOrState(probePin, -1);
if (probeRead == high) if (probeRead == high)
{ {
found = SUPPLY_5V; found = voltageSelection;
connectedRows[connectedRowsIndex] = found; connectedRows[connectedRowsIndex] = found;
connectedRowsIndex++; connectedRowsIndex++;
found = -1;
// return connectedRows[connectedRowsIndex]; // return connectedRows[connectedRowsIndex];
//Serial.print("high"); // Serial.print("high");
return found; // return found;
} }
else if (probeRead == low) else if (probeRead == low)
@ -769,7 +958,8 @@ int scanRows(int pin)
found = GND; found = GND;
connectedRows[connectedRowsIndex] = found; connectedRows[connectedRowsIndex] = found;
connectedRowsIndex++; connectedRowsIndex++;
return found; // return found;
found = -1;
// return connectedRows[connectedRowsIndex]; // return connectedRows[connectedRowsIndex];
// Serial.print(connectedRows[connectedRowsIndex]); // Serial.print(connectedRows[connectedRowsIndex]);

2
JumperlessNano/src/Probing.h
View File

@ -22,7 +22,7 @@ enum measuredState
}; };
int voltageSelect(void);
int longShortPress(int pressLength = 500); int longShortPress(int pressLength = 500);
int doubleSingleClick(void); int doubleSingleClick(void);
int selectFromLastFound(void); int selectFromLastFound(void);

74
JumperlessNano/src/main.cpp
View File

@ -74,15 +74,15 @@ void setup()
USBSer1.begin(115200); USBSer1.begin(115200);
//setupAdcUsbStuff(); // I took this out because it was causing a crash on // setupAdcUsbStuff(); // I took this out because it was causing a crash on
#ifdef EEPROMSTUFF #ifdef EEPROMSTUFF
EEPROM.begin(256); EEPROM.begin(256);
debugFlagInit(); debugFlagInit();
#endif #endif
//delay(1); // delay(1);
//initADC(); // initADC();
delay(1); delay(1);
initDAC(); // also sets revisionNumber initDAC(); // also sets revisionNumber
delay(1); delay(1);
@ -131,7 +131,7 @@ int baudRate = 115200;
int restoredNodeFile = 0; int restoredNodeFile = 0;
const char firmwareVersion[] = "1.3.5"; //// remember to update this const char firmwareVersion[] = "1.3.7"; //// remember to update this
void loop() void loop()
{ {
@ -179,24 +179,23 @@ dontshowmenu:
lastNetConfirm(1); lastNetConfirm(1);
} }
if ((millis() % 200) < 5) if ((millis() % 200) < 5)
{ {
if (checkProbeButton() == 1) if (checkProbeButton() == 1)
{ {
int longShort = longShortPress(1000); int longShort = longShortPress(1000);
if (longShort == 1) if (longShort == 1)
{ {
input = 'c'; input = 'c';
probingTimer = millis(); probingTimer = millis();
goto skipinput; goto skipinput;
} else if ( longShort == 0) }
{ else if (longShort == 0)
input = 'p'; {
probingTimer = millis(); input = 'p';
goto skipinput; probingTimer = millis();
} goto skipinput;
}
} }
// pinMode(19, INPUT); // pinMode(19, INPUT);
@ -272,7 +271,7 @@ skipinput:
} }
case 'c': case 'c':
{ {
//removeBridgeFromNodeFile(19, 1); // removeBridgeFromNodeFile(19, 1);
probeMode(19, 0); probeMode(19, 0);
break; break;
} }
@ -339,7 +338,7 @@ skipinput:
savePreformattedNodeFile(serSource); savePreformattedNodeFile(serSource);
// Serial.print("savePFNF\n\r"); // Serial.print("savePFNF\n\r");
//debugFP = 1; // debugFP = 1;
openNodeFile(); openNodeFile();
getNodesToConnect(); getNodesToConnect();
// Serial.print("openNF\n\r"); // Serial.print("openNF\n\r");
@ -471,7 +470,6 @@ skipinput:
{ {
Serial.print("18"); Serial.print("18");
} }
Serial.print("\n\n\n\r"); Serial.print("\n\n\n\r");
@ -554,8 +552,8 @@ void lastNetConfirm(int forceLastNet)
assignNetColors(); assignNetColors();
sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
Serial.print("\n\r short press BOOTSEL to restore last netlist\n\r"); Serial.print("\n\r short press BOOTSEL to restore last netlist\n\r");
Serial.print(" long press to cancel\n\r"); Serial.print(" long press to cancel\n\r");
delay(250); delay(250);
if (BOOTSEL) if (BOOTSEL)
{ {
@ -567,22 +565,21 @@ Serial.print(" long press to cancel\n\r");
if (BOOTSEL) if (BOOTSEL)
bootselPressed = 1; bootselPressed = 1;
//clearLEDs(); // clearLEDs();
//leds.show(); // leds.show();
leds.clear(); leds.clear();
lightUpRail(-1, -1, 1, 28, supplySwitchPosition); lightUpRail(-1, -1, 1, 28, supplySwitchPosition);
leds.show(); leds.show();
//showLEDsCore2 = 1; // showLEDsCore2 = 1;
if (BOOTSEL) if (BOOTSEL)
bootselPressed = 1; bootselPressed = 1;
delay(250); delay(250);
//showLEDsCore2 = 2; // showLEDsCore2 = 2;
sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
//Serial.print("p\n\r"); // Serial.print("p\n\r");
if (BOOTSEL) if (BOOTSEL)
bootselPressed = 1; bootselPressed = 1;
// delay(250); // delay(250);
@ -597,8 +594,8 @@ Serial.print(" long press to cancel\n\r");
sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
showLEDsCore2 = 2; showLEDsCore2 = 2;
delay(250); delay(250);
clearLEDs(); clearLEDs();
//leds.clear(); // leds.clear();
showLEDsCore2 = 2; showLEDsCore2 = 2;
if (fade <= 0) if (fade <= 0)
@ -606,7 +603,7 @@ Serial.print(" long press to cancel\n\r");
clearAllNTCC(); clearAllNTCC();
clearLEDs(); clearLEDs();
startupColors(); startupColors();
//clearNodeFile(); // clearNodeFile();
sendAllPathsCore2 = 1; sendAllPathsCore2 = 1;
lastNetConfirmTimer = millis(); lastNetConfirmTimer = millis();
restoredNodeFile = 0; restoredNodeFile = 0;
@ -656,14 +653,14 @@ void machineMode(void) // read in commands in machine readable format
lastTimeNetlistLoaded = millis(); lastTimeNetlistLoaded = millis();
clearAllNTCC(); clearAllNTCC();
//writeNodeFileFromInputBuffer(); // writeNodeFileFromInputBuffer();
digitalWrite(RESETPIN, HIGH); digitalWrite(RESETPIN, HIGH);
machineNetlistToNetstruct(); machineNetlistToNetstruct();
populateBridgesFromNodes(); populateBridgesFromNodes();
bridgesToPaths(); bridgesToPaths();
clearLEDs(); clearLEDs();
assignNetColors(); assignNetColors();
// showNets(); // showNets();
@ -777,23 +774,16 @@ void loop1() // core 2 handles the LEDs and the CH446Q8
{ {
int rails = showLEDsCore2; int rails = showLEDsCore2;
if (rails == 1 || rails == 2)
if (rails == 1 || rails == 2)
{ {
lightUpRail(-1, -1, 1, 28, supplySwitchPosition); lightUpRail(-1, -1, 1, 28, supplySwitchPosition);
} }
if (rails != 2)
if (rails == 2)
{ {
} else {
showNets(); showNets();
} }
if (rails > 3) if (rails > 3)
{ {
Serial.print("\n\r"); Serial.print("\n\r");