From 15bbcdacc686079672c594a9ea1c5f85fa748c1e Mon Sep 17 00:00:00 2001 From: pvvx Date: Wed, 6 Nov 2024 10:47:33 +0300 Subject: [PATCH] v1.9 --- README-ru.md | 21 +- README.md | 21 +- bin/BOOT_BTH01_v17.hex | 3001 ---------------- bin/BOOT_BTH01_v18.hex | 3003 ---------------- bin/BOOT_BTH01_v19.hex | 3003 ++++++++++++++++ bin/BOOT_TH05D_v17.hex | 3071 ---------------- bin/BOOT_TH05D_v18.hex | 3076 ----------------- bin/BOOT_TH05D_v19.hex | 3076 +++++++++++++++++ bin/BOOT_TH05F_v17.hex | 3067 ---------------- bin/BOOT_TH05F_v18.hex | 3073 ---------------- bin/BOOT_TH05F_v19.hex | 3073 ++++++++++++++++ bin/BOOT_TH05_v17.hex | 3065 ---------------- bin/BOOT_TH05_v18.hex | 3070 ---------------- bin/BOOT_TH05_v19.hex | 3071 ++++++++++++++++ bin/BOOT_THB1_v17.hex | 3062 ---------------- bin/BOOT_THB1_v18.hex | 3067 ---------------- bin/BOOT_THB1_v19.hex | 3068 ++++++++++++++++ bin/BOOT_THB2_v17.hex | 2998 ---------------- bin/BOOT_THB2_v18.hex | 3000 ---------------- bin/BOOT_THB2_v19.hex | 3000 ++++++++++++++++ bin/BOOT_THB3_v17.hex | 3062 ---------------- bin/BOOT_THB3_v18.hex | 3067 ---------------- bin/BOOT_THB3_v19.hex | 3068 ++++++++++++++++ bin/BTH01_v17.bin | Bin 48612 -> 0 bytes bin/{BTH01_v18.bin => BTH01_v19.bin} | Bin 48628 -> 48644 bytes bin/TH05D_v17.bin | Bin 50164 -> 0 bytes bin/{TH05D_v18.bin => TH05D_v19.bin} | Bin 50244 -> 50260 bytes bin/TH05F_v17.bin | Bin 50132 -> 0 bytes bin/{TH05F_v18.bin => TH05F_v19.bin} | Bin 50212 -> 50212 bytes bin/TH05_v17.bin | Bin 50020 -> 0 bytes bin/{TH05_v18.bin => TH05_v19.bin} | Bin 50084 -> 50100 bytes bin/THB1_v17.bin | Bin 50020 -> 0 bytes bin/{THB3_v18.bin => THB1_v19.bin} | Bin 50100 -> 50100 bytes bin/THB2_v17.bin | Bin 48564 -> 0 bytes bin/{THB2_v18.bin => THB2_v19.bin} | Bin 48596 -> 48596 bytes bin/THB3_v17.bin | Bin 50020 -> 0 bytes bin/{THB1_v18.bin => THB3_v19.bin} | Bin 50100 -> 50100 bytes bthome_phy6222/mk_windows.cmd | 2 +- bthome_phy6222/source/cmd_parser.c | 2 +- bthome_phy6222/source/config.h | 2 +- bthome_phy6222/source/thb2_main.c | 3 +- bthome_phy6222/web/PHY62x2BTHome.html | 4 +- fw.json | 37 +- update_boot/BOOT_BTH01_v17.bin | Bin 48916 -> 0 bytes ...{BOOT_BTH01_v18.bin => BOOT_BTH01_v19.bin} | Bin 48948 -> 48964 bytes update_boot/BOOT_TH05D_v17.bin | Bin 50052 -> 0 bytes ...{BOOT_TH05D_v18.bin => BOOT_TH05D_v19.bin} | Bin 50132 -> 50132 bytes update_boot/BOOT_TH05F_v17.bin | Bin 49988 -> 0 bytes ...{BOOT_TH05F_v18.bin => BOOT_TH05F_v19.bin} | Bin 50068 -> 50084 bytes update_boot/BOOT_TH05_v17.bin | Bin 49940 -> 0 bytes .../{BOOT_TH05_v18.bin => BOOT_TH05_v19.bin} | Bin 50020 -> 50036 bytes update_boot/BOOT_THB1_v18.bin | Bin 49972 -> 0 bytes .../{BOOT_THB1_v17.bin => BOOT_THB1_v19.bin} | Bin 49892 -> 49988 bytes update_boot/BOOT_THB2_v17.bin | Bin 48884 -> 0 bytes .../{BOOT_THB2_v18.bin => BOOT_THB2_v19.bin} | Bin 48900 -> 48900 bytes update_boot/BOOT_THB3_v18.bin | Bin 49972 -> 0 bytes .../{BOOT_THB3_v17.bin => BOOT_THB3_v19.bin} | Bin 49892 -> 49988 bytes 57 files changed, 21402 insertions(+), 42731 deletions(-) delete mode 100644 bin/BOOT_BTH01_v17.hex delete mode 100644 bin/BOOT_BTH01_v18.hex create mode 100644 bin/BOOT_BTH01_v19.hex delete mode 100644 bin/BOOT_TH05D_v17.hex delete mode 100644 bin/BOOT_TH05D_v18.hex create mode 100644 bin/BOOT_TH05D_v19.hex delete mode 100644 bin/BOOT_TH05F_v17.hex delete mode 100644 bin/BOOT_TH05F_v18.hex create mode 100644 bin/BOOT_TH05F_v19.hex delete mode 100644 bin/BOOT_TH05_v17.hex delete mode 100644 bin/BOOT_TH05_v18.hex create mode 100644 bin/BOOT_TH05_v19.hex delete mode 100644 bin/BOOT_THB1_v17.hex delete mode 100644 bin/BOOT_THB1_v18.hex create mode 100644 bin/BOOT_THB1_v19.hex delete mode 100644 bin/BOOT_THB2_v17.hex delete mode 100644 bin/BOOT_THB2_v18.hex create mode 100644 bin/BOOT_THB2_v19.hex delete mode 100644 bin/BOOT_THB3_v17.hex delete mode 100644 bin/BOOT_THB3_v18.hex create mode 100644 bin/BOOT_THB3_v19.hex delete mode 100644 bin/BTH01_v17.bin rename bin/{BTH01_v18.bin => BTH01_v19.bin} (79%) delete mode 100644 bin/TH05D_v17.bin rename bin/{TH05D_v18.bin => TH05D_v19.bin} (78%) delete mode 100644 bin/TH05F_v17.bin rename bin/{TH05F_v18.bin => TH05F_v19.bin} (78%) delete mode 100644 bin/TH05_v17.bin rename bin/{TH05_v18.bin => TH05_v19.bin} (78%) delete mode 100644 bin/THB1_v17.bin rename bin/{THB3_v18.bin => THB1_v19.bin} (78%) delete mode 100644 bin/THB2_v17.bin rename bin/{THB2_v18.bin => THB2_v19.bin} (79%) delete mode 100644 bin/THB3_v17.bin rename bin/{THB1_v18.bin => THB3_v19.bin} (78%) delete mode 100644 update_boot/BOOT_BTH01_v17.bin rename update_boot/{BOOT_BTH01_v18.bin => BOOT_BTH01_v19.bin} (79%) delete mode 100644 update_boot/BOOT_TH05D_v17.bin rename update_boot/{BOOT_TH05D_v18.bin => BOOT_TH05D_v19.bin} (79%) delete mode 100644 update_boot/BOOT_TH05F_v17.bin rename update_boot/{BOOT_TH05F_v18.bin => BOOT_TH05F_v19.bin} (79%) delete mode 100644 update_boot/BOOT_TH05_v17.bin rename update_boot/{BOOT_TH05_v18.bin => BOOT_TH05_v19.bin} (79%) delete mode 100644 update_boot/BOOT_THB1_v18.bin rename update_boot/{BOOT_THB1_v17.bin => BOOT_THB1_v19.bin} (74%) delete mode 100644 update_boot/BOOT_THB2_v17.bin rename update_boot/{BOOT_THB2_v18.bin => BOOT_THB2_v19.bin} (79%) delete mode 100644 update_boot/BOOT_THB3_v18.bin rename update_boot/{BOOT_THB3_v17.bin => BOOT_THB3_v19.bin} (74%) diff --git a/README-ru.md b/README-ru.md index 3bccd7a..0fd6aff 100644 --- a/README-ru.md +++ b/README-ru.md @@ -32,19 +32,19 @@ _Далее, с помощью соединения BLE в [PHY62x2BTHome.html]( | Устройство | Файл Boot | Файл OTA | Маркировка на печатной плате | |:---:|:---:|:---:|:---:| -| [THB1](https://pvvx.github.io/THB1) | BOOT_THB1_v18.hex | THB1_v18.bin | нет | -| [THB2](https://pvvx.github.io/THB2) | BOOT_THB2_v18.hex | THB2_v18.bin | нет | -| [THB3](https://pvvx.github.io/THB3) | BOOT_THB2_v18.hex | THB2_v18.bin | нет | -| [BTH01](https://pvvx.github.io/BTH01) | BOOT_BTH01_v18.hex | BTH01_v18.bin | нет | -| [TH05_V1.4](https://pvvx.github.io/TH-05) | BOOT_TH05_v18.hex | TH05_v18.bin | TH05_V1.4, TH05_V1.5, TH05_V1.6 с чипом BL55028 | -| [TH05_V1.3](https://pvvx.github.io/TH05-v1.3) | BOOT_TH05D_v18.hex | TH05D_v18.bin | RSH-TH05-V1.3 с чипом BL55072 | -| [TH05F](https://pvvx.github.io/TH05F) | BOOT_TH05F_v18.hex | TH05F_v18.bin | TH05Y_V1.1, TH05Y_V1.2 с чипом QD01 2332 NT | +| [THB1](https://pvvx.github.io/THB1) | BOOT_THB1_v19.hex | THB1_v19.bin | нет | +| [THB2](https://pvvx.github.io/THB2) | BOOT_THB2_v19.hex | THB2_v19.bin | нет | +| [THB3](https://pvvx.github.io/THB3) | BOOT_THB2_v19.hex | THB2_v19.bin | нет | +| [BTH01](https://pvvx.github.io/BTH01) | BOOT_BTH01_v19.hex | BTH01_v19.bin | нет | +| [TH05_V1.4](https://pvvx.github.io/TH-05) | BOOT_TH05_v19.hex | TH05_v19.bin | TH05_V1.4, TH05_V1.5, TH05_V1.6 с чипом BL55028 | +| [TH05_V1.3](https://pvvx.github.io/TH05-v1.3) | BOOT_TH05D_v19.hex | TH05D_v19.bin | RSH-TH05-V1.3 с чипом BL55072 | +| [TH05F](https://pvvx.github.io/TH05F) | BOOT_TH05F_v19.hex | TH05F_v19.bin | TH05Y_V1.1, TH05Y_V1.2 с чипом QD01 2332 NT | Основные файлы прошивок, BOOT_xxx_vxx.hex для программирования через USB-COM адаптер и xxx_vxx.bin для OTA, находятся в директории [bin](https://github.com/pvvx/THB2/tree/master/bin). -Файлы для обновления `FW Boot` по OTA находятся в директории [update_boot](https://github.com/pvvx/THB2/tree/master/update_boot). Процесс обновления `FW Boot` через OTA не является безопасным. Перед этим действием проверьте уровень батареи. Если `FW Boot` работает нормально, тогда не требуется обновлять его на новую версию. О необходимости замены `FW Boot` на новую версию будет объявляется дополнительно. +Файлы для обновления `FW Boot` по OTA находятся в директории [update_boot](https://github.com/pvvx/THB2/tree/master/update_boot). Процесс обновления `FW Boot` через OTA не является безопасным. Перед этим действием проверьте уровень батареи. -Актуальная версия `FW Boot` - **v1.7** для устройств с датчиком CHT8305. Для остальных вариантов обновлений `FW Boot` не требуется с версии **v1.4**. +Актуальная версия `FW Boot` - **v1.9** для всех устройств (содержит исправления). ## Основные характеристики @@ -74,7 +74,8 @@ _Далее, с помощью соединения BLE в [PHY62x2BTHome.html]( | 1.5 | Добавлен вариант шифрования BLE рекламы с помощью BindKey. | | 1.6 | Добавлено усреднение расчета напряжения батареи, дублирование состояния контакта open/close и счетчика через 12..20 сек (кратно интервалу рекламы) после срабатывания и далее каждые 30 минут. | | 1.7 | Исправление ошибки (> 42 C) для сенсора CHT8305 | -| 1.8b | Добавлено отображение температуры в градусах Фаренгейта | +| 1.8 | Добавлено отображение температуры в градусах Фаренгейта | +| 1.9 | Исправлена ошибка восстановления измененного имени устройства после сброса питания | ## Прошивка diff --git a/README.md b/README.md index 4f08062..4dd7783 100644 --- a/README.md +++ b/README.md @@ -33,19 +33,19 @@ The [Boot](#fw-boot-and-ota) firmware has minimal functions. `FW Boot` is only u | Device | Boot file | OTA file | Printed circuit board labelling | |:---:|:---:|:---:|:---:| -| [THB1](https://pvvx.github.io/THB1) | BOOT_THB1_v18.hex | THB1_v18.bin | no | -| [THB2](https://pvvx.github.io/THB2) | BOOT_THB2_v18.hex | THB2_v18.bin | no | -| [THB3](https://pvvx.github.io/THB3) | BOOT_THB2_v18.hex | THB2_v18.bin | no | -| [BTH01](https://pvvx.github.io/BTH01) | BOOT_BTH01_v18.hex | BTH01_v18.bin | no | -| [TH05_V1.4](https://pvvx.github.io/TH-05) | BOOT_TH05_v18.hex | TH05_v18.bin | TH05_V1.4, TH05_V1.5, TH05_V1.6 (chip: BL55028) | -| [TH05_V1.3](https://pvvx.github.io/TH05-v1.3) | BOOT_TH05D_v18.hex | TH05D_v18.bin | RSH-TH05-V1.3 (chip: BL55072) | -| [TH05F](https://pvvx.github.io/TH05F) | BOOT_TH05F_v18.hex | TH05F_v18.bin | TH05Y_V1.1, TH05Y_V1.2 (chip: QD01 2332 NT) | +| [THB1](https://pvvx.github.io/THB1) | BOOT_THB1_v19.hex | THB1_v19.bin | no | +| [THB2](https://pvvx.github.io/THB2) | BOOT_THB2_v19.hex | THB2_v19.bin | no | +| [THB3](https://pvvx.github.io/THB3) | BOOT_THB2_v19.hex | THB2_v19.bin | no | +| [BTH01](https://pvvx.github.io/BTH01) | BOOT_BTH01_v19.hex | BTH01_v19.bin | no | +| [TH05_V1.4](https://pvvx.github.io/TH-05) | BOOT_TH05_v19.hex | TH05_v19.bin | TH05_V1.4, TH05_V1.5, TH05_V1.6 (chip: BL55028) | +| [TH05_V1.3](https://pvvx.github.io/TH05-v1.3) | BOOT_TH05D_v19.hex | TH05D_v19.bin | RSH-TH05-V1.3 (chip: BL55072) | +| [TH05F](https://pvvx.github.io/TH05F) | BOOT_TH05F_v19.hex | TH05F_v19.bin | TH05Y_V1.1, TH05Y_V1.2 (chip: QD01 2332 NT) | The main firmware files, BOOT_XXX_vXX.hex (for programming via USB-COM adapter) and XXX_vXX.bin (for OTA), are located in the [bin](bin) directory. -Files for updating boot via OTA are located in the [update_boot](update_boot) directory. **The process of updating boot via OTA is not safe. Please check the battery level before doing this. If boot is working fine, there is no need to update to the new version. The need to replace boot with a new version will be announced later.** +Files for updating boot via OTA are located in the [update_boot](update_boot) directory. ** -> The current `FW Boot' version is **v1.7** for devices with CHT8305 sensor. For other variants, `FW boot' is not required from version **v1.4**. +> The current `FW Boot' version is **v1.9** for all devices (errors fixed). ## Main features @@ -76,7 +76,8 @@ Files for updating boot via OTA are located in the [update_boot](update_boot) di | 1.5 | | | 1.6 |