From 59b1fe866f9851e5f865b2ba25516409fba26985 Mon Sep 17 00:00:00 2001
From: geronet1 <geronet.bachmaier@gmail.com>
Date: Sun, 31 Mar 2024 21:20:35 +0200
Subject: [PATCH] mqtt->rssi nicht in /ch0/, mqtt->json kein
 YieldDay/YieldTotal einzeln

---
 .../htmlPreprocessorDefines.cpython-311.pyc      | Bin 0 -> 2235 bytes
 src/publisher/pubMqtt.h                          |   3 +++
 src/publisher/pubMqttIvData.h                    |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 scripts/__pycache__/htmlPreprocessorDefines.cpython-311.pyc

diff --git a/scripts/__pycache__/htmlPreprocessorDefines.cpython-311.pyc b/scripts/__pycache__/htmlPreprocessorDefines.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8b8e34409896b76a6d2fa979407131efe3b7e1f0
GIT binary patch
literal 2235
zcma)7-EY%Y6u;LWiIWtPEUh46Dk)t>%~pz_<D;!WRhw3;SQssPSZ9Q?*e#)Hl3qJN
zDn|+$4*^x08%0Wnkd~)zQ~#Dp3Ce?IDbl1p@s^2)4PLfmxA`io#<hHW?!CYBanC*H
z_~&ECoCwBWzc^OEXAt_soU{gYz`VHtObLld#BsE;|HUiVno}#3NIgX>v`7PGL<T4;
z;$_6MuTAlA6d!0YKVSjT@V=P`QbJ1Co`_Yn1*^NTw%1<ANHOsTV;8=AtqH>53D}{+
zTlUb>(ygV*AWs==io_C%!AOr|3XctXLtc|jZNYc*vy;NtvP5KIS&>#F31K!VN(muy
zKbaX5m9)hOa+JhUiY(k$HsW6qDMgY|NtTmjPFjs6B>8+QW3Un-NkTYK%EBuT0m-2T
z<H++`^x1fg3DlWDl?gN$?#cYq`JDB<0T7CI9mSHhLeYdU_lDv@`}n;F&eCfr%ZND3
zs%Q>r`0h&9rkFk)j0bJ~Dy7<XLGNDc3Q^XsI9fP_RC{ljMQYu=8qi4wR9mG>XGcb)
z56Lj=mOV17(iK|=*Wr4-m(K&v-r4PNy|^r=aw6q#Z>#q1*}8QiVq(}1Cd+Q;kM!Gi
zgx{ZmKjtmIH+n6q>?+l(0V5SsJdKF+5E4H`;K^@CdU81Gtq6YeVG$&5#n*9G<lgh@
zL*skYx!>2=6J_hnw959uDK)%3a}b3Am8n=wq~qH@2RR6t++EBdC8!J(ts{Jgm^W$I
zLgBeD=I_1!2gYkN?+qHJ1`cfvj)rb7hxp(|OqOGbwO}$OC4#aNQKStip$zdZgWXI^
zX~}ThjIAbbTP#H+!w!`yM&faUj!OxHF=tS-8!07Y&}))n(5bXyRj*--q(G<0I}AFO
zNC93}40|e~C=y8+c+;ShY3L;Dl9V!-IF!GE9~)Sb%{mIU1~D_*V59e?=sFn&-rSWX
zI0^Iw?%1}w#`)`<KR2U0`*O3o%blCkJ-#LyV2A!RNuFu+9p7Hm9#xoH-$=c0B##@e
z<N3{Jm$xr#GtVcVP3msn51Hqg^2wU}Ox=B^^4%-<Xw^NcpEy~1RCu(LDQ238_I{$D
z^#8=ZV1Kl~v}-f4S@sr{@@B>RQYomKs-F&;Y?=96_YRc&1%LVTns=z~9jYw7@}8}F
z&*~m;i7l|&rX_bri`P8Eb<c3sGpzeglqa-lZCXF|arySkiOQw&ls4Dab7^O=I9R#(
z$~#i^j_AJr(v`xMoomHwO@zJEjedVMFj?!Ls`pP-`=|8&fl{at+F2+rXt-rDvcnZQ
zjRR5bc5&js)al{!Rc-F=?{1%_<kh?iF)KL>&hkXf6RdlJRZsA(?mC`ZBxbmy?Jfrs
zvv*m2RRpHDud4WPK6d|HRHR}N?}F@})z?5AWvLzn1qiAa0l7?vw|HS(I5&D@5>i)%
ztX21unjigkW^Coc*fnA7-rZ068^SqZd}~~o7KVf|VeJ3m01~eA6fs+~m0LVb0w#aT
zB!fU?(^E*r{VZgn$;3l40!!vAUj(xMV;X+4_;fM1*l@ZvT3fCL=4;M{x^p2n+i-a_
zpBAm2`m*K<*InT%6SgAC+sH>CZBR*>c!06$#d5(?|0}XkmeqIM^hQ!l$EE9J6p&^K
s%L0%ljWO1dBWFEbOkd7=nhb?qP1Gh_0K1#0O|H`T7KX(BPik5J7Z*a)+W-In

literal 0
HcmV?d00001

diff --git a/src/publisher/pubMqtt.h b/src/publisher/pubMqtt.h
index 14445a2b..a9a91974 100644
--- a/src/publisher/pubMqtt.h
+++ b/src/publisher/pubMqtt.h
@@ -559,6 +559,9 @@ class PubMqtt {
         }
 
         void sendData(Inverter<> *iv, uint8_t curInfoCmd) {
+            if (cfg_mqtt->json)
+                return;
+
             record_t<> *rec = iv->getRecordStruct(curInfoCmd);
 
             uint32_t lastTs = iv->getLastTs(rec);
diff --git a/src/publisher/pubMqttIvData.h b/src/publisher/pubMqttIvData.h
index 6ac59cca..6c1e433d 100644
--- a/src/publisher/pubMqttIvData.h
+++ b/src/publisher/pubMqttIvData.h
@@ -115,7 +115,7 @@ class PubMqttIvData {
                     mPublish(mSubTopic.data(), mVal.data(), true, QOS_0);
 
                     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);
                         mPublish(mSubTopic.data(), mVal.data(), false, QOS_0);
                     }