patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mqtt_rework' into dev

Browse Source
This commit is contained in:
Thomas Basler 2023-02-13 18:39:29 +01:00
commit 7bbb278eaf
29 changed files with 730 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

590
docs/Web-API.md
View File

@ -56,7 +56,7 @@ You can "talk" to the OpenDTU with a command line tool like `curl`. The output i
``` ```
~$ curl http://192.168.10.10/api/livedata/status ~$ curl http://192.168.10.10/api/livedata/status
{"inverters":[{"serial":"11418186xxxx","name":"HM600","data_age":4,"reachable":true,"producing":true,"limit_relative":100,"limit_absolute":600,"0":{"Power":{"v":70.69999695,"u":"W","d":1},"Voltage":{"v":233,"u":"V","d":1},"Current":{"v":0.300000012,"u":"A","d":2},"Power DC":{"v":74,"u":"W","d":2},"YieldDay":{"v":23,"u":"Wh","d":2},"YieldTotal":{"v":150.5050049,"u":"kWh","d":2},"Frequency":{"v":50.02000046,"u":"Hz","d":2},"Temperature":{"v":8.300000191,"u":"°C","d":1},"PowerFactor":{"v":1,"u":"","d":3},"ReactivePower":{"v":0.100000001,"u":"var","d":1},"Efficiency":{"v":95.54053497,"u":"%","d":2}},"1":{"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":1,"u":"V","d":1},"Current":{"v":0.02,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":49.0320015,"u":"kWh","d":3},"Irradiation":{"v":0,"u":"%","d":2}},"2":{"Power":{"v":74,"u":"W","d":1},"Voltage":{"v":42.40000153,"u":"V","d":1},"Current":{"v":1.74000001,"u":"A","d":2},"YieldDay":{"v":23,"u":"Wh","d":0},"YieldTotal":{"v":101.4729996,"u":"kWh","d":3},"Irradiation":{"v":18.04878044,"u":"%","d":2}},"events":3},{"serial":"11418180xxxx","name":"HM800","data_age":11,"reachable":true,"producing":true,"limit_relative":100,"limit_absolute":800,"0":{"Power":{"v":70.09999847,"u":"W","d":1},"Voltage":{"v":233.1000061,"u":"V","d":1},"Current":{"v":0.300000012,"u":"A","d":2},"Power DC":{"v":73.59999847,"u":"W","d":2},"YieldDay":{"v":48,"u":"Wh","d":2},"YieldTotal":{"v":48.5399971,"u":"kWh","d":2},"Frequency":{"v":50.02000046,"u":"Hz","d":2},"Temperature":{"v":11.39999962,"u":"°C","d":1},"PowerFactor":{"v":1,"u":"","d":3},"ReactivePower":{"v":0.100000001,"u":"var","d":1},"Efficiency":{"v":95.24456024,"u":"%","d":2}},"1":{"Power":{"v":36.5,"u":"W","d":1},"Voltage":{"v":39.09999847,"u":"V","d":1},"Current":{"v":0.930000007,"u":"A","d":2},"YieldDay":{"v":31,"u":"Wh","d":0},"YieldTotal":{"v":4.301000118,"u":"kWh","d":3},"Irradiation":{"v":8.902439117,"u":"%","d":2}},"2":{"Power":{"v":37.09999847,"u":"W","d":1},"Voltage":{"v":40.79999924,"u":"V","d":1},"Current":{"v":0.910000026,"u":"A","d":2},"YieldDay":{"v":17,"u":"Wh","d":0},"YieldTotal":{"v":44.23899841,"u":"kWh","d":3},"Irradiation":{"v":9.048780441,"u":"%","d":2}},"events":1}],"total":{"Power":{"v":140.7999878,"u":"W","d":1},"YieldDay":{"v":71,"u":"Wh","d":0},"YieldTotal":{"v":199.0449982,"u":"kWh","d":2}}} {"inverters":[{"serial":"11617160xxxx","name":"Meine Solaranlage","data_age":6983,"reachable":false,"producing":false,"limit_relative":0,"limit_absolute":-1,"AC":{"0":{"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"Power DC":{"v":0,"u":"W","d":1},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Frequency":{"v":0,"u":"Hz","d":2},"PowerFactor":{"v":0,"u":"","d":3},"ReactivePower":{"v":0,"u":"var","d":1},"Efficiency":{"v":0,"u":"%","d":3}}},"DC":{"0":{"name":{"u":""},"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Irradiation":{"v":0,"u":"%","d":3}},"1":{"name":{"u":""},"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Irradiation":{"v":0,"u":"%","d":3}},"2":{"name":{"u":""},"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Irradiation":{"v":0,"u":"%","d":3}},"3":{"name":{"u":""},"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3}}},"INV":{"0":{"Temperature":{"v":0,"u":"°C","d":1}}},"events":0},{"serial":"11417160xxxx","name":"test","data_age":6983,"reachable":false,"producing":false,"limit_relative":0,"limit_absolute":-1,"AC":{"0":{"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"Power DC":{"v":0,"u":"W","d":1},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Frequency":{"v":0,"u":"Hz","d":2},"PowerFactor":{"v":0,"u":"","d":3},"ReactivePower":{"v":0,"u":"var","d":1},"Efficiency":{"v":0,"u":"%","d":3}}},"DC":{"0":{"name":{"u":"test 1"},"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Irradiation":{"v":0,"u":"%","d":3}},"1":{"name":{"u":"test 2"},"Power":{"v":0,"u":"W","d":1},"Voltage":{"v":0,"u":"V","d":1},"Current":{"v":0,"u":"A","d":2},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":3},"Irradiation":{"v":0,"u":"%","d":3}}},"INV":{"0":{"Temperature":{"v":0,"u":"°C","d":1}}},"events":0}],"total":{"Power":{"v":0,"u":"W","d":1},"YieldDay":{"v":0,"u":"Wh","d":0},"YieldTotal":{"v":0,"u":"kWh","d":2}},"hints":{"time_sync":false,"radio_problem":false,"default_password":false}}
``` ```
@ -67,284 +67,382 @@ To enhance readability (and filter information) use the JSON command line proces
{ {
"inverters": [ "inverters": [
{ {
"serial": "11418186xxxx", "serial": "116171603546",
"name": "HM600", "name": "Meine Solaranlage",
"data_age": 4, "data_age": 7038,
"reachable": true, "reachable": false,
"producing": true, "producing": false,
"limit_relative": 100, "limit_relative": 0,
"limit_absolute": 600, "limit_absolute": -1,
"0": { "AC": {
"Power": { "0": {
"v": 70.69999695, "Power": {
"u": "W", "v": 0,
"d": 1 "u": "W",
}, "d": 1
"Voltage": { },
"v": 233, "Voltage": {
"u": "V", "v": 0,
"d": 1 "u": "V",
}, "d": 1
"Current": { },
"v": 0.300000012, "Current": {
"u": "A", "v": 0,
"d": 2 "u": "A",
}, "d": 2
"Power DC": { },
"v": 74, "Power DC": {
"u": "W", "v": 0,
"d": 2 "u": "W",
}, "d": 1
"YieldDay": { },
"v": 23, "YieldDay": {
"u": "Wh", "v": 0,
"d": 2 "u": "Wh",
}, "d": 0
"YieldTotal": { },
"v": 150.5050049, "YieldTotal": {
"u": "kWh", "v": 0,
"d": 2 "u": "kWh",
}, "d": 3
"Frequency": { },
"v": 50.02000046, "Frequency": {
"u": "Hz", "v": 0,
"d": 2 "u": "Hz",
}, "d": 2
"Temperature": { },
"v": 8.300000191, "PowerFactor": {
"u": "°C", "v": 0,
"d": 1 "u": "",
}, "d": 3
"PowerFactor": { },
"v": 1, "ReactivePower": {
"u": "", "v": 0,
"d": 3 "u": "var",
}, "d": 1
"ReactivePower": { },
"v": 0.100000001, "Efficiency": {
"u": "var", "v": 0,
"d": 1 "u": "%",
}, "d": 3
"Efficiency": { }
"v": 95.54053497,
"u": "%",
"d": 2
} }
}, },
"1": { "DC": {
"Power": { "0": {
"v": 0, "name": {
"u": "W", "u": ""
"d": 1 },
"Power": {
"v": 0,
"u": "W",
"d": 1
},
"Voltage": {
"v": 0,
"u": "V",
"d": 1
},
"Current": {
"v": 0,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 0,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 0,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 0,
"u": "%",
"d": 3
}
}, },
"Voltage": { "1": {
"v": 1, "name": {
"u": "V", "u": ""
"d": 1 },
"Power": {
"v": 0,
"u": "W",
"d": 1
},
"Voltage": {
"v": 0,
"u": "V",
"d": 1
},
"Current": {
"v": 0,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 0,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 0,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 0,
"u": "%",
"d": 3
}
}, },
"Current": { "2": {
"v": 0.02, "name": {
"u": "A", "u": ""
"d": 2 },
"Power": {
"v": 0,
"u": "W",
"d": 1
},
"Voltage": {
"v": 0,
"u": "V",
"d": 1
},
"Current": {
"v": 0,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 0,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 0,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 0,
"u": "%",
"d": 3
}
}, },
"YieldDay": { "3": {
"v": 0, "name": {
"u": "Wh", "u": ""
"d": 0 },
}, "Power": {
"YieldTotal": { "v": 0,
"v": 49.0320015, "u": "W",
"u": "kWh", "d": 1
"d": 3 },
}, "Voltage": {
"Irradiation": { "v": 0,
"v": 0, "u": "V",
"u": "%", "d": 1
"d": 2 },
"Current": {
"v": 0,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 0,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 0,
"u": "kWh",
"d": 3
}
} }
}, },
"2": { "INV": {
"Power": { "0": {
"v": 74, "Temperature": {
"u": "W", "v": 0,
"d": 1 "u": "°C",
}, "d": 1
"Voltage": { }
"v": 42.40000153,
"u": "V",
"d": 1
},
"Current": {
"v": 1.74000001,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 23,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 101.4729996,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 18.04878044,
"u": "%",
"d": 2
} }
}, },
"events": 3 "events": 0
}, },
{ {
"serial": "11418180xxxx", "serial": "114171603548",
"name": "HM800", "name": "test",
"data_age": 11, "data_age": 7038,
"reachable": true, "reachable": false,
"producing": true, "producing": false,
"limit_relative": 100, "limit_relative": 0,
"limit_absolute": 800, "limit_absolute": -1,
"0": { "AC": {
"Power": { "0": {
"v": 70.09999847, "Power": {
"u": "W", "v": 0,
"d": 1 "u": "W",
}, "d": 1
"Voltage": { },
"v": 233.1000061, "Voltage": {
"u": "V", "v": 0,
"d": 1 "u": "V",
}, "d": 1
"Current": { },
"v": 0.300000012, "Current": {
"u": "A", "v": 0,
"d": 2 "u": "A",
}, "d": 2
"Power DC": { },
"v": 73.59999847, "Power DC": {
"u": "W", "v": 0,
"d": 2 "u": "W",
}, "d": 1
"YieldDay": { },
"v": 48, "YieldDay": {
"u": "Wh", "v": 0,
"d": 2 "u": "Wh",
}, "d": 0
"YieldTotal": { },
"v": 48.5399971, "YieldTotal": {
"u": "kWh", "v": 0,
"d": 2 "u": "kWh",
}, "d": 3
"Frequency": { },
"v": 50.02000046, "Frequency": {
"u": "Hz", "v": 0,
"d": 2 "u": "Hz",
}, "d": 2
"Temperature": { },
"v": 11.39999962, "PowerFactor": {
"u": "°C", "v": 0,
"d": 1 "u": "",
}, "d": 3
"PowerFactor": { },
"v": 1, "ReactivePower": {
"u": "", "v": 0,
"d": 3 "u": "var",
}, "d": 1
"ReactivePower": { },
"v": 0.100000001, "Efficiency": {
"u": "var", "v": 0,
"d": 1 "u": "%",
}, "d": 3
"Efficiency": { }
"v": 95.24456024,
"u": "%",
"d": 2
} }
}, },
"1": { "DC": {
"Power": { "0": {
"v": 36.5, "name": {
"u": "W", "u": "test 1"
"d": 1 },
"Power": {
"v": 0,
"u": "W",
"d": 1
},
"Voltage": {
"v": 0,
"u": "V",
"d": 1
},
"Current": {
"v": 0,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 0,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 0,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 0,
"u": "%",
"d": 3
}
}, },
"Voltage": { "1": {
"v": 39.09999847, "name": {
"u": "V", "u": "test 2"
"d": 1 },
}, "Power": {
"Current": { "v": 0,
"v": 0.930000007, "u": "W",
"u": "A", "d": 1
"d": 2 },
}, "Voltage": {
"YieldDay": { "v": 0,
"v": 31, "u": "V",
"u": "Wh", "d": 1
"d": 0 },
}, "Current": {
"YieldTotal": { "v": 0,
"v": 4.301000118, "u": "A",
"u": "kWh", "d": 2
"d": 3 },
}, "YieldDay": {
"Irradiation": { "v": 0,
"v": 8.902439117, "u": "Wh",
"u": "%", "d": 0
"d": 2 },
"YieldTotal": {
"v": 0,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 0,
"u": "%",
"d": 3
}
} }
}, },
"2": { "INV": {
"Power": { "0": {
"v": 37.09999847, "Temperature": {
"u": "W", "v": 0,
"d": 1 "u": "°C",
}, "d": 1
"Voltage": { }
"v": 40.79999924,
"u": "V",
"d": 1
},
"Current": {
"v": 0.910000026,
"u": "A",
"d": 2
},
"YieldDay": {
"v": 17,
"u": "Wh",
"d": 0
},
"YieldTotal": {
"v": 44.23899841,
"u": "kWh",
"d": 3
},
"Irradiation": {
"v": 9.048780441,
"u": "%",
"d": 2
} }
}, },
"events": 1 "events": 0
} }
], ],
"total": { "total": {
"Power": { "Power": {
"v": 140.7999878, "v": 0,
"u": "W", "u": "W",
"d": 1 "d": 1
}, },
"YieldDay": { "YieldDay": {
"v": 71, "v": 0,
"u": "Wh", "u": "Wh",
"d": 0 "d": 0
}, },
"YieldTotal": { "YieldTotal": {
"v": 199.0449982, "v": 0,
"u": "kWh", "u": "kWh",
"d": 2 "d": 2
} }
},
"hints": {
"time_sync": false,
"radio_problem": false,
"default_password": false
} }
} }
``` ```

4
include/MqttHandleHass.h
View File

@ -25,7 +25,7 @@ enum {
const char* const stateClasses[] = { 0, "measurement", "total_increasing" }; const char* const stateClasses[] = { 0, "measurement", "total_increasing" };
typedef struct { typedef struct {
uint8_t fieldId; // field id FieldId_t fieldId; // field id
uint8_t deviceClsId; // device class uint8_t deviceClsId; // device class
uint8_t stateClsId; // state class uint8_t stateClsId; // state class
} byteAssign_fieldDeviceClass_t; } byteAssign_fieldDeviceClass_t;
@ -57,7 +57,7 @@ public:
private: private:
void publish(const String& subtopic, const String& payload); void publish(const String& subtopic, const String& payload);
void publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear = false); void publishField(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear = false);
void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload); void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload);
void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, int16_t min = 1, int16_t max = 100); void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, int16_t min = 1, int16_t max = 100);
void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off); void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off);

