From ed4c53c740cb5ac5305b281a44d8a0f63e5343e3 Mon Sep 17 00:00:00 2001 From: Robin Dietzel Date: Fri, 13 Jan 2023 14:53:47 +0100 Subject: [PATCH] FEATURE: impl refill pump cooldown logic --- Core/Inc/git_rev.h | 2 +- Core/Src/main.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Core/Inc/git_rev.h b/Core/Inc/git_rev.h index d4b8e5e..e41d05a 100644 --- a/Core/Inc/git_rev.h +++ b/Core/Inc/git_rev.h @@ -7,6 +7,6 @@ // Auto generated header file containing the last git revision -#define GIT_HASH "9b50d90" +#define GIT_HASH "ed9a66b" #endif //FLOATPUMP_GIT_REVISION_TEMPLATE_H \ No newline at end of file diff --git a/Core/Src/main.cpp b/Core/Src/main.cpp index 547ac08..f839016 100644 --- a/Core/Src/main.cpp +++ b/Core/Src/main.cpp @@ -286,19 +286,17 @@ int main(void) { } - /*display.LCDSetCursor(0, 3); - if (S_refillempty) { + display.LCDSetCursor(0, 3); + if (S_refillcooldown > 0) { + display.LCDSendCString(const_cast(std::string("Cooldown: " + std::to_string(S_refillcooldown / 60) + "min").c_str())); + } else if (S_refillempty) { display.LCDSendCString(const_cast(std::string("Nachspeisung mangel ").c_str())); HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET); } else { display.LCDSendCString(const_cast(std::string("Nachspeisung ok ").c_str())); HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_SET); - }*/ + } - display.LCDSetCursor(0, 3); - //if (S_refillcooldown > 0) { - display.LCDSendCString(const_cast(std::string("Cooldown: " + std::to_string(S_refillcooldown) + "s").c_str())); - //} //Check for rotation to enable display backlight if (old_pos < rot_counter) {