fixed Warnings
This commit is contained in:
parent
87e3d2e739
commit
ea4895c262
@ -13,11 +13,11 @@ typedef enum eSystem_Status
|
|||||||
sysStat_Error
|
sysStat_Error
|
||||||
} tSystem_Status;
|
} tSystem_Status;
|
||||||
|
|
||||||
typedef struct Globals_t {
|
typedef struct Globals_s {
|
||||||
tSystem_Status systemStatus = sysStat_Startup;
|
tSystem_Status systemStatus = sysStat_Startup;
|
||||||
uint8_t purgePulses= 0;
|
uint8_t purgePulses= 0;
|
||||||
tSystem_Status resumeStatus = sysStat_Startup;
|
tSystem_Status resumeStatus = sysStat_Startup;
|
||||||
};
|
}Globals_t;
|
||||||
|
|
||||||
extern Globals_t globals;
|
extern Globals_t globals;
|
||||||
extern uint32_t TravelDistance_highRes;
|
extern uint32_t TravelDistance_highRes;
|
||||||
|
@ -6,8 +6,6 @@ uint32_t lubePulseTimestamp = 0;
|
|||||||
|
|
||||||
void RunLubeApp(volatile uint32_t *wheelPulseCounter)
|
void RunLubeApp(volatile uint32_t *wheelPulseCounter)
|
||||||
{
|
{
|
||||||
uint32_t LubeDistance = 0;
|
|
||||||
|
|
||||||
// Calculate traveled Distance in mm
|
// Calculate traveled Distance in mm
|
||||||
TravelDistance_highRes += (*wheelPulseCounter * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
|
TravelDistance_highRes += (*wheelPulseCounter * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
|
||||||
*wheelPulseCounter = 0;
|
*wheelPulseCounter = 0;
|
||||||
@ -38,7 +36,7 @@ void RunLubeApp(volatile uint32_t *wheelPulseCounter)
|
|||||||
case sysStat_Purge:
|
case sysStat_Purge:
|
||||||
if (globals.purgePulses > 0)
|
if (globals.purgePulses > 0)
|
||||||
{
|
{
|
||||||
if (lubePulseTimestamp + LUBE_PULSE_LENGHT_MS + LUBE_PULSE_PAUSE_MS < millis())
|
if (lubePulseTimestamp + LUBE_PULSE_PAUSE_MS < millis())
|
||||||
{
|
{
|
||||||
LubePulse();
|
LubePulse();
|
||||||
globals.purgePulses--;
|
globals.purgePulses--;
|
||||||
@ -49,6 +47,9 @@ void RunLubeApp(volatile uint32_t *wheelPulseCounter)
|
|||||||
globals.systemStatus = globals.resumeStatus;
|
globals.systemStatus = globals.resumeStatus;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case sysStat_Error:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// maintain Pin-State of Lube-Pump
|
// maintain Pin-State of Lube-Pump
|
||||||
|
@ -267,6 +267,9 @@ void LED_Process(tSystem_Status newSysStatus)
|
|||||||
case sysStat_Error:
|
case sysStat_Error:
|
||||||
LED_Status = LED_Error;
|
LED_Status = LED_Error;
|
||||||
break;
|
break;
|
||||||
|
case sysStat_NOP:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
oldSysStatus = newSysStatus;
|
oldSysStatus = newSysStatus;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user