diff --git a/DomoEsp_v02/config_rf.h b/DomoEsp_v02/config_rf.h index 33f1b28..f60ff23 100644 --- a/DomoEsp_v02/config_rf.h +++ b/DomoEsp_v02/config_rf.h @@ -246,6 +246,7 @@ class PulCocinaConfig: public DomoConfig Sensor analogico sens->AddAnalogIn(int pin, char* topic, bool ValNegado);//nivel de luz, nivel de lluvia ... */ + sens->AddDinRetardOn(D1,5,"casa/p/pul"); sens->AddDout(D5, "casa/coci/lam", false); sens->AddDinAccion( D1, "casa/coci/inter"); //sens->AddDinAccion( D2, "casa/Salon/pul2"); @@ -386,12 +387,74 @@ class CocinaDomoConfig: public DomoConfig //configuracion de sensores--------------------------------- virtual void ConfigGen(MqttSensManager* sens, MqttVarManager* vars, LcdMQTTViewer *lcd, MqttDesencadenadorManager *des) { - sens->AddHDT22(D4, "casa/cocina"); - sens->AddDinAccion(D5, "casa/cocina/mov"); - sens->AddAnalogIn(0, "casa/cocina/luz",true); + sens->AddHDT22(D4, "casa/cocina");//01 + sens->AddDinRetardOff(D5, 60,"casa/cocina/mov");//2 + sens->AddAnalogIn(0, "casa/cocina/luz",true);//3 + sens->AddDin( D1, "casa/cocina/inter");//4 + sens->AddDout(D2, "casa/cocina/lam", false);//5 + + char st[64]; + + //Efecto Pulsadores + sprintf(st,"{%d}>0 -> !{%d} ",4,5);//terminar en espacios + des->AddDes(st); + sprintf(st,"{%d}<1 -> !{%d} ",4,5);//terminar en espacios + des->AddDes(st); } }; +class SalonDomoConfig: public DomoConfig +{ + public: + SalonDomoConfig() + { + velocidadPortSerie=115200; + strcpy(ssidWifi,"Idhun");//nombre wifi + strcpy(keyWifi,"Ardileorca1234.");//key wifi + strcpy(ideEsp,"Esp8266_salon");//idenitificador del esp (sera Ășnico) + strcpy(hostMQTT,"192.168.2.50");//servidor mqttBroker + portMQTT=1883;//puerto del servidor mqtt Broker + refresTimeVars=30;//tiempo de refresco en segundos de las variables + refresTimeSens=15;//tiempo de refresco en segundos de los sensores + } + //configuracion de sensores--------------------------------- + virtual void ConfigGen(MqttSensManager* sens, MqttVarManager* vars, LcdMQTTViewer *lcd, MqttDesencadenadorManager *des) + { + sens->AddHDT22(D4, "casa/Salon");//01 + sens->AddDinRetardOff(D5, 60,"casa/Salon/mov");//2 + sens->AddAnalogIn(0, "casa/Salon/luz",true);//3 + + //variables---------------------------------------------------- + int lamb= vars->AddInternalVarInt( "casa/Salon/LAmb"); + int lchim= vars->AddInternalVarInt( "casa/Salon/LChime"); + int lent= vars->AddInternalVarInt( "casa/Salon/LEnt"); + + int pul1= vars->AddInternalVarInt( "casa/Salon/pul1"); + int pul2= vars->AddInternalVarInt( "casa/Salon/pul2"); + int pul3= vars->AddInternalVarInt( "casa/Salon/pul3"); + int pulIall= vars->AddInternalVarInt( "casa/Salon/intAll"); + int pulAll= vars->AddInternalVarInt( "casa/Salon/pulAll"); + + //desencadenaores---------- + char st[64]; + //Efecto Interruptor----- + sprintf(st,"{%d}>0 -> {%d}=1 & {%d}=1 & {%d}=1 ",pulIall,lamb,lchim, lent);//terminar en espacios + des->AddDes(st); + sprintf(st,"{%d}<1 -> {%d}=0 & {%d}=0 & {%d}=0 ",pulIall,lamb,lchim, lent);//terminar en espacios + des->AddDes(st); + //Efecto Pulsadores + sprintf(st,"{%d}>0 -> !{%d} ",pulAll,pulIall);//terminar en espacios + des->AddDes(st); + sprintf(st,"{%d}>0 -> !{%d} ",pul1,lamb);//terminar en espacios + des->AddDes(st); + sprintf(st,"{%d}>0 -> !{%d} ",pul2,lchim);//terminar en espacios + des->AddDes(st); + sprintf(st,"{%d}>0 -> !{%d} ",pul3,lent);//terminar en espacios + des->AddDes(st); + + + } +}; class ExteriorDomoConfig: public DomoConfig { public: