Change KorMYS LED Inv

This commit is contained in:
2021-06-02 16:08:06 +03:00
parent df47c18ed3
commit a7641761fd
2 changed files with 28 additions and 22 deletions

View File

@@ -50,6 +50,7 @@ void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties
void oneClick()
{
switchLight(R_LED, !digitalRead(R_LED), true);
//Serial.println("Press");
//lStat1 = !lStat1;
}
@@ -67,18 +68,18 @@ void longPress()
}
void setup() {
// Serial.begin(9600);
// Serial.println("Booting"); // "Загрузка"
//Serial.begin(115200);
//Serial.println("Booting"); // "Загрузка"
WiFi.mode(WIFI_STA);
WiFi.hostname("SW-Koridor");
ArduinoOTA.onStart([]() {
// Serial.println("Start"); // "Начало OTA-апдейта"
//Serial.println("Start"); // "Начало OTA-апдейта"
});
ArduinoOTA.onEnd([]() {
// Serial.println("\nEnd"); // "Завершение OTA-апдейта"
//Serial.println("\nEnd"); // "Завершение OTA-апдейта"
});
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
// Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
//Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
});
ArduinoOTA.onError([](ota_error_t error) {
// Serial.printf("Error[%u]: ", error);
@@ -93,19 +94,23 @@ void setup() {
// else if (error == OTA_END_ERROR) Serial.println("End Failed");
// // "Ошибка при завершении OTA-апдейта"
});
// Serial.println("OTA Begin");
ArduinoOTA.begin();
// Serial.println("OTA Done");
//Serial.end();
pinMode(B_LED, FUNCTION_3);
pinMode(B_LED, OUTPUT);
digitalWrite(B_LED, HIGH);
pinMode(R_LED, OUTPUT);
pinMode(BUTT, INPUT_PULLUP);
// Serial.println("EEPROM Begin");
EEPROM.begin(16);
uint8_t lstat = 0;
EEPROM.get(0, lstat);
//oldLStat1 = lStat1;
// Serial.print("Lamp1: ");
// Serial.println(lStat1);
//Serial.println(lStat1);
digitalWrite(R_LED, lstat);
//oldLStat2 = lStat2;
@@ -127,7 +132,8 @@ void setup() {
//attachInterrupt(digitalPinToInterrupt(BUTT), sw_func, RISING);
connectToWifi();
// Serial.println("WiFi Connect");
connectToWifi();
cRun = millis();
}
@@ -164,24 +170,24 @@ bool switchLight(uint8_t nLamp, int state, bool pub)
}
void connectToWifi() {
//Serial.println("Connecting to Wi-Fi...");
// Serial.println("Connecting to Wi-Fi...");
WiFi.begin(ssid, password);
}
void connectToMqtt() {
//Serial.println("Connecting to MQTT...");
// Serial.println("Connecting to MQTT...");
mqttClient.connect();
}
void onWifiConnect(const WiFiEventStationModeGotIP& event) {
//Serial.println("Connected to Wi-Fi.");
//Serial.print("IP: ");
//Serial.println(WiFi.localIP());
// Serial.println("Connected to Wi-Fi.");
// Serial.print("IP: ");
// Serial.println(WiFi.localIP());
connectToMqtt();
}
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
wifiReconnectTimer.once(2, connectToWifi);
}
@@ -194,7 +200,7 @@ void onMqttConnect(bool sessionPresent) {
}
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
//Serial.println("Disconnected from MQTT.");
// Serial.println("Disconnected from MQTT.");
if (WiFi.isConnected()) {
mqttReconnectTimer.once(2, connectToMqtt);