diff --git a/ESP32/StadlerHomeKitUpgrade/StadlerHomeKitUpgrade.ino b/ESP32/StadlerHomeKitUpgrade/StadlerHomeKitUpgrade.ino index 6913026..92d1aa3 100644 --- a/ESP32/StadlerHomeKitUpgrade/StadlerHomeKitUpgrade.ino +++ b/ESP32/StadlerHomeKitUpgrade/StadlerHomeKitUpgrade.ino @@ -6,7 +6,7 @@ #include #include -#define Version "0.2.0" +#define Version "0.2.1" @@ -42,7 +42,9 @@ #define NEOPIXEL 27 //GPIO04 D27 -#define IN_PHOTOTRA 12 +#define IN_PHOTOTRA 12 + +#define WTR_LVL 33 //GPIO04 D27 //NEO PIXEL ARDESES: @@ -72,6 +74,7 @@ int8_t resetVal = 0; int8_t fanSpeedVal = 0; int8_t hygrostatVal = 55; int8_t dimmVal = 10; +int8_t waterLvlVal = 0; float temp = 0.0; float hum = 0.0; @@ -98,7 +101,6 @@ int8_t neoPixelTank = 1; - void IRAM_ATTR dimmButtonFcn() { dimmVal ++; if (dimmVal >= 11) { @@ -146,8 +148,8 @@ void setup() { pinMode(PIN_SPEED_2, OUTPUT); pinMode(LED_RED_TANK, OUTPUT); pinMode(LED_WHT_TANK, OUTPUT); - pinMode(IN_PHOTOTRA, INPUT); - + pinMode(IN_PHOTOTRA, INPUT_PULLDOWN); + pinMode(WTR_LVL, INPUT); @@ -161,12 +163,7 @@ void setup() { } void loop() { - - float lux = lightMeter.readLightLevel(); - Serial.print("Light: "); - Serial.print(lux); - Serial.println(" lx"); - delay(1000); + delay(50); display.clearDisplay(); @@ -176,20 +173,39 @@ void loop() { display.setCursor(0, 0); display.println("RST:"); - display.setCursor(30, 0); + display.setCursor(25, 0); display.println(resetVal); - - display.setCursor(0, 10); - display.println("FanSpd:"); - display.setCursor(50, 10); - display.println(fanSpeedVal); - - display.setCursor(70, 10); - display.println("Hygst:"); - display.setCursor(115, 10); - display.println(hygrostatVal); + display.setCursor(35, 0); + display.println("L:"); + display.setCursor(47, 0); + float lux = lightMeter.readLightLevel(); + display.println(lux); + + + + int waterLvlVal = touchRead(WTR_LVL); + display.setCursor(0, 10); + display.println("WtrLvl:"); + display.setCursor(50, 10); + display.println(waterLvlVal); +// waterLvlVal > 45 znnaczy bez wiody + +// display.setCursor(0, 10); +// display.println("FanSpd:"); +// display.setCursor(50, 10); +// display.println(fanSpeedVal); + +// display.setCursor(0, 10); +// display.println("FanSpd:"); +// display.setCursor(50, 10); +// display.println(fanSpeedVal); +// +// display.setCursor(70, 10); +// display.println("Hygst:"); +// display.setCursor(115, 10); +// display.println(hygrostatVal); hum = (dht.readHumidity()); // display.setCursor(0, 20); @@ -254,8 +270,8 @@ void loop() { delay(500); - digitalWrite(LED_WHT_TANK, LOW); - digitalWrite(LED_RED_TANK, LOW); +// digitalWrite(LED_WHT_TANK, LOW); +// digitalWrite(LED_RED_TANK, LOW); // digitalWrite(PIN_SPEED_1, LOW); // digitalWrite(PIN_SPEED_2, LOW); }