From 5b83886065495cad9c5cf956c4b0c09ed39ed5c6 Mon Sep 17 00:00:00 2001
From: obrain17 <42682043+obrain17@users.noreply.github.com>
Date: Mon, 17 Jan 2022 17:33:05 +0100
Subject: [PATCH 1/2] Add files via upload

New file with:
Add
  "windowdur"
  "windowtemp"
  "day"
  "night"
  "offset"
to ResponseAppend_P

Assign
  cmdtype = 23
to "lock"
---
 tasmota/xdrv_85_BLE_EQ3_TRV.ino | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tasmota/xdrv_85_BLE_EQ3_TRV.ino b/tasmota/xdrv_85_BLE_EQ3_TRV.ino
index d69368268..43155838c 100644
--- a/tasmota/xdrv_85_BLE_EQ3_TRV.ino
+++ b/tasmota/xdrv_85_BLE_EQ3_TRV.ino
@@ -188,7 +188,8 @@ const char *cmdnames[] = {
   "day",
   "night",
   "reqprofile",
-  "setprofile"
+  "setprofile",
+  "lock",
 };
 
 const uint8_t *macprefixes[1] = {
@@ -206,7 +207,7 @@ struct eq3_device_tag{
   int8_t RSSI;
   uint64_t timeoutTime;
   uint8_t pairing;
-  uint8_t lastStatus[10]; // last received 02 stat
+  uint8_t lastStatus[16]; // last received 02 stat
   uint8_t lastStatusLen;
   uint32_t lastStatusTime; // in utc
   uint8_t nextDiscoveryData;
@@ -433,8 +434,8 @@ int EQ3ParseOp(BLE_ESP32::generic_sensor_t *op, bool success, int retries){
   if (success){
     if ((op->notifylen >= 6) && (op->dataNotify[0] == 2) && (op->dataNotify[1] == 1)){
       if (eq3){
-        memcpy(eq3->lastStatus, op->dataNotify, (op->notifylen <= 10)?op->notifylen:10);
-        eq3->lastStatusLen = (op->notifylen <= 10)?op->notifylen:10;
+        memcpy(eq3->lastStatus, op->dataNotify, (op->notifylen <= 10)?op->notifylen:16);
+        eq3->lastStatusLen = (op->notifylen <= 10)?op->notifylen:16;
         eq3->lastStatusTime = UtcTime();
       }
     }
@@ -504,6 +505,15 @@ int EQ3ParseOp(BLE_ESP32::generic_sensor_t *op, bool success, int retries){
       status[6],
       hh, mm
       );
+
+    if (statlen >= 15) {
+      ResponseAppend_P(PSTR(",\"windowdur\":%d"), ((int)status[11])*5);
+      ResponseAppend_P(PSTR(",\"windowtemp\":%2.1f"), ((float)status[10])/2);
+      ResponseAppend_P(PSTR(",\"day\":%2.1f"), ((float)status[12])/2);
+      ResponseAppend_P(PSTR(",\"night\":%2.1f"), ((float)status[13])/2);
+      ResponseAppend_P(PSTR(",\"offset\":%2.1f"), ((float)status[14]-7) /2);
+    }
+
   }
 
   if (success) {
@@ -1216,7 +1226,7 @@ int EQ3Send(const uint8_t* addr, const char *cmd, char* param, char* param2, int
     if (!strcmp(cmd, "unboost"))  { 
       cmdtype = 10;
       d[0] = 0x45; d[1] = 0x00; dlen = 2; break; }
-    if (!strcmp(cmd, "lock"))     { d[0] = 0x80; d[1] = 0x01; 
+    if (!strcmp(cmd, "lock"))     { cmdtype = 23; d[0] = 0x80; d[1] = 0x01; 
       if (param && (!strcmp(param, "off") || param[0] == '0')){
         d[1] = 0x00;
       }

From 0e4219150f7a201e5892e06a86ea859924236c62 Mon Sep 17 00:00:00 2001
From: obrain17 <42682043+obrain17@users.noreply.github.com>
Date: Fri, 21 Jan 2022 16:50:55 +0100
Subject: [PATCH 2/2] Change order of  window -temp- dur.

Change order of "windowtemp" and "windowdur"
Add new fields iinto json description
---
 tasmota/xdrv_85_BLE_EQ3_TRV.ino | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_85_BLE_EQ3_TRV.ino b/tasmota/xdrv_85_BLE_EQ3_TRV.ino
index 43155838c..d77d63e94 100644
--- a/tasmota/xdrv_85_BLE_EQ3_TRV.ino
+++ b/tasmota/xdrv_85_BLE_EQ3_TRV.ino
@@ -79,7 +79,12 @@ stat/EQ3/001A22092C9A = {
   "dst":"set",
   "window":"closed",
   "state":"unlocked",
-  "battery":"GOOD"
+  "battery":"GOOD",
+  "windowtemp": 12.0,
+  "windowdur": 15,
+  "day": 21.0,
+  "night": 17.0,
+  "offset": 0.0
 }
 
 holiday:
@@ -507,8 +512,8 @@ int EQ3ParseOp(BLE_ESP32::generic_sensor_t *op, bool success, int retries){
       );
 
     if (statlen >= 15) {
-      ResponseAppend_P(PSTR(",\"windowdur\":%d"), ((int)status[11])*5);
       ResponseAppend_P(PSTR(",\"windowtemp\":%2.1f"), ((float)status[10])/2);
+      ResponseAppend_P(PSTR(",\"windowdur\":%d"), ((int)status[11])*5);
       ResponseAppend_P(PSTR(",\"day\":%2.1f"), ((float)status[12])/2);
       ResponseAppend_P(PSTR(",\"night\":%2.1f"), ((float)status[13])/2);
       ResponseAppend_P(PSTR(",\"offset\":%2.1f"), ((float)status[14]-7) /2);