Index: output/eeprom.dat =================================================================== --- /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/eeprom.dat (revision 4440) +++ /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/eeprom.dat (working copy) @@ -1945,16 +1945,16 @@ 54 f2 58 -2e +0f 00 -49 +24 67 e1 c6 2d 58 00 -35 +1a 00 e7 e1 @@ -8108,8 +8108,8 @@ 20 00 01 -ff -09 +6c +e1 aa 55 40 Index: output/flash.dat =================================================================== --- /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/flash.dat (revision 4440) +++ /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/flash.dat (working copy) @@ -1945,16 +1945,16 @@ 54 f2 58 -2e +0f 00 -49 +24 67 e1 c6 2d 58 00 -35 +1a 00 e7 e1 @@ -8108,8 +8108,8 @@ 20 00 01 -ff -09 +6c +e1 aa 55 40 Index: output/otp.dat =================================================================== --- /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/otp.dat (revision 4440) +++ /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/otp.dat (working copy) @@ -1954,16 +1954,16 @@ 54 f2 58 -2e +0f 00 -49 +24 67 e1 c6 2d 58 00 -35 +1a 00 e7 e1 @@ -8117,8 +8117,8 @@ 20 00 01 -ff -09 +6c +e1 aa 55 40 Index: output/program.lis =================================================================== --- /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/program.lis (revision 4436) +++ /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/output/program.lis (working copy) @@ -591,9 +591,9 @@ p_keyboard_low_voltage_param_set: 01e4 204054f2 call mouse_adc_gpio_set_before_hibernate -01e5 582e0049 setarg 0x2e0049 +01e5 580f0024 setarg 0x0f0024 01e6 67e1c62d store 3 ,mem_mouse_vdd_full_vol -01e7 58003500 setarg 0x003500 +01e7 58001a00 setarg 0x001a00 01e8 e7e18005 istore 3 ,contw 01e9 20600000 rtn 01ea 20600000 rtn @@ -34978,30 +34978,30 @@ 20018 6fe0c9a3 fetch 1 ,mem_keyboard_bt_button_flag 20019 247a0000 nrtn blank 2001a 6fe0c666 fetch 1 ,mem_device_flag -2001b c0000020 beq mode_24g_device ,p_mouse_24g_reconn_general_dongle +2001b c0000020 beq mode_24g_device ,z_mouse_24g_reconn_general_dongle 2001c 20405aa8 call mouse_bluetooth_fast_conn_disable -2001d c0008021 beq mode_bt_device1 ,p_keyboard_start_ble1_reconnect -2001e c0010025 beq mode_bt_device2 ,p_keyboard_start_ble2_reconnect -2001f c0018027 beq mode_bt_device3 ,p_keyboard_start_ble3_reconnect +2001d c0008021 beq mode_bt_device1 ,z_keyboard_start_ble1_reconnect +2001e c0010025 beq mode_bt_device2 ,z_keyboard_start_ble2_reconnect +2001f c0018027 beq mode_bt_device3 ,z_keyboard_start_ble3_reconnect -p_mouse_24g_reconn_general_dongle: +z_mouse_24g_reconn_general_dongle: 20020 2020602f branch mouse_24g_reconn_general_dongle -p_keyboard_start_ble1_reconnect: +z_keyboard_start_ble1_reconnect: 20021 6fe34668 fetch 6 ,mem_device1_addr -p_keyboard_start_ble_reconnect: +z_keyboard_start_ble_reconnect: 20022 5800000e setarg 0x000e 20023 67e144f2 store 2 ,mem_ble_shutter_reconn_adv_interval 20024 202054a0 branch mouse_start_reconnect_device -p_keyboard_start_ble2_reconnect: +z_keyboard_start_ble2_reconnect: 20025 6fe34675 fetch 6 ,mem_device2_addr -20026 20200022 branch p_keyboard_start_ble_reconnect +20026 20200022 branch z_keyboard_start_ble_reconnect -p_keyboard_start_ble3_reconnect: +z_keyboard_start_ble3_reconnect: 20027 6fe34682 fetch 6 ,mem_device3_addr -20028 20200022 branch p_keyboard_start_ble_reconnect +20028 20200022 branch z_keyboard_start_ble_reconnect org 0x30001 z_entrance3: Index: program/patch.prog =================================================================== --- /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/program/patch.prog (revision 4436) +++ /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/program/patch.prog (working copy) @@ -15,8 +15,8 @@ define ADC_1121SB //define ADC_1121SB_1V8_MODE -//define ADC_1V5 -define ADC_3V0 +define ADC_1V5 +//define ADC_3V0 //define ADC_4V2 //define ADC_HVIN define ADC_GPIO @@ -965,17 +965,17 @@ p_keyboard_low_voltage_param_set: call mouse_adc_gpio_set_before_hibernate ifdef ADC_1V5 - setarg 0x520090 // 0x0090--1.5V 0x0052--0.9V 0x005a--1.0V 0x006d--1.1V + setarg 0x0f0024 // 0x0024--1.5V 0x000f--0.9V 0x0018--1.0V 0x001a--1.1V store 3,mem_mouse_vdd_full_vol - setarg 0x005a00 + setarg 0x001a00 istore 3,contw - fetch 1,mem_mouse_adc_last_low_voltage_flag - branch p_keyboard_low_voltage_param_set_backligh_off_1V0,blank - jam 0x5F,mem_mouse_vdd_low_vol - rtn -p_keyboard_low_voltage_param_set_backligh_off_1V0: - jam 0x5a,mem_mouse_vdd_low_vol + //fetch 1,mem_mouse_adc_last_low_voltage_flag + //branch p_keyboard_low_voltage_param_set_backligh_off_1V0,blank + //jam 0x5F,mem_mouse_vdd_low_vol rtn +//p_keyboard_low_voltage_param_set_backligh_off_1V0: +// jam 0x5a,mem_mouse_vdd_low_vol +// rtn endif ifdef ADC_4V2 setarg 0x230170 // 0x0170--3.7V 0x0123--3.0V 0x0146--3.2V 0x0153--3.3V Index: program/z.prog =================================================================== --- /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/program/z.prog (revision 4436) +++ /1121s/branch/keyboard/customer_FW/RY_Project/RY_2mode_3ch_keyboard/program/z.prog (working copy) @@ -93,20 +93,20 @@ fetch 1,mem_keyboard_bt_button_flag nrtn blank fetch 1,mem_device_flag - beq MODE_24G_DEVICE,p_mouse_24g_reconn_general_dongle + beq MODE_24G_DEVICE,z_mouse_24g_reconn_general_dongle call mouse_bluetooth_fast_conn_disable ifdef MULTI_MODE - beq MODE_BT_DEVICE1,p_keyboard_start_ble1_reconnect - beq MODE_BT_DEVICE2,p_keyboard_start_ble2_reconnect - beq MODE_BT_DEVICE3,p_keyboard_start_ble3_reconnect + beq MODE_BT_DEVICE1,z_keyboard_start_ble1_reconnect + beq MODE_BT_DEVICE2,z_keyboard_start_ble2_reconnect + beq MODE_BT_DEVICE3,z_keyboard_start_ble3_reconnect endif -p_mouse_24g_reconn_general_dongle: +z_mouse_24g_reconn_general_dongle: branch mouse_24g_reconn_general_dongle -p_keyboard_start_ble1_reconnect: +z_keyboard_start_ble1_reconnect: fetch 6,mem_device1_addr -p_keyboard_start_ble_reconnect: +z_keyboard_start_ble_reconnect: ifdef EEPROM_ENABLE fetcht 6,mem_keyboard_factory_addr isub temp,null @@ -120,13 +120,13 @@ branch mouse_start_reconnect_device ifdef MULTI_MODE -p_keyboard_start_ble2_reconnect: +z_keyboard_start_ble2_reconnect: fetch 6,mem_device2_addr - branch p_keyboard_start_ble_reconnect + branch z_keyboard_start_ble_reconnect -p_keyboard_start_ble3_reconnect: +z_keyboard_start_ble3_reconnect: fetch 6,mem_device3_addr - branch p_keyboard_start_ble_reconnect + branch z_keyboard_start_ble_reconnect endif