Index: YJX_Only24g/main/d.bat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g/main/d.bat (revision 1053) +++ /branch/mouse_project/YJX_Project/YJX_Only24g/main/d.bat (working copy) @@ -1,4 +1,7 @@ call do.bat eep +e ku +e au +ping -n 2 127.1 >nul e pu e 8081 10 e 8075 0000 Index: YJX_Only24g/main/format/bt.format =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g/main/format/bt.format (revision 1053) +++ /branch/mouse_project/YJX_Project/YJX_Only24g/main/format/bt.format (working copy) @@ -1005,7 +1005,7 @@ 0 bt_disabled 1 ble_disabled 2 module_disable - +3 g24_disabled ) ( Index: YJX_Only24g/main/program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g/main/program/patch.prog (revision 1053) +++ /branch/mouse_project/YJX_Project/YJX_Only24g/main/program/patch.prog (working copy) @@ -72,6 +72,7 @@ beq patch31_0,p_process_conn_sm // beq patch39_5,p_sdp_process endif + beq patch27_7,p_le_enable beq patch31_4,p_twspi_reset ifdef DEBUGLOG beq patch2f_6,p_parse_lmp_opcode @@ -1186,7 +1187,9 @@ p_mouse_setgpio_lpm: call p_mouse_set_sdio_high call p_clear_wake +p_mouse_setgpio_lpm_before: call mouse_lpm_before_common + call p_ice_gpio_set_input_pu hfetch 4,core_gpio_oe0 hfetcht 4,core_gpio_pu0 ior temp,temp @@ -1408,11 +1411,11 @@ nop 12000 branch p_mouse_dpi_config p_mouse_sensor_powerdown: - setarg 0x06 - call twspi_read - or pdata,0x08,pdata - lshift8 pdata,pdata - add pdata,0x06,pdata + setarg 0x0806 +// call twspi_read +// or pdata,0x08,pdata +// lshift8 pdata,pdata +// add pdata,0x06,pdata branch twspi_write //make sdio high p_mouse_setting_config: @@ -1465,7 +1468,7 @@ call gpio_get_bit jam MOUSE_12CLK_ANGLE,mem_config_sensor_angle rtn true - jam MOUSE_9CLK_ANGLE,mem_config_sensor_angle + jam MOUSE_3CLK_ANGLE,mem_config_sensor_angle rtn ifdef CLASSIC_BT @@ -1893,7 +1896,7 @@ call p_mouse_tx_power_init call p_g24_check_51cmd_stop_24g fetch 1,mem_mouse_mode_config - bbit1 MOUSE_24G_ONLY,p_mouse_null_enter_hibernate_enable + bbit1 MOUSE_24G_ONLY,app_enter_hibernate jam 0,mem_link_key_exists call mouse_eeprom_load_recon_info arg 3,loopcnt @@ -1921,8 +1924,18 @@ call disable_authrom call mouse_devce_led_off call mouse_before_hibernate_wheel_gpio_set - call mouse_lpm_before_common - branch p_mouse_multi_led_off2 + branch p_mouse_setgpio_lpm_before + + + +p_ice_gpio_set_input_pu: + arg 29,temp + call gpio_config_input + arg 29,temp + set1 gpio_active_bit,temp + arg core_gpio_pu0,contw + branch gpio_set_bit + p_mouse_sensor_powerdown_check: fetch 1,mem_mouse_init_sensor_reset_flag @@ -2804,8 +2817,8 @@ fetch 2,mem_ui_state_map bbit1 UI_STATE_BTN_DOWN,mouse_start_discovery call app_disconn_reason_clear - call p_mouse_check_key_gpio - beq MOUSE_LMR_BUTTON,p_mouse_null_enter_hibernate_enable +// call p_mouse_check_key_gpio +// beq MOUSE_LMR_BUTTON,p_mouse_null_enter_hibernate_enable branch app_bb_hibernate p_hid_rx_process: @@ -3007,7 +3020,7 @@ endif p_g24_set_device_addr: - call adc_init_data +// call adc_init_data // fetch 4,mem_0_5_adc_io_data //adc data from otp // store 4,mem_24g_device_addr // nrtn blank @@ -3548,7 +3561,20 @@ // store 2,mem_24g_check_dongle_times // call p_g24_ch // branch p_g24_tx_attemp_dongle_loop - +p_le_enable: +p_g24_enable: + jam 0x36,rf_adc_goff /*For BLE, tune AGC_gain_offset, Max added*/ + jam 0x5f,rf_agc_nsat //for BLE + enable le + jam 7,rfen_ulp /* enable ulp */ + call check_g24_disabled + fetch 1,mem_250k_freq_enable //default: 0 + rtn blank + jam 0xb8,rf_iq_gain +check_g24_disabled: + fetch 2,mem_chip_functions + bbit1 g24_disabled,assert + rtn p_g24_auto_pair_start: setarg 0 store 2,mem_24g_pair_current_ch_num @@ -3563,7 +3589,7 @@ call lpo_calibration nop 2000 fetch 2,mem_24g_check_dongle_times - arg 0x7788,temp //30s + arg 0x7788,temp //30s 0x7788 isub temp,null branch p_g24_stop_g24_mode,zero // fetch 1,mem_24g_check_dongle_times Index: YJX_Only24g/main/sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g/main/sched/mouse.dat (revision 1053) +++ /branch/mouse_project/YJX_Project/YJX_Only24g/main/sched/mouse.dat (working copy) @@ -12,7 +12,7 @@ mem_patch19:06 mem_patch1c:48 mem_patch1d:1c -mem_patch27:02 +mem_patch27:82 mem_patch28:08 mem_patch29:04 mem_patch2a:80 @@ -62,7 +62,7 @@ #bit2 MOUSE_BT_ONLY #bit3 MOUSE_BLE_24G_ENABLE #bit4 MOUSE_BT_BLE_24G_ENABLE -08 +01 mem_app_connection_options:06 mem_lap:26 10 19 20 18 10 @@ -156,8 +156,8 @@ #1 06 #mem_lbutton_gpio:16 14 #mem_rbutton_gpio:14 -07 #mem_mbutton_gpio:15 -07 #mem_bk_button_gpio:ff +08 #mem_mbutton_gpio:15 +08 #mem_bk_button_gpio:ff 14 #mem_fw_button_gpio:ff 06 #mem_dpi_button_gpio:05 #2