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

Reihenfolge der Setup() Methode sortiert

This commit is contained in:
Stefan Heinrichsen 2020-11-26 15:52:07 +01:00
parent cf13f25c97
commit 529dc9b818
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ebk_co2ampel.cpp
View File

@ -65,18 +65,15 @@ void switchBootMode(int bm){
} }
} }
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
Serial.println("Starte...");
Serial.print("CO2-Ampel Firmware: ");Serial.println(ampelversion);
preferences.begin("co2", false); preferences.begin("co2", false);
tocalibrateornot = preferences.getUInt("cal",69); // wir lesen unser flag ein, 23 = reboot vor safezone, wir wollen kalibrieren, 42 = reboot nach safezone, wir tun nichts tocalibrateornot = preferences.getUInt("cal",69); // wir lesen unser flag ein, 23 = reboot vor safezone, wir wollen kalibrieren, 42 = reboot nach safezone, wir tun nichts
preferences.putUInt("cal", 23); // wir sind gerade gestartet preferences.putUInt("cal", 23); // wir sind gerade gestartet
mySerial.begin(9600, SERIAL_8N1, RX_PIN, TX_PIN);
myMHZ19.begin(mySerial);
myMHZ19.autoCalibration(false); // baseline calibration erstmal aus
pixels.clear();
display.init(); display.init();
display.setFont(Cousine_Regular_54); display.setFont(Cousine_Regular_54);
display.setContrast(255); display.setContrast(255);
@ -88,27 +85,18 @@ void setup() {
display.display(); display.display();
dheight = display.getHeight(); dheight = display.getHeight();
Serial.println("boot..."); mySerial.begin(9600, SERIAL_8N1, RX_PIN, TX_PIN);
Serial.println(ampelversion); myMHZ19.begin(mySerial);
myMHZ19.autoCalibration(false); // baseline calibration erstmal aus
char myVersion[4]; char myVersion[4];
myMHZ19.getVersion(myVersion); myMHZ19.getVersion(myVersion);
Serial.print("\nFirmware Version: "); Serial.print("\nMH-Z19b Firmware Version: ");
for(byte i = 0; i < 4; i++) Serial.print(myVersion[0]);Serial.print(myVersion[1]);;Serial.print(".");Serial.print(myVersion[2]);Serial.println(myVersion[3]);
{ Serial.print("Range: "); Serial.println(myMHZ19.getRange());
Serial.print(myVersion[i]); Serial.print("Background CO2: "); Serial.println(myMHZ19.getBackgroundCO2());
if(i == 1) Serial.print("Temperature Cal: "); Serial.println(myMHZ19.getTempAdjustment());
Serial.print(".");
}
Serial.println("");
Serial.print("Range: ");
Serial.println(myMHZ19.getRange());
Serial.print("Background CO2: ");
Serial.println(myMHZ19.getBackgroundCO2());
Serial.print("Temperature Cal: ");
Serial.println(myMHZ19.getTempAdjustment());
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.print("read EEPROM value: "); Serial.println(tocalibrateornot);
Serial.println(tocalibrateornot);
switch(tocalibrateornot){ switch(tocalibrateornot){
case 23: case 23:
@ -119,13 +107,13 @@ void setup() {
break; break;
} }
// Pre-Fill array of last measurements with -1
// Fill array of last measurements with -1
for (int x = 0; x <= 119; x = x + 1) { for (int x = 0; x <= 119; x = x + 1) {
lastvals[x] = -1; lastvals[x] = -1;
} }
pixels.begin(); pixels.begin();
pixels.clear();
for(int i=0; i<NUMPIXELS; i++) { for(int i=0; i<NUMPIXELS; i++) {
pixels.setPixelColor(i, 0,0,50); pixels.setPixelColor(i, 0,0,50);
pixels.show(); pixels.show();