Compare commits
No commits in common. "eac6b2982521da843d625fce4dfbd3b0178f5ff8" and "2e0d19d8f652b7a0f6abc45bfe34cd2c43c02f3b" have entirely different histories.
eac6b29825
...
2e0d19d8f6
2 changed files with 11 additions and 15 deletions
|
@ -34,10 +34,10 @@ class Oled
|
|||
|
||||
public:
|
||||
void begin();
|
||||
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 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 show_values(int speed, int min_speed, int max_speed, volatile DataStruct *HallData, uint8_t hall_sensors_count, unsigned long runtime, String ipaddr);
|
||||
|
||||
};
|
||||
|
|
|
@ -22,27 +22,23 @@ void Oled::begin()
|
|||
display->setFont(ArialMT_Plain_16);
|
||||
}
|
||||
|
||||
void Oled::progressBar(uint8_t i, bool clear)
|
||||
void Oled::progressBar(uint8_t i)
|
||||
{
|
||||
progressBar(i, "", "", "", clear);
|
||||
progressBar(i, "", "", "");
|
||||
}
|
||||
|
||||
void Oled::progressBar(uint8_t i, String big_text, bool clear)
|
||||
void Oled::progressBar(uint8_t i, String big_text)
|
||||
{
|
||||
progressBar(i, big_text, "", "", clear);
|
||||
progressBar(i, big_text, "", "");
|
||||
}
|
||||
|
||||
void Oled::progressBar(uint8_t i, String big_text, String small_text1, bool clear)
|
||||
void Oled::progressBar(uint8_t i, String big_text, String small_text1)
|
||||
{
|
||||
progressBar(i, big_text, small_text1, "", clear);
|
||||
progressBar(i, big_text, small_text1, "");
|
||||
}
|
||||
|
||||
void Oled::progressBar(uint8_t i, String big_text, String small_text1, String small_text2, bool clear)
|
||||
void Oled::progressBar(uint8_t i, String big_text, String small_text1, String small_text2)
|
||||
{
|
||||
if(true == clear)
|
||||
{
|
||||
display->clear();
|
||||
}
|
||||
display->drawProgressBar(6, 28, 116, 6, i);
|
||||
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
||||
if(big_text != "")
|
||||
|
|
Loading…
Add table
Reference in a new issue