6
include/MqttHandleInverter.h
View File

@ -10,16 +10,16 @@ public:
void init(); void init();
void loop(); void loop();
static String getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId); static String getTopic(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
private: private:
void publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId); void publishField(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total); void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total);
uint32_t _lastPublishStats[INV_MAX_COUNT]; uint32_t _lastPublishStats[INV_MAX_COUNT];
uint32_t _lastPublish; uint32_t _lastPublish;
uint8_t _publishFields[14] = { FieldId_t _publishFields[14] = {
FLD_UDC, FLD_UDC,
FLD_IDC, FLD_IDC,
FLD_PDC, FLD_PDC,

2
include/WebApi_prometheus.h
View File

@ -12,7 +12,7 @@ public:
private: private:
void onPrometheusMetricsGet(AsyncWebServerRequest* request); void onPrometheusMetricsGet(AsyncWebServerRequest* request);
void addField(AsyncResponseStream* stream, String& serial, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, const char* channelName = NULL); void addField(AsyncResponseStream* stream, String& serial, uint8_t idx, std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId, const char* channelName = NULL);
AsyncWebServer* _server; AsyncWebServer* _server;
}; };

2
include/WebApi_ws_live.h
View File

@ -13,7 +13,7 @@ public:
private: private:
void generateJsonResponse(JsonVariant& root); void generateJsonResponse(JsonVariant& root);
void addField(JsonObject& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, String topic = ""); void addField(JsonObject& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId, String topic = "");
void addTotalField(JsonObject& root, String name, float value, String unit, uint8_t digits); void addTotalField(JsonObject& root, String name, float value, String unit, uint8_t digits);
void onLivedataStatus(AsyncWebServerRequest* request); void onLivedataStatus(AsyncWebServerRequest* request);
void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len); void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);

9
lib/Hoymiles/src/inverters/HM_1CH.cpp
View File

@ -32,12 +32,7 @@ String HM_1CH::typeName()
return F("HM-300, HM-350, HM-400"); return F("HM-300, HM-350, HM-400");
} }
const byteAssign_t* HM_1CH::getByteAssignment() const std::list<byteAssign_t>* HM_1CH::getByteAssignment()
{ {
return byteAssignment; return &byteAssignment;
}
uint8_t HM_1CH::getAssignmentCount()
{
return sizeof(byteAssignment) / sizeof(byteAssign_t);
} }

44
lib/Hoymiles/src/inverters/HM_1CH.h
View File

