Index: format/rom.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/format/rom.format (revision 2740) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/format/rom.format (working copy) @@ -9784,6 +9784,14 @@ 1 mem_mouse_rgb_adc_no_power_flag 1 mem_mouse_dpi_led_blink_enable + +//le name reset +20 mem_local_name_length1 +20 mem_local_name_length2 +20 mem_le_name_len1 +20 mem_le_name_len2 +1 mem_lap_temp + ) Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/output/eeprom.dat (revision 2741) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/output/eeprom.dat (working copy) @@ -1223,7 +1223,11 @@ 20 40 01 -69 +6a +24 +55 +81 +3b 20 40 41 @@ -1261,125 +1265,85 @@ 3b c9 6f -e4 -4c -1f -20 -7a -00 -00 -6f e0 -cc -1e -1f -e2 -22 -00 -1f -e6 -7c -0b -24 -21 -01 -50 -20 -40 +c9 +38 +c0 01 -49 -d8 -a0 -4a -db -20 -40 01 -46 -d8 -a0 44 -0a 20 40 01 -46 -d8 -a0 -42 -f8 -d8 -c0 4c -1f -1a -22 -72 -00 -20 -20 -7d -5f -d8 -a0 -4a -db +6f +e0 +cc +f7 +67 +e0 +c0 +ad +df 20 -40 -01 -4e +00 +14 d8 -a0 -44 -0a -20 -40 -01 -4e +c0 +4c +a7 d8 a0 -42 -f8 -df -20 -00 -0b +45 +fc 20 20 7d -26 +5f 20 40 01 -66 +5b 6f e0 cc -1e +f7 1f e0 fe 01 67 e0 -ca -d2 -70 -4a -d3 -09 +c0 +ad +df +20 +00 +14 d8 c0 4c -1f +bb d8 a0 -4a -d4 -1a -22 -72 +45 +fc +20 +20 +7d +5f +df +20 00 +14 +d8 +c0 +4c +cf +d8 +a0 +42 +f7 20 40 7d @@ -1387,7 +1351,7 @@ 6f e0 cc -1e +cf 1f e0 fe @@ -1396,58 +1360,98 @@ e0 c4 08 -70 -44 -09 -09 +df +20 +00 +13 d8 c0 4c -1f +d0 d8 a0 44 0a -1a -22 -72 -00 20 40 7d 5f +df +20 +00 +14 +d8 +c0 +44 +08 +d8 +a0 +4a +d2 +20 +20 +7d +5f +df +20 +00 +14 d8 c0 4c -1e +e3 d8 a0 42 f7 -1a -22 -72 -00 -1f 20 -f2 +40 +7d +5f +6f +e0 +cc +e3 +1f +e0 +fe 01 +67 +e0 +c4 +08 +df 20 +00 +13 +d8 +c0 +4c +e4 +d8 +a0 +44 +0a 20 +40 7d 5f -d8 -a0 -4a -d2 df 20 00 14 +d8 +c0 +44 +08 +d8 +a0 +4a +d2 20 20 7d -26 +5f 20 75 80 @@ -1466,10 +1470,6 @@ 1e 20 40 -01 -3a -20 -40 3d 13 20 @@ -5716,8 +5716,8 @@ 20 26 f6 -36 -3e +a7 +45 aa 55 40 @@ -6478,6 +6478,78 @@ 01 aa 55 +0b +00 +a7 +4c +0a +4d +4f +46 +49 +49 +20 +4d +31 +44 +4d +aa +55 +0d +00 +bb +4c +0c +34 +30 +30 +2d +4d +41 +57 +42 +54 +31 +39 +38 +aa +55 +0b +00 +cf +4c +0a +4d +4f +46 +49 +49 +20 +4d +31 +44 +4d +aa +55 +0d +00 +e3 +4c +0c +34 +30 +30 +2d +4d +41 +57 +42 +54 +31 +39 +38 +aa +55 06 00 cc @@ -7055,88 +7127,16 @@ 02 40 00 -9c +e4 1b 55 aa aa 55 -5c -97 -1b -74 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +42 +ab +18 +c6 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -c6 -4b +63 +96 Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/output/memmap.format (revision 2740) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/output/memmap.format (working copy) @@ -2295,6 +2295,11 @@ 0x4ca4 mem_mouse_rgb_ctrl_gpio 0x4ca5 mem_mouse_rgb_adc_no_power_flag 0x4ca6 mem_mouse_dpi_led_blink_enable +0x4ca7 mem_local_name_length1 +0x4cbb mem_local_name_length2 +0x4ccf mem_le_name_len1 +0x4ce3 mem_le_name_len2 +0x4cf7 mem_lap_temp 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/output/program.lis (revision 2740) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/output/program.lis (working copy) @@ -398,82 +398,78 @@ p_app_init: 012e 793f8034 set0 mark_adc_enable ,mark 012f 20406df3 call enable_authrom -0130 20400169 call p_mouse_setting_config -0131 204041a7 call mouse_init_sunt -0132 20758000 rtn wake -0133 704ca600 jam 0 ,mem_mouse_dpi_led_blink_enable -0134 2040032d call p_mouse_seting_sensor_type -0135 20403d8a call mouse_usb_check_enable -0136 20404728 call mouse_drawing_optima_init -0137 2040018f call p_mouse_cb_fuction -0138 2040051b call p_mouse_sensor_powerdown -0139 20203bc9 branch mouse_init + 8 - -p_mouse_le_name_load: -013a 6fe44c1f fetch 8 ,mem_le_name_patch -013b 207a0000 rtn blank -013c 6fe0cc1e fetch 1 ,mem_le_name_patch_len -013d 1fe22200 copy pdata ,rega -013e 1fe67c0b sub pdata ,11 ,null -013f 24210150 nbranch p_mouse_le_name_patch_len_overflow ,positive -0140 20400149 call p_mouse_le_name_clear -0141 d8a04adb arg mem_le_adv_swift_pair + 9 ,contw -0142 20400146 call p_mouse_le_name_load_next -0143 d8a0440a arg mem_le_scan_data + 2 ,contw -0144 20400146 call p_mouse_le_name_load_next -0145 d8a042f8 arg mem_le_name ,contw - -p_mouse_le_name_load_next: -0146 d8c04c1f arg mem_le_name_patch ,contr -0147 1a227200 copy rega ,loopcnt -0148 20207d5f branch memcpy - -p_mouse_le_name_clear: -0149 d8a04adb arg mem_le_adv_swift_pair + 9 ,contw -014a 2040014e call p_mouse_le_name_clear_next -014b d8a0440a arg mem_le_scan_data + 2 ,contw -014c 2040014e call p_mouse_le_name_clear_next -014d d8a042f8 arg mem_le_name ,contw - -p_mouse_le_name_clear_next: -014e df20000b arg 11 ,loopcnt -014f 20207d26 branch clear_mem - -p_mouse_le_name_patch_len_overflow: -0150 20400166 call p_mouse_le_swift_pair_disable -0151 6fe0cc1e fetch 1 ,mem_le_name_patch_len -0152 1fe0fe01 increase 1 ,pdata -0153 67e0cad2 store 1 ,mem_le_adv_swift_pair -0154 704ad309 jam 9 ,mem_le_adv_swift_pair + 1 -0155 d8c04c1f arg mem_le_name_patch ,contr -0156 d8a04ad4 arg mem_le_adv_swift_pair + 2 ,contw -0157 1a227200 copy rega ,loopcnt -0158 20407d5f call memcpy -0159 6fe0cc1e fetch 1 ,mem_le_name_patch_len -015a 1fe0fe01 increase 1 ,pdata -015b 67e0c408 store 1 ,mem_le_scan_data -015c 70440909 jam 9 ,mem_le_scan_data + 1 -015d d8c04c1f arg mem_le_name_patch ,contr -015e d8a0440a arg mem_le_scan_data + 2 ,contw -015f 1a227200 copy rega ,loopcnt -0160 20407d5f call memcpy -0161 d8c04c1e arg mem_le_name_patch_len ,contr -0162 d8a042f7 arg mem_le_name_len ,contw -0163 1a227200 copy rega ,loopcnt -0164 1f20f201 increase 1 ,loopcnt -0165 20207d5f branch memcpy - -p_mouse_le_swift_pair_disable: -0166 d8a04ad2 arg mem_le_adv_swift_pair ,contw -0167 df200014 arg 20 ,loopcnt -0168 20207d26 branch clear_mem +0130 2040016a call p_mouse_setting_config +0131 2455813b ncall p_mouse_name_reset ,wake +0132 204041a7 call mouse_init_sunt +0133 20758000 rtn wake +0134 704ca600 jam 0 ,mem_mouse_dpi_led_blink_enable +0135 2040032d call p_mouse_seting_sensor_type +0136 20403d8a call mouse_usb_check_enable +0137 20404728 call mouse_drawing_optima_init +0138 2040018f call p_mouse_cb_fuction +0139 2040051b call p_mouse_sensor_powerdown +013a 20203bc9 branch mouse_init + 8 + +p_mouse_name_reset: +013b 6fe0c938 fetch 1 ,mem_device_flag +013c c0010144 beq mode_bt_device2 ,p_mouse_bt2_name_reset +013d 2040014c call p_mouse_ble1_name_reset +013e 6fe0ccf7 fetch 1 ,mem_lap_temp +013f 67e0c0ad store 1 ,mem_lap + 5 +0140 df200014 arg 20 ,loopcnt +0141 d8c04ca7 arg mem_local_name_length1 ,contr +0142 d8a045fc arg mem_local_name_length ,contw +0143 20207d5f branch memcpy + +p_mouse_bt2_name_reset: +0144 2040015b call p_mouse_ble2_name_reset +0145 6fe0ccf7 fetch 1 ,mem_lap_temp +0146 1fe0fe01 increase 1 ,pdata +0147 67e0c0ad store 1 ,mem_lap + 5 +0148 df200014 arg 20 ,loopcnt +0149 d8c04cbb arg mem_local_name_length2 ,contr +014a d8a045fc arg mem_local_name_length ,contw +014b 20207d5f branch memcpy + +p_mouse_ble1_name_reset: +014c df200014 arg 20 ,loopcnt +014d d8c04ccf arg mem_le_name_len1 ,contr +014e d8a042f7 arg mem_le_name_len ,contw +014f 20407d5f call memcpy +0150 6fe0cccf fetch 1 ,mem_le_name_len1 +0151 1fe0fe01 increase 1 ,pdata +0152 67e0c408 store 1 ,mem_le_scan_data +0153 df200013 arg 19 ,loopcnt +0154 d8c04cd0 arg mem_le_name_len1 + 1 ,contr +0155 d8a0440a arg mem_le_scan_data + 2 ,contw +0156 20407d5f call memcpy +0157 df200014 arg 20 ,loopcnt +0158 d8c04408 arg mem_le_scan_data ,contr +0159 d8a04ad2 arg mem_le_adv_swift_pair ,contw +015a 20207d5f branch memcpy + +p_mouse_ble2_name_reset: +015b df200014 arg 20 ,loopcnt +015c d8c04ce3 arg mem_le_name_len2 ,contr +015d d8a042f7 arg mem_le_name_len ,contw +015e 20407d5f call memcpy +015f 6fe0cce3 fetch 1 ,mem_le_name_len2 +0160 1fe0fe01 increase 1 ,pdata +0161 67e0c408 store 1 ,mem_le_scan_data +0162 df200013 arg 19 ,loopcnt +0163 d8c04ce4 arg mem_le_name_len2 + 1 ,contr +0164 d8a0440a arg mem_le_scan_data + 2 ,contw +0165 20407d5f call memcpy +0166 df200014 arg 20 ,loopcnt +0167 d8c04408 arg mem_le_scan_data ,contr +0168 d8a04ad2 arg mem_le_adv_swift_pair ,contw +0169 20207d5f branch memcpy p_mouse_setting_config: -0169 20758000 rtn wake -016a 20402607 call g24_transmit_init -016b 204022ff call g24_chmap_param_init -016c 20403f1e call mouse_gpio_init -016d 2040013a call p_mouse_le_name_load +016a 20758000 rtn wake +016b 20402607 call g24_transmit_init +016c 204022ff call g24_chmap_param_init +016d 20403f1e call mouse_gpio_init 016e 20403d13 call mouse_param_init 016f 20400389 call p_mouse_device_multi_led_parm_init 0170 20400189 call p_mouse_store_normal_tx_power Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/program/patch.prog (revision 2740) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/program/patch.prog (working copy) @@ -451,6 +451,7 @@ set0 mark_adc_enable,mark call enable_authrom call p_mouse_setting_config + ncall p_mouse_name_reset,wake call mouse_init_sunt rtn wake jam 0,mem_mouse_dpi_led_blink_enable @@ -497,6 +498,65 @@ rtn endif +p_mouse_name_reset: + fetch 1,mem_device_flag + beq MODE_BT_DEVICE2,p_mouse_bt2_name_reset + call p_mouse_ble1_name_reset + fetch 1,mem_lap_temp + store 1,mem_lap+5 + arg 20,loopcnt + arg mem_local_name_length1,contr + arg mem_local_name_length,contw + branch memcpy + +p_mouse_bt2_name_reset: + call p_mouse_ble2_name_reset + fetch 1,mem_lap_temp + increase 1,pdata + store 1,mem_lap+5 + arg 20,loopcnt + arg mem_local_name_length2,contr + arg mem_local_name_length,contw + branch memcpy + +p_mouse_ble1_name_reset: + arg 20,loopcnt + arg mem_le_name_len1,contr + arg mem_le_name_len,contw + call memcpy + + fetch 1,mem_le_name_len1 + increase 1,pdata + store 1,mem_le_scan_data + arg 19,loopcnt + arg mem_le_name_len1+1,contr + arg mem_le_scan_data+2,contw + call memcpy + + arg 20,loopcnt + arg mem_le_scan_data,contr + arg mem_le_adv_swift_pair,contw + branch memcpy + +p_mouse_ble2_name_reset: + arg 20,loopcnt + arg mem_le_name_len2,contr + arg mem_le_name_len,contw + call memcpy + + fetch 1,mem_le_name_len2 + increase 1,pdata + store 1,mem_le_scan_data + arg 19,loopcnt + arg mem_le_name_len2+1,contr + arg mem_le_scan_data+2,contw + call memcpy + + arg 20,loopcnt + arg mem_le_scan_data,contr + arg mem_le_adv_swift_pair,contw + branch memcpy +/* p_mouse_le_name_load: fetch 8,mem_le_name_patch rtn blank @@ -561,7 +621,7 @@ arg mem_le_adv_swift_pair,contw arg 20,loopcnt branch clear_mem - +*/ p_mouse_setting_config: rtn wake ifdef G24_OTA @@ -570,7 +630,7 @@ call g24_transmit_init call g24_chmap_param_init call mouse_gpio_init - call p_mouse_le_name_load +// call p_mouse_le_name_load call mouse_param_init ifdef YJX_ICE_SELECT_ANGLE call p_mouse_sensor_set_angle Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/sched/mouse.dat (revision 2741) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_389/sched/mouse.dat (working copy) @@ -316,6 +316,18 @@ 2c 01 #timeout +mem_local_name_length1: +'MOFII M1DM + +mem_local_name_length2: +'400-MAWBT198 + +mem_le_name_len1: +'MOFII M1DM + +mem_le_name_len2: +'400-MAWBT198 + mem_le_adv_ind:03 12 18 mem_le_adv_direct_ind:ff 00 00