jenoack/Unendlichkeitsmaschine
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: jenoack:2e0d19d8f652b7a0f6abc45bfe34cd2c43c02f3b
Branches Tags
jenoack:master
...
compare: jenoack:eac6b2982521da843d625fce4dfbd3b0178f5ff8
Branches Tags
jenoack:master

3 commits
2e0d19d8f6 ... eac6b29825

Author SHA1 Message Date
jenoack
eac6b29825 Merge branch 'master' of https://git.makerlab-murnau.de/jenoack/Unendlichkeitsmaschine 2023-03-24 07:15:45 +01:00
jenoack
c6a7fd1f9e oled clear switch added 2023-03-24 07:14:53 +01:00
jenoack
07382f4982 switched mttq on and to real data 2023-03-24 07:14:22 +01:00
2 changed files with 15 additions and 11 deletions
Show stats Expand all files Collapse all files

8
vscode/Unendlichkeitsmaschine/include/oled.hpp
View file

@ -34,10 +34,10 @@ class Oled
public: public:
void begin(); void begin();
void progressBar(uint8_t i); void progressBar(uint8_t i, bool clear);
void progressBar(uint8_t i, String big_text); void progressBar(uint8_t i, String big_text, bool clear);
void progressBar(uint8_t i, String big_text, String small_text1); 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); 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); void show_values(int speed, int min_speed, int max_speed, volatile DataStruct *HallData, uint8_t hall_sensors_count, unsigned long runtime, String ipaddr);
}; };

18
vscode/Unendlichkeitsmaschine/src/oled.cpp
View file

@ -22,23 +22,27 @@ void Oled::begin()
display->setFont(ArialMT_Plain_16); 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->drawProgressBar(6, 28, 116, 6, i);
display->setTextAlignment(TEXT_ALIGN_CENTER); display->setTextAlignment(TEXT_ALIGN_CENTER);
if(big_text != "") if(big_text != "")