From 0497ba436dcb68bc4403babc7f8f31291baf5c74 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Thu, 27 Nov 2025 23:09:28 +0100
Subject: [PATCH] quitar warnings y defines segun placas

---
 DomoEspSensor/Actuador.h               |  4 ++--
 DomoEspSensor/Automatismos.h           |  2 +-
 DomoEspSensor/DomoEspApiConexion.h     |  4 ++--
 DomoEspSensor/DomoEspSensor.ino        |  2 +-
 DomoEspSensor/DomoEspSensorManager.cpp | 21 ++++++++++---------
 DomoEspSensor/DomoEspSensorManager.h   | 15 +++++++-------
 DomoEspSensor/SensorAin.h              |  2 +-
 DomoEspSensor/SensorBMP180.h           |  2 +-
 DomoEspSensor/SensorBuzzer.h           |  4 ++--
 DomoEspSensor/SensorDHT.h              |  2 +-
 DomoEspSensor/SensorDin.h              |  2 +-
 DomoEspSensor/SensorDout.h             |  2 +-
 DomoEspSensor/SensorLcd.h              | 10 ++++-----
 DomoEspSensor/SensorPotenI2c.h         |  2 +-
 DomoEspSensor/SensorPulsante.h         |  2 +-
 DomoEspSensor/SensorRF.h               |  2 +-
 DomoEspSensor/SensorSplitter.h         |  2 +-
 DomoEspSensor/SensorTimer.h            |  2 +-
 DomoEspSensor/SensorVF.h               |  2 +-
 DomoEspSensor/Utiles.cpp               | 28 ++++++++++++++------------
 DomoEspSensor/Utiles.h                 |  5 ++---
 DomoEspSensor/defines.h                |  4 ----
 22 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/DomoEspSensor/Actuador.h b/DomoEspSensor/Actuador.h
index c4ef80c..c961591 100644
--- a/DomoEspSensor/Actuador.h
+++ b/DomoEspSensor/Actuador.h
@@ -31,14 +31,14 @@ class Actuador: public DomoEspSensorReceiver
       activador[i].sen=NULL;
     }
   }
-  void set(char* topic_id, char* topic_id_out, char* _valSend)
+  void set(const char* topic_id, const char* topic_id_out, const char* _valSend)
   {
     val=0;
     strcpy(valSend, _valSend);
     strcpy(topic, topic_id);
     strcpy(topicOut, topic_id_out);
   }
-  void setId(char* st)
+  void setId(const char* st)
   {
     strcpy(id, st);
   }
diff --git a/DomoEspSensor/Automatismos.h b/DomoEspSensor/Automatismos.h
index 9ee3470..b37c084 100644
--- a/DomoEspSensor/Automatismos.h
+++ b/DomoEspSensor/Automatismos.h
@@ -29,7 +29,7 @@ class AutomatismoPulsador//automatismo para encender luz con interruptor o pulsa
   {
      inicia(man, tp_pul->topic, tpOut->topic, bloqueo);
   }
