3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-05 12:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.970004-zero

Browse source
This commit is contained in:
Patrick Amrhein 2024-03-26 09:35:05 +01:00
parent f8cb7272b4
commit 0dae65bbd4
6 changed files with 1290 additions and 1269 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/app.cpp
View file

@ -93,6 +93,11 @@ void app::setup() {
mZeroExport.resetWaitRebootAck(iv); mZeroExport.resetWaitRebootAck(iv);
}); });
#endif /*PLUGIN_ZEROEXPORT*/ #endif /*PLUGIN_ZEROEXPORT*/
#if defined(PLUGIN_ZEROEXPORT)
mCommunication.addNewDataListener([this] (Inverter<> *iv) {
mZeroExport.newDataAvailable(iv);
});
#endif /*PLUGIN_ZEROEXPORT*/
mSys.setup(&mTimestamp, &mConfig->inst, this); mSys.setup(&mTimestamp, &mConfig->inst, this);
for (uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) { for (uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) {

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 970003 #define VERSION_PATCH 970004
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

7
src/hm/Communication.h
View file

@ -19,6 +19,7 @@ typedef std::function<void(uint8_t, Inverter<> *)> payloadListenerType;
typedef std::function<void(Inverter<> *)> powerLimitAckListenerType; typedef std::function<void(Inverter<> *)> powerLimitAckListenerType;
typedef std::function<void(Inverter<> *)> powerPowerAckListenerType; typedef std::function<void(Inverter<> *)> powerPowerAckListenerType;
typedef std::function<void(Inverter<> *)> powerRebootAckListenerType; typedef std::function<void(Inverter<> *)> powerRebootAckListenerType;
typedef std::function<void(Inverter<> *)> newDataListenerType;
typedef std::function<void(Inverter<> *)> alarmListenerType; typedef std::function<void(Inverter<> *)> alarmListenerType;
class Communication : public CommQueue<> { class Communication : public CommQueue<> {
@ -51,6 +52,10 @@ class Communication : public CommQueue<> {
mCbPwrRebootAck = cb; mCbPwrRebootAck = cb;
} }
void addNewDataListener(newDataListenerType cb) {
mCbNewData = cb;
}
void addAlarmListener(alarmListenerType cb) { void addAlarmListener(alarmListenerType cb) {
mCbAlarm = cb; mCbAlarm = cb;
} }
@ -601,6 +606,7 @@ class Communication : public CommQueue<> {
for (uint8_t i = 0; i < rec->length; i++) { for (uint8_t i = 0; i < rec->length; i++) {
q->iv->addValue(i, mPayload.data(), rec); q->iv->addValue(i, mPayload.data(), rec);
} }
(mCbNewData)(q->iv);
rec->mqttSentStatus = MqttSentStatus::NEW_DATA; rec->mqttSentStatus = MqttSentStatus::NEW_DATA;
q->iv->rssi = rssi; q->iv->rssi = rssi;
@ -1057,6 +1063,7 @@ class Communication : public CommQueue<> {
powerLimitAckListenerType mCbPwrAck = NULL; powerLimitAckListenerType mCbPwrAck = NULL;
powerPowerAckListenerType mCbPwrPowerAck = NULL; powerPowerAckListenerType mCbPwrPowerAck = NULL;
powerRebootAckListenerType mCbPwrRebootAck = NULL; powerRebootAckListenerType mCbPwrRebootAck = NULL;
newDataListenerType mCbNewData = NULL;
alarmListenerType mCbAlarm = NULL; alarmListenerType mCbAlarm = NULL;
Heuristic mHeu; Heuristic mHeu;
uint32_t mLastEmptyQueueMillis = 0; uint32_t mLastEmptyQueueMillis = 0;

2536
src/plugins/zeroExport/zeroExport.h
View file

File diff suppressed because it is too large Load diff

3
src/web/html/setup.html
View file

@ -1363,7 +1363,8 @@
divRow("{#ZE_GROUP_TAB_POWERMETER_TYPE}", divRow("{#ZE_GROUP_TAB_POWERMETER_TYPE}",
ml("select", {name: "pm_type", class: "text", id: "pm_type"}, null), ml("select", {name: "pm_type", class: "text", id: "pm_type"}, null),
), ),
divRow("{#ZE_GROUP_TAB_POWERMETER_URL}", [ // TODO: URL -> IP
divRow("{#ZE_GROUP_TAB_POWERMETER_IP}", [
ml("input", {name: "pm_url", class: "text", type: "text", value: obj.pm_url, maxlength: "100"}, null), ml("input", {name: "pm_url", class: "text", type: "text", value: obj.pm_url, maxlength: "100"}, null),
]), ]),
divRow("{#ZE_GROUP_TAB_POWERMETER_JSONPATH}", [ divRow("{#ZE_GROUP_TAB_POWERMETER_JSONPATH}", [

6
src/web/lang.json
View file

@ -854,9 +854,9 @@
"de": "Typ:" "de": "Typ:"
}, },
{ {
"token": "ZE_GROUP_TAB_POWERMETER_URL", "token": "ZE_GROUP_TAB_POWERMETER_IP",
"en": "Url:", "en": "IP:",
"de": "Url:" "de": "IP:"
}, },
{ {
"token": "ZE_GROUP_TAB_POWERMETER_JSONPATH", "token": "ZE_GROUP_TAB_POWERMETER_JSONPATH",