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

Revert "simplify config"

Browse source 
This reverts commit 241ac1ad92.
This commit is contained in:
melody 2025-08-27 16:49:54 +02:00
commit 3d5f9749ff
1 changed files with 60 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

79
code.ino
View file

@ -269,45 +269,64 @@ bool buttonPressedLastCycle = false;
bool sht3xErrorLastCycle = false; bool sht3xErrorLastCycle = false;
// CONFIG START // CONFIG START
DataStorage* tempData;
DataStorage* humData;
GraphElement* graphTemp;
GraphElement* graphHum;
MaxAvgMinElement* bigMaxAvgMinTemp;
MaxAvgMinElement* bigMaxAvgMinHum;
MaxAvgMinElement* maxAvgMinTemp;
MaxAvgMinElement* maxAvgMinHum;
showCurrentValue* showCurrentTemp;
showCurrentValue* showCurrentHum;
Screen* screenTemp;
Screen* screenHum;
Screen* screenBigTemp;
Screen* screenBigHum;
Screen* screenCurrent;
DisplayConfig* config;
void setup() {
// Datapoint storage. Arguments: Unit, amount of datapoints to be saved. // Datapoint storage. Arguments: Unit, amount of datapoints to be saved.
DataStorage tempData("C", AMOUNT_DATAPOINTS); tempData = new DataStorage("C", AMOUNT_DATAPOINTS);
DataStorage humData("%", AMOUNT_DATAPOINTS); humData = new DataStorage("%", AMOUNT_DATAPOINTS);
// Screen elements. Base arguments: X Pos, Y Pos, Width, Lenght, Datasource, Border true/false. // Screen elements. Base arguments: X Pos, Y Pos, Width, Lenght, Datasource, Border true/false.
GraphElement graphTemp(5, 5, 80, 70, tempData, true, AMOUNT_DATAPOINTS, 10); bigMaxAvgMinTemp = new MaxAvgMinElement(5, 5, 65, 70, *tempData, false, 2);
GraphElement graphHum(5, 5, 80, 70, humData, true, AMOUNT_DATAPOINTS, 10); bigMaxAvgMinHum = new MaxAvgMinElement(5, 5, 65, 70, *humData, false, 2);
MaxAvgMinElement bigMaxAvgMinTemp(5, 5, 65, 70, tempData, false, 2); graphTemp = new GraphElement(5, 5, 80, 70, *tempData, true, AMOUNT_DATAPOINTS, 10);
MaxAvgMinElement bigMaxAvgMinHum(5, 5, 65, 70, humData, false, 2); maxAvgMinTemp = new MaxAvgMinElement(90, 5, 65, 70, *tempData, false, 1);
MaxAvgMinElement maxAvgMinTemp(90, 5, 65, 70, tempData, false, 1); graphHum = new GraphElement(5, 5, 80, 70, *humData, true, AMOUNT_DATAPOINTS, 10);
MaxAvgMinElement maxAvgMinHum(90, 5, 65, 70, humData, false, 1); maxAvgMinHum = new MaxAvgMinElement(90, 5, 65, 70, *humData, false, 1);
showCurrentValue showCurrentTemp(0, 0, 40, 80, tempData, false); showCurrentTemp = new showCurrentValue(0, 0, 40, 80, *tempData, false);
showCurrentValue showCurrentHum(0, 40, 40, 80, humData, false); showCurrentHum = new showCurrentValue(0, 40, 40, 80, *humData, false);
// Element 'collections' / arrays. Arguments: Array containing pointers to elements, nullptr must be at the end. // Element 'collections' / arrays. Arguments: Array containing pointers to elements, nullptr must be at the end.
Element* elemArrTemp[] { &graphTemp, &maxAvgMinTemp, nullptr }; static Element* elemArrTemp[] = { graphTemp, maxAvgMinTemp, nullptr };
Element* elemArrHum[] { &graphHum, &maxAvgMinHum, nullptr }; static Element* elemArrHum[] = { graphHum, maxAvgMinHum, nullptr };
Element* elemBigArrTemp[] { &bigMaxAvgMinTemp, nullptr }; static Element* elemBigArrTemp[] = { bigMaxAvgMinTemp, nullptr };
Element* elemBigArrHum[] { &bigMaxAvgMinHum, nullptr }; static Element* elemBigArrHum[] = { bigMaxAvgMinHum, nullptr };
Element* currentArr[] { &showCurrentTemp, &showCurrentHum, nullptr }; static Element* currentArr[] = { showCurrentTemp, showCurrentHum, nullptr };
// Screens. Arguments: Element arrays. // Screens. Arguments: Element arrays.
Screen screenTemp(elemArrTemp); screenTemp = new Screen(elemArrTemp);
Screen screenHum(elemArrHum); screenHum = new Screen(elemArrHum);
Screen screenBigTemp(elemBigArrTemp); screenBigTemp = new Screen(elemBigArrTemp);
Screen screenBigHum(elemBigArrHum); screenBigHum = new Screen(elemBigArrHum);
Screen screenCurrent(currentArr); screenCurrent = new Screen(currentArr);
// 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.
Screen* screenArr[] = { &screenCurrent, &screenTemp, &screenHum, &screenBigTemp, &screenBigHum, nullptr}; static Screen* screenArr[] = { screenCurrent, screenTemp, screenHum, screenBigTemp, screenBigHum, nullptr};
DisplayConfig config(screenArr); // Config. Arguments: A screen array.
config = new DisplayConfig(screenArr);
// CONFIG END // CONFIG END
void setup() {
Serial.begin(115200); Serial.begin(115200);
Serial.println(F("Serial started.")); Serial.println(F("Serial started."));
@ -326,7 +345,7 @@ void setup() {
void loop() { void loop() {
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
if (sht3xErrorLastCycle) { if (sht3xErrorLastCycle) {
config.drawCurrentScreen(); config->drawCurrentScreen();
sht3xErrorLastCycle = false; sht3xErrorLastCycle = false;
} }
if (currentMillis - previousMillis >= WAIT_TIME * 1000) { if (currentMillis - previousMillis >= WAIT_TIME * 1000) {
@ -335,11 +354,11 @@ void loop() {
float temp = sht3x.temperature(); float temp = sht3x.temperature();
float hum = sht3x.humidity(); float hum = sht3x.humidity();
tempData.addData(temp); tempData->addData(temp);
humData.addData(hum); humData->addData(hum);
config.drawCurrentScreen(); config->drawCurrentScreen();
Serial.print(F("Temperature: ")); Serial.print(F("Temperature: "));
Serial.print(temp); Serial.print(temp);
@ -361,8 +380,8 @@ void loop() {
} }
if (digitalRead(buttonPin)){ if (digitalRead(buttonPin)){
if (!buttonPressedLastCycle && millis() - lastDebounceTime > DEBOUNCE_DELAY){ if (!buttonPressedLastCycle && millis() - lastDebounceTime > DEBOUNCE_DELAY){
config.cycleScreen(); config->cycleScreen();
config.drawCurrentScreen(); config->drawCurrentScreen();
buttonPressedLastCycle = true; buttonPressedLastCycle = true;
lastDebounceTime = millis(); lastDebounceTime = millis();
} }