diff --git a/ESP_BigRoom/src/main.cpp b/ESP_BigRoom/src/main.cpp index 89bbb1b..72fc7ba 100644 --- a/ESP_BigRoom/src/main.cpp +++ b/ESP_BigRoom/src/main.cpp @@ -34,7 +34,8 @@ void setup() { Serial.begin(115200); Serial.println("Booting"); // "Загрузка" WiFi.mode(WIFI_STA); - WiFi.hostname("BigRoom"); + WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); + WiFi.setHostname("BigRoom"); wifiMulti.addAP(ssid1, password1); wifiMulti.addAP(ssid2, password2); // ArduinoOTA.onStart([]() { diff --git a/ESP_Kor/src/main.cpp b/ESP_Kor/src/main.cpp index 9ce0f92..b210bf1 100644 --- a/ESP_Kor/src/main.cpp +++ b/ESP_Kor/src/main.cpp @@ -25,7 +25,7 @@ #define LED_WRK (D3) #define LAMP_OUT (D5) -#define PIN_MOVE (D6) +#define PIN_MOVE (D2) int rxPin = D7; int txPin = D8; @@ -149,15 +149,18 @@ void loop() { char v[6]; ArduinoOTA.handle(); + static unsigned long cRunADC = millis(); if(digitalRead(PIN_MOVE) > 0){ if(curDelay == -1) mqttClient.publish(TOPIC"move", 1, false, "1"); move = true; - curDelay = timeDelay; + curDelay = timeDelay - 7; + } + if (cRunADC + 50 < millis()){ + cRunADC = millis(); + adc = analogRead(A0); + samples.add(adc); } - - adc = analogRead(A0); - samples.add(adc); //adc = samples.getMedian(); if ((samples.getMedian() <= minLight) && (move == 1)){ @@ -166,6 +169,9 @@ void loop() Serial.println("Lamp ON"); Serial.print("ADC: ");Serial.print(samples.getMedian()); Serial.print(", Move: ");Serial.println(move); + WebSerial.println("Lamp ON"); + WebSerial.print("ADC: ");WebSerial.print(samples.getMedian()); + WebSerial.print(", Move: ");WebSerial.println(move); itoa(int(samples.getMedian()), v, 10); mqttClient.publish(TOPIC"adc", 1, false, v); mqttClient.publish(TOPIC"lamp", 1, false, "1"); @@ -179,6 +185,9 @@ void loop() Serial.println("Lamp OFF"); Serial.print("ADC: ");Serial.print(samples.getMedian()); Serial.print(", Move: ");Serial.println(move); + WebSerial.println("Lamp OFF"); + WebSerial.print("ADC: ");WebSerial.print(samples.getMedian()); + WebSerial.print(", Move: ");WebSerial.println(move); itoa(int(samples.getMedian()), v, 10); mqttClient.publish(TOPIC"adc", 1, false, v); mqttClient.publish(TOPIC"lamp", 1, false, "0"); @@ -206,9 +215,13 @@ void loop() } if(curDelay > 0){ curDelay--; + WebSerial.print("MoveSens:"); + WebSerial.print(digitalRead(PIN_MOVE)); WebSerial.print("Timer light:"); WebSerial.print(curDelay); - WebSerial.print(", ADC:"); + WebSerial.print(", adc:"); + WebSerial.print(adc); + WebSerial.print(", median:"); WebSerial.println(int(samples.getMedian())); }