From 026bac121faaa3e94013d9d171aac9235c12bc41 Mon Sep 17 00:00:00 2001
From: jomjol <30766535+jomjol@users.noreply.github.com>
Date: Sat, 22 May 2021 11:37:46 +0200
Subject: [PATCH] Rolling 20210522-v2

---
 README.md                                     |   4 ++--
 .../jomjol_flowcontroll/ClassFlowMQTT.cpp     |   2 +-
 code/main/version.cpp                         |   4 ++--
 code/version.cpp                              |   4 ++--
 firmware/bootloader.bin                       | Bin 25264 -> 25264 bytes
 firmware/firmware.bin                         | Bin 1765728 -> 1765728 bytes
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7de089a8..cb1e5402 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,8 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
 
-##### Rolling - (2021-05-22)
-* Bug fix: calculation of flow rate
+##### Rolling - (2021-05-22 - v2)
+* Bug fix: calculation of flow rate, MQTT sending of rate
 
 Rolling - (2021-05-20)
 * Bug fix: mqtt retain message flag
diff --git a/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp b/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
index dfc5651d..1d0e4c1b 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
@@ -165,7 +165,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)
         MQTTPublish(topicRate, resultrate);
     }
 
-    if (topicRate.length() > 0) {
+    if (topicTimeStamp.length() > 0) {
         MQTTPublish(topicTimeStamp, resulttimestamp);
     }
 
diff --git a/code/main/version.cpp b/code/main/version.cpp
index 1d999e99..e0311dc2 100644
--- a/code/main/version.cpp
+++ b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="528a443";
+const char* GIT_REV="8a26b81";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-22 07:33";
\ No newline at end of file
+const char* BUILD_TIME="2021-05-22 11:34";
\ No newline at end of file
diff --git a/code/version.cpp b/code/version.cpp
index 1d999e99..e0311dc2 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="528a443";
+const char* GIT_REV="8a26b81";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-22 07:33";
\ No newline at end of file
+const char* BUILD_TIME="2021-05-22 11:34";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index 5b9480f6ed88f03eabf0c8795312974e5e10b676..dd9b63f43e5081e0e1d31e0bffc8df0813438405 100644
GIT binary patch
delta 61
zcmdmRlyL(P$q9298d@2fTA5l-W@M4rY$qJ(ulWAGwaz-F!mLEYwd@&}B4@^VU5I|H
Q;bG3Bb|*h`lKL+u0E_AtQ2+n{

delta 61
zcmdmRlyL(P$q929m|Gc}S{a#7W@M4rY$qJ(ulVqk#kTYMR`CZE6))uJKlb*SHTyu-
R8}%!Ndmk9tzFB=%6#%e58EgOm

diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index cbd5ee19ba30d3f592d9db9ed06ba4ea95a3af1b..c74baa92b87486ba9d0bd88a3a65e37639ac14a6 100644
GIT binary patch
delta 276
zcmaFxDEq;q><I-NhK5$gCRQdU6DuqfRz=2t-??<(sz1{YiKHxA_UB|TL)D~6?S~9p
z+2-;}a~@7Nv|<d{tiYJeAqv*UP?VpOlbM&!V3BBKmSkbrJcF}+1}7sBGXXI(5VHU=
zD-g2*F*^`*05M1n7Z7s;F%J;)0x=&D^KYNQDZt3gw8nY*93BA)LDlf+wTw?S&n!A9
zu~hSnk&^QCqdWrYj8CV(<q^<g7FgBLF3BqZ#DYL91jNEXECR%$Kr9Bt;y^3`#FE=3
sd8O2zDDL*I71)%@yxeNLjOGN6x?YJR%U-DIOh3pGU-UszQ1+(|0HdE<o&W#<

delta 294
zcmaFxDEq;q><I-N2If}ACRPUK6Duqf__Ft{+wjue;)va%*4R*YrA7PvW`z8DW0f~G
z<VMX#cAM#jR*V6g6&RB_L_yk&8H)0Aax(MM8BC2V5=~5un`dyg&){SPVkRJF24WT<
zW(8t4AZ7<*4j=}p;R0fAAm#yLULfWJV*c$jI0YD)b;OieHytWibWkGo=$TCi6V@_5
zJ#vPJXD=gA<Y`zmkgItH$Xu#<#z;wa`Vk%hb;hOB-|z@%F-fgzm*f=yVnHAl0%Bnx
z76D>WAQl5+aUhleV#)22yi#gU6dMEX<b~H{r!lO~RZU}j`L?%hXQ}yd-HOuRTmM$o
I*Rak60NE92CjbBd