melody/arduino-temp-hum-display
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add software debounce

Browse source
This commit is contained in:
melody 2025-08-18 13:54:26 +02:00
commit 5fd1543e3f
1 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

53
main.ino
View file

@ -46,12 +46,14 @@ public:
} }
float getDataByIndex(int logicalIndex) { float getDataByIndex(int logicalIndex) {
if(logicalIndex < 0 || logicalIndex >= this->rCount) return 0; if (logicalIndex < 0 || logicalIndex >= this->rCount) return 0;
int realIndex = (this->rIndex + this->MAX_DATA_POINTS - this->rCount + logicalIndex) % this->MAX_DATA_POINTS; // pain int realIndex = (this->rIndex + this->MAX_DATA_POINTS - this->rCount + logicalIndex) % this->MAX_DATA_POINTS; // pain
return this->data[realIndex]; return this->data[realIndex];
} }
int getCursor() const { return this->rCount; } int getCursor() const {
return this->rCount;
}
float getMaxDataPoint() { float getMaxDataPoint() {
if (this->rCount == 0) return 0; if (this->rCount == 0) return 0;
@ -82,7 +84,9 @@ public:
return sum / this->rCount; return sum / this->rCount;
} }
String getUnit() { return this->UNIT; } String getUnit() {
return this->UNIT;
}
}; };
class Element { class Element {
@ -110,7 +114,7 @@ public:
}; };
class MaxAvgMinElement : public Element { class MaxAvgMinElement : public Element {
public: public:
using Element::Element; using Element::Element;
void render() override { void render() override {
if (this->DRAW_BOARDER) this->drawBoarder(); if (this->DRAW_BOARDER) this->drawBoarder();
@ -130,7 +134,6 @@ class MaxAvgMinElement : public Element {
tft.print(F("Min: ")); tft.print(F("Min: "));
tft.print(this->data.getMinDataPoint(), 1); tft.print(this->data.getMinDataPoint(), 1);
tft.print(unit); tft.print(unit);
}; };
}; };
@ -144,7 +147,9 @@ private:
return X + 2 + (int)(i * (this->WIDTH - 3) / (this->AMOUNT_DATAPOINTS - 1)); return X + 2 + (int)(i * (this->WIDTH - 3) / (this->AMOUNT_DATAPOINTS - 1));
} }
int getScaledY(float value) { return this->getScaledY(value, this->data.getMinDataPoint(), this->data.getMaxDataPoint()); }; // OOP is soo cool int getScaledY(float value) {
return this->getScaledY(value, this->data.getMinDataPoint(), this->data.getMaxDataPoint());
}; // OOP is soo cool
int getScaledY(float value, float minY, float maxY) { int getScaledY(float value, float minY, float maxY) {
if (maxY - minY == 0) return this->Y + this->HEIGHT / 2; if (maxY - minY == 0) return this->Y + this->HEIGHT / 2;
@ -187,28 +192,30 @@ class Screen {
protected: protected:
Element** elements; Element** elements;
public: public:
Screen(Element** elems) : elements(elems){}; Screen(Element** elems)
void draw(){ : elements(elems){};
for(int i = 0; this->elements[i] != nullptr; i++) { void draw() {
for (int i = 0; this->elements[i] != nullptr; i++) {
this->elements[i]->render(); this->elements[i]->render();
}; };
}; };
}; };
class DisplayConfig { class DisplayConfig {
private: private:
Screen** screens; Screen** screens;
int screenIndex; int screenIndex;
int screenCount; int screenCount;
public: public:
DisplayConfig(Screen** screens) : screens(screens), screenIndex(0), screenCount(0){ DisplayConfig(Screen** screens)
: screens(screens), screenIndex(0), screenCount(0) {
while (this->screens[this->screenCount] != nullptr) this->screenCount++; while (this->screens[this->screenCount] != nullptr) this->screenCount++;
tft.initR(INITR_MINI160x80); tft.initR(INITR_MINI160x80);
tft.setRotation(1); tft.setRotation(1);
tft.fillScreen(BACKGROUND_COLOUR); tft.fillScreen(BACKGROUND_COLOUR);
}; };
Screen* applyScreen(int index){ Screen* applyScreen(int index) {
this->screenIndex = index; this->screenIndex = index;
tft.fillScreen(BACKGROUND_COLOUR); tft.fillScreen(BACKGROUND_COLOUR);
return this->screens[index]; return this->screens[index];
@ -218,17 +225,23 @@ class DisplayConfig {
return this->applyScreen(this->screenIndex); return this->applyScreen(this->screenIndex);
} }
Screen* getCurrentScreen() {return this->screens[this->screenIndex];} Screen* getCurrentScreen() {
Screen* getCurrentScreenIndex() {return this->screenIndex;} return this->screens[this->screenIndex];
}
Screen* getCurrentScreenIndex() {
return this->screenIndex;
}
}; };
unsigned long previousMillis = -1000000000; unsigned long previousMillis = -1000000000;
unsigned long lastDebounceTime = 0;
unsigned long debounceDelay = 50;
bool buttonPressedLastCycle = false; bool buttonPressedLastCycle = false;
bool sht3xErrorLastCycle = false; bool sht3xErrorLastCycle = false;
// CONFIG START // CONFIG START
DataStorage* tempData; DataStorage* tempData;
DataStorage* humData; DataStorage* humData;
@ -274,7 +287,7 @@ void setup() {
screenBigHum = new Screen(elemBigArrHum); screenBigHum = new Screen(elemBigArrHum);
// Screen 'collections' / arrays: Arguments: Array containing pointers to screens, nullptr must be at the end. // Screen 'collections' / arrays: Arguments: Array containing pointers to screens, nullptr must be at the end.
static Screen* screenArr[] = { screenTemp, screenHum, screenBigTemp, screenBigHum, nullptr}; static Screen* screenArr[] = { screenTemp, screenHum, screenBigTemp, screenBigHum, nullptr };
// Config. Arguments: A screen array. // Config. Arguments: A screen array.
config = new DisplayConfig(screenArr); config = new DisplayConfig(screenArr);
@ -334,10 +347,12 @@ void loop() {
sht3xErrorLastCycle = true; sht3xErrorLastCycle = true;
} }
} }
if (digitalRead(buttonPin)){
if (!buttonPressedLastCycle){ if (digitalRead(buttonPin)) {
if (!buttonPressedLastCycle && millis() - lastDebounceTime > debounceDelay) {
config->cycleScreen()->draw(); config->cycleScreen()->draw();
buttonPressedLastCycle = true; buttonPressedLastCycle = true;
lastDebounceTime = millis();
} }
} else { } else {
buttonPressedLastCycle = false; buttonPressedLastCycle = false;