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

Change chanel & kor send & move sensors time

Browse Source
This commit is contained in:
lexa
2020-11-20 14:21:39 +03:00
parent a45b73601c
commit 9d5b0bbc22
9 changed files with 176 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ESP_MidRoom/platformio.ini
View File

@@ -16,4 +16,6 @@ board_build.f_cpu = 26000000L
board_build.ldscript = eagle.flash.1m.ld
;board_build.flash_mode = dout
upload_protocol = espota
upload_port = 192.168.1.132
upload_port = 192.168.1.132
lib_deps =
jwrw/ESP_EEPROM @ ^2.0.0

54
ESP_MidRoom/src/main.cpp
View File

@@ -3,7 +3,7 @@
#include <Ticker.h>
#include <AsyncMqttClient.h>
#include <leds.h>
#include <EEPROM.h>
#include <ESP_EEPROM.h>
#define R_LED (13)
#define G_LED (12)
@@ -124,9 +124,9 @@ void setup() {
Serial1.println(p); */
}
EEPROM.begin(4);
EEPROM.get(0, mvDelaySet);
mvDelaySet = 90;
EEPROM.begin(16);
EEPROM.get(4, mvDelaySet);
//mvDelaySet = 90;
mvDelay = -1;
connectToWifi();
@@ -143,21 +143,21 @@ void loop() {
ArduinoOTA.handle();
g_led.tick();
//r_led.tick();
if((digitalRead(MOV_SENS) > 0) && (mvDelay == -1)){
//mqttClient.publish("/home/midroom/move", 1, false, "1");
if(digitalRead(MOV_SENS) > 0){
if(mvDelay == -1) mqttClient.publish("/home/midroom/move", 1, false, "1");
mvDelay = mvDelaySet;
}
if (digitalRead(MOV_SENS) != old_mov){
/*if (digitalRead(MOV_SENS) != old_mov){
old_mov = digitalRead(MOV_SENS);
//Serial1.println(F("Change mov detected"));
mqttClient.publish("/home/midroom/move", 1, false, old_mov ? "1" : "0");
}
}*/
if(cRun + 999 < millis()){
cRun = millis();
if(mvDelay == 0) {
//mqttClient.publish("/home/midroom/move", 1, false, "0");
mqttClient.publish("/home/midroom/move", 1, false, "0");
mvDelay = -1;
}
if(mvDelay > 0) mvDelay--;
@@ -193,10 +193,10 @@ void loop() {
//r_led.start();
//Serial1.println("Begin Publish");
dtostrf(t, 5, 1,v);
mqttClient.publish("/home/midroom/temp", 0, false, v);
mqttClient.publish("/home/midroom/temp", 1, false, v);
//Serial1.println("Publish1");
dtostrf(h, 5, 1,v);
mqttClient.publish("/home/midroom/humid", 0, false, v);
mqttClient.publish("/home/midroom/humid", 1, false, v);
//Serial1.println("Publish2");
if(firstRun){
stDelay++;
@@ -204,7 +204,7 @@ void loop() {
}
if(!firstRun && (mhz19.errorCode == RESULT_OK)){
itoa(co2, v, 10);
mqttClient.publish("/home/midroom/co2", 0, false, v);
mqttClient.publish("/home/midroom/co2", 1, false, v);
//Serial1.println("Publish3");
}
}
@@ -258,22 +258,16 @@ void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
}
void onMqttConnect(bool sessionPresent) {
/* Serial1.println(F("Connected to MQTT."));
Serial1.print(F("Session present: "));
//Serial1.flush();
Serial1.println(sessionPresent); */
//digitalWrite(B_LED, HIGH);
//digitalWrite(R_LED, LOW);
//uint16_t packetIdSub =
// //Serial1.print("Subscribing Lamp1, packetId: ");
// //Serial1.println(packetIdSub);
//packetIdSub = mqttClient.subscribe("/home/kor/lamp2_set", 1);
////Serial1.print("Subscribing Lamp2, packetId: ");
////Serial1.println(packetIdSub);
////Serial1.println("Publishing at Lamp 1");
//mqttClient.publish("/home/kor/lamp2", 1, false, lStat2 ? "1" : "0");
////Serial1.println("Publishing at Lamp 2");
digitalWrite(B_LED, LOW);
char v[15];
sprintf(v, "%u", mvDelaySet);
//itoa(mvDelaySet, v, 10);
mqttClient.publish("/home/midroom/mvdelay", 1, false, v);
mqttClient.subscribe("/home/midroom/mvdelay", 1);
// ultoa(ESP.getFlashChipSize(), v, 10);
// mqttClient.publish("/home/midroom/chipsize", 1, false, v);
// ultoa(ESP.getFlashChipRealSize(), v, 10);
// mqttClient.publish("/home/midroom/realchipsize", 1, false, v);
digitalWrite(B_LED, LOW);
}
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
@@ -302,8 +296,8 @@ void onMqttUnsubscribe(uint16_t packetId) {
void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
if(strcmp(topic, "/home/midroom/mvdelay") == 0){
mvDelaySet = atol(payload);
EEPROM.put(0, mvDelaySet);
mvDelaySet = atoi(payload);
EEPROM.put(4, mvDelaySet);
EEPROM.commit();
}
}