diff --git a/.vscode/settings.json b/.vscode/settings.json index 3ee9b27..c0900b8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,6 +15,11 @@ "atomic": "c", "ios": "c", "locale": "c", - "type_traits": "c" + "type_traits": "c", + "bitset": "c", + "chrono": "c", + "algorithm": "c", + "__bit_reference": "c", + "unordered_map": "c" } } \ No newline at end of file diff --git a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/inc/config.h b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/inc/config.h index ec0696d..14870ba 100644 --- a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/inc/config.h +++ b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/inc/config.h @@ -88,7 +88,7 @@ extern uint16_t system_1s_cnt; /****************project inforamtion MTP ADDR:0x100000C0*******************/ #define SOFT_WARE_VERISION_H 0x01 -#define SOFT_WARE_VERISION_L 0x05 +#define SOFT_WARE_VERISION_L 0x06 #define CUSTOM_ID 0xA1 #define PROJECT_ID 0x60 /**********************���칦�ܺ궨��************************************/ diff --git a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/comp_dac.c b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/comp_dac.c index 304cf3f..df6302f 100644 --- a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/comp_dac.c +++ b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/comp_dac.c @@ -99,6 +99,11 @@ void comp_dac_open_vbus(uint8_t port) gate3_control(true); break; } + + log_info("comp_dac_open_vbus:%d %d %d\n", + REG_ANALOG_GATE1->bf.driver_en, + REG_ANALOG_GATE2->bf.driver_en, + REG_ANALOG_GATE3->bf.driver_en); } /* * @brief comp_cccv_step_speed_set @@ -197,6 +202,8 @@ void comp_dac_cc_step_speed_set(uint8_t port, uint8_t speed) extern uint16_t adc_vin_start[TYPEC_PORT_MAX] ; static void comp_dac_cv_2dcdc_fb(uint8_t port, uint16_t val) { + //log_info("port:%d set_vol:%d\n", port, val); + /*CV_DAC = ((target - VREF)/RFBUP-VREF/RDOWN)*1000000/gm_FBCV + VOFFSET_CVFB1 */ int32_t temp[TYPEC_PORT_MAX + 1] = {0}; uint16_t fb_gm_cv[TYPEC_PORT_MAX] = {FB_GMCV1_150, FB_GMCV2_150 }; // {180 * 16, 180 * 16}; @@ -600,6 +607,7 @@ static void comp_dac_mode_init(void) REG_ANALOG_FB1_FBCV->word = 0x01;/*enable fb1_fbcv_en*/ // /***********FB1_CC LOOP************/ drv_dac_ctrl_cc0_cfg_word(VIN1_CC0_CONFIG_WORD);/*set CC_DAC0 = 3A*/ + //comp_dac_cc_2dcdc_fb(TYPEC_PORT0, CURRENT_5A, CC0_LOOP_OFFSET); REG_ANALOG_CS1->word = 0xA3;/*enable current-sense */ REG_ANALOG_FB1->word = 0x115;//0X117;/*enable fb1_fbcomp*/ REG_ANALOG_FB1_FB->word = 0x01;/*enable fppath1_en*/ @@ -612,6 +620,7 @@ static void comp_dac_mode_init(void) REG_ANALOG_FB2_FBCV->word = 0x01;/*enable fb2_fbcv_en*/ /***********FB2_CC LOOP************/ drv_dac_ctrl_cc1_cfg_word(VIN2_CC1_CONFIG_WORD);/*set CC_DAC0 = 3A*/ + //comp_dac_cc_2dcdc_fb(TYPEC_PORT1, CURRENT_5A, CC1_LOOP_OFFSET); REG_ANALOG_CS2->word = 0xA3;/*enable current-sense */ REG_ANALOG_FB2->word = 0x115;//0X117;/*enable fb1_fbcomp*/ REG_ANALOG_FB2_FB->word = 0x01;/*enable fppath1_en*/ diff --git a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/customized.c b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/customized.c index 1d735a3..345d666 100644 --- a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/customized.c +++ b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/code/src/customized.c @@ -697,6 +697,19 @@ void insertion_equipment_judgment(void) } +void user_delay_ms(uint32_t cnt) +{ + // 延迟期间，也要让协议正常响应 + for(size_t i = 0; i < cnt; i++) + { + drv_delay_ms(1); + pd_protocol_run(TYPEC_PORT0, &g_app_protocol_param[TYPEC_PORT0].pd_param); + pd_protocol_run(TYPEC_PORT1, &g_app_protocol_param[TYPEC_PORT1].pd_param); + dpdn_protocol_run(TYPEC_PORT0, &g_app_protocol_param[TYPEC_PORT0].dpdn_param); + dpdn_protocol_run(TYPEC_PORT1, &g_app_protocol_param[TYPEC_PORT1].dpdn_param); + } +} + void mos_switch_control(void) { if(!user_app.need_switch_mos) @@ -717,7 +730,8 @@ void mos_switch_control(void) user_app.need_switch_mos = false; log_info("%s %d\n", __func__, __LINE__); gate3_control(true); - drv_delay_ms(8); + // drv_delay_ms(8); + user_delay_ms(18); REG_ANALOG_GATE2->bf.driver_en = 0; REG_ANALOG_GATE2->bf.cp_en = 0; } @@ -731,10 +745,12 @@ void mos_switch_control(void) if(comp_adc_get_vin12(TYPEC_PORT0) * comp_adc_get_cur12(TYPEC_PORT0) <= 40000000) { user_app.need_switch_mos = false; + log_info("mos_switch open gate2\n"); REG_ANALOG_GATE2->bf.driver_en = 1; REG_ANALOG_GATE2->bf.cp_en = 1; - drv_delay_ms(8); + // drv_delay_ms(18); // 需要等gate完全开启，8ms是否够？----> 不够，要长一点 + user_delay_ms(18); gate3_control(false); } @@ -859,6 +875,10 @@ void adapter_state_check(void) return; } + log_info("adapter_state:%d usba:%d\n", + user_app.adapter_state, + usba_state); + #if SWITCH_LINE_OFF_PROTECTION // log_info("close_prote\n"); // 每次切换gate2和gate3的时候, 关闭2秒保护, 2秒后且在ready状态再打开 @@ -1043,7 +1063,8 @@ void adapter_state_check(void) { REG_ANALOG_GATE2->bf.driver_en = 1; REG_ANALOG_GATE2->bf.cp_en = 1; - drv_delay_ms(8); + // drv_delay_ms(8); // 8ms不够开启gate2 + user_delay_ms(18); gate3_control(false); } } @@ -1052,7 +1073,8 @@ void adapter_state_check(void) // 1. 确保gate3是关闭的 REG_ANALOG_GATE2->bf.driver_en = 1; REG_ANALOG_GATE2->bf.cp_en = 1; - drv_delay_ms(8); + // drv_delay_ms(8); + user_delay_ms(18); gate3_control(false); } @@ -1146,7 +1168,8 @@ void adapter_state_check(void) // 先关再开, 防止功率并联反灌 REG_ANALOG_GATE2->bf.driver_en = 1; REG_ANALOG_GATE2->bf.cp_en = 1; - drv_delay_ms(8); + // drv_delay_ms(8); + user_delay_ms(18); gate3_control(false); } } @@ -1154,7 +1177,8 @@ void adapter_state_check(void) { REG_ANALOG_GATE2->bf.driver_en = 1; REG_ANALOG_GATE2->bf.cp_en = 1; - drv_delay_ms(8); + // drv_delay_ms(8); + user_delay_ms(18); gate3_control(false); } @@ -1238,11 +1262,9 @@ void adapter_state_check(void) } } - log_info("adapter_state:%d port0:%d port1:%d usba:%d\n", - user_app.adapter_state, + log_info("need_send_cap_flag[0]:%d [1]:%d\n", need_send_cap_flag[TYPEC_PORT0], - need_send_cap_flag[TYPEC_PORT1], - usba_state); + need_send_cap_flag[TYPEC_PORT1]); user_app.last_adapter_state = user_app.adapter_state; } diff --git a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.axf b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.axf index 325454a..fd500d4 100644 Binary files a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.axf and b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.axf differ diff --git a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.build_log.htm b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.build_log.htm index 13280d6..a05a95d 100644 --- a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.build_log.htm +++ b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.build_log.htm @@ -31,23 +31,24 @@ assembling startup_CMSDK_CM0.s... compiling adapter_antifake.c... compiling system_CMSDK_CM0.c... compiling comp_auto_zero.c... +compiling comp_primary_side.c... +compiling main.c... +compiling cps8860_it.c... +compiling comp_discharge.c... compiling app_spec.c... ..\..\common\app\src\app_spec.c(177): warning: #177-D: variable "umask_val" was declared but never referenced uint32_t umask_val = 0; ..\..\common\app\src\app_spec.c: 1 warning, 0 errors -compiling comp_primary_side.c... -compiling main.c... -compiling cps8860_it.c... -compiling port0_customized.c... -compiling comp_adc.c... -compiling port1_customized.c... -compiling comp_protection.c... compiling comp_dac.c... -..\code\src\comp_dac.c(311): warning: #177-D: variable "temp" was declared but never referenced +..\code\src\comp_dac.c(318): warning: #177-D: variable "temp" was declared but never referenced uint32_t temp[TYPEC_PORT_MAX + 1] = {0}; -..\code\src\comp_dac.c(455): warning: #177-D: function "comp_dac_cc_acdc" was declared but never referenced +..\code\src\comp_dac.c(462): warning: #177-D: function "comp_dac_cc_acdc" was declared but never referenced static void comp_dac_cc_acdc(uint8_t port, uint16_t val, uint16_t offset) ..\code\src\comp_dac.c: 2 warnings, 0 errors +compiling comp_protection.c... +compiling port0_customized.c... +compiling port1_customized.c... +compiling comp_adc.c... compiling comp_powerout.c... compiling customized.c... ..\code\src\customized.c(26): warning: #188-D: enumerated type mixed with another type @@ -56,21 +57,20 @@ compiling customized.c... user_app_s user_app = {0}; ..\code\src\customized.c(175): warning: #177-D: function "path_scp_mode_exit_action" was declared but never referenced static void path_scp_mode_exit_action(uint8_t port, scp_param_s *scp_param) -..\code\src\customized.c(1582): warning: #177-D: function "comp_ccloop_enable" was declared but never referenced +..\code\src\customized.c(1604): warning: #177-D: function "comp_ccloop_enable" was declared but never referenced static void comp_ccloop_enable(uint8_t port) ..\code\src\customized.c: 4 warnings, 0 errors -compiling comp_discharge.c... compiling dpdn_protocol.c... compiling qc_scp_protocol.c... -compiling ufcs_protocol.c... compiling pd_protocol.c... -..\..\common\comp\protocol\pd_protocol\src\pd_protocol.c(827): warning: #550-D: variable "pd_hw_uvdm_header" was set but never used +..\..\common\comp\protocol\pd_protocol\src\pd_protocol.c(844): warning: #550-D: variable "pd_hw_uvdm_header" was set but never used pd_hw_uvdm_header_u pd_hw_uvdm_header = {0}; ..\..\common\comp\protocol\pd_protocol\src\pd_protocol.c(275): warning: #177-D: function "pd_analog_set" was declared but never referenced static void pd_analog_set(uint8_t port) ..\..\common\comp\protocol\pd_protocol\src\pd_protocol.c: 2 warnings, 0 errors +compiling ufcs_protocol.c... linking... -Program Size: Code=12502 RO-data=1910 RW-data=60 ZI-data=3872 +Program Size: Code=12642 RO-data=1910 RW-data=60 ZI-data=3872 FromELF: creating hex file... After Build - User command #1: .\CPS8860.bat C:\Users\TJP\Desktop\GIT_TEST\CPS8860_9196_70W\Anker_9196_CPS8860\PD_CPS8860_A1_CPS_Common_Demo\ac_project\project>set Project_Name=CPS8860_anker_9196 @@ -118,11 +118,11 @@ out_type : expected out file type 'd' output binary file(.bin) [out_file_name_without_postfix] : Option: out file name without postfix. ---------------------------------------------------------------------- -input code size: 14,472 [14.133K] - app size: 388C ; CRC: A411 +input code size: 14,612 [14.270K] + app size: 3918 ; CRC: 3572 -out code size : 14,476 [14.137K] -create file: .\output\CPS8860_anker_9196_A1_60_V1.5_CRC589B.hex success! +out code size : 14,616 [14.273K] +create file: .\output\CPS8860_anker_9196_A1_60_V1.6_CRCA78C.hex success! C:\Users\TJP\Desktop\GIT_TEST\CPS8860_9196_70W\Anker_9196_CPS8860\PD_CPS8860_A1_CPS_Common_Demo\ac_project\project>move /Y .\CPS8860_anker_9196_*.hex .\output һļҲļ ".\Objects\CPS8860_anker_9196.axf" - 0 Error(s), 9 Warning(s). diff --git a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.htm b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.htm index 4549988..2d7bafd 100644 --- a/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.htm +++ b/PD_CPS8860_A1_CPS_Common_Demo/ac_project/project/Objects/CPS8860_anker_9196.htm @@ -3,11 +3,11 @@ Static Call Graph - [.\Objects\CPS8860_anker_9196.axf]

