Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/output/flash.dat (revision 6380) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/output/flash.dat (working copy) @@ -8251,22 +8251,25 @@ 10 aa 55 -0c +0f 00 15 45 -0b -43 +0e +45 72 -61 -6b -65 +67 +6f 20 -32 +57 +69 +72 +65 +6c +65 +73 +73 20 -33 -2e -30 aa 55 05 @@ -8356,68 +8359,70 @@ 03 aa 55 -14 +10 00 13 4b -06 -ff -06 -00 -03 -00 -80 -0c +0f 09 -43 +45 72 -61 -6b -65 +67 +6f 20 -32 +57 +69 +72 +65 +6c +65 +73 +73 20 -35 -2e -32 aa 55 -0e +11 00 8f 43 1f -0c +0f 09 -43 +45 72 -61 -6b -65 +67 +6f 20 -32 +57 +69 +72 +65 +6c +65 +73 +73 20 -35 -2e -32 aa 55 -0c +0f 00 af 43 -0b -43 +0e +45 72 -61 -6b -65 +67 +6f 20 -32 +57 +69 +72 +65 +6c +65 +73 +73 20 -35 -2e -32 aa 55 08 @@ -9094,15 +9099,15 @@ 00 58 4b -97 +9c 30 00 55 aa aa 55 -83 -24 +c2 +2b ff 20 20 @@ -11038,36 +11043,28 @@ ca 68 00 -c7 +c0 +92 +2f +ef +fe +01 20 -d8 40 +80 +2c +68 00 -02 -98 -46 -7c +c0 +92 +2f +ef +fe 00 20 -42 +40 fd dd -68 -00 -c7 -20 -d8 -40 -00 -03 -98 -46 -7c -00 -20 -42 -80 -2e 70 4b 52 @@ -11152,6 +11149,14 @@ 00 00 00 +00 +00 +00 +00 +00 +00 +00 +00 20 20 00 @@ -12436,5 +12441,5 @@ 55 00 00 -42 -c6 +a2 +d9 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/output/program.lis (revision 6380) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/output/program.lis (working copy) @@ -35721,26 +35721,24 @@ 60020 d8e00007 arg mouse_store_eeprom_flag ,queue 60021 204043ce call mouse_enable_function_flag 60022 204043ca call mouse_bt_discovery_button_down_disable -60023 6800c720 fetch 1 ,mem_device_flag -60024 d8400002 arg mode_bt_device2 ,temp -60025 98467c00 isub temp ,null -60026 2042fddd call check_51cmd_start_discovery ,zero -60027 6800c720 fetch 1 ,mem_device_flag -60028 d8400003 arg mode_bt_device3 ,temp -60029 98467c00 isub temp ,null -6002a 2042802e call z_check_51cmd_adv ,zero -6002b 704b5200 jam 0 ,mem_mouse_bt_reconnect_flag -6002c 204042c7 call mouse_start_discovery_norandom_end -6002d 20200757 branch p_mouse_discovery_multi_led_blink +60023 6800c092 fetch 1 ,mem_device_option +60024 2feffe01 isolate1 mode_4_mouse ,pdata +60025 2040802c call z_check_51cmd_adv ,true +60026 6800c092 fetch 1 ,mem_device_option +60027 2feffe00 isolate1 mode_3_mouse ,pdata +60028 2040fddd call check_51cmd_start_discovery ,true +60029 704b5200 jam 0 ,mem_mouse_bt_reconnect_flag +6002a 204042c7 call mouse_start_discovery_norandom_end +6002b 20200757 branch p_mouse_discovery_multi_led_blink z_check_51cmd_adv: -6002e 7047a100 jam 0 ,mem_mouse_le_reconnect_flag -6002f 204002af call p_le_check_adv_flag -60030 58000005 setarg adv_flag_bredr_not_supported | adv_flag_limited_discoverable -60031 e0c08000 istore 1 ,contr -60032 d8c04b13 arg mem_le_adv_swift_pair ,contr -60033 20400571 call p_le_adv_data_update -60034 20207df4 branch check_51cmd_adv +6002c 7047a100 jam 0 ,mem_mouse_le_reconnect_flag +6002d 204002af call p_le_check_adv_flag +6002e 58000005 setarg adv_flag_bredr_not_supported | adv_flag_limited_discoverable +6002f e0c08000 istore 1 ,contr +60030 d8c04b13 arg mem_le_adv_swift_pair ,contr +60031 20400571 call p_le_adv_data_update +60032 20207df4 branch check_51cmd_adv org 0x70001 z_entrance6: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/output/romcode.rom (revision 6380) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/output/romcode.rom (working copy) @@ -24820,14 +24820,12 @@ d8e00007 204043ce 204043ca -6800c720 -d8400002 -98467c00 -2042fddd -6800c720 -d8400003 -98467c00 -2042802e +6800c092 +2feffe01 +2040802c +6800c092 +2feffe00 +2040fddd 704b5200 204042c7 20200757 @@ -25183,4 +25181,4 @@ 20400035 6008cd96 20600000 -00006886 +0000daac Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/program/z.prog (revision 6380) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/program/z.prog (working copy) @@ -384,15 +384,12 @@ call mouse_bt_discovery_button_down_disable - fetch 1,mem_device_flag //bt1: 3.0 - arg MODE_BT_DEVICE2,temp - isub temp,null - call check_51cmd_start_discovery,zero - - fetch 1,mem_device_flag //bt2: 5.2 - arg MODE_BT_DEVICE3,temp - isub temp,null - call z_check_51cmd_adv,zero + fetch 1,mem_device_option + isolate1 MODE_4_MOUSE,pdata + call z_check_51cmd_adv,true + fetch 1,mem_device_option + isolate1 MODE_3_MOUSE,pdata + call check_51cmd_start_discovery,true // fetch MOUSE_FLAG_LEN,mem_mouse_flag // bbit1 MOUSE_ENABLE_DISCOVERY_SENSOR_LED,mouse_sensor_start_blink Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/sched/mouse.dat (revision 6380) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/M620-R_PBSwitch_3mode_3ch_24M_Gan_dpi_4level/sched/mouse.dat (working copy) @@ -63,7 +63,7 @@ mem_app_connection_options:06 mem_lap:53 23 19 20 18 10 mem_local_name_length: -'Crake 2 3.0 +'Ergo Wireless 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 @@ -98,19 +98,19 @@ mem_le_adv_swift_pair: #microsoft swift pair -06 ff 06 00 03 00 80 +#06 ff 06 00 03 00 80 #name -'\09Crake 2 5.2 +'\09Ergo Wireless mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09Crake 2 5.2 +'\09Ergo Wireless #max 20bytes, att list data rom limits mem_le_name_len: -'Crake 2 5.2 +'Ergo Wireless mem_le_interval_min: