From b5041ff3e486efbc91e7306d3c871e91d09f2bc8 Mon Sep 17 00:00:00 2001 From: Lexa Date: Sun, 10 Aug 2025 12:43:41 +0300 Subject: [PATCH] Message --- ESP_Kor/src/main.cpp | 11 +- ESP_Midroom2/platformio.ini | 3 +- ESP_Midroom2/src/main.cpp | 2 +- MYS_Home.code-workspace | 199 ++++++++++++++++++------------------ VT_ESP8266/platformio.ini | 1 + 5 files changed, 106 insertions(+), 110 deletions(-) diff --git a/ESP_Kor/src/main.cpp b/ESP_Kor/src/main.cpp index 9e70b96..2e8d230 100644 --- a/ESP_Kor/src/main.cpp +++ b/ESP_Kor/src/main.cpp @@ -16,7 +16,7 @@ #define WIFI_PASSWORD "0ndthnrf" //#define WIFI_SSID2 "BR" //#define WIFI_PASSWORD2 "499727479o" -#define MQTT_SERV "192.168.1.111" +#define MQTT_SERV "192.168.1.10" #define TOPIC "home/kor/" #define HOSTNAME "ESP_Kor" @@ -213,13 +213,6 @@ void loop() } if(cRun + 999 < millis()){ cRun = millis(); - //if(!rsOk){ - // WebSerial.println("RadSens not Ok"); - // rsOk = radSens.init(); - //} - //dynval = radSens.getRadIntensyDynamic(); - //statval = radSens.getRadIntensyStatic(); - //impval = radSens.getNumberOfPulses(); cSec++; mins += 1 / 60.0; @@ -228,8 +221,6 @@ void loop() mqttClient.publish(TOPIC"minsmain", 1, false, v); itoa(int(samples.getMedian()), v, 10); mqttClient.publish(TOPIC"adc", 1, false, v); - //sprintf(v, "%.1f", statval); - //mqttClient.publish(TOPIC"mkr", 1, false, v); cSec = 0; } if(curDelay == 0) { diff --git a/ESP_Midroom2/platformio.ini b/ESP_Midroom2/platformio.ini index f4fcc58..214043c 100644 --- a/ESP_Midroom2/platformio.ini +++ b/ESP_Midroom2/platformio.ini @@ -24,4 +24,5 @@ lib_deps = https://github.com/pilotak/MeteoFunctions.git ;https://github.com/RobTillaart/SHT31.git ;ayushsharma82/ElegantOTA@^3.1.2 - https://github.com/adafruit/Adafruit_SHT31.git \ No newline at end of file + https://github.com/adafruit/Adafruit_SHT31.git + jandelgado/JLed @ ^4.15.0 \ No newline at end of file diff --git a/ESP_Midroom2/src/main.cpp b/ESP_Midroom2/src/main.cpp index daa5959..a580c8b 100644 --- a/ESP_Midroom2/src/main.cpp +++ b/ESP_Midroom2/src/main.cpp @@ -15,7 +15,7 @@ #define WIFI_SSID "wf-home" #define WIFI_PASSWORD "0ndthnrf" -#define MQTT_SERV "192.168.1.111" +#define MQTT_SERV "192.168.1.10" #define TOPIC "home/midroom/bed/" #define HOSTNAME "ESP_Midroom2" diff --git a/MYS_Home.code-workspace b/MYS_Home.code-workspace index 449872a..ee169d0 100644 --- a/MYS_Home.code-workspace +++ b/MYS_Home.code-workspace @@ -1,99 +1,102 @@ { - "folders": [ - { - "name": "I2C Scan", - "path": "I2C Scan" - }, - { - "name": "VT_ESP8266", - "path": "VT_ESP8266" - }, - { - "path": "Sw_MidlRoom" - }, - { - "path": "Sw_BigRoom" - }, - { - "name": "ESP12SmallRoom", - "path": "ESP12SmallRoom" - }, - { - "path": "Sw_Koridor" - }, - { - "path": "Sw_SmallRoom" - }, - { - "path": "ESP_BigRoom" - }, - { - "path": "ESP_MidRoom" - }, - { - "name": "KuhLight_ESP", - "path": "KuhLight_ESP" - }, - { - "path": "ESP_Kor" - }, - { - "path": "ESP_Electro" - }, - { - "name": "SerialGateWayMyS", - "path": "SerialGateWayMyS" - }, - { - "name": "MidRoomNLight", - "path": "MidRoomNLight" - }, - { - "name": "KorMYS", - "path": "KorMYS" - }, - { - "path": "Kuhnya" - }, - { - "name": "ExtSens", - "path": "ExtSens" - }, - { - "name": "MainDoorMyS", - "path": "MainDoorMyS" - }, - { - "name": "Rozetka", - "path": "Rozetka" - }, - { - "name": "RozetkaESP", - "path": "RozetkaESP" - }, - { - "name": "LightCtrlMyS", - "path": "LightCtrlMyS" - }, - { - "name": "BigRoomMyS", - "path": "BigRoomMyS" - } - ], - "settings": { - "terminal.integrated.env.windows": { - "PATH": "C:\\Users\\Lexa\\.platformio\\penv\\Scripts;C:\\Users\\Lexa\\.platformio\\penv;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;", - "PLATFORMIO_CALLER": "vscode" - }, - "files.associations": { - "*.tcc": "cpp", - "list": "cpp", - "string": "cpp", - "vector": "cpp", - "memory": "cpp", - "random": "cpp", - "initializer_list": "cpp" - }, - "telemetry.enableTelemetry": false - } -} \ No newline at end of file + "folders": [ + { + "name": "I2C Scan", + "path": "I2C Scan" + }, + { + "name": "VT_ESP8266", + "path": "VT_ESP8266" + }, + { + "path": "Sw_MidlRoom" + }, + { + "path": "Sw_BigRoom" + }, + { + "name": "ESP12SmallRoom", + "path": "ESP12SmallRoom" + }, + { + "path": "Sw_Koridor" + }, + { + "path": "Sw_SmallRoom" + }, + { + "path": "ESP_BigRoom" + }, + { + "path": "ESP_MidRoom" + }, + { + "name": "KuhLight_ESP", + "path": "KuhLight_ESP" + }, + { + "path": "ESP_Kor" + }, + { + "path": "ESP_Electro" + }, + { + "name": "SerialGateWayMyS", + "path": "SerialGateWayMyS" + }, + { + "name": "MidRoomNLight", + "path": "MidRoomNLight" + }, + { + "name": "KorMYS", + "path": "KorMYS" + }, + { + "path": "Kuhnya" + }, + { + "name": "ExtSens", + "path": "ExtSens" + }, + { + "name": "MainDoorMyS", + "path": "MainDoorMyS" + }, + { + "name": "Rozetka", + "path": "Rozetka" + }, + { + "name": "RozetkaESP", + "path": "RozetkaESP" + }, + { + "name": "LightCtrlMyS", + "path": "LightCtrlMyS" + }, + { + "name": "BigRoomMyS", + "path": "BigRoomMyS" + }, + { + "path": "ESP_Midroom2" + } + ], + "settings": { + "terminal.integrated.env.windows": { + "PATH": "C:\\Users\\Lexa\\.platformio\\penv\\Scripts;C:\\Users\\Lexa\\.platformio\\penv;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;", + "PLATFORMIO_CALLER": "vscode" + }, + "files.associations": { + "*.tcc": "cpp", + "list": "cpp", + "string": "cpp", + "vector": "cpp", + "memory": "cpp", + "random": "cpp", + "initializer_list": "cpp" + }, + "telemetry.enableTelemetry": false + } +} diff --git a/VT_ESP8266/platformio.ini b/VT_ESP8266/platformio.ini index 0552eec..7b947bd 100644 --- a/VT_ESP8266/platformio.ini +++ b/VT_ESP8266/platformio.ini @@ -26,3 +26,4 @@ lib_deps = mathertel/LiquidCrystal_PCF8574 @ ^2.2.0 milesburton/DallasTemperature @ ^4.0.4 marvinroger/AsyncMqttClient @ ^0.9.0 + jandelgado/JLed @ ^4.15.0