Index: format/app_mouse.format =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/format/app_mouse.format (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/format/app_mouse.format (working copy) @@ -440,6 +440,7 @@ 12 mem_sensor_sg8670_dpi_1600 12 mem_sensor_sg8670_dpi_2400 12 mem_sensor_sg8670_dpi_2600 +12 mem_sensor_sg8670_dpi_1800 2 mem_mouse_temp_data ) Index: output/memmap.format =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/output/memmap.format (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/output/memmap.format (working copy) @@ -1977,91 +1977,92 @@ 0x4b58 mem_sensor_sg8670_dpi_1600 0x4b64 mem_sensor_sg8670_dpi_2400 0x4b70 mem_sensor_sg8670_dpi_2600 -0x4b7c mem_mouse_temp_data -0x4b7e mem_24g_txpayload_buf -0x4b8e mem_release_data_from_receiver_enable -0x4b8f mem_release_data_from_transmiter_enable -0x4b90 mem_flippen_key0_gpio -0x4b91 mem_flippen_key1_gpio -0x4b92 mem_flippen_key2_gpio -0x4b93 mem_flippen_key3_gpio -0x4b94 mem_flippen_key4_gpio -0x4b95 mem_flippen_key5_gpio -0x4b96 mem_flippen_key6_gpio -0x4b97 mem_flippen_key7_gpio -0x4b98 mem_flippen_key0_press_status -0x4b99 mem_flippen_key1_press_status -0x4b9a mem_flippen_key2_press_status -0x4b9b mem_flippen_key3_press_status -0x4b9c mem_flippen_key4_press_status -0x4b9d mem_flippen_key5_press_status -0x4b9e mem_flippen_key6_press_status -0x4b9f mem_flippen_key7_press_status -0x4ba0 mem_key_press_data -0x4ba0 mem_key_pageup_data -0x4ba9 mem_key_pagedown_data -0x4bb2 mem_key_shift_f5_data -0x4bbb mem_key_esc_data -0x4bc4 mem_key_b_data -0x4bcd mem_key_tab -0x4bd6 mem_key_enter -0x4bdf mem_key_alt_tab -0x4be8 mem_key_alt_f4 -0x4bf1 mem_key_play_pause -0x4bfa mem_key_vol_up -0x4c03 mem_key_vol_down -0x4c0c mem_standard_key_release -0x4c15 mem_system_ctrl_key_release -0x4c1e mem_media_key_release -0x4c27 mem_key0_long_press_flag -0x4c28 mem_key1_long_press_flag -0x4c29 mem_key2_long_press_flag -0x4c2a mem_key3_long_press_flag -0x4c2b mem_key4_long_press_flag -0x4c2c mem_key0_long_press_event -0x4c2d mem_key1_long_press_event -0x4c2e mem_key2_long_press_event -0x4c2f mem_key3_long_press_event -0x4c30 mem_key4_long_press_event -0x4c31 mem_key0_short_press_flag -0x4c32 mem_key1_short_press_flag -0x4c33 mem_key2_short_press_flag -0x4c34 mem_key3_short_press_flag -0x4c35 mem_key4_short_press_flag -0x4c36 mem_key0_press_timer_count -0x4c37 mem_key1_press_timer_count -0x4c38 mem_key2_press_timer_count -0x4c39 mem_key3_press_timer_count -0x4c3a mem_key4_press_timer_count -0x4c3b mem_combination_key_down_flag -0x4c3c mem_combination_key_longpress_flag -0x4c3d mem_key_disable_timer -0x4c3e mem_24g_calculate_package_id_disable -0x4c3f mem_24g_package_id_abandon_flag -0x4c40 mem_24g_package_id -0x4c41 mem_key_state -0x4c42 mem_key_press_state -0x4c43 mem_poweron_first_blank_data_enable -0x4c44 mem_flippen_no_data_timeout -0x4c46 mem_flippen_start_pair_no_data_timeout -0x4c48 mem_key_longpress_timer_init -0x4c4a mem_key_longpress_timer -0x4c4c mem_low_voltage_led_blink_flag -0x4c4d mem_low_voltage_led_blink_start_timer -0x4c4e mem_poweron_led_blink_flag -0x4c4f mem_24g_pair_enable_flag -0x4c50 mem_24g_ch_work -0x4c51 mem_24g_pair_key_down_flag -0x4c52 mem_24g_pairing_stop_flag -0x4c53 mem_longpress_24g_enter_hibernate_flag -0x4c54 mem_g24_connected_state -0x4c55 mem_g24_pairing_stop_flag -0x4c56 mem_send_package_before_check -0x4c57 mem_le_conn_rcv_new -0x4c58 mem_le_conn_first_rcv -0x4c59 mem_le_check_retransmit_flag -0x4c5a mem_le_retransmit_cnt -0x4c5b mem_le_check_retransmit_discon_flag +0x4b7c mem_sensor_sg8670_dpi_1800 +0x4b88 mem_mouse_temp_data +0x4b8a mem_24g_txpayload_buf +0x4b9a mem_release_data_from_receiver_enable +0x4b9b mem_release_data_from_transmiter_enable +0x4b9c mem_flippen_key0_gpio +0x4b9d mem_flippen_key1_gpio +0x4b9e mem_flippen_key2_gpio +0x4b9f mem_flippen_key3_gpio +0x4ba0 mem_flippen_key4_gpio +0x4ba1 mem_flippen_key5_gpio +0x4ba2 mem_flippen_key6_gpio +0x4ba3 mem_flippen_key7_gpio +0x4ba4 mem_flippen_key0_press_status +0x4ba5 mem_flippen_key1_press_status +0x4ba6 mem_flippen_key2_press_status +0x4ba7 mem_flippen_key3_press_status +0x4ba8 mem_flippen_key4_press_status +0x4ba9 mem_flippen_key5_press_status +0x4baa mem_flippen_key6_press_status +0x4bab mem_flippen_key7_press_status +0x4bac mem_key_press_data +0x4bac mem_key_pageup_data +0x4bb5 mem_key_pagedown_data +0x4bbe mem_key_shift_f5_data +0x4bc7 mem_key_esc_data +0x4bd0 mem_key_b_data +0x4bd9 mem_key_tab +0x4be2 mem_key_enter +0x4beb mem_key_alt_tab +0x4bf4 mem_key_alt_f4 +0x4bfd mem_key_play_pause +0x4c06 mem_key_vol_up +0x4c0f mem_key_vol_down +0x4c18 mem_standard_key_release +0x4c21 mem_system_ctrl_key_release +0x4c2a mem_media_key_release +0x4c33 mem_key0_long_press_flag +0x4c34 mem_key1_long_press_flag +0x4c35 mem_key2_long_press_flag +0x4c36 mem_key3_long_press_flag +0x4c37 mem_key4_long_press_flag +0x4c38 mem_key0_long_press_event +0x4c39 mem_key1_long_press_event +0x4c3a mem_key2_long_press_event +0x4c3b mem_key3_long_press_event +0x4c3c mem_key4_long_press_event +0x4c3d mem_key0_short_press_flag +0x4c3e mem_key1_short_press_flag +0x4c3f mem_key2_short_press_flag +0x4c40 mem_key3_short_press_flag +0x4c41 mem_key4_short_press_flag +0x4c42 mem_key0_press_timer_count +0x4c43 mem_key1_press_timer_count +0x4c44 mem_key2_press_timer_count +0x4c45 mem_key3_press_timer_count +0x4c46 mem_key4_press_timer_count +0x4c47 mem_combination_key_down_flag +0x4c48 mem_combination_key_longpress_flag +0x4c49 mem_key_disable_timer +0x4c4a mem_24g_calculate_package_id_disable +0x4c4b mem_24g_package_id_abandon_flag +0x4c4c mem_24g_package_id +0x4c4d mem_key_state +0x4c4e mem_key_press_state +0x4c4f mem_poweron_first_blank_data_enable +0x4c50 mem_flippen_no_data_timeout +0x4c52 mem_flippen_start_pair_no_data_timeout +0x4c54 mem_key_longpress_timer_init +0x4c56 mem_key_longpress_timer +0x4c58 mem_low_voltage_led_blink_flag +0x4c59 mem_low_voltage_led_blink_start_timer +0x4c5a mem_poweron_led_blink_flag +0x4c5b mem_24g_pair_enable_flag +0x4c5c mem_24g_ch_work +0x4c5d mem_24g_pair_key_down_flag +0x4c5e mem_24g_pairing_stop_flag +0x4c5f mem_longpress_24g_enter_hibernate_flag +0x4c60 mem_g24_connected_state +0x4c61 mem_g24_pairing_stop_flag +0x4c62 mem_send_package_before_check +0x4c63 mem_le_conn_rcv_new +0x4c64 mem_le_conn_first_rcv +0x4c65 mem_le_check_retransmit_flag +0x4c66 mem_le_retransmit_cnt +0x4c67 mem_le_check_retransmit_discon_flag 0x462d mem_remote_car_hard_soft_switch 0x462e mem_remote_car_queue_each_size 0x462f mem_remote_car_queue_length Index: output/otp.dat =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/output/otp.dat (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/output/otp.dat (working copy) @@ -1488,7 +1488,7 @@ 50 e6 11 -89 +bd c8 0d 42 @@ -1512,7 +1512,7 @@ dc 27 09 -50 +6c 10 72 eb @@ -1520,7 +1520,7 @@ 09 06 ce -c0 +fc d4 4f 92 @@ -1528,11 +1528,11 @@ e3 73 92 -a7 +9b 29 65 35 -ae +9a b4 49 b0 @@ -1556,7 +1556,7 @@ 8b bd e7 -9b +a7 5d 03 ee @@ -1567,7 +1567,7 @@ 3e 8e c5 -6f +53 b3 47 5b @@ -1575,7 +1575,7 @@ 7b de 34 -fc +c0 7e 24 ab @@ -1608,7 +1608,7 @@ 0e d8 41 -d8 +e4 00 a3 4b @@ -1620,7 +1620,7 @@ 04 d2 c3 -80 +bc a7 7d 5f @@ -1644,7 +1644,7 @@ 13 19 f9 -01 +35 8d a5 1a @@ -1652,7 +1652,7 @@ f6 d1 ca -d4 +e0 22 8f f1 @@ -2172,7 +2172,7 @@ 8a d8 ff -ea +d6 4d 04 38 @@ -2180,7 +2180,7 @@ 42 4a 01 -7f +43 73 ee 1c @@ -4068,7 +4068,7 @@ b4 6d e9 -0e +32 01 4d 7d @@ -4100,11 +4100,11 @@ 6d 8d 47 -7b +4f 2d b1 ef -8e +b2 1a dc 89 @@ -4236,7 +4236,7 @@ e9 6c c3 -65 +59 23 d7 22 @@ -5316,11 +5316,11 @@ 7b f7 78 -7e +8a 95 59 7b -b5 +41 49 ff de @@ -5332,7 +5332,7 @@ d8 70 41 -49 +bd d4 04 17 @@ -5344,7 +5344,7 @@ 63 0b 56 -cf +3b fa af 94 @@ -5384,7 +5384,7 @@ 6a 83 0d -b5 +91 24 66 73 @@ -5669,8 +5669,8 @@ 64 78 03 -c1 -d0 +e7 +6b 88 b2 d7 @@ -5758,8 +5758,8 @@ 12 10 02 -00 -09 +04 +21 1b aa 55 @@ -5770,18 +5770,17 @@ 06 08 07 -ff -ff +06 +07 08 12 14 0d 0f ff +02 +02 00 -00 -00 -ff ff ff ff @@ -5790,10 +5789,11 @@ ff ff ff -05 0a +05 ff ff +15 ff ff ff @@ -6673,7 +6673,7 @@ ff aa 55 -24 +18 00 4c 4b @@ -6701,6 +6701,30 @@ 00 ff ff +aa +55 +0c +00 +7c +4b +7f +26 +7e +00 +6e +ce +6f +4e +7f +00 +ff +ff +aa +55 +0c +00 +64 +4b 7f 26 7e @@ -6871,7 +6895,7 @@ 00 1c 41 -3e +3d aa 55 0c @@ -6984,8 +7008,8 @@ aa aa 55 -ea -66 -06 -01 +47 +6d +fb +2d 20 Index: output/program.lis =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/output/program.lis (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/output/program.lis (working copy) @@ -444,7 +444,7 @@ 016b 20200157 branch p_set_lemode_2m p_le_check_retransmit_timesout: -016c 6fe0cc57 fetch 1 ,mem_le_conn_rcv_new +016c 6fe0cc63 fetch 1 ,mem_le_conn_rcv_new 016d da600100 arg 256 ,regc 016e 9a60fe00 iadd regc ,pdata 016f 20600000 rtn @@ -454,25 +454,25 @@ 0171 20202563 branch le_slave_match + 1 p_le_check_retransmit: -0172 6fe0cc58 fetch 1 ,mem_le_conn_first_rcv +0172 6fe0cc64 fetch 1 ,mem_le_conn_first_rcv 0173 207a0000 rtn blank -0174 6fe0cc59 fetch 1 ,mem_le_check_retransmit_flag +0174 6fe0cc65 fetch 1 ,mem_le_check_retransmit_flag 0175 247a0000 nrtn blank -0176 6848cc58 fetcht 1 ,mem_le_conn_first_rcv -0177 6fe0cc57 fetch 1 ,mem_le_conn_rcv_new +0176 6848cc64 fetcht 1 ,mem_le_conn_first_rcv +0177 6fe0cc63 fetch 1 ,mem_le_conn_rcv_new 0178 98467c00 isub temp ,null 0179 2441016c ncall p_le_check_retransmit_timesout ,positive 017a 98467e00 isub temp ,pdata 017b 1fe67c64 sub pdata ,100 ,null 017c 20210184 branch p_le_check_retransmit_count ,positive -017d 6fe0cc5a fetch 1 ,mem_le_retransmit_cnt +017d 6fe0cc66 fetch 1 ,mem_le_retransmit_cnt 017e 1fe67c14 sub pdata ,20 ,null 017f 24410182 ncall p_app_ble_disconnect ,positive -0180 704c5901 jam 1 ,mem_le_check_retransmit_flag +0180 704c6501 jam 1 ,mem_le_check_retransmit_flag 0181 20600000 rtn p_app_ble_disconnect: -0182 704c5b01 jam 1 ,mem_le_check_retransmit_discon_flag +0182 704c6701 jam 1 ,mem_le_check_retransmit_discon_flag 0183 2020431f branch app_ble_disconnect p_le_check_retransmit_count: @@ -482,10 +482,10 @@ 0187 9842fe00 ixor temp ,pdata 0188 2feffe02 isolate1 nesn ,pdata 0189 58000000 setarg 0 -018a 6848cc5a fetcht 1 ,mem_le_retransmit_cnt +018a 6848cc66 fetcht 1 ,mem_le_retransmit_cnt 018b 7920fe00 setflag true ,0 ,pdata 018c 98408400 iadd temp ,temp -018d 6048cc5a storet 1 ,mem_le_retransmit_cnt +018d 6048cc66 storet 1 ,mem_le_retransmit_cnt 018e 20600000 rtn p_le_got_first_packet_new: @@ -493,9 +493,9 @@ 0190 1fe0fe01 increase 1 ,pdata 0191 67e08005 store 1 ,mem_le_conn_rcv 0192 24368196 nbranch p_le_got_first_packet_new + 7 ,match -0193 6fe0cc57 fetch 1 ,mem_le_conn_rcv_new +0193 6fe0cc63 fetch 1 ,mem_le_conn_rcv_new 0194 1fe0fe01 increase 1 ,pdata -0195 67e0cc57 store 1 ,mem_le_conn_rcv_new +0195 67e0cc63 store 1 ,mem_le_conn_rcv_new 0196 2020259b branch le_got_first_packet + 4 p_le_rx_dec: @@ -659,9 +659,9 @@ 0214 6fe0c843 fetch 1 ,mem_le_connect_status_flag 0215 1fe17e03 and pdata ,0x03 ,pdata 0216 c1818000 rtnne 0x03 -0217 6fe0cc59 fetch 1 ,mem_le_check_retransmit_flag +0217 6fe0cc65 fetch 1 ,mem_le_check_retransmit_flag 0218 207a0000 rtn blank -0219 6fe0cc5b fetch 1 ,mem_le_check_retransmit_discon_flag +0219 6fe0cc67 fetch 1 ,mem_le_check_retransmit_discon_flag 021a 247a0000 nrtn blank p_mouse_le_next: @@ -1315,7 +1315,7 @@ p_mouse_le_bb_event_connected: 03f0 58000000 setarg 0 -03f1 67e24c58 store 4 ,mem_le_conn_first_rcv +03f1 67e24c64 store 4 ,mem_le_conn_first_rcv 03f2 20205ad0 branch mouse_le_bb_event_connected p_mouse_le_ll_start_encryt: @@ -1329,8 +1329,8 @@ 03f8 70484405 jam 5 ,mem_le_start_encrypt_timer p_mouse_le_ll_reconn_start_encryt_new: -03f9 6fe0cc57 fetch 1 ,mem_le_conn_rcv_new -03fa 67e0cc58 store 1 ,mem_le_conn_first_rcv +03f9 6fe0cc63 fetch 1 ,mem_le_conn_rcv_new +03fa 67e0cc64 store 1 ,mem_le_conn_first_rcv 03fb 20205af6 branch mouse_le_ll_enable_start_enc_flag p_mouse_le_conn_param_update_rsp_recieved: @@ -1373,7 +1373,7 @@ 0418 1fe17e03 and pdata ,0x03 ,pdata 0419 20405b21 call mouse_le_clean_connect_flag 041a c081d4a9 bne 0x03 ,mouse_start_reconnect -041b 6fe0cc5b fetch 1 ,mem_le_check_retransmit_discon_flag +041b 6fe0cc67 fetch 1 ,mem_le_check_retransmit_discon_flag 041c 243a54a9 nbranch mouse_start_reconnect ,blank 041d 202054cd branch mouse_app_enter_hibernate @@ -1743,16 +1743,16 @@ p_mouse_xy_zoom: 0527 1fe20400 copy pdata ,temp 0528 9840fe00 iadd temp ,pdata -0529 67e14b7c store 2 ,mem_mouse_temp_data -052a 6fe0cb7d fetch 1 ,mem_mouse_temp_data + 1 +0529 67e14b88 store 2 ,mem_mouse_temp_data +052a 6fe0cb89 fetch 1 ,mem_mouse_temp_data + 1 052b 1fe67c07 sub pdata ,0x7 ,null 052c 2441052f ncall p_mouse_xy_forward_overflow ,positive -052d 6fe14b7c fetch 2 ,mem_mouse_temp_data +052d 6fe14b88 fetch 2 ,mem_mouse_temp_data 052e 20600000 rtn p_mouse_xy_forward_overflow: 052f 580007ff setarg 0x7ff -0530 67e14b7c store 2 ,mem_mouse_temp_data +0530 67e14b88 store 2 ,mem_mouse_temp_data 0531 20600000 rtn p_mouse_setting_sensor_type: @@ -1768,7 +1768,7 @@ 0539 c001853a beq mouse_dpi_level4 ,p_mouse_set_sg8670_dpi_4 p_mouse_set_sg8670_dpi_4: -053a da604b58 arg mem_sensor_sg8670_dpi_1600 ,regc +053a da604b7c arg mem_sensor_sg8670_dpi_1800 ,regc 053b 20205995 branch mouse_sensor_wr_seq p_mouse_set_sg8670_dpi_3: Index: program/patch.prog =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/program/patch.prog (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/program/patch.prog (working copy) @@ -1994,8 +1994,8 @@ beq MOUSE_DPI_LEVEL2,p_mouse_set_SG8670_dpi_2 //1600 beq MOUSE_DPI_LEVEL3,p_mouse_set_SG8670_dpi_3 //2400 beq MOUSE_DPI_LEVEL4,p_mouse_set_SG8670_dpi_4 //3200 -p_mouse_set_SG8670_dpi_4: //1600 --> 3200 - arg mem_sensor_sg8670_dpi_1600,regc +p_mouse_set_SG8670_dpi_4: //1800 --> 3600 + arg mem_sensor_sg8670_dpi_1800,regc branch mouse_sensor_wr_seq p_mouse_set_SG8670_dpi_3: //2400 Index: sched/1305.dat =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/sched/1305.dat (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/sched/1305.dat (working copy) @@ -9,7 +9,7 @@ mem_lpm_hv_sel:b4 mem_fcomp_div:18 -mem_xtal_c_sel:3e +mem_xtal_c_sel:3d mem_gpio_wakeup_cfg:00 00 20 00 00 00 00 00 00 00 00 00 mem_version:08 0e 05 03 00 Index: sched/mouse.dat =================================================================== --- /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/sched/mouse.dat (revision 4404) +++ /1121s/branch/mouse/MZ_Project/1m/mouse_public_1M_8670/sched/mouse.dat (working copy) @@ -61,7 +61,7 @@ #bit5 MOUSE_ENABLE_PB_BUTTON_CONNECT_GND #bit6 MOUSE_ENABLE_FIRE_KEY_CONNECT_GND #bit7 MOUSE_ENABLE_CUSTOMER_KEY_CONNECT_VIN_OR_MATRIX -00 +04 #mouse flag byte7 #bit0 MOUSE_ENABLE_AUTO_24G_PARING @@ -72,7 +72,7 @@ #bit5 MOUSE_ENABLE_COMMBINATION_KEY_BY_BT_DISCOVERY #bit6 MOUSE_ENABLE_DPI_KEY_LONG_PRESS_DISCONVERY #bit7 MOUSE_ENABLE_PB_BUTTON_LONG_PRESS_DISCONVERY -09 +21 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -89,16 +89,16 @@ 06 #mem_lbutton_gpio 08 #mem_mbutton_gpio 07 #mem_rbutton_gpio -ff #mem_bk_button_gpio -ff #mem_fw_button_gpio +06 #mem_bk_button_gpio +07 #mem_fw_button_gpio 08 #mem_dpi_button_gpio 12 #mem_whee_a_data_gpio 14 #mem_whee_b_data_gpio 0d #mem_mouse_sensor_sclk_gpio 0f #mem_mouse_sensor_sdio_gpio ff #mem_select_sensor_angle_gpio -00 #mem_sensor_angle_default -00 #mem_sensor_angle_switch +02 #mem_sensor_angle_default +02 #mem_sensor_angle_switch 00 #mem_config_sensor_dpi #power on default dpi 00--1200 01--1600 ff #mem_whee_ta_data_gpio ff #mem_whee_tb_data_gpio @@ -108,11 +108,11 @@ ff #mem_firebutton_gpio ff #mem_dpi_another_button_gpio ff #mem_sensor_motion_gpio -ff #mem_device_switch_gpio +0a #mem_device_switch_gpio 05 #mem_mouse_reuse_2ice_gpio -0a #mem_mouse_logo_led_gpio +ff #mem_mouse_logo_led_gpio ff #mem_mouse_1io2led_multi_24gled -ff #mem_mouse_1io2led_multi_bt1led +15 #mem_mouse_1io2led_multi_bt1led ff #mem_mouse_1io2led_multi_bt2led ff #mem_mouse_low_voltage_alarm_gpio ff #mem_mouse_dpi_gpio @@ -399,6 +399,17 @@ # 09 00 7f 00 ff ff + +mem_sensor_sg8670_dpi_1800: +# 09 5a +7f 26 +7e 00 +6e ce +6f 4e +# 09 00 +7f 00 +ff ff + mem_sensor_sg8670_dpi_2400: #2400 # 09 5a 7f 26