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

mqtt->rssi nicht in /ch0/, mqtt->json kein YieldDay/YieldTotal einzeln

Browse source
This commit is contained in:
geronet1 2024-03-31 21:20:35 +02:00
parent 5294ae3009
commit 59b1fe866f
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/__pycache__/htmlPreprocessorDefines.cpython-311.pyc Normal file
View file

Binary file not shown.

3
src/publisher/pubMqtt.h
View file

@ -559,6 +559,9 @@ class PubMqtt {
} }
void sendData(Inverter<> *iv, uint8_t curInfoCmd) { void sendData(Inverter<> *iv, uint8_t curInfoCmd) {
if (cfg_mqtt->json)
return;
record_t<> *rec = iv->getRecordStruct(curInfoCmd); record_t<> *rec = iv->getRecordStruct(curInfoCmd);
uint32_t lastTs = iv->getLastTs(rec); uint32_t lastTs = iv->getLastTs(rec);

2
src/publisher/pubMqttIvData.h
View file

@ -115,7 +115,7 @@ class PubMqttIvData {
mPublish(mSubTopic.data(), mVal.data(), true, QOS_0); mPublish(mSubTopic.data(), mVal.data(), true, QOS_0);
if((mIv->ivGen == IV_HMS) || (mIv->ivGen == IV_HMT)) { if((mIv->ivGen == IV_HMS) || (mIv->ivGen == IV_HMT)) {
snprintf(mSubTopic.data(), mSubTopic.size(), "%s/ch0/rssi", mIv->config->name); snprintf(mSubTopic.data(), mSubTopic.size(), "%s/rssi", mIv->config->name);
snprintf(mVal.data(), mVal.size(), "%d", mIv->rssi); snprintf(mVal.data(), mVal.size(), "%d", mIv->rssi);
mPublish(mSubTopic.data(), mVal.data(), false, QOS_0); mPublish(mSubTopic.data(), mVal.data(), false, QOS_0);
} }