From b683630d0fcc16e6eb1a77de0c5f9c1a47d871de Mon Sep 17 00:00:00 2001 From: pvvx Date: Tue, 10 Dec 2024 23:36:09 +0300 Subject: [PATCH] v2.0 beta5 (fix erase flash in OTA BOOT, KEY2 size Flash) --- README-ru.md | 2 +- README.md | 2 +- bin/BOOT_KEY2_v20.hex | 16 ++++++++-------- bin/KEY2_v20.bin | Bin 45684 -> 45684 bytes .../.settings/language.settings.xml | 2 +- bthome_phy6222/ota_upboot.add | Bin 964 -> 948 bytes bthome_phy6222/source/flash_eep.h | 4 ++++ ota_boot/.settings/language.settings.xml | 2 +- ota_boot/ota_upboot.add | Bin 964 -> 948 bytes ota_boot/source/main.c | 2 +- update_boot/BOOT_BTH01_v20.bin | Bin 49636 -> 49620 bytes update_boot/BOOT_KEY2_v20.bin | Bin 48884 -> 48868 bytes update_boot/BOOT_TH05D_v20.bin | Bin 50788 -> 50772 bytes update_boot/BOOT_TH05F_v20.bin | Bin 50724 -> 50708 bytes update_boot/BOOT_TH05_v20.bin | Bin 50676 -> 50660 bytes update_boot/BOOT_THB1_v20.bin | Bin 50628 -> 50612 bytes update_boot/BOOT_THB2_v20.bin | Bin 49572 -> 49556 bytes update_boot/BOOT_THB3_v20.bin | Bin 50628 -> 50612 bytes 18 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README-ru.md b/README-ru.md index 9e87ae7..6021abb 100644 --- a/README-ru.md +++ b/README-ru.md @@ -100,7 +100,7 @@ LCD имеет разную разводку сегментов в зависи | 1.7 | | | 1.8 | | | 1.9 | | -| 2.0beta3 | | +| 2.0beta5 | | ## Прошивка diff --git a/README.md b/README.md index a1e446a..42bf278 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ The sensors are detected automatically, but have different ports depending on th | 1.7 | | | 1.8 | | | 1.9 | | -| 2.0beta4 | | +| 2.0beta5 | | diff --git a/bin/BOOT_KEY2_v20.hex b/bin/BOOT_KEY2_v20.hex index 31b474a..9405fe1 100644 --- a/bin/BOOT_KEY2_v20.hex +++ b/bin/BOOT_KEY2_v20.hex @@ -10,20 +10,20 @@ :10308000591C03D190429241104016BD99B240297B :1030900007D80B000733A343C0189042ECD300209D :1030A000F3E74430F9E7134B134A1B68126810B575 -:1030B000FA24934201D81A00F824104BE4021B684A +:1030B000F424934201D81A00F024104BA4021B6898 :1030C0009A4210D813000E4A12689A420ED3013366 -:1030D00007D1F823DB029C4203D10A49054808F0D6 -:1030E0006FFA200010BDFC24E402ECE7FE24E402A9 -:1030F000F7E7C04600C0071100D0071100E0071134 -:1031000000F00711FFFFFF7FF0B59BB015000490A2 +:1030D00007D1F0239B029C4203D10A49054808F01E +:1030E0006FFA200010BDF824A402ECE7FC24A4022F +:1030F000F7E7C04600C0031100D0031100E0031140 +:1031000000F00311FFFFFF7FF0B59BB015000490A6 :103110000391402A00D9A0E006AB59801A80FFF73E :10312000C2FF0400042816D9002206A9FFF768FF91 :10313000052810D906AB1B88AB420CD1002D07D057 :10314000514B2A000499C01808F02AFA002802D12D :1031500001201BB0F0BD06AB1D8020000699FFF7D3 :103160007FFF041E7BD1069B0793FFF79CFF802304 -:103170005B01C618802307001B039E4201D3F8267B -:10318000F60288235B05F31801931B68013302D014 +:103170005B01C61880230700DB029E4201D3F026C4 +:10318000B60288235B05F31801931B68013302D054 :10319000019807F0F5FF3D49019808F011FA3B1D31 :1031A0000293331D05938822029B52059B181B68CE :1031B00008935A1C3CD044219AB20091402A04D86A @@ -52,7 +52,7 @@ :10332000019307F02DFF019920000139019108F068 :1033300047F980235B01E418074B9C42EED104223D :10334000034901A80195FFF7DFFE0020E4E7C0462E -:103350005555000000C007110000081130B589B0B4 +:103350005555000000C003110000041130B589B0BC :1033600007F0E6FE10226946254808F019F8254BBB :10337000009A9A420ED1019B029A0F2B33D800215A :1033800001240698013B08D2002900D00292029B3A diff --git a/bin/KEY2_v20.bin b/bin/KEY2_v20.bin index 7bf0db159b11453ac749a96157e2f61b6241b86d..9e6a665c74e13ab45514f8659e826ba108845359 100644 GIT binary patch delta 136 zcmezJgz3u@rU^1E{Yxf%*{CpqG5CwhWGBWOQVbtd1iY6pNoUM*61XAEz~?2DG0TbX zGNUp3#ShA}ndUe#U*z&+^MCDTW^^0^U!Uq%&qY3EU87;PVp7nB~NG znbDa2;t%E9Omm!=FLHUZda!>G|F6Ixu=kJ36Q(!M|EWA-`u_ZY8^Zy1L52(Lf(#GX t1sOiDPiAH+<& - + diff --git a/bthome_phy6222/ota_upboot.add b/bthome_phy6222/ota_upboot.add index ec7ae8d832d0d4dcbb3cdaf87e0d5775139bfe79..fed2065617384267a186c7aab60abbe6615e30a0 100644 GIT binary patch delta 141 zcmX@YzJ*;Oz$4O(k%581LgK&t24)5Z21Z7P6-*F*g-+a*iHi4`{xeKwWE5s(m@LYe z%E&jln(;Hs|L?v3Cl@hADSnXtFAp+GAFYtzs`^U--G@uFo^ACkohnFV6rW9_~a$bGAuLsB%%Os=PVZh delta 144 zcmdnOeuP~iz$4O(k%581LgK&t0cHjU21Z7P9ZV2@-DM`DiHi4`{tHZIWE5r;m@LYe z$|yFun(;FW!-wu4lZ%+56d7dx%Y)2dP*4zLk@+vr0m2Fjf&xrJj0}njf*&ToWs+w6 qFqxBCmEYvY|L;Nn6&S?!3dsDI|1jB>Ih<)_{^T}hEtaPArWODRdn%d$ diff --git a/bthome_phy6222/source/flash_eep.h b/bthome_phy6222/source/flash_eep.h index d4551e0..4f15902 100644 --- a/bthome_phy6222/source/flash_eep.h +++ b/bthome_phy6222/source/flash_eep.h @@ -29,8 +29,12 @@ extern "C" { #define FLASH_BASE_ADDR 0x11000000 #endif #ifndef FLASH_SIZE +#if DEVICE == DEVICE_KEY2 +#define FLASH_SIZE (256*1024) +#else #define FLASH_SIZE (512*1024) #endif +#endif #ifndef FLASH_SECTOR_SIZE #define FLASH_SECTOR_SIZE 4096 #endif diff --git a/ota_boot/.settings/language.settings.xml b/ota_boot/.settings/language.settings.xml index 84095c5..65d8338 100644 --- a/ota_boot/.settings/language.settings.xml +++ b/ota_boot/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/ota_boot/ota_upboot.add b/ota_boot/ota_upboot.add index ec7ae8d832d0d4dcbb3cdaf87e0d5775139bfe79..fed2065617384267a186c7aab60abbe6615e30a0 100644 GIT binary patch delta 141 zcmX@YzJ*;Oz$4O(k%581LgK&t24)5Z21Z7P6-*F*g-+a*iHi4`{xeKwWE5s(m@LYe z%E&jln(;Hs|L?v3Cl@hADSnXtFAp+GAFYtzs`^U--G@uFo^ACkohnFV6rW9_~a$bGAuLsB%%Os=PVZh delta 144 zcmdnOeuP~iz$4O(k%581LgK&t0cHjU21Z7P9ZV2@-DM`DiHi4`{tHZIWE5r;m@LYe z$|yFun(;FW!-wu4lZ%+56d7dx%Y)2dP*4zLk@+vr0m2Fjf&xrJj0}njf*&ToWs+w6 qFqxBCmEYvY|L;Nn6&S?!3dsDI|1jB>Ih<)_{^T}hEtaPArWODRdn%d$ diff --git a/ota_boot/source/main.c b/ota_boot/source/main.c index 50b60a6..ec44999 100644 --- a/ota_boot/source/main.c +++ b/ota_boot/source/main.c @@ -140,7 +140,7 @@ void copy_app_code(void) { wfaddr += blksize; count -= blksize; } - spif_erase_sector(FADDR_APP_SEC); + flash_erase_sector(FADDR_APP_SEC); } //__disable_irq(); m_in_critical_region++; diff --git a/update_boot/BOOT_BTH01_v20.bin b/update_boot/BOOT_BTH01_v20.bin index 562922680c09b5cacb7756ae87776fc53eae4a0e..276ca71c13771903835d0927a3df891a83e7e3af 100644 GIT binary patch delta 152 zcmaFT%zUMpSs}n9(u|RTfx$xJzx;)R3=9m6j0`K7Ap8oQxG57AZ?pa1z|1JfFqx52 zn2}+!C}S!k-{fk>&n*AH_x_(;#1y6YLHfTu$Q%X*1;H=U|K)#3|Ci@bP!JSg5@KXf zR1kbH`7M()1O8Ss}n9(u|RTfx$xJzx;!P3=9m6j0`)NApE+^OhywGZ?pYBz|1HpFqx52 zm{DM|C}S$4*yL))&nyfdx_?YAVv15^kohkUGKWDyL6Ak}zdQ#BD<}vGFbOd-C@Khk znEaMWn(@PAPG(hplOO-T2mM!I5Zfyt^I!hMWLxHN=9T%3llOPaZeGHyvyUaE>(*2N D*?KVZ diff --git a/update_boot/BOOT_KEY2_v20.bin b/update_boot/BOOT_KEY2_v20.bin index 5870770e1f8616640daf72a0f6e74398f7622eeb..647be0d0e638a1efe4d7bba24eef688ddf3b585f 100644 GIT binary patch delta 275 zcmezJm+8r0CWQcxNHazT1_ld>|MCy^F)%PNGBT`Sg77PJ;-*Ygyv_E112dx_!(>KA zVMd0@qKv7Ge3PpgKePP*-ur)Y5mS`n2kHOvAafWL6a>FW|Cj$E{a>C#K|xS}Nr;g_ zQ9=4Sxy2sgco~#}m zAM$@GFbM4Zp|XVO&GSDhOPIbtKj6l2fLV~?0<$2)17<;n56qJfvzBt+W}4^3c=?0c bw#|-gR~cEE1sNDvHcN9{-Ns_wJ0TMQ8c$!4 delta 278 zcmaFzm+8x2CWQcxNHazT1_ld>|MDO9F)%PNGBWI7g7E7uGZ{@(yv_Fi05hYYz+^^7 zVMc+;qKv7GVw0;GKeI4==>9Reh$%{uLFT_a$Q%X*1wj^>|MDClte_w$z$C=Tpr|1D zVe(rhX~qweIhj@YO@93U9`s**fp0 z6BvVksZ4faydlN#Lq)**36pfjEGK~*!VG*~LK(B1_%1UVvtRt7e4A;G6Z1tbPgW0( z5Ba|o7zFnIQF+4j=J`LBCrsa;A8=zhz%IyefnAW{0lOf>2lmOESxY&knddn%UjCu> bZL=ZURYq2JK?Vkn&DtQjAOF7x{a0WR+sh#HU;e>lTjuc1OPKc@V!6I!jvW9PMloRk delta 151 zcmcc8!~CR&Ss}n9(u|RTfx$xJzkI?m1_lO3Mur_s5PscdCZmapx7q$5U}h8)n9Rs1 z%qTEflrfc2Y;rZ@XBLJJ-9IK5F-0jd$o!WFnZuxtQjAOF7x{a0WR+sh#HU;e>lTjub|IuisoZ(+_k#B$(%${_%3 Cc`_UT delta 156 zcmbQz!@Q)2Ss}n9(u|RTfx$xJzr4aR1_lO3Mur_s5PscdCZmapx7q$5U}h8)n9Rs1 z%qTEflrfc2Y;rZ@XBLJJ-9IK5F-0jd$o!WFnZux&n*AH_x_(;#1y6YLHfTu$Q%X*1;H=U|K)#3|Ci@bP!JSg5@KXf zR1kbH`7M()>iZeGG{bBN_x^Xn`C D{tz)i diff --git a/update_boot/BOOT_THB1_v20.bin b/update_boot/BOOT_THB1_v20.bin index 8c9ffc000893a4d7ba7f4b4479e8e770fa130cbb..37fb220c96f67c6fbf1805b0272773ac3738a7a3 100644 GIT binary patch delta 148 zcmX@o&Ag?XSs}n9(u|RTfx$xJzx;-y3=9m6j0`K7Ap8oQxG57AZ?pa1z|1JfFqx52 zn2}+!C}S!k-{fk>&n*AH_x_(;#1y6YLHfTu$Q%X*1;H=U|K)#3|Ci@bP!JSg5@KXf yR1kbH`7M()&n*AH_x_(;#1y6YLHfTu$Q%X*1;H=U|K)#3|Ci@bP!JSg5@KXf zR1kbH`7M()&n*AH_x_(;#1y6YLHfTu$Q%X*1;H=U|K)#3|Ci@bP!JSg5@KXf yR1kbH`7M()iaR>mz7B4RV