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

Fixed brightness menu

Browse Source 
removed annoying warnings
This commit is contained in:
Kevin Santo Cappuccio 2023-09-27 16:07:45 -07:00
parent de487e3cf1
commit ed48d88cb7
3 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
JumperlessNano/src/LEDs.cpp
View File

@ -90,7 +90,7 @@ char LEDbrightnessMenu(void)
// Serial.print(leds.getBrightness());
if (LEDbrightness > 50 || LEDbrightnessRail > 50 || LEDbrightnessSpecial > 70)
{
Serial.print("\tBrightness settings above ~50 will cause significant heating, it's not recommended\n\r");
//Serial.print("\tBrightness settings above ~50 will cause significant heating, it's not recommended\n\r");
delay(10);
}
@ -163,6 +163,12 @@ char LEDbrightnessMenu(void)
{
}
for (int i = 8; i <= numberOfNets; i++)
{
lightUpNet(i, -1, 1, LEDbrightness, 0);
}
showLEDsCore2 = 1;
if (Serial.available() == 0)
{
@ -171,7 +177,7 @@ char LEDbrightnessMenu(void)
Serial.print("\n\r");
if (LEDbrightness > 50)
{
Serial.print("Brightness settings above ~50 will cause significant heating, it's not recommended\n\r");
//Serial.print("Brightness settings above ~50 will cause significant heating, it's not recommended\n\r");
}
}
}
@ -227,7 +233,7 @@ char LEDbrightnessMenu(void)
Serial.print("\n\r");
if (LEDbrightnessRail > 50)
{
Serial.println("Brightness settings above ~50 will cause significant heating, it's not recommended\n\n\r");
//Serial.println("Brightness settings above ~50 will cause significant heating, it's not recommended\n\n\r");
}
}
}
@ -238,7 +244,7 @@ char LEDbrightnessMenu(void)
else if (input == 's')
{
Serial.print("\n\r\t+ = increase\n\r\t- = decrease\n\r\tx = exit\n\n\r");
//Serial.print("\n\r\t+ = increase\n\r\t- = decrease\n\r\tx = exit\n\n\r");
while (input == 's')
{
@ -256,7 +262,7 @@ char LEDbrightnessMenu(void)
LEDbrightnessSpecial = 200;
}
showLEDsCore2 = 1;
//showLEDsCore2 = 1;
}
else if (input2 == '-')
{
@ -268,7 +274,7 @@ char LEDbrightnessMenu(void)
LEDbrightnessSpecial = 1;
}
showLEDsCore2 = 1;
//showLEDsCore2 = 1;
}
else if (input2 == 'x')
{
@ -278,6 +284,12 @@ char LEDbrightnessMenu(void)
{
}
for (int i = 0; i < 8; i++)
{
lightUpNet(i, -1, 1, LEDbrightnessSpecial, 0);
}
showLEDsCore2 = 1;
if (Serial.available() == 0)
{
@ -286,7 +298,7 @@ char LEDbrightnessMenu(void)
Serial.print("\n\r");
if (LEDbrightnessSpecial > 70)
{
Serial.print("Brightness settings above ~70 for special nets will cause significant heating, it's not recommended\n\n\r ");
//Serial.print("Brightness settings above ~70 for special nets will cause significant heating, it's not recommended\n\n\r ");
}
}
}
@ -359,6 +371,18 @@ char LEDbrightnessMenu(void)
{
}
for (int i = 8; i <= numberOfNets; i++)
{
lightUpNet(i, -1, 1, LEDbrightness, 0);
}
lightUpRail(-1, -1, 1, LEDbrightnessRail);
for (int i = 0; i < 8; i++)
{
lightUpNet(i, -1, 1, LEDbrightnessSpecial, 0);
}
showLEDsCore2 = 1;
if (Serial.available() == 0)
{
@ -373,7 +397,7 @@ char LEDbrightnessMenu(void)
Serial.print("\n\r");
if (LEDbrightness > 50 || LEDbrightnessRail > 50 || LEDbrightnessSpecial > 70)
{
Serial.print("Brightness settings above ~50 will cause significant heating, it's not recommended\n\n\r ");
//Serial.print("Brightness settings above ~50 will cause significant heating, it's not recommended\n\n\r ");
}
}
}
@ -403,10 +427,11 @@ char LEDbrightnessMenu(void)
}
else
{
// EEPROM.write(LEDBRIGHTNESSADDRESS, LEDbrightness);
// EEPROM.write(RAILBRIGHTNESSADDRESS, LEDbrightnessRail);
// EEPROM.write(SPECIALBRIGHTNESSADDRESS, LEDbrightnessSpecial);
// EEPROM.commit();
EEPROM.write(LEDBRIGHTNESSADDRESS, LEDbrightness);
EEPROM.write(RAILBRIGHTNESSADDRESS, LEDbrightnessRail);
EEPROM.write(SPECIALBRIGHTNESSADDRESS, LEDbrightnessSpecial);
EEPROM.commit();
assignNetColors();
return input;
}
@ -1005,6 +1030,9 @@ void lightUpRail(int logo, int rail, int onOff, int brightness2)
Serial.print("\n\rled brightness: ");
Serial.print(LEDbrightness);
*/
brightness2 = LEDbrightnessRail;
if (logo == -1 && logoFlash == 0)
{
leds.setPixelColor(110, 0x550008);

5
JumperlessNano/src/NetsToChipConnections.cpp
View File

@ -122,6 +122,7 @@ void clearAllNTCC(void)
ch[i].yStatus[j] = -1;
}
}
}
void sortPathsByNet(void) // not actually sorting, just copying the bridges and nets back from netStruct so they're both in the same order
@ -829,6 +830,10 @@ void resolveAltPaths(void)
}
int xMapBB = xMapForChipLane0(path[i].chip[0], bb);
if (xMapBB == -1)
{
continue; //don't bother checking if there's no connection
}
int yMapSF = bb; // always

8
JumperlessNano/src/main.cpp
View File

@ -152,10 +152,11 @@ menu:
digitalWrite(RESETPIN, HIGH);
clearAllNTCC();
delay(5);
delay(10);
//showLEDsCore2 = 1;
digitalWrite(RESETPIN, LOW);
sendAllPathsCore2 = 1;
timer = millis();
#ifdef FSSTUFF
clearNodeFile();
@ -182,6 +183,9 @@ menu:
Serial.print(millis() - timer);
Serial.print("ms");
}
resetArduino();
break;
case '\n':