@ -2,35 +2,37 @@
#pragma once #pragma once
#include "HM_Abstract.h" #include "HM_Abstract.h"
#include <list>
class HM_1CH : public HM_Abstract { class HM_1CH : public HM_Abstract {
public: public:
explicit HM_1CH(uint64_t serial); explicit HM_1CH(uint64_t serial);
static bool isValidSerial(uint64_t serial); static bool isValidSerial(uint64_t serial);
String typeName(); String typeName();
const byteAssign_t* getByteAssignment(); const std::list<byteAssign_t>* getByteAssignment();
uint8_t getAssignmentCount();
private: private:
const byteAssign_t byteAssignment[18] = { const std::list<byteAssign_t> byteAssignment = {
{ CH1, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 }, { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
{ CH1, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 }, { TYPE_DC, CH0, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 },
{ CH1, FLD_PDC, UNIT_W, 6, 2, 10, false, 1 }, { TYPE_DC, CH0, FLD_PDC, UNIT_W, 6, 2, 10, false, 1 },
{ CH1, FLD_YD, UNIT_WH, 12, 2, 1, false, 0 }, { TYPE_DC, CH0, FLD_YD, UNIT_WH, 12, 2, 1, false, 0 },
{ CH1, FLD_YT, UNIT_KWH, 8, 4, 1000, false, 3 }, { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 8, 4, 1000, false, 3 },
{ CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 }, { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
{ CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 },
{ CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 }, { TYPE_AC, CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 },
{ CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 },
{ CH0, FLD_PRA, UNIT_VA, 20, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 20, 2, 10, false, 1 },
{ CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 }, { TYPE_AC, CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 },
{ CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 }, { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 },
{ CH0, FLD_T, UNIT_C, 26, 2, 10, true, 1 },
{ CH0, FLD_EVT_LOG, UNIT_NONE, 28, 2, 1, false, 0 }, { TYPE_INV, CH0, FLD_T, UNIT_C, 26, 2, 10, true, 1 },
{ CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 }, { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 28, 2, 1, false, 0 },
{ CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 }, { TYPE_AC, CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 },
{ CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 } { TYPE_AC, CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ TYPE_AC, CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 },
{ TYPE_AC, CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
}; };
}; };

9
lib/Hoymiles/src/inverters/HM_2CH.cpp
View File

@ -33,12 +33,7 @@ String HM_2CH::typeName()
return F("HM-600, HM-700, HM-800"); return F("HM-600, HM-700, HM-800");
} }
const byteAssign_t* HM_2CH::getByteAssignment() const std::list<byteAssign_t>* HM_2CH::getByteAssignment()
{ {
return byteAssignment; return &byteAssignment;
}
uint8_t HM_2CH::getAssignmentCount()
{
return sizeof(byteAssignment) / sizeof(byteAssign_t);
} }

55
lib/Hoymiles/src/inverters/HM_2CH.h
View File

@ -8,36 +8,37 @@ public:
explicit HM_2CH(uint64_t serial); explicit HM_2CH(uint64_t serial);
static bool isValidSerial(uint64_t serial); static bool isValidSerial(uint64_t serial);
String typeName(); String typeName();
const byteAssign_t* getByteAssignment(); const std::list<byteAssign_t>* getByteAssignment();
uint8_t getAssignmentCount();
private: private:
const byteAssign_t byteAssignment[24] = { const std::list<byteAssign_t> byteAssignment = {
{ CH1, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 }, { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
{ CH1, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 }, { TYPE_DC, CH0, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 },
{ CH1, FLD_PDC, UNIT_W, 6, 2, 10, false, 1 }, { TYPE_DC, CH0, FLD_PDC, UNIT_W, 6, 2, 10, false, 1 },
{ CH1, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 }, { TYPE_DC, CH0, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 },
{ CH1, FLD_YT, UNIT_KWH, 14, 4, 1000, false, 3 }, { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 14, 4, 1000, false, 3 },
{ CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 }, { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
{ CH2, FLD_UDC, UNIT_V, 8, 2, 10, false, 1 }, { TYPE_DC, CH1, FLD_UDC, UNIT_V, 8, 2, 10, false, 1 },
{ CH2, FLD_IDC, UNIT_A, 10, 2, 100, false, 2 }, { TYPE_DC, CH1, FLD_IDC, UNIT_A, 10, 2, 100, false, 2 },
{ CH2, FLD_PDC, UNIT_W, 12, 2, 10, false, 1 }, { TYPE_DC, CH1, FLD_PDC, UNIT_W, 12, 2, 10, false, 1 },
{ CH2, FLD_YD, UNIT_WH, 24, 2, 1, false, 0 }, { TYPE_DC, CH1, FLD_YD, UNIT_WH, 24, 2, 1, false, 0 },
{ CH2, FLD_YT, UNIT_KWH, 18, 4, 1000, false, 3 }, { TYPE_DC, CH1, FLD_YT, UNIT_KWH, 18, 4, 1000, false, 3 },
{ CH2, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH2, CMD_CALC, false, 3 }, { TYPE_DC, CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
{ CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 },
{ CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 }, { TYPE_AC, CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 },
{ CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 },
{ CH0, FLD_PRA, UNIT_VA, 32, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 32, 2, 10, false, 1 },
{ CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 }, { TYPE_AC, CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 },
{ CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 }, { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 },
{ CH0, FLD_T, UNIT_C, 38, 2, 10, true, 1 },
{ CH0, FLD_EVT_LOG, UNIT_NONE, 40, 2, 1, false, 0 }, { TYPE_INV, CH0, FLD_T, UNIT_C, 38, 2, 10, true, 1 },
{ CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 }, { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 40, 2, 1, false, 0 },
{ CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 }, { TYPE_AC, CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 },
{ CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 } { TYPE_AC, CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ TYPE_AC, CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 },
{ TYPE_AC, CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
}; };
}; };

9
lib/Hoymiles/src/inverters/HM_4CH.cpp
View File

@ -32,12 +32,7 @@ String HM_4CH::typeName()
return F("HM-1000, HM-1200, HM-1500"); return F("HM-1000, HM-1200, HM-1500");
} }
const byteAssign_t* HM_4CH::getByteAssignment() const std::list<byteAssign_t>* HM_4CH::getByteAssignment()
{ {
return byteAssignment; return &byteAssignment;
}
uint8_t HM_4CH::getAssignmentCount()
{
return sizeof(byteAssignment) / sizeof(byteAssign_t);
} }

79
lib/Hoymiles/src/inverters/HM_4CH.h
View File

@ -8,50 +8,51 @@ public:
explicit HM_4CH(uint64_t serial); explicit HM_4CH(uint64_t serial);
static bool isValidSerial(uint64_t serial); static bool isValidSerial(uint64_t serial);
String typeName(); String typeName();
const byteAssign_t* getByteAssignment(); const std::list<byteAssign_t>* getByteAssignment();
uint8_t getAssignmentCount();
private: private:
const byteAssign_t byteAssignment[36] = { const std::list<byteAssign_t> byteAssignment = {
{ CH1, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 }, { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
{ CH1, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 }, { TYPE_DC, CH0, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 },
{ CH1, FLD_PDC, UNIT_W, 8, 2, 10, false, 1 }, { TYPE_DC, CH0, FLD_PDC, UNIT_W, 8, 2, 10, false, 1 },
{ CH1, FLD_YD, UNIT_WH, 20, 2, 1, false, 0 }, { TYPE_DC, CH0, FLD_YD, UNIT_WH, 20, 2, 1, false, 0 },
{ CH1, FLD_YT, UNIT_KWH, 12, 4, 1000, false, 3 }, { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 12, 4, 1000, false, 3 },
{ CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 }, { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
{ CH2, FLD_UDC, UNIT_V, CALC_UDC_CH, CH1, CMD_CALC, false, 1 }, { TYPE_DC, CH1, FLD_UDC, UNIT_V, CALC_UDC_CH, CH0, CMD_CALC, false, 1 },
{ CH2, FLD_IDC, UNIT_A, 6, 2, 100, false, 2 }, { TYPE_DC, CH1, FLD_IDC, UNIT_A, 6, 2, 100, false, 2 },
{ CH2, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 }, { TYPE_DC, CH1, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 },
{ CH2, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 }, { TYPE_DC, CH1, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 },
{ CH2, FLD_YT, UNIT_KWH, 16, 4, 1000, false, 3 }, { TYPE_DC, CH1, FLD_YT, UNIT_KWH, 16, 4, 1000, false, 3 },
{ CH2, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH2, CMD_CALC, false, 3 }, { TYPE_DC, CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
{ CH3, FLD_UDC, UNIT_V, 24, 2, 10, false, 1 }, { TYPE_DC, CH2, FLD_UDC, UNIT_V, 24, 2, 10, false, 1 },
{ CH3, FLD_IDC, UNIT_A, 26, 2, 100, false, 2 }, { TYPE_DC, CH2, FLD_IDC, UNIT_A, 26, 2, 100, false, 2 },
{ CH3, FLD_PDC, UNIT_W, 30, 2, 10, false, 1 }, { TYPE_DC, CH2, FLD_PDC, UNIT_W, 30, 2, 10, false, 1 },
{ CH3, FLD_YD, UNIT_WH, 42, 2, 1, false, 0 }, { TYPE_DC, CH2, FLD_YD, UNIT_WH, 42, 2, 1, false, 0 },
{ CH3, FLD_YT, UNIT_KWH, 34, 4, 1000, false, 3 }, { TYPE_DC, CH2, FLD_YT, UNIT_KWH, 34, 4, 1000, false, 3 },
{ CH3, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH3, CMD_CALC, false, 3 }, { TYPE_DC, CH2, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH2, CMD_CALC, false, 3 },
{ CH4, FLD_UDC, UNIT_V, CALC_UDC_CH, CH3, CMD_CALC, false, 1 }, { TYPE_DC, CH3, FLD_UDC, UNIT_V, CALC_UDC_CH, CH2, CMD_CALC, false, 1 },
{ CH4, FLD_IDC, UNIT_A, 28, 2, 100, false, 2 }, { TYPE_DC, CH3, FLD_IDC, UNIT_A, 28, 2, 100, false, 2 },
{ CH4, FLD_PDC, UNIT_W, 32, 2, 10, false, 1 }, { TYPE_DC, CH3, FLD_PDC, UNIT_W, 32, 2, 10, false, 1 },
{ CH4, FLD_YD, UNIT_WH, 44, 2, 1, false, 0 }, { TYPE_DC, CH3, FLD_YD, UNIT_WH, 44, 2, 1, false, 0 },
{ CH4, FLD_YT, UNIT_KWH, 38, 4, 1000, false, 3 }, { TYPE_DC, CH3, FLD_YT, UNIT_KWH, 38, 4, 1000, false, 3 },
{ CH4, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH4, CMD_CALC, false, 3 }, { TYPE_DC, CH3, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH3, CMD_CALC, false, 3 },
{ CH0, FLD_UAC, UNIT_V, 46, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_UAC, UNIT_V, 46, 2, 10, false, 1 },
{ CH0, FLD_IAC, UNIT_A, 54, 2, 100, false, 2 }, { TYPE_AC, CH0, FLD_IAC, UNIT_A, 54, 2, 100, false, 2 },
{ CH0, FLD_PAC, UNIT_W, 50, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_PAC, UNIT_W, 50, 2, 10, false, 1 },
{ CH0, FLD_PRA, UNIT_VA, 52, 2, 10, false, 1 }, { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 52, 2, 10, false, 1 },
{ CH0, FLD_F, UNIT_HZ, 48, 2, 100, false, 2 }, { TYPE_AC, CH0, FLD_F, UNIT_HZ, 48, 2, 100, false, 2 },
{ CH0, FLD_PF, UNIT_NONE, 56, 2, 1000, false, 3 }, { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 56, 2, 1000, false, 3 },
{ CH0, FLD_T, UNIT_C, 58, 2, 10, true, 1 },
{ CH0, FLD_EVT_LOG, UNIT_NONE, 60, 2, 1, false, 0 }, { TYPE_INV, CH0, FLD_T, UNIT_C, 58, 2, 10, true, 1 },
{ CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 }, { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 60, 2, 1, false, 0 },
{ CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 }, { TYPE_AC, CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 },
{ CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 } { TYPE_AC, CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ TYPE_AC, CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 },
{ TYPE_AC, CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
}; };
}; };

6
lib/Hoymiles/src/inverters/HM_Abstract.cpp
View File

@ -40,14 +40,14 @@ bool HM_Abstract::sendAlarmLogRequest(HoymilesRadio* radio, bool force)
} }
if (!force) { if (!force) {
if (Statistics()->hasChannelFieldValue(CH0, FLD_EVT_LOG)) { if (Statistics()->hasChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG)) {
if ((uint8_t)Statistics()->getChannelFieldValue(CH0, FLD_EVT_LOG) == _lastAlarmLogCnt) { if ((uint8_t)Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG) == _lastAlarmLogCnt) {
return false; return false;
} }
} }
} }
_lastAlarmLogCnt = (uint8_t)Statistics()->getChannelFieldValue(CH0, FLD_EVT_LOG); _lastAlarmLogCnt = (uint8_t)Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG);
time_t now; time_t now;
time(&now); time(&now);

