Index: Librarier/drivers/debug/yc_debug.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/drivers/debug/yc_debug.c (revision 6166) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/drivers/debug/yc_debug.c (working copy) @@ -349,6 +349,7 @@ } void pringt_string_log(char *format, ...) { + return; uint32_t ulIdx, ulValue, ulPos, ulCount, ulBase, ulNeg; char *pcStr, pcBuf[16], cFill; char HexFormat; Index: ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (revision 6180) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -149,8 +149,10 @@ fetch 1,mem_le_scan_enable rtnne LE_SCAN_ENABLE fetch 1,mem_le_state + bbit0 state_inconn,p_le_scan_without_link rtnbit1 lestate_update_map rtnbit1 lestate_update_param +p_le_scan_without_link: arg le_scan_interval_timer,queue call timer_check nrtn blank @@ -1429,9 +1431,10 @@ p_le_get_anchor_value: fetcht 2,mem_le_event_count increase 10,temp - fetch 1,mem_le_slave_latency + fetch 2,mem_le_slave_latency branch p_le_get_anchor_value_no_latency,blank - lshift2 pdata,pdata + mul32 pdata,3,pdata + //lshift2 pdata,pdata iadd temp,temp p_le_get_anchor_value_no_latency: storet 2,mem_le_instant @@ -1639,6 +1642,9 @@ jam 0,mem_hci_cmd jam 0,mem_le_peer_sca + fetch 4,mem_le_conn_latency + store 4,mem_le_slave_latency + call le_create_conn_ndongle jam 2,mem_le_conn_status //arg MASTER_CONNECTION_HANDLE,temp Index: ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (revision 6180) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (working copy) @@ -156,7 +156,7 @@ # mem_tws_rf_packet_rx_window_size - (mem_tws_rf_rcv_window_size + 72us + hardware_delay(18us) + mem_tws_rf_slave_send_full_packet_sleep_time/2) mem_tws_rf_master_check_raw_id_time:db 04 -mem_rf_debug_enable: 01 +mem_rf_debug_enable: 00 mem_rf_debug_rf_rx_debug_gpio: 0c mem_rf_debug_rf_tx_debug_gpio: 0e mem_rf_debug_rf_sync_detect_debug_gpio: 13 Index: ModuleDemo/25_OTA/bt_demo/CM0/User/app_config.h =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/app_config.h (revision 6167) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/app_config.h (working copy) @@ -7,7 +7,7 @@ /////////////////// Function Control/////////////////// -#define FUNCTION_CONTROL_DEBUG_ENABLE +//#define FUNCTION_CONTROL_DEBUG_ENABLE //#define FUNCTION_WATCH_DOG #define FUNCTION_FSC_RTK_HOST #define FUNCTION_FSC_RTK_HOST_WHITE Index: ModuleDemo/25_OTA/bt_demo/CM0/User/hci/yc11xx_h4.h =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/hci/yc11xx_h4.h (revision 6166) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/hci/yc11xx_h4.h (working copy) @@ -14,8 +14,8 @@ #define H4_ISO 0x05 #define HCI_H4_UART (UARTA) -#define H4_UART_RXIO (GPIO_28) -#define H4_UART_TXIO (GPIO_27) +#define H4_UART_RXIO (GPIO_19) +#define H4_UART_TXIO (GPIO_14) #define BT_DBG(fmt, ...) DEBUG_LOG_STRING(fmt, ##__VA_ARGS__) #define BT_ERR(fmt, ...) DEBUG_LOG_STRING(fmt, ##__VA_ARGS__) Index: ModuleDemo/25_OTA/bt_demo/CM0/User/main.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (revision 6180) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (working copy) @@ -48,7 +48,7 @@ #define HVIN_5V_ADC_DATA HREADW(mem_5v_adc_hvin_data) #define GPIO_BT_DIS_EN (GPIO_12|GPIO_ACTIVE_BIT) -#define GPIO_BT_WAKE_HOST (GPIO_14|GPIO_ACTIVE_BIT) +#define GPIO_BT_WAKE_HOST (GPIO_31|GPIO_ACTIVE_BIT) uint8_t g_dis_en_trig = FALSE; int main(void) @@ -69,8 +69,8 @@ h5_init(); // Set GPIO State. - //GPIO_SetInput(GPIO_BT_DIS_EN); - //GPIO_SetOut(GPIO_BT_WAKE_HOST, FALSE); + GPIO_SetInput(GPIO_BT_DIS_EN); + GPIO_SetOut(GPIO_BT_WAKE_HOST, FALSE); // sleep_500ms; // LPM_ENABLE; @@ -86,7 +86,7 @@ case IPC_MCU_STATE_RUNNING: //always first init bt IPC_HandleRxPacket(); - /* + if(g_dis_en_trig && GPIO_GetInputStatus(GPIO_BT_DIS_EN)) { DEBUG_LOG(LOG_LEVEL_CORE, "IPC" ,"Bt_EvtCallBack: 0x%04X", 0xff99, 0x0001); @@ -94,19 +94,19 @@ GPIO_SetOut(GPIO_BT_WAKE_HOST, TRUE); whileDelayshort(1); GPIO_SetOut(GPIO_BT_WAKE_HOST, FALSE); + h5_init(); } else { if(!GPIO_GetInputStatus(GPIO_BT_DIS_EN)) { - if(!g_dis_en_trig) - { - DEBUG_LOG(LOG_LEVEL_CORE, "IPC" ,"Bt_EvtCallBack: 0x%04X", 0xff99, 0x0002); - } - g_dis_en_trig = 1; + if(!g_dis_en_trig) + { + DEBUG_LOG(LOG_LEVEL_CORE, "IPC" ,"Bt_EvtCallBack: 0x%04X", 0xff99, 0x0002); + } + g_dis_en_trig = 1; } } - */ //Bt_watchdog(); if (gBRState.topState != BR_POWER_OFF) { Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (revision 6180) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -64,73 +64,73 @@ 2000003f c2840062 c0010088 -c00701bb -c00801c9 -c00e01a9 -c00f01ce -c0100230 -c01201fe -c019018b -c01c8198 -c01d019a -c01f0223 -c02081f3 -c0220770 -c02a0707 -c02c0661 -c02e067d -c02e8683 -c0350772 -c0358774 -c03601e6 -c03c01ea -c04080fd -c0428117 -c04300d8 -c046075f -c04f00dc -c050017b -c05206fe -c05406ee -c05c8776 -c05d05c7 -c0700173 +c00701bc +c00801ca +c00e01aa +c00f01cf +c0100231 +c01201ff +c019018c +c01c8199 +c01d019b +c01f0224 +c02081f4 +c0220773 +c02a070a +c02c0664 +c02e0680 +c02e8686 +c0350775 +c0358777 +c03601e7 +c03c01eb +c04080fe +c0428118 +c04300d9 +c0460762 +c04f00dd +c050017c +c0520701 +c05406f1 +c05c8779 +c05d05ca +c0700174 20202baf -c0038778 -c006024d -c009077a -c009856a -c00a0549 -c011855d -c012868e -c0130692 -c0138694 -c0140696 -c0148697 -c015069c -c01d83df -c01f03e8 -c01f839f -c02084bb -c02106dd -c024045f -c02584ce -c0278444 -c02905ea -c02c077c -c02d8603 -c02e877e -c0300632 -c032062e -c03706b2 -c0380780 -c0388782 -c03a017f -c03a8784 -c049069d -c0528643 -c0530643 -c075073c +c003877b +c006024e +c009077d +c009856d +c00a054c +c0118560 +c0128691 +c0130695 +c0138697 +c0140699 +c014869a +c015069f +c01d83e2 +c01f03eb +c01f83a0 +c02084be +c02106e0 +c0240462 +c02584d1 +c0278447 +c02905ed +c02c077f +c02d8606 +c02e8781 +c0300635 +c0320631 +c03706b5 +c0380783 +c0388785 +c03a0180 +c03a8787 +c04906a0 +c0528646 +c0530646 +c075073f c1590000 c16a0000 20202baf @@ -143,14 +143,14 @@ 20400093 2040233d 20400099 -20400752 +20400755 20202021 c68e0000 18000e02 20407148 7d3a001c 243a209e -20200786 +20200789 6fe24133 c4008000 6fe20030 @@ -170,6 +170,7 @@ 6fe244d9 c1808000 6fe20623 +c30000af c3830000 c3828000 d8e00003 @@ -185,23 +186,23 @@ 7854fc00 78487c00 69644e34 -204000cd -243680ca +204000ce +243680cb 204047d5 1a227e00 67e24626 6fec04dd 67ec0633 6fe24c8b -c00083a8 -20400788 +c00083a9 +2040078b 204046d3 -243680ca +243680cb 6fe204dc -c00300ca -20400788 +c00300cb +2040078b 6fe44e34 -243a00b8 +243a00b9 20600000 204045c7 204045bd @@ -217,17 +218,17 @@ 6fe24013 793ffe06 67e24013 -202000de -204000de +202000df +204000df 20202bd8 20405900 2040633a -2055816f +20558170 d8e00009 20407357 -205580ec +205580ed 70894bba -204000f4 +204000f5 708907ff 20402a70 70895074 @@ -238,13 +239,13 @@ 793ffe13 67e8804c 70800502 -2040013e +2040013f 6ff04246 98000000 20600000 6fe242b4 -c00080f7 -c00100f7 +c00080f8 +c00100f8 5888e0d0 67e68955 584a103c @@ -252,7 +253,7 @@ 70895468 20600000 20407a63 -20308109 +2030810a 708955d4 20000004 708955d2 @@ -260,7 +261,7 @@ 708955d1 20000004 6fe242b4 -c0008107 +c0008108 708955d0 708956e0 18002a08 @@ -284,7 +285,7 @@ 20402a7b 58000250 20402bb1 -204000f4 +204000f5 6fe28906 79207e00 67e28906 @@ -298,14 +299,14 @@ 2000000a 7089027d 6fe242b4 -c0000133 +c0000134 70894cfb 70894def 70894eec 70894f5e -c0008135 +c0008136 20202a51 -20400139 +2040013a 20202a49 708956f7 20402a5d @@ -332,7 +333,7 @@ 180a7e00 1fe17e0f 1fe67c04 -2021014b +2021014c 67e2063c 67e208cd 1c40fe20 @@ -349,12 +350,12 @@ 202056bd 6fe24e8a 67e20f12 -245a0163 +245a0164 6ff04e9b 67f04be7 20600000 1fe67c2a -20210166 +20210167 5800002a 67e24bd8 1fe17e0f @@ -373,21 +374,21 @@ 6fe8833e 79207e1a 67e8804c -20200178 -2040013e +20200179 +2040013f 70800520 -2020013e -20400733 -20400174 +2020013f +20400736 +20400175 d85fffff 20202cb8 78547c00 204052b0 6fe20048 207a0000 -2020078a -2040078c -2020023c +2020078d +2040078f +2020023d 6fe2004b 79207e03 67e2004b @@ -398,13 +399,13 @@ d8c00183 df2000f0 d8400000 -20400193 +20400194 60440099 2020238d efe80006 207a0000 18408404 -c2000193 +c2000194 20600000 704ea700 20202414 @@ -421,33 +422,33 @@ 20402841 20402827 20404b89 -204001ac +204001ad 20202425 20404b89 -204001ac +204001ad 20202198 6fe242a7 207a0000 6fe2007c 247a0000 -2020078e -204002af +20200791 +204002b0 704c8a02 -20200790 +20200793 704c9b02 704c8a00 -202001b9 +202001ba 704c9b00 704ca200 704ca000 -20200792 +20200795 6fe24c9a -203a0794 +203a0797 6fe24c99 -203a0786 +203a0789 1fe0ffff 67e24c99 -20200794 +20200797 6fe20018 1ff18400 184f840a @@ -457,22 +458,22 @@ 20600000 20402108 6fe24ea8 -243a0796 +243a0799 704c8a04 -202001b7 +202001b8 204024d2 7854fc00 6fe24c9b -c00081c9 +c00081ca 6fe2004c c28221c5 6fe20030 c30221c4 -202002d2 +202002d3 6fe24c9d -c00001dd -c00081e0 -c00101e3 +c00001de +c00081e1 +c00101e4 704c8702 20600000 704c880f @@ -493,21 +494,21 @@ 98000c00 1d027e00 20202931 -2040025e +2040025f 68420046 98467c00 20600000 20402337 -202c01fb +202c01fc 204024ca -243a01f3 +243a01f4 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -20200798 +2020079b 204021ec 24740000 78547c00 @@ -515,15 +516,15 @@ 793f800b 20402b71 2040232b -c505820e +c505820f 204024ca -243a0203 +243a0204 78547c00 1c427e00 67e84169 78387c00 7834fc00 -2020079a +2020079d 20402b6f d8200010 20402321 @@ -532,10 +533,10 @@ 20402917 204024ab 204024f3 -2036821a +2036821b 204024ca -243a0215 -20200208 +243a0216 +20200209 18000401 6fe20031 793ffe01 @@ -544,7 +545,7 @@ 20402940 78347c00 704c8a01 -20200798 +2020079b 70011600 70015000 204024d2 @@ -552,11 +553,11 @@ 2040724d 6fe24c9b 207a0000 -202002d2 +202002d3 20404d8e c6108000 6fe24ef2 -c000823c +c000823d 20600000 6fe20030 c283a1e1 @@ -569,57 +570,57 @@ 67e2004b 204021e1 c6108000 -2020078c +2020078f 704c8803 704c8706 -204002f0 +204002f1 18007e00 e7e20005 6fe20046 e7e40005 -202002fa +202002fb 704c8806 704c8717 -204002f0 +204002f1 6fec0040 e7ec0005 -202002fa +202002fb 704c8806 704c8716 -20200246 -20400253 -204005ab +20200247 +20400254 +204005ae 207a0000 20403e9d 20628000 -2020024d +2020024e 20403e9d 20628000 20403e9d 20628000 1fe20c00 20403e92 -c005829d +c005829e 20203ef4 -20400272 +20400273 2040712d -2020026f -20400272 +20200270 +20400273 efe40006 -2020026f -20400272 +20200270 +20400273 efe60006 -2020026f -20400272 +20200270 +20400273 efec0006 -2020026f -20400272 +20200270 +20400273 efee0006 -2020026f -20400272 +20200270 +20400273 eff00006 -2020026f -20400272 +20200270 +20400273 efe20006 18c20400 60464bf2 @@ -632,16 +633,16 @@ 704eef01 7044d901 704c8b01 -202002bf +202002c0 6fec4c8d 67ec4639 67ec4140 20600000 20600000 704ddc00 -20200284 +20200285 704ddc03 -20200284 +20200285 62464ddd 58004b4a 67e443e3 @@ -657,69 +658,69 @@ 18007e06 67e243e2 20203f1a -2040079c +2040079f 6a464dd9 -20200280 -20400299 +20200281 +2040029a 6a464dd9 -2020058a -20400272 +2020058d +20400273 df200003 d8a04dd9 20203e88 20403e92 20403e92 67e24dd8 -2040026f +20400270 6fe24dd8 -c0000296 -204005ab +c0000297 +204005ae 207a0000 -20400299 +2040029a 6fe24dd8 -c0018293 +c0018294 20202baf 704c9612 -202002b0 +202002b1 704c9601 -202002b0 +202002b1 704c960c -202002b0 +202002b1 704c9600 df200001 -204002b4 -202002fa +204002b5 +202002fb 704c9600 -204002b8 +204002b9 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -204002f0 +204002f1 6fe64c93 e7e60005 20600000 700f1200 -202002c4 +202002c5 700f120c -202002c4 +202002c5 700f1202 704c870f 704c8804 -204002f0 +204002f1 6fe20f12 e7e20005 6fe64c93 e7e60005 -202002fa +202002fb 6ff04c6c c4020000 6fe20639 67e24e19 704eef00 -2020079e +202007a1 6fe20046 67e24e19 793f8021 @@ -727,7 +728,7 @@ 70004600 704ca200 704c9b00 -2020079e +202007a1 6fe20624 d8400000 c1018000 @@ -737,32 +738,32 @@ 20600000 6fe20046 67e242a8 -202002e6 +202002e7 6fe20639 67e242a8 704c8805 704c8713 -204002f0 +204002f1 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -202002fa +202002fb 6fe24c88 1fe0fe03 67e44db2 -204002f7 +204002f8 6fe64c86 e7e60005 20600000 -20400567 +2040056a 1a420a00 20600000 da204d85 20403fa5 -20200282 +20200283 18000400 18000201 704ef301 @@ -778,7 +779,7 @@ 67e21000 6fe21001 207a0000 -20400330 +20400331 6fe20623 c4020000 20406246 @@ -808,9 +809,9 @@ 20600000 6844063d 1840840a -6fe20650 -203a032e -1febfe00 +6fe40650 +203a032f +1feffe03 98408400 60440643 20600000 @@ -818,24 +819,24 @@ 1fe17e03 c1818000 6fe21002 -c0000337 -c000833a +c0000338 +c000833b 20600000 -20400328 +20400329 6044100c 20600000 -20400328 +20400329 60441008 20600000 6fe24ef3 207a0000 -202002fd +202002fe 6fe2063a -c282833d +c282833e 704ef300 -20400372 -20400386 -203a02fd +20400373 +20400387 +203a02fe efe20006 ea220006 9a267e00 @@ -851,9 +852,9 @@ 18427200 2040712d 2040480e -2040036f -20400300 -20400362 +20400370 +20400301 +20400363 da204002 68441002 20407a08 @@ -864,7 +865,7 @@ 68424f37 20407a08 20600000 -20400386 +20400387 efe20006 1fe22200 18c23000 @@ -882,15 +883,15 @@ 20600000 6fe24683 203a480c -2040037c +2040037d c6130000 da204d5d -2040055a +2040055d c000480c c000c80c 79200026 20600000 -20400386 +20400387 203a480c efe20006 e8420006 @@ -902,7 +903,7 @@ 20600000 da204d5d 20203fa1 -2040038a +2040038b 20202739 204045bd 204045cd @@ -928,23 +929,23 @@ 20407a4f 204045aa 20404766 -20400340 -20400388 -20400529 +20400341 +20400389 +2040052c 20404594 -2034053f +20340542 2020458a 6fe24626 68424ef0 98467c00 -242280ca +242280cb 6fec0633 684c4627 98467c00 -242280ca +242280cb 20402266 24628000 -20400142 +20400143 2040454a 58000000 67ea4562 @@ -954,19 +955,21 @@ 67ea455d 7042a700 70065b00 +6fe84632 +67e80650 204047d2 704eef02 704c8a00 -20200790 -204005bb +20200793 +204005be 67e64e16 58000000 67e64d2f 6fe20046 67e242a8 704ddc05 -202003cf -204005c1 +202003d2 +204005c4 67e64e16 58000000 67e64d32 @@ -1001,21 +1004,21 @@ 204045b4 2040315c 6fe20624 -c0018402 +c0018405 20204579 -2040025e +2040025f 67e242a8 -2040025e +2040025f 67e444d7 -2040025e -2040025e +2040025f +2040025f 67e44632 -2040025e +2040025f 67e44634 -2040041d -202002bf -2040038a -20200543 +20400420 +202002c0 +2040038b +20200546 6fe24eec c1828000 704eec06 @@ -1026,40 +1029,40 @@ 20600000 7834fc00 204048fd -202106e9 +202106ec 6fe24eec -245a07a0 -20400340 +245a07a3 +20400341 204045fc 7856fc00 -204003f8 -24368438 +204003fb +2436843b 20407a4f -20400432 +20400435 20404766 -20400529 +2040052c 20404594 -2034041f -20400415 +20340422 +20400418 7854fc00 20202739 6fe20623 c3830000 6fe24ee9 207a0000 -c00987a2 +c00987a5 20202baf 704ee900 20600000 704ee913 20600000 -20400340 -20400425 +20400341 +20400428 78377c00 -20400543 -2036840c -20200412 -20400427 +20400546 +2036840f +20200415 +2040042a 20202739 204045bd 204045cd @@ -1068,8 +1071,8 @@ 782efc00 78307c00 7850fc00 -20400430 -20200392 +20400433 +20200393 37c18200 20600000 6fe20623 @@ -1079,13 +1082,13 @@ 704eec01 20600000 6fe20623 -c2818412 +c2818415 6fe24e18 1fe67c06 -242106e9 +242106ec 1fe0fe01 67e24e18 -20200412 +20200415 684c4639 20600000 684c4c7a @@ -1103,8 +1106,8 @@ 67e24537 18427200 6fe2461c -205a0440 -245a0442 +205a0443 +245a0445 604c4538 d8c044e0 2040712d @@ -1117,7 +1120,7 @@ 62480f22 62660f26 20600000 -2040045b +2040045e 67244eea 1a208c01 efe20006 @@ -1126,10 +1129,10 @@ efe40005 1fe0fe01 e7e40005 -2040048e -2040047a +20400491 +2040047d 20404618 -20400457 +2040045a 6f244eea 20600000 1a208c31 @@ -1139,7 +1142,7 @@ c3004628 18408401 1fe37e00 -c2000472 +c2000475 1840ffff 1a208a22 e7e20005 @@ -1163,7 +1166,7 @@ 6fea4528 1a208a31 e7ea0005 -2020046e +20200471 1a208c00 efe20006 c4028000 @@ -1175,7 +1178,7 @@ 6fe40643 98467e00 1fe67c01 -202284a4 +202284a7 20600000 1a208c1a efe40006 @@ -1184,7 +1187,7 @@ 98467e00 d840ffff 98467c00 -202284a4 +202284a7 20600000 efe20011 793ffe05 @@ -1209,12 +1212,12 @@ 1a208a2d e7e80005 20600000 -204004bf +204004c2 2040475a -204007a4 +204007a7 20202940 7855fc00 -203704c2 +203704c5 2436c981 20402d74 6fe44161 @@ -1241,15 +1244,15 @@ 78507c00 19623600 37c18400 -203704de +203704e1 1b420400 604c00a4 242c2739 -203704e5 +203704e8 dd2001e0 1c225000 6fe20623 -c30184e5 +c30184e8 2055ac9c 20402abc 7823fc00 @@ -1267,37 +1270,37 @@ 67e204dc 1fe27200 67e2068c -203a0510 +203a0513 6fe204db 1fe17e03 -c0018505 -c5078507 +c0018508 +c507850a da204ccb -2040055a -c0008507 -203a0507 -204005b7 -203a0507 -204005c1 +2040055d +c000850a +203a050a +204005ba +203a050a +204005c4 18c20a00 6fe404db e7e40005 -2020050c +2020050f d8a004dd -2020050c +2020050f 09800008 19897e00 -c2000507 +c200050a 78367c00 -20200510 +20200513 09800008 19897e00 e7e20005 -c200050c +c200050f 09800018 78287c00 db600664 -20360517 +2036051a 1fef7e00 1ff17e00 e7e60005 @@ -1305,7 +1308,7 @@ 20232739 7836fc00 6fe242b5 -243a051f +243a0522 6fe20017 1fe0a200 20402a7b @@ -1323,26 +1326,26 @@ c68d0000 20760000 6fe204dc -203a0539 +203a053c da204000 684404db 20407a08 6fe204db 1fe17e03 c001c866 -204005c1 -20400521 +204005c4 +20400524 6fe2068c 207a0000 -202003c8 +202003cb 6fe64d32 207a0000 1fe22400 58000000 67e64d32 -2020058a +2020058d 78377c00 -20400543 +20400546 2036c582 2020458a 68420017 @@ -1350,7 +1353,7 @@ 20402a23 78287c00 d9601388 -202004d3 +202004d6 1a208409 efe20002 203a2baf @@ -1375,13 +1378,13 @@ 6fe204d5 c1018000 20204146 -2040057c +2040057f da204d35 20203f94 da204d35 20403fa5 -2020058a -2040057c +2020058d +2040057f da204d85 20203f94 1a20fe04 @@ -1402,57 +1405,57 @@ 1a420c00 1a427e00 20600000 -2040059e +204005a1 203a2baf 6fe44dd2 1fe0fff6 68444db2 98467c00 -20210585 +20210588 da204ccb 20203fa5 da204ca3 -2040055a -203a0583 +2040055d +203a0586 da204ca3 20203fa5 -20400596 +20400599 da204ca3 -203a058f +203a0592 da204ccb 20203f94 -20400593 +20400596 203a2baf da204ca3 20203f94 6f224cab d8c04cf3 -20200598 +2020059b 6f224cd3 d8c04d11 efe60006 9a467c00 -2022859c -c2000598 +2022859f +c200059b 1f227e00 20600000 6fe44dd2 1fe0fff6 68444db2 98467c00 -202105a5 +202105a8 da204ccb -2020055a +2020055d da204ca3 -2040055a +2040055d 247a0000 -202005a3 +202005a6 6fe44dd6 -202005ac +202005af 58000010 67e44db2 62280f1e -2040059e +204005a1 6a280f1e 20600000 da204ccb @@ -1460,20 +1463,20 @@ 6fe44d2f 247a0000 da204ccb -2020055a +2020055d 6fe44d32 247a0000 da204ccb -2020055a +2020055d 6fe64d2f 243a7111 -204005b1 +204005b4 1a427e00 67e64d2f 20207111 6fe64d32 243a7111 -204005b1 +204005b4 1a427e00 67e64d32 20207111 @@ -1484,12 +1487,12 @@ 20203190 1a627e00 c00a326c -c00a85d0 +c00a85d3 20203168 704c8c00 704c1700 -204007a6 -204002cc +204007a9 +204002cd 202031c3 6842063a 284c0005 @@ -1506,14 +1509,14 @@ 6fe245b5 c0014794 6fe21002 -c00285e8 +c00285eb 6fe24f37 -c00106ec +c00106ef 20600000 2040615d 20204790 20404906 -204005d5 +204005d8 6fe204db 2feffe04 79208027 @@ -1522,12 +1525,12 @@ 2feffe02 7920800f 6fe204dc -203a05fc +203a05ff 6fe20623 -c30205fc +c30205ff c6078000 20406246 -20400609 +2040060c 793a001a 247a0000 20760000 @@ -1542,7 +1545,7 @@ d8e00001 20407148 247a0000 -202007a8 +202007ab 6fe204db 1fe17e03 c001e1b6 @@ -1580,13 +1583,13 @@ 67ea4562 18007e00 20600000 -20400640 +20400643 18227e00 c1018000 -202002e4 +202002e5 62680f26 62244db2 -2040063d +20400640 1a420a00 6fe44db2 e7e20005 @@ -1595,16 +1598,16 @@ e0220005 6a680f26 20600000 -2040057c +2040057f da204d5d 20203f94 da204d5d 20403fa5 -2020058a +2020058d 6fe20b97 -243a07aa +243a07ad 6fe20b98 -243a07aa +243a07ad 20600000 6fe24c97 207a0000 @@ -1615,15 +1618,15 @@ 1a208c01 efe20006 c4008000 -20400654 +20400657 704ca001 20600000 704c8806 704c8731 -204002f0 +204002f1 6fec0040 e7ec0005 -202002fa +202002fb 6fe20151 1fe17e03 c080a68a @@ -1633,14 +1636,14 @@ 2020268a 1f227e00 67e4012c -203a065a +203a065d 9ea67c00 20212729 18017e01 -243a066c +243a066f 6fe20151 1fe17e03 -c0018685 +c0018688 c507a6f0 684444d2 184085fd @@ -1648,11 +1651,11 @@ 98467c00 20212729 da204ccb -2040055a +2040055d c000a739 -204005b3 +204005b6 203a2739 -204005bb +204005be 18c20a00 6fe20151 e7e20005 @@ -1665,9 +1668,9 @@ c58026ba 793f8000 20600000 -204003c0 +204003c3 202026dd -20400688 +2040068b 243a2729 20202649 6fe20078 @@ -1677,21 +1680,21 @@ 6fe20048 20600000 62244db2 -20400561 +20400564 6a244db2 20600000 da204d35 20203fa1 -20400564 -202002e1 -20200564 -204005a9 +20400567 +202002e2 +20200567 +204005ac 203a729b 2020729d da204d35 -2020055a +2020055d 20202baf -2040069a +2040069d 207a0000 6fe2004b c3830000 @@ -1704,7 +1707,7 @@ 18c27e00 67e4013c 6fe4442c -203a06ac +203a06af 20205b2e 6fe40099 203a2baf @@ -1715,7 +1718,7 @@ 70429300 20204b77 67e40fb7 -202006b6 +202006b9 68440fb7 18518400 6fe44881 @@ -1734,11 +1737,11 @@ 67e40241 5801df00 67e4023f -20400700 +20400703 204057e8 6fe280a0 67e20124 -204006d4 +204006d7 6fe20124 67e280a0 704e6500 @@ -1767,27 +1770,27 @@ 704c8b00 700f0d15 20206b2e -204006de +204006e1 7854fc00 20600000 704f3700 -202006e9 +202006ec 6fe24040 c3800000 c3818000 6fe247cd -203a06f5 +203a06f8 6fe24724 207a0000 20202d53 6fe206ab 67e24bef 704bf000 -20400733 -202007ac +20400736 +202007af 7043dd01 20403f41 -202007ac +202007af 20600000 20202001 704e6501 @@ -1796,13 +1799,13 @@ 207a0000 6fe24e66 c1a98000 -20200702 +20200705 18227e00 c003a739 c0032739 202025df 6fe84bd7 -2020072e +20200731 20006a60 6fe84bd7 79207e16 @@ -1810,46 +1813,46 @@ 79207e15 67e84bd7 df200032 -204007ae +204007b1 6fe84bd7 793ffe15 -2040072e +20400731 6fe84bd7 793ffe14 -2040072e +20400731 200004b0 6fe84bd7 793ffe16 -2040072e +20400731 200004b0 20600000 6fe84bd7 79207e16 -2040072e +20400731 200004b0 6fe84bd7 79207e14 -2040072e +20400731 200004b0 6fe84bd7 79207e15 -2040072e +20400731 200004b0 20600000 67e84bd7 67e8804c -2040013e +2040013f 70800540 -2020013e +2020013f d8400000 58000000 1fed7e00 1febfe00 9841fe00 67e8804c -2040013e +2040013f 70801902 -2020013e +2020013f 20406b27 da2047e1 2040725d @@ -1857,14 +1860,14 @@ 20406b2b 18427e00 207a0000 -c04c0746 +c04c0749 67e20fba -202007b0 +202007b3 20405875 20001770 68448352 18427e00 -205a074f +205a0752 60444eed 20405882 700f0d9e @@ -1874,7 +1877,7 @@ 20600000 6fe24ca2 c1808000 -202007b2 +202007b5 18a22200 704c9c00 704c880f @@ -1884,7 +1887,7 @@ 18a08bee e7e60005 18a08a0f -202002fa +202002fb 6fe2004c 2feffe02 7920fe00 @@ -1894,149 +1897,149 @@ c4018000 704c880c 704c873e -204002f0 +204002f1 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -202002fa +202002fb 58000390 -202006b4 +202006b7 58000350 -202006b4 +202006b7 58000360 -202006b4 +202006b7 580002e0 -202006b4 +202006b7 58000300 -202006b4 +202006b7 58000110 -202006b4 +202006b7 580003e0 -202006b4 +202006b7 580003a0 -202006b4 +202006b7 58000260 -202006b4 +202006b7 58000220 -202006b4 +202006b7 58000430 -202006b4 +202006b7 580002d0 -202006b4 +202006b7 58000460 -202006b4 +202006b7 580003b0 -202006b4 +202006b7 580001e0 -202006b4 +202006b7 58000340 -202006b4 +202006b7 580001f0 -202006b4 +202006b7 58000150 -202006b4 +202006b7 580001c0 -202006b4 +202006b7 580002a0 -202006b4 +202006b7 58000370 -202006b4 +202006b7 58000380 -202006b4 +202006b7 58000240 -202006b4 +202006b7 58000170 -202006b4 +202006b7 580003d0 -202006b4 +202006b7 58000200 -202006b4 +202006b7 58000210 -202006b4 +202006b7 58000250 -202006b4 +202006b7 58000310 -202006b4 +202006b7 58000320 -202006b4 +202006b7 58000330 -202006b4 +202006b7 58000450 -202006b4 +202006b7 580002c0 -202006b4 +202006b7 58000440 -202006b4 +202006b7 58000080 -202006b4 +202006b7 58000070 -202006b4 +202006b7 580000f0 -202006b4 +202006b7 58000060 -202006b4 +202006b7 580000d0 -202006b4 +202006b7 58000090 -202006b4 +202006b7 580000a0 -202006b4 +202006b7 580000b0 -202006b4 +202006b7 580000c0 -202006b4 +202006b7 58000470 -202006b4 +202006b7 580003f0 -202006b4 +202006b7 580000e0 -202006b4 +202006b7 58000100 -202006b4 +202006b7 58000190 -202006b4 +202006b7 58000120 -202006b4 +202006b7 58000010 -202006b4 +202006b7 58000020 -202006b4 +202006b7 58000030 -202006b4 +202006b7 58000040 -202006b4 +202006b7 58000050 -202006b4 +202006b7 58000140 -202006b4 +202006b7 580001a0 -202006b4 +202006b7 580001b0 -202006b4 +202006b7 58000130 -202006b4 +202006b7 58000270 -202006b4 +202006b7 580002b0 -202006b4 +202006b7 58000280 -202006b4 +202006b7 58000290 -202006b4 +202006b7 580002f0 -202006b4 +202006b7 58000180 -202006b4 +202006b7 580001d0 -202006b4 +202006b7 580003c0 -202006b4 +202006b7 58000400 -202006b4 +202006b7 58000410 -202006b4 +202006b7 58000420 -202006b4 +202006b7 Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (revision 6180) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (working copy) @@ -223,7 +223,7 @@ # mem_tws_rf_packet_rx_window_size - (mem_tws_rf_rcv_window_size + 72us + hardware_delay(18us) + mem_tws_rf_slave_send_full_packet_sleep_time/2) mem_tws_rf_master_check_raw_id_time:db 04 -mem_rf_debug_enable: 01 +mem_rf_debug_enable: 00 mem_rf_debug_rf_rx_debug_gpio: 0c mem_rf_debug_rf_tx_debug_gpio: 0e mem_rf_debug_rf_sync_detect_debug_gpio: 13 Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (revision 6180) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -2,12 +2,12 @@ 204063ce 704c8807 704c8736 -204002f0 +204002f1 58000000 e7e20005 6fec0040 e7ec0005 -202002fa +202002fb 00000000 00000000 00000000 @@ -72,11 +72,11 @@ 1fe0fe03 67e44db2 da204ccb -2040055a +2040055d 1fe67c02 20610000 704c873e -204002f0 +204002f1 58000002 e7e20005 58000001 @@ -93,9 +93,9 @@ e0420005 18427200 2040712d -204001c2 +204001c3 e7e20005 -202002fa +202002fb 6fe204db 1fe17e0f d8400000 @@ -129,10 +129,10 @@ 20200040 6fe84bd7 793ffe15 -2040072e +20400731 6fe84bd7 79207e15 -2040072e +20400731 c2000001 20600000 00000000 @@ -204,7 +204,7 @@ 704ca200 704c880b 704c8703 -204002f0 +204002f1 6fe24c8a e7e20005 6fe20046 @@ -218,7 +218,7 @@ 284ffe02 7920fe00 e7e20005 -202002fa +202002fb 00000000 00000000 00000000 @@ -386,7 +386,7 @@ 6fe204dd c0018005 c003001e -202007f8 +202007fb 6ff04de0 c4000000 6fe204dd @@ -402,7 +402,7 @@ 20200012 704c880d 704c873e -204002f0 +204002f1 58000005 e7e20005 6fe20639 @@ -411,12 +411,9 @@ e7f00005 6fe445bb e7e40005 -202002fa -20400029 +202002fb +20400026 20748000 -da207111 -d8400001 -20407a08 da200001 d8200003 204049ab @@ -425,14 +422,17 @@ 20600000 704c8804 704c8708 -204002f0 +204002f1 58000000 e7e20005 6fe20639 e7e40005 58000001 e7e20005 -202002fa +202002fb +00000000 +00000000 +00000000 00000000 00000000 00000000 @@ -452,7 +452,7 @@ c00a8014 c001000d c0090007 -202007f6 +202007f9 da200001 d8200003 204049ab @@ -478,14 +478,14 @@ 60444957 704c880b 704c873e -204002f0 +204002f1 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -202002fa +202002fb 20400014 da200009 d8200003 @@ -515,14 +515,14 @@ c4028000 704c8808 704c870c -204002f0 +204002f1 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -202002fa +202002fb 00000000 00000000 00000000 @@ -583,7 +583,7 @@ c0048013 c0060017 c007000a -202007f4 +202007f7 20400013 da200009 d8200003 @@ -595,12 +595,12 @@ 20600000 eff00006 67f04c0a -204003fa +204003fd 20200020 efea0006 67ea4c12 -204003fe -203487c8 +20400401 +203487cb 6fe24c17 247a0000 1fe0fe01 @@ -610,14 +610,14 @@ c4018000 704c880c 704c873e -204002f0 +204002f1 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -202002fa +202002fb 00000000 00000000 00000000 @@ -727,7 +727,7 @@ 20600000 c6908000 793f8021 -20200184 +20200185 00000000 00000000 00000000 @@ -771,9 +771,9 @@ 68420048 20407a08 6fe20048 -c28387f0 +c28387f3 c0188021 -c00607f2 +c00607f5 c0038030 c005800b 20204f6c @@ -811,7 +811,7 @@ 18007e01 2040528d 204052a6 -202001b4 +202001b5 70004800 20600000 18007e02 @@ -819,7 +819,7 @@ 6fe206a4 e7e20005 204052a6 -20200186 +20200187 00000000 00000000 00000000 @@ -842,7 +842,7 @@ 2040493a 6fec0633 67ec4627 -20200790 +20200793 00000000 00000000 00000000 @@ -964,14 +964,14 @@ 704c8a01 704c8808 704c8712 -204002f0 +204002f1 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202002fa +202002fb 00000000 00000000 00000000 @@ -1025,14 +1025,14 @@ 20200040 704c8808 704c8712 -204002f0 +204002f1 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202002fa +202002fb 00000000 00000000 00000000 @@ -1095,7 +1095,7 @@ 67e4003e 7855fc00 704c8a00 -202007ee +202007f1 00000000 00000000 00000000 @@ -1186,7 +1186,7 @@ 24348023 18808fff 704c8a02 -202007ee +202007f1 00000000 00000000 00000000 @@ -1253,7 +1253,7 @@ 67e2004b 6fe20030 c283b413 -20400244 +20400245 202033ca 00000000 00000000 @@ -1362,7 +1362,7 @@ 20206481 20400015 20778000 -202007c6 +202007c9 7857fc00 6fe247d4 247a0000 @@ -1380,12 +1380,12 @@ 20200024 704c880a 704c8733 -204002f0 +204002f1 6fec0040 e7ec0005 6fe80ba1 e7e80005 -202002fa +202002fb 202052d6 700b960f 204052da @@ -1429,8 +1429,8 @@ 67e24537 18427200 6fe2461c -205a0440 -245a0442 +205a0443 +245a0445 604c4538 d8c04500 2040713a @@ -1536,11 +1536,11 @@ 00000000 20200040 c3020003 -2040070d +20400710 6fe8833e 793ffe1d 67e8804c -20400178 +20400179 700f0d6a 20203f28 00000000 @@ -1608,17 +1608,17 @@ 6fe24bef 67e206ab 2040001f -2455815d +2455815e 20407988 -580005cc +580005cf 67e4431d -58000173 +58000174 67e4431f -58000158 +58000159 67e4431b -580006f6 +580006f9 67e44315 -580006fb +580006fe 67e44313 24358023 20403e79 @@ -1635,14 +1635,14 @@ 202056bd 6fec4140 67ec4340 -20400746 +20400749 70801002 204057bf 6fe24bce c301002c -c28287ec -2040070b -2040070b +c28287ef +2040070e +2040070e 700f0d9f 20203f28 204054b0 @@ -1652,9 +1652,9 @@ 6848833e 6048804c 70804de6 -2040013e +2040013f 70800520 -2020013e +2020013f 00000000 00000000 00000000 @@ -1666,10 +1666,10 @@ 793f801c 704c8801 704c8701 -204002f0 +204002f1 58000000 e7e20005 -202002fa +202002fb 00000000 00000000 00000000 @@ -1737,19 +1737,19 @@ 6fe8833e 79207e1d 67e8804c -20200178 -2020070d +20200179 +20200710 6fe84bd7 79207e02 -2020072e +20200731 6fe84bd7 793ffe02 -2020072e -20400721 +20200731 +20400724 6fe8833e 79207e1c 67e8804c -20200178 +20200179 00000000 00000000 00000000 @@ -1799,7 +1799,7 @@ 20400018 704c880a 704c8704 -204002f0 +204002f1 6fec0040 e7ec0005 6fe60146 @@ -1808,7 +1808,7 @@ e7e20005 6fec0040 67ec4e39 -202002fa +202002fb 6fec4e39 684c0040 98467c00 @@ -1857,7 +1857,7 @@ 20200040 704c88ff 704c8707 -204002f0 +204002f1 58000000 e7e20005 6fec42a9 @@ -1867,7 +1867,7 @@ 2040712d df2000b8 204070e4 -204002fa +204002fb 6fe24ea8 704ea800 70005300 @@ -1928,7 +1928,7 @@ 67e2004b 20404f51 7006ae01 -2040024a +2040024b 204052de 2420cf59 2434cd67 @@ -1947,7 +1947,7 @@ 6fe2073a 98467e00 1fe67c0e -20210796 +20210799 20204db7 68420739 58004ea9 @@ -1986,7 +1986,7 @@ 6fe2007d c0018012 c0088005 -202007ea +202007ed 20404e14 6fe24ef1 c0010009 @@ -1994,12 +1994,12 @@ 704ef100 704c8803 704c8730 -204002f0 +204002f1 58000000 e7e20005 68420046 e0440005 -202002fa +202002fb 6fe20739 67e206a3 c0088018 @@ -2010,14 +2010,14 @@ 2020001a 704c8804 704c8708 -204002f0 +204002f1 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -202002fa +202002fb 6fe24ef1 c1808000 704ef102 @@ -2051,17 +2051,17 @@ c006000a c00b8011 c0058014 -c01987e6 +c01987e9 c017001e c0208022 c0098030 -202007e8 +202007eb da200040 2040604d 6fe80739 68480779 98467c00 -2022822b +2022822c 20204d8b 6fe44dea c3014e10 @@ -2075,7 +2075,7 @@ 6fe20030 c3830000 20404d80 -20200244 +20200245 68420739 60424170 20404d51 @@ -2088,12 +2088,12 @@ 20600000 704c8803 704c871b -204002f0 +204002f1 6fe20046 e7e40005 6fe24170 e7e20005 -202002fa +202002fb 6fe44dec c3004e21 6fe44dea @@ -2120,7 +2120,7 @@ c0140026 c0038022 c0130028 -202007e4 +202007e7 6fe20739 67e206a3 c005800f @@ -2136,9 +2136,9 @@ c1830000 60420055 700b9b01 -20400648 +2040064b 6fe24c97 -203a024a +203a024b 20600000 20404dc7 6ff00739 @@ -2146,7 +2146,7 @@ 20600000 6fe20739 67e206a4 -20400186 +20400187 20204d51 20404edd 2020001f @@ -2182,14 +2182,14 @@ dfe04d5d 67e40f12 6a240f12 -2040055a +2040055d 207a0000 6a240f12 20403fa5 -2040058a +2040058d 20200007 1fe22400 -2020058a +2020058d 00000000 00000000 00000000 @@ -2240,12 +2240,12 @@ 00000000 20200040 68464dd9 -20400270 -2040026d +20400271 +2040026e c0008007 c0010012 20202baf -2040025e +2040025f 67e44c94 d84003ff 98410400 @@ -2253,13 +2253,13 @@ 1feb7e00 1fecfe00 67e24c1a -2040026d +2040026e 67e24c1b -202007e2 -2040025e +202007e5 +2040025f 67e242a8 20400034 -2040025e +2040025f 67e40f12 20402284 24628000 @@ -2268,7 +2268,7 @@ c280002c 6fe40f12 67e44db2 -2040059e +204005a1 205a723a 6fe40f12 1fe22200 @@ -2280,11 +2280,11 @@ e0220005 6fe40f12 1fe27200 -20400272 +20400273 2020712d 6fe40f12 2040003a -243a723a +247a0000 6fe40f12 1fe22200 1fe22400 @@ -2296,7 +2296,7 @@ c1008000 18000202 20600000 -204005ac +204005af 203a729b 2020729d 00000000 @@ -2385,7 +2385,7 @@ 2020000a 20404c78 2040001a -20200654 +20200657 2040001a 20404c78 20404c7c @@ -2394,12 +2394,12 @@ 20600000 704c8809 704c8732 -204002f0 +204002f1 6fec0040 e7ec0005 6fe647d3 e7e60005 -202002fa +202002fb 00000000 00000000 00000000 @@ -2443,14 +2443,14 @@ c4010000 704c880a 704c873e -204002f0 +204002f1 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -202002fa +202002fb 00000000 00000000 00000000 @@ -2514,19 +2514,19 @@ e7e20005 6ff2452d e7f20005 -2040041b +2040041e 6ff04c6c c4010000 704c880a 704c873e -204002f0 +204002f1 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -202002fa +202002fb 00000000 00000000 00000000 @@ -2563,16 +2563,16 @@ c4000000 704c8813 704c873e -204002f0 +204002f1 58000001 e7e20005 6fe24c8a e7e20005 6fe20639 e7e40005 -204002da +204002db 6fe24eef -245a02df +245a02e0 e0420005 6fe24626 e7e20005 @@ -2586,7 +2586,7 @@ 6fe2065b e7e20005 6fe20639 -202002fa +202002fb 00000000 00000000 00000000 @@ -2625,7 +2625,7 @@ 20200040 704c8817 704c8718 -204002f0 +204002f1 6fec0040 e7ec0005 d8c04297 @@ -2633,7 +2633,7 @@ 2040712d 18007e00 e7e20005 -202002fa +202002fb 00000000 00000000 00000000 @@ -2763,8 +2763,8 @@ 684c0149 20402289 20628000 -204001d7 -204002f0 +204001d8 +204002f1 58000001 e7e20005 6fec0149 @@ -2785,20 +2785,20 @@ 6fe80132 9c467e00 e7e40005 -202002fa +202002fb 6fe60146 e7e60005 6fe80132 9c467e00 e7e40005 6fe20018 -204001c2 +204001c3 e7e20005 6fe24c9c -243a0755 +243a0758 6fe24c9d c0010031 -202002fa +202002fb 6fe64d2f 1fe20c00 efe20006 @@ -2809,7 +2809,7 @@ 2040712d 184672f0 20407100 -202002fa +202002fb 00000000 00000000 00000000 @@ -2820,33 +2820,33 @@ c00e0013 c01d0009 c01d800e -c02082af -c02102af -202002ab +c02082b0 +c02102b0 +202002ac df200003 -204002b3 +204002b4 58000400 e7e40005 -202002fa +202002fb df200002 -204002b3 +204002b4 58000004 e7e20005 -202002fa +202002fb df200009 -204002b3 +204002b4 6ff04f2f e7f00005 -202002fa -2040025e +202002fb +2040025f 67e242a8 -2040026a +2040026b 67f045bd -2040025e +2040025f 67e445bb d8a04573 18007210 -2040025b +2040025c d8a005e3 18007208 204052f8 @@ -2854,7 +2854,7 @@ 18007204 204052f8 7045b501 -202002bf +202002c0 00000000 00000000 00000000 @@ -2883,13 +2883,13 @@ c00b8006 c00d8021 c011002a -202007e0 +202007e3 18007210 d8a00603 -2040025b +2040025c 18007210 d8a00613 -2040025b +2040025c 18007000 df200004 d8c00613 @@ -2901,35 +2901,35 @@ d8a04efe 20406250 df200011 -204002b3 +204002b4 df200010 d8c04efe 2040712d -202002fa +202002fb efe80006 98005e00 1f00f001 c200001c 20600000 -2040025e +2040025f 67e242a8 df200003 -204002b3 +204002b4 6fe20639 e7e40005 -204002fa +204002fb 204048b8 202048ae -2040025e +2040025f 67e4495f -2040025e +2040025f 67e44961 20400030 df200003 -204002b3 +204002b4 6fe20639 e7e40005 -202002fa +202002fb 00000000 00000000 00000000 @@ -2947,23 +2947,23 @@ c00c0006 c009000b c00d0020 -202007de +202007e1 df200009 -204002b3 +204002b4 18007208 204052f8 -202002fa +202002fb 6fe24dee -203a02ad -20400267 +203a02ae +20400268 67ee4e0b 20400014 6fe24dee 1fe0ffff 67e24dee -202002af -2040027f -243a02ad +202002b0 +20400280 +243a02ae 1a420a00 1a40a407 1a420c00 @@ -2974,16 +2974,16 @@ 18a08bf9 e7ee0005 20600000 -2040025e +2040025f 67e242a8 d8a04573 18007210 -2040025b +2040025c df200003 -204002b3 +204002b4 6fe20639 e7e40005 -204002fa +204002fb da200001 d8200003 204049ab @@ -3009,7 +3009,7 @@ 20200040 704c8806 704c8714 -204002f0 +204002f1 6fe24c89 e7e20005 6fe20046 @@ -3022,7 +3022,7 @@ 2020000f 58000000 e7e40005 -202002fa +202002fb 00000000 00000000 00000000 @@ -3073,7 +3073,7 @@ 20200040 704c8804 704c8705 -204002f0 +204002f1 58000000 e7e20005 6fe24e19 @@ -3083,7 +3083,7 @@ 6fe2004c 793ffe05 67e2004c -202002fa +202002fb 00000000 00000000 00000000 @@ -3137,12 +3137,12 @@ 20200040 704c8807 704c8720 -204002f0 +204002f1 6fec0040 e7ec0005 6fe24ca1 e7e20005 -202002fa +202002fb 00000000 00000000 00000000 @@ -3201,7 +3201,7 @@ 20200040 704c880b 704c8703 -204002f0 +204002f1 6fe24c8a e7e20005 6fe20046 @@ -3216,7 +3216,7 @@ 7920fe00 e7e20005 6fe20046 -202002fa +202002fb 00000000 00000000 00000000 @@ -3270,37 +3270,37 @@ c0300036 c0368021 c04a0018 -202002ab +202002ac 704e1a3f 58000000 67e24f0e 58000001 67e44f0f -202002af -2040026d +202002b0 +2040026e 67e24f0e df200002 -204002b8 +204002b9 58000000 e7e20005 6fe24f0e e7e20005 -202002fa +202002fb df200003 -204002b8 +204002b9 58000000 e7e20005 6fe44f0f e7e40005 1fe0fe01 67e44f0f -202002fa +202002fb df200002 -204002b8 +204002b9 58000100 e7e40005 -202002fa -2040025e +202002fb +2040025f 68420046 98467c00 2022802d @@ -3309,18 +3309,18 @@ 24628000 604242a8 df200003 -204002b8 +204002b9 6fe242a8 e7e40005 6fe20018 -204001c2 +204001c3 e7e20005 -202002fa +202002fb df200002 -204002b8 +204002b9 6fe44e37 e7e40005 -202002fa +202002fb 00000000 00000000 00000000 @@ -3336,21 +3336,21 @@ c0030011 c004000e c01f8012 -202002ab -202007d2 -202007d4 -202007d6 -202007d8 -202007da -202002ab -202002ab +202002ac +202007d5 +202007d7 +202007d9 +202007db +202007dd +202002ac +202002ac 6fe24c18 c0008015 -202007dc -20400264 +202007df +20400265 67ec4c8d -2040027b -202002af +2040027c +202002b0 00000000 00000000 00000000 @@ -3399,14 +3399,14 @@ 67e40f12 20200008 6a240f12 -2040055a +2040055d 207a0000 6a240f12 20403fa5 -2040058a +2040058d 20200008 1fe22400 -2020058a +2020058d 00000000 00000000 00000000 @@ -3456,7 +3456,7 @@ 00000000 20200040 6fe24e36 -243a07d0 +243a07d3 704e3601 20400023 6f224cd3 @@ -3522,16 +3522,16 @@ 6fe24c18 c0050018 c007001b -c00983ed +c00983f0 c00b000a c0078020 c0080025 c0088029 -202007ce -2040025e -204002bf +202007d1 +2040025f +204002c0 6ff04c0a -243a0764 +243a0767 6fe24eec 207a0000 da200009 @@ -3542,30 +3542,30 @@ 6ff04de0 e7f00005 20600000 -2040026d +2040026e 67e244de -202002af +202002b0 7044d900 704c8b00 6fe24eef -c00081b1 -202002ad +c00081b2 +202002ae df200002 -204002b3 +204002b4 58000004 e7e20005 -202002fa +202002fb 704dee00 704e0b00 704def00 -202002af +202002b0 68424dee 18467c04 -202282ad -20400267 +202282ae +20400268 67ee4e0b 20400030 -202002af +202002b0 6fe24dee d8a04def 1feffe07 @@ -3589,60 +3589,60 @@ c0058012 c0060025 c0068029 -202007cc -2040026d +202007cf +2040026e 67e244df 1fe27200 -2040025b -202002af -2040026d +2040025c +202002b0 +2040026e 67e244ff 1fe27200 -2040025b -202002af +2040025c +202002b0 6fe244d9 -243a02ad -2040026d +243a02ae +2040026e 67e24636 -2040025e +2040025f 67e444da -2040025e +2040025f 67e444dc -2040026d +2040026e 67e24637 -2040026d +2040026e 67e24e12 6fe444da 684444dc 98467c00 -242282af +242282b0 1fe3fe00 67e444da -202002af -2040026d +202002b0 +2040026e 67e244d9 -2040026d -202002af -2040025e +2040026e +202002b0 +2040025f 67e444da -2040025e +2040025f 67e444dc -2040026d -2040026d +2040026e +2040026e 67e24ef0 -20400264 +20400265 67ec4627 -2040026d +2040026e 67e2462d -2040025e +2040025f 1febfe00 67e444d7 -2040025e -2040025e +2040025f +2040025f 67e44632 -2040025e +2040025f 67e44634 -20200277 +20200278 00000000 00000000 00000000 @@ -3652,29 +3652,29 @@ c01d0011 c00a8015 c00b001a -c03d02af -c01302af -c00282af -202002ab +c03d02b0 +c01302b0 +c00282b0 +202002ac df200005 -204002b3 +204002b4 58000001 e7e20005 6fe64147 e7e60005 -202002fa -2040026d -20400261 +202002fb +2040026e +20400262 67e64147 -202002af +202002b0 df200003 -204002b3 +204002b4 6fe44ef4 e7e40005 -202002fa -2040025e +202002fb +2040025f 67e44ef4 -202002af +202002b0 00000000 00000000 00000000 @@ -3719,9 +3719,9 @@ c02b0034 c0360038 c036803d -c01982af -202007ca -204002af +c01982b0 +202007cd +204002b0 5800003f 67f04c6c 5fffffff @@ -3740,52 +3740,52 @@ 67e44c25 5800ec42 67e44c2a -2020027b -204001ef -242282ad -2040025e +2020027c +204001f0 +242282ae +2040025f 67e40051 df200003 -204002b3 +204002b4 6fe20046 e7e40005 7042a71d -202002fa -2040026d +202002fb +2040026e 67e24c98 df200064 d8a00183 -2040025b -202002af +2040025c +202002b0 df200002 -204002b3 +204002b4 6fe24c97 e7e20005 -202002fa -2040026d +202002fb +2040026e 67e24c97 -203a02a9 -202002af +203a02aa +202002b0 df200003 -204002b3 +204002b4 6fe44de8 e7e40005 -202002fa -2040025e +202002fb +2040025f 67e44de8 -202002af +202002b0 20200040 6fe24c18 c00e8004 -202002ab -2040025e +202002ac +2040025f 67e242a8 20402284 -242282c3 +242282c4 1a208c01 efe20006 c280001b -204002bf +204002c0 6fe24ef8 203a3420 2020000f @@ -3793,17 +3793,17 @@ c4028000 704c8808 704c870c -204002f0 +204002f1 58000000 e7e20005 6fe20046 e7e40005 6fea4ef9 e7ea0005 -202002fa -204002bf +202002fb +204002c0 6fea4c12 -243a07c8 +243a07cb 6fe24eec 207a0000 202048f0 @@ -3844,44 +3844,44 @@ c00f8016 c0158023 c0160033 -202007c4 -204001ef -242282ad -2040025e +202007c7 +204001f0 +242282ae +2040025f 67e44ef6 -204002bf +204002c0 704c8805 704c871d -204002f0 +204002f1 58000000 e7e20005 6fe20046 e7e40005 6fe44ef6 e7e40005 -202002fa -204001ef -242282ad -204002bf +202002fb +204001f0 +242282ae +204002c0 704c8805 704c871c -204002f0 +204002f1 18007e00 e7e20005 6fe20046 e7e40005 6fe4013e e7e40005 -202002fa -20400264 +202002fb +20400265 67ec42a9 -20400261 +20400262 67e647ce df200007 -204002b3 +204002b4 6fec0040 e7ec0005 -204002fa +204002fb 6fe24ca0 c0008030 7042a716 @@ -3889,14 +3889,14 @@ 204033e5 700b9b01 20600000 -20400264 +20400265 67ec42a9 df200007 -204002b3 +204002b4 6fec0040 e7ec0005 -204002fa -202007c6 +204002fb +202007c9 00000000 00000000 00000000 @@ -3907,13 +3907,13 @@ c00c8006 c00e0017 c00d801f -202007c2 +202007c5 704ea801 -20400264 +20400265 67ec42a9 -2040025e +2040025f 67e200b6 -2040025e +2040025f 9c40fe00 1fe17ffc 67e800b7 @@ -3924,35 +3924,35 @@ 20228015 704ea802 7042a703 -202002bf +202002c0 6fe24c9b -c08102c3 -2040025e -203a02c3 -2040026d +c08102c4 +2040025f +203a02c4 +2040026e 67e206a7 7042a715 -202002bf +202002c0 6fe24c9b -c08102c3 -2040025e +c08102c4 +2040025f 67e242a8 -203a02c3 -204002bf +203a02c4 +204002c0 6ff04e1b 243a0029 7042a704 20600000 704c880b 704c870b -204002f0 +204002f1 58000000 e7e20005 6fe20046 e7e40005 6ff04e1b e7f00005 -202002fa +202002fb 00000000 00000000 00000000 @@ -3974,53 +3974,53 @@ c0070024 c008802c c0098031 -202007c0 -20400264 +202007c3 +20400265 67ec42a9 d8a04297 18007210 -2040025b +2040025c 70429301 7042a70b 20200027 -20400264 +20400265 67ec42a9 7042a70c 20400027 -20400648 +2040064b 6fe24c97 247a0000 6fe24ef2 -c000824a +c000824b 20600000 -20400264 +20400265 67ec42a9 -2040026d +2040026e 67e247f1 98007200 d8a047f2 -2040025b +2040025c 7042a709 20200027 -20400264 +20400265 67ec42a9 7042a70a df200007 -204002b3 +204002b4 6fec0040 e7ec0005 -202002fa -2040025e +202002fb +2040025f 67e242a8 7042a70d 704ef201 -202002bf -2040025e +202002c0 +2040025f 67e242a8 -2040026d +2040026e 1fe0fe0e 67e242a7 -202002bf +202002c0 00000000 00000000 00000000 @@ -4035,13 +4035,13 @@ c0030006 c004001c c005002f -202007be -2040025e +202007c1 +2040025f 67e242a8 -2040026d +2040026e 67e206a4 20402284 -242282c3 +242282c4 1a208c01 efe20006 c2800018 @@ -4049,16 +4049,16 @@ 6fe242a8 6842439b 98467c00 -242282bf +242282c0 7042a711 6fe2439a 67e242a8 -202002bf +202002c0 6fe206a4 67e20f12 20404894 -202002bf -20400264 +202002c0 +20400265 67ec42a9 7042a71a 6fe24c9b @@ -4070,27 +4070,27 @@ 704c9600 2040002a 704c8a02 -202001b9 +202001ba 704c9602 df200007 -204002b4 +204002b5 6fec42a9 e7ec0005 -202002fa +202002fb 6fe24ca2 -c00002c3 -c00102c1 +c00002c4 +c00102c2 6fe24c9b -c00102c1 +c00102c2 704ca202 -20400264 +20400265 67ec42a9 -2040026d +2040026e 67e24c8a 7042a708 7006a416 -204002bf -202001b9 +204002c0 +202001ba 00000000 00000000 00000000 @@ -4108,69 +4108,69 @@ c0230033 c0238034 c0288036 -202007bc -2040025e +202007bf +2040025f 67e44153 -2040025e +2040025f 67e44151 -202002af +202002b0 df200005 -204002b3 +204002b4 6fe4414f e7e40005 6fe4414d e7e40005 -202002fa -2040025e +202002fb +2040025f 67e4414f -2040025e +2040025f 67e4414d -202002af +202002b0 df200004 -204002b3 +204002b4 6fe6414a e7e60005 -202002fa -20400261 +202002fb +20400262 67e6414a -202002af -202002ab -2040026d -202002af +202002b0 +202002ac +2040026e +202002b0 df200002 -204002b3 +204002b4 6fe24c9d e7e20005 -202002fa -2040026d +202002fb +2040026e 67e24c9d -202002af -202002ab -2040026d -202002af +202002b0 +202002ac +2040026e +202002b0 df2000f2 -204002b3 +204002b4 6fe24c98 e7e20005 d8c00183 df200064 2040713a -202002fa +202002fb 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -202002ab +202002ac df200003 -204002b3 +204002b4 6fe44dea e7e40005 -202002fa -2040025e +202002fb +2040025f 67e44dea -202002af +202002b0 00000000 00000000 00000000 @@ -4229,62 +4229,62 @@ c0058022 c006002d c0068036 -202007ba +202007bd 6fe44dec -c30102c1 +c30102c2 6fe44dea -c30102c1 +c30102c2 6fe24c9b -c08102c3 -2040025e +c08102c4 +2040025f 67e40253 -2040025e +2040025f 67e40255 -2040025e +2040025f 67e40257 58000040 67e4430b -2040025e +2040025f 67e4430d -2040025e +2040025f 67e4430f 7042a712 -202002bf -2040025e +202002c0 +2040025f 67e40253 6fe20031 -c30302c1 +c30302c2 7042a713 -202002bf +202002c0 6fe24c9b -c08102c3 +c08102c4 6fe44dec -c30002c1 +c30002c2 6fe44dea -c30002c1 -20400264 +c30002c2 +20400265 67ec42a9 -2040026d +2040026e 7042a718 -202002bf -204001ef -242282ad +202002c0 +204001f0 +242282ae df200005 -204002b3 +204002b4 6fe20046 e7e40005 6fe44dec e7e40005 -202002fa -204001ef -242282ad -2040025e +202002fb +204001f0 +242282ae +2040025f 67e44dec df200003 -204002b3 +204002b4 6fe20046 e7e40005 -202002fa +202002fb 00000000 20200040 6fe24c18 @@ -4293,46 +4293,46 @@ c0018012 c0028017 c003001c -202007b8 -2040026a +202007bb +2040026b 67f04c6c -202002af +202002b0 df200004 -204002b3 +204002b4 580000fb e7e40005 58000005 e7e20005 -202002fa +202002fb df200009 -204002b3 +204002b4 6ff04de0 e7f00005 -202002fa +202002fb 6fe244de -243a02ad -20400264 +243a02ae +20400265 67ec4c7a -202002af +202002b0 6fe244de -243a02ad -2040025e +243a02ae +2040025f 67e44617 -2040025e +2040025f 67e44619 -2040026d +2040026e 2040002f 6042461b -2040026d +2040026e 205a0037 245a003b -2040026d -20400264 -2040026d +2040026e +20400265 +2040026e 67e24624 -2040026d +2040026e 67e24e12 -202002af +202002b0 d8400000 c1000000 d8400002 @@ -4358,32 +4358,32 @@ c002001e c002802e c0048019 -202002ab +202002ac df200009 -204002b3 +204002b4 6ff04c24 e7f00005 -202002fa +202002fb df200041 -204002b3 +204002b4 d8c04c2c df200040 2040713a -202002fa +202002fb df200009 -204002b3 +204002b4 6ff04138 e7f00005 -202002fa +202002fb df200007 -204002b3 +204002b4 6fec4140 e7ec0005 -202002fa -2040026d +202002fb +2040026e 67e20f12 df20000b -204002b3 +204002b4 6fe20f12 c000802a c001002c @@ -4391,13 +4391,13 @@ e7f00005 efe40006 e7e40005 -202002fa +202002fb 6ff04f1b 20200026 6ff04f25 20200026 df200008 -204002b3 +204002b4 580003fd e7e40005 580000ff @@ -4406,7 +4406,7 @@ e7e40005 5800000c e7e40005 -202002fa +202002fb 00000000 00000000 00000000 @@ -4424,51 +4424,51 @@ c00c8028 c00d002d c00d8030 -202007b6 -2040026a +202007b9 +2040026b 67f04c1c -202002af -20400272 +202002b0 +20400273 d8a0468a df200042 2040713a df200042 d8c0468a d8400000 -20400193 +20400194 60424689 -202002af +202002b0 df2000f9 -204002b3 +204002b4 d8c0468a df200040 2040713c df200017 204070e4 -202002fa +202002fb df200003 -204002b3 +204002b4 6fe44159 e7e40005 -202002fa -2040025e +202002fb +2040025f 67e44159 -202002af +202002b0 df200002 -204002b3 +204002b4 6fe24133 e7e20005 -202002fa -2040026d +202002fb +2040026e 67e24133 -202002af +202002b0 df200005 -204002b3 +204002b4 6fe44153 e7e40005 6fe44151 e7e40005 -202002fa +202002fb 00000000 00000000 00000000 @@ -4484,11 +4484,11 @@ c0010017 c0028019 c004802a -202007b4 +202007b7 7920001c -20400261 +20400262 67e64147 -2040026d +2040026e d8400800 984ffe00 d840ffff @@ -4497,42 +4497,42 @@ 18427e00 18000e02 20407141 -2040026d +2040026e 67e24c99 67e24c9a -202002bf +202002c0 7042a702 -202002af -20400264 +202002b0 +20400265 67ec42a9 -2040025e +2040025f 67e40251 -2040025e +2040025f 67e200b6 -2040025e -2040026d +2040025f +2040026e 67e24ad0 245a0026 704c9b01 7042a705 -202002bf +202002c0 6fe44dec 79207e00 67e44dec 20600000 6fe24ca2 -c00002c3 -c00102c1 +c00002c4 +c00102c2 6fe24c9b -c00102c1 +c00102c2 704ca200 -20400264 +20400265 67ec42a9 7042a707 -2040026d -c00082bf +2040026e +c00082c0 7042a719 -202002bf +202002c0 00000000 00000000 00000000