Index: format/app_mouse.format =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/format/app_mouse.format (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/format/app_mouse.format (working copy) @@ -324,6 +324,22 @@ 1 mem_sensor_shutdown_flag 1 mem_mouse_24g_new_process 2 mem_cb_before_lpm_sleep + +//patch area +//patch led start +1 mem_mouse_multi_led_blink_enable +1 mem_mouse_multi_led_gpio +1 mem_mouse_multi_led_state +1 mem_mouse_multi_led_type +1 mem_mouse_multi_led_on_timer +1 mem_mouse_multi_led_on_timer_init +1 mem_mouse_multi_led_blink_timer_init +1 mem_mouse_multi_led_blink_timer +1 mem_mouse_multi_led_blink_count +1 mem_mouse_multi_led_blink_count_limited +1 mem_mouse_multi_led_on_poweron2s_flag +//patch led end + ) @@ -605,3 +621,12 @@ 7 MOUSE_DEVICE_NUMBER_FLAG ) +( +0x03 ICE_REUSE_GPIO +) + +( +0 MULTI_LED_ON +1 MULTI_LED_BLINK +) + Index: format/regs.format =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/format/regs.format (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/format/regs.format (working copy) @@ -175,6 +175,7 @@ 0x89f4 fpga_uart_rdata 0x89f5 fpga_uart_status + 0x8921 core_rx_ctrl1 0x8a00 core_clkpll_ctrl0 0x8a01 core_clkpll_ctrl1 0x8a02 core_clkpll_ctrl2 Index: output/bt_format.meta =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/bt_format.meta (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/bt_format.meta (working copy) @@ -2205,6 +2205,17 @@ 0x4be1 mem_sensor_shutdown_flag 0x4be2 mem_mouse_24g_new_process 0x4be3 mem_cb_before_lpm_sleep +0x4be5 mem_mouse_multi_led_blink_enable +0x4be6 mem_mouse_multi_led_gpio +0x4be7 mem_mouse_multi_led_state +0x4be8 mem_mouse_multi_led_type +0x4be9 mem_mouse_multi_led_on_timer +0x4bea mem_mouse_multi_led_on_timer_init +0x4beb mem_mouse_multi_led_blink_timer_init +0x4bec mem_mouse_multi_led_blink_timer +0x4bed mem_mouse_multi_led_blink_count +0x4bee mem_mouse_multi_led_blink_count_limited +0x4bef mem_mouse_multi_led_on_poweron2s_flag 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length @@ -5759,6 +5770,15 @@ 7 MOUSE_DEVICE_NUMBER_FLAG ) +( +0x03 ICE_REUSE_GPIO +) + +( +0 MULTI_LED_ON +1 MULTI_LED_BLINK +) + @@ -7749,6 +7769,7 @@ 0x89f4 fpga_uart_rdata 0x89f5 fpga_uart_status + 0x8921 core_rx_ctrl1 0x8a00 core_clkpll_ctrl0 0x8a01 core_clkpll_ctrl1 0x8a02 core_clkpll_ctrl2 Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/eeprom.dat (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -62 +e2 08 c2 84 @@ -15,7 +15,7 @@ c0 45 81 -ae +84 c0 57 00 @@ -23,23 +23,23 @@ c0 64 81 -b9 +93 c0 65 01 -c4 +9e c0 68 01 -d5 +ce c0 6b 01 -cd +a7 c0 6c 81 -e6 +df 20 20 13 @@ -47,35 +47,35 @@ c0 6f 00 -c0 +96 c0 6f 80 -de +b4 c0 70 -81 -08 +80 +de c0 71 00 -9b +71 c0 74 80 -b3 +89 c0 75 01 -58 +2e c0 75 81 -8a +60 c0 76 81 -92 +68 20 20 13 @@ -134,8 +134,8 @@ f3 20 40 -00 -2c +3b +f0 20 40 41 @@ -175,183 +175,15 @@ 20 40 00 -56 +2c 20 20 3b c8 -20 -75 -80 -00 -20 -40 -26 -07 -20 -40 -22 -ff -20 -40 -00 -31 -20 -20 -3b -f4 -68 -48 -c4 -c1 -20 -40 -60 -69 -20 -40 -79 -b4 -68 -48 -c9 -18 -20 -40 -3f -56 -68 -48 -c9 -19 -20 -40 -3f -56 -68 -48 -c9 -1a -20 -40 -3f -56 -68 -48 -c9 -0d -20 -40 -3f -56 -68 -48 -c9 -0e -20 -40 -3f -56 -68 -48 -c9 -0f -20 -40 -3f -56 -68 -48 -c9 -10 -20 -40 -3f -56 -68 -48 -c9 -1b -20 -40 -3f -56 -68 -48 -c9 -12 -20 -40 -3f -56 -68 -48 -c9 -13 -20 -40 -3f -56 -68 -48 -c9 -14 -20 -40 -3f -56 -68 -48 -c9 -1c -20 -40 -3f -56 -68 -48 -c9 -1d -20 -40 -3f -56 -68 -48 -c9 -11 -20 -40 -3f -56 -68 -48 -c9 -1e -20 -40 -3f -56 -68 -48 -ca -ab -20 -40 -60 -69 -68 -48 -c9 -17 -20 -20 -3f -56 58 00 00 -92 +68 67 e1 4b @@ -359,7 +191,7 @@ 58 00 00 -5d +33 67 e1 48 @@ -367,7 +199,7 @@ 58 00 00 -79 +4f 67 e1 48 @@ -395,7 +227,7 @@ c3 0a 80 -64 +3a 6f e0 cb @@ -415,7 +247,7 @@ c2 80 80 -73 +49 68 48 c7 @@ -563,15 +395,15 @@ 20 40 00 -b6 +8c 24 2c 00 -90 +66 24 37 80 -90 +66 20 40 48 @@ -587,7 +419,7 @@ 20 20 00 -85 +5b 6f e0 c9 @@ -635,19 +467,19 @@ c0 00 80 -a2 +78 c0 01 00 -a4 +7a c0 01 80 -a6 +7c c0 02 00 -a8 +7e 20 60 00 @@ -659,7 +491,7 @@ 20 20 00 -a9 +7f 70 47 c6 @@ -667,7 +499,7 @@ 20 20 00 -a9 +7f 70 47 c6 @@ -675,7 +507,7 @@ 20 20 00 -a9 +7f 70 47 c6 @@ -715,7 +547,7 @@ 20 40 00 -b6 +8c 20 20 23 @@ -727,7 +559,7 @@ 20 40 00 -b6 +8c 20 20 25 @@ -763,7 +595,7 @@ 20 40 00 -c8 +9e 20 57 a2 @@ -811,7 +643,7 @@ c5 97 80 -cd +a3 78 3c fc @@ -875,7 +707,7 @@ 20 3a 00 -db +b1 20 20 21 @@ -919,7 +751,7 @@ c5 13 80 -e9 +bf 6f e0 c7 @@ -971,7 +803,7 @@ 20 22 80 -f5 +cb 20 40 22 @@ -983,11 +815,11 @@ c2 00 00 -f2 +c8 c5 13 80 -fa +d0 18 a2 22 @@ -1026,8 +858,8 @@ e2 20 3a -01 -02 +00 +d8 78 46 fc @@ -1082,8 +914,8 @@ d5 20 40 -01 -04 +00 +da 79 20 2a @@ -1111,11 +943,11 @@ c5 17 81 -3a +10 c5 16 81 -4c +22 19 31 7e @@ -1134,20 +966,20 @@ 28 c5 17 -81 -20 +80 +f6 6f e0 cb e2 20 3a -01 -1e -20 +00 +f4 20 -01 20 +00 +f6 78 4e fc @@ -1186,8 +1018,8 @@ 08 c2 00 -01 -25 +00 +fb 78 24 7c @@ -1203,7 +1035,7 @@ c5 97 81 -2f +05 78 43 fc @@ -1239,11 +1071,11 @@ 20 3a 01 -36 +0c 20 20 01 -37 +0d 78 4d fc @@ -1275,7 +1107,7 @@ c2 00 01 -3b +11 78 4e fc @@ -1303,7 +1135,7 @@ c5 17 01 -49 +1f 58 00 00 @@ -1318,8 +1150,8 @@ 00 20 20 -01 -1a +00 +f0 58 00 00 @@ -1330,8 +1162,8 @@ 05 20 20 -01 -1a +00 +f0 6f e0 c1 @@ -1347,7 +1179,7 @@ c2 00 01 -4e +24 19 31 7e @@ -1378,8 +1210,8 @@ 28 20 20 -01 -1a +00 +f0 20 40 26 @@ -1387,11 +1219,11 @@ 24 34 01 -67 +3d 20 40 01 -78 +4e 20 40 26 @@ -1403,7 +1235,7 @@ 24 3a 01 -62 +38 6f e4 48 @@ -1447,7 +1279,7 @@ 20 5a 01 -6a +40 20 20 26 @@ -1507,7 +1339,7 @@ 20 20 01 -5a +30 70 48 a6 @@ -1515,7 +1347,7 @@ 20 40 00 -b6 +8c 6f e0 c8 @@ -1527,11 +1359,11 @@ 24 2c 01 -7f +55 24 37 81 -7f +55 20 20 26 @@ -1571,7 +1403,7 @@ 24 2c 01 -79 +4f 20 00 09 @@ -1579,7 +1411,7 @@ 20 20 01 -79 +4f 68 48 c8 @@ -1595,7 +1427,7 @@ 24 21 01 -8f +65 20 20 26 @@ -1603,7 +1435,7 @@ 20 40 01 -a7 +7d 20 40 27 @@ -1655,7 +1487,7 @@ c5 13 01 -9e +74 6f e0 c8 @@ -1667,7 +1499,7 @@ 24 21 01 -a6 +7c 6f e0 c8 @@ -1687,7 +1519,7 @@ c0 00 01 -a7 +7d 20 60 00 @@ -1703,7 +1535,7 @@ c0 01 01 -ac +82 1f e0 fe @@ -1724,6 +1556,14 @@ 60 00 00 +20 +40 +12 +d1 +20 +00 +00 +64 70 8a 8b @@ -1764,6 +1604,14 @@ 8a 83 90 +70 +8a +85 +00 +70 +89 +21 +40 20 20 12 @@ -1853,13 +1701,33 @@ 7e 00 c0 +1c +81 +ac +c0 1e 01 -d0 +ae +c0 +1d +01 +b4 20 20 43 36 +20 +40 +02 +0c +20 +20 +48 +57 +20 +40 +02 +0c 6f e2 48 @@ -1880,6 +1748,110 @@ 20 48 4e +6f +e0 +c8 +a5 +24 +3a +47 +e1 +6f +e0 +c8 +8b +c0 +01 +01 +bc +c0 +02 +01 +c2 +c0 +01 +81 +c9 +20 +40 +02 +0c +20 +20 +48 +3a +6f +e4 +4b +ab +c2 +97 +81 +c0 +c2 +98 +01 +c0 +20 +20 +48 +06 +20 +40 +01 +f5 +20 +20 +48 +12 +6f +e4 +4b +ab +c3 +17 +81 +c7 +6f +e0 +cb +b4 +c0 +00 +81 +c7 +20 +20 +48 +1a +20 +40 +02 +0c +20 +20 +48 +3a +6f +e4 +4b +ab +c3 +17 +81 +c7 +c2 +89 +81 +c7 +c2 +89 +01 +c7 +20 +20 +48 +12 20 40 40 @@ -1887,7 +1859,7 @@ 20 40 01 -d8 +d1 20 20 40 @@ -1938,8 +1910,8 @@ c1 20 3a -01 -f1 +02 +25 67 e0 cb @@ -1950,8 +1922,8 @@ 00 20 40 -02 -03 +01 +e7 20 40 3e @@ -1974,112 +1946,132 @@ cd 20 40 -01 -ee +02 +22 20 20 44 bd -da -60 -4b -a8 -da -40 -01 -f1 +6f +e0 +cb +e5 20 +7a +00 +00 +6f +e0 +cb +e8 +c0 +00 +81 +fc 20 -31 -8a +40 +02 +09 6f e0 -c9 -23 -67 +cb +e9 +1f e0 -c9 -2f -6f -e1 -4b -c2 -67 -e1 -49 -30 +fe +01 67 -e1 -49 -32 -da -20 -00 -00 +e0 +cb +e9 68 48 -c9 -92 -18 -40 -84 -02 -18 +cb +ea +98 46 7c -03 -20 -41 -01 -fd -24 -41 -02 -01 +00 20 +42 +81 +f3 20 -48 -ff -6f -e4 +60 +00 +00 +70 4b -ab -c4 -0e +ef 00 +20 +20 +02 +0e +70 +4b +eb +05 +70 +4b +ee 00 -18 -40 -84 +70 +4b +ed +01 +70 +4b +ec +05 +70 +4b +e5 +01 +70 +4b +e8 01 20 60 00 00 -18 +da +60 +4b +ec +da 40 -85 -fd +01 +ff 20 -60 -00 -00 +20 +31 +8a 6f -e4 -4b -ab -c4 -10 -00 -00 +e0 +cb +eb +67 +e0 +cb +ec 6f e0 cb -a7 +ee 20 -7a -00 -00 +3a +02 +07 +6f +e0 +cb +ed +20 +3a +02 +0c 1f e0 ff @@ -2087,69 +2079,205 @@ 67 e0 cb -a7 +ed +6f +e0 +cb +e7 +c0 +00 +82 +0e +70 +4b +e7 +01 +68 +48 +cb +e6 20 +20 +60 +69 +58 +00 +00 +00 +67 +e1 +cb +ec +6f +e0 +cb +ed +24 3a 02 -0c +12 +70 +4b +e5 +00 +70 +4b +e8 +00 +70 +4b +e9 +00 +70 +4b +e7 +00 +6f +e0 +cb +e6 +c0 +01 +82 +18 +68 +48 +cb +e6 +20 20 +60 +65 +68 +48 +cb +e6 +20 +20 +3f +56 +70 +4b +ef +01 +70 +4b +e5 +01 +70 +4b +e8 +00 +70 +4b +e9 +00 +20 +60 +00 +00 +70 +4b +eb +02 +70 +4b +ee +01 +20 +20 +01 +f8 +da +60 +4b +a8 +da 40 02 -0e +25 +20 +20 +31 +8a +6f +e4 +4b +ab +c2 +8e +02 +2b +6f +e0 +c9 +92 +c0 +00 +02 +32 +c0 +00 +82 +34 20 20 -49 +02 +30 +6f +e0 +c9 +92 +c0 +00 +02 +34 +c0 +00 +82 +36 +c0 +01 +02 +30 20 20 -40 02 -0e +32 +70 +4b +ed +01 20 20 -49 -12 -68 -48 -c9 -21 +02 +1f +70 +4b +ed +03 20 -40 -60 -69 -68 -48 -c9 -15 20 -40 -60 -69 -68 -48 -c9 -16 +02 +1f +70 +4b +ed +05 20 -40 -60 -69 -68 -48 -c9 -22 20 -40 -60 -69 -68 -48 -c9 -23 +02 +1f +70 +4b +ed +07 20 20 -60 -69 -9f -b9 +02 +1f +03 +21 aa 55 40 @@ -2346,7 +2474,7 @@ ff 04 05 -03 +ff ff 0d 07 @@ -2368,6 +2496,21 @@ 55 01 00 +e6 +4b +03 +aa +55 +02 +00 +ea +4b +14 +05 +aa +55 +01 +00 58 0b ff @@ -3360,153 +3503,10 @@ aa aa 55 -5a -69 -9c -ce -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 -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 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +d9 +6e +58 +ad ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -91 -e3 +e6 +fb Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/flash.dat (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/flash.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -62 +e2 08 c2 84 @@ -15,7 +15,7 @@ c0 45 81 -ae +84 c0 57 00 @@ -23,23 +23,23 @@ c0 64 81 -b9 +93 c0 65 01 -c4 +9e c0 68 01 -d5 +ce c0 6b 01 -cd +a7 c0 6c 81 -e6 +df 20 20 13 @@ -47,35 +47,35 @@ c0 6f 00 -c0 +96 c0 6f 80 -de +b4 c0 70 -81 -08 +80 +de c0 71 00 -9b +71 c0 74 80 -b3 +89 c0 75 01 -58 +2e c0 75 81 -8a +60 c0 76 81 -92 +68 20 20 13 @@ -134,8 +134,8 @@ f3 20 40 -00 -2c +3b +f0 20 40 41 @@ -175,183 +175,15 @@ 20 40 00 -56 +2c 20 20 3b c8 -20 -75 -80 -00 -20 -40 -26 -07 -20 -40 -22 -ff -20 -40 -00 -31 -20 -20 -3b -f4 -68 -48 -c4 -c1 -20 -40 -60 -69 -20 -40 -79 -b4 -68 -48 -c9 -18 -20 -40 -3f -56 -68 -48 -c9 -19 -20 -40 -3f -56 -68 -48 -c9 -1a -20 -40 -3f -56 -68 -48 -c9 -0d -20 -40 -3f -56 -68 -48 -c9 -0e -20 -40 -3f -56 -68 -48 -c9 -0f -20 -40 -3f -56 -68 -48 -c9 -10 -20 -40 -3f -56 -68 -48 -c9 -1b -20 -40 -3f -56 -68 -48 -c9 -12 -20 -40 -3f -56 -68 -48 -c9 -13 -20 -40 -3f -56 -68 -48 -c9 -14 -20 -40 -3f -56 -68 -48 -c9 -1c -20 -40 -3f -56 -68 -48 -c9 -1d -20 -40 -3f -56 -68 -48 -c9 -11 -20 -40 -3f -56 -68 -48 -c9 -1e -20 -40 -3f -56 -68 -48 -ca -ab -20 -40 -60 -69 -68 -48 -c9 -17 -20 -20 -3f -56 58 00 00 -92 +68 67 e1 4b @@ -359,7 +191,7 @@ 58 00 00 -5d +33 67 e1 48 @@ -367,7 +199,7 @@ 58 00 00 -79 +4f 67 e1 48 @@ -395,7 +227,7 @@ c3 0a 80 -64 +3a 6f e0 cb @@ -415,7 +247,7 @@ c2 80 80 -73 +49 68 48 c7 @@ -563,15 +395,15 @@ 20 40 00 -b6 +8c 24 2c 00 -90 +66 24 37 80 -90 +66 20 40 48 @@ -587,7 +419,7 @@ 20 20 00 -85 +5b 6f e0 c9 @@ -635,19 +467,19 @@ c0 00 80 -a2 +78 c0 01 00 -a4 +7a c0 01 80 -a6 +7c c0 02 00 -a8 +7e 20 60 00 @@ -659,7 +491,7 @@ 20 20 00 -a9 +7f 70 47 c6 @@ -667,7 +499,7 @@ 20 20 00 -a9 +7f 70 47 c6 @@ -675,7 +507,7 @@ 20 20 00 -a9 +7f 70 47 c6 @@ -715,7 +547,7 @@ 20 40 00 -b6 +8c 20 20 23 @@ -727,7 +559,7 @@ 20 40 00 -b6 +8c 20 20 25 @@ -763,7 +595,7 @@ 20 40 00 -c8 +9e 20 57 a2 @@ -811,7 +643,7 @@ c5 97 80 -cd +a3 78 3c fc @@ -875,7 +707,7 @@ 20 3a 00 -db +b1 20 20 21 @@ -919,7 +751,7 @@ c5 13 80 -e9 +bf 6f e0 c7 @@ -971,7 +803,7 @@ 20 22 80 -f5 +cb 20 40 22 @@ -983,11 +815,11 @@ c2 00 00 -f2 +c8 c5 13 80 -fa +d0 18 a2 22 @@ -1026,8 +858,8 @@ e2 20 3a -01 -02 +00 +d8 78 46 fc @@ -1082,8 +914,8 @@ d5 20 40 -01 -04 +00 +da 79 20 2a @@ -1111,11 +943,11 @@ c5 17 81 -3a +10 c5 16 81 -4c +22 19 31 7e @@ -1134,20 +966,20 @@ 28 c5 17 -81 -20 +80 +f6 6f e0 cb e2 20 3a -01 -1e -20 +00 +f4 20 -01 20 +00 +f6 78 4e fc @@ -1186,8 +1018,8 @@ 08 c2 00 -01 -25 +00 +fb 78 24 7c @@ -1203,7 +1035,7 @@ c5 97 81 -2f +05 78 43 fc @@ -1239,11 +1071,11 @@ 20 3a 01 -36 +0c 20 20 01 -37 +0d 78 4d fc @@ -1275,7 +1107,7 @@ c2 00 01 -3b +11 78 4e fc @@ -1303,7 +1135,7 @@ c5 17 01 -49 +1f 58 00 00 @@ -1318,8 +1150,8 @@ 00 20 20 -01 -1a +00 +f0 58 00 00 @@ -1330,8 +1162,8 @@ 05 20 20 -01 -1a +00 +f0 6f e0 c1 @@ -1347,7 +1179,7 @@ c2 00 01 -4e +24 19 31 7e @@ -1378,8 +1210,8 @@ 28 20 20 -01 -1a +00 +f0 20 40 26 @@ -1387,11 +1219,11 @@ 24 34 01 -67 +3d 20 40 01 -78 +4e 20 40 26 @@ -1403,7 +1235,7 @@ 24 3a 01 -62 +38 6f e4 48 @@ -1447,7 +1279,7 @@ 20 5a 01 -6a +40 20 20 26 @@ -1507,7 +1339,7 @@ 20 20 01 -5a +30 70 48 a6 @@ -1515,7 +1347,7 @@ 20 40 00 -b6 +8c 6f e0 c8 @@ -1527,11 +1359,11 @@ 24 2c 01 -7f +55 24 37 81 -7f +55 20 20 26 @@ -1571,7 +1403,7 @@ 24 2c 01 -79 +4f 20 00 09 @@ -1579,7 +1411,7 @@ 20 20 01 -79 +4f 68 48 c8 @@ -1595,7 +1427,7 @@ 24 21 01 -8f +65 20 20 26 @@ -1603,7 +1435,7 @@ 20 40 01 -a7 +7d 20 40 27 @@ -1655,7 +1487,7 @@ c5 13 01 -9e +74 6f e0 c8 @@ -1667,7 +1499,7 @@ 24 21 01 -a6 +7c 6f e0 c8 @@ -1687,7 +1519,7 @@ c0 00 01 -a7 +7d 20 60 00 @@ -1703,7 +1535,7 @@ c0 01 01 -ac +82 1f e0 fe @@ -1724,6 +1556,14 @@ 60 00 00 +20 +40 +12 +d1 +20 +00 +00 +64 70 8a 8b @@ -1764,6 +1604,14 @@ 8a 83 90 +70 +8a +85 +00 +70 +89 +21 +40 20 20 12 @@ -1853,13 +1701,33 @@ 7e 00 c0 +1c +81 +ac +c0 1e 01 -d0 +ae +c0 +1d +01 +b4 20 20 43 36 +20 +40 +02 +0c +20 +20 +48 +57 +20 +40 +02 +0c 6f e2 48 @@ -1880,6 +1748,110 @@ 20 48 4e +6f +e0 +c8 +a5 +24 +3a +47 +e1 +6f +e0 +c8 +8b +c0 +01 +01 +bc +c0 +02 +01 +c2 +c0 +01 +81 +c9 +20 +40 +02 +0c +20 +20 +48 +3a +6f +e4 +4b +ab +c2 +97 +81 +c0 +c2 +98 +01 +c0 +20 +20 +48 +06 +20 +40 +01 +f5 +20 +20 +48 +12 +6f +e4 +4b +ab +c3 +17 +81 +c7 +6f +e0 +cb +b4 +c0 +00 +81 +c7 +20 +20 +48 +1a +20 +40 +02 +0c +20 +20 +48 +3a +6f +e4 +4b +ab +c3 +17 +81 +c7 +c2 +89 +81 +c7 +c2 +89 +01 +c7 +20 +20 +48 +12 20 40 40 @@ -1887,7 +1859,7 @@ 20 40 01 -d8 +d1 20 20 40 @@ -1938,8 +1910,8 @@ c1 20 3a -01 -f1 +02 +25 67 e0 cb @@ -1950,8 +1922,8 @@ 00 20 40 -02 -03 +01 +e7 20 40 3e @@ -1974,112 +1946,132 @@ cd 20 40 -01 -ee +02 +22 20 20 44 bd -da -60 -4b -a8 -da -40 -01 -f1 +6f +e0 +cb +e5 20 +7a +00 +00 +6f +e0 +cb +e8 +c0 +00 +81 +fc 20 -31 -8a +40 +02 +09 6f e0 -c9 -23 -67 +cb +e9 +1f e0 -c9 -2f -6f -e1 -4b -c2 -67 -e1 -49 -30 +fe +01 67 -e1 -49 -32 -da -20 -00 -00 +e0 +cb +e9 68 48 -c9 -92 -18 -40 -84 -02 -18 +cb +ea +98 46 7c -03 -20 -41 -01 -fd -24 -41 -02 -01 +00 20 +42 +81 +f3 20 -48 -ff -6f -e4 +60 +00 +00 +70 4b -ab -c4 -0e +ef 00 +20 +20 +02 +0e +70 +4b +eb +05 +70 +4b +ee 00 -18 -40 -84 +70 +4b +ed +01 +70 +4b +ec +05 +70 +4b +e5 +01 +70 +4b +e8 01 20 60 00 00 -18 +da +60 +4b +ec +da 40 -85 -fd +01 +ff 20 -60 -00 -00 +20 +31 +8a 6f -e4 -4b -ab -c4 -10 -00 -00 +e0 +cb +eb +67 +e0 +cb +ec 6f e0 cb -a7 +ee 20 -7a -00 -00 +3a +02 +07 +6f +e0 +cb +ed +20 +3a +02 +0c 1f e0 ff @@ -2087,69 +2079,205 @@ 67 e0 cb -a7 +ed +6f +e0 +cb +e7 +c0 +00 +82 +0e +70 +4b +e7 +01 +68 +48 +cb +e6 20 +20 +60 +69 +58 +00 +00 +00 +67 +e1 +cb +ec +6f +e0 +cb +ed +24 3a 02 -0c +12 +70 +4b +e5 +00 +70 +4b +e8 +00 +70 +4b +e9 +00 +70 +4b +e7 +00 +6f +e0 +cb +e6 +c0 +01 +82 +18 +68 +48 +cb +e6 +20 20 +60 +65 +68 +48 +cb +e6 +20 +20 +3f +56 +70 +4b +ef +01 +70 +4b +e5 +01 +70 +4b +e8 +00 +70 +4b +e9 +00 +20 +60 +00 +00 +70 +4b +eb +02 +70 +4b +ee +01 +20 +20 +01 +f8 +da +60 +4b +a8 +da 40 02 -0e +25 +20 +20 +31 +8a +6f +e4 +4b +ab +c2 +8e +02 +2b +6f +e0 +c9 +92 +c0 +00 +02 +32 +c0 +00 +82 +34 20 20 -49 +02 +30 +6f +e0 +c9 +92 +c0 +00 +02 +34 +c0 +00 +82 +36 +c0 +01 +02 +30 20 20 -40 02 -0e +32 +70 +4b +ed +01 20 20 -49 -12 -68 -48 -c9 -21 +02 +1f +70 +4b +ed +03 20 -40 -60 -69 -68 -48 -c9 -15 20 -40 -60 -69 -68 -48 -c9 -16 +02 +1f +70 +4b +ed +05 20 -40 -60 -69 -68 -48 -c9 -22 20 -40 -60 -69 -68 -48 -c9 -23 +02 +1f +70 +4b +ed +07 20 20 -60 -69 -9f -b9 +02 +1f +03 +21 aa 55 40 @@ -2346,7 +2474,7 @@ ff 04 05 -03 +ff ff 0d 07 @@ -2368,6 +2496,21 @@ 55 01 00 +e6 +4b +03 +aa +55 +02 +00 +ea +4b +14 +05 +aa +55 +01 +00 58 0b ff @@ -3360,153 +3503,10 @@ aa aa 55 -5a -69 -9c -ce -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 -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 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +d9 +6e +58 +ad ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -91 -e3 +e6 +fb Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/memmap.format (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/output/memmap.format (working copy) @@ -2205,6 +2205,17 @@ 0x4be1 mem_sensor_shutdown_flag 0x4be2 mem_mouse_24g_new_process 0x4be3 mem_cb_before_lpm_sleep +0x4be5 mem_mouse_multi_led_blink_enable +0x4be6 mem_mouse_multi_led_gpio +0x4be7 mem_mouse_multi_led_state +0x4be8 mem_mouse_multi_led_type +0x4be9 mem_mouse_multi_led_on_timer +0x4bea mem_mouse_multi_led_on_timer_init +0x4beb mem_mouse_multi_led_blink_timer_init +0x4bec mem_mouse_multi_led_blink_timer +0x4bed mem_mouse_multi_led_blink_count +0x4bee mem_mouse_multi_led_blink_count_limited +0x4bef mem_mouse_multi_led_on_poweron2s_flag 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/program/patch.prog (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/program/patch.prog (working copy) @@ -48,7 +48,7 @@ call enable_authrom // call g24_chamap_param_update - call p_mouse_setting_config + call mouse_setting_config call mouse_init_sunt setarg 0x600 store 2,mem_24g_rx_window @@ -62,62 +62,6 @@ call p_mouse_cb_fuction branch mouse_init+7 -p_mouse_setting_config: - rtn wake - call g24_transmit_init - call g24_chmap_param_init - call p_mouse_gpio_init - branch mouse_setting_config+4 - -p_mouse_gpio_init: - fetcht 1,mem_eeprom_wp_gpio - call gpio_config_output - call usb_offline_check_init - fetcht 1,mem_lbutton_gpio - call mouse_gpio_config_input_pu - fetcht 1,mem_rbutton_gpio - call mouse_gpio_config_input_pu - fetcht 1,mem_mbutton_gpio - call mouse_gpio_config_input_pu - fetcht 1,mem_bk_button_gpio - call mouse_gpio_config_input_pu - fetcht 1,mem_fw_button_gpio - call mouse_gpio_config_input_pu - fetcht 1,mem_dpi_button_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_matrix_public_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_config_select_device_button_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_customer_key_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_whee_a_data_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_whee_b_data_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_whee_ta_data_gpio - call mouse_gpio_config_input_pu - fetcht 1,mem_whee_tb_data_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_sensor_motion_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_device_switch_gpio - call mouse_gpio_config_input_pu - - fetcht 1,mem_sensor_reset_gpio - call gpio_config_output - - fetcht 1,mem_select_sensor_angle_gpio - branch mouse_gpio_config_input_pu - p_mouse_cb_fuction: setarg p_mouse_24g_before_lpm_sleep store 2,mem_cb_before_lpm_sleep @@ -586,6 +530,10 @@ p_initialize_radio_cont: + //config osc_xtal_ctrim + call init_lpm_ctrl + nop 100 + jam 0xe6,core_syn_aac_cfg1 call initialize_syn_afc_cfg1 @@ -601,6 +549,8 @@ jam 0x05,core_rf_ldo_cfg3 jam 0x90,core_syn_pfd_lkd_cfg + jam 0x00,core_syn_loopdiv_dsm_cfg + jam 0x40,core_rx_ctrl1 branch initialize_radio_cont+8 @@ -633,16 +583,74 @@ p_mouse_priority_bb_event: copy regc,pdata + beq BT_EVT_24G_PAIRING_COMPLETE,p_mouse_24g_pairing_complete beq BT_EVT_24G_ATTEMPT_SUCCESS,p_mouse_24g_attempt_success + beq BT_EVT_24G_ATTEMPT_FAIL,p_mouse_24g_attempt_fail branch mouse_priority_bb_event+2 +p_mouse_24g_pairing_complete: + call p_mouse_discovey_led_blink_off + branch mouse_24g_pairing_complete + p_mouse_24g_attempt_success: + call p_mouse_discovey_led_blink_off fetch 4,mem_24g_addr store 4,mem_24g_receiver_addr store 4,mem_mouse_24g_addr // if need store 24g address to eeprom/flash,need get mem_24g_addr call mouse_device_poweron_timer_init branch mouse_24g_attempt_success +p_mouse_24g_attempt_fail: + fetch 1,mem_24g_attempt_fail_flag + nbranch mouse_24g_hibernate_set,blank + fetch 1,mem_24g_reconn_type + beq FAST_CONN_AND_3_0_ADDR,p_mouse_24g_fast_conn_attempt_fail + beq PAIR_AND_3_0_ADDR,p_mouse_24g_auto_pair_attempt_fail + beq RECEIVER_AND_3_0_ADDR,p_mouse_reconn_dongle_attempt_fail + call p_mouse_multi_led_blink_off + branch mouse_24g_attempt_fail_enter_hibernate+1 + +p_mouse_24g_fast_conn_attempt_fail: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_start_auto_pair + bbit1 MOUSE_ENABLE_AUTO_24G_PARING,p_mouse_24g_start_auto_pair +// fetch 4,mem_mouse_24g_addr // auto pair first time +// fetcht 4,mem_mouse_compare_addr_ff +// isub temp,null +// branch p_mouse_24g_start_pair_mode,zero + branch mouse_24g_reconn_dongle_start + +//p_mouse_24g_start_pair_mode: +// arg MOUSE_24G_PAIRING_FLAG,queue +// call mouse_enable_function_flag +// setarg 0 +// store 2,mem_24g_reconn_timeout +// call mouse_stop_discovery +// call mouse_low_voltage_led_blink_disable +// call p_mouse_discovery_multi_led_blink +// branch mouse_24g_start_pair_mode+7 + +p_mouse_24g_start_auto_pair: + call p_mouse_discovery_multi_led_blink + branch mouse_24g_start_auto_pair+1 + +p_mouse_24g_auto_pair_attempt_fail: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_attempt_fail_enter_hibernate + fetch 1,mem_device_number + beq 1,p_mouse_24g_attempt_fail_enter_hibernate //24g first mode and only 2.4g device + branch mouse_24g_first_bluetooth_reconnect + +p_mouse_24g_attempt_fail_enter_hibernate: + call p_mouse_multi_led_blink_off + branch mouse_24g_attempt_fail_enter_hibernate+1 + +p_mouse_reconn_dongle_attempt_fail: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_attempt_fail_enter_hibernate + bbit1 MOUSE_ENABLE_EEPROM,p_mouse_24g_attempt_fail_enter_hibernate + bbit1 MOUSE_ENABLE_FLASH,p_mouse_24g_attempt_fail_enter_hibernate + branch mouse_24g_start_auto_pair+1 ///////////////////dpi led adjust//////////////////////////////////////////////////////////////////// p_mouse_seting_dpi: @@ -668,7 +676,7 @@ p_mouse_bb_event_timer: - call p_mouse_device_poweron_timer + call p_mouse_multi_led_blink_timer call mouse_adc_read call mouse_low_voltage_led_timer //24g @@ -679,67 +687,130 @@ call p_mouse_dpi_led_blink_delay_timer branch mouse_bb_event_timer+8 -p_mouse_dpi_led_blink_delay_timer: - arg mem_mouse_dpi_led_delay_count,regc - arg p_mouse_dpi_led_blink_init,regb - branch timer_single_step - -p_mouse_dpi_led_blink_init: //result: level3: 2 3 1 level4: 3 4 1 2 - fetch 1,mem_dpi_led_gpio - store 1,mem_mouse_struct_led_gpio - fetch 2,mem_mouse_dpi_led_blink_time - store 2,mem_mouse_on_time - store 2,mem_mouse_off_time - arg 0,rega - fetcht 1,mem_mouse_dpi - increase 2,temp // 2 3 4 (5) - sub temp,3,null - call p_mouse_dpi_led_blink_init_level_4,positive - ncall p_mouse_dpi_led_blink_count_clean,positive - branch mouse_dpi_led_blink_init_end - -p_mouse_dpi_led_blink_init_level_4: - fetch MOUSE_FLAG_LEN,mem_mouse_flag - rtnbit0 MOUSE_ENABLE_DPI_LEVEL_4 - increase 1,temp // 2-->3 3-->4 +////////////////////////////////led set start//////////////////////////////////////////////// +p_mouse_multi_led_blink_timer: + fetch 1,mem_mouse_multi_led_blink_enable + rtn blank + fetch 1,mem_mouse_multi_led_type + beq MULTI_LED_BLINK,p_mouse_multi_led_type_blink +p_mouse_multi_led_type_on: + call p_mouse_multi_led_on + fetch 1,mem_mouse_multi_led_on_timer + increase 1,pdata + store 1,mem_mouse_multi_led_on_timer + fetcht 1,mem_mouse_multi_led_on_timer_init + isub temp,null + call p_mouse_multi_led_off_poweron2s,zero rtn -p_mouse_dpi_led_blink_count_clean: - increase -3,temp // 4-->1 5-->2 +p_mouse_multi_led_off_poweron2s: + jam 0,mem_mouse_multi_led_on_poweron2s_flag + branch p_mouse_multi_led_off + +p_mouse_discovery_multi_led_blink: + jam 5,mem_mouse_multi_led_blink_timer_init //300ms +p_mouse_discovery_multi_led_blink1: + jam 0,mem_mouse_multi_led_blink_count_limited + jam 1,mem_mouse_multi_led_blink_count//0 will clear mem_mouse_multi_led_blink_enable/mem_mouse_multi_led_type +p_mouse_multi_led_blink_enable: + jam 5,mem_mouse_multi_led_blink_timer + jam ON,mem_mouse_multi_led_blink_enable + jam MULTI_LED_BLINK,mem_mouse_multi_led_type rtn -p_mouse_device_poweron_timer: - fetch MOUSE_FLAG_LEN,mem_mouse_flag - rtnbit0 MOUSE_ENABLE_POWER_ON_LED - fetch 1,mem_mouse_device_poweron_timer_count - rtn blank +p_mouse_multi_led_type_blink: + arg mem_mouse_multi_led_blink_timer,regc + arg p_mouse_multi_led_type_blink_timeout,regb + branch timer_single_step +p_mouse_multi_led_type_blink_timeout: + fetch 1,mem_mouse_multi_led_blink_timer_init + store 1,mem_mouse_multi_led_blink_timer + fetch 1,mem_mouse_multi_led_blink_count_limited + branch p_mouse_multi_led_blink_count_no_limited,blank + fetch 1,mem_mouse_multi_led_blink_count + branch p_mouse_multi_led_blink_off,blank increase -1,pdata - store 1,mem_mouse_device_poweron_timer_count - branch p_mouse_device_led_off,blank -p_mouse_device_led_on: - call p_mouse_led_config_ouput - branch mouse_device_led_on - -p_mouse_device_led_off: - call p_mouse_led_config_ouput - branch mouse_device_led_off - -p_mouse_led_config_ouput: - fetcht 1,mem_config_low_voltage_alarm_gpio - call gpio_config_output + store 1,mem_mouse_multi_led_blink_count +p_mouse_multi_led_blink_count_no_limited: + fetch 1,mem_mouse_multi_led_state + beq ON,p_mouse_multi_led_off +p_mouse_multi_led_on: + jam ON,mem_mouse_multi_led_state + fetcht 1,mem_mouse_multi_led_gpio + branch gpio_out_active + +p_mouse_discovey_led_blink_off: +// fetch 1,mem_mouse_multi_led_on_timer +// nrtn blank +// fetch 1,mem_mouse_multi_led_on_poweron2s_flag +// nrtn blank +p_mouse_multi_led_blink_off: + setarg 0 + store 3,mem_mouse_multi_led_blink_timer +p_mouse_multi_led_off: + fetch 1,mem_mouse_multi_led_blink_count + nbranch p_mouse_multi_led_off_wait_blink_over,blank + jam 0,mem_mouse_multi_led_blink_enable + jam 0,mem_mouse_multi_led_type +p_mouse_multi_led_off_wait_blink_over: + jam 0,mem_mouse_multi_led_on_timer + jam OFF,mem_mouse_multi_led_state +p_mouse_multi_led_gpio_set_high: + fetch 1,mem_mouse_multi_led_gpio + beq ICE_REUSE_GPIO,p_mouse_multi_led_gpio_config_input + fetcht 1,mem_mouse_multi_led_gpio + branch gpio_out_inactive - fetcht 1,mem_config_device_24g_led_gpio - call gpio_config_output +p_mouse_multi_led_gpio_config_input: + fetcht 1,mem_mouse_multi_led_gpio + branch mouse_gpio_config_input_pu - fetcht 1,mem_config_device_bt1_led_gpio - call gpio_config_output - - fetcht 1,mem_config_device_bt2_led_gpio - call gpio_config_output +p_mouse_mode_bt_device1_multi_led_on: +p_mouse_mode_24g_device_multi_led_on: + jam 1,mem_mouse_multi_led_on_poweron2s_flag + jam ON,mem_mouse_multi_led_blink_enable + jam MULTI_LED_ON,mem_mouse_multi_led_type + jam 0,mem_mouse_multi_led_on_timer + rtn - fetcht 1,mem_dpi_led_gpio - branch gpio_config_output +p_mouse_dpi_multi_led_blink: + jam 2,mem_mouse_multi_led_blink_timer_init //200ms + jam 1,mem_mouse_multi_led_blink_count_limited + branch p_mouse_multi_led_blink_enable + +p_mouse_dpi_led_blink_delay_timer: + arg mem_mouse_dpi_led_delay_count,regc + arg p_mouse_dpi_led_blink_init,regb + branch timer_single_step -///////////////////////////////////////////////////////////////////////////////////////////////// +p_mouse_dpi_led_blink_init: //result: level3: 2 3 1 level4: 3 4 1 2 + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit1 MOUSE_ENABLE_DPI_LEVEL_4,p_mouse_dpi_led_blink_four_level +p_mouse_dpi_led_blink_three_level: + fetch 1,mem_mouse_dpi + beq 0,p_mouse_dpi_led_blink_twice + beq 1,p_mouse_dpi_led_blink_thrice + branch p_mouse_dpi_led_blink_once +p_mouse_dpi_led_blink_four_level: + fetch 1,mem_mouse_dpi + beq 0,p_mouse_dpi_led_blink_thrice + beq 1,p_mouse_dpi_led_blink_quartic + beq 2,p_mouse_dpi_led_blink_once + branch p_mouse_dpi_led_blink_twice + +p_mouse_dpi_led_blink_once: + jam 1,mem_mouse_multi_led_blink_count + branch p_mouse_dpi_multi_led_blink +p_mouse_dpi_led_blink_twice: + jam 3,mem_mouse_multi_led_blink_count + branch p_mouse_dpi_multi_led_blink +p_mouse_dpi_led_blink_thrice: + jam 5,mem_mouse_multi_led_blink_count + branch p_mouse_dpi_multi_led_blink +p_mouse_dpi_led_blink_quartic: + jam 7,mem_mouse_multi_led_blink_count + branch p_mouse_dpi_multi_led_blink + +///////////////////////////////////////////led set end//////////////////////////////////////////////// Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/sched/mouse.dat (revision 646) +++ /YC1308AC/branch/mouse_project/YHK/mouse_only_24g/sched/mouse.dat (working copy) @@ -131,7 +131,7 @@ mem_customer_key_gpio:ff mem_whee_a_data_gpio:04 mem_whee_b_data_gpio:05 -mem_config_device_24g_led_gpio:03 +mem_config_device_24g_led_gpio:ff mem_config_device_bt1_led_gpio:ff mem_select_sensor_angle_gpio:0d @@ -153,6 +153,10 @@ mem_config_sensor_dpi:00 #00--1200 01--1600 +mem_mouse_multi_led_gpio:03 +mem_mouse_multi_led_on_timer_init:14 +mem_mouse_multi_led_blink_timer_init:05 + mem_usb_offline_check_gpio:ff