11
lib/Hoymiles/src/inverters/InverterAbstract.cpp
View File

@ -30,7 +30,7 @@ void InverterAbstract::init()
// Not possible in constructor --> virtual function // Not possible in constructor --> virtual function
// Not possible in verifyAllFragments --> Because no data if nothing is ever received // Not possible in verifyAllFragments --> Because no data if nothing is ever received
// It has to be executed because otherwise the getChannelCount method in stats always returns 0 // It has to be executed because otherwise the getChannelCount method in stats always returns 0
_statisticsParser.get()->setByteAssignment(getByteAssignment(), getAssignmentCount()); _statisticsParser.get()->setByteAssignment(getByteAssignment());
} }
uint64_t InverterAbstract::serial() uint64_t InverterAbstract::serial()
@ -60,11 +60,14 @@ const char* InverterAbstract::name()
bool InverterAbstract::isProducing() bool InverterAbstract::isProducing()
{ {
if (!Statistics()->hasChannelFieldValue(CH0, FLD_PAC)) { float totalAc = 0;
return false; for (auto& c : Statistics()->getChannelsByType(TYPE_AC)) {
if (Statistics()->hasChannelFieldValue(TYPE_AC, c, FLD_PAC)) {
totalAc += Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_PAC);
}
} }
return Statistics()->getChannelFieldValue(CH0, FLD_PAC) > 0; return totalAc > 0;
} }
bool InverterAbstract::isReachable() bool InverterAbstract::isReachable()

4
lib/Hoymiles/src/inverters/InverterAbstract.h
View File

@ -11,6 +11,7 @@
#include "types.h" #include "types.h"
#include <Arduino.h> #include <Arduino.h>
#include <cstdint> #include <cstdint>
#include <list>
#define MAX_NAME_LENGTH 32 #define MAX_NAME_LENGTH 32
@ -38,8 +39,7 @@ public:
void setName(const char* name); void setName(const char* name);
const char* name(); const char* name();
virtual String typeName() = 0; virtual String typeName() = 0;
virtual const byteAssign_t* getByteAssignment() = 0; virtual const std::list<byteAssign_t>* getByteAssignment() = 0;
virtual uint8_t getAssignmentCount() = 0;
bool isProducing(); bool isProducing();
bool isReachable(); bool isReachable();

135
lib/Hoymiles/src/parser/StatisticsParser.cpp
View File

