v2.0 beta5 (fix erase flash in OTA BOOT, KEY2 size Flash)

README-ru.md

@@ -100,7 +100,7 @@ LCD имеет разную разводку сегментов в зависи
 | 1.7 | <ul><li>Исправление ошибки (> 42 C) для сенсора CHT8305</li></ul> |
 | 1.8 | <ul><li>Добавлено отображение температуры в градусах Фаренгейта</li></ul> |
 | 1.9 | <ul><li>Исправлена ошибка восстановления измененного имени устройства после сброса питания</li></ul> |
-| 2.0beta3 | <ul><li>Добавлена обработка датчика CHT832x (поддержка платы TH05Y_v3.1)</li><li>Исправление ошибки в bin-файлах BOOT OTA</li><li>Добавлена функция сна при полном разряде батареи.</li><li>Добавлена опытная прошивка для брелков [iSearching](https://pvvx.github.io/iSearching) на чипе ST17H66B с поддержкой FindMy</li></ul> |
+| 2.0beta5 | <ul><li>Добавлена обработка датчика CHT832x (поддержка платы TH05Y_v3.1)</li><li>Исправление ошибки в bin-файлах BOOT OTA</li><li>Добавлена функция сна при полном разряде батареи.</li><li>Добавлена опытная прошивка для брелков [iSearching](https://pvvx.github.io/iSearching) на чипе ST17H66B с поддержкой FindMy</li></ul> |
 
 ## Прошивка
 

README.md

@@ -104,7 +104,7 @@ The sensors are detected automatically, but have different ports depending on th
 | 1.7 | <ul><li>Fixed en error (> 42 C) for sensor CHT8305</li></ul> |
 | 1.8 | <ul><li>Added display of temperature in degrees Fahrenheit</li></ul> |
 | 1.9 | <ul><li>Fixed the bug of restoring the changed device name after power reset</li></ul> |
-| 2.0beta4 | <ul><li>Added processing of the CHT832x sensor (Support board TH05Y_v3.1)</li><li>Fixing a bug in BOOT OTA bin files</li><li>Added sleep function when battery is completely discharged</li><li>Added experimental firmware for [iSearching](https://pvvx.github.io/iSearching) key fobs on ST17H66B chip (support "FindMy")</li></ul> |
+| 2.0beta5 | <ul><li>Added processing of the CHT832x sensor (Support board TH05Y_v3.1)</li><li>Fixing a bug in BOOT OTA bin files</li><li>Added sleep function when battery is completely discharged</li><li>Added experimental firmware for [iSearching](https://pvvx.github.io/iSearching) key fobs on ST17H66B chip (support "FindMy")</li></ul> |
 
 
 

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

bthome_phy6222/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1374827689994892801" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1152988113908133432" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

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

ota_boot/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1356363595915494267" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1134524019828734898" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

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++;