mathieu/Domotique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Teleinfo: fix signature

Browse Source
This commit is contained in:
Mathieu Maret 2023-03-27 21:01:20 +02:00
parent 0847e89960
commit 5987bc28de
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WifiControlSensor/Teleinfo.h
View File

@ -4,9 +4,8 @@
#ifdef CONFIG_ENABLE_TELEINFO #ifdef CONFIG_ENABLE_TELEINFO
#include <LibTeleinfo.h> #include <LibTeleinfo.h>
int TeleinfoSetup(); int TeleinfoSetup();
int TeleinfoProcess(std::vector<struct mqttInfo> &batchInfo); int TeleinfoRetrieve(float &iinst, float &papp, float &base);
int TeleinfoProcess(float &iinst, float &papp, float &base); int TeleinfoRetrieve(float &iinst, float &papp, float &base,
int TeleinfoProcess(float &iinst, float &papp, float &base,
std::vector<struct mqttInfo> &batchInfo); std::vector<struct mqttInfo> &batchInfo);
#else #else
int TeleinfoSetup() { int TeleinfoSetup() {
@ -14,8 +13,11 @@ int TeleinfoSetup() {
return -1; return -1;
}; };
int TeleinfoProcess(float &, float &, float &, int TeleinfoRetrieve(float &, float &, float &){
std::vector<struct mqttInfo> &){ return 0;
}
int TeleinfoRetrieve(float &, float &, float &, std::vector<struct mqttInfo> &)
{
return 0; return 0;
} }
#endif #endif

23
WifiControlSensor/Teleinfo.ino
View File

@ -13,8 +13,8 @@ int TeleinfoSetup()
return 0; return 0;
} }
int TeleinfoProcess(std::vector<struct mqttInfo> &batchInfo)
{ int TeleinfoRetrieve(float &iinst, float &papp, float &base){
int c; int c;
while ((c = TELESerial.read()) >= 0) { while ((c = TELESerial.read()) >= 0) {
@ -25,16 +25,16 @@ int TeleinfoProcess(std::vector<struct mqttInfo> &batchInfo)
me = me->next; me = me->next;
while (me) { while (me) {
if (strcmp(me->name, "IINST") == 0) { if (strcmp(me->name, "IINST") == 0) {
float val = atof(me->value); iinst = atof(me->value);
batchInfo.push_back({val, TELEINFO_IINST_FEED_FORMAT, 0, 0});
} }
if (strcmp(me->name, "PAPP") == 0) { if (strcmp(me->name, "PAPP") == 0) {
float val = atof(me->value); papp = atof(me->value);
batchInfo.push_back({val, TELEINFO_PAPP_FEED_FORMAT, 0, 0});
} }
if (strcmp(me->name, "BASE") == 0) { if (strcmp(me->name, "BASE") == 0) {
float val = atof(me->value); float tmp = atof(me->value);
batchInfo.push_back({val, TELEINFO_BASE_FEED_FORMAT, 0, 0}); if(tmp != 0){
base = tmp;
}
} }
me = me->next; me = me->next;
} }
@ -42,7 +42,7 @@ int TeleinfoProcess(std::vector<struct mqttInfo> &batchInfo)
return 0; return 0;
} }
int TeleinfoProcess(float &iinst, float &papp, float &base, int TeleinfoRetrieve(float &iinst, float &papp, float &base,
std::vector<struct mqttInfo> &batchInfo) std::vector<struct mqttInfo> &batchInfo)
{ {
int c; int c;
@ -63,9 +63,12 @@ int TeleinfoProcess(float &iinst, float &papp, float &base,
batchInfo.push_back({papp, TELEINFO_PAPP_FEED_FORMAT, 0, 0}); batchInfo.push_back({papp, TELEINFO_PAPP_FEED_FORMAT, 0, 0});
} }
if (strcmp(me->name, "BASE") == 0) { if (strcmp(me->name, "BASE") == 0) {
base = atof(me->value); float tmp = atof(me->value);
if(tmp != 0){
base = tmp;
batchInfo.push_back({base, TELEINFO_BASE_FEED_FORMAT, 0, 0}); batchInfo.push_back({base, TELEINFO_BASE_FEED_FORMAT, 0, 0});
} }
}
me = me->next; me = me->next;
} }