Coorrection Mutex

xlyric · xlyric · commit b3263c53984b · 2025-04-18T10:24:22.000+02:00
diff --git a/data/config-dimmer.html b/data/config-dimmer.html
@@ -349,6 +349,15 @@ <h6 class="m-0 font-weight-bold text-primary">Pv Routeur</h6>
                   </div>
                 </div>
               </div> 
+              <div class="form-group row">
+                <div class="col-sm-4" data-toggle="popover" title="Aide" data-bs-content="Pour inverser la mesure sans toucher à la sonde">Inversion de la mesure (+/-) : ℹ </div>
+                <div class="col-sm-4">
+                  <div class="custom-control custom-checkbox small">
+                    <input type="checkbox" class="custom-control-input" id="polarity" onchange="sendservermode('polarity');">
+                    <label class="custom-control-label" for="polarity">polarité</label>
+                  </div>
+                </div>
+             </div>
             </div>
           </div>
           <br>
diff --git a/data/config-dimmer.html.gz b/data/config-dimmer.html.gz
diff --git a/data/envoy.html.gz b/data/envoy.html.gz
diff --git a/data/index.html.gz b/data/index.html.gz
diff --git a/platformio.ini b/platformio.ini
@@ -10,6 +10,8 @@
 
 [env]
 platform = espressif32 @ ~6.10.0 ; passage de la 6.3 à la 6.10 en date du 2025-03-02
+; problème avec la version 3  certaines librairies ne le supportent pas
+;platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip  
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
diff --git a/src/config/config.h b/src/config/config.h
@@ -154,7 +154,7 @@ constexpr size_t NTP_UPDATE_INTERVAL_MS = 3600000; /// synch de l'heure toute le
   //  #define ARDUINO_RUNNING_CORE 1
 #endif
 
-#define RELEASE "Version 20250324"
+#define RELEASE "Version 20250418"
 constexpr const int FS_RELEASE = 20250324;
 
 #ifdef LIGHT_FIRMWARE
diff --git a/src/functions/Mqtt_http_Functions.h b/src/functions/Mqtt_http_Functions.h
@@ -80,7 +80,8 @@ WiFiClient espClient;
       if (client.connect(pvname.c_str(), configmqtt.username, configmqtt.password)) {
         // Once connected, publish online to the availability topic
         client.publish(topic.c_str(), "online", true);         
-        client.setKeepAlive(30);      
+        client.setKeepAlive(15);  
+        client.setBufferSize(1024);    
         logging.Set_log_init(MQTT_connected,true);
         Serial.println(MQTT_connected);
       } else {
diff --git a/src/functions/homeassistant.h b/src/functions/homeassistant.h
@@ -105,7 +105,6 @@
     device_dimmer_boost.Set_name("Boost");
     device_dimmer_boost.Set_dev_cla("switch");
     
-    client.setBufferSize(1024);
     device_routeur.discovery();
     device_routed.discovery();
     device_dimmer.discovery();
diff --git a/src/functions/shelly.h b/src/functions/shelly.h
@@ -87,7 +87,9 @@ int shelly_get_data(String url) {
           shelly_watt = 99999;
           return shelly_watt;
       }
-      
+      if ( config.polarity == true ) { 
+        powerValue = -powerValue; 
+      }
       // affichage dans le sérial de doc["total_power"] en tant que string ; 
       Serial.println("Shelly Watt : ");
       Serial.println(powerValue);
diff --git a/src/functions/webFunctions.h b/src/functions/webFunctions.h
@@ -247,15 +247,16 @@ void call_pages() {
       getLocalTime( &timeinfo );
       snprintf(raison, bufferSize, "reboot manuel: %s", asctime(&timeinfo) ); 
 
-      if (xSemaphoreTake(mutex, portMAX_DELAY)) {  // Prend le mutex
         client.publish("memory/Routeur", raison, true);
-        xSemaphoreGive(mutex);  // Libère le mutex
-      }
     #endif
     request->redirect("/");
+    yield();
+    delay(1000);
+    yield();
     delay(1000);
+    yield();
     config.restart = true;
-    ESP.restart();
+    //ESP.restart();
     });
     
     // reset de la detection dallas précédente 
