Index: output/flash.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/flash.dat (revision 3838) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/flash.dat (working copy) @@ -8426,22 +8426,24 @@ 10 aa 55 -0c +0e 00 15 45 -0b -4d -33 -20 -42 +0d +50 +45 +41 +4e +55 54 +53 20 4d -6f -75 -73 -65 +53 +5f +32 +32 aa 55 05 @@ -8513,7 +8515,7 @@ 01 aa 55 -0c +1b 00 6f 43 @@ -8529,70 +8531,63 @@ 19 c2 03 -aa -55 -14 -00 -12 -4b -06 -ff -06 -00 -03 -00 -80 -0c +0e 09 -4d -33 -20 -42 +50 +45 +41 +4e +55 54 +53 20 4d -6f -75 -73 -65 +53 +5f +32 +32 aa 55 -0e +10 00 8f 43 1f -0c +0e 09 -4d -33 -20 -42 +50 +45 +41 +4e +55 54 +53 20 4d -6f -75 -73 -65 +53 +5f +32 +32 aa 55 -0c +0e 00 af 43 -0b -4d -33 -20 -42 +0d +50 +45 +41 +4e +55 54 +53 20 4d -6f -75 -73 -65 +53 +5f +32 +32 aa 55 08 @@ -9253,15 +9248,15 @@ 00 57 4b -36 +31 31 00 55 aa aa 55 -6b -22 +9a +20 ff 20 20 @@ -11225,8 +11220,8 @@ 00 d8 c0 -4b -12 +43 +90 20 40 05 @@ -11322,7 +11317,7 @@ c0 20 80 -16 +18 20 60 00 @@ -11371,6 +11366,14 @@ 21 00 0a +60 +01 +44 +96 +60 +01 +44 +98 68 00 c3 @@ -11393,8 +11396,8 @@ d8 60 00 -c1 -72 +c7 +c7 20 20 00 @@ -11410,7 +11413,7 @@ 20 40 00 -1b +1d 24 74 00 @@ -11559,14 +11562,6 @@ 00 00 00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -12595,5 +12590,5 @@ 55 00 00 -3d -81 +56 +cb Index: output/program.lis =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/program.lis (revision 3838) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/program.lis (working copy) @@ -35656,7 +35656,7 @@ z_entrance4: 50001 c0200004 beq zcode_40 ,z_le_update_param -50002 c0208016 beq zcode_41 ,z_le_update_channel_map +50002 c0208018 beq zcode_41 ,z_le_update_channel_map 50003 20600000 rtn z_le_update_param: @@ -35679,30 +35679,32 @@ 5000c 6800c3d6 fetch 1 ,mem_le_new_conninterval 5000d 1fe67c0c sub pdata ,le_interval_15ms ,null 5000e 2421000a nbranch z_mouse_le_conn_param_lpm_disable ,positive -5000f 6800c3d8 fetch 1 ,mem_le_new_connslavelatency -50010 6808c7c7 fetcht 1 ,mem_lpm_mult_init -50011 98467c00 isub temp ,null -50012 20210006 branch z_mouse_le_lpm_mult_reinit ,positive -50013 6800c3d8 fetch 1 ,mem_le_new_connslavelatency -50014 6000c172 store 1 ,mem_lpm_mult -50015 20200008 branch z_mouse_le_conn_param_lpm_enable +5000f 60014496 store 2 ,mem_le_interval_min +50010 60014498 store 2 ,mem_le_interval_min + 2 +50011 6800c3d8 fetch 1 ,mem_le_new_connslavelatency +50012 6808c7c7 fetcht 1 ,mem_lpm_mult_init +50013 98467c00 isub temp ,null +50014 20210006 branch z_mouse_le_lpm_mult_reinit ,positive +50015 6800c3d8 fetch 1 ,mem_le_new_connslavelatency +50016 6000c7c7 store 1 ,mem_lpm_mult_init +50017 20200008 branch z_mouse_le_conn_param_lpm_enable z_le_update_channel_map: -50016 6800843f fetch 1 ,mem_le_state -50017 c4030000 rtnbit0 lestate_update_map -50018 2040001b call z_le_channel_map_overflow_check -50019 24740000 nrtn user -5001a 202055a0 branch le_update_channel_map + 3 +50018 6800843f fetch 1 ,mem_le_state +50019 c4030000 rtnbit0 lestate_update_map +5001a 2040001d call z_le_channel_map_overflow_check +5001b 24740000 nrtn user +5001c 202055a0 branch le_update_channel_map + 3 z_le_channel_map_overflow_check: -5001b 78347c00 enable user -5001c 6800845a fetch 1 ,mem_le_event_count + 1 -5001d 1ff1fe00 rshift4 pdata ,pdata -5001e c1878000 rtnne 0x0f -5001f 68008460 fetch 1 ,mem_le_instant + 1 -50020 1ff1fe00 rshift4 pdata ,pdata -50021 c1800000 rtnne 0x00 -50022 20207fe9 branch disable_user +5001d 78347c00 enable user +5001e 6800845a fetch 1 ,mem_le_event_count + 1 +5001f 1ff1fe00 rshift4 pdata ,pdata +50020 c1878000 rtnne 0x0f +50021 68008460 fetch 1 ,mem_le_instant + 1 +50022 1ff1fe00 rshift4 pdata ,pdata +50023 c1800000 rtnne 0x00 +50024 20207fe9 branch disable_user org 0x60001 z_entrance5: @@ -35753,7 +35755,7 @@ 60027 204002ba call p_le_check_adv_flag 60028 58000005 setarg adv_flag_bredr_not_supported | adv_flag_limited_discoverable 60029 e0c08000 istore 1 ,contr -6002a d8c04b12 arg mem_le_adv_swift_pair ,contr +6002a d8c04390 arg mem_le_scan_data ,contr 6002b 20400536 call p_le_adv_data_update 6002c 20207df4 branch check_51cmd_adv org 0x70001 Index: output/romcode.rom =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/romcode.rom (revision 3838) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/romcode.rom (working copy) @@ -24730,7 +24730,7 @@ 70480b14 2020636f c0200004 -c0208016 +c0208018 20600000 2040000c 2020557d @@ -24743,16 +24743,18 @@ 6800c3d6 1fe67c0c 2421000a +60014496 +60014498 6800c3d8 6808c7c7 98467c00 20210006 6800c3d8 -6000c172 +6000c7c7 20200008 6800843f c4030000 -2040001b +2040001d 24740000 202055a0 78347c00 @@ -24804,7 +24806,7 @@ 204002ba 58000005 e0c08000 -d8c04b12 +d8c04390 20400536 20207df4 c0300005 @@ -25144,4 +25146,4 @@ 20400035 6008cd88 20600000 -0000b529 +0000c1fb Index: program/z.prog =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/z.prog (revision 3838) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/z.prog (working copy) @@ -274,12 +274,14 @@ fetch 1,mem_le_new_conninterval sub pdata,LE_INTERVAL_15MS,null nbranch z_mouse_le_conn_param_lpm_disable,positive + store 2,mem_le_interval_min + store 2,mem_le_interval_min+2 fetch 1,mem_le_new_connslavelatency fetcht 1,mem_lpm_mult_init isub temp,null branch z_mouse_le_lpm_mult_reinit,positive fetch 1,mem_le_new_connslavelatency - store 1,mem_lpm_mult + store 1,mem_lpm_mult_init branch z_mouse_le_conn_param_lpm_enable z_le_update_channel_map: @@ -358,7 +360,7 @@ call p_le_check_adv_flag setarg ADV_FLAG_BREDR_NOT_SUPPORTED |ADV_FLAG_LIMITED_DISCOVERABLE istore 1,contr - arg mem_le_adv_swift_pair,contr + arg mem_le_scan_data,contr call p_le_adv_data_update branch check_51cmd_adv Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/sched/mouse.dat (revision 3838) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/sched/mouse.dat (working copy) @@ -62,7 +62,7 @@ mem_app_connection_options:06 mem_lap:26 10 19 20 18 10 mem_local_name_length: -'M3 BT Mouse +'PEANUTS MS_22 mem_sniff_param_interval: 0e 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz 01 00 ##mem_sniff_param_attempt:01 00 @@ -95,21 +95,17 @@ #appearance 03 19 c2 03 -mem_le_adv_swift_pair: -#microsoft swift pair -06 ff 06 00 03 00 80 -#name -'\09M3 BT Mouse +'\09PEANUTS MS_22 mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09M3 BT Mouse +'\09PEANUTS MS_22 #max 20bytes, att list data rom limits mem_le_name_len: -'M3 BT Mouse +'PEANUTS MS_22 mem_le_interval_min: