Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/flash.dat (revision 6334) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/flash.dat (working copy) @@ -3859,7 +3859,7 @@ 20 40 04 -03 +02 20 20 3e @@ -3995,7 +3995,7 @@ c0 01 04 -28 +27 70 4b c7 @@ -4104,14 +4104,10 @@ 21 03 f0 -70 -4b -cb -00 20 20 04 -29 +28 d8 e0 00 @@ -4127,7 +4123,7 @@ 20 40 04 -0a +09 d8 e0 00 @@ -4171,7 +4167,7 @@ 20 3a 04 -24 +23 68 00 cb @@ -4179,7 +4175,7 @@ 24 3a 04 -1a +19 68 00 cb @@ -4199,7 +4195,7 @@ 20 42 84 -20 +1f 20 20 03 @@ -4223,7 +4219,7 @@ 20 42 84 -22 +21 20 20 03 @@ -4251,7 +4247,7 @@ 20 40 04 -28 +27 20 40 04 @@ -4264,6 +4260,10 @@ 40 03 f2 +70 +4b +cb +00 68 08 cb @@ -4623,7 +4623,7 @@ 20 40 04 -28 +27 20 40 04 @@ -8188,8 +8188,8 @@ 20 00 01 -c4 -7d +e0 +83 aa 55 08 @@ -10052,7 +10052,7 @@ 20 40 04 -29 +28 20 40 03 @@ -12665,5 +12665,5 @@ 55 00 00 -e0 -6f +0c +6c Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/program.lis (revision 6334) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/program.lis (working copy) @@ -1285,7 +1285,7 @@ p_mouse_idle: 03c2 20407e34 call ui_check_paring_button -03c3 20400403 call p_mouse_25ms_bb_event_timer +03c3 20400402 call p_mouse_25ms_bb_event_timer 03c4 20203ee0 branch mouse_wheel_check p_mouse_keep_logo_state: @@ -1331,7 +1331,7 @@ 03e2 704bca00 jam 0 ,mem_mouse_logo_time_enable 03e3 6800cbbe fetch 1 ,mem_mouse_logo_led_state 03e4 c00083ee beq 1 ,p_mouse_logo_led_on_enable -03e5 c0010428 beq 2 ,p_mouse_logo_and_pwm_disable +03e5 c0010427 beq 2 ,p_mouse_logo_and_pwm_disable p_mouse_logo_pwm_enable: 03e6 704bc700 jam 0 ,mem_mouse_pwm_breathe_count @@ -1373,66 +1373,66 @@ 03fe 68014bcc fetch 2 ,mem_mouse_rgb_led_keep_on_time 03ff 98467e00 isub temp ,pdata 0400 202103f0 branch p_mouse_logo_led_on ,positive -0401 704bcb00 jam 0 ,mem_mouse_rgb_led_keep_on_enable -0402 20200429 branch p_mouse_logo_led_off +0401 20200428 branch p_mouse_logo_led_off p_mouse_25ms_bb_event_timer: -0403 d8e0000c arg 12 ,queue -0404 20407f16 call timer_check -0405 247a0000 nrtn blank -0406 2040040a call p_mouse_logo_pwm_time +0402 d8e0000c arg 12 ,queue +0403 20407f16 call timer_check +0404 247a0000 nrtn blank +0405 20400409 call p_mouse_logo_pwm_time p_mouse_25ms_bb_event_timer_init: -0407 d8e0000c arg 12 ,queue -0408 58000028 setarg 40 -0409 20207f08 branch timer_init +0406 d8e0000c arg 12 ,queue +0407 58000028 setarg 40 +0408 20207f08 branch timer_init p_mouse_logo_pwm_time: -040a 6800cbbe fetch 1 ,mem_mouse_logo_led_state -040b 247a0000 nrtn blank -040c 6800cbbc fetch 1 ,mem_mouse_logo_pwm_enable_flag -040d 207a0000 rtn blank -040e 68014bbf fetch 2 ,mem_mouse_logo_led_on_time -040f 1fe0ffff increase -1 ,pdata -0410 60014bbf store 2 ,mem_mouse_logo_led_on_time -0411 203a0424 branch p_mouse_lpm_recover ,blank +0409 6800cbbe fetch 1 ,mem_mouse_logo_led_state +040a 247a0000 nrtn blank +040b 6800cbbc fetch 1 ,mem_mouse_logo_pwm_enable_flag +040c 207a0000 rtn blank +040d 68014bbf fetch 2 ,mem_mouse_logo_led_on_time +040e 1fe0ffff increase -1 ,pdata +040f 60014bbf store 2 ,mem_mouse_logo_led_on_time +0410 203a0423 branch p_mouse_lpm_recover ,blank p_mouse_logo_pwm_breathe_loop_count: -0412 6800cbc9 fetch 1 ,mem_mouse_pwm_breathe_angle -0413 243a041a nbranch p_mouse_pwm_increase_loop ,blank -0414 6800cbc6 fetch 1 ,mem_mouse_pwm_conf + 5 -0415 1fe0ffff increase -1 ,pdata -0416 6000cbc6 store 1 ,mem_mouse_pwm_conf + 5 -0417 1fe67c01 sub pdata ,1 ,null -0418 20428420 call p_mosue_pwm_breathe_increase_count_reinit ,zero -0419 202003eb branch p_mouse_pwm_outset +0411 6800cbc9 fetch 1 ,mem_mouse_pwm_breathe_angle +0412 243a0419 nbranch p_mouse_pwm_increase_loop ,blank +0413 6800cbc6 fetch 1 ,mem_mouse_pwm_conf + 5 +0414 1fe0ffff increase -1 ,pdata +0415 6000cbc6 store 1 ,mem_mouse_pwm_conf + 5 +0416 1fe67c01 sub pdata ,1 ,null +0417 2042841f call p_mosue_pwm_breathe_increase_count_reinit ,zero +0418 202003eb branch p_mouse_pwm_outset p_mouse_pwm_increase_loop: -041a 6800cbc6 fetch 1 ,mem_mouse_pwm_conf + 5 -041b 1fe0fe01 increase 1 ,pdata -041c 6000cbc6 store 1 ,mem_mouse_pwm_conf + 5 -041d 1fe67c63 sub pdata ,0x63 ,null -041e 20428422 call p_mosue_pwm_breathe_decrease_count_reinit ,zero -041f 202003eb branch p_mouse_pwm_outset +0419 6800cbc6 fetch 1 ,mem_mouse_pwm_conf + 5 +041a 1fe0fe01 increase 1 ,pdata +041b 6000cbc6 store 1 ,mem_mouse_pwm_conf + 5 +041c 1fe67c63 sub pdata ,0x63 ,null +041d 20428421 call p_mosue_pwm_breathe_decrease_count_reinit ,zero +041e 202003eb branch p_mouse_pwm_outset p_mosue_pwm_breathe_increase_count_reinit: -0420 704bc901 jam 1 ,mem_mouse_pwm_breathe_angle -0421 20600000 rtn +041f 704bc901 jam 1 ,mem_mouse_pwm_breathe_angle +0420 20600000 rtn p_mosue_pwm_breathe_decrease_count_reinit: -0422 704bc900 jam 0 ,mem_mouse_pwm_breathe_angle -0423 20600000 rtn +0421 704bc900 jam 0 ,mem_mouse_pwm_breathe_angle +0422 20600000 rtn p_mouse_lpm_recover: -0424 704bc801 jam 1 ,mem_pwm_sleep_wakeup_flag -0425 20400428 call p_mouse_logo_and_pwm_disable -0426 20400491 call p_mouse_sensor_powerdown -0427 20200534 branch p_mouse_sensor_poweron +0423 704bc801 jam 1 ,mem_pwm_sleep_wakeup_flag +0424 20400427 call p_mouse_logo_and_pwm_disable +0425 20400491 call p_mouse_sensor_powerdown +0426 20200534 branch p_mouse_sensor_poweron p_mouse_logo_and_pwm_disable: -0428 204003f2 call p_mouse_pwm_disable +0427 204003f2 call p_mouse_pwm_disable p_mouse_logo_led_off: +0428 704bcb00 jam 0 ,mem_mouse_rgb_led_keep_on_enable 0429 6808cbbb fetcht 1 ,mem_mouse_logo_led_gpio 042a 20206829 branch gpio_out_active @@ -1570,7 +1570,7 @@ 0481 202007dd branch p_zcode_entrance p_mouse_24g_attempt_fail: -0482 20400428 call p_mouse_logo_and_pwm_disable +0482 20400427 call p_mouse_logo_and_pwm_disable 0483 2040048e call p_mouse_sensor_powerdown_check 0484 704b5200 jam 0 ,mem_retry_count 0485 7011c5a0 jam zcode_a0 ,mem_zcode_temp_param0 @@ -36137,7 +36137,7 @@ b0030 20400757 call p_mouse_multi_led_off b0031 20403e9f call mouse_before_hibernate_wheel_gpio_set b0032 20400266 call p_mouse_setgpio_hibernate -b0033 20400429 call p_mouse_logo_led_off +b0033 20400428 call p_mouse_logo_led_off b0034 2040032d call p_flash_deep_power_down b0035 68108081 hfetch 1 ,core_gpio_sel1 b0036 1fe17ef7 and pdata ,0xf7 ,pdata Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/romcode.rom (revision 6334) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/romcode.rom (working copy) @@ -25065,7 +25065,7 @@ 20400757 20403e9f 20400266 -20400429 +20400428 2040032d 68108081 1fe17ef7 @@ -25168,4 +25168,4 @@ 20400035 6008cda9 20600000 -00006cde +00000923 Index: output/zcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/zcode.rom (revision 6334) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/output/zcode.rom (working copy) @@ -177,7 +177,7 @@ 20400757 20403e9f 20400266 -20400429 +20400428 2040032d 68108081 1fe17ef7 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/program/patch.prog (revision 6334) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_Key_Logo_ADC_G30BL/program/patch.prog (working copy) @@ -1769,7 +1769,6 @@ fetch 2,mem_mouse_rgb_led_keep_on_time isub temp,pdata branch p_mouse_logo_led_on,positive - jam 0,mem_mouse_rgb_led_keep_on_enable branch p_mouse_logo_led_off p_mouse_25ms_bb_event_timer: @@ -1826,6 +1825,7 @@ p_mouse_logo_and_pwm_disable: call p_mouse_pwm_disable p_mouse_logo_led_off: + jam 0,mem_mouse_rgb_led_keep_on_enable //rgb on 1min,pwm off fetcht 1,mem_mouse_logo_led_gpio branch gpio_out_active