diff --git a/src/main.cpp b/src/main.cpp
@@ -764,6 +764,10 @@ void setup()
 
 
 void loop() {
+
+
+
+
   int retry_wifi = 0;
 
   #ifdef DEBUGLEVEL1
@@ -881,14 +885,11 @@ void loop() {
         strcpy(programme_marche_forcee.heure_arret, "00:00");  // NOSONAR        
         /// remonté MQTT
         #ifndef LIGHT_FIRMWARE
-          if (xSemaphoreTake(mutex, portMAX_DELAY)) { 
             Mqtt_send(String(config.IDX), String(unified_dimmer.get_power()),"pourcent"); // remonté MQTT de la commande réelle
             if (configmqtt.HA) {
               int instant_power = unified_dimmer.get_power();
               device_dimmer.send(String(instant_power * config.charge/100));
             } 
-            xSemaphoreGive(mutex);
-          }
         #endif // not LIGHT_FIRMWARE
       } // if (programme.stop_progr() || programme_marche_forcee.stop_progr() )
     } // if (programme.run || programme_marche_forcee.run)  
@@ -911,7 +912,6 @@ void loop() {
         /// remonté MQTT
         #ifndef LIGHT_FIRMWARE
 
-          if (xSemaphoreTake(mutex, portMAX_DELAY)) {
             Mqtt_send(String(config.IDX), String(unified_dimmer.get_power()),"pourcent"); // remonté MQTT de la commande réelle
               if (configmqtt.HA) {
                 int instant_power = unified_dimmer.get_power();
@@ -920,8 +920,6 @@ void loop() {
                   device_dimmer_boost.send("1");
                 }
               } 
-              xSemaphoreGive(mutex);
-            }
         #endif // not LIGHT_FIRMWARE
       } // if (programme.start_progr() ||  programme_marche_forcee.start_progr() )
     } // else
@@ -1042,6 +1040,7 @@ void connect_to_wifi() {
       gDisplayValues.currentState = DEVICE_STATE::UP;
       gDisplayValues.IP = String(WiFi.localIP().toString());
       btStop();
+      WiFi.setAutoReconnect(true);
     #endif // WIFI_ACTIVE == true
   } // else
 } // if (AP || strcmp(configwifi.SID,"AP") == 0 )
