Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/flash.dat (revision 6855) +++ /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/flash.dat (working copy) @@ -8471,10 +8471,10 @@ 47 4a 01 -00 -00 -00 -00 +14 +01 +20 +01 aa 55 19 @@ -9033,7 +9033,7 @@ aa aa 55 -b4 +ea 31 ff 20 @@ -11139,7 +11139,7 @@ c2 85 80 -16 +19 68 00 cb @@ -11147,7 +11147,19 @@ 20 3a 00 -14 +17 +68 +01 +44 +a1 +1f +e0 +fe +01 +60 +01 +44 +a1 68 00 c4 @@ -11163,7 +11175,7 @@ 20 20 00 -16 +19 68 03 4b @@ -11227,7 +11239,7 @@ 20 40 80 -28 +2b 68 00 c0 @@ -11251,7 +11263,7 @@ 24 3a 00 -2c +2f 68 03 4b @@ -11328,18 +11340,6 @@ 00 00 00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -12112,5 +12112,5 @@ 55 00 00 -30 -8f +98 +32 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/program.lis (revision 6855) +++ /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/program.lis (working copy) @@ -35627,51 +35627,54 @@ 4000a 2feffe00 isolate1 ui_state_bt_connected ,pdata 4000b 2040b3e9 call app_bt_disconnect ,true 4000c 68014682 fetch 2 ,mem_ui_state_map -4000d c2858016 bbit1 ui_state_ble_adv ,z_mouse_start_discovery_norandom +4000d c2858019 bbit1 ui_state_ble_adv ,z_mouse_start_discovery_norandom 4000e 6800cbfb fetch 1 ,mem_mouse_key_long_press_adv_flag -4000f 203a0014 branch z_mouse_start_discovery_old_addr ,blank -40010 6800c4a0 fetch 1 ,mem_le_lap -40011 180a7e00 random pdata -40012 6000c4a0 store 1 ,mem_le_lap -40013 20200016 branch z_mouse_start_discovery_norandom +4000f 203a0017 branch z_mouse_start_discovery_old_addr ,blank +40010 680144a1 fetch 2 ,mem_le_lap + 1 +40011 1fe0fe01 increase 1 ,pdata +40012 600144a1 store 2 ,mem_le_lap + 1 +40013 6800c4a0 fetch 1 ,mem_le_lap +40014 180a7e00 random pdata +40015 6000c4a0 store 1 ,mem_le_lap +40016 20200019 branch z_mouse_start_discovery_norandom z_mouse_start_discovery_old_addr: -40014 68034b62 fetch 6 ,mem_le_normal_lap -40015 600344a0 store 6 ,mem_le_lap +40017 68034b62 fetch 6 ,mem_le_normal_lap +40018 600344a0 store 6 ,mem_le_lap z_mouse_start_discovery_norandom: -40016 2040030a call p_mouse_fast_conn_disable -40017 20403418 call app_lpm_mult_disable -40018 68014687 fetch 2 ,mem_discovery_timeout -40019 600146ac store 2 ,mem_mouse_discovery_timer -4001a 70016d06 jam 6 ,mem_connection_options -4001b 58000000 setarg 0 -4001c 600146b0 store 2 ,mem_mouse_no_data_timer -4001d 600146ae store 2 ,mem_mouse_direct_timer -4001e 2040045b call p_mouse_store_eeprom_enable -4001f 204004a8 call p_mouse_bt_discovery_button_up_init -40020 7047a100 jam 0 ,mem_mouse_le_reconnect_flag -40021 6800c092 fetch 1 ,mem_device_option -40022 2feffe00 isolate1 mode_3_mouse ,pdata -40023 20408028 call z3_check_51cmd_adv ,true +40019 2040030a call p_mouse_fast_conn_disable +4001a 20403418 call app_lpm_mult_disable +4001b 68014687 fetch 2 ,mem_discovery_timeout +4001c 600146ac store 2 ,mem_mouse_discovery_timer +4001d 70016d06 jam 6 ,mem_connection_options +4001e 58000000 setarg 0 +4001f 600146b0 store 2 ,mem_mouse_no_data_timer +40020 600146ae store 2 ,mem_mouse_direct_timer +40021 2040045b call p_mouse_store_eeprom_enable +40022 204004a8 call p_mouse_bt_discovery_button_up_init +40023 7047a100 jam 0 ,mem_mouse_le_reconnect_flag 40024 6800c092 fetch 1 ,mem_device_option 40025 2feffe00 isolate1 mode_3_mouse ,pdata -40026 2040fddd call check_51cmd_start_discovery ,true -40027 202004d5 branch p_mouse_discovery_multi_led_blink +40026 2040802b call z3_check_51cmd_adv ,true +40027 6800c092 fetch 1 ,mem_device_option +40028 2feffe00 isolate1 mode_3_mouse ,pdata +40029 2040fddd call check_51cmd_start_discovery ,true +4002a 202004d5 branch p_mouse_discovery_multi_led_blink z3_check_51cmd_adv: -40028 6800cbfb fetch 1 ,mem_mouse_key_long_press_adv_flag -40029 243a002c nbranch z_le_adv_start ,blank -4002a 68034b62 fetch 6 ,mem_le_normal_lap -4002b 600344a0 store 6 ,mem_le_lap +4002b 6800cbfb fetch 1 ,mem_mouse_key_long_press_adv_flag +4002c 243a002f nbranch z_le_adv_start ,blank +4002d 68034b62 fetch 6 ,mem_le_normal_lap +4002e 600344a0 store 6 ,mem_le_lap z_le_adv_start: -4002c 20400462 call p_le_check_adv_flag -4002d 58000005 setarg adv_flag_bredr_not_supported | adv_flag_limited_discoverable -4002e e0c08000 istore 1 ,contr -4002f d8c04b10 arg mem_le_adv_swift_pair ,contr -40030 20400457 call p_le_adv_data_update -40031 20207df4 branch check_51cmd_adv +4002f 20400462 call p_le_check_adv_flag +40030 58000005 setarg adv_flag_bredr_not_supported | adv_flag_limited_discoverable +40031 e0c08000 istore 1 ,contr +40032 d8c04b10 arg mem_le_adv_swift_pair ,contr +40033 20400457 call p_le_adv_data_update +40034 20207df4 branch check_51cmd_adv org 0x50001 z_entrance4: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/romcode.rom (revision 6855) +++ /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/romcode.rom (working copy) @@ -24741,13 +24741,16 @@ 2feffe00 2040b3e9 68014682 -c2858016 +c2858019 6800cbfb -203a0014 +203a0017 +680144a1 +1fe0fe01 +600144a1 6800c4a0 180a7e00 6000c4a0 -20200016 +20200019 68034b62 600344a0 2040030a @@ -24763,13 +24766,13 @@ 7047a100 6800c092 2feffe00 -20408028 +2040802b 6800c092 2feffe00 2040fddd 202004d5 6800cbfb -243a002c +243a002f 68034b62 600344a0 20400462 @@ -25150,4 +25153,4 @@ 6010807e 6808c6f3 202067ed -00007012 +000061d6 Index: output/sched.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/sched.rom (revision 6855) +++ /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/output/sched.rom (working copy) @@ -184,8 +184,8 @@ mem_adc_config_flag:00 #0 vinlpm 1 hvin 2 gpio mem_adc_channel:32 #gpio5 mem_mouse_vdd_full_vol:4a 01#3.3V -00 00#14 01#mem_mouse_vdd_empty_vol# 3.0V -00 00#20 01#mem_mouse_vdd_low_vol#3.15V +14 01#mem_mouse_vdd_empty_vol# 3.0V +20 01#mem_mouse_vdd_low_vol#3.15V mem_config_sensor_type:00 02 #mem_config_sensor_motion:02 Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/program/z.prog (revision 6855) +++ /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/program/z.prog (working copy) @@ -243,6 +243,9 @@ bbit1 UI_STATE_BLE_ADV,z_mouse_start_discovery_norandom fetch 1,mem_mouse_key_long_press_adv_flag branch z_mouse_start_discovery_old_addr,blank + fetch 2,mem_le_lap+1 + increase 1,pdata + store 2,mem_le_lap+1 fetch 1,mem_le_lap random pdata store 1,mem_le_lap Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/sched/mouse.dat (revision 6855) +++ /branch/mouse_project/YJX_Project/YJX_1066/Standard_PLM_MousePen_28/sched/mouse.dat (working copy) @@ -147,8 +147,8 @@ mem_adc_config_flag:00 #0 vinlpm 1 hvin 2 gpio mem_adc_channel:32 #gpio5 mem_mouse_vdd_full_vol:4a 01#3.3V -00 00#14 01#mem_mouse_vdd_empty_vol# 3.0V -00 00#20 01#mem_mouse_vdd_low_vol#3.15V +14 01#mem_mouse_vdd_empty_vol# 3.0V +20 01#mem_mouse_vdd_low_vol#3.15V mem_config_sensor_type:00 02 #mem_config_sensor_motion:02