lexa/AHome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set hostname for bigroom

Browse Source
This commit is contained in:
lexa
2022-12-05 19:03:15 +03:00
parent ff810435b3
commit b2b2921390
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ESP_BigRoom/src/main.cpp
View File

@@ -34,7 +34,8 @@ void setup() {
Serial.begin(115200); Serial.begin(115200);
Serial.println("Booting"); // "Загрузка" Serial.println("Booting"); // "Загрузка"
WiFi.mode(WIFI_STA); 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(ssid1, password1);
wifiMulti.addAP(ssid2, password2); wifiMulti.addAP(ssid2, password2);
// ArduinoOTA.onStart([]() { // ArduinoOTA.onStart([]() {

25
ESP_Kor/src/main.cpp
View File

@@ -25,7 +25,7 @@
#define LED_WRK (D3) #define LED_WRK (D3)
#define LAMP_OUT (D5) #define LAMP_OUT (D5)
#define PIN_MOVE (D6) #define PIN_MOVE (D2)
int rxPin = D7; int rxPin = D7;
int txPin = D8; int txPin = D8;
@@ -149,15 +149,18 @@ void loop()
{ {
char v[6]; char v[6];
ArduinoOTA.handle(); ArduinoOTA.handle();
static unsigned long cRunADC = millis();
if(digitalRead(PIN_MOVE) > 0){ if(digitalRead(PIN_MOVE) > 0){
if(curDelay == -1) mqttClient.publish(TOPIC"move", 1, false, "1"); if(curDelay == -1) mqttClient.publish(TOPIC"move", 1, false, "1");
move = true; 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(); //adc = samples.getMedian();
if ((samples.getMedian() <= minLight) && (move == 1)){ if ((samples.getMedian() <= minLight) && (move == 1)){
@@ -166,6 +169,9 @@ void loop()
Serial.println("Lamp ON"); Serial.println("Lamp ON");
Serial.print("ADC: ");Serial.print(samples.getMedian()); Serial.print("ADC: ");Serial.print(samples.getMedian());
Serial.print(", Move: ");Serial.println(move); 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); itoa(int(samples.getMedian()), v, 10);
mqttClient.publish(TOPIC"adc", 1, false, v); mqttClient.publish(TOPIC"adc", 1, false, v);
mqttClient.publish(TOPIC"lamp", 1, false, "1"); mqttClient.publish(TOPIC"lamp", 1, false, "1");
@@ -179,6 +185,9 @@ void loop()
Serial.println("Lamp OFF"); Serial.println("Lamp OFF");
Serial.print("ADC: ");Serial.print(samples.getMedian()); Serial.print("ADC: ");Serial.print(samples.getMedian());
Serial.print(", Move: ");Serial.println(move); 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); itoa(int(samples.getMedian()), v, 10);
mqttClient.publish(TOPIC"adc", 1, false, v); mqttClient.publish(TOPIC"adc", 1, false, v);
mqttClient.publish(TOPIC"lamp", 1, false, "0"); mqttClient.publish(TOPIC"lamp", 1, false, "0");
@@ -206,9 +215,13 @@ void loop()
} }
if(curDelay > 0){ if(curDelay > 0){
curDelay--; curDelay--;
WebSerial.print("MoveSens:");
WebSerial.print(digitalRead(PIN_MOVE));
WebSerial.print("Timer light:"); WebSerial.print("Timer light:");
WebSerial.print(curDelay); WebSerial.print(curDelay);
WebSerial.print(", ADC:"); WebSerial.print(", adc:");
WebSerial.print(adc);
WebSerial.print(", median:");
WebSerial.println(int(samples.getMedian())); WebSerial.println(int(samples.getMedian()));
} }