Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/output/eeprom.dat (revision 4748) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -76 +b6 18 c2 84 @@ -79,7 +79,7 @@ c0 67 85 -e7 +f7 c0 68 03 @@ -211,7 +211,7 @@ c0 76 85 -ef +ff 20 20 13 @@ -2299,7 +2299,7 @@ 20 40 06 -14 +24 20 40 27 @@ -2355,7 +2355,7 @@ 20 20 05 -d5 +e5 70 4b 94 @@ -5899,7 +5899,7 @@ 20 40 05 -c6 +c7 20 40 79 @@ -5907,15 +5907,19 @@ 20 40 05 -d5 +e5 20 40 05 -ca +cb +20 +40 +05 +d6 20 20 46 -50 +51 6f e0 cc @@ -5939,11 +5943,11 @@ c2 94 85 -ce +cf c2 9b 85 -ce +cf 20 60 00 @@ -5977,6 +5981,66 @@ 46 5c 6f +e4 +4b +ab +c4 +15 +00 +00 +68 +48 +c9 +1e +20 +40 +3f +56 +68 +48 +c9 +1e +20 +40 +60 +59 +20 +20 +85 +e1 +6f +e0 +c9 +38 +c1 +00 +80 +00 +70 +49 +38 +01 +20 +20 +46 +c0 +6f +e0 +c9 +38 +c1 +00 +00 +00 +70 +49 +38 +00 +20 +20 +46 +c0 +6f e0 c9 0f @@ -5999,7 +6063,7 @@ 20 40 05 -dc +ec 20 20 40 @@ -6027,7 +6091,7 @@ c0 7f 85 -e3 +f3 20 20 40 @@ -6114,8 +6178,8 @@ cc c5 13 -05 -f9 +06 +09 6f e0 c8 @@ -6127,7 +6191,7 @@ 24 21 06 -13 +23 6f e0 c8 @@ -6139,7 +6203,7 @@ 24 21 06 -01 +11 6f e0 c8 @@ -6147,7 +6211,7 @@ c0 00 06 -14 +24 20 60 00 @@ -6183,7 +6247,7 @@ c5 13 06 -0a +1a 6f e0 c8 @@ -6215,7 +6279,7 @@ c0 01 06 -1b +2b c0 00 a7 @@ -6235,7 +6299,7 @@ c0 01 86 -1a +2a 1f e0 fe @@ -6251,11 +6315,11 @@ c0 01 06 -1b +2b 20 20 06 -1b +2b 70 41 e8 @@ -6264,8 +6328,8 @@ 60 00 00 -bb -6c +60 +70 aa 55 40 @@ -6474,7 +6538,7 @@ ff ff ff -ff +0a 07 06 ff @@ -7019,7 +7083,7 @@ 54 35 2e -30 +32 20 4d 6f @@ -7647,74 +7711,10 @@ aa aa 55 -a5 -a7 -30 -cc -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +b2 +a6 +07 +80 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -88 -33 +7b +e4 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/output/program.lis (revision 4748) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/output/program.lis (working copy) @@ -18,7 +18,7 @@ 000f c065029f beq patch19_2 ,p_mouse_lpm_before_common 0010 c06600f1 beq patch19_4 ,p_mouse_adc_read_start 0011 c067053d beq patch19_6 ,p_mouse_motion -0012 c06785e7 beq patch19_7 ,p_mouse_dpi_process +0012 c06785f7 beq patch19_7 ,p_mouse_dpi_process 0013 c0680381 beq patch1a_0 ,p_mouse_seting_dpi 0014 c0688578 beq patch1a_1 ,p_mouse_check_key_gpio 0015 c069839d beq patch1a_3 ,p_mouse_init_sunt @@ -53,7 +53,7 @@ 0030 c0750207 beq patch3d_2 ,p_g24_transmit_no_interrupt 0031 c0758234 beq patch3d_3 ,p_g24_transmit_hop_process 0032 c0760532 beq patch3d_4 ,p_g24_lpm_wait -0033 c07685ef beq patch3d_5 ,p_power_ctrl_start +0033 c07685ff beq patch3d_5 ,p_power_ctrl_start 0034 2020137c branch loop p_soft_reset: @@ -751,7 +751,7 @@ 023a 684a488d fetcht 4 ,mem_24g_fast_conn_addr 023b 98467c00 isub temp ,null 023c 2022a2cb branch g24_ch ,zero -023d 20400614 call p_power_ctrl_txpower_incrs +023d 20400624 call p_power_ctrl_txpower_incrs 023e 20402724 call power_ctrl_pac_succ_decrs 023f 202022cb branch g24_ch @@ -771,7 +771,7 @@ p_mouse_dpi_check_once: 0249 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 024a c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button -024b 202005d5 branch p_mouse_dpi_check +024b 202005e5 branch p_mouse_dpi_check p_mouse_select_device_by_pb_button_check_once: 024c 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status @@ -2033,136 +2033,158 @@ 05c0 20203f56 branch mouse_gpio_config_input_pu p_mouse_idle: -05c1 204005c6 call p_mouse_low_voltage_led_no_enter_lpm +05c1 204005c7 call p_mouse_low_voltage_led_no_enter_lpm 05c2 20407936 call ui_check_paring_button -05c3 204005d5 call p_mouse_dpi_check -05c4 204005ca call p_mouse_select_device_check -05c5 20204650 branch mouse_idle + 5 +05c3 204005e5 call p_mouse_dpi_check +05c4 204005cb call p_mouse_select_device_check +05c5 204005d6 call p_mouse_check_select_device_by_switch +05c6 20204651 branch mouse_idle + 6 p_mouse_low_voltage_led_no_enter_lpm: -05c6 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -05c7 c4018000 rtnbit0 mouse_enable_low_led -05c8 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05c9 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 +05c7 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config +05c8 c4018000 rtnbit0 mouse_enable_low_led +05c9 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05ca 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 p_mouse_select_device_check: -05ca 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05cb c29485ce bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge -05cc c29b85ce bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge -05cd 20600000 rtn +05cb 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05cc c29485cf bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge +05cd c29b85cf bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge +05ce 20600000 rtn p_mouse_select_device_by_pb_button_check_judge: -05ce 6fe1478c fetch 2 ,mem_ui_state_map -05cf c283024c bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once -05d0 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio -05d1 c17f8000 rtneq gpio_disable -05d2 6fe0c9bf fetch 1 ,mem_store_information_delay_timer -05d3 247a0000 nrtn blank -05d4 2020465c branch mouse_select_device_by_pb_button + 2 +05cf 6fe1478c fetch 2 ,mem_ui_state_map +05d0 c283024c bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once +05d1 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio +05d2 c17f8000 rtneq gpio_disable +05d3 6fe0c9bf fetch 1 ,mem_store_information_delay_timer +05d4 247a0000 nrtn blank +05d5 2020465c branch mouse_select_device_by_pb_button + 2 + +p_mouse_check_select_device_by_switch: +05d6 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05d7 c4150000 rtnbit0 mouse_enable_select_device_by_switch_gpio +05d8 6848c91e fetcht 1 ,mem_device_switch_gpio +05d9 20403f56 call mouse_gpio_config_input_pu +05da 6848c91e fetcht 1 ,mem_device_switch_gpio +05db 20406059 call gpio_get_bit +05dc 202085e1 branch p_mouse_check_select_24g_device ,true + +p_mouse_select_btdevice: +05dd 6fe0c938 fetch 1 ,mem_device_flag +05de c1008000 rtneq mode_bt_device1 +05df 70493801 jam mode_bt_device1 ,mem_device_flag +05e0 202046c0 branch mouse_soft_reset + +p_mouse_check_select_24g_device: +05e1 6fe0c938 fetch 1 ,mem_device_flag +05e2 c1000000 rtneq mode_24g_device +05e3 70493800 jam mode_24g_device ,mem_device_flag +05e4 202046c0 branch mouse_soft_reset p_mouse_dpi_check: -05d5 6fe0c90f fetch 1 ,mem_dpi_button_gpio -05d6 c17f8000 rtneq gpio_disable -05d7 da200000 arg 0 ,rega -05d8 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -05d9 6848c90f fetcht 1 ,mem_dpi_button_gpio -05da 204005dc call p_mouse_dpi_key_check -05db 2020402f branch mouse_dpi_check_next +05e5 6fe0c90f fetch 1 ,mem_dpi_button_gpio +05e6 c17f8000 rtneq gpio_disable +05e7 da200000 arg 0 ,rega +05e8 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +05e9 6848c90f fetcht 1 ,mem_dpi_button_gpio +05ea 204005ec call p_mouse_dpi_key_check +05eb 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -05dc 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05dd c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -05de 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -05df 1fe22600 copy pdata ,regc -05e0 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05e1 c07f85e3 beq gpio_disable ,p_mouse_3io6key_dpi_check -05e2 2020403f branch mouse_dpi_key_check_next +05ec 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05ed c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +05ee 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +05ef 1fe22600 copy pdata ,regc +05f0 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05f1 c07f85f3 beq gpio_disable ,p_mouse_3io6key_dpi_check +05f2 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -05e3 6fe0c90f fetch 1 ,mem_dpi_button_gpio -05e4 204005ae call p_mouse_gpio_config_output_low -05e5 6848c90f fetcht 1 ,mem_dpi_button_gpio -05e6 20204195 branch mouse_3io6key_check +05f3 6fe0c90f fetch 1 ,mem_dpi_button_gpio +05f4 204005ae call p_mouse_gpio_config_output_low +05f5 6848c90f fetcht 1 ,mem_dpi_button_gpio +05f6 20204195 branch mouse_3io6key_check p_mouse_dpi_process: -05e7 20404072 call mouse_dpi_ghost_check -05e8 20740000 rtn user +05f7 20404072 call mouse_dpi_ghost_check +05f8 20740000 rtn user p_mouse_dpi_process_next: -05e9 6fe0c992 fetch 1 ,mem_mouse_dpi -05ea 1fe0fe01 increase 1 ,pdata -05eb 1fe17e03 and pdata ,0x03 ,pdata +05f9 6fe0c992 fetch 1 ,mem_mouse_dpi +05fa 1fe0fe01 increase 1 ,pdata +05fb 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -05ec 67e0c992 store 1 ,mem_mouse_dpi -05ed 20400381 call p_mouse_seting_dpi -05ee 20204643 branch mouse_store_eerpom_dpi +05fc 67e0c992 store 1 ,mem_mouse_dpi +05fd 20400381 call p_mouse_seting_dpi +05fe 20204643 branch mouse_store_eerpom_dpi p_power_ctrl_start: -05ef 6fe1478c fetch 2 ,mem_ui_state_map -05f0 c3858000 rtnbit1 ui_state_ble_adv -05f1 c3838000 rtnbit1 ui_state_bt_reconnect -05f2 c3830000 rtnbit1 ui_state_bt_discovery -05f3 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -05f4 204025cb call rssi_average -05f5 6048c8c7 storet 1 ,mem_rssi_avg_received -05f6 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g -05f7 c51305f9 bmark1 mark_24g ,p_power_ctrl_start_next -05f8 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble +05ff 6fe1478c fetch 2 ,mem_ui_state_map +0600 c3858000 rtnbit1 ui_state_ble_adv +0601 c3838000 rtnbit1 ui_state_bt_reconnect +0602 c3830000 rtnbit1 ui_state_bt_discovery +0603 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +0604 204025cb call rssi_average +0605 6048c8c7 storet 1 ,mem_rssi_avg_received +0606 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g +0607 c5130609 bmark1 mark_24g ,p_power_ctrl_start_next +0608 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble p_power_ctrl_start_next: -05f9 98467c00 isub temp ,null -05fa 24210613 nbranch p_power_ctrl_txpower_incrs_force ,positive -05fb 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05fc 1fe67c02 sub pdata ,2 ,null -05fd 24210601 nbranch p_power_ctrl_txpower_decrs_check ,positive -05fe 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05ff c0000614 beq 0 ,p_power_ctrl_txpower_incrs -0600 20600000 rtn +0609 98467c00 isub temp ,null +060a 24210623 nbranch p_power_ctrl_txpower_incrs_force ,positive +060b 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +060c 1fe67c02 sub pdata ,2 ,null +060d 24210611 nbranch p_power_ctrl_txpower_decrs_check ,positive +060e 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +060f c0000624 beq 0 ,p_power_ctrl_txpower_incrs +0610 20600000 rtn p_power_ctrl_txpower_decrs_check: -0601 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -0602 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init -0603 98467c00 isub temp ,null -0604 24628000 nrtn zero -0605 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +0611 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0612 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init +0613 98467c00 isub temp ,null +0614 24628000 nrtn zero +0615 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_decrs: -0606 6848c8c7 fetcht 1 ,mem_rssi_avg_received -0607 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g -0608 c513060a bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next -0609 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble +0616 6848c8c7 fetcht 1 ,mem_rssi_avg_received +0617 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g +0618 c513061a bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next +0619 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble p_power_ctrl_txpower_decrs_next: -060a 98467c00 isub temp ,null -060b 24610000 nrtn positive -060c 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -060d c000271b beq 0 ,power_ctrl_decrs_level0 -060e 1fe0ffff increase -1 ,pdata -060f 67e0c8c8 store 1 ,mem_power_ctrl_level -0610 c001061b beq 2 ,p_power_ctrl_decrs_level2 -0611 c000a711 beq 1 ,power_ctrl_decrs_level1 -0612 2020271b branch power_ctrl_decrs_level0 +061a 98467c00 isub temp ,null +061b 24610000 nrtn positive +061c 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +061d c000271b beq 0 ,power_ctrl_decrs_level0 +061e 1fe0ffff increase -1 ,pdata +061f 67e0c8c8 store 1 ,mem_power_ctrl_level +0620 c001062b beq 2 ,p_power_ctrl_decrs_level2 +0621 c000a711 beq 1 ,power_ctrl_decrs_level1 +0622 2020271b branch power_ctrl_decrs_level0 p_power_ctrl_txpower_incrs_force: -0613 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +0623 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_incrs: -0614 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -0615 c001861a beq 3 ,p_power_ctrl_incrs_level3 -0616 1fe0fe01 increase 1 ,pdata -0617 67e0c8c8 store 1 ,mem_power_ctrl_level -0618 c000a711 beq 1 ,power_ctrl_incrs_level1 -0619 c001061b beq 2 ,p_power_ctrl_incrs_level2 +0624 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +0625 c001862a beq 3 ,p_power_ctrl_incrs_level3 +0626 1fe0fe01 increase 1 ,pdata +0627 67e0c8c8 store 1 ,mem_power_ctrl_level +0628 c000a711 beq 1 ,power_ctrl_incrs_level1 +0629 c001062b beq 2 ,p_power_ctrl_incrs_level2 p_power_ctrl_incrs_level3: -061a 2020061b branch p_power_ctrl_incrs_level2 +062a 2020062b branch p_power_ctrl_incrs_level2 p_power_ctrl_decrs_level2: p_power_ctrl_incrs_level2: -061b 7041e803 jam tx_power_3db ,mem_tx_power -061c 20600000 rtn +062b 7041e803 jam tx_power_3db ,mem_tx_power +062c 20600000 rtn org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/program/patch.prog (revision 4748) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/program/patch.prog (working copy) @@ -2432,7 +2432,8 @@ call p_mouse_dpi_another_gpio_check endif call p_mouse_select_device_check - branch mouse_idle+5 + call p_mouse_check_select_device_by_switch + branch mouse_idle+6 p_mouse_low_voltage_led_no_enter_lpm: fetch 1,mem_mouse_led_new_interface_config @@ -2453,6 +2454,26 @@ fetch 1,mem_store_information_delay_timer nrtn blank branch mouse_select_device_by_pb_button+2 + +p_mouse_check_select_device_by_switch: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + rtnbit0 MOUSE_ENABLE_SELECT_DEVICE_BY_SWITCH_GPIO + fetcht 1,mem_device_switch_gpio + call mouse_gpio_config_input_pu + fetcht 1,mem_device_switch_gpio + call gpio_get_bit + branch p_mouse_check_select_24g_device,true +p_mouse_select_btdevice: + fetch 1,mem_device_flag + rtneq MODE_BT_DEVICE1 + jam MODE_BT_DEVICE1,mem_device_flag + branch mouse_soft_reset + +p_mouse_check_select_24g_device: + fetch 1,mem_device_flag + rtneq MODE_24G_DEVICE + jam MODE_24G_DEVICE,mem_device_flag + branch mouse_soft_reset p_mouse_dpi_check: fetch 1,mem_dpi_button_gpio Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/sched/mouse.dat (revision 4748) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_3mode_2ch_TX06/sched/mouse.dat (working copy) @@ -135,7 +135,7 @@ mem_config_select_device_button_gpio:ff mem_whee_ta_data_gpio:ff mem_whee_tb_data_gpio:ff -mem_device_switch_gpio:ff +mem_device_switch_gpio:0a mem_mouse_sensor_sclk_gpio:07 mem_mouse_sensor_sdio_gpio:06 mem_config_low_voltage_alarm_gpio:ff @@ -310,7 +310,7 @@ 'BT5.2 Mouse mem_le_name_patch_len: #max 18bytes -'BT5.0 Mouse +'BT5.2 Mouse mem_mouse_le_name_modify_enable:00 #00 disable 01 enable mem_le_name_patch_len_another: #max 18bytes