Index: format/rom.format =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/format/rom.format (revision 5051) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/format/rom.format (working copy) @@ -387,14 +387,14 @@ 8 page_interval_timer 9 key_scan_timer 10 smp_pairing_timer -11 ui_led_blink //led timer ¿ÉÀ©Õ¹ +11 ui_led_blink //led timer ����չ 12 ui_led_blink1 13 ui_led_blink2 -//²»Ê¹ÓÃmeshÓ¦ÓÿÉÒÔ¸´Óà -//Tiny Mesh ¹ã²¥APP»Ø¸´ +//��ʹ��meshӦ�ÿ��Ը��� +//Tiny Mesh �㲥APP�ظ� 13 mesh_ble_adv_app -//Tiny Mesh¹ã²¥tmall»Ø¸´ +//Tiny Mesh�㲥tmall�ظ� 14 mesh_ble_adv_tmall //Tiny Mesh relay 15 mesh_ble_relay_timer @@ -1598,33 +1598,33 @@ ) (//Timer opcode 0x01A8 VENDOR_MESSAGE_OPCODE_COMPANY_ID -//ʱ¼ä +//ʱ�� 0xF01F VENDOR_MESSAGE_ATTR_TYPE_TIME -//ʱÇø +//ʱ�� 0xF01E VENDOR_MESSAGE_ATTR_TYPE_TIME_ZONE -//¶Ôʱ +//��ʱ 0xF01D VENDOR_MESSAGE_ATTR_TYPE_ON_TIME -//¶¨Ê± +//��ʱ 0xF010 VENDOR_MESSAGE_ATTR_TYPE_TIMING -//ÖÜÆÚ¶¨Ê± +//���ڶ�ʱ 0xF011 VENDOR_MESSAGE_ATTR_TYPE_CYCLE_TIMING -//ɾ³ý¶¨Ê± +//ɾ����ʱ 0xF012 VENDOR_MESSAGE_ATTR_TYPE_DELETE_TIMING -//ÑÕÉ« +//��ɫ 0x0123 VENDOR_MESSAGE_ATTR_TYPE_COLOR -//Ö÷µÆ +//���� 0x0534 VENDOR_MESSAGE_ATTR_TYPE_MAIN_LIGHT -//±³¹âµÆ +//����� 0x0533 VENDOR_MESSAGE_ATTR_TYPE_BACKGROUND_LIGHT ) -(//Ììèeventʼþ±í -//É豸·¢ÉúµÄʼþ£¬±ÈÈçÉϵç»òÕ߶¨Ê±Íê³É +(//��èevent�¼��� +//�豸�������¼��������ϵ���߶�ʱ��� 0xF009 VENDOR_ATTR_TYPE_EVENT_TRIGGER -//ÌìèÉ豸Éϵç +//��è�豸�ϵ� 0x03 VENDOR_MESSAGE_EVENT_DEVICE_POWER_ON -//Ìì趨ʱÍê³É +//��è��ʱ��� 0x11 VENDOR_MESSAGE_EVENT_FINISH_TIMING ) ( @@ -1650,7 +1650,7 @@ (//transport mic cache parameter 10 TRANSPORT_MIC_CACHE_SPACE_NUM 4 TRANSPORT_MIC_CACHE_SPACE_SIZE -//×ܳ¤¶ÈÉÙÒ»¸öspace +//�ܳ�����һ��space 36 TRANSPORT_MIC_CACHE_TOTAL_SIZE ) ( @@ -1677,24 +1677,24 @@ 1 DEVICE_BEACON_ON ) ( -//δÅäÍø¹ã²¥³¬Ê±10min +//δ�����㲥��ʱ10min 0x1770 ADV_UNPROVISIONED_DEVICE_BEACON_TIMEOUT -//δÅäÍø¹ã²¥¼ä¸ô500ms +//δ�����㲥���500ms 5 ADV_UNPROVISIONED_DEVICE_BEACON_INTERVAL -//δÅäÍø¹ã²¥Ê±³¤120ms=20ms*6 +//δ�����㲥ʱ��120ms=20ms*6 6 ADV_UNPROVISIONED_DEVICE_BEACON_DURATION -//¾²Ä¬¹ã²¥³¬Ê±:ÎÞ +//��Ĭ�㲥��ʱ:�� 0 ADV_SILENCE_DEVICE_BEACON_TIMEOUT -//¾²Ä¬¹ã²¥¼ä¸ô60s +//��Ĭ�㲥���60s 600 ADV_SILENCE_DEVICE_BEACON_INTERVAL -//¾²Ä¬¹ã²¥Ê±³¤120ms=20ms*6 +//��Ĭ�㲥ʱ��120ms=20ms*6 6 ADV_SILENCE_DEVICE_BEACON_DURATION -//ÅäÍøºó¹ã²¥¼ä¸ô +//������㲥��� 0x54 ADV_PAIRING_MESH_MESSAGE_INTERVAL -//ÅäÍøºó¹ã²¥Ê±³¤ +//������㲥ʱ�� 20 ADV_PAIRING_MESH_MESSAGE_DURATION 10 ADV_RELAY_MESH_MESSAGE_DURATION @@ -1705,9 +1705,9 @@ 6 BIT_OF_ADV_IN_OFF ) ( -//mesh »Ø¸´APP¹ã²¥¼ä¸ô24*0.625ms = 15ms +//mesh �ظ�APP�㲥���24*0.625ms = 15ms 0x15 MESH_ADV_APP_MESSAGE_INTERVAL -//mesh»Ø¸´tmall¹ã²¥¼ä¸ô32*0.625ms = 20ms +//mesh�ظ�tmall�㲥���32*0.625ms = 20ms 0x1d MESH_ADV_TMALL_MESSAGE_INTERVAL ) ( @@ -2105,7 +2105,8 @@ 6 power_starting_cb_offset 8 power_standby_cb_offset 10 ui_butten_up_cb_offset -) +) + ( 0x9000 mem_b_box 0x9100 mem_e_box @@ -2321,20 +2322,20 @@ ) ( 0xa2 COMMAND_TEST //BYTE 0 -0x81 COM_TEST_SC // ½øÈëµ¥Ôز¨ -0x82 COM_TEST_CD // fcc²âÊÔ -0x83 COM_TEST_DAT // Êý¾Ý²âÊÔ -0x84 COM_TEST_LOW_CH //µÍƵµã -0x85 COM_TEST_MID_CH //ÖÐƵµã -0x86 COM_TEST_HIG_CH //¸ßƵµã -0x87 COM_TEST_SW_HIG //×Ô¶¯Çл»ÆµµãΪ¸ß 1mhz -0x88 COIM_TEST_SW_LOW //×Ô¶¯Çл»ÆµµãΪµÍ 1mhz -0x89 COM_TEST_SW_STOP //Í£Ö¹×Ô¶¯Çл»Æµµã -0x8a COM_TEST_POW_5 //ÉèÖÃÊä³ö¹¦ÂÊ5dbm +0x81 COM_TEST_SC // ���뵥�ز� +0x82 COM_TEST_CD // fcc���� +0x83 COM_TEST_DAT // ���ݲ��� +0x84 COM_TEST_LOW_CH //��Ƶ�� +0x85 COM_TEST_MID_CH //��Ƶ�� +0x86 COM_TEST_HIG_CH //��Ƶ�� +0x87 COM_TEST_SW_HIG //�Զ��л�Ƶ��Ϊ�� 1mhz +0x88 COIM_TEST_SW_LOW //�Զ��л�Ƶ��Ϊ�� 1mhz +0x89 COM_TEST_SW_STOP //ֹͣ�Զ��л�Ƶ�� +0x8a COM_TEST_POW_5 //�����������5dbm 0x8b COM_TEST_POW_0 //0dbm 0x8c COM_TEST_POW_N5 //-5dbm 0x8d COM_TEST_POW_N10 //-10dbm -0x8e COM_TEST_EXIT //Í˳ö²âÊÔģʽ +0x8e COM_TEST_EXIT //�˳�����ģʽ ) ( 0xa6 COMMAND_CURRENT_PROJECT @@ -7170,7 +7171,7 @@ 1 mem_mesh_access_layer_payload_len 0 mem_mesh_access_layer_payload 50 mem_mesh_access_payload - 50 mem_mesh_access_payload_padding //ΪÁË͸´«Ä£¿éÔ¤Áô + 50 mem_mesh_access_payload_padding //Ϊ��͸��ģ��Ԥ�� ) memalloc ali_mesh( 0 mem_mesh_queue_ele_temp @@ -7679,7 +7680,7 @@ ) amemalloc mem_mesh_receive_model_message_payload( - //Scene recall ģʽÉèÖà + //Scene recall ģʽ���� 1 mem_mesh_module_message_opcode_scene_recall 2 mem_mesh_scene_recall_payload_scene_number 1 mem_mesh_scene_recall_payload_TID @@ -8637,12 +8638,12 @@ ) xmemalloc ali_mesh( 1 mem_mesh_advertising_unprovisioned_device_beacon_switch - //δÅäÍø¹ã²¥¼ä¸ô + //δ�����㲥��� 2 mem_mesh_advertising_unprovisioned_device_beacon_timer - //¹ã²¥Éú´æÖÜÆÚ + //�㲥�������� 1 mem_mesh_advertising_unprovisioned_device_beacon_duration - //¹ã²¥ÖÜÆÚÖ®¼äµÄ¼ä¸ô + //�㲥����֮��ļ�� 1 mem_mesh_advertising_unprovisioned_device_beacon_interval ) @@ -8712,10 +8713,10 @@ ) xmemalloc ali_mesh( - // provisioning flag ±êÖ¾ÊÇ·ñÈëÍø + // provisioning flag ��־�Ƿ����� 1 mem_mesh_provisioned_flag - //ÈëÍøʱµÄ״̬»ú + //����ʱ��״̬�� 1 mem_mesh_Provisioning_State_Flag 1 mem_mesh_Device_PID @@ -8738,7 +8739,7 @@ ) xmemalloc ali_mesh( -//GATT ЭÒé +//GATT �� 1 mem_mesh_gatt_receive_msg_timer //fast pairing //APP control @@ -8748,22 +8749,22 @@ ) xmemalloc ali_mesh( - // three tuple °¢ÀïÔÆƽ̨·ÖÅäµÄÈýÔª×é + // three tuple ������ƽ̨�������Ԫ�� 4 mem_mesh_three_tuple_ProductID 6 mem_mesh_three_tuple_MAC 16 mem_mesh_three_tuple_secret - //ble ºËÐÄЭÒéÕ»£¬scanµ½Êý¾ÝµÄ»Øµ÷ + //ble ����Э��ջ��scan�����ݵĻص� 2 mem_mesh_cb_receive_advertising - //alarm¼Ä´æÆ÷²»ÄÜÐÞ¸Ä - //meshºËÐĹ淶½ÓÊÕµ½ÈκÎTMALLÖ¸Áî + //alarm�Ĵ��������޸� + //mesh���Ĺ淶���յ��κ�TMALLָ�� 2 mem_mesh_cb_receive_access_message - //½ÓÊÕµ½ÅäÖÃapplication keyÖ¸Áî(¿ÉÒÔÈÏΪÈëÍø³É¹¦) + //���յ�����application keyָ��(������Ϊ�����ɹ�) 2 mem_mesh_cb_receive_config_appkey_add - //¸÷ÖÖÔ­ÒòÅäÍøʧ°Ü»Øµ÷ + //����ԭ������ʧ�ܻص� 2 mem_mesh_cb_pairing_fail 2 mem_mesh_cb_generic_onoff_get @@ -8777,18 +8778,18 @@ 2 mem_mesh_cb_background_onoff_set 2 mem_mesh_cb_color_set - //relay µÄ¹¦Äܻص÷ + //relay �Ĺ��ܻص� 2 mem_mesh_cb_network_relay - //Ä£¿é¸´Î»µÄ»Øµ÷£¬ÐèÒª3sÖ®ºó¸´Î» + //ģ�鸴λ�Ļص�����Ҫ3s֮��λ 2 mem_mesh_cb_receive_node_reset - //seq¸Ä±äʱµÄ»Øµ÷£¬ÐèÒª´æµ½¶ÔÓ¦µÄ´æ´¢Æ÷ÖÐ + //seq�ı�ʱ�Ļص�����Ҫ�浽��Ӧ�Ĵ洢���� 2 mem_mesh_cb_seq_changed 2 mem_mesh_cb_subscriptuion_list_changed - //Timer ¶¨Ê±Æ÷¸Ä±äʱ£¬ÐèÒª´æµ½¶ÔÓ¦µÄ´æ´¢Æ÷ÖÐ + //Timer ��ʱ���ı�ʱ����Ҫ�浽��Ӧ�Ĵ洢���� 2 mem_mesh_cb_vendor_timing_changed @@ -8826,7 +8827,7 @@ 1 mem_mesh_element_device_upper_queue_current_num 1 mem_mesh_element_device_upper_queue_read_ptr 1 mem_mesh_element_device_upper_queue_write_ptr - //ÔªËس¤¶ÈΪ47 + //Ԫ�س���Ϊ47 188 mem_mesh_element_device_upper_queue_ele ) @@ -9825,6 +9826,7 @@ 1 mem_mouse_select_sensor_angle_type 1 mem_mouse_bt_calc_flag +38 mem_sensor_8650_init_new ) Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/output/eeprom.dat (revision 5197) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -6a +56 19 c2 84 @@ -83,7 +83,7 @@ c0 67 86 -24 +1f c0 68 03 @@ -91,7 +91,7 @@ c0 68 85 -a5 +a0 c0 69 83 @@ -99,7 +99,7 @@ c0 6a 05 -8d +88 c0 6b 02 @@ -119,7 +119,7 @@ c0 6f 05 -ee +e9 c0 6f 80 @@ -215,7 +215,7 @@ c0 76 86 -2c +27 20 20 13 @@ -1531,7 +1531,7 @@ 20 40 05 -9c +97 20 20 3b @@ -1907,7 +1907,7 @@ 20 40 05 -db +d6 df e0 00 @@ -1915,7 +1915,7 @@ 20 40 05 -db +d6 68 48 c9 @@ -1983,7 +1983,7 @@ 20 40 05 -db +d6 68 48 c9 @@ -1999,7 +1999,7 @@ 20 40 05 -d8 +d3 68 48 c9 @@ -2431,7 +2431,7 @@ 20 40 06 -51 +4c 20 40 27 @@ -2487,7 +2487,7 @@ 20 20 06 -12 +0d 70 4b 94 @@ -2627,11 +2627,11 @@ 20 40 05 -97 +92 20 40 05 -9c +97 20 20 3e @@ -2655,7 +2655,7 @@ 20 40 05 -d8 +d3 d8 40 00 @@ -2863,7 +2863,7 @@ 20 40 05 -d8 +d3 20 20 3e @@ -3379,7 +3379,7 @@ 20 40 05 -9c +97 20 20 02 @@ -3927,7 +3927,7 @@ 20 20 05 -92 +8d 58 00 00 @@ -4979,7 +4979,7 @@ 20 40 05 -a5 +a0 1f e1 7e @@ -5563,7 +5563,7 @@ 20 40 05 -7a +79 58 00 00 @@ -5587,7 +5587,7 @@ 20 40 05 -a3 +9e 6f e0 c8 @@ -5605,10 +5605,6 @@ 47 28 20 -40 -05 -89 -20 20 45 44 @@ -5627,7 +5623,7 @@ c0 05 85 -7f +7e 20 20 42 @@ -5672,22 +5668,6 @@ 20 42 79 -6f -e0 -c9 -27 -c1 -01 -80 -00 -c1 -05 -80 -00 -20 -20 -47 -1a 20 40 3f @@ -5699,7 +5679,7 @@ c0 05 85 -94 +8f 20 40 42 @@ -5719,7 +5699,7 @@ 20 40 05 -9a +95 da 60 4b @@ -5727,7 +5707,7 @@ 20 20 05 -92 +8d 6f e0 c9 @@ -5735,7 +5715,7 @@ c0 05 85 -9a +95 20 20 42 @@ -5763,7 +5743,7 @@ c0 05 85 -a1 +9c 20 20 42 @@ -5779,7 +5759,7 @@ 20 40 05 -a5 +a0 20 20 40 @@ -5799,27 +5779,27 @@ 20 40 05 -af +aa 20 40 05 -b4 +af 20 40 05 -b9 +b4 20 40 05 -be +b9 20 40 05 -cb +c6 20 40 05 -de +d9 20 20 41 @@ -5831,7 +5811,7 @@ 20 40 05 -d8 +d3 20 40 41 @@ -5851,7 +5831,7 @@ 20 40 05 -d8 +d3 20 40 41 @@ -5871,7 +5851,7 @@ 20 40 05 -d8 +d3 20 40 41 @@ -5915,7 +5895,7 @@ c0 7f 85 -c7 +c2 20 20 41 @@ -5927,7 +5907,7 @@ 20 40 05 -db +d6 68 48 c9 @@ -5967,7 +5947,7 @@ c0 7f 85 -d4 +cf 20 20 41 @@ -5979,7 +5959,7 @@ 20 40 05 -db +d6 68 48 c9 @@ -6051,7 +6031,7 @@ 20 40 05 -db +d6 68 48 c9 @@ -6079,7 +6059,7 @@ 20 40 05 -f4 +ef 20 40 79 @@ -6087,15 +6067,15 @@ 20 40 06 -12 +0d 20 40 05 -f8 +f3 20 40 -06 -03 +05 +fe 20 20 46 @@ -6123,11 +6103,11 @@ c2 94 85 -fc +f7 c2 9b 85 -fc +f7 20 60 00 @@ -6187,7 +6167,7 @@ 20 20 86 -0e +09 6f e0 c9 @@ -6243,7 +6223,7 @@ 20 40 06 -19 +14 20 20 40 @@ -6271,7 +6251,7 @@ c0 7f 86 -20 +1b 20 20 40 @@ -6283,7 +6263,7 @@ 20 40 05 -db +d6 68 48 c9 @@ -6359,7 +6339,7 @@ c5 13 06 -36 +31 6f e0 c8 @@ -6371,7 +6351,7 @@ 24 21 06 -50 +4b 6f e0 c8 @@ -6383,7 +6363,7 @@ 24 21 06 -3e +39 6f e0 c8 @@ -6391,7 +6371,7 @@ c0 00 06 -51 +4c 20 60 00 @@ -6427,7 +6407,7 @@ c5 13 06 -47 +42 6f e0 c8 @@ -6459,7 +6439,7 @@ c0 01 06 -58 +53 c0 00 a7 @@ -6479,7 +6459,7 @@ c0 01 86 -57 +52 1f e0 fe @@ -6495,11 +6475,11 @@ c0 01 06 -58 +53 20 20 06 -58 +53 70 41 e8 @@ -6508,8 +6488,8 @@ 60 00 00 -0d -92 +10 +34 aa 55 40 @@ -6656,14 +6636,14 @@ 00 22 89 -1b +18 aa 55 01 00 40 4c -2f +23 aa 55 0c @@ -6674,7 +6654,7 @@ 04 58 02 -3c +64 64 94 85 @@ -6721,7 +6701,7 @@ ff 07 06 -88 +ff ff ff aa @@ -6819,7 +6799,7 @@ 88 8a 0a -88 +ff ff aa 55 @@ -7002,7 +6982,7 @@ 01 04 01 -18 +0e 01 aa 55 @@ -7093,22 +7073,18 @@ 51 aa 55 -0c +08 00 fc 45 -0b +07 +43 +30 +35 +2d 42 54 -33 -2e -30 -20 -4d -6f -75 -73 -65 +31 aa 55 05 @@ -7255,59 +7231,53 @@ 65 aa 55 -0c +08 00 1e 4c -0b +07 +43 +30 +35 +2d 42 54 -35 -2e 31 -20 -4d -6f -75 -73 -65 aa 55 -0d +08 00 -a6 +a7 4d -00 -0b +07 +43 +30 +35 +2d 42 54 -35 -2e 32 -20 -4d -6f -75 -73 -65 aa 55 -0c +08 00 bb 4d -0b +07 +43 +30 +35 +2d 42 54 -33 -2e -30 -20 +32 +aa +55 +01 +00 +a6 4d -6f -75 -73 -65 +01 aa 55 08 @@ -7316,7 +7286,7 @@ 43 06 00 -09 +07 00 20 00 @@ -7465,7 +7435,7 @@ 88 aa 55 -74 +0a 00 df 49 @@ -7479,26 +7449,12 @@ 00 ff ff -09 -5a -0d -f0 -1d -e3 -7d -d2 -ff -ff -09 -5a -0d -10 -1d -ed -7d -80 -ff -ff +aa +55 +3c +00 +fd +49 1b 35 28 @@ -7559,102 +7515,56 @@ 00 ff ff +aa +55 +26 +00 +d2 +4d 09 5a ff 27 ab 40 +b3 +56 +9b +e6 +a8 +12 +a9 +c0 be -d1 +e6 +a5 +af a0 -41 +21 a1 -12 +02 +b8 +10 +b9 +0b a7 ff -b6 -00 b5 -c8 -a5 -af -ff -00 -09 +d0 +b6 00 ff -ff -aa -55 -0c 00 -97 -4a -05 -b9 -09 -5a -0b -72 -0c -52 09 00 ff ff aa 55 -40 +12 00 -53 -4a -09 -5a -0d -10 -0e -c5 -5b -9a -10 -38 -11 -42 -28 -28 -41 -23 -49 -39 +81 4a -b0 -4b -a0 -4c -90 -4d -70 -09 -00 -ff -ff -09 -5a -06 -02 -09 -69 -0d -48 -0e -9f -0f -ba -09 -00 -ff -ff 09 a5 46 @@ -7874,10 +7784,10 @@ aa aa 55 -ea -9d -73 -64 +f7 +85 +d6 +ce ff ff ff @@ -8188,5 +8098,95 @@ ff ff ff -8d -ac +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +db +b8 Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/output/memmap.format (revision 5051) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/output/memmap.format (working copy) @@ -470,7 +470,7 @@ 0x0a0f mem_mesh_access_layer_payload_len 0x0a10 mem_mesh_access_layer_payload 0x0a10 mem_mesh_access_payload -0x0a42 mem_mesh_access_payload_padding//ΪÁË͸´«Ä£¿éÔ¤Áô +0x0a42 mem_mesh_access_payload_padding//Ϊ��͸��ģ��Ԥ�� 0x0a74 mem_mesh_queue_ele_temp 0x0a74 mem_mesh_queue_ele_duration 0x0a75 mem_mesh_queue_ele_gatt_msg_id @@ -2308,6 +2308,7 @@ 0x4dcf mem_mouse_d_l_l_led_multi_type 0x4dd0 mem_mouse_select_sensor_angle_type 0x4dd1 mem_mouse_bt_calc_flag +0x4dd2 mem_sensor_8650_init_new 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/output/program.lis (revision 5197) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/output/program.lis (working copy) @@ -19,16 +19,16 @@ 0010 c06502c0 beq patch19_2 ,p_mouse_lpm_before_common 0011 c0660112 beq patch19_4 ,p_mouse_adc_read_start 0012 c067056a beq patch19_6 ,p_mouse_motion -0013 c0678624 beq patch19_7 ,p_mouse_dpi_process +0013 c067861f beq patch19_7 ,p_mouse_dpi_process 0014 c06803a7 beq patch1a_0 ,p_mouse_seting_dpi -0015 c06885a5 beq patch1a_1 ,p_mouse_check_key_gpio +0015 c06885a0 beq patch1a_1 ,p_mouse_check_key_gpio 0016 c06983c2 beq patch1a_3 ,p_mouse_init_sunt -0017 c06a058d beq patch1a_4 ,p_mouse_sensor_poweron +0017 c06a0588 beq patch1a_4 ,p_mouse_sensor_poweron 0018 c06b02e9 beq patch1a_6 ,p_mouse_priority_bb_event 0019 c06c83e3 beq patch1b_1 ,p_mouse_bb_event_timer 001a c06d04f4 beq patch1b_2 ,p_mouse_start_discovery 001b c06d84fe beq patch1b_3 ,p_mouse_stop_discovery -001c c06f05ee beq patch1b_6 ,p_mouse_idle +001c c06f05e9 beq patch1b_6 ,p_mouse_idle 001d c06f80a5 beq patch1b_7 ,p_mouse_ready_reconnection_by_button 001e c070809e beq patch1c_1 ,p_mouse_led_off 001f c071009b beq patch1c_2 ,p_mouse_led_on @@ -54,7 +54,7 @@ 0031 c0750228 beq patch3d_2 ,p_g24_transmit_no_interrupt 0032 c0758255 beq patch3d_3 ,p_g24_transmit_hop_process 0033 c076055f beq patch3d_4 ,p_g24_lpm_wait -0034 c076862c beq patch3d_5 ,p_power_ctrl_start +0034 c0768627 beq patch3d_5 ,p_power_ctrl_start 0035 2020137c branch loop p_soft_reset: @@ -501,7 +501,7 @@ 017a 20403d8a call mouse_usb_check_enable 017b 20404728 call mouse_drawing_optima_init 017c 20400206 call p_mouse_cb_fuction -017d 2040059c call p_mouse_sensor_powerdown +017d 20400597 call p_mouse_sensor_powerdown 017e 20203bc9 branch mouse_init + 8 p_mouse_customer_key_connect_vin: @@ -625,9 +625,9 @@ p_mouse_select_sensor_angle_by_ice: 01da 6fe0c917 fetch 1 ,mem_select_sensor_angle_gpio -01db 204005db call p_mouse_gpio_config_output_low +01db 204005d6 call p_mouse_gpio_config_output_low 01dc dfe00013 arg 0x13 ,pdata -01dd 204005db call p_mouse_gpio_config_output_low +01dd 204005d6 call p_mouse_gpio_config_output_low 01de 6848c920 fetcht 1 ,mem_mouse_sensor_sdio_gpio 01df 20403f56 call mouse_gpio_config_input_pu 01e0 6848c920 fetcht 1 ,mem_mouse_sensor_sdio_gpio @@ -652,13 +652,13 @@ p_mouse_set_sensor_gnd_set: 01ed 6fe0c917 fetch 1 ,mem_select_sensor_angle_gpio -01ee 204005db call p_mouse_gpio_config_output_low +01ee 204005d6 call p_mouse_gpio_config_output_low 01ef 6848c917 fetcht 1 ,mem_select_sensor_angle_gpio 01f0 20203f54 branch mouse_gpio_config_input_pd p_mouse_set_sensor_vin_set: 01f1 6fe0c917 fetch 1 ,mem_select_sensor_angle_gpio -01f2 204005d8 call p_mouse_gpio_config_output_high +01f2 204005d3 call p_mouse_gpio_config_output_high 01f3 6848c917 fetcht 1 ,mem_select_sensor_angle_gpio 01f4 20203f56 branch mouse_gpio_config_input_pu @@ -804,7 +804,7 @@ 025b 684a488d fetcht 4 ,mem_24g_fast_conn_addr 025c 98467c00 isub temp ,null 025d 2022a2cb branch g24_ch ,zero -025e 20400651 call p_power_ctrl_txpower_incrs +025e 2040064c call p_power_ctrl_txpower_incrs 025f 20402724 call power_ctrl_pac_succ_decrs 0260 202022cb branch g24_ch @@ -824,7 +824,7 @@ p_mouse_dpi_check_once: 026a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 026b c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button -026c 20200612 branch p_mouse_dpi_check +026c 2020060d branch p_mouse_dpi_check p_mouse_select_device_by_pb_button_check_once: 026d 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status @@ -875,8 +875,8 @@ 028c 58000006 setarg pan_reg_config 028d 20405b0d call twspi_read 028e c281be23 bbit1 3 ,mouse_app_enter_hibernate + 3 -028f 20400597 call p_mouse_sensor_reset -0290 2040059c call p_mouse_sensor_powerdown +028f 20400592 call p_mouse_sensor_reset +0290 20400597 call p_mouse_sensor_powerdown 0291 20203e23 branch mouse_app_enter_hibernate + 3 p_mouse_setgpio_hibernate: @@ -884,7 +884,7 @@ 0293 20407fdc call clear_wake 0294 20404015 call mouse_before_hibernate_wheel_gpio_set 0295 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio -0296 204005d8 call p_mouse_gpio_config_output_high +0296 204005d3 call p_mouse_gpio_config_output_high 0297 d8400003 arg 3 ,temp 0298 20403f56 call mouse_gpio_config_input_pu 0299 204002c0 call p_mouse_lpm_before_common @@ -954,7 +954,7 @@ 02c7 20406050 call gpio_config_input 02c8 20403f88 call mouse_wheel_check 02c9 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio -02ca 204005d8 call p_mouse_gpio_config_output_high +02ca 204005d3 call p_mouse_gpio_config_output_high 02cb 20203e44 branch mouse_lpm_before_common + 4 p_g24_nodata_transmit: @@ -1125,7 +1125,7 @@ 0348 67e3c8d0 store 7 ,mem_mouse_key 0349 67e0c8a7 store 1 ,mem_24g_abort_pac 034a 704be101 jam 1 ,mem_sensor_shutdown_flag -034b 2040059c call p_mouse_sensor_powerdown +034b 20400597 call p_mouse_sensor_powerdown 034c 202002d1 branch p_g24_long_sleep p_g24_pair_dispatch: @@ -1318,7 +1318,7 @@ 03d1 20404232 call mouse_sensor_reset 03d2 20407d12 call delay_10ms 03d3 da604a39 arg mem_sensor_8650_init ,regc -03d4 20200592 branch p_mouse_sensor_end +03d4 2020058d branch p_mouse_sensor_end p_mouse_3205_3t_init_param: 03d5 58000049 setarg 0x49 @@ -1725,7 +1725,7 @@ p_mouse_commbination_key_start: 04da 6048cb9d storet 1 ,mem_mouse_commbination_key -04db 204005a5 call p_mouse_check_key_gpio +04db 204005a0 call p_mouse_check_key_gpio 04dc 1fe17e07 and pdata ,0x07 ,pdata 04dd 6848cb9d fetcht 1 ,mem_mouse_commbination_key 04de 98467c00 isub temp ,null @@ -1921,337 +1921,330 @@ 056a 78547c00 disable user 056b 58000000 setarg 0 056c 67e348d1 store 6 ,mem_mouse_x -056d 2040057a call p_mouse_check_sensor_data +056d 20400579 call p_mouse_check_sensor_data 056e 58000089 setarg 0x0089 056f 20405b0c call twspi_write 0570 204003a9 call p_mouse_seting_sensor_type 0571 20403f7e call mouse_zwheel 0572 20403f83 call mouse_t_zwheel -0573 204005a3 call p_mouse_key +0573 2040059e call p_mouse_key 0574 6fe0c8d0 fetch 1 ,mem_mouse_key 0575 1fe17e1f and_into 0x1f ,pdata 0576 67e0c8d0 store 1 ,mem_mouse_key 0577 24344728 nbranch mouse_drawing_optima_init ,user -0578 20400589 call p_mouse_drawing_optima -0579 20204544 branch mouse_no_data_timer_init +0578 20204544 branch mouse_no_data_timer_init p_mouse_check_sensor_data: -057a 6fe0c4ac fetch 1 ,mem_spi_write_flash_sm -057b c1800000 rtnne flash_sm_no_buys -057c 6fe0c927 fetch 1 ,mem_config_sensor_type -057d c005857f beq ka8g2 ,p_mouse_ka8g2_sensor_motion -057e 20204243 branch mouse_check_sensor_data + 3 +0579 6fe0c4ac fetch 1 ,mem_spi_write_flash_sm +057a c1800000 rtnne flash_sm_no_buys +057b 6fe0c927 fetch 1 ,mem_config_sensor_type +057c c005857e beq ka8g2 ,p_mouse_ka8g2_sensor_motion +057d 20204243 branch mouse_check_sensor_data + 3 p_mouse_ka8g2_sensor_motion: -057f 204042c4 call mouse_clear_sensor_data -0580 6fe0c911 fetch 1 ,mem_sensor_motion_gpio -0581 c07fc294 beq gpio_disable ,mouse_pka8g2_sensor_motion_1 -0582 6848c911 fetcht 1 ,mem_sensor_motion_gpio -0583 20406059 call gpio_get_bit -0584 24608000 nrtn true +057e 204042c4 call mouse_clear_sensor_data +057f 6fe0c911 fetch 1 ,mem_sensor_motion_gpio +0580 c07fc294 beq gpio_disable ,mouse_pka8g2_sensor_motion_1 +0581 6848c911 fetcht 1 ,mem_sensor_motion_gpio +0582 20406059 call gpio_get_bit +0583 24608000 nrtn true p_mouse_pka8g2_sensor_motion_1: -0585 58000000 setarg pan_reg_pid_l -0586 20405b0d call twspi_read -0587 c0ac41b2 bne pka8g2_id1 ,mouse_twspi_reset -0588 20204279 branch mouse_p3212_sensor_motion_2 - -p_mouse_drawing_optima: -0589 6fe0c927 fetch 1 ,mem_config_sensor_type -058a c1018000 rtneq p3212 -058b c1058000 rtneq ka8g2 -058c 2020471a branch mouse_drawing_optima +0584 58000000 setarg pan_reg_pid_l +0585 20405b0d call twspi_read +0586 c0ac41b2 bne pka8g2_id1 ,mouse_twspi_reset +0587 20204279 branch mouse_p3212_sensor_motion_2 p_mouse_sensor_poweron: -058d 20403f65 call mouse_sensor_spi_init -058e 6fe0c927 fetch 1 ,mem_config_sensor_type -058f c0058594 beq ka8g2 ,p_mouse_ka8g2_sensor_init -0590 20404232 call mouse_sensor_reset -0591 da604aa3 arg mem_sensor_poweron_init ,regc +0588 20403f65 call mouse_sensor_spi_init +0589 6fe0c927 fetch 1 ,mem_config_sensor_type +058a c005858f beq ka8g2 ,p_mouse_ka8g2_sensor_init +058b 20404232 call mouse_sensor_reset +058c da604aa3 arg mem_sensor_poweron_init ,regc p_mouse_sensor_end: -0592 2040422b call mouse_sensor_wr_seq -0593 202003a9 branch p_mouse_seting_sensor_type +058d 2040422b call mouse_sensor_wr_seq +058e 202003a9 branch p_mouse_seting_sensor_type p_mouse_ka8g2_sensor_init: -0594 2040059a call p_mouse_ka8g2_sensor_reset -0595 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc -0596 20200592 branch p_mouse_sensor_end +058f 20400595 call p_mouse_ka8g2_sensor_reset +0590 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc +0591 2020058d branch p_mouse_sensor_end p_mouse_sensor_reset: -0597 6fe0c927 fetch 1 ,mem_config_sensor_type -0598 c005859a beq ka8g2 ,p_mouse_ka8g2_sensor_reset -0599 20204232 branch mouse_sensor_reset +0592 6fe0c927 fetch 1 ,mem_config_sensor_type +0593 c0058595 beq ka8g2 ,p_mouse_ka8g2_sensor_reset +0594 20204232 branch mouse_sensor_reset p_mouse_ka8g2_sensor_reset: -059a 58009706 setarg 0x9706 -059b 20204233 branch mouse_sensor_reset_end +0595 58009706 setarg 0x9706 +0596 20204233 branch mouse_sensor_reset_end p_mouse_sensor_powerdown: -059c 204041a7 call mouse_init_sunt -059d 20403f65 call mouse_sensor_spi_init -059e 6fe0c927 fetch 1 ,mem_config_sensor_type -059f c00585a1 beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown -05a0 2020423e branch mouse_sensor_powerdown_end +0597 204041a7 call mouse_init_sunt +0598 20403f65 call mouse_sensor_spi_init +0599 6fe0c927 fetch 1 ,mem_config_sensor_type +059a c005859c beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown +059b 2020423e branch mouse_sensor_powerdown_end p_mouse_ka8g2_sensor_powerdown: -05a1 58001f06 setarg 0x1f06 -05a2 20205b0c branch twspi_write +059c 58001f06 setarg 0x1f06 +059d 20205b0c branch twspi_write p_mouse_key: -05a3 204005a5 call p_mouse_check_key_gpio -05a4 202040dd branch mouse_key + 1 +059e 204005a0 call p_mouse_check_key_gpio +059f 202040dd branch mouse_key + 1 p_mouse_check_key_gpio: -05a5 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -05a6 245a4121 ncall mouse_check_key_gpio_once ,blank -05a7 da200000 arg 0 ,rega -05a8 204005af call p_mouse_check_lkey_gpio -05a9 204005b4 call p_mouse_check_rkey_gpio -05aa 204005b9 call p_mouse_check_mkey_gpio -05ab 204005be call p_mouse_check_bkkey_gpio -05ac 204005cb call p_mouse_check_fwkey_gpio -05ad 204005de call p_mouse_check_customerkey_gpio -05ae 2020411f branch mouse_check_key_gpio_next + 1 +05a0 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +05a1 245a4121 ncall mouse_check_key_gpio_once ,blank +05a2 da200000 arg 0 ,rega +05a3 204005aa call p_mouse_check_lkey_gpio +05a4 204005af call p_mouse_check_rkey_gpio +05a5 204005b4 call p_mouse_check_mkey_gpio +05a6 204005b9 call p_mouse_check_bkkey_gpio +05a7 204005c6 call p_mouse_check_fwkey_gpio +05a8 204005d9 call p_mouse_check_customerkey_gpio +05a9 2020411f branch mouse_check_key_gpio_next + 1 p_mouse_check_lkey_gpio: -05af 6fe0c918 fetch 1 ,mem_lbutton_gpio -05b0 204005d8 call p_mouse_gpio_config_output_high -05b1 20404124 call mouse_check_lkey_gpio -05b2 6848c918 fetcht 1 ,mem_lbutton_gpio -05b3 20203f56 branch mouse_gpio_config_input_pu +05aa 6fe0c918 fetch 1 ,mem_lbutton_gpio +05ab 204005d3 call p_mouse_gpio_config_output_high +05ac 20404124 call mouse_check_lkey_gpio +05ad 6848c918 fetcht 1 ,mem_lbutton_gpio +05ae 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -05b4 6fe0c919 fetch 1 ,mem_rbutton_gpio -05b5 204005d8 call p_mouse_gpio_config_output_high -05b6 2040412a call mouse_check_rkey_gpio -05b7 6848c919 fetcht 1 ,mem_rbutton_gpio -05b8 20203f56 branch mouse_gpio_config_input_pu +05af 6fe0c919 fetch 1 ,mem_rbutton_gpio +05b0 204005d3 call p_mouse_gpio_config_output_high +05b1 2040412a call mouse_check_rkey_gpio +05b2 6848c919 fetcht 1 ,mem_rbutton_gpio +05b3 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -05b9 6fe0c91a fetch 1 ,mem_mbutton_gpio -05ba 204005d8 call p_mouse_gpio_config_output_high -05bb 20404130 call mouse_check_mkey_gpio -05bc 6848c91a fetcht 1 ,mem_mbutton_gpio -05bd 20203f56 branch mouse_gpio_config_input_pu +05b4 6fe0c91a fetch 1 ,mem_mbutton_gpio +05b5 204005d3 call p_mouse_gpio_config_output_high +05b6 20404130 call mouse_check_mkey_gpio +05b7 6848c91a fetcht 1 ,mem_mbutton_gpio +05b8 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -05be 6fe0c90d fetch 1 ,mem_bk_button_gpio -05bf c17f8000 rtneq gpio_disable -05c0 704b9603 jam mouse_bk_key ,mem_mouse_key_temp -05c1 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status -05c2 1fe22600 copy pdata ,regc -05c3 6848c90d fetcht 1 ,mem_bk_button_gpio -05c4 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05c5 c07f85c7 beq gpio_disable ,p_mouse_3io6key_bk_check -05c6 2020413e branch mouse_check_bkkey_gpio_next +05b9 6fe0c90d fetch 1 ,mem_bk_button_gpio +05ba c17f8000 rtneq gpio_disable +05bb 704b9603 jam mouse_bk_key ,mem_mouse_key_temp +05bc 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status +05bd 1fe22600 copy pdata ,regc +05be 6848c90d fetcht 1 ,mem_bk_button_gpio +05bf 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05c0 c07f85c2 beq gpio_disable ,p_mouse_3io6key_bk_check +05c1 2020413e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -05c7 6fe0c90d fetch 1 ,mem_bk_button_gpio -05c8 204005db call p_mouse_gpio_config_output_low -05c9 6848c90d fetcht 1 ,mem_bk_button_gpio -05ca 2020414b branch mouse_3io6key_bk_check +05c2 6fe0c90d fetch 1 ,mem_bk_button_gpio +05c3 204005d6 call p_mouse_gpio_config_output_low +05c4 6848c90d fetcht 1 ,mem_bk_button_gpio +05c5 2020414b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -05cb 6fe0c90e fetch 1 ,mem_fw_button_gpio -05cc c17f8000 rtneq gpio_disable -05cd 704b9604 jam mouse_fw_key ,mem_mouse_key_temp -05ce 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status -05cf 1fe22600 copy pdata ,regc -05d0 6848c90e fetcht 1 ,mem_fw_button_gpio -05d1 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05d2 c07f85d4 beq gpio_disable ,p_mouse_3io6key_fw_check -05d3 20204157 branch mouse_check_fwkey_gpio_next +05c6 6fe0c90e fetch 1 ,mem_fw_button_gpio +05c7 c17f8000 rtneq gpio_disable +05c8 704b9604 jam mouse_fw_key ,mem_mouse_key_temp +05c9 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status +05ca 1fe22600 copy pdata ,regc +05cb 6848c90e fetcht 1 ,mem_fw_button_gpio +05cc 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05cd c07f85cf beq gpio_disable ,p_mouse_3io6key_fw_check +05ce 20204157 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -05d4 6fe0c90e fetch 1 ,mem_fw_button_gpio -05d5 204005db call p_mouse_gpio_config_output_low -05d6 6848c90e fetcht 1 ,mem_fw_button_gpio -05d7 20204164 branch mouse_3io6key_fw_check +05cf 6fe0c90e fetch 1 ,mem_fw_button_gpio +05d0 204005d6 call p_mouse_gpio_config_output_low +05d1 6848c90e fetcht 1 ,mem_fw_button_gpio +05d2 20204164 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -05d8 c17f8000 rtneq gpio_disable -05d9 d840003f arg gpcfg_output_high ,temp -05da 20206093 branch gpio_config_function_int +05d3 c17f8000 rtneq gpio_disable +05d4 d840003f arg gpcfg_output_high ,temp +05d5 20206093 branch gpio_config_function_int p_mouse_gpio_config_output_low: -05db c17f8000 rtneq gpio_disable -05dc d840003e arg gpcfg_output_low ,temp -05dd 20206093 branch gpio_config_function_int +05d6 c17f8000 rtneq gpio_disable +05d7 d840003e arg gpcfg_output_low ,temp +05d8 20206093 branch gpio_config_function_int p_mouse_check_customerkey_gpio: -05de 6fe0cd9a fetch 1 ,mem_mouse_customer_key_connect_vin_flag -05df 203a416a branch mouse_check_customerkey_gpio ,blank -05e0 704b8b00 jam 0 ,mem_customer_key -05e1 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05e2 c40a8000 rtnbit0 mouse_enable_keyboard -05e3 704b9607 jam mouse_customer_key ,mem_mouse_key_temp -05e4 6fe0cb95 fetch 1 ,mem_mouse_customerkey_press_status -05e5 1fe22600 copy pdata ,regc +05d9 6fe0cd9a fetch 1 ,mem_mouse_customer_key_connect_vin_flag +05da 203a416a branch mouse_check_customerkey_gpio ,blank +05db 704b8b00 jam 0 ,mem_customer_key +05dc 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05dd c40a8000 rtnbit0 mouse_enable_keyboard +05de 704b9607 jam mouse_customer_key ,mem_mouse_key_temp +05df 6fe0cb95 fetch 1 ,mem_mouse_customerkey_press_status +05e0 1fe22600 copy pdata ,regc p_mouse_3io6key_customerkey_check: -05e6 6fe0c912 fetch 1 ,mem_customer_key_gpio -05e7 204005db call p_mouse_gpio_config_output_low -05e8 6848c912 fetcht 1 ,mem_customer_key_gpio -05e9 20404195 call mouse_3io6key_check -05ea 67e0cb95 store 1 ,mem_mouse_customerkey_press_status -05eb 20404174 call mouse_check_customerkey_state -05ec 6848c912 fetcht 1 ,mem_customer_key_gpio -05ed 20203f56 branch mouse_gpio_config_input_pu +05e1 6fe0c912 fetch 1 ,mem_customer_key_gpio +05e2 204005d6 call p_mouse_gpio_config_output_low +05e3 6848c912 fetcht 1 ,mem_customer_key_gpio +05e4 20404195 call mouse_3io6key_check +05e5 67e0cb95 store 1 ,mem_mouse_customerkey_press_status +05e6 20404174 call mouse_check_customerkey_state +05e7 6848c912 fetcht 1 ,mem_customer_key_gpio +05e8 20203f56 branch mouse_gpio_config_input_pu p_mouse_idle: -05ee 204005f4 call p_mouse_low_voltage_led_no_enter_lpm -05ef 20407936 call ui_check_paring_button -05f0 20400612 call p_mouse_dpi_check -05f1 204005f8 call p_mouse_select_device_check -05f2 20400603 call p_mouse_check_select_device_by_switch -05f3 20204651 branch mouse_idle + 6 +05e9 204005ef call p_mouse_low_voltage_led_no_enter_lpm +05ea 20407936 call ui_check_paring_button +05eb 2040060d call p_mouse_dpi_check +05ec 204005f3 call p_mouse_select_device_check +05ed 204005fe call p_mouse_check_select_device_by_switch +05ee 20204651 branch mouse_idle + 6 p_mouse_low_voltage_led_no_enter_lpm: -05f4 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -05f5 c4018000 rtnbit0 mouse_enable_low_led -05f6 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05f7 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 +05ef 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config +05f0 c4018000 rtnbit0 mouse_enable_low_led +05f1 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05f2 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 p_mouse_select_device_check: -05f8 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05f9 c29485fc bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge -05fa c29b85fc bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge -05fb 20600000 rtn +05f3 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05f4 c29485f7 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge +05f5 c29b85f7 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge +05f6 20600000 rtn p_mouse_select_device_by_pb_button_check_judge: -05fc 6fe1478c fetch 2 ,mem_ui_state_map -05fd c283026d bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once -05fe 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio -05ff c17f8000 rtneq gpio_disable -0600 6fe0c9bf fetch 1 ,mem_store_information_delay_timer -0601 247a0000 nrtn blank -0602 2020465c branch mouse_select_device_by_pb_button + 2 +05f7 6fe1478c fetch 2 ,mem_ui_state_map +05f8 c283026d bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once +05f9 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio +05fa c17f8000 rtneq gpio_disable +05fb 6fe0c9bf fetch 1 ,mem_store_information_delay_timer +05fc 247a0000 nrtn blank +05fd 2020465c branch mouse_select_device_by_pb_button + 2 p_mouse_check_select_device_by_switch: -0603 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0604 c4150000 rtnbit0 mouse_enable_select_device_by_switch_gpio -0605 6848c91e fetcht 1 ,mem_device_switch_gpio -0606 20403f56 call mouse_gpio_config_input_pu -0607 6848c91e fetcht 1 ,mem_device_switch_gpio -0608 20406059 call gpio_get_bit -0609 2020860e branch p_mouse_check_select_24g_device ,true +05fe 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05ff c4150000 rtnbit0 mouse_enable_select_device_by_switch_gpio +0600 6848c91e fetcht 1 ,mem_device_switch_gpio +0601 20403f56 call mouse_gpio_config_input_pu +0602 6848c91e fetcht 1 ,mem_device_switch_gpio +0603 20406059 call gpio_get_bit +0604 20208609 branch p_mouse_check_select_24g_device ,true p_mouse_select_btdevice: -060a 6fe0c938 fetch 1 ,mem_device_flag -060b c1008000 rtneq mode_bt_device1 -060c 70493801 jam mode_bt_device1 ,mem_device_flag -060d 202046c0 branch mouse_soft_reset +0605 6fe0c938 fetch 1 ,mem_device_flag +0606 c1008000 rtneq mode_bt_device1 +0607 70493801 jam mode_bt_device1 ,mem_device_flag +0608 202046c0 branch mouse_soft_reset p_mouse_check_select_24g_device: -060e 6fe0c938 fetch 1 ,mem_device_flag -060f c1000000 rtneq mode_24g_device -0610 70493800 jam mode_24g_device ,mem_device_flag -0611 202046c0 branch mouse_soft_reset +0609 6fe0c938 fetch 1 ,mem_device_flag +060a c1000000 rtneq mode_24g_device +060b 70493800 jam mode_24g_device ,mem_device_flag +060c 202046c0 branch mouse_soft_reset p_mouse_dpi_check: -0612 6fe0c90f fetch 1 ,mem_dpi_button_gpio -0613 c17f8000 rtneq gpio_disable -0614 da200000 arg 0 ,rega -0615 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -0616 6848c90f fetcht 1 ,mem_dpi_button_gpio -0617 20400619 call p_mouse_dpi_key_check -0618 2020402f branch mouse_dpi_check_next +060d 6fe0c90f fetch 1 ,mem_dpi_button_gpio +060e c17f8000 rtneq gpio_disable +060f da200000 arg 0 ,rega +0610 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +0611 6848c90f fetcht 1 ,mem_dpi_button_gpio +0612 20400614 call p_mouse_dpi_key_check +0613 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -0619 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -061a c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -061b 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -061c 1fe22600 copy pdata ,regc -061d 6fe0c910 fetch 1 ,mem_matrix_public_gpio -061e c07f8620 beq gpio_disable ,p_mouse_3io6key_dpi_check -061f 2020403f branch mouse_dpi_key_check_next +0614 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0615 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +0616 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +0617 1fe22600 copy pdata ,regc +0618 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0619 c07f861b beq gpio_disable ,p_mouse_3io6key_dpi_check +061a 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -0620 6fe0c90f fetch 1 ,mem_dpi_button_gpio -0621 204005db call p_mouse_gpio_config_output_low -0622 6848c90f fetcht 1 ,mem_dpi_button_gpio -0623 20204195 branch mouse_3io6key_check +061b 6fe0c90f fetch 1 ,mem_dpi_button_gpio +061c 204005d6 call p_mouse_gpio_config_output_low +061d 6848c90f fetcht 1 ,mem_dpi_button_gpio +061e 20204195 branch mouse_3io6key_check p_mouse_dpi_process: -0624 20404072 call mouse_dpi_ghost_check -0625 20740000 rtn user +061f 20404072 call mouse_dpi_ghost_check +0620 20740000 rtn user p_mouse_dpi_process_next: -0626 6fe0c992 fetch 1 ,mem_mouse_dpi -0627 1fe0fe01 increase 1 ,pdata -0628 1fe17e03 and pdata ,0x03 ,pdata +0621 6fe0c992 fetch 1 ,mem_mouse_dpi +0622 1fe0fe01 increase 1 ,pdata +0623 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -0629 67e0c992 store 1 ,mem_mouse_dpi -062a 204003a7 call p_mouse_seting_dpi -062b 20204643 branch mouse_store_eerpom_dpi +0624 67e0c992 store 1 ,mem_mouse_dpi +0625 204003a7 call p_mouse_seting_dpi +0626 20204643 branch mouse_store_eerpom_dpi p_power_ctrl_start: -062c 6fe1478c fetch 2 ,mem_ui_state_map -062d c3858000 rtnbit1 ui_state_ble_adv -062e c3838000 rtnbit1 ui_state_bt_reconnect -062f c3830000 rtnbit1 ui_state_bt_discovery -0630 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -0631 204025cb call rssi_average -0632 6048c8c7 storet 1 ,mem_rssi_avg_received -0633 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g -0634 c5130636 bmark1 mark_24g ,p_power_ctrl_start_next -0635 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble +0627 6fe1478c fetch 2 ,mem_ui_state_map +0628 c3858000 rtnbit1 ui_state_ble_adv +0629 c3838000 rtnbit1 ui_state_bt_reconnect +062a c3830000 rtnbit1 ui_state_bt_discovery +062b 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +062c 204025cb call rssi_average +062d 6048c8c7 storet 1 ,mem_rssi_avg_received +062e 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g +062f c5130631 bmark1 mark_24g ,p_power_ctrl_start_next +0630 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble p_power_ctrl_start_next: -0636 98467c00 isub temp ,null -0637 24210650 nbranch p_power_ctrl_txpower_incrs_force ,positive -0638 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -0639 1fe67c02 sub pdata ,2 ,null -063a 2421063e nbranch p_power_ctrl_txpower_decrs_check ,positive -063b 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -063c c0000651 beq 0 ,p_power_ctrl_txpower_incrs -063d 20600000 rtn +0631 98467c00 isub temp ,null +0632 2421064b nbranch p_power_ctrl_txpower_incrs_force ,positive +0633 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0634 1fe67c02 sub pdata ,2 ,null +0635 24210639 nbranch p_power_ctrl_txpower_decrs_check ,positive +0636 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0637 c000064c beq 0 ,p_power_ctrl_txpower_incrs +0638 20600000 rtn p_power_ctrl_txpower_decrs_check: -063e 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -063f 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init -0640 98467c00 isub temp ,null -0641 24628000 nrtn zero -0642 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +0639 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +063a 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init +063b 98467c00 isub temp ,null +063c 24628000 nrtn zero +063d 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_decrs: -0643 6848c8c7 fetcht 1 ,mem_rssi_avg_received -0644 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g -0645 c5130647 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next -0646 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble +063e 6848c8c7 fetcht 1 ,mem_rssi_avg_received +063f 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g +0640 c5130642 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next +0641 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble p_power_ctrl_txpower_decrs_next: -0647 98467c00 isub temp ,null -0648 24610000 nrtn positive -0649 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -064a c000271b beq 0 ,power_ctrl_decrs_level0 -064b 1fe0ffff increase -1 ,pdata -064c 67e0c8c8 store 1 ,mem_power_ctrl_level -064d c0010658 beq 2 ,p_power_ctrl_decrs_level2 -064e c000a711 beq 1 ,power_ctrl_decrs_level1 -064f 2020271b branch power_ctrl_decrs_level0 +0642 98467c00 isub temp ,null +0643 24610000 nrtn positive +0644 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +0645 c000271b beq 0 ,power_ctrl_decrs_level0 +0646 1fe0ffff increase -1 ,pdata +0647 67e0c8c8 store 1 ,mem_power_ctrl_level +0648 c0010653 beq 2 ,p_power_ctrl_decrs_level2 +0649 c000a711 beq 1 ,power_ctrl_decrs_level1 +064a 2020271b branch power_ctrl_decrs_level0 p_power_ctrl_txpower_incrs_force: -0650 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +064b 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_incrs: -0651 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -0652 c0018657 beq 3 ,p_power_ctrl_incrs_level3 -0653 1fe0fe01 increase 1 ,pdata -0654 67e0c8c8 store 1 ,mem_power_ctrl_level -0655 c000a711 beq 1 ,power_ctrl_incrs_level1 -0656 c0010658 beq 2 ,p_power_ctrl_incrs_level2 +064c 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +064d c0018652 beq 3 ,p_power_ctrl_incrs_level3 +064e 1fe0fe01 increase 1 ,pdata +064f 67e0c8c8 store 1 ,mem_power_ctrl_level +0650 c000a711 beq 1 ,power_ctrl_incrs_level1 +0651 c0010653 beq 2 ,p_power_ctrl_incrs_level2 p_power_ctrl_incrs_level3: -0657 20200658 branch p_power_ctrl_incrs_level2 +0652 20200653 branch p_power_ctrl_incrs_level2 p_power_ctrl_decrs_level2: p_power_ctrl_incrs_level2: -0658 7041e803 jam tx_power_3db ,mem_tx_power -0659 20600000 rtn +0653 7041e803 jam tx_power_3db ,mem_tx_power +0654 20600000 rtn org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/program/patch.prog (revision 5197) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/program/patch.prog (working copy) @@ -2259,7 +2259,7 @@ and_into 0x1f,pdata store 1,mem_mouse_key nbranch mouse_drawing_optima_init,user - call p_mouse_drawing_optima + // call p_mouse_drawing_optima branch mouse_no_data_timer_init p_mouse_check_sensor_data: @@ -2283,11 +2283,11 @@ branch mouse_p3212_sensor_motion_2 -p_mouse_drawing_optima: - fetch 1,mem_config_sensor_type - rtneq P3212 - rtneq KA8G2 - branch mouse_drawing_optima +// p_mouse_drawing_optima: +// fetch 1,mem_config_sensor_type +// rtneq P3212 +// rtneq KA8G2 +// branch mouse_drawing_optima p_mouse_sensor_poweron: call mouse_sensor_spi_init Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/sched/mouse.dat (revision 5051) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PB_3m_3ch_70_new_low_level/sched/mouse.dat (working copy) @@ -94,7 +94,7 @@ #bit3 MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL #bit4 MOUSE_ENABLE_WHEEL_WAKE_UP_CANCEL #bit5 MOUSE_ENABLE_DOUBLE_DPI_KEY -1b +18 mem_mouse_led_new_interface_config: #bit0 MOUSE_ENABLE_LED_NEW_INTERFACE @@ -103,11 +103,11 @@ #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT #bit5 MOUSE_ENABLE_1IO2LED -2f +23 mem_mouse_discovery_timeout:b0 04 #2min mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer -mem_mouse_direct_timeout:3c #05s +mem_mouse_direct_timeout:64 #05s mem_mouse_24g_reconn_timeout_init:64 #10s mem_mouse_24g_pair_tx_power:94 #pair power @@ -139,7 +139,7 @@ mem_device_switch_gpio:ff mem_mouse_sensor_sclk_gpio:07 mem_mouse_sensor_sdio_gpio:06 -mem_config_low_voltage_alarm_gpio:88 +mem_config_low_voltage_alarm_gpio:ff mem_config_device_bt2_led_gpio:ff mem_dpi_led_gpio:ff #03 mem_firebutton_gpio:ff @@ -172,7 +172,7 @@ mem_mouse_1io2led_multi_24gled:88 mem_mouse_1io2led_multi_bt1led:8a mem_mouse_1io2led_multi_bt2led:0a -mem_mouse_low_gpio:88 +mem_mouse_low_gpio:ff mem_mouse_dpi_gpio:ff #1io2led multi end @@ -243,7 +243,7 @@ #b4 00#mem_mouse_vdd_low_vol :1.0V mem_mouse_vdd_full_vol:4a 01 #3.3V 04 01#mem_mouse_vdd_empty_vol :2.6V -18 01#mem_mouse_vdd_low_vol :2.7V +0e 01#mem_mouse_vdd_low_vol :2.7V mem_mouse_vdd_button_press_vol:10 00 mem_mouse_vdd_switch_gnd_24g_vol:52 00 mem_mouse_vdd_switch_gnd_full_vol:35 00 @@ -264,7 +264,7 @@ mem_app_connection_options:06 mem_lap:10 a3 c8 12 23 51 mem_local_name_length: -'BT3.0 Mouse +'C05-BT1 mem_sniff_param_interval: 0e 00 01 00 ##mem_sniff_param_attempt:01 00 @@ -312,19 +312,19 @@ 'BT5.2 Mouse mem_le_name_patch_len: #max 18bytes -'BT5.1 Mouse +'C05-BT1 + -mem_mouse_le_name_modify_enable:00 #00 disable 01 enable mem_ble_device2_name: #max 18bytes -'BT5.2 Mouse +'C05-BT2 mem_bt_device2_name: -'BT3.0 Mouse - +'C05-BT2 +mem_mouse_le_name_modify_enable:01 #00 disable 01 enable mem_le_interval_min: 06 00 #min interval -09 00 #max interval +07 00 #max interval 20 00 #latency 2c 01 #timeout @@ -386,19 +386,19 @@ 09 00 ff ff -mem_sensor_3204_init: -09 5a -0d f0 -1d e3 -7d d2 -ff ff - -mem_sensor_3205_init: -09 5a -0d 10 -1d ed -7d 80 -ff ff +# mem_sensor_3204_init: +# 09 5a +# 0d f0 +# 1d e3 +# 7d d2 +# ff ff + +# mem_sensor_3205_init: +# 09 5a +# 0d 10 +# 1d ed +# 7d 80 +# ff ff mem_sensor_32xx_init: 1b 35 @@ -434,55 +434,61 @@ 09 00 ff ff -mem_sensor_8650_init: +mem_sensor_8650_init_new: 09 5a ff 27 ab 40 -be d1 -a0 41 -a1 12 +b3 56 +9b e6 +a8 12 +a9 c0 +be e6 +a5 af +a0 21 +a1 02 +b8 10 +b9 0b a7 ff +b5 d0 b6 00 -b5 c8 -a5 af ff 00 09 00 ff ff -mem_sensor_p6520_init: -05 b9 -09 5a -0b 72 -0c 52 -09 00 -ff ff - -mem_sensor_ka8ul_init: -09 5a -0d 10 -0e c5 -5b 9a -10 38 -11 42 -28 28 -41 23 -49 39 -4a b0 -4b a0 -4c 90 -4d 70 -09 00 -ff ff - -mem_sensor_8009_init: -09 5a -06 02 -09 69 -0d 48 -0e 9f -0f ba -09 00 -ff ff +# mem_sensor_p6520_init: +# 05 b9 +# 09 5a +# 0b 72 +# 0c 52 +# 09 00 +# ff ff + +# mem_sensor_ka8ul_init: +# 09 5a +# 0d 10 +# 0e c5 +# 5b 9a +# 10 38 +# 11 42 +# 28 28 +# 41 23 +# 49 39 +# 4a b0 +# 4b a0 +# 4c 90 +# 4d 70 +# 09 00 +# ff ff + +# mem_sensor_8009_init: +# 09 5a +# 06 02 +# 09 69 +# 0d 48 +# 0e 9f +# 0f ba +# 09 00 +# ff ff mem_sensor_ka8g2_init: 09 a5