From 6dafe992fa51788f99113f4389b3069ab89f7e04 Mon Sep 17 00:00:00 2001 From: lexa Date: Wed, 16 Sep 2020 14:48:43 +0300 Subject: [PATCH] Clear code --- Curt_MidRoom/platformio.ini | 1 + Curt_MidRoom/src/main.cpp | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Curt_MidRoom/platformio.ini b/Curt_MidRoom/platformio.ini index d8a9f8a..c0c41b0 100644 --- a/Curt_MidRoom/platformio.ini +++ b/Curt_MidRoom/platformio.ini @@ -12,3 +12,4 @@ platform = espressif8266 board = esp12e framework = arduino +board_build.ldscript = eagle.flash.2m.ld \ No newline at end of file diff --git a/Curt_MidRoom/src/main.cpp b/Curt_MidRoom/src/main.cpp index 915af50..e8054f4 100644 --- a/Curt_MidRoom/src/main.cpp +++ b/Curt_MidRoom/src/main.cpp @@ -4,9 +4,9 @@ #include #include -#define LED_WF (14) -#define LED_MQ (12) -#define LED_WRK (13) +//#define LED_WF (14) +//#define LED_MQ (12) +//#define LED_WRK (13) #define TUYA_OPEN "55aa000600056604000100" #define TUYA_CLOSE "55aa000600056604000101" @@ -60,7 +60,6 @@ void setup(){ softSer.begin(9600, SWSERIAL_8N1, D5, D6, false); WiFi.mode(WIFI_STA); WiFi.hostname("Cur-MidRoom"); - Serial.begin(9600); ArduinoOTA.onStart([]() { Serial1.println("Start Update"); // "Начало OTA-апдейта" @@ -95,17 +94,18 @@ void setup(){ mqttClient.setServer(mqtt_server, 1883); mqttClient.setClientId("Cur_MidRoom"); - pinMode(LED_WF, OUTPUT); - pinMode(LED_MQ, OUTPUT); - pinMode(LED_WRK, OUTPUT); + //pinMode(LED_WF, OUTPUT); + //pinMode(LED_MQ, OUTPUT); + //pinMode(LED_WRK, OUTPUT); //pinMode(5, INPUT_PULLUP); - digitalWrite(LED_WF, LOW); - digitalWrite(LED_MQ, LOW); - digitalWrite(LED_WRK, LOW); + //digitalWrite(LED_WF, LOW); + //digitalWrite(LED_MQ, LOW); + //digitalWrite(LED_WRK, LOW); connectToWifi(); nSec = 0; curr = -1; nSampl = 0; + Serial.println("Start"); } void loop(){ @@ -124,7 +124,7 @@ void loop(){ cRun = millis(); if(WiFi.isConnected()){ led_wrk = !led_wrk; - digitalWrite(LED_WRK, led_wrk); + //digitalWrite(LED_WRK, led_wrk); nSampl++; } } @@ -145,14 +145,14 @@ void onWifiConnect(const WiFiEventStationModeGotIP& event) { Serial.print("IP: "); Serial.println(WiFi.localIP()); connectToMqtt(); - digitalWrite(LED_WF, HIGH); + //digitalWrite(LED_WF, HIGH); } void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) { Serial.println("Disconnected from Wi-Fi."); mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi wifiReconnectTimer.once(2, connectToWifi); - digitalWrite(LED_WF, LOW); + //digitalWrite(LED_WF, LOW); } void onMqttConnect(bool sessionPresent) { @@ -160,7 +160,7 @@ void onMqttConnect(bool sessionPresent) { Serial.print("Session present: "); Serial.println(sessionPresent); mqttClient.subscribe("/home/midroom/curtpos_set", 0); - digitalWrite(LED_MQ, HIGH); + //digitalWrite(LED_MQ, HIGH); } void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { @@ -169,7 +169,7 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { if (WiFi.isConnected()) { mqttReconnectTimer.once(2, connectToMqtt); } - digitalWrite(LED_MQ, LOW); + //digitalWrite(LED_MQ, LOW); } void onMqttSubscribe(uint16_t packetId, uint8_t qos) {