From ea4895c2624878101863bd426ab1e89db3d766c8 Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Wed, 12 Jan 2022 00:52:27 +0100 Subject: [PATCH] fixed Warnings --- Software/ChainLube/src/globals.h | 4 ++-- Software/ChainLube/src/lubeapp.cpp | 7 ++++--- Software/ChainLube/src/main.cpp | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Software/ChainLube/src/globals.h b/Software/ChainLube/src/globals.h index 2b5652f..1f2a220 100644 --- a/Software/ChainLube/src/globals.h +++ b/Software/ChainLube/src/globals.h @@ -13,11 +13,11 @@ typedef enum eSystem_Status sysStat_Error } tSystem_Status; -typedef struct Globals_t { +typedef struct Globals_s { tSystem_Status systemStatus = sysStat_Startup; uint8_t purgePulses= 0; tSystem_Status resumeStatus = sysStat_Startup; -}; +}Globals_t; extern Globals_t globals; extern uint32_t TravelDistance_highRes; diff --git a/Software/ChainLube/src/lubeapp.cpp b/Software/ChainLube/src/lubeapp.cpp index 94b10b9..e73382f 100644 --- a/Software/ChainLube/src/lubeapp.cpp +++ b/Software/ChainLube/src/lubeapp.cpp @@ -6,8 +6,6 @@ uint32_t lubePulseTimestamp = 0; void RunLubeApp(volatile uint32_t *wheelPulseCounter) { - uint32_t LubeDistance = 0; - // Calculate traveled Distance in mm TravelDistance_highRes += (*wheelPulseCounter * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution)); *wheelPulseCounter = 0; @@ -38,7 +36,7 @@ void RunLubeApp(volatile uint32_t *wheelPulseCounter) case sysStat_Purge: if (globals.purgePulses > 0) { - if (lubePulseTimestamp + LUBE_PULSE_LENGHT_MS + LUBE_PULSE_PAUSE_MS < millis()) + if (lubePulseTimestamp + LUBE_PULSE_PAUSE_MS < millis()) { LubePulse(); globals.purgePulses--; @@ -49,6 +47,9 @@ void RunLubeApp(volatile uint32_t *wheelPulseCounter) globals.systemStatus = globals.resumeStatus; } break; + case sysStat_Error: + default: + break; } // maintain Pin-State of Lube-Pump diff --git a/Software/ChainLube/src/main.cpp b/Software/ChainLube/src/main.cpp index cedbf2b..4528a9e 100644 --- a/Software/ChainLube/src/main.cpp +++ b/Software/ChainLube/src/main.cpp @@ -267,6 +267,9 @@ void LED_Process(tSystem_Status newSysStatus) case sysStat_Error: LED_Status = LED_Error; break; + case sysStat_NOP: + default: + break; } oldSysStatus = newSysStatus; }