From 07382f498291cfa38968ea54d0972a21f8d58aa9 Mon Sep 17 00:00:00 2001 From: jenoack Date: Fri, 24 Mar 2023 06:59:37 +0100 Subject: [PATCH 1/2] switched mttq on and to real data --- vscode/Unendlichkeitsmaschine/include/main.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/Unendlichkeitsmaschine/include/main.hpp b/vscode/Unendlichkeitsmaschine/include/main.hpp index 614df2d..78e2b36 100644 --- a/vscode/Unendlichkeitsmaschine/include/main.hpp +++ b/vscode/Unendlichkeitsmaschine/include/main.hpp @@ -2,7 +2,7 @@ #define MAIN_HPP //#define MACHINE_RESTART -#define DUMMY_DATA +//#define DUMMY_DATA #define EEPROM_NAME_TICK "hall_tick" #define EEPROM_NAME_TIMESTAMP "timestamp" @@ -19,7 +19,7 @@ #include "capportal.hpp" #include -//#define HAS_MQTT +#define HAS_MQTT #ifdef HAS_MQTT #include "mqtt.hpp" #include "json.hpp" From c6a7fd1f9eaaaf78d79b5c1322619a5d9866f6ed Mon Sep 17 00:00:00 2001 From: jenoack Date: Fri, 24 Mar 2023 07:11:50 +0100 Subject: [PATCH 2/2] oled clear switch added --- vscode/Unendlichkeitsmaschine/include/oled.hpp | 8 ++++---- vscode/Unendlichkeitsmaschine/src/oled.cpp | 18 +++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/vscode/Unendlichkeitsmaschine/include/oled.hpp b/vscode/Unendlichkeitsmaschine/include/oled.hpp index 98b762f..9c7e09e 100644 --- a/vscode/Unendlichkeitsmaschine/include/oled.hpp +++ b/vscode/Unendlichkeitsmaschine/include/oled.hpp @@ -34,10 +34,10 @@ class Oled public: void begin(); - void progressBar(uint8_t i); - void progressBar(uint8_t i, String big_text); - void progressBar(uint8_t i, String big_text, String small_text1); - void progressBar(uint8_t i, String big_text, String small_text1, String small_text2); + void progressBar(uint8_t i, bool clear); + void progressBar(uint8_t i, String big_text, bool clear); + void progressBar(uint8_t i, String big_text, String small_text1, bool clear); + void progressBar(uint8_t i, String big_text, String small_text1, String small_text2, bool clear); void show_values(int speed, int min_speed, int max_speed, volatile DataStruct *HallData, uint8_t hall_sensors_count, unsigned long runtime, String ipaddr); }; diff --git a/vscode/Unendlichkeitsmaschine/src/oled.cpp b/vscode/Unendlichkeitsmaschine/src/oled.cpp index 3e31f4e..9ab844c 100644 --- a/vscode/Unendlichkeitsmaschine/src/oled.cpp +++ b/vscode/Unendlichkeitsmaschine/src/oled.cpp @@ -22,23 +22,27 @@ void Oled::begin() display->setFont(ArialMT_Plain_16); } -void Oled::progressBar(uint8_t i) +void Oled::progressBar(uint8_t i, bool clear) { - progressBar(i, "", "", ""); + progressBar(i, "", "", "", clear); } -void Oled::progressBar(uint8_t i, String big_text) +void Oled::progressBar(uint8_t i, String big_text, bool clear) { - progressBar(i, big_text, "", ""); + progressBar(i, big_text, "", "", clear); } -void Oled::progressBar(uint8_t i, String big_text, String small_text1) +void Oled::progressBar(uint8_t i, String big_text, String small_text1, bool clear) { - progressBar(i, big_text, small_text1, ""); + progressBar(i, big_text, small_text1, "", clear); } -void Oled::progressBar(uint8_t i, String big_text, String small_text1, String small_text2) +void Oled::progressBar(uint8_t i, String big_text, String small_text1, String small_text2, bool clear) { + if(true == clear) + { + display->clear(); + } display->drawProgressBar(6, 28, 116, 6, i); display->setTextAlignment(TEXT_ALIGN_CENTER); if(big_text != "")