Index: format/rom.format =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/format/rom.format (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/format/rom.format (working copy) @@ -2942,15 +2942,20 @@ 1 MULTI_LED_BLINK ) +//new led function enable ( 0x00 MOUSE_ENABLE_1IO2LED 0x01 MOUSE_ENABLE_BT_RECONN_LED_EFFECT 0x02 MOUSE_ENABLE_LED_BLINK_LIMIT 0x03 MOUSE_ENABLE_LOW_LED 0x04 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT -0x05 MOUSE_ENABLE_LOW_FOR_LED -0x06 MOUSE_ENABLE_DPI_FOR_LED -0x07 MOUSE_ENABLE_DPI_LOW_FOR_LED +) + +//led multi type +( +1 MOUSE_ENABLE_LOW_FOR_LED +2 MOUSE_ENABLE_DPI_FOR_LED +3 MOUSE_ENABLE_DPI_LOW_FOR_LED ) ( @@ -9704,6 +9709,7 @@ 1 mem_mouse_multi_led_type 1 mem_mouse_multi_led_state 1 mem_mouse_multi_led_blink_type //00:rtn 01:24g blink 02:le blink 03:reconn blink 04:low blink 05:dpi blink +1 mem_mouse_led_multi_type //00:no multi 01:low+led 02:dpi+led 03:low+dpi_led //time parm 1 mem_mouse_multi_led_powon_timer_init //power on time 1 mem_mouse_multi_led_powon_timer Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/eeprom.dat (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/eeprom.dat (working copy) @@ -898,7 +898,7 @@ f4 70 4c -4e +4f 0c 6f e0 @@ -979,7 +979,7 @@ 6f e0 cc -46 +47 24 7a 00 @@ -1003,7 +1003,7 @@ 6f e0 cc -53 +54 20 3a 01 @@ -1011,7 +1011,7 @@ 68 48 cc -4e +4f 18 40 84 @@ -1019,11 +1019,11 @@ 60 48 cc -4e +4f 6f e0 cc -4c +4d 98 46 7c @@ -1035,7 +1035,7 @@ 6f e0 cc -4d +4e 98 46 7c @@ -1047,26 +1047,26 @@ 6f e0 cc -40 -c2 -82 +45 +c0 +00 84 1a -c2 -83 +c0 +01 84 1a 68 48 cc -57 +58 20 20 04 26 70 4c -4e +4f 01 20 40 @@ -1075,19 +1075,19 @@ 6f e0 cc -40 -c2 -82 +45 +c0 +00 84 2c -c2 -83 +c0 +01 84 2c 68 48 cc -57 +58 20 20 04 @@ -1095,7 +1095,7 @@ 6f e0 cc -53 +54 1f e0 ff @@ -1103,7 +1103,7 @@ 67 e0 cc -53 +54 20 60 00 @@ -1234,11 +1234,11 @@ 00 70 4c -a6 +a7 00 70 4c -95 +96 00 20 40 @@ -1655,7 +1655,7 @@ 67 e0 cc -8f +90 20 60 00 @@ -1663,7 +1663,7 @@ 6f e0 cc -8f +90 67 e0 c1 @@ -2742,7 +2742,7 @@ 27 70 4c -95 +96 01 20 40 @@ -2758,7 +2758,7 @@ 44 70 4c -95 +96 01 20 40 @@ -2779,11 +2779,11 @@ 67 e0 cc -79 +7a 67 e0 cc -7a +7b 67 e0 ca @@ -2823,18 +2823,18 @@ 6f e0 cc -79 +7a 24 7a 00 00 70 4c -79 +7a 01 70 4c -7a +7b 1e 20 60 @@ -2850,7 +2850,7 @@ 9e 70 4c -95 +96 01 20 40 @@ -2878,7 +2878,7 @@ 59 70 4c -95 +96 01 6f e2 @@ -3375,7 +3375,7 @@ 6f e0 cc -90 +91 1f e2 22 @@ -3387,7 +3387,7 @@ 6f e0 cc -92 +93 1f e2 22 @@ -3399,7 +3399,7 @@ 6f e0 cc -93 +94 1f e2 22 @@ -3587,7 +3587,7 @@ 6f e0 cc -46 +47 24 7a 00 @@ -3719,7 +3719,7 @@ 6f e0 cc -97 +98 c1 7f 80 @@ -3727,7 +3727,7 @@ 6f e0 cc -95 +96 20 7a 00 @@ -3743,7 +3743,7 @@ 68 48 cc -97 +98 98 46 7c @@ -3754,7 +3754,7 @@ ab 70 4c -96 +97 1e 20 60 @@ -3763,7 +3763,7 @@ da 60 4c -96 +97 da 40 06 @@ -3795,7 +3795,7 @@ 6f e0 cc -4c +4d 1f e3 7e @@ -3803,7 +3803,7 @@ 67 e0 cc -4d +4e 20 60 00 @@ -3811,11 +3811,11 @@ 6f e0 cc -52 +53 67 e0 cc -53 +54 20 60 00 @@ -3839,11 +3839,11 @@ 6f e0 cc -4a +4b 67 e0 cc -4b +4c 20 60 00 @@ -3851,7 +3851,7 @@ 6f e0 cc -47 +48 20 20 03 @@ -3859,7 +3859,7 @@ 6f e0 cc -48 +49 20 20 03 @@ -3867,7 +3867,7 @@ 6f e0 cc -49 +4a 20 20 03 @@ -3883,11 +3883,11 @@ 6f e0 cc -45 +46 67 e0 cc -46 +47 70 4c 42 @@ -3943,7 +3943,7 @@ 6f e0 cc -4f +50 20 20 03 @@ -3995,11 +3995,11 @@ 6f e0 cc -50 +51 67 e0 cc -51 +52 20 60 00 @@ -4063,7 +4063,7 @@ 6f e0 cc -46 +47 20 3a 03 @@ -4075,14 +4075,14 @@ 67 e0 cc -46 +47 20 20 04 1a 70 4c -a6 +a7 01 20 40 @@ -4127,7 +4127,7 @@ 6f e0 cc -51 +52 20 3a 04 @@ -4135,7 +4135,7 @@ da 60 4c -4b +4c da 40 04 @@ -4179,7 +4179,7 @@ 6f e0 cc -51 +52 1f e0 ff @@ -4187,7 +4187,7 @@ 67 e0 cc -51 +52 20 20 04 @@ -4227,7 +4227,7 @@ 68 48 cc -54 +55 20 20 04 @@ -4235,7 +4235,7 @@ 68 48 cc -55 +56 20 20 04 @@ -4243,7 +4243,7 @@ 68 48 cc -56 +57 20 20 04 @@ -4251,7 +4251,7 @@ 68 48 cc -58 +59 20 20 60 @@ -4299,7 +4299,7 @@ 68 48 cc -54 +55 20 20 04 @@ -4307,7 +4307,7 @@ 68 48 cc -55 +56 20 20 04 @@ -4315,7 +4315,7 @@ 68 48 cc -56 +57 18 46 7c @@ -4355,19 +4355,19 @@ 6f e0 cc -40 -c2 -83 +45 +c0 +01 04 2b -c2 -83 +c0 +01 84 2b 68 48 cc -58 +59 20 20 60 @@ -4379,13 +4379,13 @@ 6f e0 cc -40 -c2 -83 +45 +c0 +01 04 19 -c2 -83 +c0 +01 84 19 20 @@ -4595,7 +4595,7 @@ 67 e0 cc -51 +52 70 4c 44 @@ -4739,7 +4739,7 @@ da 60 4c -7a +7b da 40 43 @@ -6315,7 +6315,7 @@ 6f e0 cc -a6 +a7 20 7a 00 @@ -6544,8 +6544,8 @@ 20 26 f6 -e1 -20 +09 +53 aa 55 40 @@ -6771,7 +6771,7 @@ 55 01 00 -a4 +a5 4c ff aa @@ -6794,16 +6794,17 @@ 02 aa 55 -01 +02 00 45 4c +00 14 aa 55 03 00 -47 +48 4c 05 02 @@ -6812,21 +6813,21 @@ 55 01 00 -4c +4d 4c 14 aa 55 01 00 -4a +4b 4c 02 aa 55 02 00 -4f +50 4c 02 06 @@ -6834,14 +6835,14 @@ 55 01 00 -52 +53 4c 0a aa 55 05 00 -54 +55 4c ff ff @@ -6987,7 +6988,7 @@ 55 01 00 -97 +98 4c ff aa @@ -7445,7 +7446,7 @@ 55 05 00 -90 +91 4c 8a 8b @@ -7883,17 +7884,16 @@ 02 40 00 -d8 +d9 1e 55 aa aa 55 -75 +80 98 -d6 -95 -ff +81 +9b ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -8a -37 +25 +e0 Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/flash.dat (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/flash.dat (working copy) @@ -898,7 +898,7 @@ f4 70 4c -4e +4f 0c 6f e0 @@ -979,7 +979,7 @@ 6f e0 cc -46 +47 24 7a 00 @@ -1003,7 +1003,7 @@ 6f e0 cc -53 +54 20 3a 01 @@ -1011,7 +1011,7 @@ 68 48 cc -4e +4f 18 40 84 @@ -1019,11 +1019,11 @@ 60 48 cc -4e +4f 6f e0 cc -4c +4d 98 46 7c @@ -1035,7 +1035,7 @@ 6f e0 cc -4d +4e 98 46 7c @@ -1047,26 +1047,26 @@ 6f e0 cc -40 -c2 -82 +45 +c0 +00 84 1a -c2 -83 +c0 +01 84 1a 68 48 cc -57 +58 20 20 04 26 70 4c -4e +4f 01 20 40 @@ -1075,19 +1075,19 @@ 6f e0 cc -40 -c2 -82 +45 +c0 +00 84 2c -c2 -83 +c0 +01 84 2c 68 48 cc -57 +58 20 20 04 @@ -1095,7 +1095,7 @@ 6f e0 cc -53 +54 1f e0 ff @@ -1103,7 +1103,7 @@ 67 e0 cc -53 +54 20 60 00 @@ -1234,11 +1234,11 @@ 00 70 4c -a6 +a7 00 70 4c -95 +96 00 20 40 @@ -1655,7 +1655,7 @@ 67 e0 cc -8f +90 20 60 00 @@ -1663,7 +1663,7 @@ 6f e0 cc -8f +90 67 e0 c1 @@ -2742,7 +2742,7 @@ 27 70 4c -95 +96 01 20 40 @@ -2758,7 +2758,7 @@ 44 70 4c -95 +96 01 20 40 @@ -2779,11 +2779,11 @@ 67 e0 cc -79 +7a 67 e0 cc -7a +7b 67 e0 ca @@ -2823,18 +2823,18 @@ 6f e0 cc -79 +7a 24 7a 00 00 70 4c -79 +7a 01 70 4c -7a +7b 1e 20 60 @@ -2850,7 +2850,7 @@ 9e 70 4c -95 +96 01 20 40 @@ -2878,7 +2878,7 @@ 59 70 4c -95 +96 01 6f e2 @@ -3375,7 +3375,7 @@ 6f e0 cc -90 +91 1f e2 22 @@ -3387,7 +3387,7 @@ 6f e0 cc -92 +93 1f e2 22 @@ -3399,7 +3399,7 @@ 6f e0 cc -93 +94 1f e2 22 @@ -3587,7 +3587,7 @@ 6f e0 cc -46 +47 24 7a 00 @@ -3719,7 +3719,7 @@ 6f e0 cc -97 +98 c1 7f 80 @@ -3727,7 +3727,7 @@ 6f e0 cc -95 +96 20 7a 00 @@ -3743,7 +3743,7 @@ 68 48 cc -97 +98 98 46 7c @@ -3754,7 +3754,7 @@ ab 70 4c -96 +97 1e 20 60 @@ -3763,7 +3763,7 @@ da 60 4c -96 +97 da 40 06 @@ -3795,7 +3795,7 @@ 6f e0 cc -4c +4d 1f e3 7e @@ -3803,7 +3803,7 @@ 67 e0 cc -4d +4e 20 60 00 @@ -3811,11 +3811,11 @@ 6f e0 cc -52 +53 67 e0 cc -53 +54 20 60 00 @@ -3839,11 +3839,11 @@ 6f e0 cc -4a +4b 67 e0 cc -4b +4c 20 60 00 @@ -3851,7 +3851,7 @@ 6f e0 cc -47 +48 20 20 03 @@ -3859,7 +3859,7 @@ 6f e0 cc -48 +49 20 20 03 @@ -3867,7 +3867,7 @@ 6f e0 cc -49 +4a 20 20 03 @@ -3883,11 +3883,11 @@ 6f e0 cc -45 +46 67 e0 cc -46 +47 70 4c 42 @@ -3943,7 +3943,7 @@ 6f e0 cc -4f +50 20 20 03 @@ -3995,11 +3995,11 @@ 6f e0 cc -50 +51 67 e0 cc -51 +52 20 60 00 @@ -4063,7 +4063,7 @@ 6f e0 cc -46 +47 20 3a 03 @@ -4075,14 +4075,14 @@ 67 e0 cc -46 +47 20 20 04 1a 70 4c -a6 +a7 01 20 40 @@ -4127,7 +4127,7 @@ 6f e0 cc -51 +52 20 3a 04 @@ -4135,7 +4135,7 @@ da 60 4c -4b +4c da 40 04 @@ -4179,7 +4179,7 @@ 6f e0 cc -51 +52 1f e0 ff @@ -4187,7 +4187,7 @@ 67 e0 cc -51 +52 20 20 04 @@ -4227,7 +4227,7 @@ 68 48 cc -54 +55 20 20 04 @@ -4235,7 +4235,7 @@ 68 48 cc -55 +56 20 20 04 @@ -4243,7 +4243,7 @@ 68 48 cc -56 +57 20 20 04 @@ -4251,7 +4251,7 @@ 68 48 cc -58 +59 20 20 60 @@ -4299,7 +4299,7 @@ 68 48 cc -54 +55 20 20 04 @@ -4307,7 +4307,7 @@ 68 48 cc -55 +56 20 20 04 @@ -4315,7 +4315,7 @@ 68 48 cc -56 +57 18 46 7c @@ -4355,19 +4355,19 @@ 6f e0 cc -40 -c2 -83 +45 +c0 +01 04 2b -c2 -83 +c0 +01 84 2b 68 48 cc -58 +59 20 20 60 @@ -4379,13 +4379,13 @@ 6f e0 cc -40 -c2 -83 +45 +c0 +01 04 19 -c2 -83 +c0 +01 84 19 20 @@ -4595,7 +4595,7 @@ 67 e0 cc -51 +52 70 4c 44 @@ -4739,7 +4739,7 @@ da 60 4c -7a +7b da 40 43 @@ -6315,7 +6315,7 @@ 6f e0 cc -a6 +a7 20 7a 00 @@ -6544,8 +6544,8 @@ 20 26 f6 -e1 -20 +09 +53 aa 55 40 @@ -6771,7 +6771,7 @@ 55 01 00 -a4 +a5 4c ff aa @@ -6794,16 +6794,17 @@ 02 aa 55 -01 +02 00 45 4c +00 14 aa 55 03 00 -47 +48 4c 05 02 @@ -6812,21 +6813,21 @@ 55 01 00 -4c +4d 4c 14 aa 55 01 00 -4a +4b 4c 02 aa 55 02 00 -4f +50 4c 02 06 @@ -6834,14 +6835,14 @@ 55 01 00 -52 +53 4c 0a aa 55 05 00 -54 +55 4c ff ff @@ -6987,7 +6988,7 @@ 55 01 00 -97 +98 4c ff aa @@ -7445,7 +7446,7 @@ 55 05 00 -90 +91 4c 8a 8b @@ -7883,17 +7884,16 @@ 02 40 00 -d8 +d9 1e 55 aa aa 55 -75 +80 98 -d6 -95 -ff +81 +9b ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -8a -37 +25 +e0 Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/memmap.format (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/memmap.format (working copy) @@ -2238,63 +2238,64 @@ 0x4c42 mem_mouse_multi_led_type 0x4c43 mem_mouse_multi_led_state 0x4c44 mem_mouse_multi_led_blink_type//00:rtn 01:24g blink 02:le blink 03:reconn blink 04:low blink 05:dpi blink -0x4c45 mem_mouse_multi_led_powon_timer_init//power on time -0x4c46 mem_mouse_multi_led_powon_timer -0x4c47 mem_mouse_multi_24gled_blink_timer_init//24gled blink time -0x4c48 mem_mouse_multi_le_discovery_blink_timer_init//le discovery blink time -0x4c49 mem_mouse_multi_le_reconn_blink_timer_init//le reconn blink time -0x4c4a mem_mouse_dpi_led_blink_timer_init//dpi blink time -0x4c4b mem_mouse_multi_led_blink_timer -0x4c4c mem_mouse_low_led_blink_timer//low blink time -0x4c4d mem_mouse_low_led_blink_half_timer -0x4c4e mem_adc_low_volatage_led_timer_count_new -0x4c4f mem_mouse_multi_24gled_blink_count_init//24g count -0x4c50 mem_mouse_multi_le_reconn_blink_count_init//le reconn count -0x4c51 mem_mouse_multi_led_blink_count -0x4c52 mem_mouse_multi_lowled_blink_count_init//low count -0x4c53 mem_mouse_multi_low_led_blink_count -0x4c54 mem_mouse_1io2led_multi_24gled -0x4c55 mem_mouse_1io2led_multi_bt1led -0x4c56 mem_mouse_1io2led_multi_bt2led -0x4c57 mem_mouse_low_gpio -0x4c58 mem_mouse_dpi_gpio -0x4c59 mem_mouse_rssi_signal_buf_patch -0x4c69 mem_mouse_rssi_signal_buf_temp -0x4c79 mem_mouse_le_send_conn_param_update -0x4c7a mem_mouse_le_send_conn_param_update_timer -0x4c7b mem_device_uart_tx_gpio -0x4c7c mem_device_uart_rx_gpio -0x4c7d mem_device_uart_rx_buffer -0x4c7f mem_device_uart_rx_buffer_end -0x4c81 mem_device_uart_tx_buffer -0x4c83 mem_device_uart_tx_buffer_end -0x4c85 mem_device_uart_baud_rate -0x4c87 mem_24g_paccnt -0x4c88 mem_rssi_mouse -0x4c89 mem_clkn_bt_patch -0x4c8d mem_txpower_print -0x4c8f mem_normal_tx_power -0x4c90 mem_sensor_s201_dpi -0x4c90 mem_sensor_s201_dpi_0 -0x4c91 mem_sensor_s201_dpi_1 -0x4c92 mem_sensor_s201_dpi_2 -0x4c93 mem_sensor_s201_dpi_3 -0x4c94 mem_sensor_s201_dpi_4 -0x4c95 mem_mouse_commbination_dpi_check_enable -0x4c96 mem_commbination_dpi_timer -0x4c97 mem_mouse_commbination_key_dpi -0x4c98 mem_rgb_led_off_enable -0x4c99 mem_rgb_led_on_enable -0x4c9a mem_rgb_led_off_enable_timer -0x4c9b mem_rgb_led_on_enable_timer -0x4c9c mem_rgb_led_on_timer -0x4c9e mem_rgb_led_off_check_count -0x4ca0 mem_rgb_led_on_check_count -0x4ca2 mem_rgb_led_on_continue_1min_timeout_flag -0x4ca3 mem_mbutton_function_disable -0x4ca4 mem_mouse_rgb_ctrl_gpio -0x4ca5 mem_mouse_rgb_adc_no_power_flag -0x4ca6 mem_mouse_dpi_led_blink_enable +0x4c45 mem_mouse_led_multi_type//00:no multi 01:low+led 02:dpi+led 03:low+dpi_led +0x4c46 mem_mouse_multi_led_powon_timer_init//power on time +0x4c47 mem_mouse_multi_led_powon_timer +0x4c48 mem_mouse_multi_24gled_blink_timer_init//24gled blink time +0x4c49 mem_mouse_multi_le_discovery_blink_timer_init//le discovery blink time +0x4c4a mem_mouse_multi_le_reconn_blink_timer_init//le reconn blink time +0x4c4b mem_mouse_dpi_led_blink_timer_init//dpi blink time +0x4c4c mem_mouse_multi_led_blink_timer +0x4c4d mem_mouse_low_led_blink_timer//low blink time +0x4c4e mem_mouse_low_led_blink_half_timer +0x4c4f mem_adc_low_volatage_led_timer_count_new +0x4c50 mem_mouse_multi_24gled_blink_count_init//24g count +0x4c51 mem_mouse_multi_le_reconn_blink_count_init//le reconn count +0x4c52 mem_mouse_multi_led_blink_count +0x4c53 mem_mouse_multi_lowled_blink_count_init//low count +0x4c54 mem_mouse_multi_low_led_blink_count +0x4c55 mem_mouse_1io2led_multi_24gled +0x4c56 mem_mouse_1io2led_multi_bt1led +0x4c57 mem_mouse_1io2led_multi_bt2led +0x4c58 mem_mouse_low_gpio +0x4c59 mem_mouse_dpi_gpio +0x4c5a mem_mouse_rssi_signal_buf_patch +0x4c6a mem_mouse_rssi_signal_buf_temp +0x4c7a mem_mouse_le_send_conn_param_update +0x4c7b mem_mouse_le_send_conn_param_update_timer +0x4c7c mem_device_uart_tx_gpio +0x4c7d mem_device_uart_rx_gpio +0x4c7e mem_device_uart_rx_buffer +0x4c80 mem_device_uart_rx_buffer_end +0x4c82 mem_device_uart_tx_buffer +0x4c84 mem_device_uart_tx_buffer_end +0x4c86 mem_device_uart_baud_rate +0x4c88 mem_24g_paccnt +0x4c89 mem_rssi_mouse +0x4c8a mem_clkn_bt_patch +0x4c8e mem_txpower_print +0x4c90 mem_normal_tx_power +0x4c91 mem_sensor_s201_dpi +0x4c91 mem_sensor_s201_dpi_0 +0x4c92 mem_sensor_s201_dpi_1 +0x4c93 mem_sensor_s201_dpi_2 +0x4c94 mem_sensor_s201_dpi_3 +0x4c95 mem_sensor_s201_dpi_4 +0x4c96 mem_mouse_commbination_dpi_check_enable +0x4c97 mem_commbination_dpi_timer +0x4c98 mem_mouse_commbination_key_dpi +0x4c99 mem_rgb_led_off_enable +0x4c9a mem_rgb_led_on_enable +0x4c9b mem_rgb_led_off_enable_timer +0x4c9c mem_rgb_led_on_enable_timer +0x4c9d mem_rgb_led_on_timer +0x4c9f mem_rgb_led_off_check_count +0x4ca1 mem_rgb_led_on_check_count +0x4ca3 mem_rgb_led_on_continue_1min_timeout_flag +0x4ca4 mem_mbutton_function_disable +0x4ca5 mem_mouse_rgb_ctrl_gpio +0x4ca6 mem_mouse_rgb_adc_no_power_flag +0x4ca7 mem_mouse_dpi_led_blink_enable 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: output/otp.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/otp.dat (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/otp.dat (working copy) @@ -898,7 +898,7 @@ f4 70 4c -4e +4f 0c 6f e0 @@ -979,7 +979,7 @@ 6f e0 cc -46 +47 24 7a 00 @@ -1003,7 +1003,7 @@ 6f e0 cc -53 +54 20 3a 01 @@ -1011,7 +1011,7 @@ 68 48 cc -4e +4f 18 40 84 @@ -1019,11 +1019,11 @@ 60 48 cc -4e +4f 6f e0 cc -4c +4d 98 46 7c @@ -1035,7 +1035,7 @@ 6f e0 cc -4d +4e 98 46 7c @@ -1047,26 +1047,26 @@ 6f e0 cc -40 -c2 -82 +45 +c0 +00 84 1a -c2 -83 +c0 +01 84 1a 68 48 cc -57 +58 20 20 04 26 70 4c -4e +4f 01 20 40 @@ -1075,19 +1075,19 @@ 6f e0 cc -40 -c2 -82 +45 +c0 +00 84 2c -c2 -83 +c0 +01 84 2c 68 48 cc -57 +58 20 20 04 @@ -1095,7 +1095,7 @@ 6f e0 cc -53 +54 1f e0 ff @@ -1103,7 +1103,7 @@ 67 e0 cc -53 +54 20 60 00 @@ -1234,11 +1234,11 @@ 00 70 4c -a6 +a7 00 70 4c -95 +96 00 20 40 @@ -1655,7 +1655,7 @@ 67 e0 cc -8f +90 20 60 00 @@ -1663,7 +1663,7 @@ 6f e0 cc -8f +90 67 e0 c1 @@ -2742,7 +2742,7 @@ 27 70 4c -95 +96 01 20 40 @@ -2758,7 +2758,7 @@ 44 70 4c -95 +96 01 20 40 @@ -2779,11 +2779,11 @@ 67 e0 cc -79 +7a 67 e0 cc -7a +7b 67 e0 ca @@ -2823,18 +2823,18 @@ 6f e0 cc -79 +7a 24 7a 00 00 70 4c -79 +7a 01 70 4c -7a +7b 1e 20 60 @@ -2850,7 +2850,7 @@ 9e 70 4c -95 +96 01 20 40 @@ -2878,7 +2878,7 @@ 59 70 4c -95 +96 01 6f e2 @@ -3375,7 +3375,7 @@ 6f e0 cc -90 +91 1f e2 22 @@ -3387,7 +3387,7 @@ 6f e0 cc -92 +93 1f e2 22 @@ -3399,7 +3399,7 @@ 6f e0 cc -93 +94 1f e2 22 @@ -3587,7 +3587,7 @@ 6f e0 cc -46 +47 24 7a 00 @@ -3719,7 +3719,7 @@ 6f e0 cc -97 +98 c1 7f 80 @@ -3727,7 +3727,7 @@ 6f e0 cc -95 +96 20 7a 00 @@ -3743,7 +3743,7 @@ 68 48 cc -97 +98 98 46 7c @@ -3754,7 +3754,7 @@ ab 70 4c -96 +97 1e 20 60 @@ -3763,7 +3763,7 @@ da 60 4c -96 +97 da 40 06 @@ -3795,7 +3795,7 @@ 6f e0 cc -4c +4d 1f e3 7e @@ -3803,7 +3803,7 @@ 67 e0 cc -4d +4e 20 60 00 @@ -3811,11 +3811,11 @@ 6f e0 cc -52 +53 67 e0 cc -53 +54 20 60 00 @@ -3839,11 +3839,11 @@ 6f e0 cc -4a +4b 67 e0 cc -4b +4c 20 60 00 @@ -3851,7 +3851,7 @@ 6f e0 cc -47 +48 20 20 03 @@ -3859,7 +3859,7 @@ 6f e0 cc -48 +49 20 20 03 @@ -3867,7 +3867,7 @@ 6f e0 cc -49 +4a 20 20 03 @@ -3883,11 +3883,11 @@ 6f e0 cc -45 +46 67 e0 cc -46 +47 70 4c 42 @@ -3943,7 +3943,7 @@ 6f e0 cc -4f +50 20 20 03 @@ -3995,11 +3995,11 @@ 6f e0 cc -50 +51 67 e0 cc -51 +52 20 60 00 @@ -4063,7 +4063,7 @@ 6f e0 cc -46 +47 20 3a 03 @@ -4075,14 +4075,14 @@ 67 e0 cc -46 +47 20 20 04 1a 70 4c -a6 +a7 01 20 40 @@ -4127,7 +4127,7 @@ 6f e0 cc -51 +52 20 3a 04 @@ -4135,7 +4135,7 @@ da 60 4c -4b +4c da 40 04 @@ -4179,7 +4179,7 @@ 6f e0 cc -51 +52 1f e0 ff @@ -4187,7 +4187,7 @@ 67 e0 cc -51 +52 20 20 04 @@ -4227,7 +4227,7 @@ 68 48 cc -54 +55 20 20 04 @@ -4235,7 +4235,7 @@ 68 48 cc -55 +56 20 20 04 @@ -4243,7 +4243,7 @@ 68 48 cc -56 +57 20 20 04 @@ -4251,7 +4251,7 @@ 68 48 cc -58 +59 20 20 60 @@ -4299,7 +4299,7 @@ 68 48 cc -54 +55 20 20 04 @@ -4307,7 +4307,7 @@ 68 48 cc -55 +56 20 20 04 @@ -4315,7 +4315,7 @@ 68 48 cc -56 +57 18 46 7c @@ -4355,19 +4355,19 @@ 6f e0 cc -40 -c2 -83 +45 +c0 +01 04 2b -c2 -83 +c0 +01 84 2b 68 48 cc -58 +59 20 20 60 @@ -4379,13 +4379,13 @@ 6f e0 cc -40 -c2 -83 +45 +c0 +01 04 19 -c2 -83 +c0 +01 84 19 20 @@ -4595,7 +4595,7 @@ 67 e0 cc -51 +52 70 4c 44 @@ -4739,7 +4739,7 @@ da 60 4c -7a +7b da 40 43 @@ -6315,7 +6315,7 @@ 6f e0 cc -a6 +a7 20 7a 00 @@ -6544,8 +6544,8 @@ 20 26 f6 -e1 -20 +09 +53 aa 55 40 @@ -6771,7 +6771,7 @@ 55 01 00 -a4 +a5 4c ff aa @@ -6794,16 +6794,17 @@ 02 aa 55 -01 +02 00 45 4c +00 14 aa 55 03 00 -47 +48 4c 05 02 @@ -6812,21 +6813,21 @@ 55 01 00 -4c +4d 4c 14 aa 55 01 00 -4a +4b 4c 02 aa 55 02 00 -4f +50 4c 02 06 @@ -6834,14 +6835,14 @@ 55 01 00 -52 +53 4c 0a aa 55 05 00 -54 +55 4c ff ff @@ -6987,7 +6988,7 @@ 55 01 00 -97 +98 4c ff aa @@ -7445,7 +7446,7 @@ 55 05 00 -90 +91 4c 8a 8b @@ -7883,13 +7884,13 @@ 03 01 00 -d8 +d9 1e 55 aa aa 55 -37 +42 98 -78 -2d +34 +bb Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/program.lis (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/program.lis (working copy) @@ -287,7 +287,7 @@ 00dc c3003ed0 bbit0 mouse_enable_1io2led ,mouse_adc_no_low_voltage 00dd d8e00004 arg mouse_low_voltage_flag ,queue 00de 204046f4 call mouse_disable_function_flag -00df 704c4e0c jam 12 ,mem_adc_low_volatage_led_timer_count_new +00df 704c4f0c jam 12 ,mem_adc_low_volatage_led_timer_count_new 00e0 6fe0c8fa fetch 1 ,mem_mouse_adc_last_low_voltage_flag 00e1 207a0000 rtn blank 00e2 7048fa00 jam 0 ,mem_mouse_adc_last_low_voltage_flag @@ -313,52 +313,52 @@ 00f0 247a0000 nrtn blank 00f1 6fe14887 fetch 2 ,mem_24g_reconn_timeout 00f2 247a0000 nrtn blank -00f3 6fe0cc46 fetch 1 ,mem_mouse_multi_led_powon_timer +00f3 6fe0cc47 fetch 1 ,mem_mouse_multi_led_powon_timer 00f4 247a0000 nrtn blank 00f5 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 00f6 c4020000 rtnbit0 mouse_low_voltage_flag 00f7 204000e4 call p_mouse_check_dpi_blink 00f8 20740000 rtn user -00f9 6fe0cc53 fetch 1 ,mem_mouse_multi_low_led_blink_count +00f9 6fe0cc54 fetch 1 ,mem_mouse_multi_low_led_blink_count 00fa 203a0114 branch p_mouse_low_led_blink_count_init_judge ,blank p_mouse_low_led_blink_timer: -00fb 6848cc4e fetcht 1 ,mem_adc_low_volatage_led_timer_count_new +00fb 6848cc4f fetcht 1 ,mem_adc_low_volatage_led_timer_count_new 00fc 18408401 increase 1 ,temp -00fd 6048cc4e storet 1 ,mem_adc_low_volatage_led_timer_count_new -00fe 6fe0cc4c fetch 1 ,mem_mouse_low_led_blink_timer +00fd 6048cc4f storet 1 ,mem_adc_low_volatage_led_timer_count_new +00fe 6fe0cc4d fetch 1 ,mem_mouse_low_led_blink_timer 00ff 98467c00 isub temp ,null 0100 24410109 ncall p_mouse_low_led_timer_count_clean ,positive -0101 6fe0cc4d fetch 1 ,mem_mouse_low_led_blink_half_timer +0101 6fe0cc4e fetch 1 ,mem_mouse_low_led_blink_half_timer 0102 98467c00 isub temp ,null 0103 2421010b nbranch p_mouse_low_voltage_led_off_judge ,positive p_mouse_low_voltage_led_on_judge: -0104 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -0105 c282841a bbit1 mouse_enable_low_for_led ,p_mouse_device_multi_led_on + 1 -0106 c283841a bbit1 mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_on + 1 +0104 6fe0cc45 fetch 1 ,mem_mouse_led_multi_type +0105 c000841a beq mouse_enable_low_for_led ,p_mouse_device_multi_led_on + 1 +0106 c001841a beq mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_on + 1 p_mouse_low_voltage_led_on: -0107 6848cc57 fetcht 1 ,mem_mouse_low_gpio +0107 6848cc58 fetcht 1 ,mem_mouse_low_gpio 0108 20200426 branch p_mouse_multi_led_on p_mouse_low_led_timer_count_clean: -0109 704c4e01 jam 1 ,mem_adc_low_volatage_led_timer_count_new +0109 704c4f01 jam 1 ,mem_adc_low_volatage_led_timer_count_new 010a 20400110 call p_mouse_low_led_blink_decrease p_mouse_low_voltage_led_off_judge: -010b 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -010c c282842c bbit1 mouse_enable_low_for_led ,p_mouse_device_multi_led_off + 1 -010d c283842c bbit1 mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_off + 1 +010b 6fe0cc45 fetch 1 ,mem_mouse_led_multi_type +010c c000842c beq mouse_enable_low_for_led ,p_mouse_device_multi_led_off + 1 +010d c001842c beq mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_off + 1 p_mouse_low_voltage_led_off: -010e 6848cc57 fetcht 1 ,mem_mouse_low_gpio +010e 6848cc58 fetcht 1 ,mem_mouse_low_gpio 010f 20200443 branch p_mouse_multi_led_off p_mouse_low_led_blink_decrease: -0110 6fe0cc53 fetch 1 ,mem_mouse_multi_low_led_blink_count +0110 6fe0cc54 fetch 1 ,mem_mouse_multi_low_led_blink_count 0111 1fe0ffff increase -1 ,pdata -0112 67e0cc53 store 1 ,mem_mouse_multi_low_led_blink_count +0112 67e0cc54 store 1 ,mem_mouse_multi_low_led_blink_count 0113 20600000 rtn p_mouse_low_led_blink_count_init_judge: @@ -401,8 +401,8 @@ 0130 20400179 call p_mouse_setting_config 0131 204041a7 call mouse_init_sunt 0132 20758000 rtn wake -0133 704ca600 jam 0 ,mem_mouse_dpi_led_blink_enable -0134 704c9500 jam 0 ,mem_mouse_commbination_dpi_check_enable +0133 704ca700 jam 0 ,mem_mouse_dpi_led_blink_enable +0134 704c9600 jam 0 ,mem_mouse_commbination_dpi_check_enable 0135 20400343 call p_mouse_seting_sensor_type 0136 20403d8a call mouse_usb_check_enable 0137 20404728 call mouse_drawing_optima_init @@ -536,11 +536,11 @@ p_mouse_store_normal_tx_power: 019b 6fe0c1e8 fetch 1 ,mem_tx_power -019c 67e0cc8f store 1 ,mem_normal_tx_power +019c 67e0cc90 store 1 ,mem_normal_tx_power 019d 20600000 rtn p_mouse_fetch_normal_tx_power: -019e 6fe0cc8f fetch 1 ,mem_normal_tx_power +019e 6fe0cc90 fetch 1 ,mem_normal_tx_power 019f 67e0c1e8 store 1 ,mem_tx_power 01a0 20600000 rtn @@ -896,21 +896,21 @@ 02ab 20204427 branch mouse_bt_hid_handshake + 3 p_mouse_le_bb_event_connected: -02ac 704c9501 jam 1 ,mem_mouse_commbination_dpi_check_enable +02ac 704c9601 jam 1 ,mem_mouse_commbination_dpi_check_enable 02ad 204003c7 call p_mouse_device_poweron_led_config 02ae 20204350 branch mouse_le_bb_event_connected p_mouse_bb_event_connected: 02af 20404544 call mouse_no_data_timer_init -02b0 704c9501 jam 1 ,mem_mouse_commbination_dpi_check_enable +02b0 704c9601 jam 1 ,mem_mouse_commbination_dpi_check_enable 02b1 204003c7 call p_mouse_device_poweron_led_config 02b2 202043fa branch mouse_bb_event_connected p_mouse_le_bb_disconnected: 02b3 58000000 setarg 0 02b4 67e14af2 store 2 ,mem_le_battery_level_updata_timer -02b5 67e0cc79 store 1 ,mem_mouse_le_send_conn_param_update -02b6 67e0cc7a store 1 ,mem_mouse_le_send_conn_param_update_timer +02b5 67e0cc7a store 1 ,mem_mouse_le_send_conn_param_update +02b6 67e0cc7b store 1 ,mem_mouse_le_send_conn_param_update_timer 02b7 67e0cac6 store 1 ,mem_mouse_le_bb_connected_flag 02b8 20204366 branch mouse_le_bb_disconnected + 7 @@ -926,10 +926,10 @@ 02bf 20204373 branch mouse_le_ll_enable_start_enc_flag p_mouse_le_conn_param_update_rsp_recieved: -02c0 6fe0cc79 fetch 1 ,mem_mouse_le_send_conn_param_update +02c0 6fe0cc7a fetch 1 ,mem_mouse_le_send_conn_param_update 02c1 247a0000 nrtn blank -02c2 704c7901 jam 1 ,mem_mouse_le_send_conn_param_update -02c3 704c7a1e jam 30 ,mem_mouse_le_send_conn_param_update_timer +02c2 704c7a01 jam 1 ,mem_mouse_le_send_conn_param_update +02c3 704c7b1e jam 30 ,mem_mouse_le_send_conn_param_update_timer 02c4 20600000 rtn p_mouse_agc_disable_nomal_power: @@ -937,7 +937,7 @@ 02c6 2020019e branch p_mouse_fetch_normal_tx_power p_mouse_24g_pairing_complete: -02c7 704c9501 jam 1 ,mem_mouse_commbination_dpi_check_enable +02c7 704c9601 jam 1 ,mem_mouse_commbination_dpi_check_enable 02c8 204002c5 call p_mouse_agc_disable_nomal_power 02c9 20404544 call mouse_no_data_timer_init 02ca d8e00001 arg mouse_24g_pairing_flag ,queue @@ -946,7 +946,7 @@ 02cd 20204859 branch mouse_24g_pairing_complete + 2 p_mouse_24g_attempt_success: -02ce 704c9501 jam 1 ,mem_mouse_commbination_dpi_check_enable +02ce 704c9601 jam 1 ,mem_mouse_commbination_dpi_check_enable 02cf 6fe2483c fetch 4 ,mem_24g_addr 02d0 67e24891 store 4 ,mem_24g_receiver_addr 02d1 67e24993 store 4 ,mem_mouse_24g_addr @@ -1108,17 +1108,17 @@ 0349 c0010350 beq mouse_dpi_level3 ,p_mouse_set_s201_dpi_3 p_mouse_set_s201_dpi_0: -034a 6fe0cc90 fetch 1 ,mem_sensor_s201_dpi_0 +034a 6fe0cc91 fetch 1 ,mem_sensor_s201_dpi_0 034b 1fe22200 copy pdata ,rega 034c 20200352 branch p_mouse_dpi_s201_store p_mouse_set_s201_dpi_2: -034d 6fe0cc92 fetch 1 ,mem_sensor_s201_dpi_2 +034d 6fe0cc93 fetch 1 ,mem_sensor_s201_dpi_2 034e 1fe22200 copy pdata ,rega 034f 20200352 branch p_mouse_dpi_s201_store p_mouse_set_s201_dpi_3: -0350 6fe0cc93 fetch 1 ,mem_sensor_s201_dpi_3 +0350 6fe0cc94 fetch 1 ,mem_sensor_s201_dpi_3 0351 1fe22200 copy pdata ,rega p_mouse_dpi_s201_store: @@ -1187,7 +1187,7 @@ 037e 20600000 rtn p_mouse_dpi_led_blink_delay_new2: -037f 6fe0cc46 fetch 1 ,mem_mouse_multi_led_powon_timer +037f 6fe0cc47 fetch 1 ,mem_mouse_multi_led_powon_timer 0380 247a0000 nrtn blank 0381 2020037b branch p_mouse_dpi_led_blink_delay_next @@ -1226,20 +1226,20 @@ 039f 20204507 branch mouse_check_direct_timeout_timer + 3 p_mouse_commbination_dpi_check_timer: -03a0 6fe0cc97 fetch 1 ,mem_mouse_commbination_key_dpi +03a0 6fe0cc98 fetch 1 ,mem_mouse_commbination_key_dpi 03a1 c17f8000 rtneq gpio_disable -03a2 6fe0cc95 fetch 1 ,mem_mouse_commbination_dpi_check_enable +03a2 6fe0cc96 fetch 1 ,mem_mouse_commbination_dpi_check_enable 03a3 207a0000 rtn blank 03a4 2040054e call p_mouse_check_key_gpio 03a5 1fe17e07 and pdata ,0x07 ,pdata -03a6 6848cc97 fetcht 1 ,mem_mouse_commbination_key_dpi +03a6 6848cc98 fetcht 1 ,mem_mouse_commbination_key_dpi 03a7 98467c00 isub temp ,null 03a8 202283ab branch p_mouse_commbination_dpi_check ,zero -03a9 704c961e jam 0x1e ,mem_commbination_dpi_timer +03a9 704c971e jam 0x1e ,mem_commbination_dpi_timer 03aa 20600000 rtn p_mouse_commbination_dpi_check: -03ab da604c96 arg mem_commbination_dpi_timer ,regc +03ab da604c97 arg mem_commbination_dpi_timer ,regc 03ac da40062d arg p_mouse_dpi_process_next ,regb 03ad 2020318a branch timer_single_step @@ -1253,14 +1253,14 @@ 03b2 704c4400 jam 0 ,mem_mouse_multi_led_blink_type p_mouse_multi_low_led_blink_timer_init: -03b3 6fe0cc4c fetch 1 ,mem_mouse_low_led_blink_timer +03b3 6fe0cc4d fetch 1 ,mem_mouse_low_led_blink_timer 03b4 1fe37e00 rshift pdata ,pdata -03b5 67e0cc4d store 1 ,mem_mouse_low_led_blink_half_timer +03b5 67e0cc4e store 1 ,mem_mouse_low_led_blink_half_timer 03b6 20600000 rtn p_mouse_multi_low_led_blink_count_init: -03b7 6fe0cc52 fetch 1 ,mem_mouse_multi_lowled_blink_count_init -03b8 67e0cc53 store 1 ,mem_mouse_multi_low_led_blink_count +03b7 6fe0cc53 fetch 1 ,mem_mouse_multi_lowled_blink_count_init +03b8 67e0cc54 store 1 ,mem_mouse_multi_low_led_blink_count 03b9 20600000 rtn p_mouse_multi_led_blink_timer_init: @@ -1270,29 +1270,29 @@ 03bd c00183c5 beq 3 ,p_mouse_device_le_reconn_led_blink_timer_init p_mouse_multi_dpi_led_blink_timer_init: -03be 6fe0cc4a fetch 1 ,mem_mouse_dpi_led_blink_timer_init +03be 6fe0cc4b fetch 1 ,mem_mouse_dpi_led_blink_timer_init p_mouse_multi_led_blink_timer_init_next: -03bf 67e0cc4b store 1 ,mem_mouse_multi_led_blink_timer +03bf 67e0cc4c store 1 ,mem_mouse_multi_led_blink_timer 03c0 20600000 rtn p_mouse_device_24g_led_blink_timer_init: -03c1 6fe0cc47 fetch 1 ,mem_mouse_multi_24gled_blink_timer_init +03c1 6fe0cc48 fetch 1 ,mem_mouse_multi_24gled_blink_timer_init 03c2 202003bf branch p_mouse_multi_led_blink_timer_init_next p_mouse_device_le_discovery_led_blink_timer_init: -03c3 6fe0cc48 fetch 1 ,mem_mouse_multi_le_discovery_blink_timer_init +03c3 6fe0cc49 fetch 1 ,mem_mouse_multi_le_discovery_blink_timer_init 03c4 202003bf branch p_mouse_multi_led_blink_timer_init_next p_mouse_device_le_reconn_led_blink_timer_init: -03c5 6fe0cc49 fetch 1 ,mem_mouse_multi_le_reconn_blink_timer_init +03c5 6fe0cc4a fetch 1 ,mem_mouse_multi_le_reconn_blink_timer_init 03c6 202003bf branch p_mouse_multi_led_blink_timer_init_next p_mouse_device_poweron_led_config: 03c7 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config 03c8 c4000000 rtnbit0 mouse_enable_1io2led -03c9 6fe0cc45 fetch 1 ,mem_mouse_multi_led_powon_timer_init -03ca 67e0cc46 store 1 ,mem_mouse_multi_led_powon_timer +03c9 6fe0cc46 fetch 1 ,mem_mouse_multi_led_powon_timer_init +03ca 67e0cc47 store 1 ,mem_mouse_multi_led_powon_timer 03cb 704c4200 jam multi_led_on ,mem_mouse_multi_led_type p_mouse_multi_led_enable: @@ -1312,7 +1312,7 @@ 03d5 204003c1 call p_mouse_device_24g_led_blink_timer_init 03d6 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config 03d7 c4010000 rtnbit0 mouse_enable_led_blink_limit -03d8 6fe0cc4f fetch 1 ,mem_mouse_multi_24gled_blink_count_init +03d8 6fe0cc50 fetch 1 ,mem_mouse_multi_24gled_blink_count_init 03d9 202003e6 branch p_mouse_device_led_blink_count_init p_mouse_device_le_reconn_led_config: @@ -1329,10 +1329,10 @@ 03e2 204003c5 call p_mouse_device_le_reconn_led_blink_timer_init 03e3 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config 03e4 c4010000 rtnbit0 mouse_enable_led_blink_limit -03e5 6fe0cc50 fetch 1 ,mem_mouse_multi_le_reconn_blink_count_init +03e5 6fe0cc51 fetch 1 ,mem_mouse_multi_le_reconn_blink_count_init p_mouse_device_led_blink_count_init: -03e6 67e0cc51 store 1 ,mem_mouse_multi_led_blink_count +03e6 67e0cc52 store 1 ,mem_mouse_multi_led_blink_count 03e7 20600000 rtn p_mouse_device_discovery_led_config: @@ -1356,14 +1356,14 @@ 03f5 c00083ff beq multi_led_blink ,p_mouse_multi_led_type_blink p_mouse_device_multi_led_type_on: -03f6 6fe0cc46 fetch 1 ,mem_mouse_multi_led_powon_timer +03f6 6fe0cc47 fetch 1 ,mem_mouse_multi_led_powon_timer 03f7 203a03fb branch p_mouse_device_poweron_led_off ,blank 03f8 1fe0ffff increase -1 -03f9 67e0cc46 store 1 ,mem_mouse_multi_led_powon_timer +03f9 67e0cc47 store 1 ,mem_mouse_multi_led_powon_timer 03fa 2020041a branch p_mouse_device_multi_led_on + 1 p_mouse_device_poweron_led_off: -03fb 704ca601 jam 1 ,mem_mouse_dpi_led_blink_enable +03fb 704ca701 jam 1 ,mem_mouse_dpi_led_blink_enable 03fc 204003b7 call p_mouse_multi_low_led_blink_count_init p_mouse_devide_led_disable: @@ -1382,11 +1382,11 @@ 0405 20200408 branch p_mouse_multi_led_type_blink_next p_mouse_device_led_blink_limit: -0406 6fe0cc51 fetch 1 ,mem_mouse_multi_led_blink_count +0406 6fe0cc52 fetch 1 ,mem_mouse_multi_led_blink_count 0407 203a0427 branch p_mouse_multi_led_off_judge ,blank p_mouse_multi_led_type_blink_next: -0408 da604c4b arg mem_mouse_multi_led_blink_timer ,regc +0408 da604c4c arg mem_mouse_multi_led_blink_timer ,regc 0409 da40040b arg p_mouse_multi_led_type_blink_start ,regb 040a 2020318a branch timer_single_step @@ -1403,9 +1403,9 @@ 0412 20200417 branch p_mouse_multi_led_on_judge p_mouse_multi_led_blink_count_decrease: -0413 6fe0cc51 fetch 1 ,mem_mouse_multi_led_blink_count +0413 6fe0cc52 fetch 1 ,mem_mouse_multi_led_blink_count 0414 1fe0ffff increase -1 -0415 67e0cc51 store 1 ,mem_mouse_multi_led_blink_count +0415 67e0cc52 store 1 ,mem_mouse_multi_led_blink_count 0416 2020040f branch p_mouse_multi_led_blink p_mouse_multi_led_on_judge: @@ -1421,19 +1421,19 @@ 041e 20600000 rtn p_mouse_device_24g_led_on: -041f 6848cc54 fetcht 1 ,mem_mouse_1io2led_multi_24gled +041f 6848cc55 fetcht 1 ,mem_mouse_1io2led_multi_24gled 0420 20200426 branch p_mouse_multi_led_on p_mouse_device_bt1_led_on: -0421 6848cc55 fetcht 1 ,mem_mouse_1io2led_multi_bt1led +0421 6848cc56 fetcht 1 ,mem_mouse_1io2led_multi_bt1led 0422 20200426 branch p_mouse_multi_led_on p_mouse_device_bt2_led_on: -0423 6848cc56 fetcht 1 ,mem_mouse_1io2led_multi_bt2led +0423 6848cc57 fetcht 1 ,mem_mouse_1io2led_multi_bt2led 0424 20200426 branch p_mouse_multi_led_on p_mouse_multi_dpi_led_on: -0425 6848cc58 fetcht 1 ,mem_mouse_dpi_gpio +0425 6848cc59 fetcht 1 ,mem_mouse_dpi_gpio p_mouse_multi_led_on: 0426 20206069 branch gpio_out_active @@ -1455,15 +1455,15 @@ 0430 20600000 rtn p_mouse_device_24g_led_off: -0431 6848cc54 fetcht 1 ,mem_mouse_1io2led_multi_24gled +0431 6848cc55 fetcht 1 ,mem_mouse_1io2led_multi_24gled 0432 20200436 branch p_gpio_set_high_impedance p_mouse_device_bt1_led_off: -0433 6848cc55 fetcht 1 ,mem_mouse_1io2led_multi_bt1led +0433 6848cc56 fetcht 1 ,mem_mouse_1io2led_multi_bt1led 0434 20200436 branch p_gpio_set_high_impedance p_mouse_device_bt2_led_off: -0435 6848cc56 fetcht 1 ,mem_mouse_1io2led_multi_bt2led +0435 6848cc57 fetcht 1 ,mem_mouse_1io2led_multi_bt2led p_gpio_set_high_impedance: 0436 18467cff sub temp ,gpio_disable ,null @@ -1479,21 +1479,21 @@ p_mouse_multi_dpi_led_off_judge: 043e 704c4300 jam off ,mem_mouse_multi_led_state -043f 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -0440 c283042b bbit1 mouse_enable_dpi_for_led ,p_mouse_device_multi_led_off -0441 c283842b bbit1 mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_off +043f 6fe0cc45 fetch 1 ,mem_mouse_led_multi_type +0440 c001042b beq mouse_enable_dpi_for_led ,p_mouse_device_multi_led_off +0441 c001842b beq mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_off p_mouse_multi_dpi_led_off: -0442 6848cc58 fetcht 1 ,mem_mouse_dpi_gpio +0442 6848cc59 fetcht 1 ,mem_mouse_dpi_gpio p_mouse_multi_led_off: 0443 20206065 branch gpio_out_inactive p_mouse_multi_dpi_led_on_judge: 0444 704c4301 jam on ,mem_mouse_multi_led_state -0445 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -0446 c2830419 bbit1 mouse_enable_dpi_for_led ,p_mouse_device_multi_led_on -0447 c2838419 bbit1 mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_on +0445 6fe0cc45 fetch 1 ,mem_mouse_led_multi_type +0446 c0010419 beq mouse_enable_dpi_for_led ,p_mouse_device_multi_led_on +0447 c0018419 beq mouse_enable_dpi_low_for_led ,p_mouse_device_multi_led_on 0448 20200425 branch p_mouse_multi_dpi_led_on p_mouse_logo_led_on_timer: @@ -1563,7 +1563,7 @@ 0478 2441046f ncall p_mouse_dpi_led_blink_count_clean ,positive 0479 18427e00 copy temp ,pdata 047a 9fe0fe00 iadd pdata ,pdata -047b 67e0cc51 store 1 ,mem_mouse_multi_led_blink_count +047b 67e0cc52 store 1 ,mem_mouse_multi_led_blink_count p_mouse_multi_dpi_led_blink_enable: 047c 704c4404 jam 4 ,mem_mouse_multi_led_blink_type @@ -1619,7 +1619,7 @@ 049e 2020451f branch mouse_le_battery_updata_timer p_mouse_le_send_conn_param_update_timer: -049f da604c7a arg mem_mouse_le_send_conn_param_update_timer ,regc +049f da604c7b arg mem_mouse_le_send_conn_param_update_timer ,regc 04a0 da40436c arg mouse_updata_le_param ,regb 04a1 2020318a branch timer_single_step @@ -2169,7 +2169,7 @@ 0628 20600000 rtn p_mouse_dpi_process: -0629 6fe0cca6 fetch 1 ,mem_mouse_dpi_led_blink_enable +0629 6fe0cca7 fetch 1 ,mem_mouse_dpi_led_blink_enable 062a 207a0000 rtn blank 062b 20404072 call mouse_dpi_ghost_check 062c 20740000 rtn user Index: output/ramcode.rom =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/ramcode.rom (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/ramcode.rom (working copy) @@ -221,7 +221,7 @@ c3003ed0 d8e00004 204046f4 -704c4e0c +704c4f0c 6fe0c8fa 207a0000 7048fa00 @@ -241,38 +241,38 @@ 247a0000 6fe14887 247a0000 -6fe0cc46 +6fe0cc47 247a0000 6fe44bab c4020000 204000e4 20740000 -6fe0cc53 +6fe0cc54 203a0114 -6848cc4e +6848cc4f 18408401 -6048cc4e -6fe0cc4c +6048cc4f +6fe0cc4d 98467c00 24410109 -6fe0cc4d +6fe0cc4e 98467c00 2421010b -6fe0cc40 -c282841a -c283841a -6848cc57 +6fe0cc45 +c000841a +c001841a +6848cc58 20200426 -704c4e01 +704c4f01 20400110 -6fe0cc40 -c282842c -c283842c -6848cc57 +6fe0cc45 +c000842c +c001842c +6848cc58 20200443 -6fe0cc53 +6fe0cc54 1fe0ffff -67e0cc53 +67e0cc54 20600000 6fe0cc40 c282010b @@ -305,8 +305,8 @@ 20400179 204041a7 20758000 -704ca600 -704c9500 +704ca700 +704c9600 20400343 20403d8a 20404728 @@ -410,9 +410,9 @@ 67e0c992 20600000 6fe0c1e8 -67e0cc8f +67e0cc90 20600000 -6fe0cc8f +6fe0cc90 67e0c1e8 20600000 580001a6 @@ -682,17 +682,17 @@ 70445401 20403223 20204427 -704c9501 +704c9601 204003c7 20204350 20404544 -704c9501 +704c9601 204003c7 202043fa 58000000 67e14af2 -67e0cc79 67e0cc7a +67e0cc7b 67e0cac6 20204366 6fe0cac7 @@ -702,21 +702,21 @@ 2040436c 704b760a 20204373 -6fe0cc79 +6fe0cc7a 247a0000 -704c7901 -704c7a1e +704c7a01 +704c7b1e 20600000 20400080 2020019e -704c9501 +704c9601 204002c5 20404544 d8e00001 204046f4 204003c7 20204859 -704c9501 +704c9601 6fe2483c 67e24891 67e24993 @@ -840,13 +840,13 @@ c000034a c000834d c0010350 -6fe0cc90 +6fe0cc91 1fe22200 20200352 -6fe0cc92 +6fe0cc93 1fe22200 20200352 -6fe0cc93 +6fe0cc94 1fe22200 5800c309 20405b0c @@ -893,7 +893,7 @@ 203a045a 67e0cba8 20600000 -6fe0cc46 +6fe0cc47 247a0000 2020037b 20403e9b @@ -926,18 +926,18 @@ da40450a 2040318a 20204507 -6fe0cc97 +6fe0cc98 c17f8000 -6fe0cc95 +6fe0cc96 207a0000 2040054e 1fe17e07 -6848cc97 +6848cc98 98467c00 202283ab -704c961e +704c971e 20600000 -da604c96 +da604c97 da40062d 2020318a 704c4100 @@ -945,30 +945,30 @@ c4000000 20400439 704c4400 -6fe0cc4c +6fe0cc4d 1fe37e00 -67e0cc4d +67e0cc4e 20600000 -6fe0cc52 -67e0cc53 +6fe0cc53 +67e0cc54 20600000 6fe0cc44 c00083c1 c00103c3 c00183c5 -6fe0cc4a -67e0cc4b +6fe0cc4b +67e0cc4c 20600000 -6fe0cc47 -202003bf 6fe0cc48 202003bf 6fe0cc49 202003bf +6fe0cc4a +202003bf 6fe0cc40 c4000000 -6fe0cc45 -67e0cc46 +6fe0cc46 +67e0cc47 704c4200 704c4300 704c4101 @@ -982,7 +982,7 @@ 204003c1 6fe0cc40 c4010000 -6fe0cc4f +6fe0cc50 202003e6 6fe0cc40 c4000000 @@ -995,8 +995,8 @@ 204003c5 6fe0cc40 c4010000 -6fe0cc50 -67e0cc51 +6fe0cc51 +67e0cc52 20600000 6fe0cc40 c4000000 @@ -1012,12 +1012,12 @@ 207a0000 6fe0cc42 c00083ff -6fe0cc46 +6fe0cc47 203a03fb 1fe0ffff -67e0cc46 +67e0cc47 2020041a -704ca601 +704ca701 204003b7 704c4100 2020042c @@ -1028,9 +1028,9 @@ 6fe0cc40 c2810406 20200408 -6fe0cc51 +6fe0cc52 203a0427 -da604c4b +da604c4c da40040b 2020318a 6fe0cc44 @@ -1041,9 +1041,9 @@ 6fe0cc43 c0008429 20200417 -6fe0cc51 +6fe0cc52 1fe0ffff -67e0cc51 +67e0cc52 2020040f 6fe0cc44 c0020444 @@ -1053,13 +1053,13 @@ c0008421 c0010423 20600000 -6848cc54 -20200426 6848cc55 20200426 6848cc56 20200426 -6848cc58 +6848cc57 +20200426 +6848cc59 20206069 704c4100 704c4400 @@ -1071,11 +1071,11 @@ c0008433 c0010435 20600000 -6848cc54 -20200436 6848cc55 20200436 6848cc56 +20200436 +6848cc57 18467cff 20628000 2020607f @@ -1085,15 +1085,15 @@ 2040010b 2020043e 704c4300 -6fe0cc40 -c283042b -c283842b -6848cc58 +6fe0cc45 +c001042b +c001842b +6848cc59 20206065 704c4301 -6fe0cc40 -c2830419 -c2838419 +6fe0cc45 +c0010419 +c0018419 20200425 6fe0cbed c17f8000 @@ -1145,7 +1145,7 @@ 2441046f 18427e00 9fe0fe00 -67e0cc51 +67e0cc52 704c4404 204003be 704c4201 @@ -1181,7 +1181,7 @@ 6fe44bab c39d8000 2020451f -da604c7a +da604c7b da40436c 2020318a da604ab2 @@ -1575,7 +1575,7 @@ 20600000 704c3e00 20600000 -6fe0cca6 +6fe0cca7 207a0000 20404072 20740000 Index: output/sched.rom =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/sched.rom (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/sched.rom (working copy) @@ -169,9 +169,6 @@ #bit2 MOUSE_ENABLE_LED_BLINK_LIMIT #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT -#bit5 MOUSE_ENABLE_LOW_FOR_LED -#bit6 MOUSE_ENABLE_DPI_FOR_LED -#bit7 MOUSE_ENABLE_DPI_LOW_FOR_LED 00 mem_mouse_discovery_timeout:b0 04 #2min @@ -224,6 +221,7 @@ #1io2led multi start #time parm +mem_mouse_led_multi_type:00 #00:no multi 01:low+led 02:dpi+led 03:low+dpi_led mem_mouse_multi_led_powon_timer_init:14 #2s mem_mouse_multi_24gled_blink_timer_init:05 #24gled blink time 500ms on,500ms off mem_mouse_multi_le_discovery_blink_timer_init:02 #le discovery blink time 500ms on,500ms off Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/program/patch.prog (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/program/patch.prog (working copy) @@ -382,9 +382,9 @@ isub temp,null nbranch p_mouse_low_voltage_led_off_judge,positive p_mouse_low_voltage_led_on_judge: - fetch 1,mem_mouse_led_new_interface_config - bbit1 MOUSE_ENABLE_LOW_FOR_LED,p_mouse_device_multi_led_on+1 - bbit1 MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_on+1 + fetch 1,mem_mouse_led_multi_type + beq MOUSE_ENABLE_LOW_FOR_LED,p_mouse_device_multi_led_on+1 + beq MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_on+1 p_mouse_low_voltage_led_on: fetcht 1,mem_mouse_low_gpio branch p_mouse_multi_led_on @@ -393,9 +393,9 @@ jam 1,mem_adc_low_volatage_led_timer_count_new call p_mouse_low_led_blink_decrease //blink count decrease p_mouse_low_voltage_led_off_judge: - fetch 1,mem_mouse_led_new_interface_config - bbit1 MOUSE_ENABLE_LOW_FOR_LED,p_mouse_device_multi_led_off+1 - bbit1 MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_off+1 + fetch 1,mem_mouse_led_multi_type + beq MOUSE_ENABLE_LOW_FOR_LED,p_mouse_device_multi_led_off+1 + beq MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_off+1 p_mouse_low_voltage_led_off: fetcht 1,mem_mouse_low_gpio branch p_mouse_multi_led_off @@ -1754,9 +1754,9 @@ p_mouse_multi_dpi_led_off_judge: jam OFF,mem_mouse_multi_led_state - fetch 1,mem_mouse_led_new_interface_config - bbit1 MOUSE_ENABLE_DPI_FOR_LED,p_mouse_device_multi_led_off - bbit1 MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_off + fetch 1,mem_mouse_led_multi_type + beq MOUSE_ENABLE_DPI_FOR_LED,p_mouse_device_multi_led_off + beq MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_off p_mouse_multi_dpi_led_off: fetcht 1,mem_mouse_dpi_gpio p_mouse_multi_led_off: @@ -1764,9 +1764,9 @@ p_mouse_multi_dpi_led_on_judge: jam ON,mem_mouse_multi_led_state - fetch 1,mem_mouse_led_new_interface_config - bbit1 MOUSE_ENABLE_DPI_FOR_LED,p_mouse_device_multi_led_on - bbit1 MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_on + fetch 1,mem_mouse_led_multi_type + beq MOUSE_ENABLE_DPI_FOR_LED,p_mouse_device_multi_led_on + beq MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_on branch p_mouse_multi_dpi_led_on //================led multi end===================// Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/sched/mouse.dat (revision 2739) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/sched/mouse.dat (working copy) @@ -102,9 +102,6 @@ #bit2 MOUSE_ENABLE_LED_BLINK_LIMIT #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT -#bit5 MOUSE_ENABLE_LOW_FOR_LED -#bit6 MOUSE_ENABLE_DPI_FOR_LED -#bit7 MOUSE_ENABLE_DPI_LOW_FOR_LED 00 mem_mouse_discovery_timeout:b0 04 #2min @@ -157,6 +154,7 @@ #1io2led multi start #time parm +mem_mouse_led_multi_type:00 #00:no multi 01:low+led 02:dpi+led 03:low+dpi_led mem_mouse_multi_led_powon_timer_init:14 #2s mem_mouse_multi_24gled_blink_timer_init:05 #24gled blink time 500ms on,500ms off mem_mouse_multi_le_discovery_blink_timer_init:02 #le discovery blink time 500ms on,500ms off