@ -28,10 +28,9 @@ const calcFunc_t calcFunctions[] = {
{ CALC_IRR_CH, &calcIrradiation } { CALC_IRR_CH, &calcIrradiation }
}; };
void StatisticsParser::setByteAssignment(const byteAssign_t* byteAssignment, const uint8_t count) void StatisticsParser::setByteAssignment(const std::list<byteAssign_t>* byteAssignment)
{ {
_byteAssignment = byteAssignment; _byteAssignment = byteAssignment;
_byteAssignmentCount = count;
} }
void StatisticsParser::clearBuffer() void StatisticsParser::clearBuffer()
@ -50,31 +49,26 @@ void StatisticsParser::appendFragment(uint8_t offset, uint8_t* payload, uint8_t
_statisticLength += len; _statisticLength += len;
} }
uint8_t StatisticsParser::getAssignIdxByChannelField(uint8_t channel, uint8_t fieldId) const byteAssign_t* StatisticsParser::getAssignmentByChannelField(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
const byteAssign_t* b = _byteAssignment; for (auto const& i : *_byteAssignment) {
if (i.type == type && i.ch == channel && i.fieldId == fieldId) {
uint8_t pos; return &i;
for (pos = 0; pos < _byteAssignmentCount; pos++) {
if (b[pos].ch == channel && b[pos].fieldId == fieldId) {
return pos;
} }
} }
return 0xff; return NULL;
} }
float StatisticsParser::getChannelFieldValue(uint8_t channel, uint8_t fieldId) float StatisticsParser::getChannelFieldValue(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); const byteAssign_t* pos = getAssignmentByChannelField(type, channel, fieldId);
if (pos == 0xff) { if (pos == NULL) {
return 0; return 0;
} }
const byteAssign_t* b = _byteAssignment; uint8_t ptr = pos->start;
uint8_t end = ptr + pos->num;
uint8_t ptr = b[pos].start; uint16_t div = pos->div;
uint8_t end = ptr + b[pos].num;
uint16_t div = b[pos].div;
if (CMD_CALC != div) { if (CMD_CALC != div) {
// Value is a static value // Value is a static value
@ -85,9 +79,9 @@ float StatisticsParser::getChannelFieldValue(uint8_t channel, uint8_t fieldId)
} while (++ptr != end); } while (++ptr != end);
float result; float result;
if (b[pos].isSigned && b[pos].num == 2) { if (pos->isSigned && pos->num == 2) {
result = static_cast<float>(static_cast<int16_t>(val)); result = static_cast<float>(static_cast<int16_t>(val));
} else if (b[pos].isSigned && b[pos].num == 4) { } else if (pos->isSigned && pos->num == 4) {
result = static_cast<float>(static_cast<int32_t>(val)); result = static_cast<float>(static_cast<int32_t>(val));
} else { } else {
result = static_cast<float>(val); result = static_cast<float>(val);
@ -97,62 +91,71 @@ float StatisticsParser::getChannelFieldValue(uint8_t channel, uint8_t fieldId)
return result; return result;
} else { } else {
// Value has to be calculated // Value has to be calculated
return calcFunctions[b[pos].start].func(this, b[pos].num); return calcFunctions[pos->start].func(this, pos->num);
} }
return 0; return 0;
} }
bool StatisticsParser::hasChannelFieldValue(uint8_t channel, uint8_t fieldId) bool StatisticsParser::hasChannelFieldValue(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); const byteAssign_t* pos = getAssignmentByChannelField(type, channel, fieldId);
return pos != 0xff; return pos != NULL;
} }
const char* StatisticsParser::getChannelFieldUnit(uint8_t channel, uint8_t fieldId) const char* StatisticsParser::getChannelFieldUnit(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); const byteAssign_t* pos = getAssignmentByChannelField(type, channel, fieldId);
const byteAssign_t* b = _byteAssignment; return units[pos->unitId];
return units[b[pos].unitId];
} }
const char* StatisticsParser::getChannelFieldName(uint8_t channel, uint8_t fieldId) const char* StatisticsParser::getChannelFieldName(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); const byteAssign_t* pos = getAssignmentByChannelField(type, channel, fieldId);
const byteAssign_t* b = _byteAssignment; return fields[pos->fieldId];
return fields[b[pos].fieldId];
} }
uint8_t StatisticsParser::getChannelFieldDigits(uint8_t channel, uint8_t fieldId) uint8_t StatisticsParser::getChannelFieldDigits(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); const byteAssign_t* pos = getAssignmentByChannelField(type, channel, fieldId);
return _byteAssignment[pos].digits; return pos->digits;
} }
uint8_t StatisticsParser::getChannelCount() std::list<ChannelType_t> StatisticsParser::getChannelTypes()
{ {
const byteAssign_t* b = _byteAssignment; return {
uint8_t cnt = 0; TYPE_AC,
for (uint8_t pos = 0; pos < _byteAssignmentCount; pos++) { TYPE_DC,
if (b[pos].ch > cnt) { TYPE_INV
cnt = b[pos].ch; };
}
const char* StatisticsParser::getChannelTypeName(ChannelType_t type)
{
return channelsTypes[type];
}
std::list<ChannelNum_t> StatisticsParser::getChannelsByType(ChannelType_t type)
{
std::list<ChannelNum_t> l;
for (auto const& b : *_byteAssignment) {
if (b.type == type) {
l.push_back(b.ch);
} }
} }
l.unique();
return cnt; return l;
} }
uint16_t StatisticsParser::getChannelMaxPower(uint8_t channel) uint16_t StatisticsParser::getStringMaxPower(uint8_t channel)
{ {
return _chanMaxPower[channel]; return _stringMaxPower[channel];
} }
void StatisticsParser::setChannelMaxPower(uint8_t channel, uint16_t power) void StatisticsParser::setStringMaxPower(uint8_t channel, uint16_t power)
{ {
if (channel < CH4) { if (channel < sizeof(_stringMaxPower) / sizeof(_stringMaxPower[0])) {
_chanMaxPower[channel] = power; _stringMaxPower[channel] = power;
} }
} }
@ -174,8 +177,8 @@ uint32_t StatisticsParser::getRxFailureCount()
static float calcYieldTotalCh0(StatisticsParser* iv, uint8_t arg0) static float calcYieldTotalCh0(StatisticsParser* iv, uint8_t arg0)
{ {
float yield = 0; float yield = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (auto& channel : iv->getChannelsByType(TYPE_DC)) {
yield += iv->getChannelFieldValue(i, FLD_YT); yield += iv->getChannelFieldValue(TYPE_DC, channel, FLD_YT);
} }
return yield; return yield;
} }
@ -183,8 +186,8 @@ static float calcYieldTotalCh0(StatisticsParser* iv, uint8_t arg0)
static float calcYieldDayCh0(StatisticsParser* iv, uint8_t arg0) static float calcYieldDayCh0(StatisticsParser* iv, uint8_t arg0)
{ {
float yield = 0; float yield = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (auto& channel : iv->getChannelsByType(TYPE_DC)) {
yield += iv->getChannelFieldValue(i, FLD_YD); yield += iv->getChannelFieldValue(TYPE_DC, channel, FLD_YD);
} }
return yield; return yield;
} }
@ -192,14 +195,14 @@ static float calcYieldDayCh0(StatisticsParser* iv, uint8_t arg0)
// arg0 = channel of source // arg0 = channel of source
static float calcUdcCh(StatisticsParser* iv, uint8_t arg0) static float calcUdcCh(StatisticsParser* iv, uint8_t arg0)
{ {
return iv->getChannelFieldValue(arg0, FLD_UDC); return iv->getChannelFieldValue(TYPE_DC, static_cast<ChannelNum_t>(arg0), FLD_UDC);
} }
static float calcPowerDcCh0(StatisticsParser* iv, uint8_t arg0) static float calcPowerDcCh0(StatisticsParser* iv, uint8_t arg0)
{ {
float dcPower = 0; float dcPower = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (auto& channel : iv->getChannelsByType(TYPE_DC)) {
dcPower += iv->getChannelFieldValue(i, FLD_PDC); dcPower += iv->getChannelFieldValue(TYPE_DC, channel, FLD_PDC);
} }
return dcPower; return dcPower;
} }
@ -207,15 +210,19 @@ static float calcPowerDcCh0(StatisticsParser* iv, uint8_t arg0)
// arg0 = channel // arg0 = channel
static float calcEffiencyCh0(StatisticsParser* iv, uint8_t arg0) static float calcEffiencyCh0(StatisticsParser* iv, uint8_t arg0)
{ {
float acPower = iv->getChannelFieldValue(CH0, FLD_PAC); float acPower = 0;
float dcPower = 0; for (auto& channel : iv->getChannelsByType(TYPE_AC)) {
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { acPower += iv->getChannelFieldValue(TYPE_AC, channel, FLD_PAC);
dcPower += iv->getChannelFieldValue(i, FLD_PDC);
} }
float dcPower = 0;
for (auto& channel : iv->getChannelsByType(TYPE_DC)) {
dcPower += iv->getChannelFieldValue(TYPE_DC, channel, FLD_PDC);
}
if (dcPower > 0) { if (dcPower > 0) {
return acPower / dcPower * 100.0f; return acPower / dcPower * 100.0f;
} }
return 0.0; return 0.0;
} }
@ -223,8 +230,8 @@ static float calcEffiencyCh0(StatisticsParser* iv, uint8_t arg0)
static float calcIrradiation(StatisticsParser* iv, uint8_t arg0) static float calcIrradiation(StatisticsParser* iv, uint8_t arg0)
{ {
if (NULL != iv) { if (NULL != iv) {
if (iv->getChannelMaxPower(arg0 - 1) > 0) if (iv->getStringMaxPower(arg0) > 0)
return iv->getChannelFieldValue(arg0, FLD_PDC) / iv->getChannelMaxPower(arg0 - 1) * 100.0f; return iv->getChannelFieldValue(TYPE_DC, static_cast<ChannelNum_t>(arg0), FLD_PDC) / iv->getStringMaxPower(arg0) * 100.0f;
} }
return 0.0; return 0.0;
} }

48
lib/Hoymiles/src/parser/StatisticsParser.h
View File

