Added counter status 12..20 sec (multiple of ad interval) after triggering and then every 30 min. |
| 1.7 | Fixed en error (> 42 C) for sensor CHT8305 Added display of temperature in degrees Fahrenheit PHY62x2 BTHome v1.5
+PHY62x2 BTHome v1.6
@@ -591,6 +591,8 @@ div#divChart {
INVALID_BINDKEY_LENGTH: { en: 'Bindkey must be 16 bytes, hex encoded (=32 characters)', ru: 'BindKey должен соднержать 16 байт в HEX виде (32 символа)' },
UPLOAD_FIRMWARE: { en: 'Download firmware file', ru: 'Загрузка firmware файла' },
WARNING_BOOT_FW: { en: 'Attention!: Uploading boot FW is not safe. In order to avoid firmware failure use a fresh battery!', ru: 'Внимание!: Обновление Boot fw не безопасно. Во избежание сбоя прошивки желательно использование полной батареи!' },
+ MEMO_OFF: {en: 'Disabled', ru: 'Отключено'},
+ SHOW_TEMPF: {en: 'Show Temperature in Fahrenheit', ru: 'Показывать температуру в градусах Фаренгейта'},
};
function getUserLang() {
@@ -1425,6 +1427,8 @@ function showConfig() {
$('chkCfgTrg').checked = (devCfg.flg & 8) != 0;
$('chkCfgLcdOff').checked = (devCfg.flg & 16) != 0;
$('chkCfgBindKey').checked = (devCfg.flg & 32) != 0;
+ $('chkCfgFahrenheit').checked = (devCfg.flg & 64) != 0;
+
let txPwr = 31;
el = $('selTxPwr');
for(let n = 0; n < el.options.length; n++) if(el.options[n].value >= devCfg.tx_power) txPwr = el.options[n].value;
@@ -1437,7 +1441,7 @@ function showConfig() {
$('lblMeasInt').innerHTML = "= " + msri.toFixed(1) + ` ${i18n.getTag('MS')}`;
$('inpAverInt').value = devCfg.averaging_measurements; // запись истории: при 0 - отключена, 1...255 * шаг опроса датчика = интерал записи истории
if(devCfg.averaging_measurements == 0)
- $('lblAverInt').innerHTML = "отключена";
+ $('lblAverInt').innerHTML = ` ${i18n.getTag('MEMO_OFF')}`;
else {
let hsti = (msri*devCfg.averaging_measurements)/1000.0;
if(hsti > 60) {
@@ -1797,6 +1801,7 @@ function chkDevCfg() {
devCfg.flg |= ($('chkCfgTrg').checked) ? 8 : 0;
devCfg.flg |= ($('chkCfgLcdOff').checked) ? 16 : 0;
devCfg.flg |= ($('chkCfgBindKey').checked) ? 32 : 0;
+ devCfg.flg |= ($('chkCfgFahrenheit').checked) ? 64 : 0;
devCfg.tx_power = $('selTxPwr').value & 0x3f; // 0..0x1f -> -20..+5 dBm ? нелинейное 0x1f = +0 дБм
let connect_latency = parseInt($('inpLat').value); // = (connect_latency + 1)*30 ms
if (connect_latency < 0) {
@@ -2365,6 +2370,7 @@ window.onload = function() {
Отображать смайлик Отображать триггер Отключить дисплей Показывать температуру в градусах Фаренгейта
diff --git a/fw.json b/fw.json
index 062d580..93e0516 100644
--- a/fw.json
+++ b/fw.json
@@ -7,13 +7,22 @@
"bin/TH05D_v17.bin",
"bin/TH05F_v17.bin",
"bin/THB3_v17.bin"],
-"updateboot":[
-"update_boot/BOOT_THB2_v17.bin",
-"update_boot/BOOT_BTH01_v17.bin",
-"update_boot/BOOT_TH05_v17.bin",
+"betafw":[
+"bin/THB2_v18.bin",
+"bin/BTH01_v18.bin",
+"bin/TH05_v18.bin",
"?",
-"update_boot/BOOT_THB1_v17.bin",
-"update_boot/BOOT_TH05D_v17.bin",
-"update_boot/BOOT_TH05F_v17.bin",
-"update_boot/BOOT_THB3_v17.bin"]
+"bin/THB1_v18.bin",
+"bin/TH05D_v18.bin",
+"bin/TH05F_v18.bin",
+"bin/THB3_v18.bin"],
+"updateboot":[
+"update_boot/BOOT_THB2_v18.bin",
+"update_boot/BOOT_BTH01_v18.bin",
+"update_boot/BOOT_TH05_v18.bin",
+"?",
+"update_boot/BOOT_THB1_v18.bin",
+"update_boot/BOOT_TH05D_v18.bin",
+"update_boot/BOOT_TH05F_v18.bin",
+"update_boot/BOOT_THB3_v18.bin"]
}
diff --git a/update_boot/BOOT_BTH01_v18.bin b/update_boot/BOOT_BTH01_v18.bin
new file mode 100644
index 0000000..b17ec90
Binary files /dev/null and b/update_boot/BOOT_BTH01_v18.bin differ
diff --git a/update_boot/BOOT_TH05D_v18.bin b/update_boot/BOOT_TH05D_v18.bin
new file mode 100644
index 0000000..15ce10e
Binary files /dev/null and b/update_boot/BOOT_TH05D_v18.bin differ
diff --git a/update_boot/BOOT_TH05F_v18.bin b/update_boot/BOOT_TH05F_v18.bin
new file mode 100644
index 0000000..05aee8c
Binary files /dev/null and b/update_boot/BOOT_TH05F_v18.bin differ
diff --git a/update_boot/BOOT_TH05_v18.bin b/update_boot/BOOT_TH05_v18.bin
new file mode 100644
index 0000000..827d34e
Binary files /dev/null and b/update_boot/BOOT_TH05_v18.bin differ
diff --git a/update_boot/BOOT_THB1_v18.bin b/update_boot/BOOT_THB1_v18.bin
new file mode 100644
index 0000000..8430892
Binary files /dev/null and b/update_boot/BOOT_THB1_v18.bin differ
diff --git a/update_boot/BOOT_THB2_v18.bin b/update_boot/BOOT_THB2_v18.bin
new file mode 100644
index 0000000..112038a
Binary files /dev/null and b/update_boot/BOOT_THB2_v18.bin differ
diff --git a/update_boot/BOOT_THB3_v18.bin b/update_boot/BOOT_THB3_v18.bin
new file mode 100644
index 0000000..adff1cb
Binary files /dev/null and b/update_boot/BOOT_THB3_v18.bin differ
diff --git a/wr_bth01.cmd b/wr_bth01.cmd
index 26de55b..87c57b9 100644
--- a/wr_bth01.cmd
+++ b/wr_bth01.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_BTH01_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/BTH01_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM12 -e -r wh ./bin/BOOT_BTH01_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM12 -r we 0x10000 ./bin/BTH01_v18.bin
\ No newline at end of file
diff --git a/wr_th05.cmd b/wr_th05.cmd
index 8749b92..3607ba6 100644
--- a/wr_th05.cmd
+++ b/wr_th05.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_TH05_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/TH05_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_TH05_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/TH05_v18.bin
\ No newline at end of file
diff --git a/wr_th05d.cmd b/wr_th05d.cmd
index c6b7523..fb6d548 100644
--- a/wr_th05d.cmd
+++ b/wr_th05d.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_TH05D_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/TH05D_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_TH05D_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/TH05D_v18.bin
\ No newline at end of file
diff --git a/wr_th05f.cmd b/wr_th05f.cmd
index 7f8b9c3..3228778 100644
--- a/wr_th05f.cmd
+++ b/wr_th05f.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_TH05F_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/TH05F_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_TH05F_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/TH05F_v18.bin
\ No newline at end of file
diff --git a/wr_thb1.cmd b/wr_thb1.cmd
index 8be32f0..0f65a27 100644
--- a/wr_thb1.cmd
+++ b/wr_thb1.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_THB1_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/THB1_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_THB1_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/THB1_v18.bin
\ No newline at end of file
diff --git a/wr_thb2.cmd b/wr_thb2.cmd
index 5f9311c..23acf17 100644
--- a/wr_thb2.cmd
+++ b/wr_thb2.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_THB2_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/THB2_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM12 -e -r wh ./bin/BOOT_THB2_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM12 -r we 0x10000 ./bin/THB2_v18.bin
\ No newline at end of file
diff --git a/wr_thb3.cmd b/wr_thb3.cmd
index 91456e2..4915ea3 100644
--- a/wr_thb3.cmd
+++ b/wr_thb3.cmd
@@ -1,2 +1,2 @@
-python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_THB3_v17.hex
-@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/THB3_v17.bin
\ No newline at end of file
+python3 rdwr_phy62x2.py -p COM11 -e -r wh ./bin/BOOT_THB3_v18.hex
+@rem python3 rdwr_phy62x2.py -p COM11 -r we 0x10000 ./bin/THB3_v18.bin
\ No newline at end of file