smash
/
ebk-unhb-co2ampel
forked from github/ebk_co2ampel
2
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Mehr Infos auf dem Display im Kalibrationsmodus und beim starten

This commit is contained in:
Stefan Heinrichsen 2020-12-03 18:58:28 +01:00
parent 207224fa05
commit 0f1f0b0067
1 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ebk_co2ampel.cpp
View File

@ -15,7 +15,7 @@
// Display Update-Intervall in Milisekunden // Display Update-Intervall in Milisekunden
#define DISPLAY_INTERVAL 2500 #define DISPLAY_INTERVAL 2500
// Dauer der Kalibrierungsphase in Milisekunden // Dauer der Kalibrierungsphase in Milisekunden
#define CALINTERVAL 180*1000 #define CAL_INTERVAL 300*1000
// Boot-Mode Konstanten // Boot-Mode Konstanten
#define BOOT_NORMAL 42 #define BOOT_NORMAL 42
@ -42,14 +42,13 @@ HardwareSerial mySerial(1);
SSD1306Wire display(0x3c, SDA_PIN, SCL_PIN); SSD1306Wire display(0x3c, SDA_PIN, SCL_PIN);
Adafruit_NeoPixel pixels = Adafruit_NeoPixel(NUMPIXELS, LED_PIN, NEO_GRB + NEO_KHZ800); Adafruit_NeoPixel pixels = Adafruit_NeoPixel(NUMPIXELS, LED_PIN, NEO_GRB + NEO_KHZ800);
String ampelversion = "0.13"; String ampelversion = "0.50";
unsigned long calibrationStart = 0;
int countdown = 0;
int lastvals[120]; int lastvals[120];
int dheight; int dheight;
int safezone = false;
int currentBootMode; int currentBootMode;
void setBootMode(int bootMode) { void setBootMode(int bootMode) {
if(bootMode == BOOT_NORMAL) { if(bootMode == BOOT_NORMAL) {
Serial.println("Startmodus nächster Reboot: Messmodus"); Serial.println("Startmodus nächster Reboot: Messmodus");
@ -134,13 +133,21 @@ void setup() {
// Ab hier Display einrichten // Ab hier Display einrichten
display.init(); display.init();
display.setFont(Cousine_Regular_54); // display.setLogBuffer(5,30);
display.setContrast(255); display.setContrast(255);
delay(500); delay(500);
display.clear(); display.clear();
display.flipScreenVertically(); display.flipScreenVertically();
display.setFont(ArialMT_Plain_16);
display.setTextAlignment(TEXT_ALIGN_CENTER); display.setTextAlignment(TEXT_ALIGN_CENTER);
display.drawString(64 ,0 , String(ampelversion)); display.drawString(64, 0, "Version: " + String(ampelversion));
if(currentBootMode == BOOT_NORMAL) {
display.drawString(64, 17, "Zum Kalibrieren");
display.drawString(64, 34, "Neustarten" );
} else {
display.drawString(64, 17, "Zum Messen");
display.drawString(64, 34, "Neustarten" );
}
display.display(); display.display();
dheight = display.getHeight(); dheight = display.getHeight();
@ -158,12 +165,12 @@ void setup() {
Serial.print("ABC Status: "); myMHZ19.getABC() ? Serial.println("ON") : Serial.println("OFF"); Serial.print("ABC Status: "); myMHZ19.getABC() ? Serial.println("ON") : Serial.println("OFF");
Serial.print("read EEPROM value: "); Serial.println(currentBootMode); Serial.print("read EEPROM value: "); Serial.println(currentBootMode);
Serial.print("First CO2 value (should be 400): "); Serial.println(readCO2()); Serial.print("First CO2 value (should be 400): "); Serial.println(readCO2());
// Liste der Messwerte mit "-1" befüllen ("-1" wird beinm Graph nicht gezeichnet) // Liste der Messwerte mit "-1" befüllen ("-1" wird beinm Graph nicht gezeichnet)
for (int x = 0; x <= 119; x = x + 1) { for (int x = 0; x <= 119; x = x + 1) {
lastvals[x] = -1; lastvals[x] = -1;
} }
// Ab hier LED-Ring konfigurien // Ab hier LED-Ring konfigurien
pixels.begin(); pixels.begin();
pixels.clear(); pixels.clear();
@ -171,8 +178,9 @@ void setup() {
pixels.show(); pixels.show();
// Wir lesen schonmal einen CO2 Sensorwert, da die erste Werte meist Müll sind // Wir lesen schonmal einen CO2 Sensorwert, da die erste Werte meist Müll sind
delay (5000); readCO2(); delay(5000);
Serial.print("Second CO2 value: "); Serial.println(readCO2()); Serial.print("Second CO2 value: "); Serial.println(readCO2());
Serial.flush();
} }
int calc_vpos_for_co2(int co2val, int display_height) { int calc_vpos_for_co2(int co2val, int display_height) {
@ -258,11 +266,9 @@ void updateDisplayCO2(int co2) {
} }
} }
// Aktuellen CO2 Wert ausgeben // Aktuellen CO2 Wert ausgeben
//display.setLogBuffer(1, 30);
display.setFont(Cousine_Regular_54); display.setFont(Cousine_Regular_54);
display.setTextAlignment(TEXT_ALIGN_CENTER); display.setTextAlignment(TEXT_ALIGN_CENTER);
display.drawString(64 ,0 , String(co2)); display.drawString(64 ,0 , String(co2));
//display.drawLogBuffer(0, 0);
display.display(); display.display();
// Fertig mit update; Zeitpunkt für das nächste Update speichern // Fertig mit update; Zeitpunkt für das nächste Update speichern
@ -271,27 +277,41 @@ void updateDisplayCO2(int co2) {
} }
void loop() { void loop() {
static unsigned long calibrationStart = 0;
static int countdown = 0;
static int safezone = false;
int co2; int co2;
// Nur für die ersten 10 Sekunden wichtig, // Nur für die ersten 10 Sekunden wichtig,
if ( (!safezone) & (millis() > 10000) ) { if ( (!safezone) & (millis() > 10000) ) {
Serial.println("=== 10 Sekunden im Betrieb, nächster Boot im Messmodus ==="); Serial.println("=== 10 Sekunden im Betrieb, nächster Boot im Messmodus ===");
setBootMode(BOOT_NORMAL); // setBootMode(BOOT_NORMAL);
safezone = true; safezone = true;
} }
if (safezone) { if (safezone) {
if (currentBootMode == BOOT_CALIBRATE){ if (currentBootMode == BOOT_CALIBRATE){
if (millis() - calibrationStart <= CALINTERVAL) { if (millis() - calibrationStart <= CAL_INTERVAL) {
rainbow(10); rainbow(10);
display.clear(); countdown = ((calibrationStart + CAL_INTERVAL) - millis()) / 1000;
display.setTextAlignment(TEXT_ALIGN_CENTER);
countdown = ((calibrationStart + CALINTERVAL) - millis()) / 1000;
Serial.println("Countdown: " + String(countdown)); Serial.println("Countdown: " + String(countdown));
display.drawString(64, 0, String(countdown));
display.clear();
display.setFont(ArialMT_Plain_16);
display.setTextAlignment(TEXT_ALIGN_LEFT);
display.drawString(0, 0, "SensorKalibration");
display.setFont(ArialMT_Plain_10);;
display.drawString(0, 17, "Abbrechen durch Neustart");
display.setTextAlignment(TEXT_ALIGN_CENTER);
display.setFont(ArialMT_Plain_16);;
display.drawString(64, 35, "Rest: " + String(countdown) + " Sek.");
display.display(); display.display();
} }
else if (millis() - calibrationStart >= CALINTERVAL) { else if (millis() - calibrationStart >= CAL_INTERVAL) {
calibrateCO2(); calibrateCO2();
calibrationStart = millis(); calibrationStart = millis();
} }