make warmuptime a constant

[toast/airingbutler.git] / airingbutler.ino

diff --git a/airingbutler.ino b/airingbutler.ino
index c93f4ba89dad7496c546c027c24957dd18119b7a..b4579e6fe78e2a46ec31fb07fdd016c51364a722 100644 (file)
--- a/airingbutler.ino
+++ b/airingbutler.ino
@@ -14,12 +14,24 @@ const int buzzer_pin = 13;
 const int co2_warning_thr = 1000;
 const int co2_alarm_thr   = 1500;
 
 const int co2_warning_thr = 1000;
 const int co2_alarm_thr   = 1500;
 

+const unsigned long warmuptime = 60000; // 1 min.
+

 MHZ19 mhz19 = MHZ19(rx_pin,tx_pin);
 LiquidCrystal lcd(7, 8, 9, 10, 11, 12);
 
 unsigned long time;
 MHZ19 mhz19 = MHZ19(rx_pin,tx_pin);
 LiquidCrystal lcd(7, 8, 9, 10, 11, 12);
 
 unsigned long time;

+int co2 = 0;
+int temp = 0;

 int lastppm = 0;
 
 int lastppm = 0;
 

+void buzz(unsigned long pause, int count) {
+       for (int i = 0; i <= count; i++) {
+               digitalWrite(buzzer_pin, HIGH);
+               delay(pause);
+               digitalWrite(buzzer_pin, LOW);
+               if (i < count - 1) delay(pause);
+       }
+}

 
 void setup()
 {
 
 void setup()
 {


@@ -30,17 +42,16 @@ void setup()
        mhz19.begin(rx_pin, tx_pin);
 
        // LCD
        mhz19.begin(rx_pin, tx_pin);
 
        // LCD

-       lcd.begin(16,2);
-       lcd.setCursor(0,0);
+       lcd.begin(16, 2);
+       lcd.setCursor(0, 0);

        lcd.print("Airing Butler");
        lcd.print("Airing Butler");

-       lcd.setCursor(0,1);
+       lcd.setCursor(0, 1);

        lcd.print("says hello!");
 
        lcd.print("says hello!");
 

-       // LEDs + buzzer
+       // LEDs

        pinMode(led_green_pin, OUTPUT);
        pinMode(led_yellow_pin, OUTPUT);
        pinMode(led_red_pin, OUTPUT);
        pinMode(led_green_pin, OUTPUT);
        pinMode(led_yellow_pin, OUTPUT);
        pinMode(led_red_pin, OUTPUT);

-       pinMode(buzzer_pin, OUTPUT);

        digitalWrite(led_green_pin, HIGH);
        delay(500);
        digitalWrite(led_green_pin, LOW);
        digitalWrite(led_green_pin, HIGH);
        delay(500);
        digitalWrite(led_green_pin, LOW);


@@ -50,9 +61,10 @@ void setup()
        digitalWrite(led_red_pin, HIGH);
        delay(500);
        digitalWrite(led_red_pin, LOW);
        digitalWrite(led_red_pin, HIGH);
        delay(500);
        digitalWrite(led_red_pin, LOW);

-       digitalWrite(buzzer_pin, HIGH);
-       delay(200);
-       digitalWrite(buzzer_pin, LOW);
+
+       // buzzer
+       pinMode(buzzer_pin, OUTPUT);
+       buzz(200, 1);

 
        lcd.clear();
 }
 
        lcd.clear();
 }


@@ -62,42 +74,39 @@ void loop()
 {
        time = millis();
        measurement_t m = mhz19.getMeasurement();
 {
        time = millis();
        measurement_t m = mhz19.getMeasurement();

+       co2 = m.co2_ppm;
+       temp = m.temperature;

 
        Serial.print(time);
        Serial.print(",");
 
        Serial.print(time);
        Serial.print(",");

-       Serial.print(m.co2_ppm);
+       Serial.print(co2);

        Serial.print(",");
        Serial.print(",");

-       Serial.println(m.temperature);
+       Serial.println(temp);

 
 

-       digitalWrite(led_red_pin, m.co2_ppm >= co2_alarm_thr);
-       digitalWrite(led_yellow_pin, m.co2_ppm >= co2_warning_thr && m.co2_ppm < co2_alarm_thr);
-       digitalWrite(led_green_pin, m.co2_ppm < co2_warning_thr);
+       digitalWrite(led_red_pin, co2 >= co2_alarm_thr);
+       digitalWrite(led_yellow_pin, co2 >= co2_warning_thr && co2 < co2_alarm_thr);
+       digitalWrite(led_green_pin, co2 < co2_warning_thr);

 
 

-       if (m.co2_ppm >= co2_alarm_thr && lastppm < co2_alarm_thr) {
-               digitalWrite(buzzer_pin, HIGH);
-               delay(100);
-               digitalWrite(buzzer_pin, LOW);
-               delay(100);
-               digitalWrite(buzzer_pin, HIGH);
-               delay(100);
-               digitalWrite(buzzer_pin, LOW);
-               delay(100);
-               digitalWrite(buzzer_pin, HIGH);
-               delay(100);
-               digitalWrite(buzzer_pin, LOW);
+       if (co2 >= co2_alarm_thr && lastppm < co2_alarm_thr) {
+               buzz(100, 3);

        }
 
        }
 

-       if (m.co2_ppm >= co2_warning_thr && lastppm < co2_warning_thr) {
-               digitalWrite(buzzer_pin, HIGH);
-               delay(500);
-               digitalWrite(buzzer_pin, LOW);
+       if (co2 >= co2_warning_thr && lastppm < co2_warning_thr) {
+               buzz(500, 1);

        }
 
        lcd.setCursor(0, 0);
        lcd.print("CO2: ");
        }
 
        lcd.setCursor(0, 0);
        lcd.print("CO2: ");

-       lcd.print(m.co2_ppm);
-       lcd.print(" ppm         ");
+       lcd.print(co2);
+       if (time < warmuptime && (co2 == -1 || co2 == 410)) {
+               lcd.print (" (W)");
+       }
+       lcd.print(" ppm    ");
+       lcd.setCursor(0, 1);
+       lcd.print("Temp: ");
+       lcd.print(temp);
+       lcd.print(" C +/-  ");

 
 

-       lastppm = m.co2_ppm;
+       lastppm = co2;

        delay(5000);
 }
        delay(5000);
 }