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 7bf0db1..9e6a665 100644 Binary files a/bin/KEY2_v20.bin and b/bin/KEY2_v20.bin differ diff --git a/bthome_phy6222/.settings/language.settings.xml b/bthome_phy6222/.settings/language.settings.xml index e4d75e8..5ac1d6e 100644 --- a/bthome_phy6222/.settings/language.settings.xml +++ b/bthome_phy6222/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/bthome_phy6222/ota_upboot.add b/bthome_phy6222/ota_upboot.add index ec7ae8d..fed2065 100644 Binary files a/bthome_phy6222/ota_upboot.add and b/bthome_phy6222/ota_upboot.add differ 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 ec7ae8d..fed2065 100644 Binary files a/ota_boot/ota_upboot.add and b/ota_boot/ota_upboot.add differ 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 5629226..276ca71 100644 Binary files a/update_boot/BOOT_BTH01_v20.bin and b/update_boot/BOOT_BTH01_v20.bin differ diff --git a/update_boot/BOOT_KEY2_v20.bin b/update_boot/BOOT_KEY2_v20.bin index 5870770..647be0d 100644 Binary files a/update_boot/BOOT_KEY2_v20.bin and b/update_boot/BOOT_KEY2_v20.bin differ diff --git a/update_boot/BOOT_TH05D_v20.bin b/update_boot/BOOT_TH05D_v20.bin index 6882540..ae63019 100644 Binary files a/update_boot/BOOT_TH05D_v20.bin and b/update_boot/BOOT_TH05D_v20.bin differ diff --git a/update_boot/BOOT_TH05F_v20.bin b/update_boot/BOOT_TH05F_v20.bin index e9f8018..bb61368 100644 Binary files a/update_boot/BOOT_TH05F_v20.bin and b/update_boot/BOOT_TH05F_v20.bin differ diff --git a/update_boot/BOOT_TH05_v20.bin b/update_boot/BOOT_TH05_v20.bin index 203331c..61df8f6 100644 Binary files a/update_boot/BOOT_TH05_v20.bin and b/update_boot/BOOT_TH05_v20.bin differ diff --git a/update_boot/BOOT_THB1_v20.bin b/update_boot/BOOT_THB1_v20.bin index 8c9ffc0..37fb220 100644 Binary files a/update_boot/BOOT_THB1_v20.bin and b/update_boot/BOOT_THB1_v20.bin differ diff --git a/update_boot/BOOT_THB2_v20.bin b/update_boot/BOOT_THB2_v20.bin index a74dac0..a6b6bc9 100644 Binary files a/update_boot/BOOT_THB2_v20.bin and b/update_boot/BOOT_THB2_v20.bin differ diff --git a/update_boot/BOOT_THB3_v20.bin b/update_boot/BOOT_THB3_v20.bin index b11a227..8041063 100644 Binary files a/update_boot/BOOT_THB3_v20.bin and b/update_boot/BOOT_THB3_v20.bin differ