From f7eb0b1921a3a27b1f24aa028865c57b6358c99c Mon Sep 17 00:00:00 2001
From: f-reiling <florian.reiling@gmail.com>
Date: Sun, 9 Sep 2018 21:54:21 +0200
Subject: [PATCH] Added decode for battery level and combined
 temperature/humidity (#265)

---
 ZgatewayBT.ino | 35 +++++++++++++++++++++++++++++++++++
 config_BT.h    |  1 +
 2 files changed, 36 insertions(+)

diff --git a/ZgatewayBT.ino b/ZgatewayBT.ino
index a43a9b2..6363fdb 100644
--- a/ZgatewayBT.ino
+++ b/ZgatewayBT.ino
@@ -363,6 +363,12 @@ boolean process_data(int offset, char * rest_data, char * mac_adress){
   char val[12];
   String mactopic(mac_adress);
   mactopic = subjectBTtoMQTT + mactopic;
+
+  // second value
+  char val2[12];
+  String mactopic2(mac_adress);
+  mactopic2 = subjectBTtoMQTT + mactopic2;
+  bool hasTopic2 = false;
   
  
   // Mi flora provides tem(perature), (earth) moi(sture), fer(tility) and lux (illuminance)
@@ -391,11 +397,40 @@ boolean process_data(int offset, char * rest_data, char * mac_adress){
           mactopic = mactopic + subjectBTtoMQTTmoi;
           dtostrf(value,0,0,val);
      break;
+     
+    case 'a' : // batteryLevel
+          mactopic = mactopic + subjectBTtoMQTTbatt;
+          dtostrf(value,0,0,val);
+     break;
+
+     case 'd' : // temp+hum
+          char tempAr[8];
+          // humidity
+          memcpy(tempAr, data, 4);
+          tempAr[4] = '\0';
+          value = strtol(tempAr, NULL, 16);
+          if (value > 65000) value = value - 65535;
+          dtostrf(value/10,3,1,val); // hum has to be divided by 10
+          trc(val);
+          // temperature
+          memcpy(tempAr, &data[4], 4);
+          tempAr[4] = '\0';
+          value = strtol(tempAr, NULL, 16);
+          if (value > 65000) value = value - 65535;
+          dtostrf(value/10,3,1,val2); // hum has to be divided by 10
+          trc(val2);
+          mactopic = mactopic + subjectBTtoMQTThum;
+          mactopic2 = mactopic2 + subjectBTtoMQTTtem;
+          hasTopic2 = true;
+     break;
     default:
     trc("can't read values");
     return false;
     }
     client.publish((char *)mactopic.c_str(),val);
+    if (hasTopic2){
+      client.publish((char *)mactopic2.c_str(),val2);
+    }
     trc(val);
     return true;
   }
diff --git a/config_BT.h b/config_BT.h
index 69126c2..32aff79 100644
--- a/config_BT.h
+++ b/config_BT.h
@@ -32,6 +32,7 @@
 #define subjectBTtoMQTTmoi "/moi"
 #define subjectBTtoMQTTfer "/fer"
 #define subjectBTtoMQTTlux "/lux"
+#define subjectBTtoMQTTbatt "/batt"
 #define subjectBTtoMQTTservicedata "/servicedata"
 #define TimeBtw_Read 55555 //define the time between 2 scans
 #define Scan_duration 10 //define the time for a scan