mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13779 from hallard/teleinfo_fix 

Teleinfo use hardware energy counters
This commit is contained in:
Theo Arends 2021-11-24 09:45:36 +01:00 committed by GitHub
parent c826ae1e64 58b4ee6542
commit f5a86f4b88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib_div/LibTeleinfo/src/LibTeleinfo.h
View File

@ -149,6 +149,7 @@ class TInfo
uint8_t valuesDump(void); uint8_t valuesDump(void);
char * valueGet(char * name, char * value); char * valueGet(char * name, char * value);
char * valueGet_P(const char * name, char * value); char * valueGet_P(const char * name, char * value);
int labelCount();
boolean listDelete(); boolean listDelete();
unsigned char calcChecksum(char *etiquette, char *valeur, char *horodate=NULL) ; unsigned char calcChecksum(char *etiquette, char *valeur, char *horodate=NULL) ;
@ -157,7 +158,6 @@ class TInfo
ValueList * valueAdd (char * name, char * value, uint8_t checksum, uint8_t * flags, char * horodate=NULL); ValueList * valueAdd (char * name, char * value, uint8_t checksum, uint8_t * flags, char * horodate=NULL);
boolean valueRemove (char * name); boolean valueRemove (char * name);
boolean valueRemoveFlagged(uint8_t flags); boolean valueRemoveFlagged(uint8_t flags);
int labelCount();
uint32_t horodate2Timestamp( char * pdate) ; uint32_t horodate2Timestamp( char * pdate) ;
void customLabel( char * plabel, char * pvalue, uint8_t * pflags) ; void customLabel( char * plabel, char * pvalue, uint8_t * pflags) ;
ValueList * checkLine(char * pline) ; ValueList * checkLine(char * pline) ;

4
tasmota/xnrg_15_teleinfo.ino
View File

@ -357,6 +357,7 @@ void DataCallback(struct _ValueList * me, uint8_t flags)
Energy.import_active[0] = total/1000.0f; Energy.import_active[0] = total/1000.0f;
EnergyUpdateTotal(); EnergyUpdateTotal();
AddLog (LOG_LEVEL_INFO, PSTR ("TIC: Total counter updated to %u Wh"), total);
} }
// Wh total index (standard) // Wh total index (standard)
@ -568,6 +569,9 @@ void TInfoDrvInit(void) {
TasmotaGlobal.energy_driver = XNRG_15; TasmotaGlobal.energy_driver = XNRG_15;
Energy.voltage_available = false; Energy.voltage_available = false;
Energy.phase_count = 1; Energy.phase_count = 1;
// init hardware energy counters
Settings->flag3.hardware_energy_total = true;
Settings->energy_kWhtotal = 0;
} }
} }