From f4bfdb8f9d0ee16f1dff7708a1e4a43dd45769ec Mon Sep 17 00:00:00 2001
From: pvvx <pvvx@mail.ru>
Date: Tue, 6 Feb 2024 03:53:20 +0300
Subject: [PATCH] update v1.1

---
 README.md                             |   2 +-
 bin/BTH01_v11.bin                     | Bin 49012 -> 49012 bytes
 bin/TH05_v11.bin                      | Bin 50260 -> 50260 bytes
 bin/THB2_v11.bin                      | Bin 48964 -> 48964 bytes
 bthome_phy6222/bin/BTH01_v11.bin      | Bin 49012 -> 49012 bytes
 bthome_phy6222/bin/TH05_v11.bin       | Bin 50260 -> 50260 bytes
 bthome_phy6222/bin/THB2_v11.bin       | Bin 48964 -> 48964 bytes
 bthome_phy6222/source/sensor.h        |   2 +-
 bthome_phy6222/source/trigger.c       |   2 +-
 bthome_phy6222/web/PHY62x2BTHome.html |  25 +++++++++++++++----------
 10 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index eb32563..581bb6c 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Custom firmware for Tuya [THB2](https://pvvx.github.io/THB2), [BTH01](https://pv
 | N | Описание |
 |---|--- |
 | 1.0 | Первая релизная версия |
-| 1.1 | Добавлен триггер - вывод TX2 срабатывающий по установленным значениям температуры и/или влажности с гистерезисами. Передача состояния вывода RX2. Для термометров с экраном добавлен показ смайлика с "комфортом". |
+| 1.1 | Добавлен триггер - вывод TX2 срабатывающий по установленным значениям температуры и/или влажности с гистерезисами. Передача состояния вывода RX2 при connect. Для термометров с экраном добавлен показ смайлика с "комфортом". |
 
 
 ## Прошивка:
diff --git a/bin/BTH01_v11.bin b/bin/BTH01_v11.bin
index 19a11e01e73403854149cf2e83f9ec407f720d49..60089d2aca3c792d26a6e4b1419c81a5ce5ae7cc 100644
GIT binary patch
delta 201
zcmezJkLk-lrU^1EkNv&aHY!{b5>Ksq%cgKOT8crF?N+lB+bsdb<f?Ax<jK6k;`OOj
zYuU`fazeM7orG>FK;(*eA4E$qXtLgFc6xeOKsm9B+xhPEW~ZOG?>%pJdUGeaicukw
zlb3-*jn&~T!)9k~=j0;cDn<upC*})`49QiuIc7TZDzJXg`^Tfe`oa1iqY^ViLY1(?
n1ZN57grb7IFtcw7-c<k_ehh5*<>v?7Hg6H$vzkS8Z%Zry$EHlQ

delta 201
zcmezJkLk-lrU^1EQ+xNF-KcO)NPKD4TQ-HO(NYYWY`2=7*lr0ZF0Sf!UObssSiF8|
z)mk<Su$<7XW+$Or3J|#>-UrbV44SOBnw_5B6;NJS#qE6ed9%~c+xMO~JH5HHxQbCB
zl9QK#LygtpEyHGKZRf>B!c~k8%udV~7#S8<-R79-%&WlqLGK@r0_z9se~e1Z3=67+
p9VR$SI4>wlC@R<sHC@o@=3ND_@khbNUwXcIi}0S+EP9i9!vX)OP+I^1

