Continued implementation and changes after testing

This commit is contained in:
Gunnar Skjold
2026-03-26 14:16:27 +01:00
parent e91ef1a98c
commit ecd7017ac5
10 changed files with 637 additions and 531 deletions

View File

@@ -29,7 +29,7 @@ bool DomoticzMqttHandler::publish(AmsData* update, AmsData* previousState, Energ
if(energy > 0.0) {
char val[16];
snprintf_P(val, 16, PSTR("%.1f;%.1f"), (data.getActiveImportPower()/1.0), energy*1000.0);
snprintf_P(json, BufferSize, DOMOTICZ_JSON,
snprintf_P(json, BUF_SIZE_COMMON, DOMOTICZ_JSON,
config.elidx,
val
);
@@ -44,7 +44,7 @@ bool DomoticzMqttHandler::publish(AmsData* update, AmsData* previousState, Energ
if (config.vl1idx > 0){
char val[16];
snprintf_P(val, 16, PSTR("%.2f"), data.getL1Voltage());
snprintf_P(json, BufferSize, DOMOTICZ_JSON,
snprintf_P(json, BUF_SIZE_COMMON, DOMOTICZ_JSON,
config.vl1idx,
val
);
@@ -55,7 +55,7 @@ bool DomoticzMqttHandler::publish(AmsData* update, AmsData* previousState, Energ
if (config.vl2idx > 0){
char val[16];
snprintf_P(val, 16, PSTR("%.2f"), data.getL2Voltage());
snprintf_P(json, BufferSize, DOMOTICZ_JSON,
snprintf_P(json, BUF_SIZE_COMMON, DOMOTICZ_JSON,
config.vl2idx,
val
);
@@ -66,7 +66,7 @@ bool DomoticzMqttHandler::publish(AmsData* update, AmsData* previousState, Energ
if (config.vl3idx > 0){
char val[16];
snprintf(val, 16, "%.2f", data.getL3Voltage());
snprintf_P(json, BufferSize, DOMOTICZ_JSON,
snprintf_P(json, BUF_SIZE_COMMON, DOMOTICZ_JSON,
config.vl3idx,
val
);
@@ -77,7 +77,7 @@ bool DomoticzMqttHandler::publish(AmsData* update, AmsData* previousState, Energ
if (config.cl1idx > 0){
char val[16];
snprintf(val, 16, "%.1f;%.1f;%.1f", data.getL1Current(), data.getL2Current(), data.getL3Current());
snprintf_P(json, BufferSize, DOMOTICZ_JSON,
snprintf_P(json, BUF_SIZE_COMMON, DOMOTICZ_JSON,
config.cl1idx,
val
);