-  void inicia(ISensorManager* man, char* tp_pul, char* tpOut, DomoEspSensorReceiver* bloqueo=NULL )
+  void inicia(ISensorManager* man, const char* tp_pul, const char* tpOut, DomoEspSensorReceiver* bloqueo=NULL )
   {
      pulsador.set(tp_pul, tpOut, "X");
      pulsador.setId("Pulsa");
diff --git a/DomoEspSensor/DomoEspApiConexion.h b/DomoEspSensor/DomoEspApiConexion.h
index ee1ab12..aa16c46 100644
--- a/DomoEspSensor/DomoEspApiConexion.h
+++ b/DomoEspSensor/DomoEspApiConexion.h
@@ -1,10 +1,10 @@
 #ifndef DomoEspApiConexionDef
 #define DomoEspApiConexionDef 1
 #include "defines.h"
-#ifndef ESP32_DEF
+#ifdef ESP8266
 #include <ESP8266HTTPClient.h>
 //sensor Replica, sensor interno que se setea con get y no se publica
-class DomoEspApiConexion
+class DomoEspApiConexion //hay que arreglar compatibilidad con esp32
 {
   public:
   DomoEspApiConexion()
diff --git a/DomoEspSensor/DomoEspSensor.ino b/DomoEspSensor/DomoEspSensor.ino
index 654ef02..2727022 100644
--- a/DomoEspSensor/DomoEspSensor.ino
+++ b/DomoEspSensor/DomoEspSensor.ino
@@ -1,4 +1,4 @@
-#define ESP32_DEF 1
+
 #include "DomoEspSensorManager.h"
 #include "configuracionActual.h"
 DomoEspManager manager;
diff --git a/DomoEspSensor/DomoEspSensorManager.cpp b/DomoEspSensor/DomoEspSensorManager.cpp
index 000a63a..0c7f72a 100644
--- a/DomoEspSensor/DomoEspSensorManager.cpp
+++ b/DomoEspSensor/DomoEspSensorManager.cpp
@@ -64,10 +64,12 @@ void DomoEspManager::loop()
       {
         if(tNoConexion.onTimer())
         {
-          #ifndef ESP32_DEF
+          #if defined(ESP8266)
             ESP.reset();
+          #elif defined(ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ESP32C3)
+            ESP.restart();
           #else
-          ESP.restart();
+            #error "Placa no soportada"
           #endif
           
           return;
@@ -80,10 +82,12 @@ void DomoEspManager::loop()
      suscrito=false;
       if(tNomqtt.onTimer())
            {
-          #ifndef ESP32_DEF
+          #if defined(ESP8266)
             ESP.reset();
+          #elif defined(ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ESP32C3)
+            ESP.restart();
           #else
-          ESP.restart();
+            #error "Placa no soportada"
           #endif
           
           return;
@@ -102,12 +106,10 @@ void DomoEspManager::loop()
   int tiempoAux=0;
   if(timer.onTimerReset())
   {
-      #ifndef ESP32_DEF
+      #ifdef ESP8266
         if(conf->conexionPorApi)
         {
-          #ifndef ESP32_DEF
-       
-      
+          
           char topic_aux[32];
           char payload_aux[128];
 
@@ -115,7 +117,6 @@ void DomoEspManager::loop()
           {
             OnMqtt(topic_aux, payload_aux);
           }
-          #endif
         }
       #endif
       tiempo=(tiempo+1)%2;
@@ -185,7 +186,7 @@ void DomoEspManager::MqttSend(char* topic, char* payload)
 {
   if(conf->conexionPorApi)
      {
-      #ifndef ESP32_DEF
+      #ifdef ESP8266
         api.send(topic, payload);
       #endif
      } 
diff --git a/DomoEspSensor/DomoEspSensorManager.h b/DomoEspSensor/DomoEspSensorManager.h
index e5d3f4c..1ffb413 100644
--- a/DomoEspSensor/DomoEspSensorManager.h
+++ b/DomoEspSensor/DomoEspSensorManager.h
@@ -3,11 +3,12 @@
 
 
 #include <PubSubClient.h>
-#ifndef ESP32_DEF
-#include <ESP8266WiFi.h>
-#endif
-#ifdef ESP32_DEF
-#include <WiFi.h>
+#if defined(ESP8266)
+	#include <ESP8266WiFi.h>
+#elif defined(ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ESP32C3)
+	#include <WiFi.h>
+#else
+	#error "Placa no soportada"
 #endif
 
 #include "utiles.h"
@@ -30,8 +31,8 @@ class DomoEspManager: public MqttReceiver, public IMqttManager, public ISensorMa
   WiFiClient espClient;
   PubSubClient clienteMqtt;
   MqttManager mqtt;
-  #ifndef ESP32_DEF
-  DomoEspApiConexion api;
+  #ifdef ESP8266
+	DomoEspApiConexion api;
   #endif
   
 
diff --git a/DomoEspSensor/SensorAin.h b/DomoEspSensor/SensorAin.h
index 39cb51e..dc1e72b 100644
--- a/DomoEspSensor/SensorAin.h
+++ b/DomoEspSensor/SensorAin.h
@@ -15,7 +15,7 @@ class SensorAin: public DomoEspSensorReceiver
       return val;
   }
   SensorAin(){}
-  void set(uint8_t _pin, char* topic_id, bool _negado, float _dif)
+  void set(uint8_t _pin,const char* topic_id, bool _negado, float _dif)
   {
     timer.inicia();
     timer.set(1);
diff --git a/DomoEspSensor/SensorBMP180.h b/DomoEspSensor/SensorBMP180.h
index c495103..3a3b538 100644
--- a/DomoEspSensor/SensorBMP180.h
+++ b/DomoEspSensor/SensorBMP180.h
@@ -16,7 +16,7 @@ class SensorBMP180: public DomoEspSensorReceiver
     t=p=a=0;
     topic[0]=0;
   }
-  void set(char* topic_id, int _sda, int _scl)
+  void set(const char* topic_id, int _sda, int _scl)
   {
     sda=_sda;
     scl=_scl;
diff --git a/DomoEspSensor/SensorBuzzer.h b/DomoEspSensor/SensorBuzzer.h
index b4817f4..82fa566 100644
--- a/DomoEspSensor/SensorBuzzer.h
+++ b/DomoEspSensor/SensorBuzzer.h
@@ -13,11 +13,11 @@ class SensorBuzzer: public DomoEspSensorReceiver
     val=0;
     topic[0]=0;
   }
-  void setMelodia(int i, char* melodia)
+  void setMelodia(int i, const char* melodia)
   {
     buz.Set(i, melodia);
   }
-  void set(char* topic_id, int _pin)
+  void set(const char* topic_id, int _pin)
   {
     val=0;
     strcpy(topic, topic_id);
diff --git a/DomoEspSensor/SensorDHT.h b/DomoEspSensor/SensorDHT.h
index 5657ea0..4cac338 100644
--- a/DomoEspSensor/SensorDHT.h
+++ b/DomoEspSensor/SensorDHT.h
@@ -20,7 +20,7 @@ class SensorDHT: public DomoEspSensorReceiver
     t=h=0;
     topic[0]=0;
   }
-  void set(uint8_t _pin, char* topic_id)
+  void set(uint8_t _pin, const char* topic_id)
   {
     pin=_pin;
     t=h=9.99998;
diff --git a/DomoEspSensor/SensorDin.h b/DomoEspSensor/SensorDin.h
index 02fa45d..797590c 100644
--- a/DomoEspSensor/SensorDin.h
+++ b/DomoEspSensor/SensorDin.h
@@ -16,7 +16,7 @@ class SensorDin: public DomoEspSensorReceiver
   SensorDin(){
     logTiempo2=true;
   }
-  void set(uint8_t _pin, char* topic_id, bool _logTiempo2=true)
+  void set(uint8_t _pin, const char* topic_id, bool _logTiempo2=true)
   {
     logTiempo2=_logTiempo2;
     pin=_pin;
diff --git a/DomoEspSensor/SensorDout.h b/DomoEspSensor/SensorDout.h
index e026275..be25561 100644
--- a/DomoEspSensor/SensorDout.h
+++ b/DomoEspSensor/SensorDout.h
@@ -19,7 +19,7 @@ bool negado;
     topic[0]=0;
     negado=false;
   }
-  void set(uint8_t _pin, char* topic_id, bool valdef,bool _negado=false)
+  void set(uint8_t _pin, const char* topic_id, bool valdef,bool _negado=false)
   {
     pin=_pin;
     val=valdef;
diff --git a/DomoEspSensor/SensorLcd.h b/DomoEspSensor/SensorLcd.h
index c2bb35b..92b1a8b 100644
--- a/DomoEspSensor/SensorLcd.h
+++ b/DomoEspSensor/SensorLcd.h
@@ -39,7 +39,7 @@ public:
         apan=0;
         
     }
-    void set(char* topic_id, LiquidCrystal * _lcd, int _nchar, int lineas, int seg)
+    void set(const char* topic_id, LiquidCrystal * _lcd, int _nchar, int lineas, int seg)
     {
         val = 0;
         strcpy(topic, topic_id);
@@ -49,7 +49,7 @@ public:
         nlin = lineas;
         
     }
-    void AddPan(char* msg, DomoEspSensorReceiver *sen1=0, DomoEspSensorReceiver *sen2=0)
+    void AddPan(const char* msg, DomoEspSensorReceiver *sen1=0, DomoEspSensorReceiver *sen2=0)
     {
       if(npan<MAX_PAN_LCD)
       {
@@ -126,7 +126,7 @@ private:
         Muestra(msg);
         
     }
-    void Muestra(char * txt)
+    void Muestra(const char * txt)
     {
         #ifdef DEBUG_PS
         Serial.println("SenLcd muestra: ");
@@ -134,7 +134,7 @@ private:
         #endif
         int linea=0;
         int i=0;
-        char* ini=txt;
+        const char* ini=txt;
         bool sigue=true;
         while(sigue && linea<nlin)
         {
@@ -166,7 +166,7 @@ private:
 
 
     }
-    void Muestra(char * txt,int nStr, int linea)
+    void Muestra(const char * txt,int nStr, int linea)
         {
         char buf[MAXTOPICVAR];
 
diff --git a/DomoEspSensor/SensorPotenI2c.h b/DomoEspSensor/SensorPotenI2c.h
index 32265d9..9a8e6ef 100644
--- a/DomoEspSensor/SensorPotenI2c.h
+++ b/DomoEspSensor/SensorPotenI2c.h
@@ -28,7 +28,7 @@ bool negado;
     initDS1803();
   }
 
-  void set( char* topic_id, int valdef,bool _negado=false)
+  void set( const char* topic_id, int valdef,bool _negado=false)
   {
     val=valdef;
     negado=_negado;
diff --git a/DomoEspSensor/SensorPulsante.h b/DomoEspSensor/SensorPulsante.h
index 4b1b895..2bbed5b 100644
--- a/DomoEspSensor/SensorPulsante.h
+++ b/DomoEspSensor/SensorPulsante.h
@@ -19,7 +19,7 @@ class SensorPulsante: public DomoEspSensorReceiver
     espera=false;
     timer.setmilis(500);
   }
-  void set(uint8_t _pin, char* topic_id, bool _valDef)
+  void set(uint8_t _pin, const char* topic_id, bool _valDef)
   {
     pin=_pin;
     valDef=_valDef;
diff --git a/DomoEspSensor/SensorRF.h b/DomoEspSensor/SensorRF.h
index 47944b3..3824725 100644
--- a/DomoEspSensor/SensorRF.h
+++ b/DomoEspSensor/SensorRF.h
@@ -13,7 +13,7 @@ class SensorRF: public DomoEspSensorReceiver
     val=0;
     topic[0]=0;
   }
-  void set(char* topic_id,bool _negado=0, float valdef=0)
+  void set(const char* topic_id,bool _negado=0, float valdef=0)
   {
     negado=_negado;
     val=valdef;
diff --git a/DomoEspSensor/SensorSplitter.h b/DomoEspSensor/SensorSplitter.h
index 7977ce1..fb24e8d 100644
--- a/DomoEspSensor/SensorSplitter.h
+++ b/DomoEspSensor/SensorSplitter.h
@@ -22,7 +22,7 @@ class SensorSplitter: public DomoEspSensorReceiver
     for(int i=0; i<MAX_ACTIVADORES; i++)
       sensorSend[i].sen=0;
   }
-  void set(char* topic_id, float =0)
+  void set(const char* topic_id, float =0)
   {
     val=0;
     strcpy(topic, topic_id);
diff --git a/DomoEspSensor/SensorTimer.h b/DomoEspSensor/SensorTimer.h
index 13293d6..27a8434 100644
--- a/DomoEspSensor/SensorTimer.h
+++ b/DomoEspSensor/SensorTimer.h
@@ -14,7 +14,7 @@ class SensorTimer: public DomoEspSensorReceiver
     val=0;
     topic[0]=0;
   }
-  void set(char* topic_id, bool _valdef, int segTime)
+  void set(const char* topic_id, bool _valdef, int segTime)
   {
     t.set(segTime);
     valDef=_valdef;
diff --git a/DomoEspSensor/SensorVF.h b/DomoEspSensor/SensorVF.h
index fa5b2cd..12811a7 100644
--- a/DomoEspSensor/SensorVF.h
+++ b/DomoEspSensor/SensorVF.h
@@ -12,7 +12,7 @@ class SensorVF: public DomoEspSensorReceiver
     val=0;
     topic[0]=0;
   }
-  void set(char* topic_id, float valdef=0)
+  void set(const char* topic_id, float valdef=0)
   {
     val=valdef;
     strcpy(topic, topic_id);
diff --git a/DomoEspSensor/Utiles.cpp b/DomoEspSensor/Utiles.cpp
index 4c52e6b..e4a5b5e 100644
--- a/DomoEspSensor/Utiles.cpp
+++ b/DomoEspSensor/Utiles.cpp
@@ -1,11 +1,12 @@
 #include <Arduino.h>
-#define ESP32_DEF 1
-#ifndef ESP32_DEF
-#include <ESP8266WiFi.h>
-#include <ESP8266mDNS.h>
-#endif
-#ifdef ESP32_DEF
-#include <WiFi.h>
+
+#if defined(ESP8266)
+    #include <ESP8266WiFi.h>
+    #include <ESP8266mDNS.h>
+#elif defined(ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ESP32C3)
+    #include <WiFi.h>
+#else
+    #error "Placa no soportada"
 #endif
 
 #include <WiFiUdp.h>
@@ -19,11 +20,12 @@
 void MqttUtiles::resetFunc()
 {
 
-    #ifdef ESP32_DEF
-    ESP.restart();
-    #endif
-    #ifndef ESP32_DEF
-    ESP.wdtEnable(1);
+    #if defined(ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ESP32C3)
+        ESP.restart();
+    #elif defined(ESP8266)
+        ESP.wdtEnable(1);
+    #else
+        #error "Placa no soportada"
     #endif
     
     while(1){};
@@ -354,7 +356,7 @@ void SonidoBuzzer::Toca(int pin, int imel)
     mel[imel].Toca(pin);
 }
 
-void SonidoBuzzer::Set(int i, char* melo)
+void SonidoBuzzer::Set(int i, const char* melo)
 {
   if(i<MAX_MELODIAS)
   {
diff --git a/DomoEspSensor/Utiles.h b/DomoEspSensor/Utiles.h
index 7be0967..ce2a0b3 100644
--- a/DomoEspSensor/Utiles.h
+++ b/DomoEspSensor/Utiles.h
@@ -2,8 +2,7 @@
 #define UtilesDef 1
 #include "defines.h"
 class PubSubClient;
-
-#ifndef ESP32_DEF
+#ifdef ESP8266
 class WiFiClient;
 #endif
 class MqttUtiles
@@ -99,7 +98,7 @@ class SonidoBuzzer
   int n;
   SonidoBuzzer();
   void Toca(int pin, int melodia);
-  void Set(int i, char* melo);
+  void Set(int i, const char* melo);
   char* getMelSubSt(char* orig, char caracter, int lim, char* bufOut);
 };
 
diff --git a/DomoEspSensor/defines.h b/DomoEspSensor/defines.h
index 38f4b43..5f006d1 100644
--- a/DomoEspSensor/defines.h
+++ b/DomoEspSensor/defines.h
@@ -1,11 +1,7 @@
 #ifndef DefinesDef
-
-#define ESP32_DEF 1
-
 #define DefinesDef 1
 
 #define DEBUG_PS 1
-
 #define MAXTOPICVAR  32//maximo de caracteres de los topic de las variables
 #define MAX_CHAR_PAN_LCD  35//MAXIMO DE CARACTRES POR PANTALLA LCD
 #define MAX_PAN_LCD 3//MAXIMO DE PANTALLAS POR SENSOR LCD