Index: btkb/format/keyboard.format =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/format/keyboard.format (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/format/keyboard.format (working copy) @@ -159,7 +159,7 @@ 2 mem_att_report3 1 mem_suspend_flag -100 mem_32asm_data_end +80 mem_32asm_data_end 1 mem_store_ltk_timer 1 mem_reconnect_continue 4 mem_le_pin_code Index: btkb/output/bt_format.meta =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_format.meta (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_format.meta (working copy) @@ -486,37 +486,37 @@ 0x4cbc mem_att_report3 0x4cbe mem_suspend_flag 0x4cbf mem_32asm_data_end -0x4d23 mem_store_ltk_timer -0x4d24 mem_reconnect_continue -0x4d25 mem_le_pin_code -0x4d29 mem_le_send_security_request_flag -0x4d2a mem_att_report_battery -0x4d2c mem_24g_enter_hibernate -0x4d30 mem_24g_txfail_cnt -0x4d31 mem_mouse_retry_flag -0x4d32 mem_24g_led_flag -0x4d33 mem_ui_timer_last_btclk_temp -0x4d37 mem_ui_check_timer_setup -0x4d3b mem_customize_timer_setup -0x4d3d mem_customize_timer -0x4d3e mem_ios_mode_flag -0x4d3f mem_24g_txbuf_new -0x4d53 mem_le_adv_swift_pair -0x4d5a mem_24g_enter_hibernate_setup -0x4d5e mem_24g_enter_hibernate_max -0x4d62 mem_24g_short_sleep_counter -0x4d65 mem_pc_sleep_flag -0x4d66 mem_le_pause_enc_flag -0x4d67 mem_le_battery_level_display_enable -0x4d68 mem_le_evidm -0x4d72 mem_le_skdm_temp -0x4d7a mem_le_connect_ios_mac_flag -0x4d7b mem_le_system_4type -0x4d7c mem_le_search_mac_uuid -0x4d7e mem_le_search_mac_manu_name -0x4d87 mem_le_start_auto_reco_timer -0x4d88 mem_le_search_service_uuid -0x4d98 mem_le_mac_handle_number +0x4d0f mem_store_ltk_timer +0x4d10 mem_reconnect_continue +0x4d11 mem_le_pin_code +0x4d15 mem_le_send_security_request_flag +0x4d16 mem_att_report_battery +0x4d18 mem_24g_enter_hibernate +0x4d1c mem_24g_txfail_cnt +0x4d1d mem_mouse_retry_flag +0x4d1e mem_24g_led_flag +0x4d1f mem_ui_timer_last_btclk_temp +0x4d23 mem_ui_check_timer_setup +0x4d27 mem_customize_timer_setup +0x4d29 mem_customize_timer +0x4d2a mem_ios_mode_flag +0x4d2b mem_24g_txbuf_new +0x4d3f mem_le_adv_swift_pair +0x4d46 mem_24g_enter_hibernate_setup +0x4d4a mem_24g_enter_hibernate_max +0x4d4e mem_24g_short_sleep_counter +0x4d51 mem_pc_sleep_flag +0x4d52 mem_le_pause_enc_flag +0x4d53 mem_le_battery_level_display_enable +0x4d54 mem_le_evidm +0x4d5e mem_le_skdm_temp +0x4d66 mem_le_connect_ios_mac_flag +0x4d67 mem_le_system_4type +0x4d68 mem_le_search_mac_uuid +0x4d6a mem_le_search_mac_manu_name +0x4d73 mem_le_start_auto_reco_timer +0x4d74 mem_le_search_service_uuid +0x4d84 mem_le_mac_handle_number 0x4800 mem_at_gpio 0x4801 mem_module_wake_up_gpio 0x4802 mem_module_state_gpio Index: btkb/output/bt_program23.icode =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.icode (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.icode (working copy) @@ -103,7 +103,7 @@ 00000102 0x000000a8 byteswap 0x00000002 , 0x00000002 00000103 0x000000a9 storet 0x00000002 , 0x00004b9a 00000104 0x000000aa rtn - 00000105 0x000000ad arg 0x00004d3f , 0x00000005 + 00000105 0x000000ad arg 0x00004d2b , 0x00000005 00000106 0x000000ae branch 0x000000db 00000107 0x000000b1 copy 0x00000006 , 0x00000011 00000108 0x000000b3 fetch 0x00000001 , 0x00004ba9 @@ -137,27 +137,27 @@ 00000136 0x000000d4 branch 0x00000082 00000137 0x000000d6 fetch 0x00000002 , 0x00004cbc 00000138 0x000000d7 branch 0x00000082 - 00000139 0x000000d9 fetch 0x00000002 , 0x00004d2a + 00000139 0x000000d9 fetch 0x00000002 , 0x00004d16 00000140 0x000000da call 0x00000090 - 00000141 0x000000db fetch 0x00000001 , 0x00004d67 + 00000141 0x000000db fetch 0x00000001 , 0x00004d53 00000142 0x000000dc rtn 0x00000034 00000143 0x000000dd branch 0x00000083 00000144 0x000000e0 istore 0x00000002 , 0x00000005 00000145 0x000000e1 copy 0x00000011 , 0x00000006 00000146 0x000000e2 branch 0x000000dd - 00000147 0x000000e8 fetcht 0x00000004 , 0x00004d37 + 00000147 0x000000e8 fetcht 0x00000004 , 0x00004d23 00000148 0x000000e9 copy 0x00000022 , 0x0000003f 00000149 0x000000ea isub 0x00000002 , 0x0000003f - 00000150 0x000000eb fetcht 0x00000002 , 0x00004d3b + 00000150 0x000000eb fetcht 0x00000002 , 0x00004d27 00000151 0x000000ec idiv 0x00000002 00000152 0x000000ed call 0x00007efd 00000153 0x000000ee quotient 0x0000003f 00000154 0x000000ef rtn 0x00000034 00000155 0x000000f0 copy 0x00000022 , 0x00000002 - 00000156 0x000000f1 storet 0x00000004 , 0x00004d37 - 00000157 0x000000f2 fetch 0x00000001 , 0x00004d3d + 00000156 0x000000f1 storet 0x00000004 , 0x00004d23 + 00000157 0x000000f2 fetch 0x00000001 , 0x00004d29 00000158 0x000000f3 increase 0x00000001 , 0x0000003f - 00000159 0x000000f4 store 0x00000001 , 0x00004d3d + 00000159 0x000000f4 store 0x00000001 , 0x00004d29 00000160 0x000000f5 rtn 00000161 0x000000fb fetcht 0x00000004 , 0x00004c59 00000162 0x000000fc copy 0x00000022 , 0x0000003f @@ -262,16 +262,16 @@ 00000261 0x00000180 branch 0x000069b1 , 0x00000005 00000262 0x00000181 branch 0x0000320b 00000263 0x00000185 copy 0x00000022 , 0x0000003f - 00000264 0x00000186 store 0x00000004 , 0x00004d33 + 00000264 0x00000186 store 0x00000004 , 0x00004d1f 00000265 0x00000187 fetcht 0x00000001 , 0x000047ef - 00000266 0x00000188 fetch 0x00000001 , 0x00004d36 + 00000266 0x00000188 fetch 0x00000001 , 0x00004d22 00000267 0x00000189 isub 0x00000002 , 0x0000003e 00000268 0x0000018a ncall 0x0000010e , 0x00000002 00000269 0x0000018b branch 0x00007c06 - 00000270 0x0000018e fetcht 0x00000004 , 0x00004d33 + 00000270 0x0000018e fetcht 0x00000004 , 0x00004d1f 00000271 0x0000018f storet 0x00000004 , 0x000047ec 00000272 0x00000190 storet 0x00000004 , 0x00004c59 - 00000273 0x00000191 storet 0x00000004 , 0x00004d37 + 00000273 0x00000191 storet 0x00000004 , 0x00004d23 00000274 0x00000192 rtn 00000275 0x00000196 arg 0x000047df , 0x00000011 00000276 0x00000197 call 0x00007f9f @@ -284,7 +284,7 @@ 00000283 0x000001a0 beq 0x0000003d , 0x0000011e 00000284 0x000001a1 beq 0x00000015 , 0x000002a6 00000285 0x000001a2 branch 0x00003e7d - 00000286 0x000001a5 jam 0x00000005 , 0x00004d87 + 00000286 0x000001a5 jam 0x00000005 , 0x00004d73 00000287 0x000001a6 rtn 00000288 0x000001ab storet 0x00000001 , 0x00000259 00000289 0x000001ac fetch 0x00000001 , 0x00004c8d @@ -657,7 +657,7 @@ 00000656 0x00000397 arg 0x000043fa , 0x00000006 00000657 0x00000398 branch 0x00007e45 00000658 0x0000039c copy 0x0000003f , 0x00000039 - 00000659 0x0000039d arg 0x00004d53 , 0x00000006 + 00000659 0x0000039d arg 0x00004d3f , 0x00000006 00000660 0x0000039e branch 0x00007e45 00000661 0x000003a1 fetch 0x00000001 , 0x000043f9 00000662 0x000003a2 add 0x0000003f , 0x0000000b , 0x0000003f @@ -676,7 +676,7 @@ 00000675 0x000003c2 ifetch 0x00000001 , 0x00000006 00000676 0x000003c3 store 0x00000001 , 0x00004cb7 00000677 0x000003c4 rtn - 00000678 0x000003ca jam 0x00000000 , 0x00004d66 + 00000678 0x000003ca jam 0x00000000 , 0x00004d52 00000679 0x000003cb branch 0x000005ba 00000680 0x000003cf call 0x000054bd 00000681 0x000003d0 fetcht 0x00000001 , 0x00000017 @@ -727,14 +727,14 @@ 00000726 0x00000410 nrtn 0x00000001 00000727 0x00000411 fetch 0x00000001 , 0x00004440 00000728 0x00000412 beq 0x00000005 , 0x000002dc - 00000729 0x00000413 fetch 0x00000001 , 0x00004d66 + 00000729 0x00000413 fetch 0x00000001 , 0x00004d52 00000730 0x00000414 beq 0x00000001 , 0x000002e0 00000731 0x00000415 rtn 00000732 0x00000418 fetch 0x00000001 , 0x000003c0 00000733 0x00000419 set1 0x00000004 , 0x0000003f 00000734 0x0000041a store 0x00000001 , 0x000003c0 00000735 0x0000041b rtn - 00000736 0x0000041e jam 0x00000000 , 0x00004d66 + 00000736 0x0000041e jam 0x00000000 , 0x00004d52 00000737 0x0000041f arg 0x00000000 , 0x0000003f 00000738 0x00000420 store 0x00000004 , 0x0000446f 00000739 0x00000421 store 0x00000001 , 0x0000448b @@ -784,7 +784,7 @@ 00000783 0x0000045e call 0x00006227 00000784 0x0000045f fetch 0x00000004 , 0x00004477 00000785 0x00000460 istore 0x00000004 , 0x00000002 - 00000786 0x00000462 fetch 0x00000008 , 0x00004d72 + 00000786 0x00000462 fetch 0x00000008 , 0x00004d5e 00000787 0x00000463 store 0x00000008 , 0x00000380 00000788 0x00000465 call 0x000074b6 00000789 0x00000466 fetch 0x00000001 , 0x0000448b @@ -878,7 +878,7 @@ 00000877 0x000004de loop 0x00000367 00000878 0x000004e0 call 0x0000759e 00000879 0x000004e2 increase 0xfffffffc , 0x00000038 - 00000880 0x000004e3 fetch 0x00000004 , 0x00004d25 + 00000880 0x000004e3 fetch 0x00000004 , 0x00004d11 00000881 0x000004e4 copy 0x0000003f , 0x0000002f 00000882 0x000004e5 increase 0x00000004 , 0x00000038 00000883 0x000004e6 branch 0x00007573 @@ -903,25 +903,25 @@ 00000902 0x00000503 beq 0x00000001 , 0x00000396 00000903 0x00000504 beq 0x0000000b , 0x000003b1 00000904 0x00000505 branch 0x00005907 - 00000905 0x0000050a fetch 0x00000001 , 0x00004d7a + 00000905 0x0000050a fetch 0x00000001 , 0x00004d66 00000906 0x0000050b beq 0x00000002 , 0x0000039a - 00000907 0x0000050d jam 0x00000004 , 0x00004d7b + 00000907 0x0000050d jam 0x00000004 , 0x00004d67 00000908 0x0000050e jam 0x0000003e , 0x00000b7d 00000909 0x0000050f branch 0x00007c27 00000910 0x00000511 fetch 0x00000001 , 0x000044e6 00000911 0x00000512 beq 0x00000000 , 0x00000393 - 00000912 0x00000513 jam 0x00000002 , 0x00004d7b + 00000912 0x00000513 jam 0x00000003 , 0x00004d67 00000913 0x00000514 jam 0x0000003e , 0x00000b7d 00000914 0x00000515 branch 0x00007c27 - 00000915 0x00000517 jam 0x00000005 , 0x00004d7b + 00000915 0x00000517 jam 0x00000002 , 0x00004d67 00000916 0x00000518 jam 0x0000003e , 0x00000b7d 00000917 0x00000519 branch 0x00007c27 - 00000918 0x0000051c fetch 0x00000001 , 0x00004d7a + 00000918 0x0000051c fetch 0x00000001 , 0x00004d66 00000919 0x0000051d beq 0x00000002 , 0x0000038e - 00000920 0x0000051e jam 0x00000002 , 0x00004d7a + 00000920 0x0000051e jam 0x00000002 , 0x00004d66 00000921 0x0000051f branch 0x000003e3 00000922 0x00000522 fetch 0x00000004 , 0x00000347 - 00000923 0x00000523 store 0x00000004 , 0x00004d98 + 00000923 0x00000523 store 0x00000004 , 0x00004d84 00000924 0x00000524 jam 0x00000008 , 0x00000b7d 00000925 0x00000525 branch 0x00005620 00000926 0x00000528 fetch 0x00000002 , 0x00000342 @@ -940,19 +940,19 @@ 00000939 0x00000536 loop 0x000003a4 00000940 0x00000537 branch 0x0000038e 00000941 0x00000539 copy 0x00000013 , 0x0000003f - 00000942 0x0000053a store 0x00000002 , 0x00004d98 + 00000942 0x0000053a store 0x00000002 , 0x00004d84 00000943 0x0000053b jam 0x0000000a , 0x00000b7d 00000944 0x0000053c branch 0x00005620 00000945 0x0000053f arg 0x00000009 , 0x00000039 00000946 0x00000540 arg 0x00000347 , 0x00000011 - 00000947 0x00000541 arg 0x00004d7e , 0x00000012 + 00000947 0x00000541 arg 0x00004d6a , 0x00000012 00000948 0x00000542 call 0x00007f25 00000949 0x00000543 branch 0x000003b7 , 0x00000005 00000950 0x00000544 branch 0x0000038e - 00000951 0x00000547 jam 0x00000002 , 0x00004d7b + 00000951 0x00000547 jam 0x00000005 , 0x00004d67 00000952 0x00000548 jam 0x0000003e , 0x00000b7d 00000953 0x00000549 branch 0x00007c27 - 00000954 0x0000054b jam 0x00000001 , 0x00004d24 + 00000954 0x0000054b jam 0x00000001 , 0x00004d10 00000955 0x0000054c fetch 0x00000002 , 0x000003fa 00000956 0x0000054d beq 0x00000021 , 0x000003be 00000957 0x0000054e branch 0x000059ed @@ -992,10 +992,10 @@ 00000991 0x0000057d beq 0x00000008 , 0x000003fd 00000992 0x0000057e beq 0x0000000a , 0x00000404 00000993 0x0000057f branch 0x00005666 - 00000994 0x00000582 jam 0x00000001 , 0x00004d7a + 00000994 0x00000582 jam 0x00000001 , 0x00004d66 00000995 0x00000583 jam 0x00000006 , 0x00000b7d 00000996 0x00000584 branch 0x00005620 - 00000997 0x00000587 fetch 0x00000001 , 0x00004d7a + 00000997 0x00000587 fetch 0x00000001 , 0x00004d66 00000998 0x00000588 beq 0x00000002 , 0x000003f2 00000999 0x0000058a arg 0x00004445 , 0x00000005 00001000 0x0000058b setarg 0x00000001 @@ -1004,7 +1004,7 @@ 00001003 0x0000058e istore 0x00000002 , 0x00000005 00001004 0x0000058f setarg 0x00002800 00001005 0x00000590 istore 0x00000002 , 0x00000005 - 00001006 0x00000591 arg 0x00004d88 , 0x00000006 + 00001006 0x00000591 arg 0x00004d74 , 0x00000006 00001007 0x00000592 call 0x00007e35 00001008 0x00000593 arg 0x0000001b , 0x00000002 00001009 0x00000594 branch 0x00005892 @@ -1015,18 +1015,18 @@ 00001014 0x0000059a istore 0x00000002 , 0x00000005 00001015 0x0000059b setarg 0x00002800 00001016 0x0000059c istore 0x00000002 , 0x00000005 - 00001017 0x0000059d fetch 0x00000002 , 0x00004d7c + 00001017 0x0000059d fetch 0x00000002 , 0x00004d68 00001018 0x0000059e istore 0x00000002 , 0x00000005 00001019 0x0000059f arg 0x0000000d , 0x00000002 00001020 0x000005a0 branch 0x00005892 - 00001021 0x000005a3 fetch 0x00000004 , 0x00004d98 + 00001021 0x000005a3 fetch 0x00000004 , 0x00004d84 00001022 0x000005a4 arg 0x00004445 , 0x00000005 00001023 0x000005a5 istore 0x00000004 , 0x00000005 00001024 0x000005a6 setarg 0x00002803 00001025 0x000005a7 istore 0x00000002 , 0x00000005 00001026 0x000005a8 force 0x0000000b , 0x00000002 00001027 0x000005a9 branch 0x00005892 - 00001028 0x000005ac fetch 0x00000002 , 0x00004d98 + 00001028 0x000005ac fetch 0x00000002 , 0x00004d84 00001029 0x000005ad store 0x00000002 , 0x00004445 00001030 0x000005ae force 0x00000007 , 0x00000002 00001031 0x000005af branch 0x00005892 @@ -1042,7 +1042,7 @@ 00001041 0x000005c4 beq 0x0000002c , 0x00000414 00001042 0x000005c5 beq 0x0000000e , 0x00000417 00001043 0x000005c7 branch 0x000057c6 - 00001044 0x000005ca fetch 0x00000001 , 0x00004d67 + 00001044 0x000005ca fetch 0x00000001 , 0x00004d53 00001045 0x000005cb branch 0x00005728 , 0x00000034 00001046 0x000005cc branch 0x000057c6 00001047 0x000005cf fetch 0x00000001 , 0x00004c69 @@ -1367,20 +1367,20 @@ 00001366 0x00000765 call 0x00005924 00001367 0x00000766 fetch 0x00000002 , 0x00004437 00001368 0x00000767 mul32 0x0000003f , 0x00000004 , 0x00000002 - 00001369 0x00000768 storet 0x00000002 , 0x00004d3b + 00001369 0x00000768 storet 0x00000002 , 0x00004d27 00001370 0x00000769 rtn 00001371 0x0000076c ifetch 0x00000008 , 0x00000006 - 00001372 0x0000076d store 0x00000004 , 0x00004d6a + 00001372 0x0000076d store 0x00000004 , 0x00004d56 00001373 0x0000076e ifetch 0x00000002 , 0x00000006 - 00001374 0x0000076f store 0x00000002 , 0x00004d68 + 00001374 0x0000076f store 0x00000002 , 0x00004d54 00001375 0x00000770 call 0x00005939 00001376 0x00000771 fetch 0x00000001 , 0x00004c69 00001377 0x00000772 beq 0x00000002 , 0x00000563 00001378 0x00000773 call 0x00000566 00001379 0x00000775 fetch 0x00000008 , 0x00000380 - 00001380 0x00000776 store 0x00000008 , 0x00004d72 + 00001380 0x00000776 store 0x00000008 , 0x00004d5e 00001381 0x00000777 rtn - 00001382 0x0000077a fetch 0x00000006 , 0x00004d68 + 00001382 0x0000077a fetch 0x00000006 , 0x00004d54 00001383 0x0000077b branch 0x0000056c , 0x00000034 00001384 0x0000077c jam 0x00000003 , 0x00004c7c 00001385 0x0000077d call 0x00000326 @@ -1391,7 +1391,7 @@ 00001390 0x00000785 rtn 00001391 0x00000789 jam 0x00000033 , 0x00000b7d 00001392 0x0000078a branch 0x00005620 - 00001393 0x0000078d jam 0x00000001 , 0x00004d66 + 00001393 0x0000078d jam 0x00000001 , 0x00004d52 00001394 0x0000078e jam 0x0000002b , 0x00000b7d 00001395 0x0000078f branch 0x00005620 00001396 0x00000792 setarg 0x00000014 @@ -1415,7 +1415,7 @@ 00001414 0x000007ab branch 0x000058f8 00001415 0x000007af jam 0x00000003 , 0x00004c69 00001416 0x000007b0 branch 0x00005974 - 00001417 0x000007b3 jam 0x00000001 , 0x00004d29 + 00001417 0x000007b3 jam 0x00000001 , 0x00004d15 00001418 0x000007b4 store 0x00000001 , 0x000044ae 00001419 0x000007b5 ifetch 0x00000006 , 0x00000006 00001420 0x000007b6 istore 0x00000006 , 0x00000005 @@ -1454,7 +1454,7 @@ 00001453 0x000007e2 increase 0x00000001 , 0x00000038 00001454 0x000007e3 call 0x0000759e 00001455 0x000007e6 increase 0xfffffffc , 0x00000038 - 00001456 0x000007e7 fetch 0x00000004 , 0x00004d25 + 00001456 0x000007e7 fetch 0x00000004 , 0x00004d11 00001457 0x000007e8 copy 0x0000003f , 0x0000002f 00001458 0x000007e9 increase 0x00000004 , 0x00000038 00001459 0x000007ea force 0x00000038 , 0x00000036 @@ -1474,8 +1474,8 @@ 00001473 0x00000802 store 0x00000004 , 0x00004ba9 00001474 0x00000803 rtn 00001475 0x00000807 rtnmark0 0x00000023 - 00001476 0x00000808 fetch 0x00000004 , 0x00004d2c - 00001477 0x00000809 store 0x00000004 , 0x00004d5a + 00001476 0x00000808 fetch 0x00000004 , 0x00004d18 + 00001477 0x00000809 store 0x00000004 , 0x00004d46 00001478 0x0000080a call 0x000005e9 00001479 0x0000080b nbranch 0x000005dc , 0x00000028 00001480 0x0000080c jam 0x0000000a , 0x00004c15 @@ -1483,7 +1483,7 @@ 00001482 0x0000080e fetch 0x00000001 , 0x00004bef 00001483 0x0000080f rtnne 0x000000ff 00001484 0x00000810 jam 0x00000002 , 0x00004c3d - 00001485 0x00000812 fetch 0x00000001 , 0x00004d31 + 00001485 0x00000812 fetch 0x00000001 , 0x00004d1d 00001486 0x00000813 nrtn 0x00000034 00001487 0x00000814 call 0x0000015c 00001488 0x00000815 nrtn 0x00000028 @@ -1494,7 +1494,7 @@ 00001493 0x0000081a rtn 0x00000034 00001494 0x0000081b fetch 0x00000001 , 0x00004131 00001495 0x0000081c rtn 0x00000034 - 00001496 0x00000820 fetch 0x00000003 , 0x00004d62 + 00001496 0x00000820 fetch 0x00000003 , 0x00004d4e 00001497 0x00000822 call 0x00007e8a 00001498 0x00000823 storet 0x00000004 , 0x000041fc 00001499 0x00000824 branch 0x00003cda @@ -1509,7 +1509,7 @@ 00001508 0x0000082f rtn 0x00000034 00001509 0x00000830 fetch 0x00000001 , 0x00004c15 00001510 0x00000831 nbranch 0x000005d8 , 0x00000034 - 00001511 0x00000832 fetch 0x00000004 , 0x00004d5a + 00001511 0x00000832 fetch 0x00000004 , 0x00004d46 00001512 0x00000833 branch 0x000005d9 00001513 0x00000836 fetch 0x00000001 , 0x00004bef 00001514 0x00000837 bne 0x000000ff , 0x0000065c @@ -1520,21 +1520,21 @@ 00001519 0x0000083d rtn 00001520 0x00000840 disable 0x00000028 00001521 0x00000841 jam 0x00000002 , 0x00004be2 - 00001522 0x00000842 fetch 0x00000001 , 0x00004d3f + 00001522 0x00000842 fetch 0x00000001 , 0x00004d2b 00001523 0x00000843 beq 0x00000004 , 0x000005fa 00001524 0x00000844 beq 0x00000005 , 0x000005fd 00001525 0x00000845 beq 0x00000007 , 0x00000603 00001526 0x00000846 beq 0x00000006 , 0x00000600 - 00001527 0x00000847 fetch 0x00000001 , 0x00004d31 + 00001527 0x00000847 fetch 0x00000001 , 0x00004d1d 00001528 0x00000848 ncall 0x000034df , 0x00000034 00001529 0x00000849 rtn - 00001530 0x0000084b jam 0x00000000 , 0x00004d3f + 00001530 0x0000084b jam 0x00000000 , 0x00004d2b 00001531 0x0000084c jam 0x0000000a , 0x00004be1 00001532 0x0000084d branch 0x00000605 - 00001533 0x0000084f jam 0x00000003 , 0x00004d3f + 00001533 0x0000084f jam 0x00000003 , 0x00004d2b 00001534 0x00000850 jam 0x00000004 , 0x00004be1 00001535 0x00000851 branch 0x00000605 - 00001536 0x00000853 jam 0x00000002 , 0x00004d3f + 00001536 0x00000853 jam 0x00000002 , 0x00004d2b 00001537 0x00000854 jam 0x00000003 , 0x00004be1 00001538 0x00000855 branch 0x00000605 00001539 0x00000857 jam 0x00000001 , 0x00004be2 @@ -1542,7 +1542,7 @@ 00001541 0x0000085a jam 0x00000000 , 0x00004be7 00001542 0x0000085b branch 0x000034df 00001543 0x0000085f arg 0x00000009 , 0x00000039 - 00001544 0x00000860 arg 0x00004d3f , 0x00000006 + 00001544 0x00000860 arg 0x00004d2b , 0x00000006 00001545 0x00000861 arg 0x00000cd5 , 0x00000005 00001546 0x00000862 branch 0x00007e45 00001547 0x00000866 jam 0x00000000 , 0x00004be8 @@ -1552,14 +1552,14 @@ 00001551 0x0000086d fetch 0x00000001 , 0x00004be0 00001552 0x0000086e increase 0x00000001 , 0x0000003f 00001553 0x0000086f store 0x00000001 , 0x00004be0 - 00001554 0x00000870 jam 0x00000000 , 0x00004d31 + 00001554 0x00000870 jam 0x00000000 , 0x00004d1d 00001555 0x00000871 fetch 0x00000001 , 0x00004bef 00001556 0x00000872 bne 0x000000ff , 0x0000062f 00001557 0x00000874 call 0x0000062b 00001558 0x00000875 jam 0x00000000 , 0x00004be7 00001559 0x00000876 jam 0x00000000 , 0x00004be6 00001560 0x00000877 rtn - 00001561 0x0000087b jam 0x00000001 , 0x00004d31 + 00001561 0x0000087b jam 0x00000001 , 0x00004d1d 00001562 0x0000087c fetch 0x00000001 , 0x00004be7 00001563 0x0000087d increase 0x00000001 , 0x0000003f 00001564 0x0000087e store 0x00000001 , 0x00004be7 @@ -1579,7 +1579,7 @@ 00001578 0x0000088c branch 0x000006ea 00001579 0x00000890 setarg 0x00000000 00001580 0x00000891 store 0x00000009 , 0x00000cd5 - 00001581 0x00000892 store 0x00000009 , 0x00004d3f + 00001581 0x00000892 store 0x00000009 , 0x00004d2b 00001582 0x00000893 rtn 00001583 0x000008a0 branch 0x00000676 00001584 0x000008a3 disable 0x0000002f @@ -1594,9 +1594,9 @@ 00001593 0x000008ae call 0x00000702 00001594 0x000008af call 0x0000073c , 0x0000002f 00001595 0x000008b0 rtn - 00001596 0x000008b8 jam 0x00000000 , 0x00004d31 + 00001596 0x000008b8 jam 0x00000000 , 0x00004d1d 00001597 0x000008b9 rtn - 00001598 0x000008be jam 0x00000000 , 0x00004d31 + 00001598 0x000008be jam 0x00000000 , 0x00004d1d 00001599 0x000008bf jam 0x00000032 , 0x00000b7d 00001600 0x000008c0 branch 0x00007c27 00001601 0x000008c4 call 0x000006ab @@ -1615,7 +1615,7 @@ 00001614 0x000008d1 beq 0x000000ff , 0x00000651 00001615 0x000008d2 store 0x00000001 , 0x00004cb7 00001616 0x000008d4 rtn - 00001617 0x000008d7 jam 0x00000001 , 0x00004d65 + 00001617 0x000008d7 jam 0x00000001 , 0x00004d51 00001618 0x000008d8 rtn 00001619 0x000008dd set1 0x00000023 , 0x00000000 00001620 0x000008de call 0x00000658 Index: btkb/output/bt_program23.list =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.list (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.list (working copy) @@ -1052,11 +1052,11 @@ : 001296 p_le_parse_att_not_find_mac_report: 0x38e 001297 fetch 1 ,mem_le_conn_peer_addr_type 0x38f 001298 beq le_addr_type_public ,p_keyboard_system_is_windows -0x390 001299 jam osmode_windows ,mem_le_system_4type +0x390 001299 jam osmode_android ,mem_le_system_4type 0x391 001300 jam ipc_evt_ancs_auto_system ,mem_fifo_temp 0x392 001301 branch ui_ipc_send_event : 001302 p_keyboard_system_is_windows: -0x393 001303 jam osmode_mac ,mem_le_system_4type +0x393 001303 jam osmode_windows ,mem_le_system_4type 0x394 001304 jam ipc_evt_ancs_auto_system ,mem_fifo_temp 0x395 001305 branch ui_ipc_send_event : 001307 p_le_send_att_find_by_type_value_response_ios: @@ -1099,7 +1099,7 @@ 0x3b5 001347 branch p_le_parse_att_find_mac_report ,zero 0x3b6 001348 branch p_le_parse_att_not_find_mac_report : 001350 p_le_parse_att_find_mac_report: -0x3b7 001351 jam osmode_windows ,mem_le_system_4type +0x3b7 001351 jam osmode_mac ,mem_le_system_4type 0x3b8 001352 jam ipc_evt_ancs_auto_system ,mem_fifo_temp 0x3b9 001353 branch ui_ipc_send_event : 001354 p_le_parse_att_write_command: Index: btkb/output/bt_program23.meta =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.meta (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.meta (working copy) @@ -1296,11 +1296,11 @@ p_le_parse_att_not_find_mac_report: fetch 1,mem_le_conn_peer_addr_type beq LE_ADDR_TYPE_PUBLIC,p_keyboard_system_is_windows - jam OSMODE_WINDOWS,mem_le_system_4type + jam OSMODE_ANDROID,mem_le_system_4type jam IPC_EVT_ANCS_AUTO_SYSTEM,mem_fifo_temp branch ui_ipc_send_event p_keyboard_system_is_windows: - jam OSMODE_MAC,mem_le_system_4type + jam OSMODE_WINDOWS,mem_le_system_4type jam IPC_EVT_ANCS_AUTO_SYSTEM,mem_fifo_temp branch ui_ipc_send_event // second time read device info service differ phone from other @@ -1348,7 +1348,7 @@ branch p_le_parse_att_not_find_mac_report p_le_parse_att_find_mac_report: - jam OSMODE_WINDOWS,mem_le_system_4type + jam OSMODE_MAC,mem_le_system_4type jam IPC_EVT_ANCS_AUTO_SYSTEM,mem_fifo_temp branch ui_ipc_send_event p_le_parse_att_write_command: Index: btkb/output/bt_program23.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/bt_program23.rom (working copy) @@ -103,7 +103,7 @@ 00011000010100001000010000000000 01100000000010010100101110011010 00100000011000000000000000000000 -11011000101000000100110100111111 +11011000101000000100110100101011 00100000001000000000000011011011 00011000110000100010001000000000 01101000000000001100101110101001 @@ -137,27 +137,27 @@ 00100000001000000000000010000010 01101000000000010100110010111100 00100000001000000000000010000010 -01101000000000010100110100101010 +01101000000000010100110100010110 00100000010000000000000010010000 -01101000000000001100110101100111 +01101000000000001100110101010011 00100000011110100000000000000000 00100000001000000000000010000011 11100000101000010000000000000000 00011010001000100000110000000000 00100000001000000000000011011101 -01101000000010100100110100110111 +01101000000010100100110100100011 00011100010000100111111000000000 10011000010001100111111000000000 -01101000000010010100110100111011 +01101000000010010100110100100111 10011000010001101111110000000000 00100000010000000111111011111101 00011000000001111111111000000000 00100000011110100000000000000000 00011100010000100000010000000000 -01100000000010100100110100110111 -01101000000000001100110100111101 +01100000000010100100110100100011 +01101000000000001100110100101001 00011111111000001111111000000001 -01100000000000001100110100111101 +01100000000000001100110100101001 00100000011000000000000000000000 01101000000010100100110001011001 00011100010000100111111000000000 @@ -262,16 +262,16 @@ 00100000001000101110100110110001 00100000001000000011001000001011 00011100010000100111111000000000 -01100000000000100100110100110011 +01100000000000100100110100011111 01101000000010001100011111101111 -01101000000000001100110100110110 +01101000000000001100110100100010 10011000010001100111110000000000 00100100010000010000000100001110 00100000001000000111110000000110 -01101000000010100100110100110011 +01101000000010100100110100011111 01100000000010100100011111101100 01100000000010100100110001011001 -01100000000010100100110100110111 +01100000000010100100110100100011 00100000011000000000000000000000 11011010001000000100011111011111 00100000010000000111111110011111 @@ -284,7 +284,7 @@ 11000000000111101000000100011110 11000000000010101000001010100110 00100000001000000011111001111101 -01110000010011011000011100000101 +01110000010011010111001100000101 00100000011000000000000000000000 01100000000010001000001001011001 01101000000000001100110010001101 @@ -657,7 +657,7 @@ 11011000110000000100001111111010 00100000001000000111111001000101 00011111111000100111001000000000 -11011000110000000100110101010011 +11011000110000000100110100111111 00100000001000000111111001000101 01101000000000001100001111111001 00011111111000001111111000001011 @@ -676,7 +676,7 @@ 11101000110000001000000000000000 01100000000000001100110010110111 00100000011000000000000000000000 -01110000010011010110011000000000 +01110000010011010101001000000000 00100000001000000000010110111010 00100000010000000101010010111101 01101000000010001000000000010111 @@ -727,14 +727,14 @@ 00100100011000001000000000000000 01101000000000001100010001000000 11000000000000101000001011011100 -01101000000000001100110101100110 +01101000000000001100110101010010 11000000000000001000001011100000 00100000011000000000000000000000 01101000000000001000001111000000 01111001001000000111111000000100 01100000000000001000001111000000 00100000011000000000000000000000 -01110000010011010110011000000000 +01110000010011010101001000000000 11011111111000000000000000000000 01100000000000100100010001101111 01100000000000001100010010001011 @@ -784,7 +784,7 @@ 00100000010000000110001000100111 01101000000000100100010001110111 11100000010000100000000000000000 -01101000000001000100110101110010 +01101000000001000100110101011110 01100000000001000000001110000000 00100000010000000111010010110110 01101000000000001100010010001011 @@ -878,7 +878,7 @@ 11000010000000000000001101100111 00100000010000000111010110011110 00011111000000001111000111111100 -01101000000000100100110100100101 +01101000000000100100110100010001 00011111111000100101111000000000 00011111000000001111000000000100 00100000001000000111010101110011 @@ -903,25 +903,25 @@ 11000000000000001000001110010110 11000000000001011000001110110001 00100000001000000101100100000111 -01101000000000001100110101111010 +01101000000000001100110101100110 11000000000000010000001110011010 -01110000010011010111101100000100 +01110000010011010110011100000100 01110000000010110111110100111110 00100000001000000111110000100111 01101000000000001100010011100110 11000000000000000000001110010011 -01110000010011010111101100000010 +01110000010011010110011100000011 01110000000010110111110100111110 00100000001000000111110000100111 -01110000010011010111101100000101 +01110000010011010110011100000010 01110000000010110111110100111110 00100000001000000111110000100111 -01101000000000001100110101111010 +01101000000000001100110101100110 11000000000000010000001110001110 -01110000010011010111101000000010 +01110000010011010110011000000010 00100000001000000000001111100011 01101000000000100000001101000111 -01100000000000100100110110011000 +01100000000000100100110110000100 01110000000010110111110100001000 00100000001000000101011000100000 01101000000000010000001101000010 @@ -940,19 +940,19 @@ 11000010000000000000001110100100 00100000001000000000001110001110 00011010011000100111111000000000 -01100000000000010100110110011000 +01100000000000010100110110000100 01110000000010110111110100001010 00100000001000000101011000100000 11011111001000000000000000001001 11011010001000000000001101000111 -11011010010000000100110101111110 +11011010010000000100110101101010 00100000010000000111111100100101 00100000001000101000001110110111 00100000001000000000001110001110 -01110000010011010111101100000010 +01110000010011010110011100000101 01110000000010110111110100111110 00100000001000000111110000100111 -01110000010011010010010000000001 +01110000010011010001000000000001 01101000000000010000001111111010 11000000000100001000001110111110 00100000001000000101100111101101 @@ -992,10 +992,10 @@ 11000000000001000000001111111101 11000000000001010000010000000100 00100000001000000101011001100110 -01110000010011010111101000000001 +01110000010011010110011000000001 01110000000010110111110100000110 00100000001000000101011000100000 -01101000000000001100110101111010 +01101000000000001100110101100110 11000000000000010000001111110010 11011000101000000100010001000101 01011000000000000000000000000001 @@ -1004,7 +1004,7 @@ 11100000101000010000000000000000 01011000000000000010100000000000 11100000101000010000000000000000 -11011000110000000100110110001000 +11011000110000000100110101110100 00100000010000000111111000110101 11011000010000000000000000011011 00100000001000000101100010010010 @@ -1015,18 +1015,18 @@ 11100000101000010000000000000000 01011000000000000010100000000000 11100000101000010000000000000000 -01101000000000010100110101111100 +01101000000000010100110101101000 11100000101000010000000000000000 11011000010000000000000000001101 00100000001000000101100010010010 -01101000000000100100110110011000 +01101000000000100100110110000100 11011000101000000100010001000101 11100000101000100000000000000000 01011000000000000010100000000011 11100000101000010000000000000000 00011000000000000000010000001011 00100000001000000101100010010010 -01101000000000010100110110011000 +01101000000000010100110110000100 01100000000000010100010001000101 00011000000000000000010000000111 00100000001000000101100010010010 @@ -1042,7 +1042,7 @@ 11000000000101100000010000010100 11000000000001110000010000010111 00100000001000000101011111000110 -01101000000000001100110101100111 +01101000000000001100110101010011 00100000001110100101011100101000 00100000001000000101011111000110 01101000000000001100110001101001 @@ -1367,20 +1367,20 @@ 00100000010000000101100100100100 01101000000000010100010000110111 00011111111011111000010000000100 -01100000000010010100110100111011 +01100000000010010100110100100111 00100000011000000000000000000000 11101000110001000000000000000000 -01100000000000100100110101101010 +01100000000000100100110101010110 11101000110000010000000000000000 -01100000000000010100110101101000 +01100000000000010100110101010100 00100000010000000101100100111001 01101000000000001100110001101001 11000000000000010000010101100011 00100000010000000000010101100110 01101000000001000000001110000000 -01100000000001000100110101110010 +01100000000001000100110101011110 00100000011000000000000000000000 -01101000000000110100110101101000 +01101000000000110100110101010100 00100000001110100000010101101100 01110000010011000111110000000011 00100000010000000000001100100110 @@ -1391,7 +1391,7 @@ 00100000011000000000000000000000 01110000000010110111110100110011 00100000001000000101011000100000 -01110000010011010110011000000001 +01110000010011010101001000000001 01110000000010110111110100101011 00100000001000000101011000100000 01011000000000000000000000010100 @@ -1415,7 +1415,7 @@ 00100000001000000101100011111000 01110000010011000110100100000011 00100000001000000101100101110100 -01110000010011010010100100000001 +01110000010011010001010100000001 01100000000000001100010010101110 11101000110000110000000000000000 11100000101000110000000000000000 @@ -1454,7 +1454,7 @@ 00011111000000001111000000000001 00100000010000000111010110011110 00011111000000001111000111111100 -01101000000000100100110100100101 +01101000000000100100110100010001 00011111111000100101111000000000 00011111000000001111000000000100 00011000000000000110110000111000 @@ -1474,8 +1474,8 @@ 01100000000000100100101110101001 00100000011000000000000000000000 11000110100100011000000000000000 -01101000000000100100110100101100 -01100000000000100100110101011010 +01101000000000100100110100011000 +01100000000000100100110101000110 00100000010000000000010111101001 00100100001101000000010111011100 01110000010011000001010100001010 @@ -1483,7 +1483,7 @@ 01101000000000001100101111101111 11000001111111111000000000000000 01110000010011000011110100000010 -01101000000000001100110100110001 +01101000000000001100110100011101 00100100011110100000000000000000 00100000010000000000000101011100 00100100011101000000000000000000 @@ -1494,7 +1494,7 @@ 00100000011110100000000000000000 01101000000000001100000100110001 00100000011110100000000000000000 -01101000000000011100110101100010 +01101000000000011100110101001110 00100000010000000111111010001010 01100000000010100100000111111100 00100000001000000011110011011010 @@ -1509,7 +1509,7 @@ 00100000011110100000000000000000 01101000000000001100110000010101 00100100001110100000010111011000 -01101000000000100100110101011010 +01101000000000100100110101000110 00100000001000000000010111011001 01101000000000001100101111101111 11000000111111111000011001011100 @@ -1520,21 +1520,21 @@ 00100000011000000000000000000000 01111000010101000111110000000000 01110000010010111110001000000010 -01101000000000001100110100111111 +01101000000000001100110100101011 11000000000000100000010111111010 11000000000000101000010111111101 11000000000000111000011000000011 11000000000000110000011000000000 -01101000000000001100110100110001 +01101000000000001100110100011101 00100100010110100011010011011111 00100000011000000000000000000000 -01110000010011010011111100000000 +01110000010011010010101100000000 01110000010010111110000100001010 00100000001000000000011000000101 -01110000010011010011111100000011 +01110000010011010010101100000011 01110000010010111110000100000100 00100000001000000000011000000101 -01110000010011010011111100000010 +01110000010011010010101100000010 01110000010010111110000100000011 00100000001000000000011000000101 01110000010010111110001000000001 @@ -1542,7 +1542,7 @@ 01110000010010111110011100000000 00100000001000000011010011011111 11011111001000000000000000001001 -11011000110000000100110100111111 +11011000110000000100110100101011 11011000101000000000110011010101 00100000001000000111111001000101 01110000010010111110100000000000 @@ -1552,14 +1552,14 @@ 01101000000000001100101111100000 00011111111000001111111000000001 01100000000000001100101111100000 -01110000010011010011000100000000 +01110000010011010001110100000000 01101000000000001100101111101111 11000000111111111000011000101111 00100000010000000000011000101011 01110000010010111110011100000000 01110000010010111110011000000000 00100000011000000000000000000000 -01110000010011010011000100000001 +01110000010011010001110100000001 01101000000000001100101111100111 00011111111000001111111000000001 01100000000000001100101111100111 @@ -1579,7 +1579,7 @@ 00100000001000000000011011101010 01011000000000000000000000000000 01100000000001001000110011010101 -01100000000001001100110100111111 +01100000000001001100110100101011 00100000011000000000000000000000 00100000001000000000011001110110 01111000010101111111110000000000 @@ -1594,9 +1594,9 @@ 00100000010000000000011100000010 00100000010101111000011100111100 00100000011000000000000000000000 -01110000010011010011000100000000 +01110000010011010001110100000000 00100000011000000000000000000000 -01110000010011010011000100000000 +01110000010011010001110100000000 01110000000010110111110100110010 00100000001000000111110000100111 00100000010000000000011010101011 @@ -1615,7 +1615,7 @@ 11000000011111111000011001010001 01100000000000001100110010110111 00100000011000000000000000000000 -01110000010011010110010100000001 +01110000010011010101000100000001 00100000011000000000000000000000 01111001001000000000000000100011 00100000010000000000011001011000 Index: btkb/output/eeprom.dat =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/eeprom.dat (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/eeprom.dat (working copy) @@ -427,7 +427,7 @@ d8 a0 4d -3f +2b 20 20 00 @@ -563,7 +563,7 @@ 68 01 4d -2a +16 20 40 00 @@ -571,7 +571,7 @@ 68 00 cd -67 +53 20 7a 00 @@ -595,7 +595,7 @@ 68 0a 4d -37 +23 1c 42 7e @@ -607,7 +607,7 @@ 68 09 4d -3b +27 98 46 fc @@ -631,11 +631,11 @@ 60 0a 4d -37 +23 68 00 cd -3d +29 1f e0 fe @@ -643,7 +643,7 @@ 60 00 cd -3d +29 20 60 00 @@ -1063,7 +1063,7 @@ 60 02 4d -33 +1f 68 08 c7 @@ -1071,7 +1071,7 @@ 68 00 cd -36 +22 98 46 7c @@ -1087,7 +1087,7 @@ 68 0a 4d -33 +1f 60 0a 47 @@ -1099,7 +1099,7 @@ 60 0a 4d -37 +23 20 60 00 @@ -1150,7 +1150,7 @@ 7d 70 4d -87 +73 05 20 60 @@ -2643,7 +2643,7 @@ d8 c0 4d -53 +3f 20 20 7e @@ -2718,7 +2718,7 @@ 00 70 4d -66 +52 00 20 20 @@ -2923,7 +2923,7 @@ 68 00 cd -66 +52 c0 00 82 @@ -2950,7 +2950,7 @@ 00 70 4d -66 +52 00 df e0 @@ -3151,7 +3151,7 @@ 68 04 4d -72 +5e 60 04 03 @@ -3527,7 +3527,7 @@ 68 02 4d -25 +11 1f e2 5e @@ -3627,14 +3627,14 @@ 68 00 cd -7a +66 c0 01 03 9a 70 4d -7b +67 04 70 0b @@ -3654,8 +3654,8 @@ 93 70 4d -7b -02 +67 +03 70 0b 7d @@ -3666,8 +3666,8 @@ 27 70 4d -7b -05 +67 +02 70 0b 7d @@ -3679,14 +3679,14 @@ 68 00 cd -7a +66 c0 01 03 8e 70 4d -7a +66 02 20 20 @@ -3699,7 +3699,7 @@ 60 02 4d -98 +84 70 0b 7d @@ -3775,7 +3775,7 @@ 60 01 4d -98 +84 70 0b 7d @@ -3795,7 +3795,7 @@ da 40 4d -7e +6a 20 40 7f @@ -3810,8 +3810,8 @@ 8e 70 4d -7b -02 +67 +05 70 0b 7d @@ -3822,7 +3822,7 @@ 27 70 4d -24 +10 01 68 01 @@ -3982,7 +3982,7 @@ 66 70 4d -7a +66 01 70 0b @@ -3995,7 +3995,7 @@ 68 00 cd -7a +66 c0 01 03 @@ -4031,7 +4031,7 @@ d8 c0 4d -88 +74 20 40 7e @@ -4075,7 +4075,7 @@ 68 01 4d -7c +68 e0 a1 00 @@ -4091,7 +4091,7 @@ 68 02 4d -98 +84 d8 a0 44 @@ -4119,7 +4119,7 @@ 68 01 4d -98 +84 60 01 44 @@ -4183,7 +4183,7 @@ 68 00 cd -67 +53 20 3a 57 @@ -5483,7 +5483,7 @@ 60 09 4d -3b +27 20 60 00 @@ -5495,7 +5495,7 @@ 60 02 4d -6a +56 e8 c1 00 @@ -5503,7 +5503,7 @@ 60 01 4d -68 +54 20 40 59 @@ -5527,7 +5527,7 @@ 60 04 4d -72 +5e 20 60 00 @@ -5535,7 +5535,7 @@ 68 03 4d -68 +54 20 3a 05 @@ -5578,7 +5578,7 @@ 20 70 4d -66 +52 01 70 0b @@ -5674,7 +5674,7 @@ 74 70 4d -29 +15 01 60 00 @@ -5831,7 +5831,7 @@ 68 02 4d -25 +11 1f e2 5e @@ -5911,11 +5911,11 @@ 68 02 4d -2c +18 60 02 4d -5a +46 20 40 05 @@ -5947,7 +5947,7 @@ 68 00 cd -31 +1d 24 7a 00 @@ -5991,7 +5991,7 @@ 68 01 cd -62 +4e 20 40 7e @@ -6051,7 +6051,7 @@ 68 02 4d -5a +46 20 20 05 @@ -6095,7 +6095,7 @@ 68 00 cd -3f +2b c0 02 05 @@ -6115,7 +6115,7 @@ 68 00 cd -31 +1d 24 5a 34 @@ -6126,7 +6126,7 @@ 00 70 4d -3f +2b 00 70 4b @@ -6138,7 +6138,7 @@ 05 70 4d -3f +2b 03 70 4b @@ -6150,7 +6150,7 @@ 05 70 4d -3f +2b 02 70 4b @@ -6183,7 +6183,7 @@ d8 c0 4d -3f +2b d8 a0 0c @@ -6222,7 +6222,7 @@ e0 70 4d -31 +1d 00 68 00 @@ -6250,7 +6250,7 @@ 00 70 4d -31 +1d 01 68 00 @@ -6331,7 +6331,7 @@ 60 04 cd -3f +2b 20 60 00 @@ -6390,7 +6390,7 @@ 00 70 4d -31 +1d 00 20 60 @@ -6398,7 +6398,7 @@ 00 70 4d -31 +1d 00 70 0b @@ -6474,7 +6474,7 @@ 00 70 4d -65 +51 01 20 60 @@ -7568,8 +7568,8 @@ 20 3a 7a -12 -03 +96 +8f aa 55 40 @@ -7644,7 +7644,7 @@ 55 02 00 -3b +27 4d 20 00 @@ -8371,6 +8371,51 @@ dd aa 55 +09 +00 +6a +4d +41 +70 +70 +6c +65 +20 +49 +6e +63 +aa +55 +02 +00 +68 +4d +0a +18 +aa +55 +10 +00 +74 +4d +d0 +00 +2d +12 +1e +4b +0f +a4 +99 +4e +ce +b5 +31 +f4 +05 +79 +aa +55 01 00 7e @@ -8392,7 +8437,7 @@ 55 02 00 -2a +16 4d 2c 00 @@ -8405,39 +8450,9 @@ 50 aa 55 -02 -00 -7c -4d -0a -18 -aa -55 -10 -00 -88 -4d -d0 -00 -2d -12 -1e -4b -0f -a4 -99 -4e -ce -b5 -31 -f4 -05 -79 -aa -55 01 00 -67 +53 4d 01 aa @@ -8519,7 +8534,7 @@ 55 07 00 -53 +3f 4d 06 ff @@ -8670,7 +8685,7 @@ 55 04 00 -2c +18 4d 00 48 @@ -8680,7 +8695,7 @@ 55 07 00 -5e +4a 4d ff ff @@ -8974,7 +8989,7 @@ aa aa 55 -b4 -3d -1c -a9 +ff +41 +58 +13 Index: btkb/output/memmap.format =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/memmap.format (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/memmap.format (working copy) @@ -1010,37 +1010,37 @@ 0x4cbc mem_att_report3 0x4cbe mem_suspend_flag 0x4cbf mem_32asm_data_end -0x4d23 mem_store_ltk_timer -0x4d24 mem_reconnect_continue -0x4d25 mem_le_pin_code -0x4d29 mem_le_send_security_request_flag -0x4d2a mem_att_report_battery -0x4d2c mem_24g_enter_hibernate -0x4d30 mem_24g_txfail_cnt -0x4d31 mem_mouse_retry_flag -0x4d32 mem_24g_led_flag -0x4d33 mem_ui_timer_last_btclk_temp -0x4d37 mem_ui_check_timer_setup -0x4d3b mem_customize_timer_setup -0x4d3d mem_customize_timer -0x4d3e mem_ios_mode_flag -0x4d3f mem_24g_txbuf_new -0x4d53 mem_le_adv_swift_pair -0x4d5a mem_24g_enter_hibernate_setup -0x4d5e mem_24g_enter_hibernate_max -0x4d62 mem_24g_short_sleep_counter -0x4d65 mem_pc_sleep_flag -0x4d66 mem_le_pause_enc_flag -0x4d67 mem_le_battery_level_display_enable -0x4d68 mem_le_evidm -0x4d72 mem_le_skdm_temp -0x4d7a mem_le_connect_ios_mac_flag -0x4d7b mem_le_system_4type -0x4d7c mem_le_search_mac_uuid -0x4d7e mem_le_search_mac_manu_name -0x4d87 mem_le_start_auto_reco_timer -0x4d88 mem_le_search_service_uuid -0x4d98 mem_le_mac_handle_number +0x4d0f mem_store_ltk_timer +0x4d10 mem_reconnect_continue +0x4d11 mem_le_pin_code +0x4d15 mem_le_send_security_request_flag +0x4d16 mem_att_report_battery +0x4d18 mem_24g_enter_hibernate +0x4d1c mem_24g_txfail_cnt +0x4d1d mem_mouse_retry_flag +0x4d1e mem_24g_led_flag +0x4d1f mem_ui_timer_last_btclk_temp +0x4d23 mem_ui_check_timer_setup +0x4d27 mem_customize_timer_setup +0x4d29 mem_customize_timer +0x4d2a mem_ios_mode_flag +0x4d2b mem_24g_txbuf_new +0x4d3f mem_le_adv_swift_pair +0x4d46 mem_24g_enter_hibernate_setup +0x4d4a mem_24g_enter_hibernate_max +0x4d4e mem_24g_short_sleep_counter +0x4d51 mem_pc_sleep_flag +0x4d52 mem_le_pause_enc_flag +0x4d53 mem_le_battery_level_display_enable +0x4d54 mem_le_evidm +0x4d5e mem_le_skdm_temp +0x4d66 mem_le_connect_ios_mac_flag +0x4d67 mem_le_system_4type +0x4d68 mem_le_search_mac_uuid +0x4d6a mem_le_search_mac_manu_name +0x4d73 mem_le_start_auto_reco_timer +0x4d74 mem_le_search_service_uuid +0x4d84 mem_le_mac_handle_number 0x4800 mem_at_gpio 0x4801 mem_module_wake_up_gpio 0x4802 mem_module_state_gpio Index: btkb/output/program.lis =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/program.lis (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/program.lis (working copy) @@ -131,7 +131,7 @@ 0068 20600000 rtn p_ipc_rx_24g: -0069 d8a04d3f arg mem_24g_txbuf_new ,contw +0069 d8a04d2b arg mem_24g_txbuf_new ,contw 006a 202000db branch p_ipc_rx_cpy p_ipc_rx_ble: @@ -179,9 +179,9 @@ 008a 20200082 branch p_set_report p_report4: -008b 68014d2a fetch 2 ,mem_att_report_battery +008b 68014d16 fetch 2 ,mem_att_report_battery 008c 20400090 call p_ipc_copy_2byte -008d 6800cd67 fetch 1 ,mem_le_battery_level_display_enable +008d 6800cd53 fetch 1 ,mem_le_battery_level_display_enable 008e 207a0000 rtn blank 008f 20200083 branch p_set_report + 1 @@ -191,19 +191,19 @@ 0092 202000dd branch p_ipc_copy p_ui_check_timer_setup: -0093 680a4d37 fetcht 4 ,mem_ui_check_timer_setup +0093 680a4d23 fetcht 4 ,mem_ui_check_timer_setup 0094 1c427e00 copy clkn_bt ,pdata 0095 98467e00 isub temp ,pdata -0096 68094d3b fetcht 2 ,mem_customize_timer_setup +0096 68094d27 fetcht 2 ,mem_customize_timer_setup 0097 9846fc00 idiv temp 0098 20407efd call wait_div_end 0099 1807fe00 quotient pdata 009a 207a0000 rtn blank 009b 1c420400 copy clkn_bt ,temp -009c 600a4d37 storet 4 ,mem_ui_check_timer_setup -009d 6800cd3d fetch 1 ,mem_customize_timer +009c 600a4d23 storet 4 ,mem_ui_check_timer_setup +009d 6800cd29 fetch 1 ,mem_customize_timer 009e 1fe0fe01 increase 1 ,pdata -009f 6000cd3d store 1 ,mem_customize_timer +009f 6000cd29 store 1 ,mem_customize_timer 00a0 20600000 rtn p_ipc_timer_check: @@ -348,18 +348,18 @@ p_ui_timer_check: 0107 1c427e00 copy clkn_bt ,pdata -0108 60024d33 store 4 ,mem_ui_timer_last_btclk_temp +0108 60024d1f store 4 ,mem_ui_timer_last_btclk_temp 0109 6808c7ef fetcht 1 ,mem_ui_timer_last_btclk + 3 -010a 6800cd36 fetch 1 ,mem_ui_timer_last_btclk_temp + 3 +010a 6800cd22 fetch 1 ,mem_ui_timer_last_btclk_temp + 3 010b 98467c00 isub temp ,null 010c 2441010e ncall p_ui_timer_reinit ,positive 010d 20207c06 branch ui_timer_check + 2 p_ui_timer_reinit: -010e 680a4d33 fetcht 4 ,mem_ui_timer_last_btclk_temp +010e 680a4d1f fetcht 4 ,mem_ui_timer_last_btclk_temp 010f 600a47ec storet 4 ,mem_ui_timer_last_btclk 0110 600a4c59 storet 4 ,mem_ipc_last_check_timer -0111 600a4d37 storet 4 ,mem_ui_check_timer_setup +0111 600a4d23 storet 4 ,mem_ui_check_timer_setup 0112 20600000 rtn p_app_process_bb_event: @@ -378,7 +378,7 @@ 011d 20203e7d branch app_event_normal_process p_mouse_le_ll_start_encryt: -011e 704d8705 jam 5 ,mem_le_start_auto_reco_timer +011e 704d7305 jam 5 ,mem_le_start_auto_reco_timer 011f 20600000 rtn p_kb_bb_event_timer: @@ -855,7 +855,7 @@ p_handle_adv_swift_pair: 0292 1fe27200 copy pdata ,loopcnt -0293 d8c04d53 arg mem_le_adv_swift_pair ,contr +0293 d8c04d3f arg mem_le_adv_swift_pair ,contr 0294 20207e45 branch memcpy p_le_adv_data_overflow: @@ -884,7 +884,7 @@ 02a5 20600000 rtn p_scale_process_le_discon: -02a6 704d6600 jam 0 ,mem_le_pause_enc_flag +02a6 704d5200 jam 0 ,mem_le_pause_enc_flag 02a7 202005ba branch scale_process_le_discon p_le_transmit_receive_sifs: @@ -953,7 +953,7 @@ 02d6 24608000 nrtn true 02d7 6800c440 fetch 1 ,mem_le_txpayload 02d8 c00282dc beq ll_start_enc_req ,p_le_set_enc -02d9 6800cd66 fetch 1 ,mem_le_pause_enc_flag +02d9 6800cd52 fetch 1 ,mem_le_pause_enc_flag 02da c00082e0 beq 1 ,p_le_clear_enc 02db 20600000 rtn @@ -964,7 +964,7 @@ 02df 20600000 rtn p_le_clear_enc: -02e0 704d6600 jam 0 ,mem_le_pause_enc_flag +02e0 704d5200 jam 0 ,mem_le_pause_enc_flag 02e1 dfe00000 arg 0 ,pdata 02e2 6002446f store 4 ,mem_le_last_mic 02e3 6000c48b store 1 ,mem_ltk_exists @@ -1030,7 +1030,7 @@ 030f 20406227 call generate_random_loop 0310 68024477 fetch 4 ,mem_le_ivs 0311 e0420000 istore 4 ,temp -0312 68044d72 fetch 8 ,mem_le_skdm_temp +0312 68044d5e fetch 8 ,mem_le_skdm_temp 0313 60040380 store 8 ,mem_le_skdm 0314 204074b6 call generate_sk 0315 6800c48b fetch 1 ,mem_ltk_exists @@ -1150,7 +1150,7 @@ 036d c2000367 loop p_function_c1_loop1 036e 2040759e call aes_clear 036f 1f00f1fc increase -4 ,regext_index -0370 68024d25 fetch 4 ,mem_le_pin_code +0370 68024d11 fetch 4 ,mem_le_pin_code 0371 1fe25e00 copy pdata ,regext 0372 1f00f004 increase 4 ,regext_index 0373 20207573 branch function_c1_loop1 + 8 @@ -1181,35 +1181,35 @@ 0388 20205907 branch le_parse_att_p p_le_parse_att_find_by_type_value_response: -0389 6800cd7a fetch 1 ,mem_le_connect_ios_mac_flag +0389 6800cd66 fetch 1 ,mem_le_connect_ios_mac_flag 038a c001039a beq 2 ,p_le_parse_att_find_by_type_value_rsp_mac p_le_parse_att_find_ios_report: -038b 704d7b04 jam osmode_ios ,mem_le_system_4type +038b 704d6704 jam osmode_ios ,mem_le_system_4type 038c 700b7d3e jam ipc_evt_ancs_auto_system ,mem_fifo_temp 038d 20207c27 branch ui_ipc_send_event p_le_parse_att_not_find_mac_report: 038e 6800c4e6 fetch 1 ,mem_le_conn_peer_addr_type 038f c0000393 beq le_addr_type_public ,p_keyboard_system_is_windows -0390 704d7b02 jam osmode_windows ,mem_le_system_4type +0390 704d6703 jam osmode_android ,mem_le_system_4type 0391 700b7d3e jam ipc_evt_ancs_auto_system ,mem_fifo_temp 0392 20207c27 branch ui_ipc_send_event p_keyboard_system_is_windows: -0393 704d7b05 jam osmode_mac ,mem_le_system_4type +0393 704d6702 jam osmode_windows ,mem_le_system_4type 0394 700b7d3e jam ipc_evt_ancs_auto_system ,mem_fifo_temp 0395 20207c27 branch ui_ipc_send_event p_le_send_att_find_by_type_value_response_ios: -0396 6800cd7a fetch 1 ,mem_le_connect_ios_mac_flag +0396 6800cd66 fetch 1 ,mem_le_connect_ios_mac_flag 0397 c001038e beq 2 ,p_le_parse_att_not_find_mac_report -0398 704d7a02 jam 2 ,mem_le_connect_ios_mac_flag +0398 704d6602 jam 2 ,mem_le_connect_ios_mac_flag 0399 202003e3 branch p_le_send_att_find_by_type_value_request_fifo_in + 1 p_le_parse_att_find_by_type_value_rsp_mac: 039a 68020347 fetch 4 ,mem_le_rxbuf + 7 -039b 60024d98 store 4 ,mem_le_mac_handle_number +039b 60024d84 store 4 ,mem_le_mac_handle_number 039c 700b7d08 jam attop_read_by_type_request ,mem_fifo_temp 039d 20205620 branch le_xtype_fifo_in @@ -1234,25 +1234,25 @@ p_le_send_att_read_by_type_rsp_manufactory: 03ad 1a627e00 copy regc ,pdata -03ae 60014d98 store 2 ,mem_le_mac_handle_number +03ae 60014d84 store 2 ,mem_le_mac_handle_number 03af 700b7d0a jam attop_read_request ,mem_fifo_temp 03b0 20205620 branch le_xtype_fifo_in p_le_parse_att_manu_resp: 03b1 df200009 arg 9 ,loopcnt 03b2 da200347 arg mem_le_rxbuf + 7 ,rega -03b3 da404d7e arg mem_le_search_mac_manu_name ,regb +03b3 da404d6a arg mem_le_search_mac_manu_name ,regb 03b4 20407f25 call string_compare 03b5 202283b7 branch p_le_parse_att_find_mac_report ,zero 03b6 2020038e branch p_le_parse_att_not_find_mac_report p_le_parse_att_find_mac_report: -03b7 704d7b02 jam osmode_windows ,mem_le_system_4type +03b7 704d6705 jam osmode_mac ,mem_le_system_4type 03b8 700b7d3e jam ipc_evt_ancs_auto_system ,mem_fifo_temp 03b9 20207c27 branch ui_ipc_send_event p_le_parse_att_write_command: -03ba 704d2401 jam 1 ,mem_reconnect_continue +03ba 704d1001 jam 1 ,mem_reconnect_continue 03bb 680103fa fetch 2 ,mem_le_att_handle 03bc c01083be beq handle_uuid_chrctr_report_id1_output ,p_handle_num 03bd 202059ed branch le_parse_att_write_command @@ -1306,12 +1306,12 @@ 03e1 20205666 branch le_prepare_att0 p_le_send_att_find_by_type_value_request_fifo_in: -03e2 704d7a01 jam 1 ,mem_le_connect_ios_mac_flag +03e2 704d6601 jam 1 ,mem_le_connect_ios_mac_flag 03e3 700b7d06 jam attop_find_by_type_value_request ,mem_fifo_temp 03e4 20205620 branch le_xtype_fifo_in p_le_send_att_find_by_type_value_request_ancs: -03e5 6800cd7a fetch 1 ,mem_le_connect_ios_mac_flag +03e5 6800cd66 fetch 1 ,mem_le_connect_ios_mac_flag 03e6 c00103f2 beq 2 ,p_le_send_att_find_by_type_value_request_mac_uuid p_le_send_att_find_by_type_value_request_ios_uuid: @@ -1322,7 +1322,7 @@ 03eb e0a10000 istore 2 ,contw 03ec 58002800 setarg 0x2800 03ed e0a10000 istore 2 ,contw -03ee d8c04d88 arg mem_le_search_service_uuid ,contr +03ee d8c04d74 arg mem_le_search_service_uuid ,contr 03ef 20407e35 call memcpy16 03f0 d840001b arg 27 ,temp 03f1 20205892 branch le_send_packet @@ -1335,13 +1335,13 @@ 03f6 e0a10000 istore 2 ,contw 03f7 58002800 setarg 0x2800 03f8 e0a10000 istore 2 ,contw -03f9 68014d7c fetch 2 ,mem_le_search_mac_uuid +03f9 68014d68 fetch 2 ,mem_le_search_mac_uuid 03fa e0a10000 istore 2 ,contw 03fb d840000d arg 13 ,temp 03fc 20205892 branch le_send_packet p_le_send_att_find_by_type_value_requset_mac: -03fd 68024d98 fetch 4 ,mem_le_mac_handle_number +03fd 68024d84 fetch 4 ,mem_le_mac_handle_number 03fe d8a04445 arg mem_le_l2cap + 1 ,contw 03ff e0a20000 istore 4 ,contw 0400 58002803 setarg 0x2803 @@ -1350,7 +1350,7 @@ 0403 20205892 branch le_send_packet p_le_send_att_read_type_manu_loop: -0404 68014d98 fetch 2 ,mem_le_mac_handle_number +0404 68014d84 fetch 2 ,mem_le_mac_handle_number 0405 60014445 store 2 ,mem_le_l2cap + 1 0406 18000407 force 7 ,temp 0407 20205892 branch le_send_packet @@ -1378,7 +1378,7 @@ 0413 202057c6 branch le_send_att_read_response p_le_send_att_battery_level: -0414 6800cd67 fetch 1 ,mem_le_battery_level_display_enable +0414 6800cd53 fetch 1 ,mem_le_battery_level_display_enable 0415 203a5728 branch le_send_att_error_response_notfound ,blank 0416 202057c6 branch le_send_att_read_response @@ -1813,14 +1813,14 @@ 0556 20405924 call le_parse_connection_update_req 0557 68014437 fetch 2 ,mem_le_new_param + 3 0558 1fef8404 mul32 pdata ,4 ,temp -0559 60094d3b storet 2 ,mem_customize_timer_setup +0559 60094d27 storet 2 ,mem_customize_timer_setup 055a 20600000 rtn p_le_parse_enc_req: 055b e8c40000 ifetch 8 ,contr -055c 60024d6a store 4 ,mem_le_evidm + 2 +055c 60024d56 store 4 ,mem_le_evidm + 2 055d e8c10000 ifetch 2 ,contr -055e 60014d68 store 2 ,mem_le_evidm +055e 60014d54 store 2 ,mem_le_evidm 055f 20405939 call le_parse_enc_req + 1 0560 6800cc69 fetch 1 ,mem_le_pairing_state 0561 c0010563 beq flag_le_pairing_after_auth ,p_le_parse_enc_req_store_skdm @@ -1828,11 +1828,11 @@ p_le_parse_enc_req_store_skdm: 0563 68040380 fetch 8 ,mem_le_skdm -0564 60044d72 store 8 ,mem_le_skdm_temp +0564 60044d5e store 8 ,mem_le_skdm_temp 0565 20600000 rtn p_load_device_list_mode_4: -0566 68034d68 fetch 6 ,mem_le_evidm +0566 68034d54 fetch 6 ,mem_le_evidm 0567 203a056c branch p_clear_ltk_exists_iphone_lost_ltk ,blank 0568 704c7c03 jam ltk_not_lost ,mem_ltk_states 0569 20400326 call p_le_ltk_reset @@ -1851,7 +1851,7 @@ 0570 20205620 branch le_xtype_fifo_in p_le_parse_pause_enc_rsq: -0571 704d6601 jam 1 ,mem_le_pause_enc_flag +0571 704d5201 jam 1 ,mem_le_pause_enc_flag 0572 700b7d2b jam xt_ll_pause_enc_rsp ,mem_fifo_temp 0573 20205620 branch le_xtype_fifo_in @@ -1889,7 +1889,7 @@ 0588 20205974 branch le_parse_smp_identity_address_information p_le_parse_smp_pairing_request: -0589 704d2901 jam 1 ,mem_le_send_security_request_flag +0589 704d1501 jam 1 ,mem_le_send_security_request_flag 058a 6000c4ae store 1 ,mem_le_preq 058b e8c30000 ifetch 6 ,contr 058c e0a30000 istore 6 ,contw @@ -1940,7 +1940,7 @@ 05ad 1f00f001 increase 1 ,regext_index 05ae 2040759e call aes_clear 05af 1f00f1fc increase -4 ,regext_index -05b0 68024d25 fetch 4 ,mem_le_pin_code +05b0 68024d11 fetch 4 ,mem_le_pin_code 05b1 1fe25e00 copy pdata ,regext 05b2 1f00f004 increase 4 ,regext_index 05b3 18006c38 force 0x38 ,aes_ctrl @@ -1968,8 +1968,8 @@ p_g24_dispatch: 05c3 c6918000 rtnmark0 mark_24g -05c4 68024d2c fetch 4 ,mem_24g_enter_hibernate -05c5 60024d5a store 4 ,mem_24g_enter_hibernate_setup +05c4 68024d18 fetch 4 ,mem_24g_enter_hibernate +05c5 60024d46 store 4 ,mem_24g_enter_hibernate_setup 05c6 204005e9 call p_g24_txdata_prep 05c7 243405dc nbranch p_g24_long_sleep ,user 05c8 704c150a jam 10 ,mem_24g_enter_lpm_timer @@ -1979,7 +1979,7 @@ 05cc 704c3d02 jam tx_power_5db ,mem_tx_power p_g24_short_sleep: -05cd 6800cd31 fetch 1 ,mem_mouse_retry_flag +05cd 6800cd1d fetch 1 ,mem_mouse_retry_flag 05ce 247a0000 nrtn blank 05cf 2040015c call p_check_ipc_for_lpm 05d0 24740000 nrtn user @@ -1992,7 +1992,7 @@ 05d7 207a0000 rtn blank p_g24_short_sleep_1: -05d8 6801cd62 fetch 3 ,mem_24g_short_sleep_counter +05d8 6801cd4e fetch 3 ,mem_24g_short_sleep_counter p_g24_short_sleep_2: 05d9 20407e8a call clk2lpo @@ -2011,7 +2011,7 @@ 05e4 207a0000 rtn blank 05e5 6800cc15 fetch 1 ,mem_24g_enter_lpm_timer 05e6 243a05d8 nbranch p_g24_short_sleep_1 ,blank -05e7 68024d5a fetch 4 ,mem_24g_enter_hibernate_setup +05e7 68024d46 fetch 4 ,mem_24g_enter_hibernate_setup 05e8 202005d9 branch p_g24_short_sleep_2 p_g24_txdata_prep: @@ -2028,27 +2028,27 @@ p_g24_package_data: 05f0 78547c00 disable user 05f1 704be202 jam 2 ,mem_24g_data_type -05f2 6800cd3f fetch 1 ,mem_24g_txbuf_new +05f2 6800cd2b fetch 1 ,mem_24g_txbuf_new 05f3 c00205fa beq 0x04 ,p_g24_dataready 05f4 c00285fd beq 0x05 ,p_g24_dataready_mk 05f5 c0038603 beq 0x07 ,p_g24_dataready_ms 05f6 c0030600 beq 0x06 ,p_g24_dataready_sys -05f7 6800cd31 fetch 1 ,mem_mouse_retry_flag +05f7 6800cd1d fetch 1 ,mem_mouse_retry_flag 05f8 245a34df ncall enable_user ,blank 05f9 20600000 rtn p_g24_dataready: -05fa 704d3f00 jam 0x00 ,mem_24g_txbuf_new +05fa 704d2b00 jam 0x00 ,mem_24g_txbuf_new 05fb 704be10a jam 10 ,mem_24g_datalen 05fc 20200605 branch p_g24_package_data_rtn p_g24_dataready_mk: -05fd 704d3f03 jam 0x03 ,mem_24g_txbuf_new +05fd 704d2b03 jam 0x03 ,mem_24g_txbuf_new 05fe 704be104 jam 4 ,mem_24g_datalen 05ff 20200605 branch p_g24_package_data_rtn p_g24_dataready_sys: -0600 704d3f02 jam 0x02 ,mem_24g_txbuf_new +0600 704d2b02 jam 0x02 ,mem_24g_txbuf_new 0601 704be103 jam 3 ,mem_24g_datalen 0602 20200605 branch p_g24_package_data_rtn @@ -2062,7 +2062,7 @@ p_g24_get_package_data: 0607 df200009 arg 9 ,loopcnt -0608 d8c04d3f arg mem_24g_txbuf_new ,contr +0608 d8c04d2b arg mem_24g_txbuf_new ,contr 0609 d8a00cd5 arg mem_24g_txbuf ,contw 060a 20207e45 branch memcpy @@ -2076,7 +2076,7 @@ 060f 6800cbe0 fetch 1 ,mem_24g_pid 0610 1fe0fe01 increase 1 ,pdata 0611 6000cbe0 store 1 ,mem_24g_pid -0612 704d3100 jam 0 ,mem_mouse_retry_flag +0612 704d1d00 jam 0 ,mem_mouse_retry_flag 0613 6800cbef fetch 1 ,mem_24g_pairing_sm 0614 c0ff862f bne state_24g_pairing_success ,p_g24_paring_mode_start @@ -2087,7 +2087,7 @@ 0618 20600000 rtn p_g24_retransmit: -0619 704d3101 jam 1 ,mem_mouse_retry_flag +0619 704d1d01 jam 1 ,mem_mouse_retry_flag 061a 6800cbe7 fetch 1 ,mem_24g_get_ack_fail 061b 1fe0fe01 increase 1 ,pdata 061c 6000cbe7 store 1 ,mem_24g_get_ack_fail @@ -2109,7 +2109,7 @@ p_g24_clear_txbuf: 062b 58000000 setarg 0 062c 60048cd5 store 9 ,mem_24g_txbuf -062d 6004cd3f store 9 ,mem_24g_txbuf_new +062d 6004cd2b store 9 ,mem_24g_txbuf_new 062e 20600000 rtn p_g24_paring_mode_start: @@ -2130,11 +2130,11 @@ 063b 20600000 rtn p_g24_tx_paring_retry: -063c 704d3100 jam 0 ,mem_mouse_retry_flag +063c 704d1d00 jam 0 ,mem_mouse_retry_flag 063d 20600000 rtn p_g24_stop_g24_mode: -063e 704d3100 jam 0 ,mem_mouse_retry_flag +063e 704d1d00 jam 0 ,mem_mouse_retry_flag 063f 700b7d32 jam bt_evt_24g_attempt_fail ,mem_fifo_temp 0640 20207c27 branch ui_ipc_send_event @@ -2157,7 +2157,7 @@ 0650 20600000 rtn p_pc_sleep_mode: -0651 704d6501 jam 1 ,mem_pc_sleep_flag +0651 704d5101 jam 1 ,mem_pc_sleep_flag 0652 20600000 rtn p_g24_start_pairing_sm1: Index: btkb/output/ramcode.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/ramcode.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/ramcode.rom (working copy) @@ -103,7 +103,7 @@ 18508400 60094b9a 20600000 -d8a04d3f +d8a04d2b 202000db 18c22200 6800cba9 @@ -137,27 +137,27 @@ 20200082 68014cbc 20200082 -68014d2a +68014d16 20400090 -6800cd67 +6800cd53 207a0000 20200083 e0a10000 1a220c00 202000dd -680a4d37 +680a4d23 1c427e00 98467e00 -68094d3b +68094d27 9846fc00 20407efd 1807fe00 207a0000 1c420400 -600a4d37 -6800cd3d +600a4d23 +6800cd29 1fe0fe01 -6000cd3d +6000cd29 20600000 680a4c59 1c427e00 @@ -262,16 +262,16 @@ 2022e9b1 2020320b 1c427e00 -60024d33 +60024d1f 6808c7ef -6800cd36 +6800cd22 98467c00 2441010e 20207c06 -680a4d33 +680a4d1f 600a47ec 600a4c59 -600a4d37 +600a4d23 20600000 da2047df 20407f9f @@ -284,7 +284,7 @@ c01e811e c00a82a6 20203e7d -704d8705 +704d7305 20600000 60088259 6800cc8d @@ -657,7 +657,7 @@ d8c043fa 20207e45 1fe27200 -d8c04d53 +d8c04d3f 20207e45 6800c3f9 1fe0fe0b @@ -676,7 +676,7 @@ e8c08000 6000ccb7 20600000 -704d6600 +704d5200 202005ba 204054bd 68088017 @@ -727,14 +727,14 @@ 24608000 6800c440 c00282dc -6800cd66 +6800cd52 c00082e0 20600000 680083c0 79207e04 600083c0 20600000 -704d6600 +704d5200 dfe00000 6002446f 6000c48b @@ -784,7 +784,7 @@ 20406227 68024477 e0420000 -68044d72 +68044d5e 60040380 204074b6 6800c48b @@ -878,7 +878,7 @@ c2000367 2040759e 1f00f1fc -68024d25 +68024d11 1fe25e00 1f00f004 20207573 @@ -903,25 +903,25 @@ c0008396 c00583b1 20205907 -6800cd7a +6800cd66 c001039a -704d7b04 +704d6704 700b7d3e 20207c27 6800c4e6 c0000393 -704d7b02 +704d6703 700b7d3e 20207c27 -704d7b05 +704d6702 700b7d3e 20207c27 -6800cd7a +6800cd66 c001038e -704d7a02 +704d6602 202003e3 68020347 -60024d98 +60024d84 700b7d08 20205620 68010342 @@ -940,19 +940,19 @@ c20003a4 2020038e 1a627e00 -60014d98 +60014d84 700b7d0a 20205620 df200009 da200347 -da404d7e +da404d6a 20407f25 202283b7 2020038e -704d7b02 +704d6705 700b7d3e 20207c27 -704d2401 +704d1001 680103fa c01083be 202059ed @@ -992,10 +992,10 @@ c00403fd c0050404 20205666 -704d7a01 +704d6601 700b7d06 20205620 -6800cd7a +6800cd66 c00103f2 d8a04445 58000001 @@ -1004,7 +1004,7 @@ e0a10000 58002800 e0a10000 -d8c04d88 +d8c04d74 20407e35 d840001b 20205892 @@ -1015,18 +1015,18 @@ e0a10000 58002800 e0a10000 -68014d7c +68014d68 e0a10000 d840000d 20205892 -68024d98 +68024d84 d8a04445 e0a20000 58002803 e0a10000 1800040b 20205892 -68014d98 +68014d84 60014445 18000407 20205892 @@ -1042,7 +1042,7 @@ c0160414 c0070417 202057c6 -6800cd67 +6800cd53 203a5728 202057c6 6800cc69 @@ -1367,20 +1367,20 @@ 20405924 68014437 1fef8404 -60094d3b +60094d27 20600000 e8c40000 -60024d6a +60024d56 e8c10000 -60014d68 +60014d54 20405939 6800cc69 c0010563 20400566 68040380 -60044d72 +60044d5e 20600000 -68034d68 +68034d54 203a056c 704c7c03 20400326 @@ -1391,7 +1391,7 @@ 20600000 700b7d33 20205620 -704d6601 +704d5201 700b7d2b 20205620 58000014 @@ -1415,7 +1415,7 @@ 202058f8 704c6903 20205974 -704d2901 +704d1501 6000c4ae e8c30000 e0a30000 @@ -1454,7 +1454,7 @@ 1f00f001 2040759e 1f00f1fc -68024d25 +68024d11 1fe25e00 1f00f004 18006c38 @@ -1474,8 +1474,8 @@ 60024ba9 20600000 c6918000 -68024d2c -60024d5a +68024d18 +60024d46 204005e9 243405dc 704c150a @@ -1483,7 +1483,7 @@ 6800cbef c1ff8000 704c3d02 -6800cd31 +6800cd1d 247a0000 2040015c 24740000 @@ -1494,7 +1494,7 @@ 207a0000 6800c131 207a0000 -6801cd62 +6801cd4e 20407e8a 600a41fc 20203cda @@ -1509,7 +1509,7 @@ 207a0000 6800cc15 243a05d8 -68024d5a +68024d46 202005d9 6800cbef c0ff865c @@ -1520,21 +1520,21 @@ 20600000 78547c00 704be202 -6800cd3f +6800cd2b c00205fa c00285fd c0038603 c0030600 -6800cd31 +6800cd1d 245a34df 20600000 -704d3f00 +704d2b00 704be10a 20200605 -704d3f03 +704d2b03 704be104 20200605 -704d3f02 +704d2b02 704be103 20200605 704be201 @@ -1542,7 +1542,7 @@ 704be700 202034df df200009 -d8c04d3f +d8c04d2b d8a00cd5 20207e45 704be800 @@ -1552,14 +1552,14 @@ 6800cbe0 1fe0fe01 6000cbe0 -704d3100 +704d1d00 6800cbef c0ff862f 2040062b 704be700 704be600 20600000 -704d3101 +704d1d01 6800cbe7 1fe0fe01 6000cbe7 @@ -1579,7 +1579,7 @@ 202006ea 58000000 60048cd5 -6004cd3f +6004cd2b 20600000 20200676 7857fc00 @@ -1594,9 +1594,9 @@ 20400702 2057873c 20600000 -704d3100 +704d1d00 20600000 -704d3100 +704d1d00 700b7d32 20207c27 204006ab @@ -1615,7 +1615,7 @@ c07f8651 6000ccb7 20600000 -704d6501 +704d5101 20600000 79200023 20400658 Index: btkb/output/sched.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/output/sched.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/output/sched.rom (working copy) @@ -296,6 +296,12 @@ mem_le_notify_handle:14 mem_le_lap:11 46 34 54 77 dd +mem_le_search_mac_manu_name: +41 70 70 6c 65 20 49 6e 63 +mem_le_search_mac_uuid: +0a 18 +mem_le_search_service_uuid: +d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 mem_empty_count:00 mem_att_report1:15 00 @@ -304,11 +310,6 @@ mem_att_report_battery:2c 00 mem_le_rx_window:50 -mem_le_search_mac_uuid: -0a 18 -mem_le_search_service_uuid: -d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 - mem_le_battery_level_display_enable:01 mem_le_connection_updata_param: Index: btkb/program/patch.prog =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/program/patch.prog (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/program/patch.prog (working copy) @@ -1395,11 +1395,11 @@ p_le_parse_att_not_find_mac_report: fetch 1,mem_le_conn_peer_addr_type beq LE_ADDR_TYPE_PUBLIC,p_keyboard_system_is_windows - jam OSMODE_WINDOWS,mem_le_system_4type + jam OSMODE_ANDROID,mem_le_system_4type jam IPC_EVT_ANCS_AUTO_SYSTEM,mem_fifo_temp branch ui_ipc_send_event p_keyboard_system_is_windows: - jam OSMODE_MAC,mem_le_system_4type + jam OSMODE_WINDOWS,mem_le_system_4type jam IPC_EVT_ANCS_AUTO_SYSTEM,mem_fifo_temp branch ui_ipc_send_event // second time read device info service differ phone from other @@ -1447,7 +1447,7 @@ branch p_le_parse_att_not_find_mac_report p_le_parse_att_find_mac_report: - jam OSMODE_WINDOWS,mem_le_system_4type + jam OSMODE_MAC,mem_le_system_4type jam IPC_EVT_ANCS_AUTO_SYSTEM,mem_fifo_temp branch ui_ipc_send_event endif Index: btkb/sched/kb.dat =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/btkb/sched/kb.dat (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/btkb/sched/kb.dat (working copy) @@ -296,6 +296,12 @@ mem_le_notify_handle:14 mem_le_lap:11 46 34 54 77 dd +mem_le_search_mac_manu_name: +41 70 70 6c 65 20 49 6e 63 +mem_le_search_mac_uuid: +0a 18 +mem_le_search_service_uuid: +d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 mem_empty_count:00 mem_att_report1:15 00 @@ -304,11 +310,6 @@ mem_att_report_battery:2c 00 mem_le_rx_window:50 -mem_le_search_mac_uuid: -0a 18 -mem_le_search_service_uuid: -d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 - mem_le_battery_level_display_enable:01 mem_le_connection_updata_param: Index: c51/Makefile =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/Makefile (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/Makefile (working copy) @@ -8,7 +8,7 @@ OUTDIR = output -ROOT_PATH =c:\keil +ROOT_PATH =F:\keil UTIL_PATH = ..\rom\util Index: c51/btreg.h =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/btreg.h (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/btreg.h (working copy) @@ -1012,37 +1012,37 @@ #define mem_att_report3 0x4cbc #define mem_suspend_flag 0x4cbe #define mem_32asm_data_end 0x4cbf -#define mem_store_ltk_timer 0x4d23 -#define mem_reconnect_continue 0x4d24 -#define mem_le_pin_code 0x4d25 -#define mem_le_send_security_request_flag 0x4d29 -#define mem_att_report_battery 0x4d2a -#define mem_24g_enter_hibernate 0x4d2c -#define mem_24g_txfail_cnt 0x4d30 -#define mem_mouse_retry_flag 0x4d31 -#define mem_24g_led_flag 0x4d32 -#define mem_ui_timer_last_btclk_temp 0x4d33 -#define mem_ui_check_timer_setup 0x4d37 -#define mem_customize_timer_setup 0x4d3b -#define mem_customize_timer 0x4d3d -#define mem_ios_mode_flag 0x4d3e -#define mem_24g_txbuf_new 0x4d3f -#define mem_le_adv_swift_pair 0x4d53 -#define mem_24g_enter_hibernate_setup 0x4d5a -#define mem_24g_enter_hibernate_max 0x4d5e -#define mem_24g_short_sleep_counter 0x4d62 -#define mem_pc_sleep_flag 0x4d65 -#define mem_le_pause_enc_flag 0x4d66 -#define mem_le_battery_level_display_enable 0x4d67 -#define mem_le_evidm 0x4d68 -#define mem_le_skdm_temp 0x4d72 -#define mem_le_connect_ios_mac_flag 0x4d7a -#define mem_le_system_4type 0x4d7b -#define mem_le_search_mac_uuid 0x4d7c -#define mem_le_search_mac_manu_name 0x4d7e -#define mem_le_start_auto_reco_timer 0x4d87 -#define mem_le_search_service_uuid 0x4d88 -#define mem_le_mac_handle_number 0x4d98 +#define mem_store_ltk_timer 0x4d0f +#define mem_reconnect_continue 0x4d10 +#define mem_le_pin_code 0x4d11 +#define mem_le_send_security_request_flag 0x4d15 +#define mem_att_report_battery 0x4d16 +#define mem_24g_enter_hibernate 0x4d18 +#define mem_24g_txfail_cnt 0x4d1c +#define mem_mouse_retry_flag 0x4d1d +#define mem_24g_led_flag 0x4d1e +#define mem_ui_timer_last_btclk_temp 0x4d1f +#define mem_ui_check_timer_setup 0x4d23 +#define mem_customize_timer_setup 0x4d27 +#define mem_customize_timer 0x4d29 +#define mem_ios_mode_flag 0x4d2a +#define mem_24g_txbuf_new 0x4d2b +#define mem_le_adv_swift_pair 0x4d3f +#define mem_24g_enter_hibernate_setup 0x4d46 +#define mem_24g_enter_hibernate_max 0x4d4a +#define mem_24g_short_sleep_counter 0x4d4e +#define mem_pc_sleep_flag 0x4d51 +#define mem_le_pause_enc_flag 0x4d52 +#define mem_le_battery_level_display_enable 0x4d53 +#define mem_le_evidm 0x4d54 +#define mem_le_skdm_temp 0x4d5e +#define mem_le_connect_ios_mac_flag 0x4d66 +#define mem_le_system_4type 0x4d67 +#define mem_le_search_mac_uuid 0x4d68 +#define mem_le_search_mac_manu_name 0x4d6a +#define mem_le_start_auto_reco_timer 0x4d73 +#define mem_le_search_service_uuid 0x4d74 +#define mem_le_mac_handle_number 0x4d84 #define mem_at_gpio 0x4800 #define mem_module_wake_up_gpio 0x4801 #define mem_module_state_gpio 0x4802 Index: c51/ipc.h =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/ipc.h (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/ipc.h (working copy) @@ -83,7 +83,7 @@ #define IPC_CMD_SET_RECONNECT_INIT 0x2a #define IPC_CMD_START_ADV_REC 0x2b #define IPC_CMD_START_ADV_DISCOVERY 0x2c -#define IPC_CMD_ANCS_TIMET 0X2d +#define IPC_CMD_ANCS_DELAY_TIMER 0X2d /*IPC event type*/ #define IPC_EVT_NULL 0x00 Index: c51/output/FW =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/output/FW.COD =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/FW.COD (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/FW.COD (working copy) @@ -1,4 +1,4 @@ -LX51 LINKER/LOCATER V4.41 10/18/2023 16:43:30 PAGE 1 +LX51 LINKER/LOCATER V4.41 10/23/2023 20:13:26 PAGE 1 @@ -476,14 +476,14 @@ 000987 E4 CLR A 000988 F0 MOVX @DPTR,A 401: m_24g_led_flag = KB_24G_LED_ACK_TYPE; -000989 904D32 MOV DPTR,#m_24g_led_flag +000989 904D1E MOV DPTR,#m_24g_led_flag 00098C 7403 MOV A,#03H 00098E F0 MOVX @DPTR,A 402: } 00098F ?C0082?KB_PROCESS: 403: #ifdef PC_SLEEP_STATUS_GET 404: if(m_pc_sleep_flag) // wake from pc sleep,get led status -00098F 904D65 MOV DPTR,#m_pc_sleep_flag +00098F 904D51 MOV DPTR,#m_pc_sleep_flag 000992 E0 MOVX A,@DPTR 000993 6008 JZ ?C0083?KB_PROCESS 405: { @@ -491,7 +491,7 @@ 000995 E4 CLR A 000996 F0 MOVX @DPTR,A 407: m_24g_led_flag = KB_24G_LED_ACK_TYPE; -000997 904D32 MOV DPTR,#m_24g_led_flag +000997 904D1E MOV DPTR,#m_24g_led_flag 00099A 7403 MOV A,#03H 00099C F0 MOVX @DPTR,A 408: } @@ -526,7 +526,7 @@ 418: { 419: m_24g_enter_hibernate[0] = 0x00; 0009BE E4 CLR A -0009BF 904D2C MOV DPTR,#m_24g_enter_hibernate +0009BF 904D18 MOV DPTR,#m_24g_enter_hibernate 0009C2 F0 MOVX @DPTR,A 420: m_24g_enter_hibernate[1] = 0x48; 0009C3 A3 INC DPTR @@ -547,7 +547,7 @@ 425: { 426: m_24g_enter_hibernate[0] = 0x00; 0009D0 E4 CLR A -0009D1 904D2C MOV DPTR,#m_24g_enter_hibernate +0009D1 904D18 MOV DPTR,#m_24g_enter_hibernate 0009D4 F0 MOVX @DPTR,A 427: m_24g_enter_hibernate[1] = 0x48; 0009D5 A3 INC DPTR @@ -682,7 +682,7 @@ 474: || (pEvt->ksPool[i] == HID_KEY_SCROLL_LOCK)) 475: { 476: m_24g_led_flag = KB_24G_LED_ACK_TYPE; -000A56 904D32 MOV DPTR,#m_24g_led_flag +000A56 904D1E MOV DPTR,#m_24g_led_flag 000A59 7403 MOV A,#03H 000A5B F0 MOVX @DPTR,A 477: @@ -844,7 +844,7 @@ 000B17 E0 MOVX A,@DPTR 000B18 B4030A CJNE A,#03H,?C0105?KB_PROCESS 517: hidBuff[2] = m_24g_led_flag; -000B1B 904D32 MOV DPTR,#m_24g_led_flag +000B1B 904D1E MOV DPTR,#m_24g_led_flag 000B1E E0 MOVX A,@DPTR 000B1F 904802 MOV DPTR,#hidBuff+02H 000B22 F0 MOVX @DPTR,A @@ -1330,13 +1330,13 @@ 000D68 F0 MOVX @DPTR,A 39: m_reconnect_continue = 0; 000D69 E4 CLR A -000D6A 904D24 MOV DPTR,#m_reconnect_continue +000D6A 904D10 MOV DPTR,#m_reconnect_continue 000D6D F0 MOVX @DPTR,A 40: ble_send_secutiry_request_timer = 0; 000D6E 904DD4 MOV DPTR,#ble_send_secutiry_request_timer 000D71 F0 MOVX @DPTR,A 41: m_le_start_auto_reco_timer = 0; -000D72 904D87 MOV DPTR,#m_le_start_auto_reco_timer +000D72 904D73 MOV DPTR,#m_le_start_auto_reco_timer 000D75 F0 MOVX @DPTR,A 42: } 000D76 22 RET @@ -1569,7 +1569,7 @@ 000E52 EF MOV A,R7 000E53 6404 XRL A,#04H 000E55 7039 JNZ ?C0079?SYS -000E57 904D67 MOV DPTR,#m_le_battery_level_display_enable +000E57 904D53 MOV DPTR,#m_le_battery_level_display_enable 000E5A E0 MOVX A,@DPTR 000E5B 6033 JZ ?C0079?SYS 418: { @@ -1778,7 +1778,7 @@ 000F44 F0 MOVX @DPTR,A 98: #endif 99: m_24g_enter_hibernate[0] = 0xff; -000F45 904D2C MOV DPTR,#m_24g_enter_hibernate +000F45 904D18 MOV DPTR,#m_24g_enter_hibernate 000F48 74FF MOV A,#0FFH 000F4A F0 MOVX @DPTR,A 100: m_24g_enter_hibernate[1] = 0xff; @@ -1861,7 +1861,7 @@ 270: { 271: if((m_24g_led_flag)&& (repeat_send_24g == 0)) 272: { -000F86 904D32 MOV DPTR,#m_24g_led_flag +000F86 904D1E MOV DPTR,#m_24g_led_flag 000F89 E0 MOVX A,@DPTR 000F8A 604A JZ ?C0054?KB_PROCESS 000F8C 904DDE MOV DPTR,#repeat_send_24g @@ -1899,7 +1899,7 @@ 000FBA 04 INC A 000FBB F0 MOVX @DPTR,A 281: IPC_TxHidData(hidBuff, 9); -000FBC 904D32 MOV DPTR,#m_24g_led_flag +000FBC 904D1E MOV DPTR,#m_24g_led_flag 000FBF E0 MOVX A,@DPTR 000FC0 904802 MOV DPTR,#hidBuff+02H 000FC3 F0 MOVX @DPTR,A @@ -2893,7 +2893,7 @@ 00145D ?C0033?LED: 122: m_24g_led_flag = 0; 00145D E4 CLR A -00145E 904D32 MOV DPTR,#m_24g_led_flag +00145E 904D1E MOV DPTR,#m_24g_led_flag 001461 F0 MOVX @DPTR,A 123: m_caps_num_lock_last = m_caps_num_lock; 001462 904CB7 MOV DPTR,#m_caps_num_lock @@ -3163,7 +3163,7 @@ 0015A9 904CC3 MOV DPTR,#g_variable+04H 0015AC F0 MOVX @DPTR,A 178: m_24g_led_flag = KB_24G_LED_ACK_TYPE; -0015AD 904D32 MOV DPTR,#m_24g_led_flag +0015AD 904D1E MOV DPTR,#m_24g_led_flag 0015B0 7403 MOV A,#03H 0015B2 F0 MOVX @DPTR,A 179: delayChgInvTimer = 10; @@ -3440,7 +3440,7 @@ 265: case IPC_EVT_LE_PINCODE_REQ: 0016EB ?C0040?SYS: 266: le_pin_code = 0; -0016EB 904D25 MOV DPTR,#le_pin_code +0016EB 904D11 MOV DPTR,#le_pin_code 0016EE 120582 LCALL ?C?LSTKXDATA 0016F1 00 DB 00H 0016F2 00 DB 00H @@ -3485,7 +3485,7 @@ 00171D F0 MOVX @DPTR,A 278: m_le_send_security_request_flag = 0; 00171E E4 CLR A -00171F 904D29 MOV DPTR,#m_le_send_security_request_flag +00171F 904D15 MOV DPTR,#m_le_send_security_request_flag 001722 F0 MOVX @DPTR,A 279: if (g_variable.lockLpm == 1) 001723 904CEC MOV DPTR,#g_variable+02DH @@ -3541,7 +3541,7 @@ 302: case IPC_EVT_ANCS_AUTO_SYSTEM: 00174F ?C0045?SYS: 303: switch(m_le_system_4type) -00174F 904D7B MOV DPTR,#m_le_system_4type +00174F 904D67 MOV DPTR,#m_le_system_4type 001752 E0 MOVX A,@DPTR 001753 24FD ADD A,#0FDH 001755 6011 JZ ?C0048?SYS @@ -3627,7 +3627,7 @@ 83: m_reconnect_continue = 0; 84: IPC_TxControlCmd(IPC_CMD_ENTER_HIBERNATE); 0017A4 E4 CLR A -0017A5 904D24 MOV DPTR,#m_reconnect_continue +0017A5 904D10 MOV DPTR,#m_reconnect_continue 0017A8 F0 MOVX @DPTR,A 85: } 0017A9 7F19 MOV R7,#019H @@ -5061,7 +5061,7 @@ 852: #ifdef PC_SLEEP_STATUS_GET 001E1B 121380 LCALL LED_handle 853: if(m_pc_sleep_flag) -001E1E 904D65 MOV DPTR,#m_pc_sleep_flag +001E1E 904D51 MOV DPTR,#m_pc_sleep_flag 001E21 E0 MOVX A,@DPTR 001E22 6003 JZ ?C0171?SYS 854: { @@ -6126,7 +6126,7 @@ 00229C 702A JNZ ?C0006?ADC 79: { 80: m_24g_enter_hibernate[0] = 0x00; -00229E 904D2C MOV DPTR,#m_24g_enter_hibernate +00229E 904D18 MOV DPTR,#m_24g_enter_hibernate 0022A1 F0 MOVX @DPTR,A 81: m_24g_enter_hibernate[1] = 0x48; 0022A2 A3 INC DPTR @@ -6156,7 +6156,7 @@ 0022B7 700F JNZ ?C0006?ADC 90: { 91: m_24g_enter_hibernate[0] = 0x00; -0022B9 904D2C MOV DPTR,#m_24g_enter_hibernate +0022B9 904D18 MOV DPTR,#m_24g_enter_hibernate 0022BC F0 MOVX @DPTR,A 92: m_24g_enter_hibernate[1] = 0x48; 0022BD A3 INC DPTR @@ -9476,7 +9476,7 @@ 003071 ?C0140?SYS: 726: //ANCS start time 727: if (m_le_start_auto_reco_timer) -003071 904D87 MOV DPTR,#m_le_start_auto_reco_timer +003071 904D73 MOV DPTR,#m_le_start_auto_reco_timer 003074 E0 MOVX A,@DPTR 003075 600B JZ ?C0142?SYS 728: { @@ -9487,7 +9487,7 @@ 730: if (!m_le_start_auto_reco_timer) 00307A E0 MOVX A,@DPTR 00307B 7005 JNZ ?C0142?SYS - 731: IPC_TxControlCmd(IPC_CMD_ANCS_TIMET); + 731: IPC_TxControlCmd(IPC_CMD_ANCS_DELAY_TIMER); 00307D 7F2D MOV R7,#02DH 00307F 121095 LCALL _IPC_TxControlCmd 732: } @@ -9661,7 +9661,7 @@ 00312D 700B JNZ ?C0161?SYS 800: { 801: if(!m_le_send_security_request_flag) -00312F 904D29 MOV DPTR,#m_le_send_security_request_flag +00312F 904D15 MOV DPTR,#m_le_send_security_request_flag 003132 E0 MOVX A,@DPTR 003133 7005 JNZ ?C0161?SYS 802: { @@ -9686,7 +9686,7 @@ 003144 7015 JNZ ?C0146?SYS 811: { 812: if( m_24g_led_flag) -003146 904D32 MOV DPTR,#m_24g_led_flag +003146 904D1E MOV DPTR,#m_24g_led_flag 003149 E0 MOVX A,@DPTR 00314A 6002 JZ ?C0166?SYS 813: { Index: c51/output/FW.HTM =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/FW.HTM (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/FW.HTM (working copy) @@ -25,7 +25,7 @@

Created from: LX51 LINKER/LOCATER V4.41
-Creation time: 10/18/2023 16:43:30

+Creation time: 10/23/2023 20:13:26

Index: c51/output/FW.MAP =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/FW.MAP (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/FW.MAP (working copy) @@ -1,8 +1,8 @@ -LX51 LINKER/LOCATER V4.41 10/18/2023 16:43:30 PAGE 1 +LX51 LINKER/LOCATER V4.41 10/23/2023 20:13:26 PAGE 1 LX51 LINKER/LOCATER V4.41, INVOKED BY: -C:\KEIL\C51\BIN\LX51.EXE OUTPUT/BLUETOOTH.OBJ, OUTPUT/GLOBAL_VARIABLE.OBJ, OUTPUT/KB_PROCESS.OBJ, OUTPUT/KEYSCAN.OBJ, OU +F:\KEIL\C51\BIN\LX51.EXE OUTPUT/BLUETOOTH.OBJ, OUTPUT/GLOBAL_VARIABLE.OBJ, OUTPUT/KB_PROCESS.OBJ, OUTPUT/KEYSCAN.OBJ, OU >> TPUT/LED.OBJ, OUTPUT/SYS.OBJ, OUTPUT/ADC.OBJ, OUTPUT/RAM.OBJ, OUTPUT/..\PATCH\IPC.OBJ, OUTPUT/..\PATCH\UTILITIES.OBJ, >> OUTPUT/..\PATCH\GPIO.OBJ, OUTPUT/..\PATCH\IIC.OBJ TO OUTPUT\FW CLASSES (XDATA (X:0X4DD0-X:0X4F40), CODE (C:0-C:0XFFF >> F), DATA (D:0X10-0X7F), IDATA (I:0X80-0XCF)) SEGMENTS (?STACK (D:0XD0)) NOOVERLAY PAGELENGTH (60000) CODE @@ -37,47 +37,47 @@ COMMENT TYPE 0: C51 V9.00 OUTPUT/..\PATCH\IIC.OBJ (IIC) COMMENT TYPE 0: C51 V9.00 - C:\KEIL\C51\LIB\C51FPL.LIB (?C?FPADD) + F:\KEIL\C51\LIB\C51FPL.LIB (?C?FPADD) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51FPL.LIB (?C?FPMUL) + F:\KEIL\C51\LIB\C51FPL.LIB (?C?FPMUL) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51FPL.LIB (?C?FCAST) + F:\KEIL\C51\LIB\C51FPL.LIB (?C?FCAST) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51FPL.LIB (?C?CASTF) + F:\KEIL\C51\LIB\C51FPL.LIB (?C?CASTF) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51FPL.LIB (?C?FPGETOPN) + F:\KEIL\C51\LIB\C51FPL.LIB (?C?FPGETOPN) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C_STARTUP) + F:\KEIL\C51\LIB\C51L.LIB (?C_STARTUP) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?COPY) + F:\KEIL\C51\LIB\C51L.LIB (?C?COPY) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?CLDPTR) + F:\KEIL\C51\LIB\C51L.LIB (?C?CLDPTR) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?CLDOPTR) + F:\KEIL\C51\LIB\C51L.LIB (?C?CLDOPTR) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?CSTPTR) + F:\KEIL\C51\LIB\C51L.LIB (?C?CSTPTR) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?IILDX) + F:\KEIL\C51\LIB\C51L.LIB (?C?IILDX) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?ILDIX) + F:\KEIL\C51\LIB\C51L.LIB (?C?ILDIX) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?LMUL) + F:\KEIL\C51\LIB\C51L.LIB (?C?LMUL) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?ULDIV) + F:\KEIL\C51\LIB\C51L.LIB (?C?ULDIV) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?LNEG) + F:\KEIL\C51\LIB\C51L.LIB (?C?LNEG) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?ULCMP) + F:\KEIL\C51\LIB\C51L.LIB (?C?ULCMP) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?LSTXDATA) + F:\KEIL\C51\LIB\C51L.LIB (?C?LSTXDATA) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?LSTKXDATA) + F:\KEIL\C51\LIB\C51L.LIB (?C?LSTKXDATA) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?CCASE) + F:\KEIL\C51\LIB\C51L.LIB (?C?CCASE) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C?ICALL) + F:\KEIL\C51\LIB\C51L.LIB (?C?ICALL) COMMENT TYPE 1: A51 / ASM51 Assembler - C:\KEIL\C51\LIB\C51L.LIB (?C_INIT) + F:\KEIL\C51\LIB\C51L.LIB (?C_INIT) COMMENT TYPE 1: A51 / ASM51 Assembler @@ -292,25 +292,25 @@ 004CB7H 004CB7H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?18 004CB8H 004CBEH 000007H --- --- **GAP** 004CBFH 004D05H 000047H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?4 -004D06H 004D23H 00001EH --- --- **GAP** -004D24H 004D24H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?33 -004D25H 004D28H 000004H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?37 -004D29H 004D29H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?36 -004D2AH 004D2BH 000002H --- --- **GAP** -004D2CH 004D2FH 000004H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?19 -004D30H 004D31H 000002H --- --- **GAP** -004D32H 004D32H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?16 -004D33H 004D3CH 00000AH --- --- **GAP** -004D3DH 004D3DH 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?21 -004D3EH 004D64H 000027H --- --- **GAP** -004D65H 004D65H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?7 -004D66H 004D66H 000001H --- --- **GAP** -004D67H 004D67H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?13 -004D68H 004D7AH 000013H --- --- **GAP** -004D7BH 004D7BH 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?1 -004D7CH 004D86H 00000BH --- --- **GAP** -004D87H 004D87H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?32 -004D88H 004D92H 00000BH --- --- **GAP** +004D06H 004D0FH 00000AH --- --- **GAP** +004D10H 004D10H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?33 +004D11H 004D14H 000004H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?37 +004D15H 004D15H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?36 +004D16H 004D17H 000002H --- --- **GAP** +004D18H 004D1BH 000004H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?19 +004D1CH 004D1DH 000002H --- --- **GAP** +004D1EH 004D1EH 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?16 +004D1FH 004D28H 00000AH --- --- **GAP** +004D29H 004D29H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?21 +004D2AH 004D50H 000027H --- --- **GAP** +004D51H 004D51H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?7 +004D52H 004D52H 000001H --- --- **GAP** +004D53H 004D53H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?13 +004D54H 004D66H 000013H --- --- **GAP** +004D67H 004D67H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?1 +004D68H 004D72H 00000BH --- --- **GAP** +004D73H 004D73H 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?32 +004D74H 004D92H 00001FH --- --- **GAP** 004D93H 004DA6H 000014H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?25 004DA7H 004DA7H 000001H --- --- **GAP** 004DA8H 004DBBH 000014H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?2 @@ -498,7 +498,7 @@ 02004DBCH XDATA --- ksSelMapCurr 02004D93H XDATA --- ksSelMapOld 02004DD0H XDATA --- le_lap_temp - 02004D25H XDATA DWORD le_pin_code + 02004D11H XDATA DWORD le_pin_code 02004DD7H XDATA BYTE le_pin_code_len 02004DDCH XDATA BYTE le_send_battery_level_delay_count 02004DDBH XDATA BYTE le_send_battery_level_flag @@ -510,8 +510,8 @@ 02004DDDH XDATA BYTE long_press_flag 02000B7FH XDATA BYTE lpm_flag 02004C00H XDATA --- m_24g_addr - 02004D2CH XDATA --- m_24g_enter_hibernate - 02004D32H XDATA BYTE m_24g_led_flag + 02004D18H XDATA --- m_24g_enter_hibernate + 02004D1EH XDATA BYTE m_24g_led_flag 02004BEFH XDATA BYTE m_24g_pairing_sm 02004BEBH XDATA --- m_24g_paring_addr 02004C91H XDATA WORD m_adc0vBase @@ -521,21 +521,21 @@ 02004C95H XDATA WORD m_adcCurrentValue 02004CB7H XDATA BYTE m_caps_num_lock 02004DE1H XDATA BYTE m_caps_num_lock_last - 02004D3DH XDATA BYTE m_customize_timer - 02004D67H XDATA BYTE m_le_battery_level_display_enable + 02004D29H XDATA BYTE m_customize_timer + 02004D53H XDATA BYTE m_le_battery_level_display_enable 020044F9H XDATA --- m_le_lap 0200447BH XDATA --- m_le_ltk - 02004D29H XDATA BYTE m_le_send_security_request_flag - 02004D87H XDATA BYTE m_le_start_auto_reco_timer - 02004D7BH XDATA BYTE m_le_system_4type + 02004D15H XDATA BYTE m_le_send_security_request_flag + 02004D73H XDATA BYTE m_le_start_auto_reco_timer + 02004D67H XDATA BYTE m_le_system_4type 0200425EH XDATA BYTE m_link_key_exists 02004262H XDATA --- m_linkkey 02004131H XDATA BYTE m_lpm_mode 0200448BH XDATA BYTE m_ltk_exists - 02004D65H XDATA BYTE m_pc_sleep_flag + 02004D51H XDATA BYTE m_pc_sleep_flag 02004CB6H XDATA BYTE m_power_on_flag 02004274H XDATA --- m_reconn_addr - 02004D24H XDATA BYTE m_reconnect_continue + 02004D10H XDATA BYTE m_reconnect_continue 02000040H XDATA --- m_remote_addr 020003D0H XDATA --- m_remote_le_addr 02008010H XDATA BYTE m_reset_reg @@ -813,8 +813,8 @@ 02004E57H PUBLIC XDATA BYTE fast_connect_flag 02004E4EH PUBLIC XDATA --- multikey 02004E4DH PUBLIC XDATA BYTE mult_key_status - 02004D25H PUBLIC XDATA DWORD le_pin_code - 02004D29H PUBLIC XDATA BYTE m_le_send_security_request_flag + 02004D11H PUBLIC XDATA DWORD le_pin_code + 02004D15H PUBLIC XDATA BYTE m_le_send_security_request_flag 02004DF0H PUBLIC XDATA --- bd_key_record_list 02004DEFH PUBLIC XDATA BYTE delayChgInvTimer_last 02004DEEH PUBLIC XDATA BYTE mult_key_value @@ -825,8 +825,8 @@ 02004DE9H PUBLIC XDATA BYTE key_value_temp 02004213H PUBLIC XDATA BYTE kscurrmult 02004C95H PUBLIC XDATA WORD m_adcCurrentValue - 02004D24H PUBLIC XDATA BYTE m_reconnect_continue - 02004D87H PUBLIC XDATA BYTE m_le_start_auto_reco_timer + 02004D10H PUBLIC XDATA BYTE m_reconnect_continue + 02004D73H PUBLIC XDATA BYTE m_le_start_auto_reco_timer 02004DE8H PUBLIC XDATA BYTE fn_lock_flag 02000040H PUBLIC XDATA --- m_remote_addr 02004DE7H PUBLIC XDATA BYTE delayChgInvTimer @@ -849,26 +849,26 @@ 02004DDDH PUBLIC XDATA BYTE long_press_flag 020044F9H PUBLIC XDATA --- m_le_lap 02004800H PUBLIC XDATA --- hidBuff - 02004D3DH PUBLIC XDATA BYTE m_customize_timer + 02004D29H PUBLIC XDATA BYTE m_customize_timer 02004DDCH PUBLIC XDATA BYTE le_send_battery_level_delay_count 02004CB6H PUBLIC XDATA BYTE m_power_on_flag 02004DDBH PUBLIC XDATA BYTE le_send_battery_level_flag - 02004D2CH PUBLIC XDATA --- m_24g_enter_hibernate + 02004D18H PUBLIC XDATA --- m_24g_enter_hibernate 02004CB7H PUBLIC XDATA BYTE m_caps_num_lock 02004C90H PUBLIC XDATA BYTE m_adc_channel 02004DDAH PUBLIC XDATA BYTE switch_role_timer - 02004D32H PUBLIC XDATA BYTE m_24g_led_flag + 02004D1EH PUBLIC XDATA BYTE m_24g_led_flag 02004DD9H PUBLIC XDATA BYTE control_key_flag 0200425EH PUBLIC XDATA BYTE m_link_key_exists 02004BEFH PUBLIC XDATA BYTE m_24g_pairing_sm - 02004D67H PUBLIC XDATA BYTE m_le_battery_level_display_enable + 02004D53H PUBLIC XDATA BYTE m_le_battery_level_display_enable 02004C93H PUBLIC XDATA WORD m_adc3vValue 02004131H PUBLIC XDATA BYTE m_lpm_mode 02004DD8H PUBLIC XDATA BYTE fn_tx_flag 0200448BH PUBLIC XDATA BYTE m_ltk_exists 02000B81H PUBLIC XDATA BYTE m_wakup_from_power_flag 02004C91H PUBLIC XDATA WORD m_adc0vBase - 02004D65H PUBLIC XDATA BYTE m_pc_sleep_flag + 02004D51H PUBLIC XDATA BYTE m_pc_sleep_flag 02004DD7H PUBLIC XDATA BYTE le_pin_code_len 02004C00H PUBLIC XDATA --- m_24g_addr 02004DD6H PUBLIC XDATA BYTE recon_index @@ -880,7 +880,7 @@ 020003D0H PUBLIC XDATA --- m_remote_le_addr 02004DD0H PUBLIC XDATA --- le_lap_temp 02004DA8H PUBLIC XDATA --- ksSelMapCheck - 02004D7BH PUBLIC XDATA BYTE m_le_system_4type + 02004D67H PUBLIC XDATA BYTE m_le_system_4type 02004BEBH PUBLIC XDATA --- m_24g_paring_addr 01000696H PUBLIC CONST --- ksMap 01000681H PUBLIC CONST --- col Index: c51/output/FW.SBR =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/output/eeprom.dat =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/eeprom.dat (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/eeprom.dat (working copy) @@ -427,7 +427,7 @@ d8 a0 4d -3f +2b 20 20 00 @@ -563,7 +563,7 @@ 68 01 4d -2a +16 20 40 00 @@ -571,7 +571,7 @@ 68 00 cd -67 +53 20 7a 00 @@ -595,7 +595,7 @@ 68 0a 4d -37 +23 1c 42 7e @@ -607,7 +607,7 @@ 68 09 4d -3b +27 98 46 fc @@ -631,11 +631,11 @@ 60 0a 4d -37 +23 68 00 cd -3d +29 1f e0 fe @@ -643,7 +643,7 @@ 60 00 cd -3d +29 20 60 00 @@ -1063,7 +1063,7 @@ 60 02 4d -33 +1f 68 08 c7 @@ -1071,7 +1071,7 @@ 68 00 cd -36 +22 98 46 7c @@ -1087,7 +1087,7 @@ 68 0a 4d -33 +1f 60 0a 47 @@ -1099,7 +1099,7 @@ 60 0a 4d -37 +23 20 60 00 @@ -1150,7 +1150,7 @@ 7d 70 4d -87 +73 05 20 60 @@ -2643,7 +2643,7 @@ d8 c0 4d -53 +3f 20 20 7e @@ -2718,7 +2718,7 @@ 00 70 4d -66 +52 00 20 20 @@ -2923,7 +2923,7 @@ 68 00 cd -66 +52 c0 00 82 @@ -2950,7 +2950,7 @@ 00 70 4d -66 +52 00 df e0 @@ -3151,7 +3151,7 @@ 68 04 4d -72 +5e 60 04 03 @@ -3527,7 +3527,7 @@ 68 02 4d -25 +11 1f e2 5e @@ -3627,14 +3627,14 @@ 68 00 cd -7a +66 c0 01 03 9a 70 4d -7b +67 04 70 0b @@ -3654,8 +3654,8 @@ 93 70 4d -7b -02 +67 +03 70 0b 7d @@ -3666,8 +3666,8 @@ 27 70 4d -7b -05 +67 +02 70 0b 7d @@ -3679,14 +3679,14 @@ 68 00 cd -7a +66 c0 01 03 8e 70 4d -7a +66 02 20 20 @@ -3699,7 +3699,7 @@ 60 02 4d -98 +84 70 0b 7d @@ -3775,7 +3775,7 @@ 60 01 4d -98 +84 70 0b 7d @@ -3795,7 +3795,7 @@ da 40 4d -7e +6a 20 40 7f @@ -3810,8 +3810,8 @@ 8e 70 4d -7b -02 +67 +05 70 0b 7d @@ -3822,7 +3822,7 @@ 27 70 4d -24 +10 01 68 01 @@ -3982,7 +3982,7 @@ 66 70 4d -7a +66 01 70 0b @@ -3995,7 +3995,7 @@ 68 00 cd -7a +66 c0 01 03 @@ -4031,7 +4031,7 @@ d8 c0 4d -88 +74 20 40 7e @@ -4075,7 +4075,7 @@ 68 01 4d -7c +68 e0 a1 00 @@ -4091,7 +4091,7 @@ 68 02 4d -98 +84 d8 a0 44 @@ -4119,7 +4119,7 @@ 68 01 4d -98 +84 60 01 44 @@ -4183,7 +4183,7 @@ 68 00 cd -67 +53 20 3a 57 @@ -5483,7 +5483,7 @@ 60 09 4d -3b +27 20 60 00 @@ -5495,7 +5495,7 @@ 60 02 4d -6a +56 e8 c1 00 @@ -5503,7 +5503,7 @@ 60 01 4d -68 +54 20 40 59 @@ -5527,7 +5527,7 @@ 60 04 4d -72 +5e 20 60 00 @@ -5535,7 +5535,7 @@ 68 03 4d -68 +54 20 3a 05 @@ -5578,7 +5578,7 @@ 20 70 4d -66 +52 01 70 0b @@ -5674,7 +5674,7 @@ 74 70 4d -29 +15 01 60 00 @@ -5831,7 +5831,7 @@ 68 02 4d -25 +11 1f e2 5e @@ -5911,11 +5911,11 @@ 68 02 4d -2c +18 60 02 4d -5a +46 20 40 05 @@ -5947,7 +5947,7 @@ 68 00 cd -31 +1d 24 7a 00 @@ -5991,7 +5991,7 @@ 68 01 cd -62 +4e 20 40 7e @@ -6051,7 +6051,7 @@ 68 02 4d -5a +46 20 20 05 @@ -6095,7 +6095,7 @@ 68 00 cd -3f +2b c0 02 05 @@ -6115,7 +6115,7 @@ 68 00 cd -31 +1d 24 5a 34 @@ -6126,7 +6126,7 @@ 00 70 4d -3f +2b 00 70 4b @@ -6138,7 +6138,7 @@ 05 70 4d -3f +2b 03 70 4b @@ -6150,7 +6150,7 @@ 05 70 4d -3f +2b 02 70 4b @@ -6183,7 +6183,7 @@ d8 c0 4d -3f +2b d8 a0 0c @@ -6222,7 +6222,7 @@ e0 70 4d -31 +1d 00 68 00 @@ -6250,7 +6250,7 @@ 00 70 4d -31 +1d 01 68 00 @@ -6331,7 +6331,7 @@ 60 04 cd -3f +2b 20 60 00 @@ -6390,7 +6390,7 @@ 00 70 4d -31 +1d 00 20 60 @@ -6398,7 +6398,7 @@ 00 70 4d -31 +1d 00 70 0b @@ -6474,7 +6474,7 @@ 00 70 4d -65 +51 01 20 60 @@ -7568,8 +7568,8 @@ 20 3a 7a -12 -03 +96 +8f aa 55 f1 @@ -10017,13 +10017,13 @@ f0 90 4d -32 +1e 74 03 f0 90 4d -65 +51 e0 60 08 @@ -10031,7 +10031,7 @@ f0 90 4d -32 +1e 74 03 f0 @@ -10071,7 +10071,7 @@ e4 90 4d -2c +18 f0 a3 74 @@ -10089,7 +10089,7 @@ e4 90 4d -2c +18 f0 a3 74 @@ -10222,7 +10222,7 @@ 06 90 4d -32 +1e 74 03 f0 @@ -10419,7 +10419,7 @@ 0a 90 4d -32 +1e e0 90 48 @@ -11010,7 +11010,7 @@ e4 90 4d -24 +10 f0 90 4d @@ -11018,7 +11018,7 @@ f0 90 4d -87 +73 f0 22 90 @@ -11247,7 +11247,7 @@ 39 90 4d -67 +53 e0 60 33 @@ -11485,7 +11485,7 @@ f0 90 4d -2c +18 74 ff f0 @@ -11550,7 +11550,7 @@ 22 90 4d -32 +1e e0 60 4a @@ -11604,7 +11604,7 @@ f0 90 4d -32 +1e e0 90 48 @@ -12790,7 +12790,7 @@ e4 90 4d -32 +1e f0 90 4c @@ -13125,7 +13125,7 @@ f0 90 4d -32 +1e 74 03 f0 @@ -13443,7 +13443,7 @@ 22 90 4d -25 +11 12 05 82 @@ -13495,7 +13495,7 @@ e4 90 4d -29 +15 f0 90 4c @@ -13543,7 +13543,7 @@ 22 90 4d -7b +67 e0 24 fd @@ -13629,7 +13629,7 @@ e4 90 4d -24 +10 f0 7f 19 @@ -15286,7 +15286,7 @@ 80 90 4d -65 +51 e0 60 03 @@ -16438,7 +16438,7 @@ 2a 90 4d -2c +18 f0 a3 74 @@ -16465,7 +16465,7 @@ 0f 90 4d -2c +18 f0 a3 74 @@ -19977,7 +19977,7 @@ f0 90 4d -87 +73 e0 60 0b @@ -20167,7 +20167,7 @@ 0b 90 4d -29 +15 e0 70 05 @@ -20190,7 +20190,7 @@ 15 90 4d -32 +1e e0 60 02 @@ -21637,8 +21637,8 @@ 04 cf 22 -3b -7a +90 +3d aa 55 40 @@ -21713,7 +21713,7 @@ 55 02 00 -3b +27 4d 20 00 @@ -22440,6 +22440,51 @@ dd aa 55 +09 +00 +6a +4d +41 +70 +70 +6c +65 +20 +49 +6e +63 +aa +55 +02 +00 +68 +4d +0a +18 +aa +55 +10 +00 +74 +4d +d0 +00 +2d +12 +1e +4b +0f +a4 +99 +4e +ce +b5 +31 +f4 +05 +79 +aa +55 01 00 7e @@ -22461,7 +22506,7 @@ 55 02 00 -2a +16 4d 2c 00 @@ -22474,39 +22519,9 @@ 50 aa 55 -02 -00 -7c -4d -0a -18 -aa -55 -10 -00 -88 -4d -d0 -00 -2d -12 -1e -4b -0f -a4 -99 -4e -ce -b5 -31 -f4 -05 -79 -aa -55 01 00 -67 +53 4d 01 aa @@ -22588,7 +22603,7 @@ 55 07 00 -53 +3f 4d 06 ff @@ -22739,7 +22754,7 @@ 55 04 00 -2c +18 4d 00 48 @@ -22749,7 +22764,7 @@ 55 07 00 -5e +4a 4d ff ff @@ -23039,23 +23054,8 @@ 6c 59 50 -6f -94 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +cd +d2 ff ff ff @@ -32764,5 +32764,5 @@ ff ff ff -47 -78 +38 +40 Index: c51/output/fw.hex =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/fw.hex (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/fw.hex (working copy) @@ -150,12 +150,12 @@ :10095000CA904DE5E0600261CA904E4DF0904DEEB8 :10096000F0904DEAE0600AE4F0904E4E7406F0809C :1009700006904E4E7402F07B017A4E794E7D0361F3 -:10098000CB904CFCE06008E4F0904D327403F090A2 -:100990004D65E06008E4F0904D327403F0904CC770 +:10098000CB904CFCE06008E4F0904D1E7403F090B6 +:100990004D51E06008E4F0904D1E7403F0904CC798 :1009A000E0B404069042137403F0904DE7740AF02B :1009B000E4904CE3F0A3F0904CD5E0B40112E49045 -:1009C0004D2CF0A37448F0A37412F0E4A3F080104F -:1009D000E4904D2CF0A37448F0A3745DF0E4A3F010 +:1009C0004D18F0A37448F0A37412F0E4A3F0801063 +:1009D000E4904D18F0A37448F0A3745DF0E4A3F024 :1009E0007B017A4879007D097C0091AE7B017A4ECB :1009F000794E7D097C0091AE904CB67401F0904C1C :100A0000F4E0FF6401700261CAEF6404700261CA1D @@ -163,7 +163,7 @@ :100A20004ECBF0904ECBE0FFC394055037904EC7AD :100A3000E0FBA3E0FAA3E02401F9E43AFA7E00E93E :100A40002FF9EE3AFA1203B6FF64396009EF6453E6 -:100A50006004EFB44706904D327403F0904ECBE043 +:100A50006004EFB44706904D1E7403F0904ECBE057 :100A600004F080BF904EC7E0FBA3E0FAA3E0F912C8 :100A700022E4904E4DE0B401117402F0904E4EF01D :100A80007B017A4E794E7D0361CB904E4DE0B404EC @@ -175,7 +175,7 @@ :100AE000904DE5E07016904EC7E0FBA3E0FAA3E05E :100AF0002401F9E43AFA7D067C0091AE9048007436 :100B000001F0904EC7E0FBA3E0FAA3E0F91203B6B0 -:100B1000904801F0904CC5E0B4030A904D32E0904B +:100B1000904801F0904CC5E0B4030A904D1EE0905F :100B20004802F08005E4904802F0E4904DE0F09037 :100B30004E57E0706F9000011203CFB47F157E48CE :100B40007F03E92402F9E43AFA904EC67405F011E5 @@ -212,8 +212,8 @@ :100D30004DDEF0904DD5F0904DE6F0904DE4F09002 :100D40004E4DF0904DDDF0904DE0F0904DE3F09081 :100D50004DEBF0904DD8F0904DE8F0904DEEF090C6 -:100D60004CB774F0F0904DE1F0E4904D24F0904DCC -:100D7000D4F0904D87F022904EFBEFF0A3EDF07B86 +:100D60004CB774F0F0904DE1F0E4904D10F0904DE0 +:100D7000D4F0904D73F022904EFBEFF0A3EDF07B9A :100D8000017A4879007D097C0091AE904800740199 :100D9000F0A3E0FF904EFBE0FEEF4E904801F09094 :100DA0004EFCE0904803F07B017A4879007D0961B0 @@ -227,7 +227,7 @@ :100E20004CF6F0904CF5F0A3E0FDE4FFB177E490D0 :100E30004CF4F022904DDCE0600FE014F0E070091B :100E400090413104F0904DDBF0904CC7E0FF64041A -:100E50007058EF64047039904D67E06033904DDB5B +:100E50007058EF64047039904D53E06033904DDB6F :100E6000E07010904CE3E0FEA3E0FF4E6022EF54F0 :100E70001F701DE4904DDBF0904E4E7404F0904CCA :100E8000F9E0904E4FF07B017A4E794E7D0271CBA6 @@ -242,14 +242,14 @@ :100F10004010904DE6E06007E4F07F0E121095124D :100F200017A422121DD6904BEF74FFF0904CFC7466 :100F300001F0E4904CE6F0A3F0A3F0904CB774F00D -:100F4000F0904DE1F0904D2C74FFF0A3F0A3F0A3CE +:100F4000F0904DE1F0904D1874FFF0A3F0A3F0A3E2 :100F5000F022904EE6E4F0A3F0A3F01235EC502519 :100F60001229DB904EE6EBF0A3EAF0A3E9F04A7019 :100F700007904CB604F0800E904EE6E0FBA3E0FA3A -:100F8000A3E0F911C022904D32E0604A904DDEE0BE +:100F8000A3E0F911C022904D1EE0604A904DDEE0D2 :100F90007044904CC5E06403703C904DE7E0FF90D6 :100FA0004DEFE06F60287B017A4879007D097C0075 -:100FB00091AEE4904E4DF090480004F0904D32E038 +:100FB00091AEE4904E4DF090480004F0904D1EE04C :100FC000904802F07B017A4879007D0971CB904D01 :100FD000E7E0904DEFF022900BE77406F0904F0A97 :100FE000EDF0E0FD900BE8F07E0B7FE9904EC6ED52 @@ -324,7 +324,7 @@ :101430000CF0904CE5E07025904CE2E0701FC2018A :101440007F1D51988017904CE5E0700C904CE2E0C5 :101450007006D2017F1D5198E4904CE8F0E4904D65 -:1014600032F0904CB7E0904DE1F022D2017F105164 +:101460001EF0904CB7E0904DE1F022D2017F105178 :1014700098D2017F0F4198D2017F10519822904F4E :101480000DEFF07B017A807974121FC99209904F99 :101490000DE0FFA209B392014198904F09EFF012BD @@ -344,7 +344,7 @@ :101570007B017A4D79F07D5D7C007F607E7F121A61 :10158000BFD2017FFF4198904DD6E0FF0207379010 :101590004CC57403F0E4A3F0F1F0E4904CEEF0904D -:1015A0004CEBF0904CC074FEF0904CC3F0904D3278 +:1015A0004CEBF0904CC074FEF0904CC3F0904D1E8C :1015B0007403F0904DE7740AF0904F09E0643170C5 :1015C00034904DE8F0904E57F0904CC1F0904CE5BF :1015D000741EF0904BEBE0B40F12A3E0B40F0DA318 @@ -364,19 +364,19 @@ :1016B00004F0E4A3F0F1F0E4904CEBF0904DDC7416 :1016C0000AF0904CC3E0904CC0F0904CBF7403F013 :1016D00022904CC3E014FD7F01120803904CC3E03C -:1016E000904CC0F0904CBF7403F022904D25120531 +:1016E000904CC0F0904CBF7403F022904D11120545 :1016F0008200000000E4904DD7F0904DDF04F090A0 :101700004CC804F0904CC704F022904CC7E0904CB9 :10171000CBF0E4904CC7F0A3F0904CEB04F0E490D5 -:101720004D29F0904CECE0B40104E4F08076904C4C +:101720004D15F0904CECE0B40104E4F08076904C60 :10173000EDE06003FF01BF904CF0E06008904DD6F3 :10174000E0FF020737F1A4E4904CE3F0A3F022900D -:101750004D7BE024FD601114601614601B2403709F +:101750004D67E024FD601114601614601B240370B3 :101760001FE4904CC1F0801D904CC17401F08015B5 :10177000904CC17402F0800D904CC17403F0800550 :10178000E4904CC1F0904CC1E0FF904CC3E075F088 :101790001FA424EEF582E4344DF583EFF0904CBFA6 -:1017A0007403F022E4904D24F07F190195EFD39457 +:1017A0007403F022E4904D10F07F190195EFD3946B :1017B000004011E4FDFC0DBD00010CBC04F8BDA609 :1017C000F51F80E922904CC7E0FF64046004EFB489 :1017D00003077F1111957F0122904CC5E0FF640340 @@ -480,7 +480,7 @@ :101DF0007F1DAC07ECF46017AF04D204122F85AF3F :101E000004A2069201121298AF04C202122F63229A :101E10001232F21233B2120DB1716D121380904D65 -:101E200065E06003120F23900B7EE014600C24FE2B +:101E200051E06003120F23900B7EE014600C24FE3F :101E300070E1D174B1D6F1AC80FE904CEAE0701E36 :101E4000904CECE07018904CE5E07012904DD9E0A9 :101E5000700C904DE3E07006904CF8E06005123590 @@ -552,8 +552,8 @@ :1022700002F022904CDEE0FEA3E0FFE4FCFD904E75 :10228000CDE0F8A3E0F9A3E0FAA3E0FBC3120565F3 :10229000501C904CD57401F0904CFCE0702A904D8D -:1022A0002CF0A37448F0A37412F0E4A3F022E4909D -:1022B0004CD5F0904CFCE0700F904D2CF0A374487E +:1022A00018F0A37448F0A37412F0E4A3F022E490B1 +:1022B0004CD5F0904CFCE0700F904D18F0A3744892 :1022C000F0A3745DF0E4A3F022AD07AC06904E4D90 :1022D000E06402600E7401F0904E4E04F0EFA3F043 :1022E000EEA3F022904EDAEBF0A3EAF0A3E9F0E4DB @@ -773,7 +773,7 @@ :103040001DF2C2017F1E121298C2067F1D021DF2E0 :10305000904CEAE0600214F0904CEFE0600214F053 :10306000904CF8E0600B14F0E07006904CF474069D -:10307000F0904D87E0600BE014F0E070057F2D12BA +:10307000F0904D73E0600BE014F0E070057F2D12CE :103080001095904CE5E0601E904CEEE06006E490F8 :103090004CE5F022904CE5E014F01111904CE5E085 :1030A0007045315C8041904CE9E0703B904CEEE023 @@ -785,8 +785,8 @@ :103100004E4EE0600D7B017A4E794E7D03120BCB63 :103110008011904800E0600B7B017A4879007D09BE :10312000120BCB904DD4E06011E014F0E0700B90E6 -:103130004D29E070057F1B121095904DE7E0601B54 -:10314000E014F0E07015904D32E06002E4F0904C35 +:103130004D15E070057F1B121095904DE7E0601B68 +:10314000E014F0E07015904D1EE06002E4F0904C49 :10315000C7E0B40406904213740CF022904CC3E014 :10316000B40107D2017F1F021298904CC3E0B40251 :1031700007D2017F1E021298904CC3E0B4030ED216 Index: c51/output/fwram.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/fwram.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/fwram.rom (working copy) @@ -2441,13 +2441,13 @@ f0 90 4d -32 +1e 74 03 f0 90 4d -65 +51 e0 60 08 @@ -2455,7 +2455,7 @@ f0 90 4d -32 +1e 74 03 f0 @@ -2495,7 +2495,7 @@ e4 90 4d -2c +18 f0 a3 74 @@ -2513,7 +2513,7 @@ e4 90 4d -2c +18 f0 a3 74 @@ -2646,7 +2646,7 @@ 06 90 4d -32 +1e 74 03 f0 @@ -2843,7 +2843,7 @@ 0a 90 4d -32 +1e e0 90 48 @@ -3434,7 +3434,7 @@ e4 90 4d -24 +10 f0 90 4d @@ -3442,7 +3442,7 @@ f0 90 4d -87 +73 f0 22 90 @@ -3671,7 +3671,7 @@ 39 90 4d -67 +53 e0 60 33 @@ -3909,7 +3909,7 @@ f0 90 4d -2c +18 74 ff f0 @@ -3974,7 +3974,7 @@ 22 90 4d -32 +1e e0 60 4a @@ -4028,7 +4028,7 @@ f0 90 4d -32 +1e e0 90 48 @@ -5214,7 +5214,7 @@ e4 90 4d -32 +1e f0 90 4c @@ -5549,7 +5549,7 @@ f0 90 4d -32 +1e 74 03 f0 @@ -5867,7 +5867,7 @@ 22 90 4d -25 +11 12 05 82 @@ -5919,7 +5919,7 @@ e4 90 4d -29 +15 f0 90 4c @@ -5967,7 +5967,7 @@ 22 90 4d -7b +67 e0 24 fd @@ -6053,7 +6053,7 @@ e4 90 4d -24 +10 f0 7f 19 @@ -7710,7 +7710,7 @@ 80 90 4d -65 +51 e0 60 03 @@ -8862,7 +8862,7 @@ 2a 90 4d -2c +18 f0 a3 74 @@ -8889,7 +8889,7 @@ 0f 90 4d -2c +18 f0 a3 74 @@ -12401,7 +12401,7 @@ f0 90 4d -87 +73 e0 60 0b @@ -12591,7 +12591,7 @@ 0b 90 4d -29 +15 e0 70 05 @@ -12614,7 +12614,7 @@ 15 90 4d -32 +1e e0 60 02 Index: c51/output/ramcode.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/ramcode.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/ramcode.rom (working copy) @@ -103,7 +103,7 @@ 18508400 60094b9a 20600000 -d8a04d3f +d8a04d2b 202000db 18c22200 6800cba9 @@ -137,27 +137,27 @@ 20200082 68014cbc 20200082 -68014d2a +68014d16 20400090 -6800cd67 +6800cd53 207a0000 20200083 e0a10000 1a220c00 202000dd -680a4d37 +680a4d23 1c427e00 98467e00 -68094d3b +68094d27 9846fc00 20407efd 1807fe00 207a0000 1c420400 -600a4d37 -6800cd3d +600a4d23 +6800cd29 1fe0fe01 -6000cd3d +6000cd29 20600000 680a4c59 1c427e00 @@ -262,16 +262,16 @@ 2022e9b1 2020320b 1c427e00 -60024d33 +60024d1f 6808c7ef -6800cd36 +6800cd22 98467c00 2441010e 20207c06 -680a4d33 +680a4d1f 600a47ec 600a4c59 -600a4d37 +600a4d23 20600000 da2047df 20407f9f @@ -284,7 +284,7 @@ c01e811e c00a82a6 20203e7d -704d8705 +704d7305 20600000 60088259 6800cc8d @@ -657,7 +657,7 @@ d8c043fa 20207e45 1fe27200 -d8c04d53 +d8c04d3f 20207e45 6800c3f9 1fe0fe0b @@ -676,7 +676,7 @@ e8c08000 6000ccb7 20600000 -704d6600 +704d5200 202005ba 204054bd 68088017 @@ -727,14 +727,14 @@ 24608000 6800c440 c00282dc -6800cd66 +6800cd52 c00082e0 20600000 680083c0 79207e04 600083c0 20600000 -704d6600 +704d5200 dfe00000 6002446f 6000c48b @@ -784,7 +784,7 @@ 20406227 68024477 e0420000 -68044d72 +68044d5e 60040380 204074b6 6800c48b @@ -878,7 +878,7 @@ c2000367 2040759e 1f00f1fc -68024d25 +68024d11 1fe25e00 1f00f004 20207573 @@ -903,25 +903,25 @@ c0008396 c00583b1 20205907 -6800cd7a +6800cd66 c001039a -704d7b04 +704d6704 700b7d3e 20207c27 6800c4e6 c0000393 -704d7b02 +704d6703 700b7d3e 20207c27 -704d7b05 +704d6702 700b7d3e 20207c27 -6800cd7a +6800cd66 c001038e -704d7a02 +704d6602 202003e3 68020347 -60024d98 +60024d84 700b7d08 20205620 68010342 @@ -940,19 +940,19 @@ c20003a4 2020038e 1a627e00 -60014d98 +60014d84 700b7d0a 20205620 df200009 da200347 -da404d7e +da404d6a 20407f25 202283b7 2020038e -704d7b02 +704d6705 700b7d3e 20207c27 -704d2401 +704d1001 680103fa c01083be 202059ed @@ -992,10 +992,10 @@ c00403fd c0050404 20205666 -704d7a01 +704d6601 700b7d06 20205620 -6800cd7a +6800cd66 c00103f2 d8a04445 58000001 @@ -1004,7 +1004,7 @@ e0a10000 58002800 e0a10000 -d8c04d88 +d8c04d74 20407e35 d840001b 20205892 @@ -1015,18 +1015,18 @@ e0a10000 58002800 e0a10000 -68014d7c +68014d68 e0a10000 d840000d 20205892 -68024d98 +68024d84 d8a04445 e0a20000 58002803 e0a10000 1800040b 20205892 -68014d98 +68014d84 60014445 18000407 20205892 @@ -1042,7 +1042,7 @@ c0160414 c0070417 202057c6 -6800cd67 +6800cd53 203a5728 202057c6 6800cc69 @@ -1367,20 +1367,20 @@ 20405924 68014437 1fef8404 -60094d3b +60094d27 20600000 e8c40000 -60024d6a +60024d56 e8c10000 -60014d68 +60014d54 20405939 6800cc69 c0010563 20400566 68040380 -60044d72 +60044d5e 20600000 -68034d68 +68034d54 203a056c 704c7c03 20400326 @@ -1391,7 +1391,7 @@ 20600000 700b7d33 20205620 -704d6601 +704d5201 700b7d2b 20205620 58000014 @@ -1415,7 +1415,7 @@ 202058f8 704c6903 20205974 -704d2901 +704d1501 6000c4ae e8c30000 e0a30000 @@ -1454,7 +1454,7 @@ 1f00f001 2040759e 1f00f1fc -68024d25 +68024d11 1fe25e00 1f00f004 18006c38 @@ -1474,8 +1474,8 @@ 60024ba9 20600000 c6918000 -68024d2c -60024d5a +68024d18 +60024d46 204005e9 243405dc 704c150a @@ -1483,7 +1483,7 @@ 6800cbef c1ff8000 704c3d02 -6800cd31 +6800cd1d 247a0000 2040015c 24740000 @@ -1494,7 +1494,7 @@ 207a0000 6800c131 207a0000 -6801cd62 +6801cd4e 20407e8a 600a41fc 20203cda @@ -1509,7 +1509,7 @@ 207a0000 6800cc15 243a05d8 -68024d5a +68024d46 202005d9 6800cbef c0ff865c @@ -1520,21 +1520,21 @@ 20600000 78547c00 704be202 -6800cd3f +6800cd2b c00205fa c00285fd c0038603 c0030600 -6800cd31 +6800cd1d 245a34df 20600000 -704d3f00 +704d2b00 704be10a 20200605 -704d3f03 +704d2b03 704be104 20200605 -704d3f02 +704d2b02 704be103 20200605 704be201 @@ -1542,7 +1542,7 @@ 704be700 202034df df200009 -d8c04d3f +d8c04d2b d8a00cd5 20207e45 704be800 @@ -1552,14 +1552,14 @@ 6800cbe0 1fe0fe01 6000cbe0 -704d3100 +704d1d00 6800cbef c0ff862f 2040062b 704be700 704be600 20600000 -704d3101 +704d1d01 6800cbe7 1fe0fe01 6000cbe7 @@ -1579,7 +1579,7 @@ 202006ea 58000000 60048cd5 -6004cd3f +6004cd2b 20600000 20200676 7857fc00 @@ -1594,9 +1594,9 @@ 20400702 2057873c 20600000 -704d3100 +704d1d00 20600000 -704d3100 +704d1d00 700b7d32 20207c27 204006ab @@ -1615,7 +1615,7 @@ c07f8651 6000ccb7 20600000 -704d6501 +704d5101 20600000 79200023 20400658 Index: c51/output/sched.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/output/sched.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/output/sched.rom (working copy) @@ -65,7 +65,7 @@ 00 #mem_patch3F -4d3b: 20 00 # 20:10ms 30:15ms +4d27: 20 00 # 20:10ms 30:15ms 4131:01 4213:40 @@ -296,20 +296,21 @@ 44c2:14 44f9:11 46 34 54 77 dd +4d6a: +41 70 70 6c 65 20 49 6e 63 +4d68: +0a 18 +4d74: +d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 4c7e:00 4cb8:15 00 4cba:1d 00 4cbc:19 00 -4d2a:2c 00 +4d16:2c 00 4c60:50 -4d7c: -0a 18 -4d88: -d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 - -4d67:01 +4d53:01 4c6c: 0c 00 #Length @@ -331,7 +332,7 @@ 43da: #02 01 05 05 02 12 18 0f 18 03 19 c1 03 02 01 05 03 19 c1 03 03 03 12 18 -4d53: +4d3f: #microsoft swift pair 06 ff 06 00 03 00 80 @@ -358,9 +359,9 @@ 4beb:20 15 10 05 4c7d:c2 0d37:00 00 00 00 00 00 00 00 00 00 -4d2c:00 48 5d 00 #10 min -4d5e:ff ff ff ff -4d62:e8 fd 00 #00 00 0a +4d18:00 48 5d 00 #10 min +4d4a:ff ff ff ff +4d4e:e8 fd 00 #00 00 0a 4216:8f 10 ce 4219:00 0a 0b ef 0f Index: c51/patch/adc.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/bluetooth.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/global_variable.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/kb.dat =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/patch/kb.dat (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/patch/kb.dat (working copy) @@ -296,6 +296,12 @@ mem_le_notify_handle:14 mem_le_lap:11 46 34 54 77 dd +mem_le_search_mac_manu_name: +41 70 70 6c 65 20 49 6e 63 +mem_le_search_mac_uuid: +0a 18 +mem_le_search_service_uuid: +d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 mem_empty_count:00 mem_att_report1:15 00 @@ -304,11 +310,6 @@ mem_att_report_battery:2c 00 mem_le_rx_window:50 -mem_le_search_mac_uuid: -0a 18 -mem_le_search_service_uuid: -d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 - mem_le_battery_level_display_enable:01 mem_le_connection_updata_param: Index: c51/patch/kb_process.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/keyboard.format =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/patch/keyboard.format (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/patch/keyboard.format (working copy) @@ -159,7 +159,7 @@ 2 mem_att_report3 1 mem_suspend_flag -100 mem_32asm_data_end +80 mem_32asm_data_end 1 mem_store_ltk_timer 1 mem_reconnect_continue 4 mem_le_pin_code Index: c51/patch/keyscan.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/led.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/memmap.format =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/patch/memmap.format (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/patch/memmap.format (working copy) @@ -1010,37 +1010,37 @@ 0x4cbc mem_att_report3 0x4cbe mem_suspend_flag 0x4cbf mem_32asm_data_end -0x4d23 mem_store_ltk_timer -0x4d24 mem_reconnect_continue -0x4d25 mem_le_pin_code -0x4d29 mem_le_send_security_request_flag -0x4d2a mem_att_report_battery -0x4d2c mem_24g_enter_hibernate -0x4d30 mem_24g_txfail_cnt -0x4d31 mem_mouse_retry_flag -0x4d32 mem_24g_led_flag -0x4d33 mem_ui_timer_last_btclk_temp -0x4d37 mem_ui_check_timer_setup -0x4d3b mem_customize_timer_setup -0x4d3d mem_customize_timer -0x4d3e mem_ios_mode_flag -0x4d3f mem_24g_txbuf_new -0x4d53 mem_le_adv_swift_pair -0x4d5a mem_24g_enter_hibernate_setup -0x4d5e mem_24g_enter_hibernate_max -0x4d62 mem_24g_short_sleep_counter -0x4d65 mem_pc_sleep_flag -0x4d66 mem_le_pause_enc_flag -0x4d67 mem_le_battery_level_display_enable -0x4d68 mem_le_evidm -0x4d72 mem_le_skdm_temp -0x4d7a mem_le_connect_ios_mac_flag -0x4d7b mem_le_system_4type -0x4d7c mem_le_search_mac_uuid -0x4d7e mem_le_search_mac_manu_name -0x4d87 mem_le_start_auto_reco_timer -0x4d88 mem_le_search_service_uuid -0x4d98 mem_le_mac_handle_number +0x4d0f mem_store_ltk_timer +0x4d10 mem_reconnect_continue +0x4d11 mem_le_pin_code +0x4d15 mem_le_send_security_request_flag +0x4d16 mem_att_report_battery +0x4d18 mem_24g_enter_hibernate +0x4d1c mem_24g_txfail_cnt +0x4d1d mem_mouse_retry_flag +0x4d1e mem_24g_led_flag +0x4d1f mem_ui_timer_last_btclk_temp +0x4d23 mem_ui_check_timer_setup +0x4d27 mem_customize_timer_setup +0x4d29 mem_customize_timer +0x4d2a mem_ios_mode_flag +0x4d2b mem_24g_txbuf_new +0x4d3f mem_le_adv_swift_pair +0x4d46 mem_24g_enter_hibernate_setup +0x4d4a mem_24g_enter_hibernate_max +0x4d4e mem_24g_short_sleep_counter +0x4d51 mem_pc_sleep_flag +0x4d52 mem_le_pause_enc_flag +0x4d53 mem_le_battery_level_display_enable +0x4d54 mem_le_evidm +0x4d5e mem_le_skdm_temp +0x4d66 mem_le_connect_ios_mac_flag +0x4d67 mem_le_system_4type +0x4d68 mem_le_search_mac_uuid +0x4d6a mem_le_search_mac_manu_name +0x4d73 mem_le_start_auto_reco_timer +0x4d74 mem_le_search_service_uuid +0x4d84 mem_le_mac_handle_number 0x4800 mem_at_gpio 0x4801 mem_module_wake_up_gpio 0x4802 mem_module_state_gpio Index: c51/patch/ram.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/patch/ramcode.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/patch/ramcode.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/patch/ramcode.rom (working copy) @@ -103,7 +103,7 @@ 18508400 60094b9a 20600000 -d8a04d3f +d8a04d2b 202000db 18c22200 6800cba9 @@ -137,27 +137,27 @@ 20200082 68014cbc 20200082 -68014d2a +68014d16 20400090 -6800cd67 +6800cd53 207a0000 20200083 e0a10000 1a220c00 202000dd -680a4d37 +680a4d23 1c427e00 98467e00 -68094d3b +68094d27 9846fc00 20407efd 1807fe00 207a0000 1c420400 -600a4d37 -6800cd3d +600a4d23 +6800cd29 1fe0fe01 -6000cd3d +6000cd29 20600000 680a4c59 1c427e00 @@ -262,16 +262,16 @@ 2022e9b1 2020320b 1c427e00 -60024d33 +60024d1f 6808c7ef -6800cd36 +6800cd22 98467c00 2441010e 20207c06 -680a4d33 +680a4d1f 600a47ec 600a4c59 -600a4d37 +600a4d23 20600000 da2047df 20407f9f @@ -284,7 +284,7 @@ c01e811e c00a82a6 20203e7d -704d8705 +704d7305 20600000 60088259 6800cc8d @@ -657,7 +657,7 @@ d8c043fa 20207e45 1fe27200 -d8c04d53 +d8c04d3f 20207e45 6800c3f9 1fe0fe0b @@ -676,7 +676,7 @@ e8c08000 6000ccb7 20600000 -704d6600 +704d5200 202005ba 204054bd 68088017 @@ -727,14 +727,14 @@ 24608000 6800c440 c00282dc -6800cd66 +6800cd52 c00082e0 20600000 680083c0 79207e04 600083c0 20600000 -704d6600 +704d5200 dfe00000 6002446f 6000c48b @@ -784,7 +784,7 @@ 20406227 68024477 e0420000 -68044d72 +68044d5e 60040380 204074b6 6800c48b @@ -878,7 +878,7 @@ c2000367 2040759e 1f00f1fc -68024d25 +68024d11 1fe25e00 1f00f004 20207573 @@ -903,25 +903,25 @@ c0008396 c00583b1 20205907 -6800cd7a +6800cd66 c001039a -704d7b04 +704d6704 700b7d3e 20207c27 6800c4e6 c0000393 -704d7b02 +704d6703 700b7d3e 20207c27 -704d7b05 +704d6702 700b7d3e 20207c27 -6800cd7a +6800cd66 c001038e -704d7a02 +704d6602 202003e3 68020347 -60024d98 +60024d84 700b7d08 20205620 68010342 @@ -940,19 +940,19 @@ c20003a4 2020038e 1a627e00 -60014d98 +60014d84 700b7d0a 20205620 df200009 da200347 -da404d7e +da404d6a 20407f25 202283b7 2020038e -704d7b02 +704d6705 700b7d3e 20207c27 -704d2401 +704d1001 680103fa c01083be 202059ed @@ -992,10 +992,10 @@ c00403fd c0050404 20205666 -704d7a01 +704d6601 700b7d06 20205620 -6800cd7a +6800cd66 c00103f2 d8a04445 58000001 @@ -1004,7 +1004,7 @@ e0a10000 58002800 e0a10000 -d8c04d88 +d8c04d74 20407e35 d840001b 20205892 @@ -1015,18 +1015,18 @@ e0a10000 58002800 e0a10000 -68014d7c +68014d68 e0a10000 d840000d 20205892 -68024d98 +68024d84 d8a04445 e0a20000 58002803 e0a10000 1800040b 20205892 -68014d98 +68014d84 60014445 18000407 20205892 @@ -1042,7 +1042,7 @@ c0160414 c0070417 202057c6 -6800cd67 +6800cd53 203a5728 202057c6 6800cc69 @@ -1367,20 +1367,20 @@ 20405924 68014437 1fef8404 -60094d3b +60094d27 20600000 e8c40000 -60024d6a +60024d56 e8c10000 -60014d68 +60014d54 20405939 6800cc69 c0010563 20400566 68040380 -60044d72 +60044d5e 20600000 -68034d68 +68034d54 203a056c 704c7c03 20400326 @@ -1391,7 +1391,7 @@ 20600000 700b7d33 20205620 -704d6601 +704d5201 700b7d2b 20205620 58000014 @@ -1415,7 +1415,7 @@ 202058f8 704c6903 20205974 -704d2901 +704d1501 6000c4ae e8c30000 e0a30000 @@ -1454,7 +1454,7 @@ 1f00f001 2040759e 1f00f1fc -68024d25 +68024d11 1fe25e00 1f00f004 18006c38 @@ -1474,8 +1474,8 @@ 60024ba9 20600000 c6918000 -68024d2c -60024d5a +68024d18 +60024d46 204005e9 243405dc 704c150a @@ -1483,7 +1483,7 @@ 6800cbef c1ff8000 704c3d02 -6800cd31 +6800cd1d 247a0000 2040015c 24740000 @@ -1494,7 +1494,7 @@ 207a0000 6800c131 207a0000 -6801cd62 +6801cd4e 20407e8a 600a41fc 20203cda @@ -1509,7 +1509,7 @@ 207a0000 6800cc15 243a05d8 -68024d5a +68024d46 202005d9 6800cbef c0ff865c @@ -1520,21 +1520,21 @@ 20600000 78547c00 704be202 -6800cd3f +6800cd2b c00205fa c00285fd c0038603 c0030600 -6800cd31 +6800cd1d 245a34df 20600000 -704d3f00 +704d2b00 704be10a 20200605 -704d3f03 +704d2b03 704be104 20200605 -704d3f02 +704d2b02 704be103 20200605 704be201 @@ -1542,7 +1542,7 @@ 704be700 202034df df200009 -d8c04d3f +d8c04d2b d8a00cd5 20207e45 704be800 @@ -1552,14 +1552,14 @@ 6800cbe0 1fe0fe01 6000cbe0 -704d3100 +704d1d00 6800cbef c0ff862f 2040062b 704be700 704be600 20600000 -704d3101 +704d1d01 6800cbe7 1fe0fe01 6000cbe7 @@ -1579,7 +1579,7 @@ 202006ea 58000000 60048cd5 -6004cd3f +6004cd2b 20600000 20200676 7857fc00 @@ -1594,9 +1594,9 @@ 20400702 2057873c 20600000 -704d3100 +704d1d00 20600000 -704d3100 +704d1d00 700b7d32 20207c27 204006ab @@ -1615,7 +1615,7 @@ c07f8651 6000ccb7 20600000 -704d6501 +704d5101 20600000 79200023 20400658 Index: c51/patch/sch.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/patch/sch.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/patch/sch.rom (working copy) @@ -296,6 +296,12 @@ mem_le_notify_handle:14 mem_le_lap:11 46 34 54 77 dd +mem_le_search_mac_manu_name: +41 70 70 6c 65 20 49 6e 63 +mem_le_search_mac_uuid: +0a 18 +mem_le_search_service_uuid: +d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 mem_empty_count:00 mem_att_report1:15 00 @@ -304,11 +310,6 @@ mem_att_report_battery:2c 00 mem_le_rx_window:50 -mem_le_search_mac_uuid: -0a 18 -mem_le_search_service_uuid: -d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 - mem_le_battery_level_display_enable:01 mem_le_connection_updata_param: Index: c51/patch/sched.rom =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/patch/sched.rom (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/patch/sched.rom (working copy) @@ -296,6 +296,12 @@ mem_le_notify_handle:14 mem_le_lap:11 46 34 54 77 dd +mem_le_search_mac_manu_name: +41 70 70 6c 65 20 49 6e 63 +mem_le_search_mac_uuid: +0a 18 +mem_le_search_service_uuid: +d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 mem_empty_count:00 mem_att_report1:15 00 @@ -304,11 +310,6 @@ mem_att_report_battery:2c 00 mem_le_rx_window:50 -mem_le_search_mac_uuid: -0a 18 -mem_le_search_service_uuid: -d0 00 2d 12 1e 4b 0f a4 99 4e ce b5 31 f4 05 79 - mem_le_battery_level_display_enable:01 mem_le_connection_updata_param: Index: c51/patch/sys.obj =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/sys.c =================================================================== --- /YC1026/YC1086_BLE_24g_SDK/c51/sys.c (revision 800) +++ /YC1026/YC1086_BLE_24g_SDK/c51/sys.c (working copy) @@ -728,7 +728,7 @@ { m_le_start_auto_reco_timer--; if (!m_le_start_auto_reco_timer) - IPC_TxControlCmd(IPC_CMD_ANCS_TIMET); + IPC_TxControlCmd(IPC_CMD_ANCS_DELAY_TIMER); } //end