diff --git a/bin/TH05_v11.bin b/bin/TH05_v11.bin
index 9e34e7413a7de64ccc2d4a7311cd5a0aaad1cc7f..3827e2344959543e66cdf5a7a67f2504f6c743ab 100644
GIT binary patch
delta 236
zcmcc8!F;8Id4dc}^Cq568x_6?=_XXoW?13O?3`T0qkJKbL4)%GhiY(qYSmjdg{#t1
z3>s{=x}Df=2`DC4bvq|db`%z`Ppw+ZW_~qVia}H8R<o1PEd_{N5$^+O2?h<;Tis4i
z?+Pd<R&hJuectW#^Y*>x%}#IbBv&yiL~`;naHz35yk*$ztnHj!BwWMj!0g0)fsrA(
z>NdwrXI=%i4=F!*6xco#{$NyMW=N<Kc9`HS;ha!Zus2$QL6h}Xv(qiXy9!{#k3Da8
k`g!~E^8;?1UkD$NWK5pCQrDR=dGlM{<Y_EZt_wZ|0BW;XqW}N^

delta 236
zcmcc8!F;8Id4dd!_m_XiH!6G)(p^wBn_-1Bv-9F29_0&h3>uslI8=k<msY)HQ@AQE
z#h}4<tJ{g~mVn~os&41SlO2V{>z7uoWwW>%EybWIbgS7(=#~ORu88-6v;>0&>#c65
zr*{RE7gljQ-+kWg^z-(;=gm%U?kuiiREXr{W#CX_b$H9L*;(6paglHhqXV-O^94qR
z#Z|XCW;*jKuzg7R!K1+Tq3{Qz5;MbsDq)8S&JxZGiV}(n_C`xEXtLgF7IeCKR{?DN
l(dW%hKW|@pzWIgl0ZGQilUM3GGcMlzRyTPXi@>|-I{{BpU8?{9

diff --git a/bin/THB2_v11.bin b/bin/THB2_v11.bin
index ec4eac3c63f0aa07fc2a248362cb42ef91ab7ae2..38cd1df924e35f33f122a72b9710b304c676d517 100644
GIT binary patch
delta 201
zcmX@|kLk!irU^1EN3)w9HY)5A5>Ksq%cgKOT8crF?N+lB+bsdb<f?Ax<jEg}#OqV5
z*0Py{<%DiEI|<!VfXEf`K8TiJ&}6;U?DX`mfO29LxAWcS%}zgW-+SKd^yW@-6{A8V
zCocns8mq%whRx2}&dEi>Rg4bIPRth=8Ir4RbIf#RRbc&~@{dh{^@HI*MkQv3geqZ&
n3C<GE2}K2aVP@YFysH2<{218q%g+zEZJr^#Vl|7Hb;T6`K5|VY

delta 201
zcmX@|kLk!irU^1E+z&44ZdBMMB)+ujEt|sCXekCwwp-0kY_|jy7gu#VFP{8SNW6Y&
z)mk<Su$<7XW+$Or3J|#>-UrbV44SOBnw_5B6;NJS#qE6ed9%~c+xMO~JH5HHxQbCB
zl9QK#LygtpEyHGKZRf>B!c~k8%udV~7#S8<-R79-%&NfpLFFHt0_z9Ee~e1Z3=67+
q9VR$SI4>wlC@R<sHC@o@=3ND_@khbNUwXcIhVY8jEUN{A4*&p^iBMJm

diff --git a/bthome_phy6222/bin/BTH01_v11.bin b/bthome_phy6222/bin/BTH01_v11.bin
index 19a11e01e73403854149cf2e83f9ec407f720d49..60089d2aca3c792d26a6e4b1419c81a5ce5ae7cc 100644
GIT binary patch
delta 201
zcmezJkLk-lrU^1EkNv&aHY!{b5>Ksq%cgKOT8crF?N+lB+bsdb<f?Ax<jK6k;`OOj
zYuU`fazeM7orG>FK;(*eA4E$qXtLgFc6xeOKsm9B+xhPEW~ZOG?>%pJdUGeaicukw
zlb3-*jn&~T!)9k~=j0;cDn<upC*})`49QiuIc7TZDzJXg`^Tfe`oa1iqY^ViLY1(?
n1ZN57grb7IFtcw7-c<k_ehh5*<>v?7Hg6H$vzkS8Z%Zry$EHlQ

delta 201
zcmezJkLk-lrU^1EQ+xNF-KcO)NPKD4TQ-HO(NYYWY`2=7*lr0ZF0Sf!UObssSiF8|
z)mk<Su$<7XW+$Or3J|#>-UrbV44SOBnw_5B6;NJS#qE6ed9%~c+xMO~JH5HHxQbCB
zl9QK#LygtpEyHGKZRf>B!c~k8%udV~7#S8<-R79-%&WlqLGK@r0_z9se~e1Z3=67+
p9VR$SI4>wlC@R<sHC@o@=3ND_@khbNUwXcIi}0S+EP9i9!vX)OP+I^1

