souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

some Code-simplification

Browse Source
This commit is contained in:
Marcel Peterkau
2023-09-25 07:17:38 +02:00
parent caff1c185f
commit aff1d40297
3 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Software/src/lubeapp.cpp
View File

@@ -22,6 +22,7 @@ void RunLubeApp(uint32_t add_milimeters)
switch (globals.systemStatus)
{
case sysStat_Startup:
strcpy_P(globals.systemStatustxt, PSTR("Startup"));
if (millis() > STARTUP_DELAY)
{
globals.systemStatus = sysStat_Normal;
@@ -30,6 +31,7 @@ void RunLubeApp(uint32_t add_milimeters)
break;
case sysStat_Normal:
strcpy_P(globals.systemStatustxt, PSTR("Normal"));
if (PersistenceData.TravelDistance_highRes_mm / 1000 > LubeConfig.DistancePerLube_Default)
{
LubePulse();
@@ -38,6 +40,7 @@ void RunLubeApp(uint32_t add_milimeters)
break;
case sysStat_Rain:
strcpy_P(globals.systemStatustxt, PSTR("Rain"));
if (PersistenceData.TravelDistance_highRes_mm / 1000 > LubeConfig.DistancePerLube_Rain)
{
LubePulse();
@@ -45,12 +48,14 @@ void RunLubeApp(uint32_t add_milimeters)
}
break;
case sysStat_Purge:
strcpy_P(globals.systemStatustxt, PSTR("Purge"));
if (globals.purgePulses > 0)
{
if (lubePulseTimestamp + LUBE_PULSE_PAUSE_MS < millis())
{
LubePulse();
globals.purgePulses--;
Debug_pushMessage("Purge remain: %d\n", globals.purgePulses);
}
}
else
@@ -58,32 +63,14 @@ void RunLubeApp(uint32_t add_milimeters)
globals.systemStatus = globals.resumeStatus;
}
break;
case sysStat_Error:
case sysStat_Shutdown:
default:
break;
}
switch (globals.systemStatus)
{
case sysStat_Normal:
strcpy_P(globals.systemStatustxt, PSTR("Normal"));
break;
case sysStat_Purge:
strcpy_P(globals.systemStatustxt, PSTR("Purge"));
break;
case sysStat_Rain:
strcpy_P(globals.systemStatustxt, PSTR("Rain"));
break;
case sysStat_Startup:
strcpy_P(globals.systemStatustxt, PSTR("Startup"));
break;
case sysStat_Error:
strcpy_P(globals.systemStatustxt, PSTR("Error"));
break;
case sysStat_Shutdown:
strcpy_P(globals.systemStatustxt, PSTR("Shutdown"));
break;
default:
break;
}
// maintain Pin-State of Lube-Pump