Index: output/bt_program23.icode =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.icode (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.icode (working copy) @@ -26853,48 +26853,37 @@ 00393259 0x00009273 call 0x00000532 00393260 0x00009274 branch 0x00007df4 00458753 0x00009279 beq 0x00000060 , 0x00070005 - 00458754 0x0000927a beq 0x00000061 , 0x00070017 - 00458755 0x0000927b beq 0x00000062 , 0x0007001f + 00458754 0x0000927a beq 0x00000061 , 0x0007000c + 00458755 0x0000927b beq 0x00000062 , 0x00070014 00458756 0x0000927c rtn - 00458757 0x0000927f call 0x0007000e - 00458758 0x00009280 branch 0x000001d4 , 0x00000028 - 00458759 0x00009281 set1 0x00000026 , 0x00000000 - 00458760 0x00009282 fetch 0x00000001 , 0x00004d8c - 00458761 0x00009283 set1 0x00000002 , 0x0000003f - 00458762 0x00009284 store 0x00000001 , 0x00004d8c - 00458763 0x00009285 call 0x000001be - 00458764 0x00009286 call 0x00000134 - 00458765 0x00009287 branch 0x0007001b - 00458766 0x0000928a arg 0x00000002 , 0x00000039 - 00458767 0x0000928b arg 0x00004c64 , 0x00000006 - 00458768 0x0000928c call 0x00007fe7 - 00458769 0x0000928d setarg 0x0000ffff - 00458770 0x0000928f ifetcht 0x00000002 , 0x00000006 - 00458771 0x00009290 isub 0x00000002 , 0x0000003e - 00458772 0x00009291 ncall 0x00007fe9 , 0x00000005 - 00458773 0x00009292 loop 0x00070012 - 00458774 0x00009293 rtn - 00458775 0x00009296 set1 0x00000026 , 0x00000000 - 00458776 0x00009297 fetch 0x00000001 , 0x00004d8c - 00458777 0x00009298 set1 0x00000001 , 0x0000003f - 00458778 0x00009299 store 0x00000001 , 0x00004d8c - 00458779 0x0000929b setarg 0x0000003c - 00458780 0x0000929c store 0x00000002 , 0x00004d88 - 00458781 0x0000929d jam 0x00000000 , 0x00004d87 - 00458782 0x0000929e rtn - 00458783 0x000092a1 fetch 0x00000004 , 0x000046d3 - 00458784 0x000092a2 rtnbit0 0x00000011 - 00458785 0x000092a3 rtnbit1 0x00000003 - 00458786 0x000092a4 rtnmark1 0x00000026 - 00458787 0x000092a5 call 0x00004482 - 00458788 0x000092a6 arg 0x00000003 , 0x00000007 - 00458789 0x000092a7 call 0x000043ce - 00458790 0x000092a8 setarg 0x00000000 - 00458791 0x000092a9 store 0x00000002 , 0x000046ae - 00458792 0x000092aa store 0x00000001 , 0x000046b4 - 00458793 0x000092ab store 0x00000002 , 0x00004c69 - 00458794 0x000092ac call 0x000042ca - 00458795 0x000092ad branch 0x000001d4 + 00458757 0x00009281 set1 0x00000026 , 0x00000000 + 00458758 0x00009282 fetch 0x00000001 , 0x00004d8c + 00458759 0x00009283 set1 0x00000002 , 0x0000003f + 00458760 0x00009284 store 0x00000001 , 0x00004d8c + 00458761 0x00009285 call 0x000001be + 00458762 0x00009286 call 0x00000134 + 00458763 0x00009287 branch 0x00070010 + 00458764 0x00009296 set1 0x00000026 , 0x00000000 + 00458765 0x00009297 fetch 0x00000001 , 0x00004d8c + 00458766 0x00009298 set1 0x00000001 , 0x0000003f + 00458767 0x00009299 store 0x00000001 , 0x00004d8c + 00458768 0x0000929b setarg 0x0000003c + 00458769 0x0000929c store 0x00000002 , 0x00004d88 + 00458770 0x0000929d jam 0x00000000 , 0x00004d87 + 00458771 0x0000929e rtn + 00458772 0x000092a1 fetch 0x00000004 , 0x000046d3 + 00458773 0x000092a2 rtnbit0 0x00000011 + 00458774 0x000092a3 rtnbit1 0x00000003 + 00458775 0x000092a4 rtnmark1 0x00000026 + 00458776 0x000092a5 call 0x00004482 + 00458777 0x000092a6 arg 0x00000003 , 0x00000007 + 00458778 0x000092a7 call 0x000043ce + 00458779 0x000092a8 setarg 0x00000000 + 00458780 0x000092a9 store 0x00000002 , 0x000046ae + 00458781 0x000092aa store 0x00000001 , 0x000046b4 + 00458782 0x000092ab store 0x00000002 , 0x00004c69 + 00458783 0x000092ac call 0x000042ca + 00458784 0x000092ad branch 0x000001d4 00524289 0x000092b3 beq 0x00000070 , 0x00080004 00524290 0x000092b4 beq 0x00000071 , 0x0008001a 00524291 0x000092b5 rtn Index: output/bt_program23.list =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.list (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.list (working copy) @@ -31318,50 +31318,37 @@ 0x70003 037499 beq zcode_62 ,z_mouse_24g_pairing_button 0x70004 037500 rtn : 037502 z_g24_start_24g_mode: -0x70005 037503 call z_g24_factory_check -0x70006 037504 branch p_g24_auto_pair_start ,user -0x70007 037505 set1 mark_24g ,mark -0x70008 037506 fetch 1 ,mem_24g_conn_sm -0x70009 037507 set1 state_24g_reconn ,pdata -0x7000a 037508 store 1 ,mem_24g_conn_sm -0x7000b 037509 call p_g24_syncword_crc8 -0x7000c 037510 call p_g24_ch -0x7000d 037511 branch z_g24_auto_pair_timeout_init -: 037513 z_g24_factory_check: -0x7000e 037514 arg 2 ,loopcnt -0x7000f 037515 arg mem_24g_addr ,contr -0x70010 037516 call enable_user -0x70011 037517 setarg 0xffff -: 037518 z4_pdata_0xff_check_loop: -0x70012 037519 ifetcht 2 ,contr -0x70013 037520 isub temp ,null -0x70014 037521 ncall disable_user ,zero -0x70015 037522 loop z4_pdata_0xff_check_loop -0x70016 037523 rtn +0x70005 037505 set1 mark_24g ,mark +0x70006 037506 fetch 1 ,mem_24g_conn_sm +0x70007 037507 set1 state_24g_reconn ,pdata +0x70008 037508 store 1 ,mem_24g_conn_sm +0x70009 037509 call p_g24_syncword_crc8 +0x7000a 037510 call p_g24_ch +0x7000b 037511 branch z_g24_auto_pair_timeout_init : 037525 z_g24_auto_pair_start: -0x70017 037526 set1 mark_24g ,mark -0x70018 037527 fetch 1 ,mem_24g_conn_sm -0x70019 037528 set1 state_24g_pair ,pdata -0x7001a 037529 store 1 ,mem_24g_conn_sm +0x7000c 037526 set1 mark_24g ,mark +0x7000d 037527 fetch 1 ,mem_24g_conn_sm +0x7000e 037528 set1 state_24g_pair ,pdata +0x7000f 037529 store 1 ,mem_24g_conn_sm : 037530 z_g24_auto_pair_timeout_init: -0x7001b 037531 setarg g24_first_disconn_nodata_timer -0x7001c 037532 store 2 ,mem_24g_stop_g24_mode_timeout -0x7001d 037533 jam 0 ,mem_24g_stop_g24_mode -0x7001e 037534 rtn +0x70010 037531 setarg g24_first_disconn_nodata_timer +0x70011 037532 store 2 ,mem_24g_stop_g24_mode_timeout +0x70012 037533 jam 0 ,mem_24g_stop_g24_mode +0x70013 037534 rtn : 037536 z_mouse_24g_pairing_button: -0x7001f 037537 fetch mouse_flag_len ,mem_mouse_flag -0x70020 037538 rtnbit0 mouse_enable_24g -0x70021 037539 rtnbit1 mosue_24g_pairing_flag -0x70022 037540 rtnmark1 mark_24g -0x70023 037541 call mouse_devce_led_off -0x70024 037542 arg mosue_24g_pairing_flag ,queue -0x70025 037543 call mouse_enable_function_flag -0x70026 037544 setarg 0 -0x70027 037545 store 2 ,mem_mouse_direct_timer -0x70028 037546 store 1 ,mem_mouse_send_blank_timer -0x70029 037547 store 2 ,mem_24g_check_dongle_times -0x7002a 037548 call mouse_stop_discovery -0x7002b 037549 branch p_g24_auto_pair_start +0x70014 037537 fetch mouse_flag_len ,mem_mouse_flag +0x70015 037538 rtnbit0 mouse_enable_24g +0x70016 037539 rtnbit1 mosue_24g_pairing_flag +0x70017 037540 rtnmark1 mark_24g +0x70018 037541 call mouse_devce_led_off +0x70019 037542 arg mosue_24g_pairing_flag ,queue +0x7001a 037543 call mouse_enable_function_flag +0x7001b 037544 setarg 0 +0x7001c 037545 store 2 ,mem_mouse_direct_timer +0x7001d 037546 store 1 ,mem_mouse_send_blank_timer +0x7001e 037547 store 2 ,mem_24g_check_dongle_times +0x7001f 037548 call mouse_stop_discovery +0x70020 037549 branch p_g24_auto_pair_start org 0x80001 : 037554 z_entrance7: 0x80001 037555 beq zcode_70 ,z_g24_reconn_dispatch Index: output/bt_program23.meta =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.meta (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.meta (working copy) @@ -37500,8 +37500,8 @@ rtn z_g24_start_24g_mode: - call z_g24_factory_check - branch p_g24_auto_pair_start,user +// call z_g24_factory_check +// branch p_g24_auto_pair_start,user set1 mark_24g,mark fetch 1,mem_24g_conn_sm set1 STATE_24G_RECONN,pdata @@ -37510,17 +37510,17 @@ call p_g24_ch branch z_g24_auto_pair_timeout_init -z_g24_factory_check: - arg 2,loopcnt - arg mem_24g_addr,contr - call enable_user - setarg 0xffff -z4_pdata_0xff_check_loop: - ifetcht 2,contr - isub temp,null - ncall disable_user,zero - loop z4_pdata_0xff_check_loop - rtn +//z_g24_factory_check: +// arg 2,loopcnt +// arg mem_24g_addr,contr +// call enable_user +// setarg 0xffff +//z4_pdata_0xff_check_loop: +// ifetcht 2,contr +// isub temp,null +// ncall disable_user,zero +// loop z4_pdata_0xff_check_loop +// rtn z_g24_auto_pair_start: set1 mark_24g,mark Index: output/bt_program23.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.rom (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/bt_program23.rom (working copy) @@ -458752,27 +458752,16 @@ 11000000001100000000000000000101 -11000000001100001000000000010111 -11000000001100010000000000011111 +11000000001100001000000000001100 +11000000001100010000000000010100 00100000011000000000000000000000 -00100000010000000000000000001110 -00100000001101000000000111010100 01111001001000000000000000100110 01101000000000001100110110001100 01111001001000000111111000000010 01100000000000001100110110001100 00100000010000000000000110111110 00100000010000000000000100110100 -00100000001000000000000000011011 -11011111001000000000000000000010 -11011000110000000100110001100100 -00100000010000000111111111100111 -01011000000000001111111111111111 -11101000110010010000000000000000 -10011000010001100111110000000000 -00100100010000101111111111101001 -11000010000000000000000000010010 -00100000011000000000000000000000 +00100000001000000000000000010000 01111001001000000000000000100110 01101000000000001100110110001100 01111001001000000111111000000001 @@ -524287,6 +524276,17 @@ + + + + + + + + + + + 11000000001110000000000000000100 11000000001110001000000000011010 00100000011000000000000000000000 Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/flash.dat (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/flash.dat (working copy) @@ -9133,7 +9133,7 @@ 00 b2 4b -0a +0b 00 aa 55 @@ -10830,23 +10830,15 @@ c0 30 80 -17 +0c c0 31 00 -1f +14 20 60 00 00 -20 -40 -00 -0e -20 -34 -01 -d4 79 20 00 @@ -10874,43 +10866,7 @@ 20 20 00 -1b -df -20 -00 -02 -d8 -c0 -4c -64 -20 -40 -7f -e7 -58 -00 -ff -ff -e8 -c9 -00 -00 -98 -46 -7c -00 -24 -42 -ff -e9 -c2 -00 -00 -12 -20 -60 -00 -00 +10 79 20 00 @@ -11075,6 +11031,50 @@ 00 00 00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 20 20 00 @@ -12615,5 +12615,5 @@ 55 00 00 -19 -99 +34 +e7 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/program.lis (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/program.lis (working copy) @@ -35765,60 +35765,45 @@ z_entrance6: 70001 c0300005 beq zcode_60 ,z_g24_start_24g_mode -70002 c0308017 beq zcode_61 ,z_g24_auto_pair_start -70003 c031001f beq zcode_62 ,z_mouse_24g_pairing_button +70002 c030800c beq zcode_61 ,z_g24_auto_pair_start +70003 c0310014 beq zcode_62 ,z_mouse_24g_pairing_button 70004 20600000 rtn z_g24_start_24g_mode: -70005 2040000e call z_g24_factory_check -70006 203401d4 branch p_g24_auto_pair_start ,user -70007 79200026 set1 mark_24g ,mark -70008 6800cd8c fetch 1 ,mem_24g_conn_sm -70009 79207e02 set1 state_24g_reconn ,pdata -7000a 6000cd8c store 1 ,mem_24g_conn_sm -7000b 204001be call p_g24_syncword_crc8 -7000c 20400134 call p_g24_ch -7000d 2020001b branch z_g24_auto_pair_timeout_init - -z_g24_factory_check: -7000e df200002 arg 2 ,loopcnt -7000f d8c04c64 arg mem_24g_addr ,contr -70010 20407fe7 call enable_user -70011 5800ffff setarg 0xffff - -z4_pdata_0xff_check_loop: -70012 e8c90000 ifetcht 2 ,contr -70013 98467c00 isub temp ,null -70014 2442ffe9 ncall disable_user ,zero -70015 c2000012 loop z4_pdata_0xff_check_loop -70016 20600000 rtn +70005 79200026 set1 mark_24g ,mark +70006 6800cd8c fetch 1 ,mem_24g_conn_sm +70007 79207e02 set1 state_24g_reconn ,pdata +70008 6000cd8c store 1 ,mem_24g_conn_sm +70009 204001be call p_g24_syncword_crc8 +7000a 20400134 call p_g24_ch +7000b 20200010 branch z_g24_auto_pair_timeout_init z_g24_auto_pair_start: -70017 79200026 set1 mark_24g ,mark -70018 6800cd8c fetch 1 ,mem_24g_conn_sm -70019 79207e01 set1 state_24g_pair ,pdata -7001a 6000cd8c store 1 ,mem_24g_conn_sm +7000c 79200026 set1 mark_24g ,mark +7000d 6800cd8c fetch 1 ,mem_24g_conn_sm +7000e 79207e01 set1 state_24g_pair ,pdata +7000f 6000cd8c store 1 ,mem_24g_conn_sm z_g24_auto_pair_timeout_init: -7001b 5800003c setarg g24_first_disconn_nodata_timer -7001c 60014d88 store 2 ,mem_24g_stop_g24_mode_timeout -7001d 704d8700 jam 0 ,mem_24g_stop_g24_mode -7001e 20600000 rtn +70010 5800003c setarg g24_first_disconn_nodata_timer +70011 60014d88 store 2 ,mem_24g_stop_g24_mode_timeout +70012 704d8700 jam 0 ,mem_24g_stop_g24_mode +70013 20600000 rtn z_mouse_24g_pairing_button: -7001f 680246d3 fetch mouse_flag_len ,mem_mouse_flag -70020 c4088000 rtnbit0 mouse_enable_24g -70021 c3818000 rtnbit1 mosue_24g_pairing_flag -70022 c6130000 rtnmark1 mark_24g -70023 20404482 call mouse_devce_led_off -70024 d8e00003 arg mosue_24g_pairing_flag ,queue -70025 204043ce call mouse_enable_function_flag -70026 58000000 setarg 0 -70027 600146ae store 2 ,mem_mouse_direct_timer -70028 6000c6b4 store 1 ,mem_mouse_send_blank_timer -70029 60014c69 store 2 ,mem_24g_check_dongle_times -7002a 204042ca call mouse_stop_discovery -7002b 202001d4 branch p_g24_auto_pair_start +70014 680246d3 fetch mouse_flag_len ,mem_mouse_flag +70015 c4088000 rtnbit0 mouse_enable_24g +70016 c3818000 rtnbit1 mosue_24g_pairing_flag +70017 c6130000 rtnmark1 mark_24g +70018 20404482 call mouse_devce_led_off +70019 d8e00003 arg mosue_24g_pairing_flag ,queue +7001a 204043ce call mouse_enable_function_flag +7001b 58000000 setarg 0 +7001c 600146ae store 2 ,mem_mouse_direct_timer +7001d 6000c6b4 store 1 ,mem_mouse_send_blank_timer +7001e 60014c69 store 2 ,mem_24g_check_dongle_times +7001f 204042ca call mouse_stop_discovery +70020 202001d4 branch p_g24_auto_pair_start org 0x80001 z_entrance7: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/romcode.rom (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/romcode.rom (working copy) @@ -24808,27 +24808,16 @@ 20400532 20207df4 c0300005 -c0308017 -c031001f +c030800c +c0310014 20600000 -2040000e -203401d4 79200026 6800cd8c 79207e02 6000cd8c 204001be 20400134 -2020001b -df200002 -d8c04c64 -20407fe7 -5800ffff -e8c90000 -98467c00 -2442ffe9 -c2000012 -20600000 +20200010 79200026 6800cd8c 79207e01 @@ -25155,4 +25144,4 @@ 20400035 6008cd8b 20600000 -0000b156 +0000e498 Index: output/sched.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/sched.rom (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/output/sched.rom (working copy) @@ -334,7 +334,7 @@ mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 4f 12 # 240ms dpi B4 B5 check easy -mem_firmware_version:0a 00 +mem_firmware_version:0b 00 mem_device_flag:01 mem_device1_type:34 Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/program/z.prog (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/program/z.prog (working copy) @@ -371,8 +371,8 @@ rtn z_g24_start_24g_mode: - call z_g24_factory_check - branch p_g24_auto_pair_start,user +// call z_g24_factory_check +// branch p_g24_auto_pair_start,user set1 mark_24g,mark fetch 1,mem_24g_conn_sm set1 STATE_24G_RECONN,pdata @@ -381,17 +381,17 @@ call p_g24_ch branch z_g24_auto_pair_timeout_init -z_g24_factory_check: - arg 2,loopcnt - arg mem_24g_addr,contr - call enable_user - setarg 0xffff -z4_pdata_0xff_check_loop: - ifetcht 2,contr - isub temp,null - ncall disable_user,zero - loop z4_pdata_0xff_check_loop - rtn +//z_g24_factory_check: +// arg 2,loopcnt +// arg mem_24g_addr,contr +// call enable_user +// setarg 0xffff +//z4_pdata_0xff_check_loop: +// ifetcht 2,contr +// isub temp,null +// ncall disable_user,zero +// loop z4_pdata_0xff_check_loop +// rtn z_g24_auto_pair_start: set1 mark_24g,mark Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/sched/mouse.dat (revision 2700) +++ /branch/mouse_project/YJX_Project/YJX_1059/PBSwitch_3mode_3ch/sched/mouse.dat (working copy) @@ -297,7 +297,7 @@ mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 4f 12 # 240ms dpi B4 B5 check easy -mem_firmware_version:0a 00 +mem_firmware_version:0b 00 mem_device_flag:01 mem_device1_type:34