@ -3,11 +3,12 @@
#include "Parser.h" #include "Parser.h"
#include <Arduino.h> #include <Arduino.h>
#include <cstdint> #include <cstdint>
#include <list>
#define STATISTIC_PACKET_SIZE (4 * 16) #define STATISTIC_PACKET_SIZE (4 * 16)
// units // units
enum { enum UnitId_t {
UNIT_V = 0, UNIT_V = 0,
UNIT_A, UNIT_A,
UNIT_W, UNIT_W,
@ -22,7 +23,7 @@ enum {
const char* const units[] = { "V", "A", "W", "Wh", "kWh", "Hz", "°C", "%", "var", "" }; const char* const units[] = { "V", "A", "W", "Wh", "kWh", "Hz", "°C", "%", "var", "" };
// field types // field types
enum { enum FieldId_t {
FLD_UDC = 0, FLD_UDC = 0,
FLD_IDC, FLD_IDC,
FLD_PDC, FLD_PDC,
@ -54,7 +55,7 @@ enum {
enum { CMD_CALC = 0xffff }; enum { CMD_CALC = 0xffff };
// CH0 is default channel (freq, ac, temp) // CH0 is default channel (freq, ac, temp)
enum { enum ChannelNum_t {
CH0 = 0, CH0 = 0,
CH1, CH1,
CH2, CH2,
@ -62,10 +63,18 @@ enum {
CH4 CH4
}; };
enum ChannelType_t {
TYPE_AC = 0,
TYPE_DC,
TYPE_INV
};
const char* const channelsTypes[] = { "AC", "DC", "INV" };
typedef struct { typedef struct {
uint8_t ch; // channel 0 - 4 ChannelType_t type;
uint8_t fieldId; // field id ChannelNum_t ch; // channel 0 - 4
uint8_t unitId; // uint id FieldId_t fieldId; // field id
UnitId_t unitId; // uint id
uint8_t start; // pos of first byte in buffer uint8_t start; // pos of first byte in buffer
uint8_t num; // number of bytes in buffer uint8_t num; // number of bytes in buffer
uint16_t div; // divisor / calc command uint16_t div; // divisor / calc command
@ -78,19 +87,21 @@ public:
void clearBuffer(); void clearBuffer();
void appendFragment(uint8_t offset, uint8_t* payload, uint8_t len); void appendFragment(uint8_t offset, uint8_t* payload, uint8_t len);
void setByteAssignment(const byteAssign_t* byteAssignment, const uint8_t count); void setByteAssignment(const std::list<byteAssign_t>* byteAssignment);
uint8_t getAssignIdxByChannelField(uint8_t channel, uint8_t fieldId); const byteAssign_t* getAssignmentByChannelField(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
float getChannelFieldValue(uint8_t channel, uint8_t fieldId); float getChannelFieldValue(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
bool hasChannelFieldValue(uint8_t channel, uint8_t fieldId); bool hasChannelFieldValue(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
const char* getChannelFieldUnit(uint8_t channel, uint8_t fieldId); const char* getChannelFieldUnit(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
const char* getChannelFieldName(uint8_t channel, uint8_t fieldId); const char* getChannelFieldName(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
uint8_t getChannelFieldDigits(uint8_t channel, uint8_t fieldId); uint8_t getChannelFieldDigits(ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
uint8_t getChannelCount(); std::list<ChannelType_t> getChannelTypes();
const char* getChannelTypeName(ChannelType_t type);
std::list<ChannelNum_t> getChannelsByType(ChannelType_t type);
uint16_t getChannelMaxPower(uint8_t channel); uint16_t getStringMaxPower(uint8_t channel);
void setChannelMaxPower(uint8_t channel, uint16_t power); void setStringMaxPower(uint8_t channel, uint16_t power);
void resetRxFailureCount(); void resetRxFailureCount();
void incrementRxFailureCount(); void incrementRxFailureCount();
@ -99,10 +110,9 @@ public:
private: private:
uint8_t _payloadStatistic[STATISTIC_PACKET_SIZE] = {}; uint8_t _payloadStatistic[STATISTIC_PACKET_SIZE] = {};
uint8_t _statisticLength = 0; uint8_t _statisticLength = 0;
uint16_t _chanMaxPower[CH4]; uint16_t _stringMaxPower[CH4];
const byteAssign_t* _byteAssignment; const std::list<byteAssign_t>* _byteAssignment;
uint8_t _byteAssignmentCount;
uint32_t _rxFailureCount = 0; uint32_t _rxFailureCount = 0;
}; };

13
src/Display_Graphic.cpp
View File

@ -37,7 +37,8 @@ std::map<DisplayType_t, std::function<U8G2*(uint8_t, uint8_t, uint8_t, uint8_t)>
}; };
DisplayGraphicClass::DisplayGraphicClass() DisplayGraphicClass::DisplayGraphicClass()
{} {
}
DisplayGraphicClass::~DisplayGraphicClass() DisplayGraphicClass::~DisplayGraphicClass()
{ {
@ -88,7 +89,7 @@ void DisplayGraphicClass::printText(const char* text, uint8_t line)
break; break;
} }
// get the font height, to calculate the textheight // get the font height, to calculate the textheight
_dispY += (_display->getMaxCharHeight()) + 1; _dispY += (_display->getMaxCharHeight()) + 1;
// calculate the starting position of the text // calculate the starting position of the text
@ -126,9 +127,11 @@ void DisplayGraphicClass::loop()
isprod++; isprod++;
} }
totalPower += inv->Statistics()->getChannelFieldValue(CH0, FLD_PAC); for (auto& c : inv->Statistics()->getChannelsByType(TYPE_AC)) {
totalYieldDay += inv->Statistics()->getChannelFieldValue(CH0, FLD_YD); totalPower += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_PAC);
totalYieldTotal += inv->Statistics()->getChannelFieldValue(CH0, FLD_YT); totalYieldDay += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_YD);
totalYieldTotal += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_YT);
}
} }
_display->clearBuffer(); _display->clearBuffer();

38
src/MqttHandleHass.cpp
View File

@ -65,13 +65,15 @@ void MqttHandleHassClass::publishConfig()
publishInverterBinarySensor(inv, "Producing", "status/producing", "1", "0"); publishInverterBinarySensor(inv, "Producing", "status/producing", "1", "0");
// Loop all channels // Loop all channels
for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) { for (auto& t : inv->Statistics()->getChannelTypes()) {
for (uint8_t f = 0; f < DEVICE_CLS_ASSIGN_LIST_LEN; f++) { for (auto& c : inv->Statistics()->getChannelsByType(t)) {
bool clear = false; for (uint8_t f = 0; f < DEVICE_CLS_ASSIGN_LIST_LEN; f++) {
if (c > 0 && !config.Mqtt_Hass_IndividualPanels) { bool clear = false;
clear = true; if (t == TYPE_DC && !config.Mqtt_Hass_IndividualPanels) {
clear = true;
}
publishField(inv, t, c, deviceFieldAssignment[f], clear);
} }
publishField(inv, c, deviceFieldAssignment[f], clear);
} }
} }
@ -79,32 +81,40 @@ void MqttHandleHassClass::publishConfig()
} }
} }
void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear) void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear)
{ {
if (!inv->Statistics()->hasChannelFieldValue(channel, fieldType.fieldId)) { if (!inv->Statistics()->hasChannelFieldValue(type, channel, fieldType.fieldId)) {
return; return;
} }
String serial = inv->serialString(); String serial = inv->serialString();
String fieldName; String fieldName;
if (channel == CH0 && fieldType.fieldId == FLD_PDC) { if (type == TYPE_AC && fieldType.fieldId == FLD_PDC) {
fieldName = "PowerDC"; fieldName = "PowerDC";
} else { } else {
fieldName = inv->Statistics()->getChannelFieldName(channel, fieldType.fieldId); fieldName = inv->Statistics()->getChannelFieldName(type, channel, fieldType.fieldId);
}
String chanNum;
if (type == TYPE_DC) {
// TODO(tbnobody)
chanNum = static_cast<uint8_t>(channel) + 1;
} else {
chanNum = channel;
} }
String configTopic = "sensor/dtu_" + serial String configTopic = "sensor/dtu_" + serial
+ "/" + "ch" + String(channel) + "_" + fieldName + "/" + "ch" + chanNum + "_" + fieldName
+ "/config"; + "/config";
if (!clear) { if (!clear) {
String stateTopic = MqttSettings.getPrefix() + MqttHandleInverter.getTopic(inv, channel, fieldType.fieldId); String stateTopic = MqttSettings.getPrefix() + MqttHandleInverter.getTopic(inv, type, channel, fieldType.fieldId);
const char* devCls = deviceClasses[fieldType.deviceClsId]; const char* devCls = deviceClasses[fieldType.deviceClsId];
const char* stateCls = stateClasses[fieldType.stateClsId]; const char* stateCls = stateClasses[fieldType.stateClsId];
String name; String name;
if (channel == CH0) { if (type != TYPE_DC) {
name = String(inv->name()) + " " + fieldName; name = String(inv->name()) + " " + fieldName;
} else { } else {
name = String(inv->name()) + " CH" + String(channel) + " " + fieldName; name = String(inv->name()) + " CH" + String(channel) + " " + fieldName;
@ -115,7 +125,7 @@ void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
root[F("stat_t")] = stateTopic; root[F("stat_t")] = stateTopic;
root[F("uniq_id")] = serial + "_ch" + String(channel) + "_" + fieldName; root[F("uniq_id")] = serial + "_ch" + String(channel) + "_" + fieldName;
String unit_of_measure = inv->Statistics()->getChannelFieldUnit(channel, fieldType.fieldId); String unit_of_measure = inv->Statistics()->getChannelFieldUnit(type, channel, fieldType.fieldId);
if (unit_of_measure != "") { if (unit_of_measure != "") {
root[F("unit_of_meas")] = unit_of_measure; root[F("unit_of_meas")] = unit_of_measure;
} }

43
src/MqttHandleInverter.cpp
View File

@ -96,15 +96,18 @@ void MqttHandleInverterClass::loop()
_lastPublishStats[i] = lastUpdate; _lastPublishStats[i] = lastUpdate;
// Loop all channels // Loop all channels
for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) { for (auto& t : inv->Statistics()->getChannelTypes()) {
if (c > 0) { for (auto& c : inv->Statistics()->getChannelsByType(t)) {
INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial()); if (t == TYPE_DC) {
if (inv_cfg != nullptr) { INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial());
MqttSettings.publish(inv->serialString() + "/" + String(c) + "/name", inv_cfg->channel[c - 1].Name); if (inv_cfg != nullptr) {
// TODO(tbnobody)
MqttSettings.publish(inv->serialString() + "/" + String(static_cast<uint8_t>(c) + 1) + "/name", inv_cfg->channel[c].Name);
}
}
for (uint8_t f = 0; f < sizeof(_publishFields) / sizeof(FieldId_t); f++) {
publishField(inv, t, c, _publishFields[f]);
} }
}
for (uint8_t f = 0; f < sizeof(_publishFields); f++) {
publishField(inv, c, _publishFields[f]);
} }
} }
} }
@ -116,31 +119,39 @@ void MqttHandleInverterClass::loop()
} }
} }
void MqttHandleInverterClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) void MqttHandleInverterClass::publishField(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
String topic = getTopic(inv, channel, fieldId); String topic = getTopic(inv, type, channel, fieldId);
if (topic == "") { if (topic == "") {
return; return;
} }
MqttSettings.publish(topic, String(inv->Statistics()->getChannelFieldValue(channel, fieldId))); MqttSettings.publish(topic, String(inv->Statistics()->getChannelFieldValue(type, channel, fieldId)));
} }
String MqttHandleInverterClass::getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) String MqttHandleInverterClass::getTopic(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId)
{ {
if (!inv->Statistics()->hasChannelFieldValue(channel, fieldId)) { if (!inv->Statistics()->hasChannelFieldValue(type, channel, fieldId)) {
return String(""); return String("");
} }
String chanName; String chanName;
if (channel == 0 && fieldId == FLD_PDC) { if (type == TYPE_AC && fieldId == FLD_PDC) {
chanName = "powerdc"; chanName = "powerdc";
} else { } else {
chanName = inv->Statistics()->getChannelFieldName(channel, fieldId); chanName = inv->Statistics()->getChannelFieldName(type, channel, fieldId);
chanName.toLowerCase(); chanName.toLowerCase();
} }
return inv->serialString() + "/" + String(channel) + "/" + chanName; String chanNum;
if (type == TYPE_DC) {
// TODO(tbnobody)
chanNum = static_cast<uint8_t>(channel) + 1;
} else {
chanNum = channel;
}
return inv->serialString() + "/" + chanNum + "/" + chanName;
} }
void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total) void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total)

