Index: output/eeprom.dat =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/eeprom.dat (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/eeprom.dat (working copy) @@ -2491,7 +2491,7 @@ 20 20 05 -e6 +e5 6f e0 cd @@ -4915,7 +4915,7 @@ 70 4e ae -33 +21 20 20 07 @@ -5943,7 +5943,7 @@ 20 20 05 -e6 +e5 70 41 77 @@ -5983,7 +5983,7 @@ 24 21 05 -f5 +f4 c2 00 05 @@ -5995,7 +5995,7 @@ 20 5a 05 -eb +ea 70 4c 01 @@ -6011,7 +6011,7 @@ 20 22 85 -ee +ed d8 c0 4c @@ -6031,7 +6031,7 @@ c0 3f 85 -f3 +f2 e7 e0 80 @@ -6040,10 +6040,6 @@ 00 05 e1 -67 -e1 -4c -02 20 40 06 @@ -6095,7 +6091,7 @@ 20 20 05 -e6 +e5 58 00 00 @@ -6123,7 +6119,7 @@ c0 74 06 -11 +10 c0 74 86 @@ -6215,11 +6211,15 @@ 20 20 05 -e6 +e5 58 00 01 83 +67 +e1 +4c +02 20 20 05 @@ -6230,160 +6230,160 @@ cd 20 20 -05 -e5 +06 +11 58 00 00 b7 20 20 -05 -e5 +06 +11 58 00 00 b6 20 20 -05 -e5 +06 +11 58 00 00 b5 20 20 -05 -e5 +06 +11 58 00 00 ea 20 20 -05 -e5 +06 +11 58 00 00 e9 20 20 -05 -e5 +06 +11 58 00 00 e2 20 20 -05 -e5 +06 +11 58 00 01 94 20 20 -05 -e5 +06 +11 58 00 01 8a 20 20 -05 -e5 +06 +11 58 00 01 92 20 20 -05 -e5 +06 +11 58 00 00 70 20 20 -05 -e5 +06 +11 58 00 00 6f 20 20 -05 -e5 +06 +11 58 00 02 2a 20 20 -05 -e5 +06 +11 58 00 02 25 20 20 -05 -e5 +06 +11 58 00 02 24 20 20 -05 -e5 +06 +11 58 00 02 26 20 20 -05 -e5 +06 +11 58 00 02 27 20 20 -05 -e5 +06 +11 58 00 02 21 20 20 -05 -e5 +06 +11 58 00 02 23 20 20 -05 -e5 +06 +11 58 00 00 30 20 20 -05 -e5 +06 +11 6f e0 ce @@ -6398,16 +6398,16 @@ ae 20 20 -05 -e5 +06 +11 58 00 03 07 20 20 -05 -e5 +06 +11 70 4c a1 @@ -6419,7 +6419,7 @@ 20 5a 05 -eb +ea 70 4d 73 @@ -6435,7 +6435,7 @@ 20 20 05 -e6 +e5 70 4c 01 @@ -6446,8 +6446,8 @@ 02 20 20 -05 -e5 +06 +11 6f e0 c9 @@ -7892,8 +7892,8 @@ 20 00 01 -18 -40 +bf +41 aa 55 40 @@ -8630,7 +8630,7 @@ 00 d2 4b -1e +32 aa 55 01 @@ -8660,7 +8660,7 @@ 00 d0 4b -b8 +bd 0b aa 55 @@ -8713,8 +8713,8 @@ 00 14 4c -58 -02 +b8 +0b aa 55 01 @@ -9297,7 +9297,7 @@ aa aa 55 -55 +d7 98 ff 20 @@ -10212,6 +10212,14 @@ 20 07 87 +6f +e0 +cf +d7 +24 +3a +42 +6b 20 40 00 @@ -10316,14 +10324,6 @@ 00 00 00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -10331,27 +10331,23 @@ c0 18 00 -08 +07 c0 18 80 -12 +11 c0 19 00 -17 -c0 -19 -80 -1d +16 c0 1a 00 -25 +1c c0 1a 80 -32 +2b 20 60 00 @@ -10440,38 +10436,6 @@ 20 42 81 -6f -e0 -ca -d9 -c0 -00 -80 -22 -70 -4b -88 -14 -70 -4e -8d -05 -20 -20 -42 -8e -20 -40 -42 -87 -70 -4b -88 -05 -20 -20 -42 -8e 20 40 04 @@ -10500,6 +10464,14 @@ 40 44 5f +6f +e0 +cf +d7 +24 +3a +00 +29 70 4f d4 @@ -10543,7 +10515,7 @@ c0 01 00 -39 +32 c0 01 c7 @@ -10580,6 +10552,34 @@ 20 47 20 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 20 20 00 @@ -10587,7 +10587,11 @@ c0 10 00 -03 +04 +c0 +10 +80 +19 20 60 00 @@ -10607,7 +10611,7 @@ c3 0a 00 -12 +13 20 40 5f @@ -10635,7 +10639,7 @@ 20 21 00 -04 +05 da 20 48 @@ -10676,42 +10680,38 @@ 20 3c f2 +6f +e0 +ca +d9 +c0 00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 +80 +1e +70 +4b +88 +14 +70 +4e +8d +05 +20 +20 +42 +8e +20 +40 +42 +87 +70 +4b +88 +05 +20 +20 +42 +8e 00 00 00 @@ -11096,5 +11096,5 @@ 00 00 00 -6d -95 +6c +30 Index: output/otp.dat =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/otp.dat (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/otp.dat (working copy) @@ -2491,7 +2491,7 @@ 20 20 05 -e6 +e5 6f e0 cd @@ -4915,7 +4915,7 @@ 70 4e ae -33 +21 20 20 07 @@ -5943,7 +5943,7 @@ 20 20 05 -e6 +e5 70 41 77 @@ -5983,7 +5983,7 @@ 24 21 05 -f5 +f4 c2 00 05 @@ -5995,7 +5995,7 @@ 20 5a 05 -eb +ea 70 4c 01 @@ -6011,7 +6011,7 @@ 20 22 85 -ee +ed d8 c0 4c @@ -6031,7 +6031,7 @@ c0 3f 85 -f3 +f2 e7 e0 80 @@ -6040,10 +6040,6 @@ 00 05 e1 -67 -e1 -4c -02 20 40 06 @@ -6095,7 +6091,7 @@ 20 20 05 -e6 +e5 58 00 00 @@ -6123,7 +6119,7 @@ c0 74 06 -11 +10 c0 74 86 @@ -6215,11 +6211,15 @@ 20 20 05 -e6 +e5 58 00 01 83 +67 +e1 +4c +02 20 20 05 @@ -6230,160 +6230,160 @@ cd 20 20 -05 -e5 +06 +11 58 00 00 b7 20 20 -05 -e5 +06 +11 58 00 00 b6 20 20 -05 -e5 +06 +11 58 00 00 b5 20 20 -05 -e5 +06 +11 58 00 00 ea 20 20 -05 -e5 +06 +11 58 00 00 e9 20 20 -05 -e5 +06 +11 58 00 00 e2 20 20 -05 -e5 +06 +11 58 00 01 94 20 20 -05 -e5 +06 +11 58 00 01 8a 20 20 -05 -e5 +06 +11 58 00 01 92 20 20 -05 -e5 +06 +11 58 00 00 70 20 20 -05 -e5 +06 +11 58 00 00 6f 20 20 -05 -e5 +06 +11 58 00 02 2a 20 20 -05 -e5 +06 +11 58 00 02 25 20 20 -05 -e5 +06 +11 58 00 02 24 20 20 -05 -e5 +06 +11 58 00 02 26 20 20 -05 -e5 +06 +11 58 00 02 27 20 20 -05 -e5 +06 +11 58 00 02 21 20 20 -05 -e5 +06 +11 58 00 02 23 20 20 -05 -e5 +06 +11 58 00 00 30 20 20 -05 -e5 +06 +11 6f e0 ce @@ -6398,16 +6398,16 @@ ae 20 20 -05 -e5 +06 +11 58 00 03 07 20 20 -05 -e5 +06 +11 70 4c a1 @@ -6419,7 +6419,7 @@ 20 5a 05 -eb +ea 70 4d 73 @@ -6435,7 +6435,7 @@ 20 20 05 -e6 +e5 70 4c 01 @@ -6446,8 +6446,8 @@ 02 20 20 -05 -e5 +06 +11 6f e0 c9 @@ -7892,8 +7892,8 @@ 20 00 01 -18 -40 +bf +41 aa 55 40 @@ -8630,7 +8630,7 @@ 00 d2 4b -1e +32 aa 55 01 @@ -8660,7 +8660,7 @@ 00 d0 4b -b8 +bd 0b aa 55 @@ -8713,8 +8713,8 @@ 00 14 4c -58 -02 +b8 +0b aa 55 01 @@ -9297,7 +9297,7 @@ aa aa 55 -55 +d7 98 ff 20 @@ -10212,6 +10212,14 @@ 20 07 87 +6f +e0 +cf +d7 +24 +3a +42 +6b 20 40 00 @@ -10316,14 +10324,6 @@ 00 00 00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -10331,27 +10331,23 @@ c0 18 00 -08 +07 c0 18 80 -12 +11 c0 19 00 -17 -c0 -19 -80 -1d +16 c0 1a 00 -25 +1c c0 1a 80 -32 +2b 20 60 00 @@ -10440,38 +10436,6 @@ 20 42 81 -6f -e0 -ca -d9 -c0 -00 -80 -22 -70 -4b -88 -14 -70 -4e -8d -05 -20 -20 -42 -8e -20 -40 -42 -87 -70 -4b -88 -05 -20 -20 -42 -8e 20 40 04 @@ -10500,6 +10464,14 @@ 40 44 5f +6f +e0 +cf +d7 +24 +3a +00 +29 70 4f d4 @@ -10543,7 +10515,7 @@ c0 01 00 -39 +32 c0 01 c7 @@ -10580,6 +10552,34 @@ 20 47 20 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 20 20 00 @@ -10587,7 +10587,11 @@ c0 10 00 -03 +04 +c0 +10 +80 +19 20 60 00 @@ -10607,7 +10611,7 @@ c3 0a 00 -12 +13 20 40 5f @@ -10635,7 +10639,7 @@ 20 21 00 -04 +05 da 20 48 @@ -10676,42 +10680,38 @@ 20 3c f2 +6f +e0 +ca +d9 +c0 00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 +80 +1e +70 +4b +88 +14 +70 +4e +8d +05 +20 +20 +42 +8e +20 +40 +42 +87 +70 +4b +88 +05 +20 +20 +42 +8e 00 00 00 @@ -11096,5 +11096,5 @@ 00 00 00 -6d -95 +6c +30 Index: output/program.lis =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/program.lis (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/program.lis (working copy) @@ -809,7 +809,7 @@ 026a 6048cc04 storet 1 ,mem_keyboard_tx_data + 3 026b 20407d92 call enable_user 026c 704c0100 jam hid_reportid_key_standard ,mem_keyboard_tx_data -026d 202005e6 branch p_keyboard_motion_data_check_next +026d 202005e5 branch p_keyboard_motion_data_check_next p_keyboard_commbination_key_press_process: 026e 6fe0cd70 fetch 1 ,mem_keyboard_commbination_control_key_value @@ -1631,7 +1631,7 @@ 04ca 20200795 branch p_zcode_entrance p_mouse_le_ll_start_encryt: -04cb 704eae33 jam zcode_33 ,mem_zcode_temp_param0 +04cb 704eae21 jam zcode_21 ,mem_zcode_temp_param0 04cc 20200795 branch p_zcode_entrance p_mouse_le_parse_conn_param_accepted: @@ -1988,7 +1988,7 @@ 05c9 df20000a arg 10 ,loopcnt 05ca 20407c68 call clear_mem 05cb 20407d92 call enable_user -05cc 202005e6 branch p_keyboard_motion_data_check_next +05cc 202005e5 branch p_keyboard_motion_data_check_next p_keyboard_current_mult_update: 05cd 70417703 jam 3 ,mem_lpm_mult @@ -2004,195 +2004,195 @@ p_keyboard_value_tpye_check: 05d4 efe08006 ifetch 1 ,contr 05d5 1fe67ce7 sub pdata ,hid_key_right_gui ,null -05d6 242105f5 nbranch p_keyboard_value_tpye_consumer_set ,positive +05d6 242105f4 nbranch p_keyboard_value_tpye_consumer_set ,positive p_keyboard_value_tpye_check_loop: 05d7 c20005d4 loop p_keyboard_value_tpye_check 05d8 6fe0cc9e fetch 1 ,mem_keyboard_all_press_key_count -05d9 205a05eb call p_keyboard_value_release_all_key ,blank +05d9 205a05ea call p_keyboard_value_release_all_key ,blank 05da 704c0100 jam hid_reportid_key_standard ,mem_keyboard_tx_data 05db 6fe0cca7 fetch 1 ,mem_keyboard_keyvalue_buffer + 2 05dc 1fe67c7f sub pdata ,hid_key_fn ,null -05dd 202285ee branch p_keyboard_tx_data_skip_fn ,zero +05dd 202285ed branch p_keyboard_tx_data_skip_fn ,zero 05de d8c04ca5 arg mem_keyboard_keyvalue_buffer ,contr 05df d8a04c02 arg mem_keyboard_tx_data + 1 ,contw 05e0 df200008 arg 8 ,loopcnt p_keyboard_tx_data_store: 05e1 efe08006 ifetch 1 ,contr -05e2 c03f85f3 beq hid_key_fn ,p_keyboard_tx_data_clear_fn +05e2 c03f85f2 beq hid_key_fn ,p_keyboard_tx_data_clear_fn p_keyboard_tx_data_store_loop: 05e3 e7e08005 istore 1 ,contw 05e4 c20005e1 loop p_keyboard_tx_data_store -p_keyboard_value_set: -05e5 67e14c02 store 2 ,mem_keyboard_tx_data + 1 - p_keyboard_motion_data_check_next: -05e6 2040064b call p_keyboard_device_data_tpye_check -05e7 6fe0cc0b fetch 1 ,mem_keyboard_data_send_flag -05e8 c000fd92 beq device_data_tpye_mouse ,enable_user +05e5 2040064b call p_keyboard_device_data_tpye_check +05e6 6fe0cc0b fetch 1 ,mem_keyboard_data_send_flag +05e7 c000fd92 beq device_data_tpye_mouse ,enable_user p_device_send_keyboard_data: -05e9 20404095 call mouse_customerkey_press -05ea 20207d92 branch enable_user +05e8 20404095 call mouse_customerkey_press +05e9 20207d92 branch enable_user p_keyboard_value_release_all_key: -05eb d8a04ca5 arg mem_keyboard_keyvalue_buffer ,contw -05ec df200009 arg 9 ,loopcnt -05ed 20207c68 branch clear_mem +05ea d8a04ca5 arg mem_keyboard_keyvalue_buffer ,contw +05eb df200009 arg 9 ,loopcnt +05ec 20207c68 branch clear_mem p_keyboard_tx_data_skip_fn: -05ee 6fe14ca5 fetch 2 ,mem_keyboard_keyvalue_buffer -05ef 67e14c02 store 2 ,mem_keyboard_tx_data + 1 -05f0 6fe34ca8 fetch 6 ,mem_keyboard_keyvalue_buffer + 3 -05f1 67e34c04 store 6 ,mem_keyboard_tx_data + 3 -05f2 202005e6 branch p_keyboard_motion_data_check_next +05ed 6fe14ca5 fetch 2 ,mem_keyboard_keyvalue_buffer +05ee 67e14c02 store 2 ,mem_keyboard_tx_data + 1 +05ef 6fe34ca8 fetch 6 ,mem_keyboard_keyvalue_buffer + 3 +05f0 67e34c04 store 6 ,mem_keyboard_tx_data + 3 +05f1 202005e5 branch p_keyboard_motion_data_check_next p_keyboard_tx_data_clear_fn: -05f3 58000000 setarg 0 -05f4 202005e3 branch p_keyboard_tx_data_store_loop +05f2 58000000 setarg 0 +05f3 202005e3 branch p_keyboard_tx_data_store_loop p_keyboard_value_tpye_consumer_set: -05f5 704c0103 jam hid_reportid_consumer_key ,mem_keyboard_tx_data -05f6 6848cc9e fetcht 1 ,mem_keyboard_all_press_key_count -05f7 18467c00 sub temp ,hid_key_null ,null -05f8 20228641 branch p_keyboard_value_consumer_all_key_release ,zero -05f9 c0740611 beq hid_key_multikey_media ,p_keyboard_value_media -05fa c0748613 beq hid_key_multikey_paly ,p_keyboard_value_play -05fb c0750615 beq hid_key_multikey_stop ,p_keyboard_value_stop -05fc c0758617 beq hid_key_multikey_pre_track ,p_keyboard_value_pre_track -05fd c0760619 beq hid_key_multikey_next_track ,p_keyboard_value_next_track -05fe c076861b beq hid_key_multikey_vol_down ,p_keyboard_value_vol_down -05ff c077061d beq hid_key_multikey_vol_up ,p_keyboard_value_vol_up -0600 c077861f beq hid_key_multikey_mute ,p_keyboard_value_mute -0601 c0780621 beq hid_key_my_computer ,p_keyboard_value_my_computer -0602 c0788623 beq hid_key_mail ,p_keyboard_value_mail -0603 c0790625 beq hid_key_calculator ,p_keyboard_value_calculator -0604 c0798627 beq hid_key_light_down ,p_keyboard_value_light_down -0605 c07a0629 beq hid_key_light_up ,p_keyboard_value_light_up -0606 c07a862b beq hid_key_ac_favorites ,p_keyboard_value_ac_favorites -0607 c07b062d beq hid_key_ac_forward ,p_keyboard_value_ac_forward -0608 c07b862f beq hid_key_ac_back ,p_keyboard_value_ac_back -0609 c07c0631 beq hid_key_ac_stop ,p_keyboard_value_ac_stop -060a c07c8633 beq hid_key_ac_refresh ,p_keyboard_value_ac_refresh -060b c07d0635 beq hid_key_ac_search ,p_keyboard_value_ac_search -060c c07d8637 beq hid_key_ac_home ,p_keyboard_value_ac_home -060d c07e0639 beq hid_key_ios_android_os_lock ,p_keyboard_value_os_lock -060e c07e863b beq hid_key_os_soft_kb ,p_keyboard_value_os_soft_kb -060f c07f8648 beq hid_key_system_sleep ,p_keyboard_value_system_sleep -0610 202005e6 branch p_keyboard_motion_data_check_next +05f4 704c0103 jam hid_reportid_consumer_key ,mem_keyboard_tx_data +05f5 6848cc9e fetcht 1 ,mem_keyboard_all_press_key_count +05f6 18467c00 sub temp ,hid_key_null ,null +05f7 20228641 branch p_keyboard_value_consumer_all_key_release ,zero +05f8 c0740610 beq hid_key_multikey_media ,p_keyboard_value_media +05f9 c0748613 beq hid_key_multikey_paly ,p_keyboard_value_play +05fa c0750615 beq hid_key_multikey_stop ,p_keyboard_value_stop +05fb c0758617 beq hid_key_multikey_pre_track ,p_keyboard_value_pre_track +05fc c0760619 beq hid_key_multikey_next_track ,p_keyboard_value_next_track +05fd c076861b beq hid_key_multikey_vol_down ,p_keyboard_value_vol_down +05fe c077061d beq hid_key_multikey_vol_up ,p_keyboard_value_vol_up +05ff c077861f beq hid_key_multikey_mute ,p_keyboard_value_mute +0600 c0780621 beq hid_key_my_computer ,p_keyboard_value_my_computer +0601 c0788623 beq hid_key_mail ,p_keyboard_value_mail +0602 c0790625 beq hid_key_calculator ,p_keyboard_value_calculator +0603 c0798627 beq hid_key_light_down ,p_keyboard_value_light_down +0604 c07a0629 beq hid_key_light_up ,p_keyboard_value_light_up +0605 c07a862b beq hid_key_ac_favorites ,p_keyboard_value_ac_favorites +0606 c07b062d beq hid_key_ac_forward ,p_keyboard_value_ac_forward +0607 c07b862f beq hid_key_ac_back ,p_keyboard_value_ac_back +0608 c07c0631 beq hid_key_ac_stop ,p_keyboard_value_ac_stop +0609 c07c8633 beq hid_key_ac_refresh ,p_keyboard_value_ac_refresh +060a c07d0635 beq hid_key_ac_search ,p_keyboard_value_ac_search +060b c07d8637 beq hid_key_ac_home ,p_keyboard_value_ac_home +060c c07e0639 beq hid_key_ios_android_os_lock ,p_keyboard_value_os_lock +060d c07e863b beq hid_key_os_soft_kb ,p_keyboard_value_os_soft_kb +060e c07f8648 beq hid_key_system_sleep ,p_keyboard_value_system_sleep +060f 202005e5 branch p_keyboard_motion_data_check_next p_keyboard_value_media: -0611 58000183 setarg 0x0183 -0612 202005e5 branch p_keyboard_value_set +0610 58000183 setarg 0x0183 + +p_keyboard_value_set: +0611 67e14c02 store 2 ,mem_keyboard_tx_data + 1 +0612 202005e5 branch p_keyboard_motion_data_check_next p_keyboard_value_play: 0613 580000cd setarg 0x00cd -0614 202005e5 branch p_keyboard_value_set +0614 20200611 branch p_keyboard_value_set p_keyboard_value_stop: 0615 580000b7 setarg 0x00b7 -0616 202005e5 branch p_keyboard_value_set +0616 20200611 branch p_keyboard_value_set p_keyboard_value_pre_track: 0617 580000b6 setarg 0x00b6 -0618 202005e5 branch p_keyboard_value_set +0618 20200611 branch p_keyboard_value_set p_keyboard_value_next_track: 0619 580000b5 setarg 0x00b5 -061a 202005e5 branch p_keyboard_value_set +061a 20200611 branch p_keyboard_value_set p_keyboard_value_vol_down: 061b 580000ea setarg 0x00ea -061c 202005e5 branch p_keyboard_value_set +061c 20200611 branch p_keyboard_value_set p_keyboard_value_vol_up: 061d 580000e9 setarg 0x00e9 -061e 202005e5 branch p_keyboard_value_set +061e 20200611 branch p_keyboard_value_set p_keyboard_value_mute: 061f 580000e2 setarg 0x00e2 -0620 202005e5 branch p_keyboard_value_set +0620 20200611 branch p_keyboard_value_set p_keyboard_value_my_computer: 0621 58000194 setarg 0x0194 -0622 202005e5 branch p_keyboard_value_set +0622 20200611 branch p_keyboard_value_set p_keyboard_value_mail: 0623 5800018a setarg 0x018a -0624 202005e5 branch p_keyboard_value_set +0624 20200611 branch p_keyboard_value_set p_keyboard_value_calculator: 0625 58000192 setarg 0x0192 -0626 202005e5 branch p_keyboard_value_set +0626 20200611 branch p_keyboard_value_set p_keyboard_value_light_down: 0627 58000070 setarg 0x0070 -0628 202005e5 branch p_keyboard_value_set +0628 20200611 branch p_keyboard_value_set p_keyboard_value_light_up: 0629 5800006f setarg 0x006f -062a 202005e5 branch p_keyboard_value_set +062a 20200611 branch p_keyboard_value_set p_keyboard_value_ac_favorites: 062b 5800022a setarg 0x022a -062c 202005e5 branch p_keyboard_value_set +062c 20200611 branch p_keyboard_value_set p_keyboard_value_ac_forward: 062d 58000225 setarg 0x0225 -062e 202005e5 branch p_keyboard_value_set +062e 20200611 branch p_keyboard_value_set p_keyboard_value_ac_back: 062f 58000224 setarg 0x0224 -0630 202005e5 branch p_keyboard_value_set +0630 20200611 branch p_keyboard_value_set p_keyboard_value_ac_stop: 0631 58000226 setarg 0x0226 -0632 202005e5 branch p_keyboard_value_set +0632 20200611 branch p_keyboard_value_set p_keyboard_value_ac_refresh: 0633 58000227 setarg 0x0227 -0634 202005e5 branch p_keyboard_value_set +0634 20200611 branch p_keyboard_value_set p_keyboard_value_ac_search: 0635 58000221 setarg 0x0221 -0636 202005e5 branch p_keyboard_value_set +0636 20200611 branch p_keyboard_value_set p_keyboard_value_ac_home: 0637 58000223 setarg 0x0223 -0638 202005e5 branch p_keyboard_value_set +0638 20200611 branch p_keyboard_value_set p_keyboard_value_os_lock: 0639 58000030 setarg 0x0030 -063a 202005e5 branch p_keyboard_value_set +063a 20200611 branch p_keyboard_value_set p_keyboard_value_os_soft_kb: 063b 6fe0ce54 fetch 1 ,mem_kb_computer_system 063c c000863f beq system_os_andriod ,p_keyboard_value_os_soft_kb_andriod 063d 580001ae setarg 0x01ae -063e 202005e5 branch p_keyboard_value_set +063e 20200611 branch p_keyboard_value_set p_keyboard_value_os_soft_kb_andriod: 063f 58000307 setarg 0x0307 -0640 202005e5 branch p_keyboard_value_set +0640 20200611 branch p_keyboard_value_set p_keyboard_value_consumer_all_key_release: p_keyboard_value_consumer_release: 0641 704ca102 jam 2 ,mem_keyboard_data_change_flag 0642 6fe0cc9e fetch 1 ,mem_keyboard_all_press_key_count -0643 205a05eb call p_keyboard_value_release_all_key ,blank +0643 205a05ea call p_keyboard_value_release_all_key ,blank 0644 704d7300 jam keyboard_consumer_key_standby ,mem_keyboard_consumer_key_status 0645 58000003 setarg 0x03 0646 67e1cc01 store 3 ,mem_keyboard_tx_data -0647 202005e6 branch p_keyboard_motion_data_check_next +0647 202005e5 branch p_keyboard_motion_data_check_next p_keyboard_value_system_sleep: 0648 704c0102 jam hid_reportid_system_ctrl ,mem_keyboard_tx_data 0649 58000002 setarg 0x02 -064a 202005e5 branch p_keyboard_value_set +064a 20200611 branch p_keyboard_value_set p_keyboard_device_data_tpye_check: 064b 6fe0c93f fetch 1 ,mem_device_flag @@ -2742,115 +2742,119 @@ org 0x20001 z_entrance2: -20001 c0100003 beq zcode_20 ,z_keyboard_start_work -20002 20600000 rtn +20001 c0100004 beq zcode_20 ,z_keyboard_start_work +20002 c0108019 beq zcode_21 ,z_mouse_le_ll_start_encryt +20003 20600000 rtn z_keyboard_start_work: -20003 2040056d call p_keyboard_poweron_timer_init -20004 20400570 call p_mouse_device_poweron_timer -20005 6fe44bbd fetch mouse_flag_len ,mem_mouse_flag -20006 c30a0012 bbit0 mouse_enable_adc ,z_keyboard_start_work_next -20007 20405ff1 call enable_adc -20008 20406018 call vdd_calculate_by_mode -20009 67e148f1 store 2 ,mem_mouse_vdd_now_vol -2000a 68494499 fetcht 2 ,mem_2v_adc_vinlpm_data -2000b 6fe144a7 fetch 2 ,mem_adc_current_value -2000c 98467c00 isub temp ,null -2000d 20210004 branch z_keyboard_start_work + 1 ,positive -2000e da2048eb arg mem_mouse_vdd_calculate_set ,rega -2000f 20403df5 call mouse_adc_bat_percent_lowpower_out -20010 6fe0c4a9 fetch 1 ,mem_adc_power_flag -20011 c280be39 bbit1 1 ,mouse_power_down +20004 2040056d call p_keyboard_poweron_timer_init +20005 20400570 call p_mouse_device_poweron_timer +20006 6fe44bbd fetch mouse_flag_len ,mem_mouse_flag +20007 c30a0013 bbit0 mouse_enable_adc ,z_keyboard_start_work_next +20008 20405ff1 call enable_adc +20009 20406018 call vdd_calculate_by_mode +2000a 67e148f1 store 2 ,mem_mouse_vdd_now_vol +2000b 68494499 fetcht 2 ,mem_2v_adc_vinlpm_data +2000c 6fe144a7 fetch 2 ,mem_adc_current_value +2000d 98467c00 isub temp ,null +2000e 20210005 branch z_keyboard_start_work + 1 ,positive +2000f da2048eb arg mem_mouse_vdd_calculate_set ,rega +20010 20403df5 call mouse_adc_bat_percent_lowpower_out +20011 6fe0c4a9 fetch 1 ,mem_adc_power_flag +20012 c280be39 bbit1 1 ,mouse_power_down z_keyboard_start_work_next: -20012 6fe0c93f fetch 1 ,mem_device_flag -20013 c0004726 beq mode_24g_device ,mouse_24g_reconn_general_dongle -20014 2040422f call mouse_bluetooth_fast_conn_disable -20015 6fe34941 fetch 6 ,mem_device1_addr -20016 203a0379 branch p_mouse_buletooth_fast_conn_init ,blank -20017 20203cf2 branch mouse_start_reconnect_device +20013 6fe0c93f fetch 1 ,mem_device_flag +20014 c0004726 beq mode_24g_device ,mouse_24g_reconn_general_dongle +20015 2040422f call mouse_bluetooth_fast_conn_disable +20016 6fe34941 fetch 6 ,mem_device1_addr +20017 203a0379 branch p_mouse_buletooth_fast_conn_init ,blank +20018 20203cf2 branch mouse_start_reconnect_device + +z_mouse_le_ll_start_encryt: +20019 6fe0cad9 fetch 1 ,mem_mouse_le_reconnect_flag +2001a c000801e beq 1 ,z_mouse_le_ll_reconn_start_encryt +2001b 704b8814 jam 20 ,mem_le_start_encrypt_timer +2001c 704e8d05 jam 5 ,mem_le_start_auto_reco_timer +2001d 2020428e branch mouse_le_ll_enable_start_enc_flag + +z_mouse_le_ll_reconn_start_encryt: +2001e 20404287 call mouse_updata_le_param +2001f 704b8805 jam 5 ,mem_le_start_encrypt_timer +20020 2020428e branch mouse_le_ll_enable_start_enc_flag org 0x30001 z_entrance3: -30001 c0180008 beq zcode_30 ,z_mouse_le_parse_conn_param_accepted -30002 c0188012 beq zcode_31 ,z_mouse_le_conn_param_update_rsp_recieved -30003 c0190017 beq zcode_32 ,z_mouse_le_bb_disconnected -30004 c019801d beq zcode_33 ,z_mouse_le_ll_start_encryt -30005 c01a0025 beq zcode_34 ,z_mouse_24g_attempt_success -30006 c01a8032 beq zcode_35 ,z_mouse_24g_attempt_fail -30007 20600000 rtn +30001 c0180007 beq zcode_30 ,z_mouse_le_parse_conn_param_accepted +30002 c0188011 beq zcode_31 ,z_mouse_le_conn_param_update_rsp_recieved +30003 c0190016 beq zcode_32 ,z_mouse_le_bb_disconnected +30004 c01a001c beq zcode_34 ,z_mouse_24g_attempt_success +30005 c01a802b beq zcode_35 ,z_mouse_24g_attempt_fail +30006 20600000 rtn z_mouse_le_parse_conn_param_accepted: -30008 6fe082c1 fetch 1 ,mem_le_new_conninterval -30009 1fe67c0c sub pdata ,le_interval_15ms ,null -3000a 2421429f nbranch mouse_le_conn_param_lpm_disable ,positive -3000b 6fe082c3 fetch 1 ,mem_le_new_connslavelatency -3000c 6848cb9c fetcht 1 ,mem_lpm_mult_init -3000d 98467c00 isub temp ,null -3000e 202142b5 branch mouse_le_lpm_mult_reinit ,positive -3000f 6fe082c3 fetch 1 ,mem_le_new_connslavelatency -30010 67e0c177 store 1 ,mem_lpm_mult -30011 202042a1 branch mouse_le_conn_param_lpm_enable +30007 6fe082c1 fetch 1 ,mem_le_new_conninterval +30008 1fe67c0c sub pdata ,le_interval_15ms ,null +30009 2421429f nbranch mouse_le_conn_param_lpm_disable ,positive +3000a 6fe082c3 fetch 1 ,mem_le_new_connslavelatency +3000b 6848cb9c fetcht 1 ,mem_lpm_mult_init +3000c 98467c00 isub temp ,null +3000d 202142b5 branch mouse_le_lpm_mult_reinit ,positive +3000e 6fe082c3 fetch 1 ,mem_le_new_connslavelatency +3000f 67e0c177 store 1 ,mem_lpm_mult +30010 202042a1 branch mouse_le_conn_param_lpm_enable z_mouse_le_conn_param_update_rsp_recieved: -30012 6fe0cc0c fetch 1 ,mem_mouse_le_send_conn_param_update -30013 247a0000 nrtn blank -30014 704c0c01 jam 1 ,mem_mouse_le_send_conn_param_update -30015 704c0d1e jam 30 ,mem_mouse_le_send_conn_param_update_timer -30016 20600000 rtn +30011 6fe0cc0c fetch 1 ,mem_mouse_le_send_conn_param_update +30012 247a0000 nrtn blank +30013 704c0c01 jam 1 ,mem_mouse_le_send_conn_param_update +30014 704c0d1e jam 30 ,mem_mouse_le_send_conn_param_update_timer +30015 20600000 rtn z_mouse_le_bb_disconnected: -30017 58000000 setarg 0 -30018 67e14b04 store 2 ,mem_le_battery_level_updata_timer -30019 67e0cc0c store 1 ,mem_mouse_le_send_conn_param_update -3001a 67e0cc0d store 1 ,mem_mouse_le_send_conn_param_update_timer -3001b 67e0cad8 store 1 ,mem_mouse_le_bb_connected_flag -3001c 20204281 branch mouse_le_bb_disconnected + 7 - -z_mouse_le_ll_start_encryt: -3001d 6fe0cad9 fetch 1 ,mem_mouse_le_reconnect_flag -3001e c0008022 beq 1 ,z_mouse_le_ll_reconn_start_encryt -3001f 704b8814 jam 20 ,mem_le_start_encrypt_timer -30020 704e8d05 jam 5 ,mem_le_start_auto_reco_timer -30021 2020428e branch mouse_le_ll_enable_start_enc_flag - -z_mouse_le_ll_reconn_start_encryt: -30022 20404287 call mouse_updata_le_param -30023 704b8805 jam 5 ,mem_le_start_encrypt_timer -30024 2020428e branch mouse_le_ll_enable_start_enc_flag +30016 58000000 setarg 0 +30017 67e14b04 store 2 ,mem_le_battery_level_updata_timer +30018 67e0cc0c store 1 ,mem_mouse_le_send_conn_param_update +30019 67e0cc0d store 1 ,mem_mouse_le_send_conn_param_update_timer +3001a 67e0cad8 store 1 ,mem_mouse_le_bb_connected_flag +3001b 20204281 branch mouse_le_bb_disconnected + 7 z_mouse_24g_attempt_success: -30025 204004dd call p_keyboard_get_24g_led_enable -30026 6fe24843 fetch 4 ,mem_24g_addr -30027 67e24899 store 4 ,mem_24g_receiver_addr -30028 67e2499a store 4 ,mem_mouse_24g_addr -30029 2040256a call g24_ch_syncword_crc8_init -3002a 204047f0 call mouse_device_poweron_timer_init -3002b 2040445f call mouse_no_data_timer_init -3002c 704fd400 jam 0 ,mem_keyboard_led_blink_timer -3002d 704fde00 jam 0 ,mem_keyboard_discovery_flag -3002e 20400514 call p_keyboard_key_press_check_enable -3002f 20400787 call p_led_off -30030 704fdd01 jam 1 ,mem_keyboard_24g_state -30031 20204768 branch mouse_24g_attempt_success +3001c 204004dd call p_keyboard_get_24g_led_enable +3001d 6fe24843 fetch 4 ,mem_24g_addr +3001e 67e24899 store 4 ,mem_24g_receiver_addr +3001f 67e2499a store 4 ,mem_mouse_24g_addr +30020 2040256a call g24_ch_syncword_crc8_init +30021 204047f0 call mouse_device_poweron_timer_init +30022 2040445f call mouse_no_data_timer_init +30023 6fe0cfd7 fetch 1 ,mem_keyboard_device_poweron_timer_count +30024 243a0029 nbranch z_mouse_24g_attempt_success_skip_led_config ,blank +30025 704fd400 jam 0 ,mem_keyboard_led_blink_timer +30026 704fde00 jam 0 ,mem_keyboard_discovery_flag +30027 20400514 call p_keyboard_key_press_check_enable +30028 20400787 call p_led_off + +z_mouse_24g_attempt_success_skip_led_config: +30029 704fdd01 jam 1 ,mem_keyboard_24g_state +3002a 20204768 branch mouse_24g_attempt_success z_mouse_24g_attempt_fail: -30032 704fdd00 jam 0 ,mem_keyboard_24g_state -30033 6fe0c8ad fetch 1 ,mem_24g_attempt_fail_flag -30034 243a04e4 nbranch p_mouse_24g_hibernate_set ,blank -30035 6fe0c893 fetch 1 ,mem_24g_reconn_type -30036 c0010039 beq fast_conn_and_3_0_addr ,z_mouse_24g_fast_conn_attempt_fail -30037 c001c753 beq receiver_and_3_0_addr ,mouse_24g_attempt_fail_enter_hibernate -30038 20204750 branch mouse_24g_attempt_fail + 3 +3002b 704fdd00 jam 0 ,mem_keyboard_24g_state +3002c 6fe0c8ad fetch 1 ,mem_24g_attempt_fail_flag +3002d 243a04e4 nbranch p_mouse_24g_hibernate_set ,blank +3002e 6fe0c893 fetch 1 ,mem_24g_reconn_type +3002f c0010032 beq fast_conn_and_3_0_addr ,z_mouse_24g_fast_conn_attempt_fail +30030 c001c753 beq receiver_and_3_0_addr ,mouse_24g_attempt_fail_enter_hibernate +30031 20204750 branch mouse_24g_attempt_fail + 3 z_mouse_24g_fast_conn_attempt_fail: -30039 6fe44bbd fetch mouse_flag_len ,mem_mouse_flag -3003a c297c72b bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_start_auto_pair -3003b c298472b bbit1 mouse_enable_auto_24g_paring ,mouse_24g_start_auto_pair -3003c c31d4720 bbit0 mouse_enable_24g_auto_pair_nerver_been_paired ,mouse_24g_reconn_dongle_start -3003d 6fe2499a fetch 4 ,mem_mouse_24g_addr -3003e 203a0364 branch p_mouse_24g_start_pair_mode ,blank -3003f 20204720 branch mouse_24g_reconn_dongle_start +30032 6fe44bbd fetch mouse_flag_len ,mem_mouse_flag +30033 c297c72b bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_start_auto_pair +30034 c298472b bbit1 mouse_enable_auto_24g_paring ,mouse_24g_start_auto_pair +30035 c31d4720 bbit0 mouse_enable_24g_auto_pair_nerver_been_paired ,mouse_24g_reconn_dongle_start +30036 6fe2499a fetch 4 ,mem_mouse_24g_addr +30037 203a0364 branch p_mouse_24g_start_pair_mode ,blank +30038 20204720 branch mouse_24g_reconn_dongle_start org 0x40001 z_entrance4: @@ -2899,8 +2903,10 @@ 40023 20200787 branch p_led_off z_mouse_le_bb_event_connected: -40024 20400020 call z_keyboard_discovery_led_off -40025 2020426b branch mouse_le_bb_event_connected +40024 6fe0cfd7 fetch 1 ,mem_keyboard_device_poweron_timer_count +40025 243a426b nbranch mouse_le_bb_event_connected ,blank +40026 20400020 call z_keyboard_discovery_led_off +40027 2020426b branch mouse_le_bb_event_connected org 0x50001 z_entrance5: Index: output/romcode.rom =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/romcode.rom (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/romcode.rom (working copy) @@ -58,19 +58,20 @@ d8a04ae4 20200035 20600000 -c0100003 +c0100004 +c0108019 20600000 2040056d 20400570 6fe44bbd -c30a0012 +c30a0013 20405ff1 20406018 67e148f1 68494499 6fe144a7 98467c00 -20210004 +20210005 da2048eb 20403df5 6fe0c4a9 @@ -81,12 +82,19 @@ 6fe34941 203a0379 20203cf2 -c0180008 -c0188012 -c0190017 -c019801d -c01a0025 -c01a8032 +6fe0cad9 +c000801e +704b8814 +704e8d05 +2020428e +20404287 +704b8805 +2020428e +c0180007 +c0188011 +c0190016 +c01a001c +c01a802b 20600000 6fe082c1 1fe67c0c @@ -109,14 +117,6 @@ 67e0cc0d 67e0cad8 20204281 -6fe0cad9 -c0008022 -704b8814 -704e8d05 -2020428e -20404287 -704b8805 -2020428e 204004dd 6fe24843 67e24899 @@ -124,6 +124,8 @@ 2040256a 204047f0 2040445f +6fe0cfd7 +243a0029 704fd400 704fde00 20400514 @@ -134,7 +136,7 @@ 6fe0c8ad 243a04e4 6fe0c893 -c0010039 +c0010032 c001c753 20204750 6fe44bbd @@ -179,6 +181,8 @@ 704fde00 20400514 20200787 +6fe0cfd7 +243a426b 20400020 2020426b c0280003 @@ -317,4 +321,4 @@ 20200007 704d7002 20200007 -000044a3 +00009546 Index: output/zcode.rom =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/zcode.rom (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/output/zcode.rom (working copy) @@ -226,6 +226,8 @@ 704fde00 20400514 20200787 +6fe0cfd7 +243a426b 20400020 2020426b 00000000 @@ -252,15 +254,12 @@ 00000000 00000000 00000000 -00000000 -00000000 20200040 -c0180008 -c0188012 -c0190017 -c019801d -c01a0025 -c01a8032 +c0180007 +c0188011 +c0190016 +c01a001c +c01a802b 20600000 6fe082c1 1fe67c0c @@ -283,14 +282,6 @@ 67e0cc0d 67e0cad8 20204281 -6fe0cad9 -c0008022 -704b8814 -704e8d05 -2020428e -20404287 -704b8805 -2020428e 204004dd 6fe24843 67e24899 @@ -298,6 +289,8 @@ 2040256a 204047f0 2040445f +6fe0cfd7 +243a0029 704fd400 704fde00 20400514 @@ -308,7 +301,7 @@ 6fe0c8ad 243a04e4 6fe0c893 -c0010039 +c0010032 c001c753 20204750 6fe44bbd @@ -318,20 +311,28 @@ 6fe2499a 203a0364 20204720 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 20200040 -c0100003 +c0100004 +c0108019 20600000 2040056d 20400570 6fe44bbd -c30a0012 +c30a0013 20405ff1 20406018 67e148f1 68494499 6fe144a7 98467c00 -20210004 +20210005 da2048eb 20403df5 6fe0c4a9 @@ -342,15 +343,14 @@ 6fe34941 203a0379 20203cf2 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 +6fe0cad9 +c000801e +704b8814 +704e8d05 +2020428e +20404287 +704b8805 +2020428e 00000000 00000000 00000000 Index: program/patch.prog =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/program/patch.prog (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/program/patch.prog (working copy) @@ -1830,7 +1830,7 @@ branch p_zcode_entrance p_mouse_le_ll_start_encryt: - jam ZCODE_33,mem_zcode_temp_param0 + jam ZCODE_21,mem_zcode_temp_param0 branch p_zcode_entrance p_mouse_le_parse_conn_param_accepted: @@ -2292,9 +2292,6 @@ p_keyboard_tx_data_store_loop: istore 1,contw loop p_keyboard_tx_data_store - -p_keyboard_value_set: - store 2,mem_keyboard_tx_data+1 p_keyboard_motion_data_check_next: call p_keyboard_device_data_tpye_check @@ -2357,7 +2354,10 @@ p_keyboard_value_media: setarg 0x0183 - branch p_keyboard_value_set +p_keyboard_value_set: + store 2,mem_keyboard_tx_data+1 + branch p_keyboard_motion_data_check_next + p_keyboard_value_play: setarg 0x00cd branch p_keyboard_value_set @@ -2838,7 +2838,7 @@ beq 2,p_bt1_led_on beq 3,p_bt2_led_on beq 4,p_caps_led_on - beq 5,p_led_all_off + beq 5,p_led_off rtn endif Index: program/z.prog =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/program/z.prog (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/program/z.prog (working copy) @@ -86,6 +86,7 @@ org 0x20001 z_entrance2: beq ZCODE_20,z_keyboard_start_work + beq ZCODE_21,z_mouse_le_ll_start_encryt rtn z_keyboard_start_work: @@ -118,13 +119,23 @@ branch p_mouse_buletooth_fast_conn_init,blank branch mouse_start_reconnect_device +z_mouse_le_ll_start_encryt: + fetch 1,mem_mouse_le_reconnect_flag + beq 1,z_mouse_le_ll_reconn_start_encryt + jam 20,mem_le_start_encrypt_timer + jam 5,mem_le_start_auto_reco_timer + branch mouse_le_ll_enable_start_enc_flag +z_mouse_le_ll_reconn_start_encryt: + call mouse_updata_le_param + jam 5,mem_le_start_encrypt_timer + branch mouse_le_ll_enable_start_enc_flag + org 0x30001 z_entrance3: beq ZCODE_30,z_mouse_le_parse_conn_param_accepted beq ZCODE_31,z_mouse_le_conn_param_update_rsp_recieved beq ZCODE_32,z_mouse_le_bb_disconnected - beq ZCODE_33,z_mouse_le_ll_start_encryt beq ZCODE_34,z_mouse_24g_attempt_success beq ZCODE_35,z_mouse_24g_attempt_fail rtn @@ -156,17 +167,6 @@ store 1,mem_mouse_le_bb_connected_flag branch mouse_le_bb_disconnected+7 -z_mouse_le_ll_start_encryt: - fetch 1,mem_mouse_le_reconnect_flag - beq 1,z_mouse_le_ll_reconn_start_encryt - jam 20,mem_le_start_encrypt_timer - jam 5,mem_le_start_auto_reco_timer - branch mouse_le_ll_enable_start_enc_flag -z_mouse_le_ll_reconn_start_encryt: - call mouse_updata_le_param - jam 5,mem_le_start_encrypt_timer - branch mouse_le_ll_enable_start_enc_flag - z_mouse_24g_attempt_success: call p_keyboard_get_24g_led_enable fetch 4,mem_24g_addr @@ -176,11 +176,14 @@ call mouse_device_poweron_timer_init call mouse_no_data_timer_init ifdef LED_FUNCTION + fetch 1,mem_keyboard_device_poweron_timer_count + nbranch z_mouse_24g_attempt_success_skip_led_config,blank jam 0,mem_keyboard_led_blink_timer jam 0,mem_keyboard_discovery_flag call p_keyboard_key_press_check_enable call p_led_off endif +z_mouse_24g_attempt_success_skip_led_config: jam 1,mem_keyboard_24g_state branch mouse_24g_attempt_success @@ -261,6 +264,8 @@ z_mouse_le_bb_event_connected: ifdef LED_FUNCTION + fetch 1,mem_keyboard_device_poweron_timer_count + nbranch mouse_le_bb_event_connected,blank call z_keyboard_discovery_led_off endif branch mouse_le_bb_event_connected Index: sched/keyboard.dat =================================================================== --- /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/sched/keyboard.dat (revision 1975) +++ /branch/keyboard/customer_FW/RY_project/RY_YC1028_2mode_3ch_Project/sched/keyboard.dat (working copy) @@ -223,13 +223,13 @@ mem_adc_low_volatage_led_blink_timer:64 00 mem_mouse_low_v_led_blink_time:e8 03 #200ms on 200ms off mem_mouse_disconvey_led_blink_time:05 00 #500ms on 500ms off -mem_mouse_device_poweron_timer_count_init:1e +mem_mouse_device_poweron_timer_count_init:32 mem_keyboard_system_switch_led_blink_time:01 #100ms on 100ms off #time mem_mouse_24g_pair_timeout_init:b0 04 #2min mem_mouse_discovery_timeout:b0 04 #2min -mem_mouse_no_data_timeout:b8 0b #5mins +mem_mouse_no_data_timeout:bd 0b #5mins mem_mouse_24g_reconn_timeout_init:64 #10s mem_mouse_direct_timeout:64 #10s mem_mouse_fast_direct_timeout:64 #10s @@ -237,7 +237,7 @@ mem_mouse_fast_page_to:00 40 # 16384*0.625ms=10s mem_same_keyvalue_timer_init:B8 0B #5min -mem_keyboard_caps_led_on_timer:58 02 #1min +mem_keyboard_caps_led_on_timer:b8 0b #5min #system mem_device_flag:00 #00--24g 01--bt/ble