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

started implementation of MI inverters (setup.html, own processing MiPayload.h)

Browse source
This commit is contained in:
lumapu 2023-02-06 23:37:05 +01:00
parent 67ff0209e8
commit 75539c5daf
17 changed files with 408 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGES.md
View file

@ -2,6 +2,9 @@
(starting from release version `0.5.66`) (starting from release version `0.5.66`)
## 0.5.81
* started implementation of MI inverters (setup.html, own processing `MiPayload.h`)
## 0.5.80 ## 0.5.80
* fixed communication #656 * fixed communication #656

65
src/app.cpp
View file

@ -13,7 +13,6 @@ app::app() : ah::Scheduler() {}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void app::setup() { void app::setup() {
mSys = NULL;
Serial.begin(115200); Serial.begin(115200);
while (!Serial) while (!Serial)
yield(); yield();
@ -26,9 +25,8 @@ void app::setup() {
mSettings.getPtr(mConfig); mSettings.getPtr(mConfig);
DPRINTLN(DBG_INFO, F("Settings valid: ") + String((mSettings.getValid()) ? F("true") : F("false"))); DPRINTLN(DBG_INFO, F("Settings valid: ") + String((mSettings.getValid()) ? F("true") : F("false")));
mSys = new HmSystemType(); mSys.enableDebug();
mSys->enableDebug(); mSys.setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
mSys->setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
mPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1)); mPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1));
#if defined(AP_ONLY) #if defined(AP_ONLY)
@ -42,34 +40,37 @@ void app::setup() {
everySec(std::bind(&ahoywifi::tickWifiLoop, &mWifi), "wifiL"); everySec(std::bind(&ahoywifi::tickWifiLoop, &mWifi), "wifiL");
#endif #endif
mSys->addInverters(&mConfig->inst); mSys.addInverters(&mConfig->inst);
mPayload.setup(this, mSys, &mStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp); mPayload.setup(this, &mSys, &mStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
mPayload.enableSerialDebug(mConfig->serial.debug); mPayload.enableSerialDebug(mConfig->serial.debug);
if(!mSys->Radio.isChipConnected()) mMiPayload.setup(this, &mSys, &mStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
mMiPayload.enableSerialDebug(mConfig->serial.debug);
if(!mSys.Radio.isChipConnected())
DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring")); DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring"));
// when WiFi is in client mode, then enable mqtt broker // when WiFi is in client mode, then enable mqtt broker
#if !defined(AP_ONLY) #if !defined(AP_ONLY)
mMqttEnabled = (mConfig->mqtt.broker[0] > 0); mMqttEnabled = (mConfig->mqtt.broker[0] > 0);
if (mMqttEnabled) { if (mMqttEnabled) {
mMqtt.setup(&mConfig->mqtt, mConfig->sys.deviceName, mVersion, mSys, &mTimestamp); mMqtt.setup(&mConfig->mqtt, mConfig->sys.deviceName, mVersion, &mSys, &mTimestamp);
mMqtt.setSubscriptionCb(std::bind(&app::mqttSubRxCb, this, std::placeholders::_1)); mMqtt.setSubscriptionCb(std::bind(&app::mqttSubRxCb, this, std::placeholders::_1));
mPayload.addAlarmListener(std::bind(&PubMqttType::alarmEventListener, &mMqtt, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); mPayload.addAlarmListener(std::bind(&PubMqttType::alarmEventListener, &mMqtt, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
} }
#endif #endif
setupLed(); setupLed();
mWeb.setup(this, mSys, mConfig); mWeb.setup(this, &mSys, mConfig);
mWeb.setProtection(strlen(mConfig->sys.adminPwd) != 0); mWeb.setProtection(strlen(mConfig->sys.adminPwd) != 0);
mApi.setup(this, mSys, mWeb.getWebSrvPtr(), mConfig); mApi.setup(this, &mSys, mWeb.getWebSrvPtr(), mConfig);
// Plugins // Plugins
if(mConfig->plugin.display.type != 0) if(mConfig->plugin.display.type != 0)
mMonoDisplay.setup(&mConfig->plugin.display, mSys, &mTimestamp, 0xff, mVersion); mMonoDisplay.setup(&mConfig->plugin.display, &mSys, &mTimestamp, 0xff, mVersion);
mPubSerial.setup(mConfig, mSys, &mTimestamp); mPubSerial.setup(mConfig, &mSys, &mTimestamp);
regularTickers(); regularTickers();
} }
@ -83,23 +84,31 @@ void app::loop(void) {
void app::loopStandard(void) { void app::loopStandard(void) {
ah::Scheduler::loop(); ah::Scheduler::loop();
if (mSys->Radio.loop()) { if (mSys.Radio.loop()) {
while (!mSys->Radio.mBufCtrl.empty()) { while (!mSys.Radio.mBufCtrl.empty()) {
packet_t *p = &mSys->Radio.mBufCtrl.front(); packet_t *p = &mSys.Radio.mBufCtrl.front();
if (mConfig->serial.debug) { if (mConfig->serial.debug) {
DPRINT(DBG_INFO, "RX " + String(p->len) + "B Ch" + String(p->ch) + " | "); DPRINT(DBG_INFO, "RX " + String(p->len) + "B Ch" + String(p->ch) + " | ");
mSys->Radio.dumpBuf(p->packet, p->len); mSys.Radio.dumpBuf(p->packet, p->len);
} }
mStat.frmCnt++; mStat.frmCnt++;
mPayload.add(p); Inverter<> *iv = mSys.findInverter(&p->packet[1]);
mSys->Radio.mBufCtrl.pop(); if(NULL == iv) {
if(IV_HM == iv->ivGen)
mPayload.add(iv, p);
else
mMiPayload.add(iv, p);
}
mSys.Radio.mBufCtrl.pop();
yield(); yield();
} }
mPayload.process(true); mPayload.process(true);
mMiPayload.process(true);
} }
mPayload.loop(); mPayload.loop();
mMiPayload.loop();
if(mMqttEnabled) if(mMqttEnabled)
mMqtt.loop(); mMqtt.loop();
@ -232,26 +241,30 @@ void app::tickMidnight(void) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void app::tickSend(void) { void app::tickSend(void) {
if(!mSys->Radio.isChipConnected()) { if(!mSys.Radio.isChipConnected()) {
DPRINTLN(DBG_WARN, "NRF24 not connected!"); DPRINTLN(DBG_WARN, "NRF24 not connected!");
return; return;
} }
if (mIVCommunicationOn) { if (mIVCommunicationOn) {
if (!mSys->Radio.mBufCtrl.empty()) { if (!mSys.Radio.mBufCtrl.empty()) {
if (mConfig->serial.debug) if (mConfig->serial.debug)
DPRINTLN(DBG_DEBUG, F("recbuf not empty! #") + String(mSys->Radio.mBufCtrl.size())); DPRINTLN(DBG_DEBUG, F("recbuf not empty! #") + String(mSys.Radio.mBufCtrl.size()));
} }
int8_t maxLoop = MAX_NUM_INVERTERS; int8_t maxLoop = MAX_NUM_INVERTERS;
Inverter<> *iv = mSys->getInverterByPos(mSendLastIvId); Inverter<> *iv = mSys.getInverterByPos(mSendLastIvId);
do { do {
mSendLastIvId = ((MAX_NUM_INVERTERS - 1) == mSendLastIvId) ? 0 : mSendLastIvId + 1; mSendLastIvId = ((MAX_NUM_INVERTERS - 1) == mSendLastIvId) ? 0 : mSendLastIvId + 1;
iv = mSys->getInverterByPos(mSendLastIvId); iv = mSys.getInverterByPos(mSendLastIvId);
} while ((NULL == iv) && ((maxLoop--) > 0)); } while ((NULL == iv) && ((maxLoop--) > 0));
if (NULL != iv) { if (NULL != iv) {
if(iv->config->enabled) if(iv->config->enabled) {
mPayload.ivSend(iv); if(iv->ivGen == IV_HM)
mPayload.ivSend(iv);
else
mMiPayload.ivSend(iv);
}
} }
} else { } else {
if (mConfig->serial.debug) if (mConfig->serial.debug)
@ -307,7 +320,7 @@ void app::setupLed(void) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void app::updateLed(void) { void app::updateLed(void) {
if(mConfig->led.led0 != 0xff) { if(mConfig->led.led0 != 0xff) {
Inverter<> *iv = mSys->getInverterByPos(0); Inverter<> *iv = mSys.getInverterByPos(0);
if (NULL != iv) { if (NULL != iv) {
if(iv->isProducing(mTimestamp)) if(iv->isProducing(mTimestamp))
digitalWrite(mConfig->led.led0, LOW); // LED on digitalWrite(mConfig->led.led0, LOW); // LED on

8
src/app.h
View file

@ -22,6 +22,7 @@
#include "hm/hmSystem.h" #include "hm/hmSystem.h"
#include "hm/hmPayload.h" #include "hm/hmPayload.h"
#include "hm/miPayload.h"
#include "wifi/ahoywifi.h" #include "wifi/ahoywifi.h"
#include "web/web.h" #include "web/web.h"
#include "web/RestApi.h" #include "web/RestApi.h"
@ -38,6 +39,7 @@
typedef HmSystem<MAX_NUM_INVERTERS> HmSystemType; typedef HmSystem<MAX_NUM_INVERTERS> HmSystemType;
typedef HmPayload<HmSystemType> PayloadType; typedef HmPayload<HmSystemType> PayloadType;
typedef MiPayload<HmSystemType> MiPayloadType;
typedef Web<HmSystemType> WebType; typedef Web<HmSystemType> WebType;
typedef RestApi<HmSystemType> RestApiType; typedef RestApi<HmSystemType> RestApiType;
typedef PubMqtt<HmSystemType> PubMqttType; typedef PubMqtt<HmSystemType> PubMqttType;
@ -61,8 +63,7 @@ class app : public IApp, public ah::Scheduler {
void regularTickers(void); void regularTickers(void);
void handleIntr(void) { void handleIntr(void) {
if(NULL != mSys) mSys.Radio.handleIntr();
mSys->Radio.handleIntr();
} }
uint32_t getUptime() { uint32_t getUptime() {
@ -187,7 +188,7 @@ class app : public IApp, public ah::Scheduler {
Scheduler::setTimestamp(newTime); Scheduler::setTimestamp(newTime);
} }
HmSystemType *mSys; HmSystemType mSys;
private: private:
typedef std::function<void()> innerLoopCb; typedef std::function<void()> innerLoopCb;
@ -246,6 +247,7 @@ class app : public IApp, public ah::Scheduler {
WebType mWeb; WebType mWeb;
RestApiType mApi; RestApiType mApi;
PayloadType mPayload; PayloadType mPayload;
MiPayloadType mMiPayload;
PubSerialType mPubSerial; PubSerialType mPubSerial;
char mVersion[12]; char mVersion[12];

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 5 #define VERSION_MINOR 5
#define VERSION_PATCH 80 #define VERSION_PATCH 81
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

3
src/hm/hmDefines.h
View file

@ -9,6 +9,9 @@
#include "../utils/dbg.h" #include "../utils/dbg.h"
#include <cstdint> #include <cstdint>
// inverter generations
enum {IV_HM = 0, IV_MI};
// units // units
enum {UNIT_V = 0, UNIT_A, UNIT_W, UNIT_WH, UNIT_KWH, UNIT_HZ, UNIT_C, UNIT_PCT, UNIT_VAR, UNIT_NONE}; enum {UNIT_V = 0, UNIT_A, UNIT_W, UNIT_WH, UNIT_KWH, UNIT_HZ, UNIT_C, UNIT_PCT, UNIT_VAR, UNIT_NONE};
const char* const units[] = {"V", "A", "W", "Wh", "kWh", "Hz", "°C", "%", "var", ""}; const char* const units[] = {"V", "A", "W", "Wh", "kWh", "Hz", "°C", "%", "var", ""};

2
src/hm/hmInverter.h
View file

@ -105,6 +105,7 @@ const calcFunc_t<T> calcFunctions[] = {
template <class REC_TYP> template <class REC_TYP>
class Inverter { class Inverter {
public: public:
uint8_t ivGen; // generation of inverter (HM / MI)
cfgIv_t *config; // stored settings cfgIv_t *config; // stored settings
uint8_t id; // unique id uint8_t id; // unique id
uint8_t type; // integer which refers to inverter type uint8_t type; // integer which refers to inverter type
@ -123,6 +124,7 @@ class Inverter {
bool isConnected; // shows if inverter was successfully identified (fw version and hardware info) bool isConnected; // shows if inverter was successfully identified (fw version and hardware info)
Inverter() { Inverter() {
ivGen = IV_HM;
powerLimit[0] = 0xffff; // 65535 W Limit -> unlimited powerLimit[0] = 0xffff; // 65535 W Limit -> unlimited
powerLimit[1] = AbsolutNonPersistent; // default power limit setting powerLimit[1] = AbsolutNonPersistent; // default power limit setting
actPowerLimit = 0xffff; // init feedback from inverter to -1 actPowerLimit = 0xffff; // init feedback from inverter to -1

17
src/hm/hmPayload.h
View file

@ -3,8 +3,8 @@
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/ // Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __PAYLOAD_H__ #ifndef __HM_PAYLOAD_H__
#define __PAYLOAD_H__ #define __HM_PAYLOAD_H__
#include "../utils/dbg.h" #include "../utils/dbg.h"
#include "../utils/crc.h" #include "../utils/crc.h"
@ -48,6 +48,7 @@ class HmPayload {
mSerialDebug = false; mSerialDebug = false;
mHighPrioIv = NULL; mHighPrioIv = NULL;
mCbAlarm = NULL; mCbAlarm = NULL;
mCbPayload = NULL;
} }
void enableSerialDebug(bool enable) { void enableSerialDebug(bool enable) {
@ -118,12 +119,7 @@ class HmPayload {
} }
} }
void add(packet_t *p) { void add(Inverter<> *iv, packet_t *p) {
Inverter<> *iv = mSys->findInverter(&p->packet[1]);
if(NULL == iv)
return;
if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command
mPayload[iv->id].txId = p->packet[0]; mPayload[iv->id].txId = p->packet[0];
DPRINTLN(DBG_DEBUG, F("Response from info request received")); DPRINTLN(DBG_DEBUG, F("Response from info request received"));
@ -289,7 +285,8 @@ class HmPayload {
private: private:
void notify(uint8_t val) { void notify(uint8_t val) {
(mCbPayload)(val); if(NULL != mCbPayload)
(mCbPayload)(val);
} }
void notify(uint16_t code, uint32_t start, uint32_t endTime) { void notify(uint16_t code, uint32_t start, uint32_t endTime) {
@ -352,4 +349,4 @@ class HmPayload {
payloadListenerType mCbPayload; payloadListenerType mCbPayload;
}; };
#endif /*__PAYLOAD_H_*/ #endif /*__HM_PAYLOAD_H__*/

8
src/hm/hmRadio.h
View file

@ -291,16 +291,16 @@ class HmRadio {
mTxBuf[len++] = (crc ) & 0xff; mTxBuf[len++] = (crc ) & 0xff;
} }
// crc over all // crc over all
mTxBuf[len++] = ah::crc8(mTxBuf, len); mTxBuf[len+1] = ah::crc8(mTxBuf, len);
if(mSerialDebug) { if(mSerialDebug) {
DPRINT(DBG_INFO, "TX " + String(len) + "B Ch" + String(mRfChLst[mTxChIdx]) + " | "); DPRINT(DBG_INFO, "TX " + String(len+1) + "B Ch" + String(mRfChLst[mTxChIdx]) + " | ");
dumpBuf(mTxBuf, len); dumpBuf(mTxBuf, len+1);
} }
mNrf24.setChannel(mRfChLst[mTxChIdx]); mNrf24.setChannel(mRfChLst[mTxChIdx]);
mNrf24.openWritingPipe(reinterpret_cast<uint8_t*>(&invId)); mNrf24.openWritingPipe(reinterpret_cast<uint8_t*>(&invId));
mNrf24.startWrite(mTxBuf, len, false); // false = request ACK response mNrf24.startWrite(mTxBuf, len+1, false); // false = request ACK response
// switch TX channel for next packet // switch TX channel for next packet
if(++mTxChIdx >= RF_CHANNELS) if(++mTxChIdx >= RF_CHANNELS)

39
src/hm/hmSystem.h
View file

@ -14,18 +14,15 @@ class HmSystem {
public: public:
HmRadio<> Radio; HmRadio<> Radio;
HmSystem() { HmSystem() {}
mNumInv = 0;
}
~HmSystem() {
// TODO: cleanup
}
void setup() { void setup() {
mNumInv = 0;
Radio.setup(); Radio.setup();
} }
void setup(uint8_t ampPwr, uint8_t irqPin, uint8_t cePin, uint8_t csPin) { void setup(uint8_t ampPwr, uint8_t irqPin, uint8_t cePin, uint8_t csPin) {
mNumInv = 0;
Radio.setup(ampPwr, irqPin, cePin, csPin); Radio.setup(ampPwr, irqPin, cePin, csPin);
} }
@ -34,8 +31,19 @@ class HmSystem {
for (uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) { for (uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) {
iv = addInverter(&config->iv[i]); iv = addInverter(&config->iv[i]);
if (0ULL != config->iv[i].serial.u64) { if (0ULL != config->iv[i].serial.u64) {
if (NULL != iv) if (NULL != iv) {
DPRINTLN(DBG_INFO, "added inverter " + String(iv->config->serial.u64, HEX)); DPRINT(DBG_INFO, "added inverter ");
if(iv->config->serial.b[5] == 0x11)
DBGPRINT("HM");
else {
DBGPRINT(((iv->config->serial.b[4] & 0x03) == 0x01) ? " (2nd Gen) " : " (3rd Gen) ");
}
DBGPRINTLN(String(iv->config->serial.u64, HEX));
if((iv->config->serial.b[5] == 0x10) && ((iv->config->serial.b[4] & 0x03) == 0x01))
DPRINTLN(DBG_WARN, F("MI Inverter are not fully supported now!!!"));
}
} }
} }
} }
@ -51,16 +59,25 @@ class HmSystem {
p->config = config; p->config = config;
DPRINT(DBG_VERBOSE, "SERIAL: " + String(p->config->serial.b[5], HEX)); DPRINT(DBG_VERBOSE, "SERIAL: " + String(p->config->serial.b[5], HEX));
DPRINTLN(DBG_VERBOSE, " " + String(p->config->serial.b[4], HEX)); DPRINTLN(DBG_VERBOSE, " " + String(p->config->serial.b[4], HEX));
if(p->config->serial.b[5] == 0x11) { if((p->config->serial.b[5] == 0x11) || (p->config->serial.b[5] == 0x10)) {
switch(p->config->serial.b[4]) { switch(p->config->serial.b[4]) {
case 0x22:
case 0x21: p->type = INV_TYPE_1CH; break; case 0x21: p->type = INV_TYPE_1CH; break;
case 0x42:
case 0x41: p->type = INV_TYPE_2CH; break; case 0x41: p->type = INV_TYPE_2CH; break;
case 0x62:
case 0x61: p->type = INV_TYPE_4CH; break; case 0x61: p->type = INV_TYPE_4CH; break;
default: default:
DPRINT(DBG_ERROR, F("unknown inverter type: 11")); DPRINTLN(DBG_ERROR, F("unknown inverter type"));
DPRINTLN(DBG_ERROR, String(p->config->serial.b[4], HEX));
break; break;
} }
if(p->config->serial.b[5] == 0x11)
p->ivGen = IV_HM;
else if((p->config->serial.b[4] & 0x03) == 0x02) // MI 3rd Gen -> same as HM
p->ivGen = IV_HM;
else // MI 2nd Gen
p->ivGen = IV_MI;
} }
else if(p->config->serial.u64 != 0ULL) else if(p->config->serial.u64 != 0ULL)
DPRINTLN(DBG_ERROR, F("inverter type can't be detected!")); DPRINTLN(DBG_ERROR, F("inverter type can't be detected!"));

298
src/hm/miPayload.h Normal file
View file

@ -0,0 +1,298 @@
//-----------------------------------------------------------------------------
// 2023 Ahoy, https://ahoydtu.de
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
//-----------------------------------------------------------------------------
#ifndef __MI_PAYLOAD_H__
#define __MI_PAYLOAD_H__
#include "../utils/dbg.h"
#include "../utils/crc.h"
#include "../config/config.h"
#include <Arduino.h>
typedef struct {
uint32_t ts;
bool requested;
uint8_t txCmd;
uint8_t len[MAX_PAYLOAD_ENTRIES];
/*
uint8_t txId;
uint8_t invId;
uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE];
bool complete;
uint8_t maxPackId;
bool lastFound;
uint8_t retransmits;
bool gotFragment;*/
} miPayload_t;
typedef std::function<void(uint8_t)> miPayloadListenerType;
template<class HMSYSTEM>
class MiPayload {
public:
MiPayload() {}
void setup(IApp *app, HMSYSTEM *sys, statistics_t *stat, uint8_t maxRetransmits, uint32_t *timestamp) {
mApp = app;
mSys = sys;
mStat = stat;
mMaxRetrans = maxRetransmits;
mTimestamp = timestamp;
for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) {
reset(i);
}
mSerialDebug = false;
mCbMiPayload = NULL;
}
void enableSerialDebug(bool enable) {
mSerialDebug = enable;
}
void addPayloadListener(miPayloadListenerType cb) {
mCbMiPayload = cb;
}
void loop() {}
void ivSend(Inverter<> *iv) {
reset(iv->id);
mPayload[iv->id].requested = true;
yield();
if (mSerialDebug)
DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") Requesting Inv SN ") + String(iv->config->serial.u64, HEX));
uint8_t cmd = 0x09; //iv->getQueuedCmd();
DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") sendTimePacket"));
mSys->Radio.sendTimePacket(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false);
mPayload[iv->id].txCmd = cmd;
}
void add(Inverter<> *iv, packet_t *p) {
DPRINTLN(DBG_INFO, F("MI got data [0]=") + String(p->packet[0], HEX));
/*if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command
mPayload[iv->id].txId = p->packet[0];
DPRINTLN(DBG_DEBUG, F("Response from info request received"));
uint8_t *pid = &p->packet[9];
if (*pid == 0x00) {
DPRINT(DBG_DEBUG, F("fragment number zero received and ignored"));
} else {
DPRINTLN(DBG_DEBUG, "PID: 0x" + String(*pid, HEX));
if ((*pid & 0x7F) < MAX_PAYLOAD_ENTRIES) {
memcpy(mPayload[iv->id].data[(*pid & 0x7F) - 1], &p->packet[10], p->len - 11);
mPayload[iv->id].len[(*pid & 0x7F) - 1] = p->len - 11;
mPayload[iv->id].gotFragment = true;
}
if ((*pid & ALL_FRAMES) == ALL_FRAMES) {
// Last packet
if (((*pid & 0x7f) > mPayload[iv->id].maxPackId) || (MAX_PAYLOAD_ENTRIES == mPayload[iv->id].maxPackId)) {
mPayload[iv->id].maxPackId = (*pid & 0x7f);
if (*pid > 0x81)
mPayload[iv->id].lastFound = true;
}
}
}
} else if (p->packet[0] == (TX_REQ_DEVCONTROL + ALL_FRAMES)) { // response from dev control command
DPRINTLN(DBG_DEBUG, F("Response from devcontrol request received"));
mPayload[iv->id].txId = p->packet[0];
iv->clearDevControlRequest();
if ((p->packet[12] == ActivePowerContr) && (p->packet[13] == 0x00)) {
String msg = "";
if((p->packet[10] == 0x00) && (p->packet[11] == 0x00))
mApp->setMqttPowerLimitAck(iv);
else
msg = "NOT ";
DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(" has ") + msg + F("accepted power limit set point ") + String(iv->powerLimit[0]) + F(" with PowerLimitControl ") + String(iv->powerLimit[1]));
iv->clearCmdQueue();
iv->enqueCommand<InfoCommand>(SystemConfigPara); // read back power limit
}
iv->devControlCmd = Init;
}*/
}
void process(bool retransmit) {
for (uint8_t id = 0; id < mSys->getNumInverters(); id++) {
Inverter<> *iv = mSys->getInverterByPos(id);
if (NULL == iv)
continue; // skip to next inverter
/*if ((mPayload[iv->id].txId != (TX_REQ_INFO + ALL_FRAMES)) && (0 != mPayload[iv->id].txId)) {
// no processing needed if txId is not 0x95
mPayload[iv->id].complete = true;
continue; // skip to next inverter
}
if (!mPayload[iv->id].complete) {
bool crcPass, pyldComplete;
crcPass = build(iv->id, &pyldComplete);
if (!crcPass && !pyldComplete) { // payload not complete
if ((mPayload[iv->id].requested) && (retransmit)) {
if (iv->devControlCmd == Restart || iv->devControlCmd == CleanState_LockAndAlarm) {
// This is required to prevent retransmissions without answer.
DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm..."));
mPayload[iv->id].retransmits = mMaxRetrans;
} else if(iv->devControlCmd == ActivePowerContr) {
DPRINTLN(DBG_INFO, F("retransmit power limit"));
mSys->Radio.sendControlPacket(iv->radioId.u64, iv->devControlCmd, iv->powerLimit, true);
} else {
if (mPayload[iv->id].retransmits < mMaxRetrans) {
mPayload[iv->id].retransmits++;
if(false == mPayload[iv->id].gotFragment) {
DPRINTLN(DBG_WARN, F("(#") + String(iv->id) + F(") nothing received"));
mPayload[iv->id].retransmits = mMaxRetrans;
} else {
for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId - 1); i++) {
if (mPayload[iv->id].len[i] == 0) {
DPRINTLN(DBG_WARN, F("Frame ") + String(i + 1) + F(" missing: Request Retransmit"));
mSys->Radio.sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME + i), true);
break; // only request retransmit one frame per loop
}
yield();
}
}
}
}
}
} else if(!crcPass && pyldComplete) { // crc error on complete Payload
if (mPayload[iv->id].retransmits < mMaxRetrans) {
mPayload[iv->id].retransmits++;
DPRINTLN(DBG_WARN, F("CRC Error: Request Complete Retransmit"));
mPayload[iv->id].txCmd = iv->getQueuedCmd();
DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") sendTimePacket 0x") + String(mPayload[iv->id].txCmd, HEX));
mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true);
}
} else { // payload complete
DPRINTLN(DBG_INFO, F("procPyld: cmd: 0x") + String(mPayload[iv->id].txCmd, HEX));
DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + String(mPayload[iv->id].txId, HEX));
DPRINTLN(DBG_DEBUG, F("procPyld: max: ") + String(mPayload[iv->id].maxPackId));
record_t<> *rec = iv->getRecordStruct(mPayload[iv->id].txCmd); // choose the parser
mPayload[iv->id].complete = true;
uint8_t payload[128];
uint8_t payloadLen = 0;
memset(payload, 0, 128);
for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) {
memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i]));
payloadLen += (mPayload[iv->id].len[i]);
yield();
}
payloadLen -= 2;
if (mSerialDebug) {
DPRINT(DBG_INFO, F("Payload (") + String(payloadLen) + "): ");
mSys->Radio.dumpBuf(payload, payloadLen);
}
if (NULL == rec) {
DPRINTLN(DBG_ERROR, F("record is NULL!"));
} else if ((rec->pyldLen == payloadLen) || (0 == rec->pyldLen)) {
if (mPayload[iv->id].txId == (TX_REQ_INFO + ALL_FRAMES))
mStat->rxSuccess++;
rec->ts = mPayload[iv->id].ts;
for (uint8_t i = 0; i < rec->length; i++) {
iv->addValue(i, payload, rec);
yield();
}
iv->doCalculations();
notify(mPayload[iv->id].txCmd);
if(AlarmData == mPayload[iv->id].txCmd) {
uint8_t i = 0;
uint16_t code;
uint32_t start, end;
while(1) {
code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end);
if(0 == code)
break;
if (NULL != mCbAlarm)
(mCbAlarm)(code, start, end);
yield();
}
}
} else {
DPRINTLN(DBG_ERROR, F("plausibility check failed, expected ") + String(rec->pyldLen) + F(" bytes"));
mStat->rxFail++;
}
iv->setQueuedCmdFinished();
}
}*/
yield();
}
}
private:
void notify(uint8_t val) {
if(NULL != mCbMiPayload)
(mCbMiPayload)(val);
}
bool build(uint8_t id, bool *complete) {
/*DPRINTLN(DBG_VERBOSE, F("build"));
uint16_t crc = 0xffff, crcRcv = 0x0000;
if (mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES)
mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES;
// check if all fragments are there
*complete = true;
for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) {
if(mPayload[id].len[i] == 0)
*complete = false;
}
if(!*complete)
return false;
for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) {
if (mPayload[id].len[i] > 0) {
if (i == (mPayload[id].maxPackId - 1)) {
crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc);
crcRcv = (mPayload[id].data[i][mPayload[id].len[i] - 2] << 8) | (mPayload[id].data[i][mPayload[id].len[i] - 1]);
} else
crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i], crc);
}
yield();
}
return (crc == crcRcv) ? true : false;*/
return true;
}
void reset(uint8_t id) {
DPRINTLN(DBG_INFO, "resetPayload: id: " + String(id));
memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES);
/*
mPayload[id].gotFragment = false;
mPayload[id].retransmits = 0;
mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES;
mPayload[id].lastFound = false;
mPayload[id].complete = false;*/
mPayload[id].txCmd = 0;
mPayload[id].requested = false;
mPayload[id].ts = *mTimestamp;
}
IApp *mApp;
HMSYSTEM *mSys;
statistics_t *mStat;
uint8_t mMaxRetrans;
uint32_t *mTimestamp;
miPayload_t mPayload[MAX_NUM_INVERTERS];
bool mSerialDebug;
payloadListenerType mCbMiPayload;
};
#endif /*__MI_PAYLOAD_H__*/

2
src/web/html/index.html
View file

@ -62,7 +62,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>

2
src/web/html/login.html
View file

@ -20,7 +20,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>

2
src/web/html/serial.html
View file

@ -55,7 +55,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>

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

@ -224,7 +224,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>
@ -395,10 +395,17 @@
setHide("lbl"+id+"ModPwr", true); setHide("lbl"+id+"ModPwr", true);
setHide("lbl"+id+"ModName", true); setHide("lbl"+id+"ModName", true);
if(serial === "1161") max = 4; if(serial.charAt(0) == 1) {
else if(serial === "1141") max = 2; if((serial.charAt(1) == 0) || (serial.charAt(1) == 1)) {
else if(serial === "1121") max = 1; if((serial.charAt(3) == 1) || (serial.charAt(3) == 2)) {
else max = 0; switch(serial.charAt(2)) {
case "2": max = 1; break;
case "4": max = 2; break;
case "6": max = 4; break;
}
}
}
}
if(max != 0) { if(max != 0) {
for(var i=0;i<max;i++) { for(var i=0;i<max;i++) {

2
src/web/html/system.html
View file

@ -28,7 +28,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>

2
src/web/html/update.html
View file

@ -27,7 +27,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>

2
src/web/html/visualization.html
View file

@ -26,7 +26,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div class="left"> <div class="left">
<a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2022</a> <a href="https://ahoydtu.de" target="_blank">AhoyDTU &copy 2023</a>
<ul> <ul>
<li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li> <li><a href="https://discord.gg/WzhxEY62mB" target="_blank">Discord</a></li>
<li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li> <li><a href="https://github.com/lumapu/ahoy" target="_blank">Github</a></li>