topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

further improvements regarding wifi #611, fix connection if only one AP with same SSID is there 

fix endless loop in `zerovalues` #564
fix auto discover again #565
added total values to autodiscover #630
improved zero at midnight #625
pull/630/head
lumapu 2 years ago
parent
f8d4b4f5ae
commit
8457f46b0c
4 changed files with 66 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/CHANGES.md
  2. 2
      src/defines.h
  3. 78
      src/publisher/pubMqtt.h
  4. 19
      src/wifi/ahoywifi.cpp

7
src/CHANGES.md
View File

@ -2,6 +2,13 @@
(starting from release version `0.5.66`) (starting from release version `0.5.66`)
## 0.5.78
* further improvements regarding wifi #611, fix connection if only one AP with same SSID is there
* fix endless loop in `zerovalues` #564
* fix auto discover again #565
* added total values to autodiscover #630
* improved zero at midnight #625
## 0.5.77 ## 0.5.77
* fix wrong filename for automatically created manifest (online installer) #620 * fix wrong filename for automatically created manifest (online installer) #620
* added rotate display feature #619 * added rotate display feature #619

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 77 #define VERSION_PATCH 78
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

78
src/publisher/pubMqtt.h
View File

@ -133,6 +133,7 @@ class PubMqtt {
void tickerMidnight() { void tickerMidnight() {
Inverter<> *iv; Inverter<> *iv;
record_t<> *rec; record_t<> *rec;
char topic[7 + MQTT_TOPIC_LEN], val[4];
// set YieldDay to zero // set YieldDay to zero
for (uint8_t id = 0; id < mSys->getNumInverters(); id++) { for (uint8_t id = 0; id < mSys->getNumInverters(); id++) {
@ -142,10 +143,11 @@ class PubMqtt {
rec = iv->getRecordStruct(RealTimeRunData_Debug); rec = iv->getRecordStruct(RealTimeRunData_Debug);
uint8_t pos = iv->getPosByChFld(CH0, FLD_YD, rec); uint8_t pos = iv->getPosByChFld(CH0, FLD_YD, rec);
iv->setValue(pos, rec, 0.0f); iv->setValue(pos, rec, 0.0f);
}
mSendList.push(RealTimeRunData_Debug); snprintf(topic, 32 + MAX_NAME_LENGTH, "%s/ch0/%s", iv->config->name, fields[FLD_YD]);
sendIvData(); snprintf(val, 4, "0.0");
publish(topic, val, true);
}
} }
void payloadEventListener(uint8_t cmd) { void payloadEventListener(uint8_t cmd) {
@ -210,7 +212,10 @@ class PubMqtt {
DPRINTLN(DBG_VERBOSE, F("sendMqttDiscoveryConfig")); DPRINTLN(DBG_VERBOSE, F("sendMqttDiscoveryConfig"));
char topic[64], name[32], uniq_id[32]; char topic[64], name[32], uniq_id[32];
DynamicJsonDocument doc(512); DynamicJsonDocument doc(128);
uint8_t fldTotal[4] = {FLD_PAC, FLD_YT, FLD_YD, FLD_PDC};
for (uint8_t id = 0; id < mSys->getNumInverters(); id++) { for (uint8_t id = 0; id < mSys->getNumInverters(); id++) {
Inverter<> *iv = mSys->getInverterByPos(id); Inverter<> *iv = mSys->getInverterByPos(id);
if (NULL == iv) if (NULL == iv)
@ -218,41 +223,55 @@ class PubMqtt {
record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug);
doc.clear(); doc.clear();
doc[F("name")] = iv->config->name; doc[F("name")] = iv->config->name;
doc[F("ids")] = String(iv->config->serial.u64, HEX); doc[F("ids")] = String(iv->config->serial.u64, HEX);
doc[F("cu")] = F("http://") + String(WiFi.localIP().toString()); doc[F("cu")] = F("http://") + String(WiFi.localIP().toString());
doc[F("mf")] = F("Hoymiles"); doc[F("mf")] = F("Hoymiles");
doc[F("mdl")] = iv->config->name; doc[F("mdl")] = iv->config->name;
JsonObject deviceObj = doc.as<JsonObject>(); JsonObject deviceObj = doc.as<JsonObject>(); // deviceObj is only pointer!?
for (uint8_t i = 0; i < rec->length; i++) { for (uint8_t i = 0; i < (rec->length + 4); i++) {
if (rec->assign[i].ch == CH0) const char *devCls, *stateCls;
snprintf(name, 32, "%s %s", iv->config->name, iv->getFieldName(i, rec)); if(i < rec->length) {
else if (rec->assign[i].ch == CH0)
snprintf(name, 32, "%s CH%d %s", iv->config->name, rec->assign[i].ch, iv->getFieldName(i, rec)); snprintf(name, 32, "%s %s", iv->config->name, iv->getFieldName(i, rec));
snprintf(topic, 64, "/ch%d/%s", rec->assign[i].ch, iv->getFieldName(i, rec)); else
snprintf(uniq_id, 32, "ch%d_%s", rec->assign[i].ch, iv->getFieldName(i, rec)); snprintf(name, 32, "%s CH%d %s", iv->config->name, rec->assign[i].ch, iv->getFieldName(i, rec));
snprintf(topic, 64, "/ch%d/%s", rec->assign[i].ch, iv->getFieldName(i, rec));
const char *devCls = getFieldDeviceClass(rec->assign[i].fieldId); snprintf(uniq_id, 32, "ch%d_%s", rec->assign[i].ch, iv->getFieldName(i, rec));
const char *stateCls = getFieldStateClass(rec->assign[i].fieldId);
devCls = getFieldDeviceClass(rec->assign[i].fieldId);
doc.clear(); stateCls = getFieldStateClass(rec->assign[i].fieldId);
doc[F("name")] = name; }
doc[F("stat_t")] = String(mCfgMqtt->topic) + "/" + String(iv->config->name) + String(topic); else { // total values
doc[F("unit_of_meas")] = iv->getUnit(i, rec); snprintf(name, 32, "Total %s", fields[fldTotal[i-rec->length]]);
doc[F("uniq_id")] = String(iv->config->serial.u64, HEX) + "_" + uniq_id; snprintf(topic, 64, "/%s", fields[fldTotal[i-rec->length]]);
doc[F("dev")] = deviceObj; snprintf(uniq_id, 32, "total_%s", fields[fldTotal[i-rec->length]]);
doc[F("exp_aft")] = MQTT_INTERVAL + 5; // add 5 sec if connection is bad or ESP too slow @TODO: stimmt das wirklich als expire!? devCls = getFieldDeviceClass(fldTotal[i-rec->length]);
stateCls = getFieldStateClass(fldTotal[i-rec->length]);
}
DynamicJsonDocument doc2(512);
doc2[F("name")] = name;
doc2[F("stat_t")] = String(mCfgMqtt->topic) + "/" + String(iv->config->name) + String(topic);
doc2[F("unit_of_meas")] = iv->getUnit(((i < rec->length) ? i : (i - rec->length)), rec);
doc2[F("uniq_id")] = String(iv->config->serial.u64, HEX) + "_" + uniq_id;
doc2[F("dev")] = deviceObj;
doc2[F("exp_aft")] = MQTT_INTERVAL + 5; // add 5 sec if connection is bad or ESP too slow @TODO: stimmt das wirklich als expire!?
if (devCls != NULL) if (devCls != NULL)
doc[F("dev_cla")] = String(devCls); doc2[F("dev_cla")] = String(devCls);
if (stateCls != NULL) if (stateCls != NULL)
doc[F("stat_cla")] = String(stateCls); doc2[F("stat_cla")] = String(stateCls);
snprintf(topic, 64, "%s/sensor/%s/ch%d_%s/config", MQTT_DISCOVERY_PREFIX, iv->config->name, rec->assign[i].ch, iv->getFieldName(i, rec)); if(i < rec->length)
size_t size = measureJson(doc) + 1; snprintf(topic, 64, "%s/sensor/%s/ch%d_%s/config", MQTT_DISCOVERY_PREFIX, iv->config->name, rec->assign[i].ch, iv->getFieldName(i, rec));
else // total values
snprintf(topic, 64, "%s/sensor/%s/total_%s/config", MQTT_DISCOVERY_PREFIX, iv->config->name, fields[fldTotal[i-rec->length]]);
size_t size = measureJson(doc2) + 1;
char *buf = new char[size]; char *buf = new char[size];
memset(buf, 0, size); memset(buf, 0, size);
serializeJson(doc, buf, size); serializeJson(doc2, buf, size);
publish(topic, buf, true, false); publish(topic, buf, true, false);
delete[] buf; delete[] buf;
} }
@ -582,6 +601,7 @@ class PubMqtt {
case FLD_FW_BUILD_HOUR_MINUTE: case FLD_FW_BUILD_HOUR_MINUTE:
case FLD_HW_ID: case FLD_HW_ID:
case FLD_ACT_ACTIVE_PWR_LIMIT: case FLD_ACT_ACTIVE_PWR_LIMIT:
fld++;
continue; continue;
break; break;
} }

19
src/wifi/ahoywifi.cpp
View File

@ -98,7 +98,12 @@ void ahoywifi::tickWifiLoop() {
} }
mCnt++; mCnt++;
if(!mScanActive && mBSSIDList.empty()) { // start scanning APs with the given SSID uint8_t timeout = 10; // seconds
if (mStaConn == CONNECTED) // connected but no ip
timeout = 20;
if(!mScanActive && mBSSIDList.empty() && ((mCnt % timeout) == 0)) { // start scanning APs with the given SSID
DBGPRINT(F("scanning APs with SSID ")); DBGPRINT(F("scanning APs with SSID "));
DBGPRINTLN(String(mConfig->sys.stationSsid)); DBGPRINTLN(String(mConfig->sys.stationSsid));
mScanCnt = 0; mScanCnt = 0;
@ -110,20 +115,14 @@ void ahoywifi::tickWifiLoop() {
#endif #endif
return; return;
} }
uint8_t timeout = 10; // seconds
if (mStaConn == CONNECTED) // connected but no ip
timeout = 20;
DBGPRINT(F("reconnect in ")); DBGPRINT(F("reconnect in "));
DBGPRINT(String(timeout-mCnt)); DBGPRINT(String(timeout-mCnt));
DBGPRINTLN(F(" seconds")); DBGPRINTLN(F(" seconds"));
if(mScanActive) { if(mScanActive) {
getBSSIDs(); getBSSIDs();
if(!mScanActive) // scan completed //if(!mScanActive) // scan completed
if ((mCnt % timeout) < 8) // if ((mCnt % timeout) < 8)
mCnt = timeout - 2; // mCnt = timeout - 2;
} }
if((mCnt % timeout) == 0) { // try to reconnect after x sec without connection if((mCnt % timeout) == 0) { // try to reconnect after x sec without connection
if(mStaConn != CONNECTED) if(mStaConn != CONNECTED)

Write Preview
Loading…
Cancel
Save