Index: Librarier/bt_rom/format/headset.format
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (working copy)
@@ -299,6 +299,7 @@
1 mem_le_wait_process_cmd
2 mem_loopcnt
1 mem_le_master_sm
+ 2 mem_adc_current_value
1 mem_le_conn_status
1 mem_le_hci_conn_peer_addr_type
0 mem_headset_end
Index: Librarier/bt_rom/format/ui.format
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/ui.format (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/ui.format (working copy)
@@ -302,6 +302,7 @@
0x96 BT_CMD_MSR_TEMP
0x97 BT_CMD_UPDATE_WAKEUP
0x98 BT_CMD_BATVALUE
+0x9f BT_CMD_CHARGE_START_POWERON
0x99 BT_CMD_EnterTestMode
Index: ModuleDemo/25_OTA/bt_demo/BT/a-l.bat
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/a-l.bat (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/a-l.bat (working copy)
@@ -2,10 +2,10 @@
e pu
::e 8097 040307020506
:: enable flash vcc
-e 809a 3f
+:: e 809a 3f
:: set flash io port
e 8090 060502
-e 8094 070304
+e 8094 040307
:: clear flash first
e fe 0
:: sometimes in lpm will power off qspi
@@ -18,11 +18,10 @@
e fe 7f000
:: close wdt
e 8043 00
+::e fp output/ota.dat 1000
::e fw 3 a5
-e fp output/flash.dat 1000
-::e fp output/flash.dat 20000
+e fp output/flash_add_coef.dat 6000
e fw 4 a5
:: make sure flash offset write after the file download, becouse in rom code, will check crc, if download failed in middle time, it will occur error.
-e fw 0 031000
-::e fw 0 030002
+e fw 0 036000
e k
Index: ModuleDemo/25_OTA/bt_demo/BT/a.bat
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/a.bat (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/a.bat (working copy)
@@ -2,10 +2,10 @@
e pu
::e 8097 040307020506
:: enable flash vcc
-e 809a 3f
+:: e 809a 3f
:: set flash io port
e 8090 060502
-e 8094 070304
+e 8094 040307
:: clear flash first
e fe 0
:: sometimes in lpm will power off qspi
@@ -18,11 +18,10 @@
e fe 7f000
:: close wdt
e 8043 00
+::e fp output/ota.dat 1000
::e fw 3 a5
-e fp output/flash.dat 1000
-::e fp output/flash.dat 20000
+e fp output/flash_add_coef.dat 6000
e fw 4 a5
:: make sure flash offset write after the file download, becouse in rom code, will check crc, if download failed in middle time, it will occur error.
-::e fw 0 030002
-e fw 0 031000
+e fw 0 036000
e k
Index: ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy)
@@ -4,6 +4,7 @@
define RF_DEBUG
//define WHITE_LIST
define MINZHAN_SDK
+//define FUNCTION_CHARGE_DEFAULT_DISABLE
define FSC_RTK_HOST
//define LE_CONN_RCV_DEBUG
define PATCH_DEBUG_LOG
@@ -44,7 +45,7 @@
beq patch13_6,p_initialize_radio_cont_by_init_param
- beq patch14_0,p_lpm_hibernate
+ beq patch14_0,p_lpm_hibernate_final
beq patch14_4,p_lpm_dispatch
beq patch15_0,p_lpm_dispatch_unconn
beq patch17_1,z_app_init
@@ -87,6 +88,7 @@
beq patch32_2,p_scheduler_tx_l2cap_pkt
beq patch34_5,p_simple_pairing_sequence
beq patch34_6,p_master_simple_paring_sequence
+ beq patch3d_2,p_check_51cmd_once
rtneq patch36_2
rtneq patch3a_4
//beq patch36_2,p_tws_m_wait_connecting
@@ -229,6 +231,9 @@
call wdt_disable_watchdog
endif //FUNCTION_WATCH_DOG
+ // Be-careful, mark register may loss, reason unknow.
+ call p_lpm_load_mark,wake
+
// Change mixer power
jam 0xba,0x894b
call p_initialize_radio_tx_power
@@ -239,6 +244,19 @@
jam 0x0e,0x8952
jam 0x07,0x896d
rtn
+
+p_lpm_load_mark:
+ // clear gpio latch
+ fetch 4,core_lpm_xtalcnt
+ set0 19,pdata // enable gpio fuction gpio_latch
+ store 4,core_lpm_reg
+
+ jam lpmreg_sel_ctrl2,core_lpm_wr
+ call p_lpm_write_wait_clock
+
+ fetch 8,mem_saved_mark
+ iforce mark
+ rtn
p_initialize_radio_tx_power:
fetch 1,mem_tx_power
@@ -425,6 +443,97 @@
endif //FUNCTION_WATCH_DOG
rtn
+ifdef MINZHAN_SDK
+p_read_efuse_64_bytes:
+ setarg 0
+ arg mem_efuse_64_bytes,rega
+ arg 64,temp
+ branch efuse_read_data
+endif
+
+
+p_app_init_efuse_data:
+ // Load efuse data for por
+ setarg EFUSE_UCODE_CHGR_CAL
+ arg mem_temp,rega
+ arg 1,temp
+ call efuse_read_data
+
+ fetch 1,mem_temp
+ ncall p_charge_setting_by_efuse_data,blank
+
+ setarg EFUSE_UCODE_ADC_GPIO_0_5
+ arg mem_efuse_adc_offset,rega
+ arg 8,temp
+ branch efuse_read_data
+
+p_charge_setting_by_efuse_data:
+ sub pdata,0x2A,null
+ branch p_charge_setting_by_efuse_data_cont,positive
+ setarg 0x2a
+p_charge_setting_by_efuse_data_cont:
+ store 1,mem_lpm_write_temp_charge_control+1
+ and pdata,0x0f,pdata
+ increase -1,pdata
+ lshift4 pdata,pdata
+ // here may reduce some code, becouse first byte default is 0xb0
+ //store 1,mem_lpm_write_temp_charge_control
+ fetcht 1,mem_lpm_write_temp_charge_control
+ and temp,0x0f,temp
+ ior temp,pdata
+ store 1,mem_lpm_write_temp_charge_control
+ rtn
+
+p_evt_first_power_on:
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+ call p_lpm_charge_init_pwr_off
+else
+ call p_lpm_charge_init_pwr_on
+endif //FUNCTION_CHARGE_DEFAULT_DISABLE
+ jam BT_EVT_FIRST_PWR_ON,mem_fifo_temp
+ branch ipc_tx_bt_event
+
+
+p_evt_restart:
+ // Check if last have shutdown charge or not
+ fetch 1,mem_hibernate_flag
+ bbit0 4,p_evt_restart_continue
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+ call p_lpm_charge_init_pwr_off_restart
+else
+ // If last shutdown charge, need restart it.
+ call p_lpm_charge_init_start_charge_ctrl
+endif //FUNCTION_CHARGE_DEFAULT_DISABLE
+p_evt_restart_continue:
+ //call p_clear_charge_stop_power_off_flag
+ //call p_clear_charge_reset_flag
+ call p_clear_charge_reset_and_charge_stop_power_off_flag
+ jam BT_EVT_RESTART,mem_fifo_temp
+ branch ipc_tx_bt_event
+/*
+p_headset_cb_saradc_read_hvin_wait:
+ fetch 1,mem_saradc_flag
+ rtn blank
+ call saradc_read_hvin_wait
+ fetch 1,mem_saradc_flag
+ nrtn blank
+ storet 2,mem_adc_current_value
+ rtn
+*/
+// call p_clear_charge_reset_flag
+ call p_clear_charge_reset_and_charge_stop_power_off_flag
+ jam BT_EVT_RESTART,mem_fifo_temp
+ branch ipc_tx_bt_event
+
+
+p_set_gpio_after_lpm:
+ call qspi_init_set
+ call qspi_gpio_init
+ nop 2000 // Delay for gpio26 work ready
+ call qspi_release_powerdown_flash
+// nop 100
+ rtn
+
//p_app_process_bb_event:
// fetch 1,mem_state
@@ -441,18 +550,35 @@
p_clear_charge_reset_flag:
+p_clear_charge_reset_and_charge_stop_power_off_flag:
fetch 4,core_lpm_buck_cfg
+// set0 28,pdata
set0 29,pdata
store 4,core_lpm_reg
branch p_lpm_write_ctrl_buck
+
+p_set_first_pwr_on_flag:
+ // 0x8341 bit2, for first power on detect
+ fetch 4,core_lpm_buck_cfg
+ set1 26,pdata
+ store 4,core_lpm_reg
+ branch p_lpm_write_ctrl_buck
+
p_lpm_write_ctrl_buck:
- until null,lpo_edge
+// until null,lpo_edge
+ call p_lpm_write_wait_clock
jam lpmreg_sel_buck_cfg,core_lpm_wr
- until null,lpo_edge
- rtn
-p_lpm_hibernate:
+ branch p_lpm_write_wait_clock
+// until null,lpo_edge
+// rtn
+
+
+p_lpm_hibernate_final:
+ // set charge wake up
+ call p_lpm_charge_set_wakeup_setting
+ call p_set_first_pwr_on_flag
arg -1,temp // Here must be -1, the rom code is error
- branch lpm_doze
+ branch lpm_hibernate+2
@@ -3011,11 +3137,12 @@
cb_enter_lpm:
fetch 1,mem_lmp_conn_state
store 1,mem_xlmp_conn_state
+ jam 0,mem_xlmp_clock_offset_valid
+ call p_lpm_charge_set_wakeup_setting
branch z_enter_hibernate_prepare_work
cb_enter_hibernate:
-// call ice_break
jam MCU_STATE_HIBERNATE,mem_ipc_mcu_state
call ipc_check_ack
branch z_enter_hibernate_prepare_work
@@ -3097,4 +3224,179 @@
beq type_hv3, end_of_packet
beq type_2ev3,end_of_packet
branch rx_type_dispatch+2
+
+
+
+/////////////////////////////////////////////////////// CHARGE //////////////////////////////////////////////////////////////////
+p_lpm_charge_set_wakeup_setting:
+ fetcht 2,mem_lpm_write_temp_charge_wakeup_low_active
+ fetch 2,mem_lpm_write_temp_charge_wakeup_high_active
+ lshift8 pdata,pdata
+ lshift2 pdata,pdata
+ ior temp,pdata
+p_lpm_write2_charge_wakeup_cfg:
+ store 4,core_lpm_reg
+ call p_lpm_write_wait_clock
+ jam lpmreg_sel_charger_low_high_wakeup_reg,core_lpm_wr2
+ branch p_lpm_write_wait_clock
+
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+p_lpm_charge_init_pwr_off:
+ call p_lpm_charge_init_pwr_on
+ branch p_lpm_charge_init_stop_charge_ctrl
+
+p_lpm_charge_init_pwr_off_restart:
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_SHUTDOWN_CORE,pdata
+ set1 CHARGE_CHGR_SHUTDOWN_SW,pdata
+ set1 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
+ branch p_lpm_write_charge_cfg
+
+wake_from_power_close_charge:
+ call p_lpm_charge_init_pwr_off
+ branch wake_from_power_continue
+endif //FUNCTION_CHARGE_DEFAULT_DISABLE
+
+p_lpm_charge_init_pwr_on:
+ifdef PATCH_DEBUG_LOG
+ // set flag
+ arg LOG_POINT_1700,rega
+ fetcht 2,mem_lpm_write_temp_charge_control
+ call debug_log_print
+endif //PATCH_DEBUG_LOG
+ fetch 4,mem_lpm_write_temp_charge_control
+ branch p_lpm_write_charge_cfg
+
+
+//Because we don't have last setting value
+p_lpm_charge_init_start_charge_ctrl:
+ifdef PATCH_DEBUG_LOG
+ // set flag
+ arg LOG_POINT_1701,rega
+ fetcht 2,mem_lpm_write_temp_charge_control
+ call debug_log_print
+endif //PATCH_DEBUG_LOG
+ // delay 500us for clock safe
+ nop 60000
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_SHUTDOWN_CORE,pdata
+ set1 CHARGE_CHGR_SHUTDOWN_SW,pdata
+ set1 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
+ store 4,mem_lpm_write_temp_charge_control
+
+ // For generate bias clock
+ arg 50,loopcnt
+ call p_charge_reset_bias
+
+ //call p_lpm_charge_insc_enb_set
+
+ fetch 4,mem_lpm_write_temp_charge_control
+ set0 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
+ call p_lpm_write_charge_cfg
+
+ fetch 4,mem_lpm_write_temp_charge_control
+ set0 CHARGE_CHGR_SHUTDOWN_SW,pdata
+ call p_lpm_write_charge_cfg
+ // delay 10us
+ nop 1200
+
+ fetch 4,mem_lpm_write_temp_charge_control
+ set0 CHARGE_CHGR_SHUTDOWN_CORE,pdata
+ call p_lpm_write_charge_cfg
+ // delay 10us
+ nop 1200
+ rtn
+
+
+// Charge need this to generate clock.
+p_charge_reset_bias:
+ // Enable Bias
+ fetch 4,mem_lpm_write_temp_charge_control
+ set0 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
+ call p_lpm_write_charge_cfg
+
+ // Enable Bias
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
+ call p_lpm_write_charge_cfg
+
+ loop p_charge_reset_bias
+ rtn
+
+p_lpm_charge_init_stop_charge_ctrl:
+ifdef PATCH_DEBUG_LOG
+ // set flag
+ arg LOG_POINT_1702,rega
+ fetcht 2,mem_lpm_write_temp_charge_control
+ call debug_log_print
+endif //PATCH_DEBUG_LOG
+ //call ice_break
+ // Enable Bias
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_SHUTDOWN_CORE,pdata
+ call p_lpm_write_charge_cfg
+ // delay 10us
+ nop 1200
+
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_SHUTDOWN_SW,pdata
+ call p_lpm_write_charge_cfg
+ // delay 10us
+ nop 1200
+
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
+ call p_lpm_write_charge_cfg
+ // delay 10us
+ nop 1200
+ rtn
+
+p_lpm_write_charge_cfg:
+// jam 0xfa,mem_lpm_write_temp_charge_control+1
+ store 4,mem_lpm_write_temp_charge_control
+ store 4,core_lpm_reg
+ call p_lpm_write_wait_clock
+ jam lpmreg_sel_charge_ctrl,core_lpm_wr
+ branch p_lpm_write_wait_clock
+
+
+
+
+/////////////////////////////////////////////////////// CHARGE //////////////////////////////////////////////////////////////////
+
+
+
+p_check_51cmd_once:
+ call ui_ipc_get_lock
+ arg mem_ipc_fifo_c512bt,rega
+ call fifo_out
+ copy pdata,temp
+ call ui_ipc_put_lock
+ copy temp,pdata
+ rtn blank
+ beq BT_CMD_BATVALUE,p_cmd_check_batvalue
+
+ store 1,mem_zcode_temp_param2
+ branch z_check_51cmd_once
+
+p_cmd_check_batvalue:
+ call saradc_check_hvin
+ nop 6000
+ fetcht 2,core_sumdata
+ copy temp,pdata
+ call adc_check_wait_little_time,blank
+ storet 2,mem_adc_current_value
+ call saradc_diable
+p_send_evt_batvalue:
+ jam BT_EVT_BATVALUE,mem_fifo_temp
+ branch ipc_tx_bt_event
+adc_check_wait_little_time:
+ nop 6000
+ fetcht 2,core_sumdata
+ rtn
+
+
+p_app_init:
+ call z_set_gpio_after_lpm,wake
+ branch z_app_init
Index: ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy)
@@ -1993,6 +1993,62 @@
rtn
org z
+z_check_51cmd_once:
+ fetch 1,mem_zcode_temp_param2
+ beq BT_CMD_CHARGE_POWER_OFF,z_cmd_charge_power_off
+ beq BT_CMD_CHARGE_START_POWERON,z_cmd_charge_start_power_on
+ beq BT_CMD_CHARGE_STOP_POWEROFF,z_cmd_charge_stop_power_off
+ beq BT_CMD_CHARGE_INSCENB,z_lpm_charge_insc_enb_set
+ beq BT_CMD_CHARGE_INSCENB_CLEAR,z_lpm_charge_insc_enb_clear
+
+ branch check_51cmd_once +8
+
+z_cmd_charge_power_off:
+ //branch p_set_charge_reset_flag
+z_set_charge_reset_flag:
+ // 0x8341 bit5, for next wakeup to judge need auto power on
+ fetch 4,core_lpm_buck_cfg
+ set1 29,pdata
+ store 4,core_lpm_reg
+ branch p_lpm_write_ctrl_buck
+z_cmd_charge_start_power_on:
+ branch p_lpm_charge_init_start_charge_ctrl
+
+z_lpm_charge_insc_enb_set:
+ifdef PATCH_DEBUG_LOG
+ // set flag
+ arg LOG_POINT_1703,rega
+ fetcht 2,mem_lpm_write_temp_charge_control
+ call debug_log_print
+endif //PATCH_DEBUG_LOG
+ // Enable Bias
+ fetch 4,mem_lpm_write_temp_charge_control
+ set1 CHARGE_CHGR_INSC_ENB,pdata
+ branch p_lpm_write_charge_cfg
+
+z_lpm_charge_insc_enb_clear:
+ifdef PATCH_DEBUG_LOG
+ // set flag
+ arg LOG_POINT_1704,rega
+ fetcht 2,mem_lpm_write_temp_charge_control
+ call debug_log_print
+endif //PATCH_DEBUG_LOG
+ // Enable Bias
+ fetch 4,mem_lpm_write_temp_charge_control
+ set0 CHARGE_CHGR_INSC_ENB,pdata
+ branch p_lpm_write_charge_cfg
+
+z_cmd_charge_stop_power_off:
+ call p_lpm_charge_init_stop_charge_ctrl
+z_set_charge_stop_power_off_flag:
+ // 0x8341 bit4, for next wakeup to judge need charge full power on
+ fetch 4,core_lpm_buck_cfg
+ set1 28,pdata
+ store 4,core_lpm_reg
+ branch p_lpm_write_ctrl_buck
+ rtn
+
+org z
z_hci_send_inquiry_comple:
set0 mark_inquiry_on,mark
jam 1,mem_mesh_event_para_total_length
@@ -2023,8 +2079,7 @@
fetch 1,mem_xlmp_conn_state
store 1,mem_lmp_conn_state
- ncall z_app_init_efuse_data,wake
-
+ ncall p_app_init_efuse_data,wake
ifdef FUNCTION_WATCH_DOG
call wdt_init_reset_with_start
@@ -2052,7 +2107,7 @@
//call headset_check_reconnet
//call p_ipc_notify_m0_wakeup_flag_init
- call z_set_gpio_after_lpm,wake
+ //call z_set_gpio_after_lpm,wake
// call qspi_release_powerdown_flash,wake
nbranch wake_from_power,wake
wake_for_lpm:
@@ -2070,22 +2125,37 @@
endif
wake_from_power:
+
+// setarg 0x1171
+// store 2,mem_encryp_inital_value
+// call z_efuse_custom_encryption
// store local addr
fetch 6,mem_lap
store 6,mem_local_bdaddr
+ //read adc
+ call p_cmd_check_batvalue
+
ifdef MINZHAN_SDK
jam 2 ,core_reset
endif
call enable_xip
fetch 1,mem_hibernate_flag
- bbit1 5,z_evt_restart
- jam BT_EVT_RESET,mem_fifo_temp
- call ipc_tx_bt_event
+ bbit0 2,p_evt_first_power_on
+ bbit1 5,p_evt_restart
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+ // Check if last have shutdown charge or not
+ fetch 1,mem_hibernate_flag
+ bbit0 4,wake_from_power_close_charge
+ call p_lpm_charge_init_pwr_off_restart
+else
+ // For charge power up setting
+ call p_lpm_charge_init_pwr_on
+endif //FUNCTION_CHARGE_DEFAULT_DISABLE
- setarg 0x1171
- store 2,mem_encryp_inital_value
- branch z_efuse_custom_encryption
+wake_from_power_continue:
+ jam BT_EVT_RESET,mem_fifo_temp
+ branch ipc_tx_bt_event
z_evt_restart:
call p_clear_charge_reset_flag
@@ -2110,11 +2180,11 @@
branch p_lpm_write_wait_clock
-z_app_init_efuse_data:
- setarg EFUSE_UCODE_ADC_GPIO_0_5
- arg mem_efuse_adc_offset,rega
- arg 8,temp
- branch efuse_read_data
+//z_app_init_efuse_data:
+// setarg EFUSE_UCODE_ADC_GPIO_0_5
+// arg mem_efuse_adc_offset,rega
+// arg 8,temp
+// branch efuse_read_data
org z
Index: ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat (working copy)
@@ -61,7 +61,7 @@
10 #mem_patch3A
00 #mem_patch3B
00 #mem_patch3C
-00 #mem_patch3D
+04 #mem_patch3D
00 #mem_patch3E
00 #mem_patch3F
Index: ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (working copy)
@@ -323,3 +323,12 @@
mem_local_rx_max_octets:fb 00 48 08 fb 00 48 08
+mem_lpm_write_temp_adc_low: bb 3a 48 00
+mem_lpm_write_temp_adc_high:14 00 00 00
+#re-charge battery set default to 4.1V, change in charge power off
+#charge target battery set default to 4.3V, change in charge power off
+#re-charge and charge must diff to 0.2V
+#10% Charging termination current control
+#Use Force on charger CC & CV loop when charger is in standby mode
+mem_lpm_write_temp_charge_control:b0 2b 03 06
+
Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/Objects/tool/d.bat
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/Objects/tool/d.bat (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/Objects/tool/d.bat (working copy)
@@ -9,16 +9,18 @@
e 809a 3f
:: set flash io port
e 8090 060502
-e 8094 070304
+e 8094 040307
+e fe 0
e pu
e fa
e fr 0 30
-e fc
+e fe 0
+e fe 7f000
e 8043 00
::e fw 3 a5
-e fp flash.dat 1000
+e fp output/flash_add_coef.dat 6000
e fw 4 a5
-e fw 0 031000
+e fw 0 036000
e k
pause
Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (working copy)
@@ -256,7 +256,6 @@
1
- 0
0
1
10000000
@@ -274,7 +273,7 @@
1
1
1
- 0
+ 1
0
0
..\..\User\main.c
@@ -466,6 +465,18 @@
0
0
+
+ 3
+ 16
+ 1
+ 0
+ 0
+ 0
+ ..\..\User\device\battery\yc11xx_dev_battery.c
+ yc11xx_dev_battery.c
+ 0
+ 0
+
Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (working copy)
@@ -16,7 +16,7 @@
ARMCM0
ARM
- ARM.CMSIS.5.5.1
+ ARM.CMSIS.5.3.0
http://www.keil.com/pack/
IROM(0x00000000,0x00040000) IRAM(0x20000000,0x00020000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE
@@ -33,7 +33,7 @@
-
+ $$Device:ARMCM0$Device\ARM\SVD\ARMCM0.svd
0
0
@@ -184,7 +184,6 @@
0
0
0
- 0
0
0
8
@@ -338,7 +337,7 @@
--c99 --gnu
- ..\..\..\..\..\..\Librarier\device;..\..\User\hci;..\..\..\..\..\..\Librarier\drivers\uart;..\..\..\..\..\..\Librarier\drivers\gpio;..\..\..\..\..\..\Librarier\drivers\debug;..\..\..\..\..\..\Librarier\drivers\bt;..\..\..\..\..\..\Librarier\drivers\timer;..\..\..\..\..\..\Librarier\drivers\systick;..\..\..\..\..\..\Librarier\drivers\hal;..\..\..\..\..\..\Librarier\drivers\wdt;..\..\User
+ ..\..\..\..\..\..\Librarier\device;..\..\User\hci;..\..\..\..\..\..\Librarier\drivers\uart;..\..\..\..\..\..\Librarier\drivers\gpio;..\..\..\..\..\..\Librarier\drivers\debug;..\..\..\..\..\..\Librarier\drivers\bt;..\..\..\..\..\..\Librarier\drivers\timer;..\..\..\..\..\..\Librarier\drivers\systick;..\..\..\..\..\..\Librarier\drivers\hal;..\..\..\..\..\..\Librarier\drivers\wdt;..\..\User;..\..\User\device\battery;..\..\User\device\battery
@@ -467,6 +466,11 @@
1
..\..\..\..\..\..\Librarier\drivers\wdt\yc11xx_wdt.c
+
+ yc11xx_dev_battery.c
+ 1
+ ..\..\User\device\battery\yc11xx_dev_battery.c
+
Index: ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c (working copy)
@@ -1,6 +1,7 @@
#include
#include "Drv_bt.h"
#include "yc11xx_h4.h"
+#include "yc11xx_dev_battery.h"
BR_STATE gBRState;
BT_HCI_DATA_FIFO gHciDataFifo;
@@ -19,6 +20,7 @@
case BT_EVT_WAKEUP:
SYS_TimerStartTickTimer(CLOCK_48M_multiple);
break;
+ case BT_EVT_FIRST_PWR_ON:
case BT_EVT_RESET:
Bt_Reset();
Bt_PowerOn(true);
@@ -26,7 +28,7 @@
break;
case BT_EVT_RESTART:
Bt_PowerResetWork();
- break;
+ break;
default:
break;
@@ -230,7 +232,7 @@
//Read_Ledgpionum();
//VP_Init();
//Led_Init();
- //Bat_InitDev();
+ Bat_InitDev();
}
void Bt_PowerOn(bool isPowerOnFromKeyPress)
Index: ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (working copy)
@@ -1699,9 +1699,10 @@
#define mem_le_wait_process_cmd 0x4fe7
#define mem_loopcnt 0x4fe8
#define mem_le_master_sm 0x4fea
-#define mem_le_conn_status 0x4feb
-#define mem_le_hci_conn_peer_addr_type 0x4fec
-#define mem_headset_end 0x4fed
+#define mem_adc_current_value 0x4feb
+#define mem_le_conn_status 0x4fed
+#define mem_le_hci_conn_peer_addr_type 0x4fee
+#define mem_headset_end 0x4fef
#define mem_usb_mouse_data 0x4ace
#define mem_usb_kb_data 0x4ade
#define mem_usb_kb_multikey 0x4aee
@@ -1929,6 +1930,7 @@
#define BT_CMD_MSR_TEMP 0x96
#define BT_CMD_UPDATE_WAKEUP 0x97
#define BT_CMD_BATVALUE 0x98
+#define BT_CMD_CHARGE_START_POWERON 0x9f
#define BT_CMD_EnterTestMode 0x99
#define BT_CMD_ExitTestMode 0x9a
#define BT_CMD_TestPlay 0x9b
Index: ModuleDemo/25_OTA/bt_demo/CM0/User/main.c
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (working copy)
@@ -11,6 +11,7 @@
#include "yc11xx_wdt.h"
#include "yc_drv_common.h"
#include "yc11xx_h4.h"
+#include "yc11xx_dev_battery.h"
#define LPM_ENABLE HWRITE(mem_lpm_mode,1);
@@ -84,6 +85,8 @@
{
DEBUG_POLLING_PRINT();
SYS_timerPolling();
+
+ Bat_StateSwitchPooling();
h4_polling_rx();
}
Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (working copy)
@@ -1697,9 +1697,10 @@
0x4fe7 mem_le_wait_process_cmd
0x4fe8 mem_loopcnt
0x4fea mem_le_master_sm
-0x4feb mem_le_conn_status
-0x4fec mem_le_hci_conn_peer_addr_type
-0x4fed mem_headset_end
+0x4feb mem_adc_current_value
+0x4fed mem_le_conn_status
+0x4fee mem_le_hci_conn_peer_addr_type
+0x4fef mem_headset_end
0x4ace mem_usb_mouse_data
0x4ade mem_usb_kb_data
0x4aee mem_usb_kb_multikey
Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy)
@@ -63,89 +63,90 @@
2000003e
2000003f
c2840060
-c0010084
-c0070189
-c0080197
-c00e0177
-c00f019c
-c0100224
-c01201f4
-c0190159
-c01c8166
-c01d0168
-c01f0219
-c02081e9
-c02206de
-c02a06da
-c02c063e
-c02e065a
-c02e8660
-c03506e0
-c03586e2
-c03601e0
-c04080eb
-c0428109
-c04300ce
-c04f00d2
-c050014b
-c05206c3
-c05406b5
-c05c86e4
-c05d05c5
-c0700142
+c0010085
+c00701c3
+c00801d1
+c00e01b1
+c00f01d6
+c010025e
+c012022e
+c0190193
+c01c81a0
+c01d01a2
+c01f0253
+c0208223
+c0220774
+c02a0716
+c02c0678
+c02e0694
+c02e869a
+c0350776
+c0358778
+c036021a
+c04080f5
+c0428113
+c04300cf
+c04f00d3
+c0500183
+c05206ff
+c05406ef
+c05c877a
+c05d05ff
+c0700177
20202baf
-c00386e6
-c0060241
-c00906e8
-c009856c
-c00a054b
-c011855f
-c0128662
-c0130666
-c0138668
-c014066a
-c014866b
-c0150670
-c01d83c5
-c01f03ce
-c01f8371
-c02084d4
-c02106a6
-c024047b
-c02584d8
-c0278457
-c02905e4
-c02c06ea
-c02d85fd
-c02e86ec
-c0300607
-c0320603
-c0370686
-c03806ee
-c03886f0
-c03a014d
-c0490671
-c0528616
-c0530616
+c003877c
+c006027b
+c009077e
+c00985a6
+c00a0585
+c0118599
+c012869c
+c01306a0
+c01386a2
+c01406a4
+c01486a5
+c01506aa
+c01d83ff
+c01f0408
+c01f83ab
+c020850e
+c02106e0
+c02404b5
+c0258512
+c0278491
+c029061e
+c02c0780
+c02d8637
+c02e8782
+c0300641
+c032063d
+c03706c0
+c0380784
+c0388786
+c03a0187
+c04906ab
+c0528650
+c0530650
+c075075c
c1590000
c16a0000
20202baf
20406490
20406863
20406326
-2040009f
+204000a0
2040203c
20403153
-2040008e
+2040008f
2040233d
-20400094
+20400095
20202021
c68e0000
18000e02
20407148
7d3a001c
243a209e
-202006f2
+20200788
6fe24133
c4008000
6fe20030
@@ -158,7 +159,7 @@
18423600
202023b7
204045b4
-204000a2
+204000a3
2020455e
6fe244d9
c1808000
@@ -175,23 +176,23 @@
7854fc00
78487c00
69644e32
-204000c3
-243680c0
+204000c4
+243680c1
204047d5
1a227e00
67e24626
6fec04dd
67ec0633
6fe24c8b
-c0008394
-204002d8
+c00083ce
+20400312
204046d3
-243680c0
+243680c1
6fe204dc
-c00300c0
-204002d8
+c00300c1
+20400312
6fe44e32
-243a00ae
+243a00af
20600000
204045c7
204045bd
@@ -207,22 +208,31 @@
6fe24013
793ffe06
67e24013
-202000d4
-204000d4
+202000d5
+204000d5
20202bd8
20405900
+205580df
70894bba
-204000dd
+204000e7
708907ff
20402a70
70895074
7089520e
70896d07
20600000
+6fe8833a
+793ffe13
+67e8804c
+70800502
+20400145
+6ff04246
+98000000
+20600000
6fe242b4
-c00080e1
-c00200e7
-c00100e1
+c00080eb
+c00200f1
+c00100eb
5888e0d0
67e68955
584a103c
@@ -232,9 +242,9 @@
5888c0d0
67e68955
584a106c
-202000e4
+202000ee
20407a63
-203080f8
+20308102
708955d4
20000004
708955d2
@@ -242,8 +252,8 @@
708955d1
20000004
6fe242b4
-c00080f6
-c0020106
+c0008100
+c0020110
708955d0
708956e0
18002a08
@@ -262,7 +272,7 @@
20600000
708955d0
708956c0
-202000f8
+20200102
60420017
1840a200
6fe242b5
@@ -270,7 +280,7 @@
20402a7b
58000250
20402bb1
-204000dd
+204000e7
6fe28906
79207e00
67e28906
@@ -284,25 +294,25 @@
2000000a
7089027d
6fe242b4
-c0000130
-c002012b
+c000013a
+c0020135
70894cfb
70894def
70894eec
70894f5e
-c0008132
-c0028127
+c000813c
+c0028131
20202a51
708956ff
20402a5d
708955ff
20600000
-20400136
+20400140
708956cc
20402a5d
708955d8
20600000
-20400136
+20400140
20202a49
708956f7
20402a5d
@@ -320,24 +330,72 @@
37d98200
20600000
20600000
+58000000
+da204f65
+d8400040
+202056bd
+58000023
+da200f12
+d8400001
+204056bd
+6fe20f12
+245a015a
+58000034
+da204be7
+d8400008
+202056bd
+1fe67c2a
+2021015d
+5800002a
+67e24bd8
+1fe17e0f
+1fe0ffff
+1ff27e00
+68424bd7
+1841040f
+9841fe00
+67e24bd7
+20600000
+20400723
+700f0d9f
+20203f28
+6fe24bce
+c302016c
+20400728
+20400178
+700f0d6a
+20203f28
+20400178
+700f0d6a
+20203f28
+204054b0
+204054b5
+200007d0
+2040553b
+20600000
20600000
6fe8833e
793ffe1d
67e8804c
-20200147
-37d98200
+20200180
+6fe8833e
+79207e1a
+67e8804c
+20200180
+20400145
70800520
-37d98200
-20600000
+20200145
+2040071a
+2040017c
d85fffff
-20202cb8
+20202cbe
78547c00
204052b0
6fe20048
207a0000
-202006f4
-204006f6
-20200230
+2020078a
+2040078c
+2020026a
6fe2004b
79207e03
67e2004b
@@ -348,13 +406,13 @@
d8c00183
df2000f0
d8400000
-20400161
+2040019b
60440099
2020238d
efe20006
207a0000
18408401
-c2000161
+c200019b
20600000
704fa500
20202414
@@ -371,33 +429,33 @@
20402841
20402827
20404b89
-2040017a
+204001b4
20202425
20404b89
-2040017a
+204001b4
20202198
6fe242a7
207a0000
6fe2007c
247a0000
-202006f8
-2040029d
+2020078e
+204002d7
704c8a02
-202006fa
+20200790
704c9b02
704c8a00
-20200187
+202001c1
704c9b00
704ca100
704c9f00
-202006fc
+20200792
6fe24c9a
-203a06fe
+203a0794
6fe24c99
-203a06f2
+203a0788
1fe0ffff
67e24c99
-202006fe
+20200794
6fe20018
1ff18400
184f840a
@@ -407,22 +465,22 @@
20600000
20402108
6fe24fa6
-243a01c4
+243a01fe
704c8a04
-20200185
+202001bf
204024d2
7854fc00
6fe24c9b
-c0008197
+c00081d1
6fe2004c
c28221c5
6fe20030
c30221c4
-202002c0
+202002fa
6fe24c9c
-c00001ab
-c00081ae
-c00101b1
+c00001e5
+c00081e8
+c00101eb
704c8702
20600000
704c880f
@@ -443,16 +501,16 @@
98408a00
d8c0073b
2040713a
-204001d8
+20400212
68420053
6fe2073a
98467e00
1fe67c0e
-202101c4
+202101fe
20204db7
704c88ff
704c8707
-20400308
+20400342
58000000
e7e20005
6fec42a9
@@ -462,11 +520,11 @@
2040712d
df2000b8
204070e4
-20400312
+2040034c
6fe24fa6
704fa600
70005300
-c00101d6
+c0010210
20204dbb
20404f5f
20204dbb
@@ -482,22 +540,22 @@
1fe67c64
242127fd
202027ea
-2040024c
+20400286
68420046
98467c00
20628000
-2020029b
+202002d5
20402337
-202c01f1
+202c022b
204024ca
-243a01e9
+243a0223
78587c00
1d027e00
67e84169
20600000
2040248f
704c8a00
-20200700
+20200796
204021ec
24740000
78547c00
@@ -505,15 +563,15 @@
793f800b
20402b71
2040232b
-c5058204
+c505823e
204024ca
-243a01f9
+243a0233
78547c00
1c427e00
67e84169
78387c00
7834fc00
-20200702
+20200798
20402b6f
d8200010
20402321
@@ -522,10 +580,10 @@
20402917
204024ab
204024f3
-20368210
+2036824a
204024ca
-243a020b
-202001fe
+243a0245
+20200238
18000401
6fe20031
793ffe01
@@ -534,7 +592,7 @@
20402940
78347c00
704c8a01
-20200700
+20200796
70011600
70015000
204024d2
@@ -542,10 +600,10 @@
2040724d
6fe24c9b
207a0000
-202002c0
+202002fa
20404d8e
c6108000
-20200230
+2020026a
6fe20030
c283a1e1
6fe20b9c
@@ -557,51 +615,51 @@
67e2004b
204021e1
c6108000
-202006f6
+2020078c
704c8803
704c8706
-20400308
+20400342
18007e00
e7e20005
6fe20046
e7e40005
-20200312
+2020034c
704c8806
704c8717
-20400308
+20400342
6fec0040
e7ec0005
-20200312
+2020034c
704c8806
704c8716
-2020023a
+20200274
6fe243de
207a0000
20403e9d
20628000
1fe20c00
20403e92
-c005828b
+c00582c5
20203ef4
-20400260
+2040029a
2040712d
-2020025d
-20400260
+20200297
+2040029a
efe40006
-2020025d
-20400260
+20200297
+2040029a
efe60006
-2020025d
-20400260
+20200297
+2040029a
efec0006
-2020025d
-20400260
+20200297
+2040029a
efee0006
-2020025d
-20400260
+20200297
+2040029a
eff00006
-2020025d
-20400260
+20200297
+2040029a
efe20006
18c20400
60464bf2
@@ -611,19 +669,19 @@
20600000
704e1102
20600000
-704feb01
+704fed01
7044d901
704c8b01
-202002ad
+202002e7
6fec4c8d
67ec4639
67ec4140
20600000
20600000
704ddb00
-20200272
+202002ac
704ddb03
-20200272
+202002ac
62464ddc
58004b4a
67e443e3
@@ -639,76 +697,76 @@
18007e06
67e243e2
20203f1a
-20400704
+2040079a
6a464dd8
-2020026e
-20400287
+202002a8
+204002c1
6a464dd8
-2020058c
-20400260
+202005c6
+2040029a
df200003
d8a04dd8
20203e88
20403e92
20403e92
67e24dd7
-2040025d
+20400297
6fe24dd7
-c0000284
-204005ad
+c00002be
+204005e7
207a0000
-20400287
+204002c1
6fe24dd7
-c0018281
+c00182bb
20202baf
704c9612
-2020029e
+202002d8
704c9601
-2020029e
+202002d8
704c960c
-2020029e
+202002d8
704c9600
df200001
-204002a2
-20200312
+204002dc
+2020034c
704c9600
-204002a6
+204002e0
6fe24c96
e7e20005
20600000
704c870e
1f20fe03
67e24c88
-20400308
+20400342
6fe64c93
e7e60005
20600000
700f1200
-202002b2
+202002ec
700f120c
-202002b2
+202002ec
700f1202
704c870f
704c8804
-20400308
+20400342
6fe20f12
e7e20005
6fe64c93
e7e60005
-20200312
+2020034c
6ff04c6c
c4020000
6fe20639
67e24e18
-704feb00
-20200706
+704fed00
+2020079c
6fe20046
67e24e18
793f8021
70004600
704ca100
704c9b00
-20200706
+2020079c
6fe20624
d8400000
c1018000
@@ -735,16 +793,16 @@
1fe0fe03
67e44db1
da204cca
-2040055c
+20400596
1fe67c02
20610000
704c873e
-20400308
+20400342
58000002
e7e20005
58000001
e7e20005
-204002cc
+20400306
e0420005
204047d5
1a227e00
@@ -756,37 +814,37 @@
e0420005
18427200
2040712d
-20400190
+204001ca
e7e20005
-20200312
+2020034c
6fe20046
67e242a8
-202002fe
+20200338
6fe20639
67e242a8
704c8805
704c8713
-20400308
+20400342
58000001
e7e20005
6fe242a8
e7e40005
58000001
e7e40005
-20200312
+2020034c
6fe24c88
1fe0fe03
67e44db1
-2040030f
+20400349
6fe64c86
e7e60005
20600000
-20400569
+204005a3
1a420a00
20600000
da204d84
20403fa5
-20200270
+202002aa
18000400
18000201
60421001
@@ -802,9 +860,9 @@
20600000
6fe2063a
c3828000
-20400344
-20400358
-203a0315
+2040037e
+20400392
+203a034f
efe20006
ea220006
9a267e00
@@ -820,8 +878,8 @@
18427200
2040712d
2040480e
-20400317
-20400358
+20400351
+20400392
efe20006
1fe22200
18c23000
@@ -836,15 +894,15 @@
202049f1
6fe24683
203a480c
-2040034e
+20400388
c6130000
da204d5c
-2040055c
+20400596
c000480c
c000c80c
79200026
20600000
-20400358
+20400392
203a480c
efe20006
e8420006
@@ -856,7 +914,7 @@
20600000
da204d5c
20203fa1
-2040035c
+20400396
20202739
204045bd
204045cd
@@ -882,11 +940,11 @@
20407a4f
204045aa
20404766
-20400322
-2040035a
-20400532
+2040035c
+20400394
+2040056c
20404594
-20340541
+2034057b
2020458a
6fe20623
79207e05
@@ -912,10 +970,10 @@
e7f20005
6fe40643
e7e40005
-2040042e
-20200708
+20400468
+2020079e
6fe24626
-68424fec
+68424fee
98467c00
24628000
6fec0633
@@ -929,18 +987,18 @@
7042a700
70065b00
204047d2
-704feb02
+704fed02
704c8a00
-202006fa
-204005b9
+20200790
+204005f3
67e64e15
58000000
67e64d2e
6fe20046
67e242a8
704ddb05
-202003b5
-204005bf
+202003ef
+204005f9
67e64e15
58000000
67e64d31
@@ -975,29 +1033,29 @@
204045b4
2040315c
6fe20624
-c0018416
+c0018450
20204579
-2040024c
+20400286
67e242a8
-2040024c
+20400286
1febfe00
67e444d7
-2040024c
-2040024c
+20400286
+20400286
67e44632
-2040024c
+20400286
67e44634
-20400430
-202002ad
-2040035c
-20200545
+2040046a
+202002e7
+20400396
+2020057f
6fe24fea
-c00003fe
-c0008401
-c0018403
-c0020405
-c00303ff
-c00503e9
+c0000438
+c000843b
+c001843d
+c002043f
+c0030439
+c0050423
20600000
6fe20623
79207e06
@@ -1046,39 +1104,39 @@
20600000
7834fc00
204048fd
-202106b2
-204003e1
-20400322
+202106ec
+2040041b
+2040035c
204045fc
7856fc00
-204003df
-2436844b
+20400419
+24368485
20407a4f
-20400445
+2040047f
20404766
-20400532
+2040056c
20404594
-20340432
-20400428
+2034046c
+20400462
7854fc00
20202739
6fe20623
c3830000
6fe24fe7
207a0000
-c009837a
+c00983b4
20202baf
704fe700
20600000
704fe713
20600000
-20400322
-20400438
+2040035c
+20400472
78377c00
-20400545
-2036841f
-20200425
-2040043a
+2040057f
+20368459
+2020045f
+20400474
20202739
204045bd
204045cd
@@ -1087,8 +1145,8 @@
782efc00
78307c00
7850fc00
-20400443
-20200364
+2040047d
+2020039e
37c18200
20600000
6fe20623
@@ -1098,13 +1156,13 @@
704fea01
20600000
6fe20623
-c2818425
+c281845f
6fe24e17
1fe67c06
-242106b2
+242106ec
1fe0fe01
67e24e17
-20200425
+2020045f
684c4639
20600000
684c4c7a
@@ -1122,8 +1180,8 @@
67e24537
18427200
6fe2461c
-205a0453
-245a0455
+205a048d
+245a048f
604c4538
d8c044e0
2040712d
@@ -1136,7 +1194,7 @@
67e40124
24610000
2040473e
-20200708
+2020079e
6a280f1e
6a480f22
6a660f26
@@ -1145,7 +1203,7 @@
62480f22
62660f26
20600000
-20400477
+204004b1
67244fe8
1a208c01
efe20006
@@ -1154,10 +1212,10 @@
efe40005
1fe0fe01
e7e40005
-204004a7
-20400496
+204004e1
+204004d0
20404618
-20400473
+204004ad
6f244fe8
20600000
1a208c31
@@ -1167,7 +1225,7 @@
c3004628
18408401
1fe37e00
-c200048e
+c20004c8
1840ffff
1a208a22
e7e20005
@@ -1188,7 +1246,7 @@
6fea4528
1a208a31
e7ea0005
-2020048a
+202004c4
1a208c00
efe20006
c4028000
@@ -1200,7 +1258,7 @@
6fe40643
98467e00
1fe67c01
-202284bd
+202284f7
20600000
1a208c1a
efe40006
@@ -1209,7 +1267,7 @@
98467e00
d840ffff
98467c00
-202284bd
+202284f7
20600000
efe20011
793ffe05
@@ -1236,7 +1294,7 @@
20600000
20404972
2040475a
-2040046a
+204004a4
20202940
78287c00
6fe40631
@@ -1251,15 +1309,15 @@
78507c00
19623600
37c18400
-203704e8
+20370522
1b420400
604c00a4
242c2739
-203704ef
+20370529
dd2001e0
1c225000
6fe20623
-c30184ef
+c3018529
2055ac9c
20402abc
7823fc00
@@ -1277,36 +1335,36 @@
67e204dc
1fe27200
67e2068c
-203a0519
+203a0553
6fe204db
1fe17e03
-c001850e
-c5078510
+c0018548
+c507854a
da204cca
-2040055c
-c0008510
-204005b5
-203a0510
-204005bf
+20400596
+c000854a
+204005ef
+203a054a
+204005f9
18c20a00
6fe404db
e7e40005
-20200515
+2020054f
d8a004dd
-20200515
+2020054f
09800008
19897e00
-c2000510
+c200054a
78367c00
-20200519
+20200553
09800008
19897e00
e7e20005
-c2000515
+c200054f
09800018
78287c00
db600664
-20360520
+2036055a
1fef7e00
1ff17e00
e7e60005
@@ -1314,7 +1372,7 @@
20232739
7836fc00
6fe242b5
-243a0528
+243a0562
6fe20017
1fe0a200
20402a7b
@@ -1336,15 +1394,15 @@
6fe204db
1fe17e03
c001c866
-204005bf
-2040052a
+204005f9
+20400564
6fe2068c
207a0000
6fe2068d
c001c866
-202003ae
+202003e8
78377c00
-20400545
+2040057f
2036c582
2020458a
68420017
@@ -1352,7 +1410,7 @@
20402a23
78287c00
d9601388
-202004dd
+20200517
1a208409
efe20002
203a2baf
@@ -1377,13 +1435,13 @@
6fe204d5
c1018000
20204146
-2040057e
+204005b8
da204d34
20203f94
da204d34
20403fa5
-2020058c
-2040057e
+202005c6
+204005b8
da204d84
20203f94
1a20fe04
@@ -1404,57 +1462,57 @@
1a420c00
1a427e00
20600000
-204005a0
+204005da
203a2baf
6fe44dd1
1fe0fff6
68444db1
98467c00
-20210587
+202105c1
da204cca
20203fa5
da204ca2
-2040055c
-203a0585
+20400596
+203a05bf
da204ca2
20203fa5
-20400598
+204005d2
da204ca2
-203a0591
+203a05cb
da204cca
20203f94
-20400595
+204005cf
203a2baf
da204ca2
20203f94
6f224caa
d8c04cf2
-2020059a
+202005d4
6f224cd2
d8c04d10
efe60006
9a467c00
-2022859e
-c200059a
+202285d8
+c20005d4
1f227e00
20600000
6fe44dd1
1fe0fff6
68444db1
98467c00
-202105a7
+202105e1
da204cca
-2020055c
+20200596
da204ca2
-2040055c
+20400596
247a0000
-202005a5
+202005df
6fe44dd5
-202005ae
+202005e8
58000010
67e44db1
62280f1e
-204005a0
+204005da
6a280f1e
20600000
da204cca
@@ -1462,16 +1520,16 @@
6fe44d2e
247a0000
da204cca
-2020055c
+20200596
6fe64d2e
243a7111
-204005b3
+204005ed
1a427e00
67e64d2e
20207111
6fe64d31
243a7111
-204005b3
+204005ed
1a427e00
67e64d31
20207111
@@ -1481,12 +1539,12 @@
1fe22600
20203190
1a627e00
-c00a85cd
+c00a8607
20203168
704c8c00
704c1700
-2040070a
-204002ba
+204007a0
+204002f4
202031c3
6842063a
284c0005
@@ -1503,11 +1561,11 @@
6fe245b5
c0014794
6fe21002
-c00106b2
+c00106ec
c002c790
20600000
20404906
-204005d2
+2040060c
6fe204db
2feffe04
79208027
@@ -1516,9 +1574,9 @@
2feffe02
7920800f
6fe204dc
-203a05f6
+203a0630
6fe20623
-c30205f6
+c3020630
c6078000
20406246
204061b6
@@ -1536,13 +1594,13 @@
d8e00001
20407148
247a0000
-2020070c
-20400613
+202007a2
+2040064d
18227e00
c1018000
-202002fc
+20200336
62244db1
-20400610
+2040064a
1a420a00
6fe44db1
e7e20005
@@ -1550,23 +1608,23 @@
e7e20005
e0220005
20600000
-2040057e
+204005b8
da204d5c
20203f94
da204d5c
20403fa5
-2020058c
+202005c6
6fe20b97
-243a070e
+243a07a4
6fe20b98
-243a070e
+243a07a4
20600000
6fe2004b
79207e02
67e2004b
20404f51
7006ae01
-2040023e
+20400278
204052de
2420cf59
2434cd67
@@ -1580,15 +1638,15 @@
1a208c01
efe20006
c4008000
-20400631
+2040066b
704c9f01
20600000
704c8806
704c8731
-20400308
+20400342
6fec0040
e7ec0005
-20200312
+2020034c
6fe20151
1fe17e03
c080a68a
@@ -1598,11 +1656,11 @@
2020268a
1f227e00
67e4012c
-203a0637
+203a0671
9ea67c00
20212729
18017e01
-243a0649
+243a0683
6fe20151
1fe17e03
c001a649
@@ -1613,11 +1671,11 @@
98467c00
20212729
da204cca
-2040055c
+20400596
c000a739
-204005b5
+204005ef
203a2739
-204005b9
+204005f3
18c20a00
6fe20151
e7e20005
@@ -1630,24 +1688,24 @@
c58026ba
793f8000
20600000
-204003a6
+204003e0
202026dd
62244db1
-20400563
+2040059d
6a244db1
20600000
da204d34
20203fa1
-20400566
-202002f9
-20200566
-204005ab
+204005a0
+20200333
+202005a0
+204005e5
203a729b
2020729d
da204d34
-2020055c
+20200596
20202baf
-2040066e
+204006a8
207a0000
6fe2004b
c3830000
@@ -1660,7 +1718,7 @@
18c27e00
67e4013c
6fe4442c
-203a0680
+203a06ba
20205b2e
6fe40099
203a2baf
@@ -1671,7 +1729,7 @@
70429300
20204b77
67e40fb7
-2020068a
+202006c4
68440fb7
18518400
6fe44881
@@ -1690,7 +1748,7 @@
67e40241
58004e34
67e4023f
-204006d3
+2040070f
204057e8
6fe280a0
67e20124
@@ -1708,38 +1766,40 @@
793ffe00
793ffe01
67e20623
-704feb00
+704fed00
704c8b00
700f0d15
20206b2e
-204006a7
+204006e1
7854fc00
20600000
6fe24040
c3800000
c3818000
6fe247cd
-203a06bc
+203a06f6
6fe24724
207a0000
20202d53
6fe206ab
67e24bef
-20200710
+704bf000
+2040071a
+202007a6
7043dd01
20403f41
-20200710
+202007a6
6fe20fd6
-c05506d2
+c055070e
6fe24131
207a0000
-2040066e
+204006a8
247a0000
da204d5c
-2040055c
+20400596
247a0000
da204cca
-2040055c
+20400596
68424caa
98467c00
24628000
@@ -1751,108 +1811,198 @@
207a0000
6fe24f64
c1a98000
-202006d5
+20200711
18227e00
c003a739
c0032739
202025df
-580002e0
-20200688
-580002a0
-20200688
+68444bdb
+6fe44bdd
+1fed7e00
+1febfe00
+9841fe00
+67e8804c
+20400145
+70801902
+20200145
+da201700
+68444bd7
+20407a08
+6fe84bd7
+20200757
+da201701
+68444bd7
+20407a08
+20006a60
+6fe84bd7
+79207e16
+79207e14
+79207e15
+67e84bd7
+df200032
+2040073f
+6fe84bd7
+793ffe15
+20400757
+6fe84bd7
+793ffe14
+20400757
+200004b0
+6fe84bd7
+793ffe16
+20400757
+200004b0
+20600000
+6fe84bd7
+793ffe15
+20400757
+6fe84bd7
+79207e15
+20400757
+c200073f
+20600000
+da201702
+68444bd7
+20407a08
+6fe84bd7
+79207e16
+20400757
+200004b0
+6fe84bd7
+79207e14
+20400757
+200004b0
+6fe84bd7
+79207e15
+20400757
+200004b0
+20600000
+67e84bd7
+67e8804c
+20400145
+70800540
+20200145
+20406b27
+da2047e1
+2040725d
+1fe20400
+20406b2b
+18427e00
+207a0000
+c04c0766
+67e20fba
+202007a8
+20405875
+20001770
+68448352
+18427e00
+205a076f
+60444feb
+20405882
+700f0d9e
+20203f28
+20001770
+68448352
+20600000
+2055802d
+2020077a
+580002f0
+202006c2
580002b0
-20200688
-58000240
-20200688
+202006c2
+580002c0
+202006c2
58000250
-20200688
+202006c2
+58000260
+202006c2
580000f0
-20200688
-58000320
-20200688
-580002f0
-20200688
+202006c2
+58000330
+202006c2
+58000300
+202006c2
58000200
-20200688
+202006c2
580001c0
-20200688
-58000230
-20200688
-58000300
-20200688
+202006c2
+58000240
+202006c2
+58000310
+202006c2
58000190
-20200688
-58000290
-20200688
+202006c2
+580002a0
+202006c2
580001a0
-20200688
+202006c2
58000120
-20200688
+202006c2
58000170
-20200688
-580002c0
-20200688
+202006c2
580002d0
-20200688
+202006c2
+580002e0
+202006c2
580001e0
-20200688
+202006c2
58000140
-20200688
+202006c2
580001b0
-20200688
+202006c2
580001f0
-20200688
-58000260
-20200688
+202006c2
58000270
-20200688
+202006c2
58000280
-20200688
+202006c2
+58000290
+202006c2
+58000230
+202006c2
58000080
-20200688
+202006c2
58000070
-20200688
+202006c2
580000d0
-20200688
+202006c2
58000060
-20200688
+202006c2
580000c0
-20200688
+202006c2
58000090
-20200688
+202006c2
580000a0
-20200688
+202006c2
580000b0
-20200688
+202006c2
580000e0
-20200688
+202006c2
58000160
-20200688
+202006c2
58000100
-20200688
+202006c2
58000010
-20200688
+202006c2
58000020
-20200688
+202006c2
58000030
-20200688
+202006c2
58000040
-20200688
+202006c2
58000050
-20200688
+202006c2
58000110
-20200688
+202006c2
58000210
-20200688
+202006c2
58000220
-20200688
-580001d0
-20200688
+202006c2
58000150
-20200688
+202006c2
58000180
-20200688
-58000310
-20200688
-58000330
-20200688
+202006c2
+58000320
+202006c2
+58000340
+202006c2
Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (working copy)
@@ -61,7 +61,7 @@
10 #mem_patch3A
00 #mem_patch3B
00 #mem_patch3C
-00 #mem_patch3D
+04 #mem_patch3D
00 #mem_patch3E
00 #mem_patch3F
@@ -390,6 +390,15 @@
mem_local_rx_max_octets:fb 00 48 08 fb 00 48 08
+mem_lpm_write_temp_adc_low: bb 3a 48 00
+mem_lpm_write_temp_adc_high:14 00 00 00
+#re-charge battery set default to 4.1V, change in charge power off
+#charge target battery set default to 4.3V, change in charge power off
+#re-charge and charge must diff to 0.2V
+#10% Charging termination current control
+#Use Force on charger CC & CV loop when charger is in standby mode
+mem_lpm_write_temp_charge_control:b0 2b 03 06
+
mem_lpm_config:8f 10 ca
mem_lpm_buckcnt:0a 0b ef 07
mem_lpm_hibernate_switch:00
Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (revision 4662)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy)
@@ -23,14 +23,14 @@
60444957
704c880b
704c873e
-20400308
+20400342
58000007
e7e20005
6fe20639
e7e40005
6ff04953
e7f00005
-20200312
+2020034c
2040000d
da200009
d8200003
@@ -69,7 +69,7 @@
c006002b
c0008008
c0004880
-20200740
+202007d6
efea0006
67ea4528
efe40006
@@ -92,22 +92,22 @@
20600000
eff00006
67f04c0a
-2040040e
+20400448
6ff04c6c
c4018000
704c880c
704c873e
-20400308
+20400342
58000004
e7e40005
6fe20639
e7e40005
6ff04c0a
e7f00005
-20200312
+2020034c
efea0006
67ea4c12
-20400412
+2040044c
20348034
6fe24c17
247a0000
@@ -118,14 +118,14 @@
c4028000
704c8808
704c870c
-20400308
+20400342
58000000
e7e20005
6fe20639
e7e40005
6fea4c12
e7ea0005
-20200312
+2020034c
20200040
da204140
2040604d
@@ -151,7 +151,7 @@
20600000
c6908000
793f8021
-20200152
+2020018c
00000000
00000000
00000000
@@ -195,9 +195,9 @@
68420048
20407a08
6fe20048
-c283873c
+c28387d2
c0188021
-c006073e
+c00607d4
c0038030
c005800b
20204f6c
@@ -235,7 +235,7 @@
18007e01
2040528d
204052a6
-20200182
+202001bc
70004800
20600000
18007e02
@@ -243,7 +243,7 @@
6fe206a4
e7e20005
204052a6
-20200154
+2020018e
00000000
00000000
00000000
@@ -264,7 +264,7 @@
98467c00
24628000
2040493a
-202006fa
+20200790
00000000
00000000
00000000
@@ -388,14 +388,14 @@
704c8a01
704c8808
704c8712
-20400308
+20400342
18007e35
e7e20005
6fec0040
e7ec0005
6fe24c8a
e7e20005
-20200312
+2020034c
00000000
00000000
00000000
@@ -449,14 +449,14 @@
20200040
704c8808
704c8712
-20400308
+20400342
18007e00
e7e20005
6fec0040
e7ec0005
6fe24c8a
e7e20005
-20200312
+2020034c
00000000
00000000
00000000
@@ -519,7 +519,7 @@
67e4003e
7855fc00
704c8a00
-2020073a
+202007d0
00000000
00000000
00000000
@@ -610,7 +610,7 @@
24348023
18808fff
704c8a02
-2020073a
+202007d0
00000000
00000000
00000000
@@ -669,7 +669,7 @@
67e2004b
6fe20030
c283b413
-20400238
+20400272
202033ca
00000000
00000000
@@ -784,12 +784,12 @@
204063ce
704c8807
704c8736
-20400308
+20400342
58000000
e7e20005
6fec0040
e7ec0005
-20200312
+2020034c
202052d6
700b960f
204052da
@@ -853,8 +853,8 @@
67e24537
18427200
6fe2461c
-205a0453
-245a0455
+205a048d
+245a048f
604c4538
d8c04500
2040713a
@@ -962,26 +962,25 @@
700fd600
71f0001c
70804205
-20400032
+20400031
6fe28341
67e24bce
6fe24bef
67e206ab
-24558038
+24558150
20407988
-2040001c
-580005ca
+2040001b
+58000604
67e4431d
-58000142
+58000177
67e4431f
-58000141
+5800014b
67e4431b
-580006bd
+580006f7
67e44315
-580006c0
+580006fc
67e44313
-2055802e
-24358020
+2435801f
20403e79
204057bf
700f0d66
@@ -992,16 +991,16 @@
202056bd
6fec4140
67ec4340
+20400766
70801002
204057bf
6fe24bce
-c282802b
+c3010166
+c2828169
+20400723
700f0d65
-20403f28
-58001171
-67e44f5d
-20200738
-20400143
+20203f28
+20400178
700f0d6a
20203f28
204054b0
@@ -1011,13 +1010,14 @@
6848833e
6048804c
70804de6
-2040013b
+20400145
70800520
-2020013b
-58000034
-da204be7
-d8400008
-202056bd
+20200145
+00000000
+00000000
+00000000
+00000000
+00000000
00000000
00000000
00000000
@@ -1026,10 +1026,10 @@
793f801c
704c8801
704c8701
-20400308
+20400342
58000000
e7e20005
-20200312
+2020034c
00000000
00000000
00000000
@@ -1087,12 +1087,76 @@
00000000
00000000
20200040
+6fe20fba
+c0480008
+c04f800c
+c0460019
+c049800d
+c04a0013
+20206b58
+6fe8833e
+79207e1d
+67e8804c
+20200180
+20200728
+da201703
+68444bd7
+20407a08
+6fe84bd7
+79207e02
+20200757
+da201704
+68444bd7
+20407a08
+6fe84bd7
+793ffe02
+20200757
+20400747
+6fe8833e
+79207e1c
+67e8804c
+20200180
+20600000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+20200040
6fe24ca1
c0008010
20400015
704c880a
704c8704
-20400308
+20400342
6fec0040
e7ec0005
6fe60146
@@ -1101,7 +1165,7 @@
e7e20005
6fec0040
67ec4f37
-20200312
+2020034c
6fec4f37
684c0040
98467c00
@@ -1155,7 +1219,7 @@
c0060009
c00b8010
c0058013
-c0198736
+c01987ce
c017001d
c0208025
20204ba4
@@ -1164,7 +1228,7 @@
6fe80739
68480779
98467c00
-20228221
+2022825b
20204d8b
6fe44de9
c3014e10
@@ -1178,7 +1242,7 @@
6fe20030
c3830000
20404d80
-20200238
+20200272
6fe24170
1fe0fe01
68420739
@@ -1195,12 +1259,12 @@
20600000
704c8803
704c871b
-20400308
+20400342
6fe20046
e7e40005
6fe24170
e7e20005
-20200312
+2020034c
00000000
00000000
00000000
@@ -1225,9 +1289,9 @@
c0138033
c014003b
c0038037
-c004061b
-c00101b4
-20200734
+c0040655
+c00101ee
+202007cc
6fe20739
67e206a3
c0088012
@@ -1238,14 +1302,14 @@
20200016
704c8804
704c8708
-20400308
+20400342
58000000
e7e20005
68420046
e0440005
58000001
e7e20005
-20200312
+2020034c
6fe20739
67e206a3
c0058024
@@ -1261,9 +1325,9 @@
c1830000
60420055
700b9b01
-20400625
+2040065f
6fe24c97
-203a023e
+203a0278
20600000
20404dc7
6ff00739
@@ -1271,7 +1335,7 @@
20600000
6fe20739
67e206a4
-20400154
+2040018e
20204d51
20404edd
20200034
@@ -1286,14 +1350,14 @@
dfe04d5c
67e40f12
6a240f12
-2040055c
+20400596
207a0000
6a240f12
20403fa5
-2040058c
+204005c6
20200007
1fe22400
-2020058c
+202005c6
00000000
00000000
00000000
@@ -1344,12 +1408,12 @@
00000000
20200040
68464dd8
-2040025e
-2040025b
+20400298
+20400295
c0008007
c0010012
20202baf
-2040024c
+20400286
67e44c94
d84003ff
98410400
@@ -1357,13 +1421,13 @@
1feb7e00
1fecfe00
67e24c1a
-2040025b
+20400295
67e24c1b
-20200732
-2040024c
+202007ca
+20400286
67e242a8
20400034
-2040024c
+20400286
67e40f12
20402284
24628000
@@ -1372,7 +1436,7 @@
c280002c
6fe40f12
67e44db1
-204005a0
+204005da
205a723a
6fe40f12
1fe22200
@@ -1384,7 +1448,7 @@
e0220005
6fe40f12
1fe27200
-20400260
+2040029a
2020712d
6fe40f12
2040003a
@@ -1400,7 +1464,7 @@
c1008000
18000202
20600000
-204005ae
+204005e8
203a729b
2020729d
00000000
@@ -1488,7 +1552,7 @@
2020000a
20404c78
20400019
-20200631
+2020066b
20400019
20404c78
20404c7c
@@ -1497,12 +1561,12 @@
20600000
704c8809
704c8732
-20400308
+20400342
6fec0040
e7ec0005
6fe647d3
e7e60005
-20200312
+2020034c
00000000
00000000
00000000
@@ -1539,14 +1603,14 @@
c4010000
704c880a
704c873e
-20400308
+20400342
58000003
e7e40005
6fe20639
e7e40005
6fec4530
e7ec0005
-20200312
+2020034c
00000000
00000000
00000000
@@ -1603,7 +1667,7 @@
c4000000
704c8813
704c873e
-20400308
+20400342
58000001
e7e20005
6fe24c8a
@@ -1611,11 +1675,11 @@
6fe20639
e7e40005
d8400000
-6fe24feb
+6fe24fed
1fe67c02
-204282c7
+20428301
e0420005
-6fe24fec
+6fe24fee
e7e20005
6fec4627
e7ec0005
@@ -1627,7 +1691,7 @@
6fe2065b
e7e20005
6fe20639
-20200312
+2020034c
00000000
00000000
00000000
@@ -1665,7 +1729,7 @@
20200040
704c8817
704c8718
-20400308
+20400342
6fec0040
e7ec0005
d8c04297
@@ -1673,7 +1737,7 @@
2040712d
18007e00
e7e20005
-20200312
+2020034c
00000000
00000000
00000000
@@ -1799,8 +1863,8 @@
684c0149
20402289
20628000
-204001a5
-20400308
+204001df
+20400342
58000001
e7e20005
6fec0149
@@ -1821,18 +1885,18 @@
6fe80132
9c467e00
e7e40005
-20200312
+2020034c
6fe60146
e7e60005
6fe80132
9c467e00
e7e40005
6fe20018
-20400190
+204001ca
e7e20005
6fe24c9c
c001002b
-20200312
+2020034c
6fe64d2e
1fe20c00
efe20006
@@ -1843,7 +1907,7 @@
2040712d
184672f0
20407100
-20200312
+2020034c
00000000
00000000
00000000
@@ -1858,18 +1922,18 @@
6fe24c18
c0090005
c011001a
-20200299
+202002d3
6fe24ded
-203a029b
-20400255
+203a02d5
+2040028f
67ee4e0a
2040000e
6fe24ded
1fe0ffff
67e24ded
-2020029d
-2040026d
-243a029b
+202002d7
+204002a7
+243a02d5
1a420a00
1a40a407
1a420c00
@@ -1880,16 +1944,16 @@
18a08bf9
e7ee0005
20600000
-2040024c
+20400286
67e4495f
-2040024c
+20400286
67e44961
20400024
df200003
-204002a1
+204002db
6fe20639
e7e40005
-20200312
+2020034c
da400014
da200009
d8200003
@@ -1921,7 +1985,7 @@
20200040
704c8806
704c8714
-20400308
+20400342
6fe24c89
e7e20005
6fe20046
@@ -1934,7 +1998,7 @@
2020000f
58000000
e7e40005
-20200312
+2020034c
00000000
00000000
00000000
@@ -1985,7 +2049,7 @@
20200040
704c8804
704c8705
-20400308
+20400342
58000000
e7e20005
6fe24e18
@@ -1995,7 +2059,7 @@
6fe2004c
793ffe05
67e2004c
-20200312
+2020034c
00000000
00000000
00000000
@@ -2049,12 +2113,12 @@
20200040
704c8807
704c8720
-20400308
+20400342
6fec0040
e7ec0005
6fe24ca0
e7e20005
-20200312
+2020034c
00000000
00000000
00000000
@@ -2113,7 +2177,7 @@
20200040
704c880b
704c8703
-20400308
+20400342
6fe24c8a
e7e20005
6fe20046
@@ -2128,7 +2192,7 @@
7920fe00
e7e20005
6fe20046
-20200312
+2020034c
00000000
00000000
00000000
@@ -2184,33 +2248,33 @@
c0030011
c004000e
c01f8012
-20200299
-20200728
-2020072a
-2020072c
-2020072e
-20200730
-20200299
-20200299
+202002d3
+202007c0
+202007c2
+202007c4
+202007c6
+202007c8
+202002d3
+202002d3
6fe24c18
c0008019
c00b801d
c010001f
c0518024
c0300034
-20200299
-20400252
+202002d3
+2040028c
67ec4c8d
-20400269
-2020029d
+204002a3
+202002d7
704e193f
-2020029d
+202002d7
df200002
-204002a6
+204002e0
58000000
e7e40005
-20200312
-2040024c
+2020034c
+20400286
68420046
98467c00
2022802b
@@ -2219,18 +2283,18 @@
24628000
604242a8
df200003
-204002a6
+204002e0
6fe242a8
e7e40005
6fe20018
-20400190
+204001ca
e7e20005
-20200312
+2020034c
df200002
-204002a6
+204002e0
6fe44f35
e7e40005
-20200312
+2020034c
00000000
00000000
00000000
@@ -2247,14 +2311,14 @@
67e40f12
20200008
6a240f12
-2040055c
+20400596
207a0000
6a240f12
20403fa5
-2040058c
+204005c6
20200008
1fe22400
-2020058c
+202005c6
00000000
00000000
00000000
@@ -2304,7 +2368,7 @@
00000000
20200040
6fe24f34
-243a0726
+243a07be
704f3401
20400023
6f224cd2
@@ -2370,7 +2434,7 @@
6fe24c18
c005001a
c007001d
-c00983d3
+c009840d
c00b000f
c00b8019
c00c0019
@@ -2380,9 +2444,9 @@
c0078022
c0080027
c008802b
-20200724
-2040024c
-204002ad
+202007bc
+20400286
+204002e7
da200009
d8200003
204049ab
@@ -2391,31 +2455,31 @@
6ff04ddf
e7f00005
20600000
-20200299
-2040025b
+202002d3
+20400295
67e244de
-2020029d
+202002d7
7044d900
704c8b00
-6fe24feb
-c000817f
-2020029b
+6fe24fed
+c00081b9
+202002d5
df200002
-204002a1
+204002db
58000004
e7e20005
-20200312
+2020034c
704ded00
704e0a00
704dee00
-2020029d
+202002d7
68424ded
18467c04
-2022829b
-20400255
+202282d5
+2040028f
67ee4e0a
20400032
-2020029d
+202002d7
6fe24ded
d8a04dee
1feffe07
@@ -2437,63 +2501,63 @@
c0058012
c0060025
c0068029
-20200722
-2040025b
+202007ba
+20400295
67e244df
1fe27200
-20400249
-2020029d
-2040025b
+20400283
+202002d7
+20400295
67e244ff
1fe27200
-20400249
-2020029d
+20400283
+202002d7
6fe244d9
-243a029b
-2040025b
+243a02d5
+20400295
67e24636
-2040024c
+20400286
67e444da
-2040024c
+20400286
67e444dc
-2040025b
+20400295
67e24637
-2040025b
+20400295
67e24e11
6fe444da
684444dc
98467c00
-2422829d
+242282d7
1fe3fe00
67e444da
-2020029d
-2040025b
+202002d7
+20400295
67e244d9
-2040025b
-2020029d
-2040024c
+20400295
+202002d7
+20400286
67e444da
-2040024c
+20400286
67e444dc
-2040025b
+20400295
67e24e11
98267c00
-20428263
-2040025b
-67e24fec
-20400252
+2042829d
+20400295
+67e24fee
+2040028c
67ec4627
-2040025b
+20400295
67e2462d
-2040024c
+20400286
1febfe00
67e444d7
-2040024c
-2040024c
+20400286
+20400286
67e44632
-2040024c
+20400286
67e44634
-20200265
+2020029f
20200040
6fe24c18
c001800a
@@ -2503,8 +2567,8 @@
c02b0029
c036002d
c0368032
-20200299
-2040029d
+202002d3
+204002d7
5800003f
67f04c6c
5fffffff
@@ -2514,39 +2578,39 @@
67e244de
67e244d9
67e24133
-20200269
-204001e4
-2040024c
+202002a3
+2040021e
+20400286
67e40051
df200003
-204002a1
+204002db
6fe20046
e7e40005
7042a71d
-20200312
-2040025b
+2020034c
+20400295
67e24c98
df200064
d8a00183
-20400249
-2020029d
+20400283
+202002d7
df200002
-204002a1
+204002db
6fe24c97
e7e20005
-20200312
-2040025b
+2020034c
+20400295
67e24c97
-203a0297
-2020029d
+203a02d1
+202002d7
df200003
-204002a1
+204002db
6fe44de7
e7e40005
-20200312
-2040024c
+2020034c
+20400286
67e44de7
-2020029d
+202002d7
00000000
00000000
00000000
@@ -2562,16 +2626,16 @@
6fe24c18
c0158005
c0160015
-20200299
-20400252
+202002d3
+2040028c
67ec42a9
-2040024f
+20400289
67e647ce
df200007
-204002a1
+204002db
6fec0040
e7ec0005
-20400312
+2040034c
6fe24c9f
c0008012
7042a716
@@ -2579,14 +2643,14 @@
204033e5
700b9b01
20600000
-20400252
+2040028c
67ec42a9
2040001d
df200007
-204002a1
+204002db
6fec0040
e7ec0005
-20200312
+2020034c
700b950a
700b9701
20600000
@@ -2628,13 +2692,13 @@
c00e0018
c00e8020
c00d802b
-20200720
+202007b8
704fa601
-20400252
+2040028c
67ec42a9
-2040024c
+20400286
67e200b6
-2040024c
+20400286
9c40fe00
1fe17ffc
67e800b7
@@ -2645,46 +2709,46 @@
20228016
704fa602
7042a703
-202002ad
+202002e7
6fe24c9b
-c08102b1
-2040024c
-203a02b1
-2040025b
+c08102eb
+20400286
+203a02eb
+20400295
67e206a7
7042a715
-202002ad
-2040024c
+202002e7
+20400286
67e242a8
20402284
-242282b1
+242282eb
1a208c01
efe20006
c2800029
-204002ad
+204002e7
20203420
-204002ad
+204002e7
202048f0
6fe24c9b
-c08102b1
-2040024c
+c08102eb
+20400286
67e242a8
-203a02b1
-204002ad
+203a02eb
+204002e7
6ff04e1a
243a0035
7042a704
20600000
704c880b
704c870b
-20400308
+20400342
58000000
e7e20005
6fe20046
e7e40005
6ff04e1a
e7f00005
-20200312
+2020034c
00000000
20200040
6fe24c18
@@ -2694,50 +2758,50 @@
c0070022
c008802a
c009802e
-2020071e
-20400252
+202007b6
+2040028c
67ec42a9
d8a04297
18007210
-20400249
+20400283
70429301
7042a70b
20200025
-20400252
+2040028c
67ec42a9
7042a70c
20400025
-20400625
+2040065f
6fe24c97
-203a023e
+203a0278
20600000
-20400252
+2040028c
67ec42a9
-2040025b
+20400295
67e247f1
98007200
d8a047f2
-20400249
+20400283
7042a709
20200025
-20400252
+2040028c
67ec42a9
7042a70a
df200007
-204002a1
+204002db
6fec0040
e7ec0005
-20200312
-2040024c
+2020034c
+20400286
67e242a8
7042a70d
-202002ad
-2040024c
+202002e7
+20400286
67e242a8
-2040025b
+20400295
1fe0fe0e
67e242a7
-202002ad
+202002e7
00000000
00000000
00000000
@@ -2755,13 +2819,13 @@
c0030006
c004001c
c005002f
-2020071c
-2040024c
+202007b4
+20400286
67e242a8
-2040025b
+20400295
67e206a4
20402284
-242282b1
+242282eb
1a208c01
efe20006
c2800018
@@ -2769,16 +2833,16 @@
6fe242a8
6842439b
98467c00
-242282ad
+242282e7
7042a711
6fe2439a
67e242a8
-202002ad
+202002e7
6fe206a4
67e20f12
20404894
-202002ad
-20400252
+202002e7
+2040028c
67ec42a9
7042a71a
6fe24c9b
@@ -2790,26 +2854,26 @@
704c9600
2040002a
704c8a02
-20200187
+202001c1
704c9602
df200007
-204002a2
+204002dc
6fec42a9
e7ec0005
-20200312
+2020034c
6fe24ca1
-c00002b1
-c00102af
+c00002eb
+c00102e9
6fe24c9b
-c00102af
+c00102e9
704ca102
-20400252
+2040028c
67ec42a9
-2040025b
+20400295
67e24c8a
7042a708
-204002ad
-20200187
+204002e7
+202001c1
00000000
00000000
00000000
@@ -2828,69 +2892,69 @@
c0230033
c0238034
c0288036
-2020071a
-2040024c
+202007b2
+20400286
67e44153
-2040024c
+20400286
67e44151
-2020029d
+202002d7
df200005
-204002a1
+204002db
6fe4414f
e7e40005
6fe4414d
e7e40005
-20200312
-2040024c
+2020034c
+20400286
67e4414f
-2040024c
+20400286
67e4414d
-2020029d
+202002d7
df200004
-204002a1
+204002db
6fe6414a
e7e60005
-20200312
-2040024f
+2020034c
+20400289
67e6414a
-2020029d
-20200299
-2040025b
-20200299
+202002d7
+202002d3
+20400295
+202002d3
df200002
-204002a1
+204002db
6fe24c9c
e7e20005
-20200312
-2040025b
+2020034c
+20400295
67e24c9c
-2020029d
-20200299
-2040025b
-20200299
+202002d7
+202002d3
+20400295
+202002d3
df2000f2
-204002a1
+204002db
6fe24c98
e7e20005
d8c00183
df200064
2040713a
-20200312
+2020034c
00000000
00000000
20200040
6fe24c18
c0070005
c007800a
-20200299
+202002d3
df200003
-204002a1
+204002db
6fe44de9
e7e40005
-20200312
-2040024c
+2020034c
+20400286
67e44de9
-2020029d
+202002d7
00000000
00000000
00000000
@@ -2949,60 +3013,60 @@
c0058022
c006002d
c0068035
-20200718
+202007b0
6fe44deb
-c30102af
+c30102e9
6fe44de9
-c30102af
+c30102e9
6fe24c9b
-c08102b1
-2040024c
+c08102eb
+20400286
67e40253
-2040024c
+20400286
67e40255
-2040024c
+20400286
67e40257
58000040
67e4430b
-2040024c
+20400286
67e4430d
-2040024c
+20400286
67e4430f
7042a712
-202002ad
-2040024c
+202002e7
+20400286
67e40253
6fe20031
-c30302af
+c30302e9
7042a713
-202002ad
+202002e7
6fe24c9b
-c08102b1
+c08102eb
6fe44deb
-c30002af
+c30002e9
6fe44de9
-c30002af
-20400252
+c30002e9
+2040028c
67ec42a9
-2040025b
+20400295
7042a718
-202002ad
-204001e4
+202002e7
+2040021e
df200005
-204002a1
+204002db
6fe20046
e7e40005
6fe44deb
e7e40005
-20200312
-204001e4
-2040024c
+2020034c
+2040021e
+20400286
67e44deb
df200003
-204002a1
+204002db
6fe20046
e7e40005
-20200312
+2020034c
00000000
00000000
00000000
@@ -3013,44 +3077,44 @@
c0018010
c0028015
c003001a
-20200716
-20400258
+202007ae
+20400292
67f04c6c
-2020029d
+202002d7
df200004
-204002a1
+204002db
580400fb
e7e60005
-20200312
+2020034c
df200009
-204002a1
+204002db
6ff04ddf
e7f00005
-20200312
+2020034c
6fe244de
-243a029b
-20400252
+243a02d5
+2040028c
67ec4c7a
-2020029d
+202002d7
6fe244de
-243a029b
-2040024c
+243a02d5
+20400286
67e44617
-2040024c
+20400286
67e44619
-2040025b
+20400295
2040002d
6042461b
-2040025b
+20400295
205a0035
245a0039
-2040025b
-20400252
-2040025b
+20400295
+2040028c
+20400295
67e24624
-2040025b
+20400295
67e24e11
-2020029d
+202002d7
d8400000
c1000000
d8400002
@@ -3078,30 +3142,30 @@
c002001e
c002801e
c0048019
-20200299
+202002d3
df200009
-204002a1
+204002db
6ff04c24
e7f00005
-20200312
+2020034c
df200041
-204002a1
+204002db
d8c04c2c
df200040
2040713a
-20200312
+2020034c
df200009
-204002a1
+204002db
6ff04138
e7f00005
-20200312
+2020034c
df200007
-204002a1
+204002db
6fec4140
e7ec0005
-20200312
+2020034c
df200008
-204002a1
+204002db
580002a8
e7e40005
5800003c
@@ -3109,7 +3173,7 @@
58000008
e7e40005
e7e40005
-20200312
+2020034c
00000000
00000000
00000000
@@ -3144,51 +3208,51 @@
c00c8028
c00d002d
c00d8030
-20200714
-20400258
+202007ac
+20400292
67f04c1c
-2020029d
-20400260
+202002d7
+2040029a
d8a0468a
df200042
2040713a
df200042
d8c0468a
d8400000
-20400161
+2040019b
60424689
-2020029d
+202002d7
df2000f9
-204002a1
+204002db
d8c0468a
df200040
2040713c
df200017
204070e4
-20200312
+2020034c
df200003
-204002a1
+204002db
6fe44159
e7e40005
-20200312
-2040024c
+2020034c
+20400286
67e44159
-2020029d
+202002d7
df200002
-204002a1
+204002db
6fe24133
e7e20005
-20200312
-2040025b
+2020034c
+20400295
67e24133
-2020029d
+202002d7
df200005
-204002a1
+204002db
6fe44153
e7e40005
6fe44151
e7e40005
-20200312
+2020034c
00000000
00000000
00000000
@@ -3204,11 +3268,11 @@
c0010017
c0028019
c0048025
-20200712
+202007aa
7920001c
-2040024f
+20400289
67e64147
-2040025b
+20400295
d8400800
984ffe00
d840ffff
@@ -3217,36 +3281,36 @@
18427e00
18000e02
20407141
-2040025b
+20400295
67e24c99
67e24c9a
-202002ad
+202002e7
7042a702
-2020029d
-20400252
+202002d7
+2040028c
67ec42a9
-2040024c
+20400286
67e40251
-2040024c
+20400286
67e200b6
-2040024c
-2040025b
+20400286
+20400295
67e24ad0
704c9b01
7042a705
-202002ad
+202002e7
6fe24ca1
-c00002b1
-c00102af
+c00002eb
+c00102e9
6fe24c9b
-c00102af
-20400252
+c00102e9
+2040028c
67ec42a9
7042a707
-2040025b
-c00082ad
+20400295
+c00082e7
7042a719
-204002ad
+204002e7
20204d51
00000000
00000000