6
src/WebApi_inverter.cpp
View File

@ -59,7 +59,7 @@ void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request)
max_channels = INV_MAX_CHAN_COUNT; max_channels = INV_MAX_CHAN_COUNT;
} else { } else {
obj[F("type")] = inv->typeName(); obj[F("type")] = inv->typeName();
max_channels = inv->Statistics()->getChannelCount(); max_channels = inv->Statistics()->getChannelsByType(TYPE_DC).size();
} }
JsonArray channel = obj.createNestedArray("channel"); JsonArray channel = obj.createNestedArray("channel");
@ -167,7 +167,7 @@ void WebApiInverterClass::onInverterAdd(AsyncWebServerRequest* request)
if (inv != nullptr) { if (inv != nullptr) {
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) { for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
inv->Statistics()->setChannelMaxPower(c, inverter->channel[c].MaxChannelPower); inv->Statistics()->setStringMaxPower(c, inverter->channel[c].MaxChannelPower);
} }
} }
@ -296,7 +296,7 @@ void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
if (inv != nullptr) { if (inv != nullptr) {
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) { for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
inv->Statistics()->setChannelMaxPower(c, inverter.channel[c].MaxChannelPower); inv->Statistics()->setStringMaxPower(c, inverter.channel[c].MaxChannelPower);
} }
} }

57
src/WebApi_prometheus.cpp
View File

@ -63,39 +63,48 @@ void WebApiPrometheusClass::onPrometheusMetricsGet(AsyncWebServerRequest* reques
serial.c_str(), i, name, inv->Statistics()->getLastUpdate() / 1000); serial.c_str(), i, name, inv->Statistics()->getLastUpdate() / 1000);
// Loop all channels // Loop all channels
for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) { for (auto& t : inv->Statistics()->getChannelTypes()) {
addField(stream, serial, i, inv, c, FLD_PAC); for (auto& c : inv->Statistics()->getChannelsByType(t)) {
addField(stream, serial, i, inv, c, FLD_UAC); addField(stream, serial, i, inv, t, c, FLD_PAC);
addField(stream, serial, i, inv, c, FLD_IAC); addField(stream, serial, i, inv, t, c, FLD_UAC);
if (c == 0) { addField(stream, serial, i, inv, t, c, FLD_IAC);
addField(stream, serial, i, inv, c, FLD_PDC, "PowerDC"); if (t == TYPE_AC) {
} else { addField(stream, serial, i, inv, t, c, FLD_PDC, "PowerDC");
addField(stream, serial, i, inv, c, FLD_PDC); } else {
addField(stream, serial, i, inv, t, c, FLD_PDC);
}
addField(stream, serial, i, inv, t, c, FLD_UDC);
addField(stream, serial, i, inv, t, c, FLD_IDC);
addField(stream, serial, i, inv, t, c, FLD_YD);
addField(stream, serial, i, inv, t, c, FLD_YT);
addField(stream, serial, i, inv, t, c, FLD_F);
addField(stream, serial, i, inv, t, c, FLD_T);
addField(stream, serial, i, inv, t, c, FLD_PF);
addField(stream, serial, i, inv, t, c, FLD_PRA);
addField(stream, serial, i, inv, t, c, FLD_EFF);
addField(stream, serial, i, inv, t, c, FLD_IRR);
} }
addField(stream, serial, i, inv, c, FLD_UDC);
addField(stream, serial, i, inv, c, FLD_IDC);
addField(stream, serial, i, inv, c, FLD_YD);
addField(stream, serial, i, inv, c, FLD_YT);
addField(stream, serial, i, inv, c, FLD_F);
addField(stream, serial, i, inv, c, FLD_T);
addField(stream, serial, i, inv, c, FLD_PF);
addField(stream, serial, i, inv, c, FLD_PRA);
addField(stream, serial, i, inv, c, FLD_EFF);
addField(stream, serial, i, inv, c, FLD_IRR);
} }
} }
stream->addHeader(F("Cache-Control"), F("no-cache")); stream->addHeader(F("Cache-Control"), F("no-cache"));
request->send(stream); request->send(stream);
} }
void WebApiPrometheusClass::addField(AsyncResponseStream* stream, String& serial, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, const char* channelName) void WebApiPrometheusClass::addField(AsyncResponseStream* stream, String& serial, uint8_t idx, std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId, const char* channelName)
{ {
if (inv->Statistics()->hasChannelFieldValue(channel, fieldId)) { if (inv->Statistics()->hasChannelFieldValue(type, channel, fieldId)) {
const char* chanName = (channelName == NULL) ? inv->Statistics()->getChannelFieldName(channel, fieldId) : channelName; const char* chanName = (channelName == NULL) ? inv->Statistics()->getChannelFieldName(type, channel, fieldId) : channelName;
if (idx == 0 && channel == 0) { if (idx == 0 && type == TYPE_AC && channel == 0) {
stream->printf("# HELP opendtu_%s in %s\n", chanName, inv->Statistics()->getChannelFieldUnit(channel, fieldId)); stream->printf("# HELP opendtu_%s in %s\n", chanName, inv->Statistics()->getChannelFieldUnit(type, channel, fieldId));
stream->printf("# TYPE opendtu_%s gauge\n", chanName); stream->printf("# TYPE opendtu_%s gauge\n", chanName);
} }
stream->printf("opendtu_%s{serial=\"%s\",unit=\"%d\",name=\"%s\",channel=\"%d\"} %f\n", chanName, serial.c_str(), idx, inv->name(), channel, inv->Statistics()->getChannelFieldValue(channel, fieldId)); stream->printf("opendtu_%s{serial=\"%s\",unit=\"%d\",name=\"%s\",type=\"%s\",channel=\"%d\"} %f\n",
chanName,
serial.c_str(),
idx,
inv->name(),
inv->Statistics()->getChannelTypeName(type),
channel,
inv->Statistics()->getChannelFieldValue(type, channel, fieldId));
} }
} }

77
src/WebApi_ws_live.cpp
View File

