Narvaling-Arduino
/
DomoEsp_v1
mirror of http://desa.narvaling.com/Bonobo.Git.Server/DomoEsp_v1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correccion error flags y reconfiguraciones

master
Gerardo 2022-02-07 10:58:21 +01:00
parent e4be7231c7
commit a6406c785e
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DomoEsp_v02/MqttSensManager.cpp
View File

@ -12,6 +12,7 @@
MqttSensor::MqttSensor() MqttSensor::MqttSensor()
{ {
ivar=-1; ivar=-1;
flags=0;
} }
void MqttSensor::Set(MqttSensor *s) void MqttSensor::Set(MqttSensor *s)
{ {

60
DomoEsp_v02/config_rf.h
View File

@ -108,6 +108,48 @@ class ActDomoConfig: public DomoConfig
/* */ /* */
} }
}; };
class PulSalonPruebConfig: public DomoConfig
{
public:
PulSalonPruebConfig()
{
velocidadPortSerie=115200;
strcpy(ssidWifi,"Idhun");//nombre wifi
strcpy(keyWifi,"Ardileorca1234.");//key wifi
strcpy(ideEsp,"Esp8266_pulSalonPrueb");//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
//config lcd--------------------
lcd.colum=16;//columnas lcd
lcd.lines=2;//lineas
//pines lcd
lcd.rs=0;
lcd.en=0;//eneable
lcd.d0=0;
lcd.d1=0;
lcd.d2=0;
lcd.d3=0;
}
//configuracion de sensores, variables, lcd---------------------------------
virtual void ConfigGen(MqttSensManager* sens, MqttVarManager* vars, LcdMQTTViewer *lcd, MqttDesencadenadorManager *des)
{
//sensores--------------------------------------------------------
//sens->AddHDT22(D4, "casa/desp");
// sens->AddDout(D1, "casa/p/LEnt", true);
sens->AddDout(D7, "casa/p/LEnt", true);
sens->AddDin( D1,"casa/p/pul1");
sens->AddDin( D2, "casa/p/pul2");
sens->AddDin( D3, "casa/p/pul3");
sens->AddDin( D4,"casa/p/pulAll");
}
};
class AutomatismosDomoConfig: public DomoConfig class AutomatismosDomoConfig: public DomoConfig
{ {
public: public:
@ -309,11 +351,11 @@ class PulSalonConfig: public DomoConfig
*/ */
//sens->AddHDT22(D4, "casa/desp"); //sens->AddHDT22(D4, "casa/desp");
// sens->AddDout(D1, "casa/Salon/LEnt", true); // sens->AddDout(D1, "casa/Salon/LEnt", true);
sens->AddDout(D7, "casa/Salon/LEnt", false); sens->AddDout(D7, "casa/Salon/LEnt", true);
sens->AddDinAccion( D1, "casa/Salon/pul1"); sens->AddDinRetardOff( D1, 1,"casa/Salon/pul1");
sens->AddDinAccion( D2, "casa/Salon/pul2"); sens->AddDinRetardOff( D2, 1, "casa/Salon/pul2");
sens->AddDinAccion( D5, "casa/Salon/pul3"); sens->AddDinRetardOff( D5, 1, "casa/Salon/pul3");
sens->AddDinAccion( D6, "casa/Salon/pulAll"); sens->AddDinRetardOff( D6, 1,"casa/Salon/pulAll");
} }
}; };
class DespachoDomoConfig: public DomoConfig class DespachoDomoConfig: public DomoConfig
@ -403,9 +445,9 @@ class CocinaDomoConfig: public DomoConfig
des->AddDes(st); des->AddDes(st);
sprintf(st,"{%d}<1 -> !{%d} ",4,5);//accion interruptor sprintf(st,"{%d}<1 -> !{%d} ",4,5);//accion interruptor
des->AddDes(st); des->AddDes(st);
sprintf(st,"{%d}<1&{%d}>0&{%d}=0 -> {%d}=1 ",mov,lauto,lam,lam);//apaga luz si no hay nadie sprintf(st,"{%d}<1&{%d}>0&{%d}=1 -> {%d}=0 ",mov,lauto,lam,lam);//apaga luz si no hay nadie
des->AddDes(st); des->AddDes(st);
sprintf(st,"{%d}<20&{%d}>0&{%d}>0 -> {%d}=0 ",luz,mov,lauto,lam);//enciende luz si hay presencia y esta oscuro sprintf(st,"{%d}<20&{%d}>0&{%d}>0&{%d}=0 -> {%d}=1 ",luz,mov,lauto,lam,lam);//enciende luz si hay presencia y esta oscuro
des->AddDes(st); des->AddDes(st);
} }
@ -446,9 +488,9 @@ class SalonDomoConfig: public DomoConfig
//desencadenaores---------- //desencadenaores----------
char st[64]; char st[64];
//Efecto Interruptor----- //Efecto Interruptor-----
sprintf(st,"{%d}>0 -> {%d}=1 & {%d}=1 & {%d}=1 ",pulIall,lamb,lchim, lent);//terminar en espacios sprintf(st,"{%d}>0 -> {%d}=1 & {%d}=1 & {%d}=0 ",pulIall,lamb,lchim, lent);//terminar en espacios
des->AddDes(st); des->AddDes(st);
sprintf(st,"{%d}<1 -> {%d}=0 & {%d}=0 & {%d}=0 ",pulIall,lamb,lchim, lent);//terminar en espacios sprintf(st,"{%d}<1 -> {%d}=0 & {%d}=0 & {%d}=1 ",pulIall,lamb,lchim, lent);//terminar en espacios
des->AddDes(st); des->AddDes(st);
//Efecto Pulsadores //Efecto Pulsadores
sprintf(st,"{%d}>0 -> !{%d} ",pulAll,pulIall);//terminar en espacios sprintf(st,"{%d}>0 -> !{%d} ",pulAll,pulIall);//terminar en espacios