From 92cee891c4f5df787f8f93cb5dcd9ae5f875ada3 Mon Sep 17 00:00:00 2001
From: Lexa <lexa@cherkasov.moscow>
Date: Thu, 21 Aug 2025 14:56:47 +0300
Subject: [PATCH] Change IP MQTT

---
 ESP32_Kor/platformio.ini |  3 +--
 ESP32_Kor/src/main.cpp   |  8 --------
 ESP_Kor/platformio.ini   |  2 +-
 ESP_Kor/src/main.cpp     | 18 +++++++++++-------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/ESP32_Kor/platformio.ini b/ESP32_Kor/platformio.ini
index 0f0bfc8..bd5706e 100644
--- a/ESP32_Kor/platformio.ini
+++ b/ESP32_Kor/platformio.ini
@@ -9,12 +9,11 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env:esp32dev]
-platform = espressif32
+platform = espressif32@6.11.0
 board = esp32dev
 framework = arduino
 lib_deps =
   robtillaart/RunningMedian @ ^0.3.3
   lewapek/Nova Fitness Sds dust sensors library @ ^1.5.1
   ottowinter/AsyncMqttClient-esphome @ ^0.8.6
-  climateguard/ClimateGuard RadSens @ ^1.1.3
 monitor_speed = 115200
diff --git a/ESP32_Kor/src/main.cpp b/ESP32_Kor/src/main.cpp
index ea65263..7ff262c 100644
--- a/ESP32_Kor/src/main.cpp
+++ b/ESP32_Kor/src/main.cpp
@@ -26,11 +26,6 @@ extern "C" {
 }
 #include <AsyncMqttClient.h>
 
-#include "CG_RadSens.h"
-
-CG_RadSens radSens(RS_DEFAULT_I2C_ADDRESS); /*Constructor of the class ClimateGuard_RadSens1v2,
-                                                           sets the address parameter of I2C sensor.
-                                                           Default address: 0x66.*/
 
 typedef struct message {
   float temperature;
@@ -102,9 +97,6 @@ void setup() {
   WiFi.mode(WIFI_MODE_APSTA);
   connectToWifi();
 
-  radSens.init();
-  radSens.setSensitivity(105);
-
  	oldmov = 0;
 	lamp = false;
 	cRun = millis();
diff --git a/ESP_Kor/platformio.ini b/ESP_Kor/platformio.ini
index bb1ff4d..4225d85 100644
--- a/ESP_Kor/platformio.ini
+++ b/ESP_Kor/platformio.ini
@@ -22,4 +22,4 @@ lib_deps =
   ottowinter/ESPAsyncWebServer-esphome @ ^3.0.0
   lewapek/Nova Fitness Sds dust sensors library @ ^1.5.1
   ottowinter/AsyncMqttClient-esphome @ ^0.8.6
-  https://github.com/climateguard/RadSens.git
+  jandelgado/JLed @ ^4.15.0
diff --git a/ESP_Kor/src/main.cpp b/ESP_Kor/src/main.cpp
index 2e8d230..f0bbe88 100644
--- a/ESP_Kor/src/main.cpp
+++ b/ESP_Kor/src/main.cpp
@@ -10,7 +10,7 @@
 #include <ESPAsyncWebServer.h>
 #include <WebSerial.h>
 #include <ESP8266WiFiMulti.h>
-#include "CG_RadSens.h"
+#include <jled.h>
 
 #define WIFI_SSID "wf-home"
 #define WIFI_PASSWORD "0ndthnrf"
@@ -63,12 +63,14 @@ unsigned long stled;
 ESP8266WiFiMulti wifiMulti;
 AsyncWebServer server(80);
 
-CG_RadSens radSens(RS_DEFAULT_I2C_ADDRESS);
 bool rsOk;
 float dynval;  // Переменная для динамического значения интенсивности
 float statval; // Переменная для статического значения интенсивности
 uint32_t impval;  // Переменная для кол-ва импульсов
 
+auto bLed = JLed(LED_MQ);
+
+
 void setup()
 {
   Serial.begin(9600);
@@ -115,7 +117,7 @@ void setup()
 
   
   pinMode(LED_WF, OUTPUT);
-  pinMode(LED_MQ, OUTPUT);
+  //pinMode(LED_MQ, OUTPUT);
   pinMode(LED_WRK, OUTPUT);
   pinMode(LAMP_OUT, OUTPUT);
   //pinMode(3, FUNCTION_3);
@@ -124,7 +126,7 @@ void setup()
   pinMode(PIN_MOVE, INPUT);
   
   digitalWrite(LED_WF, LOW);
-  digitalWrite(LED_MQ, HIGH);
+  //digitalWrite(LED_MQ, HIGH);
   digitalWrite(LED_WRK, LOW);
 
   EEPROM.begin(20);
@@ -155,13 +157,13 @@ void setup()
   server.begin();
   //Wire.begin();
   //rsOk = radSens.init();
-  radSens.setSensitivity(105);
 }
 
 void loop()
 {
   char v[6];
 	ArduinoOTA.handle();
+  bLed.Update();
   static unsigned long cRunADC = millis();
 
   if(digitalRead(PIN_MOVE) > 0){
@@ -312,7 +314,8 @@ void onMqttConnect(bool sessionPresent) {
   mqttClient.subscribe(TOPIC"lightlev", 1);
 
   //analogWrite(LED_MQ, 1023);
-  digitalWrite(LED_MQ, LOW);
+  bLed.Breathe(2000).DelayAfter(1000).Forever();
+  //digitalWrite(LED_MQ, LOW);
 }
 
 void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
@@ -322,7 +325,8 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
     mqttReconnectTimer.once(2, connectToMqtt);
   }
   //analogWrite(LED_MQ, 0);
-  digitalWrite(LED_MQ, HIGH);
+  bLed.Off();
+  //digitalWrite(LED_MQ, HIGH);
 }
 
 void onMqttSubscribe(uint16_t packetId, uint8_t qos) {