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

Clear code

Browse Source
This commit is contained in:
lexa
2020-09-16 14:48:43 +03:00
parent e1556d0ee7
commit 6dafe992fa
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Curt_MidRoom/platformio.ini
View File

@@ -12,3 +12,4 @@
platform = espressif8266 platform = espressif8266
board = esp12e board = esp12e
framework = arduino framework = arduino
board_build.ldscript = eagle.flash.2m.ld

30
Curt_MidRoom/src/main.cpp
View File

@@ -4,9 +4,9 @@
#include <AsyncMqttClient.h> #include <AsyncMqttClient.h>
#include <SoftwareSerial.h> #include <SoftwareSerial.h>
#define LED_WF (14) //#define LED_WF (14)
#define LED_MQ (12) //#define LED_MQ (12)
#define LED_WRK (13) //#define LED_WRK (13)
#define TUYA_OPEN "55aa000600056604000100" #define TUYA_OPEN "55aa000600056604000100"
#define TUYA_CLOSE "55aa000600056604000101" #define TUYA_CLOSE "55aa000600056604000101"
@@ -60,7 +60,6 @@ void setup(){
softSer.begin(9600, SWSERIAL_8N1, D5, D6, false); softSer.begin(9600, SWSERIAL_8N1, D5, D6, false);
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.hostname("Cur-MidRoom"); WiFi.hostname("Cur-MidRoom");
Serial.begin(9600);
ArduinoOTA.onStart([]() { ArduinoOTA.onStart([]() {
Serial1.println("Start Update"); // "Начало OTA-апдейта" Serial1.println("Start Update"); // "Начало OTA-апдейта"
@@ -95,17 +94,18 @@ void setup(){
mqttClient.setServer(mqtt_server, 1883); mqttClient.setServer(mqtt_server, 1883);
mqttClient.setClientId("Cur_MidRoom"); mqttClient.setClientId("Cur_MidRoom");
pinMode(LED_WF, OUTPUT); //pinMode(LED_WF, OUTPUT);
pinMode(LED_MQ, OUTPUT); //pinMode(LED_MQ, OUTPUT);
pinMode(LED_WRK, OUTPUT); //pinMode(LED_WRK, OUTPUT);
//pinMode(5, INPUT_PULLUP); //pinMode(5, INPUT_PULLUP);
digitalWrite(LED_WF, LOW); //digitalWrite(LED_WF, LOW);
digitalWrite(LED_MQ, LOW); //digitalWrite(LED_MQ, LOW);
digitalWrite(LED_WRK, LOW); //digitalWrite(LED_WRK, LOW);
connectToWifi(); connectToWifi();
nSec = 0; nSec = 0;
curr = -1; curr = -1;
nSampl = 0; nSampl = 0;
Serial.println("Start");
} }
void loop(){ void loop(){
@@ -124,7 +124,7 @@ void loop(){
cRun = millis(); cRun = millis();
if(WiFi.isConnected()){ if(WiFi.isConnected()){
led_wrk = !led_wrk; led_wrk = !led_wrk;
digitalWrite(LED_WRK, led_wrk); //digitalWrite(LED_WRK, led_wrk);
nSampl++; nSampl++;
} }
} }
@@ -145,14 +145,14 @@ void onWifiConnect(const WiFiEventStationModeGotIP& event) {
Serial.print("IP: "); Serial.print("IP: ");
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
connectToMqtt(); connectToMqtt();
digitalWrite(LED_WF, HIGH); //digitalWrite(LED_WF, HIGH);
} }
void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) { void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
Serial.println("Disconnected from Wi-Fi."); Serial.println("Disconnected from Wi-Fi.");
mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
wifiReconnectTimer.once(2, connectToWifi); wifiReconnectTimer.once(2, connectToWifi);
digitalWrite(LED_WF, LOW); //digitalWrite(LED_WF, LOW);
} }
void onMqttConnect(bool sessionPresent) { void onMqttConnect(bool sessionPresent) {
@@ -160,7 +160,7 @@ void onMqttConnect(bool sessionPresent) {
Serial.print("Session present: "); Serial.print("Session present: ");
Serial.println(sessionPresent); Serial.println(sessionPresent);
mqttClient.subscribe("/home/midroom/curtpos_set", 0); mqttClient.subscribe("/home/midroom/curtpos_set", 0);
digitalWrite(LED_MQ, HIGH); //digitalWrite(LED_MQ, HIGH);
} }
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
@@ -169,7 +169,7 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
if (WiFi.isConnected()) { if (WiFi.isConnected()) {
mqttReconnectTimer.once(2, connectToMqtt); mqttReconnectTimer.once(2, connectToMqtt);
} }
digitalWrite(LED_MQ, LOW); //digitalWrite(LED_MQ, LOW);
} }
void onMqttSubscribe(uint16_t packetId, uint8_t qos) { void onMqttSubscribe(uint16_t packetId, uint8_t qos) {