diff --git a/src/tasks/Dimmer.h b/src/tasks/Dimmer.h
@@ -64,7 +64,6 @@ int get_dimmer_child_power (){
 //***********************************
 void updateDimmer(void * parameter) {
   for (;;) {
-    if (xSemaphoreTake(mutex, portMAX_DELAY)) {
       gDisplayValues.task = true;
       #if WIFI_ACTIVE == true
         // application de la consigne de puissance uniquement si le minuteur n'est pas actif et que la dallas n'est pas perdu
@@ -94,10 +93,8 @@ void updateDimmer(void * parameter) {
           gDisplayValues.puissance_route = config.charge * gDisplayValues.dimmer/100; // watts
         #endif    
       #endif
-
       gDisplayValues.task = false;
-      xSemaphoreGive(mutex);  // Libère le mutex
-    }   
+  
     
     task_mem.task_updateDimmer = uxTaskGetStackHighWaterMark(nullptr);
 
diff --git a/src/tasks/dallas.h b/src/tasks/dallas.h
@@ -31,7 +31,6 @@ extern SemaphoreHandle_t mutex;
 //***********************************
 void dallasread(void * parameter){
   for (;;){
-    if (xSemaphoreTake(mutex, portMAX_DELAY)) {
       if (dallas.detect) {
         float Old_temperature = gDisplayValues.temperature;
         gDisplayValues.temperature = CheckTemperature("Inside : ", dallas.addr); 
@@ -44,11 +43,8 @@ void dallasread(void * parameter){
           logging.Set_log_init(String(gDisplayValues.temperature).c_str());
           logging.Set_log_init("\r\n");
         }
-        xSemaphoreGive(mutex);  // Libère le mutex
-      } 
     }
-
-   
+  
     task_mem.task_dallas_read = uxTaskGetStackHighWaterMark(nullptr);
     
     // Sleep for 5 seconds, avant de refaire une analyse
diff --git a/src/tasks/gettemp.h b/src/tasks/gettemp.h
@@ -35,7 +35,7 @@ HTTPClient httpdimmer;
 //***********************************
 void GetDImmerTemp(void * parameter){
  for (;;) { 
-    if (xSemaphoreTake(mutex, portMAX_DELAY)) {  // Prend le mutex
+
       // create get request 
       if (WiFi.status() != WL_CONNECTED) {   /// si pas de connexion Wifi test dans 10 s 
         vTaskDelay(10*1000 / portTICK_PERIOD_MS);
@@ -88,9 +88,9 @@ void GetDImmerTemp(void * parameter){
         }
       }
 
-      xSemaphoreGive(mutex);  // Libère le mutex
+
       task_mem.task_GetDImmerTemp = uxTaskGetStackHighWaterMark(nullptr);
-    }
+    
 
     // refresh every GETTEMPREFRESH seconds 
     vTaskDelay(pdMS_TO_TICKS(15000+(esp_random() % 61) - 30));
diff --git a/src/tasks/mDNS.h b/src/tasks/mDNS.h
@@ -136,7 +136,6 @@ bool mdns_search(String type, uint16_t port) {
 void mdns_discovery(void *parameter) {    // NOSONAR
   for (;;) {        
     int Taskdelay = 10000;
-    if (xSemaphoreTake(mutex, portMAX_DELAY)) {  
       if (WiFi.status() == WL_CONNECTED && (strcmp(config.dimmer, "") == 0 || strcmp(config.dimmer, "none") == 0) ) { 
         if (!AP) {                       
           // recherche d'un dimmer
@@ -149,10 +148,6 @@ void mdns_discovery(void *parameter) {    // NOSONAR
       else {
         Taskdelay = 600000+(esp_random() % 61) - 30; // 10 minutes
       }
-
-      xSemaphoreGive(mutex);  // Libère le mutex
-
-    }
     //si config.dimmer défini, on arrête la tâche
     if (strcmp(config.dimmer, "") != 0 && strcmp(config.dimmer, "none") != 0) {
       vTaskDelete(NULL);
diff --git a/src/tasks/measure-electricity.h b/src/tasks/measure-electricity.h
@@ -59,7 +59,7 @@ void measureElectricity(void *parameter) { // NOSONAR
     else if (configmodule.Fronius_present) {
       mode = 3;
     }
-    if (xSemaphoreTake(mutex, portMAX_DELAY)) {
+
       // SCT 013
       #ifndef ESP32D1MINI_FIRMWARE
         if (mode == 0) {
@@ -149,8 +149,7 @@ void measureElectricity(void *parameter) { // NOSONAR
           }
         } // mode == 3
       } // (!AP)
-      xSemaphoreGive(mutex); // Libère le mutex
-    }
+
     
     long end = millis();
     task_mem.task_measure_electricity = uxTaskGetStackHighWaterMark(nullptr);
diff --git a/src/tasks/send-mqtt.h b/src/tasks/send-mqtt.h
@@ -61,12 +61,13 @@ long beforetime;
 //***********************************
 void send_to_mqtt(void * parameter) { // NOSONAR
   for (;;) {
-    if (xSemaphoreTake(mutex, portMAX_DELAY)) {   
+
       if (!WiFi.isConnected()) {   /// si pas de connexion Wifi test dans 10 s 
         vTaskDelay(10*1000 / portTICK_PERIOD_MS);
         continue;
       }
 
+
       /// vérification que l'envoie mqtt est souhaité et les connexions actives
       #ifndef LIGHT_FIRMWARE
       if (config.mqtt && (WiFi.status() == WL_CONNECTED ) && client.connected() ) {
@@ -80,6 +81,7 @@ void send_to_mqtt(void * parameter) { // NOSONAR
             long timemesure = start-beforetime;
             float wattheure = (timemesure * abs(gDisplayValues.watt) / timemilli);  
             #ifndef LIGHT_FIRMWARE
+            if (xSemaphoreTake(mutex, portMAX_DELAY)) {   
               // domoticz et jeedom
               if (config.IDX != 0 ) {
                 Mqtt_send(String(config.IDX), String(int(gDisplayValues.watt)),"","watt");  
@@ -136,10 +138,12 @@ void send_to_mqtt(void * parameter) { // NOSONAR
                 }
               }
               //maj 202030209
+              xSemaphoreGive(mutex);  // Libère le mutex
             #endif  // not LIGHT_FIRMWARE
             
             beforetime = start; 
             Pow_mqtt_send = 0 ;
+            
           }
         #endif   
       }           
@@ -148,12 +152,13 @@ void send_to_mqtt(void * parameter) { // NOSONAR
       //client.publish(("memory/"+gDisplayValues.pvname).c_str(), String(esp_get_free_heap_size()).c_str()) ;
       //client.publish(("memory/"+gDisplayValues.pvname + " min free").c_str(), String(esp_get_minimum_free_heap_size()).c_str()) ;
       client.loop(); // on envoie ce qui est en attente      
-      xSemaphoreGive(mutex);  // Libère le mutex
+      
     }
+    
     task_mem.task_send_mqtt = uxTaskGetStackHighWaterMark(nullptr);
         
-    // Sleep for 10 seconds
-    vTaskDelay(pdMS_TO_TICKS(1000));
+    // Sleep for 5 seconds
+    vTaskDelay(pdMS_TO_TICKS(2000+(esp_random() % 61) - 30)); // 10 secondes + aléatoire entre -30 et +30 ms
 
   }
 } 