diff --git a/bthome_phy6222/bin/TH05_v11.bin b/bthome_phy6222/bin/TH05_v11.bin
index 9e34e7413a7de64ccc2d4a7311cd5a0aaad1cc7f..3827e2344959543e66cdf5a7a67f2504f6c743ab 100644
GIT binary patch
delta 236
zcmcc8!F;8Id4dc}^Cq568x_6?=_XXoW?13O?3`T0qkJKbL4)%GhiY(qYSmjdg{#t1
z3>s{=x}Df=2`DC4bvq|db`%z`Ppw+ZW_~qVia}H8R<o1PEd_{N5$^+O2?h<;Tis4i
z?+Pd<R&hJuectW#^Y*>x%}#IbBv&yiL~`;naHz35yk*$ztnHj!BwWMj!0g0)fsrA(
z>NdwrXI=%i4=F!*6xco#{$NyMW=N<Kc9`HS;ha!Zus2$QL6h}Xv(qiXy9!{#k3Da8
k`g!~E^8;?1UkD$NWK5pCQrDR=dGlM{<Y_EZt_wZ|0BW;XqW}N^

delta 236
zcmcc8!F;8Id4dd!_m_XiH!6G)(p^wBn_-1Bv-9F29_0&h3>uslI8=k<msY)HQ@AQE
z#h}4<tJ{g~mVn~os&41SlO2V{>z7uoWwW>%EybWIbgS7(=#~ORu88-6v;>0&>#c65
zr*{RE7gljQ-+kWg^z-(;=gm%U?kuiiREXr{W#CX_b$H9L*;(6paglHhqXV-O^94qR
z#Z|XCW;*jKuzg7R!K1+Tq3{Qz5;MbsDq)8S&JxZGiV}(n_C`xEXtLgF7IeCKR{?DN
l(dW%hKW|@pzWIgl0ZGQilUM3GGcMlzRyTPXi@>|-I{{BpU8?{9

diff --git a/bthome_phy6222/bin/THB2_v11.bin b/bthome_phy6222/bin/THB2_v11.bin
index ec4eac3c63f0aa07fc2a248362cb42ef91ab7ae2..38cd1df924e35f33f122a72b9710b304c676d517 100644
GIT binary patch
delta 201
zcmX@|kLk!irU^1EN3)w9HY)5A5>Ksq%cgKOT8crF?N+lB+bsdb<f?Ax<jEg}#OqV5
z*0Py{<%DiEI|<!VfXEf`K8TiJ&}6;U?DX`mfO29LxAWcS%}zgW-+SKd^yW@-6{A8V
zCocns8mq%whRx2}&dEi>Rg4bIPRth=8Ir4RbIf#RRbc&~@{dh{^@HI*MkQv3geqZ&
n3C<GE2}K2aVP@YFysH2<{218q%g+zEZJr^#Vl|7Hb;T6`K5|VY

delta 201
zcmX@|kLk!irU^1E+z&44ZdBMMB)+ujEt|sCXekCwwp-0kY_|jy7gu#VFP{8SNW6Y&
z)mk<Su$<7XW+$Or3J|#>-UrbV44SOBnw_5B6;NJS#qE6ed9%~c+xMO~JH5HHxQbCB
zl9QK#LygtpEyHGKZRf>B!c~k8%udV~7#S8<-R79-%&NfpLFFHt0_z9Ee~e1Z3=67+
q9VR$SI4>wlC@R<sHC@o@=3ND_@khbNUwXcIhVY8jEUN{A4*&p^iBMJm

diff --git a/bthome_phy6222/source/sensor.h b/bthome_phy6222/source/sensor.h
index bb3a9af..b6d52a9 100644
--- a/bthome_phy6222/source/sensor.h
+++ b/bthome_phy6222/source/sensor.h
@@ -149,7 +149,7 @@ typedef struct _measured_data_t {
 	int16_t		humi; // x 0.01 %
 	uint16_t	battery_mv; // mV
 	uint8_t		battery; // 0..100 %
-	uint8_t		out_flg;	// _measured_flg_t
+//	uint8_t		out_flg;	// _measured_flg_t
 	measured_flg_t flg;
 } measured_data_t;
 #define send_len_measured_data 10
diff --git a/bthome_phy6222/source/trigger.c b/bthome_phy6222/source/trigger.c
index d2dd482..bf88ace 100644
--- a/bthome_phy6222/source/trigger.c
+++ b/bthome_phy6222/source/trigger.c
@@ -97,7 +97,7 @@ void set_trigger_out(void) {
 #ifdef GPIO_INP
 	measured_data.flg.pin_input = hal_gpio_read(GPIO_INP);
 #endif
-	measured_data.out_flg = *((uint8_t *)&measured_data.flg);
+//	measured_data.out_flg = *((uint8_t *)&measured_data.flg);
 }
 
 
diff --git a/bthome_phy6222/web/PHY62x2BTHome.html b/bthome_phy6222/web/PHY62x2BTHome.html
index 4180f06..b160bce 100644
--- a/bthome_phy6222/web/PHY62x2BTHome.html
+++ b/bthome_phy6222/web/PHY62x2BTHome.html
@@ -1225,17 +1225,21 @@ function customBlkParse(value) {
 		let rds_count = 0;
 		let	s = 'Температура: ' + temp.toFixed(2) + '°C, '
 		      + 'Влажность: ' + humi.toFixed(2) + '%, '
-			  + 'Vbat: ' + vbat + ' мВ, '
+			  + 'Vbat: ' + vbat + ' мВ ('+pbat+'%), '
 		      + 'ID: ' + count;
-		if(len > 12) {
-			flg = value.getUint8(9);
-			rds_count = value.getUint32(10, true);
-			s += ', счетчик срабатываний: '+ rds_count+', флаги: 0x'+hex(flg,2)+':r'+(flg&1)+'/t'+((flg>>1)&1);
-		}
-		console.log(s);
 		$('lblTemp').innerHTML = temp + ' °C';
 		$('lblHumi').innerHTML = humi + ' %RH';
 		$('lblBat').innerHTML = pbat + ' % (' + vbat / 1000 + ' V)';
+		if(len > 10) {
+			flg = value.getUint8(10);
+			s += ", флаги: 0x" + hex(flg,2);
+			$('lblTrg').innerHTML = "In: " + (flg&1)
+			+ ", Out: " + ((flg&2)? 1:0)
+			+ ", Cmf: " + ((flg&4)? 1:0)
+			+ ", Te: " + ((flg&16)? 1:0)
+			+ ", He: " + ((flg&32)? 1:0);
+		}
+		console.log(s);
 		if(rend) ShowGrf(temp, humi);
 		getDevTime();
 	} else if((blkId == 0x25 || blkId == 0x26) && (len > 12)) {
@@ -1755,7 +1759,6 @@ window.onload = (event) => {
 window.onresize = (event) => { if(window.innerWidth > 400) $('divDygraph').style.width = (window.innerWidth-40) + 'px';}
 
 window.onload = function() {
-
     document.querySelector("#inpFile").addEventListener("change", function() {
     	var file = this.files[0];
         if (file != null) {
@@ -1801,9 +1804,10 @@ function ShowGrf(temp, humi) {
 					legend: 'always',  // "follow"
 					digitsAfterDecimal: 3,
 				});
-			gu.updateOptions({'file': datau})
+			gu.updateOptions({'file': datau});
+			$(window).trigger('resize');
 		} else if (gu_flg == 3)
-			gu.updateOptions({'file': datau})
+			gu.updateOptions({'file': datau});
 	}
 }
 
@@ -1833,6 +1837,7 @@ function ShowGrf(temp, humi) {
     <td><label id="lblTemp">-- °C</label></td>
     <td><label id="lblHumi">-- %RH</label></td>
     <td><label id="lblBat">-- % (-- V)</label></td>
+    <td><label id="lblTrg"></label></td>
   </tr>
 </table>
 <hr>