Static Call Graph for image .\Objects\CPS8860_anker_9196.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Oct 27 14:12:20 2025 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Tue Nov 18 18:10:44 2025

-

Maximum Stack Usage = 280 bytes + Unknown(Cycles, Untraceable Function Pointers)

+

Maximum Stack Usage = 288 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

-main ⇒ app_spec_run ⇒ app_protocol_run ⇒ adapter_state_check ⇒ wait_c2_ready ⇒ pd_phy_open_vbus ⇒ adapter_state_check (Cycle) +main ⇒ app_spec_run ⇒ app_protocol_run ⇒ adapter_state_check ⇒ mos_switch_control ⇒ user_delay_ms ⇒ dpdn_protocol_run ⇒ fast_charge_reset ⇒ comp_powerout_open_nmos ⇒ comp_dac_open_vbus ⇒ comp_set_vol_cur ⇒ comp_powerout_vol_set ⇒ comp_dac_output_voltage_set ⇒ comp_dac_cv_target_set ⇒ comp_dac_cv_2dcdc_fb

Mutually Recursive functions @@ -134,26 +134,26 @@ Global Symbols
  • >>   comp_adc_clac_cur (via Veneer) -

    __aeabi_memcpy (Thumb, 0 bytes, Stack size 0 bytes, rom_symdef.txt(ABSOLUTE)) -

    [Called By]