@ -111,36 +111,39 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
} }
// Loop all channels // Loop all channels
for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) { for (auto& t : inv->Statistics()->getChannelTypes()) {
if (c > 0) { JsonObject chanTypeObj = invObject.createNestedObject(inv->Statistics()->getChannelTypeName(t));
INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial()); for (auto& c : inv->Statistics()->getChannelsByType(t)) {
if (inv_cfg != nullptr) { if (t == TYPE_DC) {
invObject[String(c)][F("name")]["u"] = inv_cfg->channel[c - 1].Name; INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial());
if (inv_cfg != nullptr) {
chanTypeObj[String(static_cast<uint8_t>(c))][F("name")]["u"] = inv_cfg->channel[c].Name;
}
}
addField(chanTypeObj, i, inv, t, c, FLD_PAC);
addField(chanTypeObj, i, inv, t, c, FLD_UAC);
addField(chanTypeObj, i, inv, t, c, FLD_IAC);
if (t == TYPE_AC) {
addField(chanTypeObj, i, inv, t, c, FLD_PDC, F("Power DC"));
} else {
addField(chanTypeObj, i, inv, t, c, FLD_PDC);
}
addField(chanTypeObj, i, inv, t, c, FLD_UDC);
addField(chanTypeObj, i, inv, t, c, FLD_IDC);
addField(chanTypeObj, i, inv, t, c, FLD_YD);
addField(chanTypeObj, i, inv, t, c, FLD_YT);
addField(chanTypeObj, i, inv, t, c, FLD_F);
addField(chanTypeObj, i, inv, t, c, FLD_T);
addField(chanTypeObj, i, inv, t, c, FLD_PF);
addField(chanTypeObj, i, inv, t, c, FLD_PRA);
addField(chanTypeObj, i, inv, t, c, FLD_EFF);
if (t == TYPE_DC && inv->Statistics()->getStringMaxPower(c) > 0) {
addField(chanTypeObj, i, inv, t, c, FLD_IRR);
} }
}
addField(invObject, i, inv, c, FLD_PAC);
addField(invObject, i, inv, c, FLD_UAC);
addField(invObject, i, inv, c, FLD_IAC);
if (c == 0) {
addField(invObject, i, inv, c, FLD_PDC, F("Power DC"));
} else {
addField(invObject, i, inv, c, FLD_PDC);
}
addField(invObject, i, inv, c, FLD_UDC);
addField(invObject, i, inv, c, FLD_IDC);
addField(invObject, i, inv, c, FLD_YD);
addField(invObject, i, inv, c, FLD_YT);
addField(invObject, i, inv, c, FLD_F);
addField(invObject, i, inv, c, FLD_T);
addField(invObject, i, inv, c, FLD_PF);
addField(invObject, i, inv, c, FLD_PRA);
addField(invObject, i, inv, c, FLD_EFF);
if (c > 0 && inv->Statistics()->getChannelMaxPower(c - 1) > 0) {
addField(invObject, i, inv, c, FLD_IRR);
} }
} }
if (inv->Statistics()->hasChannelFieldValue(CH0, FLD_EVT_LOG)) { if (inv->Statistics()->hasChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG)) {
invObject[F("events")] = inv->EventLog()->getEntryCount(); invObject[F("events")] = inv->EventLog()->getEntryCount();
} else { } else {
invObject[F("events")] = -1; invObject[F("events")] = -1;
@ -150,9 +153,11 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
_newestInverterTimestamp = inv->Statistics()->getLastUpdate(); _newestInverterTimestamp = inv->Statistics()->getLastUpdate();
} }
totalPower += inv->Statistics()->getChannelFieldValue(CH0, FLD_PAC); for (auto& c : inv->Statistics()->getChannelsByType(TYPE_AC)) {
totalYieldDay += inv->Statistics()->getChannelFieldValue(CH0, FLD_YD); totalPower += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_PAC);
totalYieldTotal += inv->Statistics()->getChannelFieldValue(CH0, FLD_YT); totalYieldDay += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_YD);
totalYieldTotal += inv->Statistics()->getChannelFieldValue(TYPE_AC, c, FLD_YT);
}
} }
JsonObject totalObj = root.createNestedObject("total"); JsonObject totalObj = root.createNestedObject("total");
@ -172,18 +177,20 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
} }
} }
void WebApiWsLiveClass::addField(JsonObject& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, String topic) void WebApiWsLiveClass::addField(JsonObject& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId, String topic)
{ {
if (inv->Statistics()->hasChannelFieldValue(channel, fieldId)) { if (inv->Statistics()->hasChannelFieldValue(type, channel, fieldId)) {
String chanName; String chanName;
if (topic == "") { if (topic == "") {
chanName = inv->Statistics()->getChannelFieldName(channel, fieldId); chanName = inv->Statistics()->getChannelFieldName(type, channel, fieldId);
} else { } else {
chanName = topic; chanName = topic;
} }
root[String(channel)][chanName]["v"] = inv->Statistics()->getChannelFieldValue(channel, fieldId); String chanNum;
root[String(channel)][chanName]["u"] = inv->Statistics()->getChannelFieldUnit(channel, fieldId); chanNum = channel;
root[String(channel)][chanName]["d"] = inv->Statistics()->getChannelFieldDigits(channel, fieldId); root[chanNum][chanName]["v"] = inv->Statistics()->getChannelFieldValue(type, channel, fieldId);
root[chanNum][chanName]["u"] = inv->Statistics()->getChannelFieldUnit(type, channel, fieldId);
root[chanNum][chanName]["d"] = inv->Statistics()->getChannelFieldDigits(type, channel, fieldId);
} }
} }

2
src/main.cpp
View File

@ -149,7 +149,7 @@ void setup()
if (inv != nullptr) { if (inv != nullptr) {
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) { for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
inv->Statistics()->setChannelMaxPower(c, config.Inverter[i].channel[c].MaxChannelPower); inv->Statistics()->setStringMaxPower(c, config.Inverter[i].channel[c].MaxChannelPower);
} }
} }
MessageOutput.println(F(" done")); MessageOutput.println(F(" done"));

29
webapp/src/components/InverterChannelInfo.vue
View File

@ -1,11 +1,21 @@
<template> <template>
<div class="card" :class="{ 'border-info': channelNumber == 0 }"> <div class="card" :class="{
<div v-if="channelNumber >= 1" class="card-header"> 'border-info': channelType == 'AC',
<template v-if="channelData.name.u != ''">{{ channelData.name.u }}</template> 'border-secondary': channelType == 'INV'
<template v-else>{{ $t('inverterchannelinfo.String', { num: channelNumber }) }}</template> }">
<div v-if="channelType == 'INV'" class="card-header text-bg-secondary">
{{ $t('inverterchannelinfo.General') }}
</div> </div>
<div v-if="channelNumber == 0" class="card-header text-bg-info">
{{ $t('inverterchannelinfo.Phase', { num: channelNumber + 1 }) }}</div> <div v-if="channelType == 'DC'" class="card-header">
<template v-if="channelData.name.u != ''">{{ channelData.name.u }}</template>
<template v-else>{{ $t('inverterchannelinfo.String', { num: channelNumber + 1 }) }}</template>
</div>
<div v-if="channelType == 'AC'" class="card-header text-bg-info">
{{ $t('inverterchannelinfo.Phase', { num: channelNumber + 1 }) }}
</div>
<div class="card-body"> <div class="card-body">
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
@ -21,10 +31,10 @@
<th scope="row">{{ $t('inverterchannelproperty.' + key) }}</th> <th scope="row">{{ $t('inverterchannelproperty.' + key) }}</th>
<td style="text-align: right"> <td style="text-align: right">
{{ $n(property.v, 'decimal', { {{ $n(property.v, 'decimal', {
minimumFractionDigits: property.d, minimumFractionDigits: property.d,
maximumFractionDigits: property.d}) maximumFractionDigits: property.d})
}} }}
</td> </td>
<td>{{ property.u }}</td> <td>{{ property.u }}</td>
</template> </template>
</tr> </tr>
@ -41,6 +51,7 @@ import { defineComponent, type PropType } from 'vue';
export default defineComponent({ export default defineComponent({
props: { props: {
channelData: { type: Object as PropType<InverterStatistics>, required: true }, channelData: { type: Object as PropType<InverterStatistics>, required: true },
channelType: { type: String, required: true },
channelNumber: { type: Number, required: true }, channelNumber: { type: Number, required: true },
}, },
}); });

1
webapp/src/locales/de.json
View File

@ -263,6 +263,7 @@
"inverterchannelinfo": { "inverterchannelinfo": {
"String": "String {num}", "String": "String {num}",
"Phase": "Phase {num}", "Phase": "Phase {num}",
"General": "Allgemein",
"Property": "Eigenschaft", "Property": "Eigenschaft",
"Value": "Wert", "Value": "Wert",
"Unit": "Einheit" "Unit": "Einheit"

1
webapp/src/locales/en.json
View File

@ -263,6 +263,7 @@
"inverterchannelinfo": { "inverterchannelinfo": {
"String": "String {num}", "String": "String {num}",
"Phase": "Phase {num}", "Phase": "Phase {num}",
"General": "General",
"Property": "Property", "Property": "Property",
"Value": "Value", "Value": "Value",
"Unit": "Unit" "Unit": "Unit"

1
webapp/src/locales/fr.json
View File

@ -263,6 +263,7 @@
"inverterchannelinfo": { "inverterchannelinfo": {
"String": "Ligne {num}", "String": "Ligne {num}",
"Phase": "Phase {num}", "Phase": "Phase {num}",
"General": "General",
"Property": "Propriété", "Property": "Propriété",
"Value": "Valeur", "Value": "Valeur",
"Unit": "Unité" "Unit": "Unité"

4
webapp/src/types/LiveDataStatus.ts
View File

@ -29,7 +29,9 @@ export interface Inverter {
limit_relative: number; limit_relative: number;
limit_absolute: number; limit_absolute: number;
events: number; events: number;
[key: number]: InverterStatistics; AC: InverterStatistics[];
DC: InverterStatistics[];
INV: InverterStatistics[];
} }
export interface Total { export interface Total {

11
webapp/src/views/HomeView.vue
View File

@ -92,11 +92,12 @@
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row flex-row-reverse flex-wrap-reverse align-items-end g-3"> <div class="row flex-row-reverse flex-wrap-reverse g-3">
<template v-for="channel in 5" :key="channel"> <template v-for="chanType in [{obj: inverter.INV, name: 'INV'}, {obj: inverter.AC, name: 'AC'}, {obj: inverter.DC, name: 'DC'}].reverse()">
<div v-if="inverter[channel - 1]" :class="`col order-${5 - channel}`"> <div v-for="channel in Object.keys(chanType.obj).sort().reverse().map(x=>+x)" :key="channel" class="col">
<InverterChannelInfo :channelData="inverter[channel - 1]" <InverterChannelInfo :channelData="chanType.obj[channel]"
:channelNumber="channel - 1" /> :channelType="chanType.name"
:channelNumber="channel" />
</div> </div>
</template> </template>
</div> </div>