diff --git a/apps/boot/application/main.c b/apps/boot/application/main.c
index 8c11db6..7c48401 100644
--- a/apps/boot/application/main.c
+++ b/apps/boot/application/main.c
@@ -166,6 +166,56 @@ void MX_USART_DeInit (void)
     HAL_UART_DeInit(&huart2);
 }
 
+static void boot_JumpToAPP (void)
+{
+	static uint32_t _stack_addr;                                /* APP 栈顶地址 */
+	static uint32_t _reset_handler;                             /* APP reset handler 地址 */
+    typedef void(*APP_MAIN_FUNC)(void);
+    APP_MAIN_FUNC  APP_Main; 
+    
+    _stack_addr    = *(volatile uint32_t *)BASE_APPLICATION;
+    _reset_handler = *(volatile uint32_t *)(BASE_APPLICATION + 4);
+
+    /* 设置所有时钟到默认状态，使用HSI时钟 */
+    HAL_RCC_DeInit();
+    
+    /* 关闭全局中断 */
+    __disable_irq();
+
+    /* 关闭滴答定时器，复位到默认值 */
+    SysTick->CTRL = 0;
+    SysTick->LOAD = 0;
+    SysTick->VAL  = 0;
+
+    /* 关闭所有中断，清除所有中断挂起标志 */
+    for (uint8_t i = 0; i < 8; i++) {
+        NVIC->ICER[i] = 0xFFFFFFFF;
+        NVIC->ICPR[i] = 0xFFFFFFFF;
+    }
+
+    /* 外设 deinit */
+    HAL_DeInit();
+	MX_USART_DeInit();
+	MX_DMA_DeInit();
+
+    
+    /* 设置主堆栈指针 */
+    __set_MSP(_stack_addr);
+
+    /* 在 RTOS 工程，这条语句很重要，设置为特权级模式，使用 MSP 指针 */
+    __set_CONTROL(0);
+    
+    /* 设置中断向量表 */
+    SCB->VTOR = BASE_APPLICATION;
+
+    /* 跳转到 APP ，首地址是 MSP ，地址 +4 是复位中断服务程序地址 */
+    APP_Main = (APP_MAIN_FUNC)_reset_handler;
+    APP_Main();
+
+    /* 复位或跳转成功的话，不会执行到这里 */
+    while (1) {
+    }
+}
 
 int main (void)
 {
@@ -190,9 +240,10 @@ int main (void)
 		VERSION_MAIN, VERSION_SUB, VERSION_FIX, BUILD_TIMESTAMP);
 #endif
 	APP_Init();
-
+	boot_JumpToAPP();
 	while (1) {
-		APP_Running();
+		
+		//APP_Running();
 	}
 
 	return -1;
diff --git a/apps/chrg/applications/bsp/chrg_gpio.h b/apps/chrg/applications/bsp/chrg_gpio.h
index 624ca38..96bfce7 100644
--- a/apps/chrg/applications/bsp/chrg_gpio.h
+++ b/apps/chrg/applications/bsp/chrg_gpio.h
@@ -32,18 +32,18 @@
 #define GPO_PIN_CH1_P2			GET_PIN(C, 1)	// P2 connect K5 for GND/PGND
 
 // 鍖楀悜缁х數鍣�2缁�
-#define GPO_PIN_CH2_P0			GET_PIN(A, 5)	// P0
-#define GPO_PIN_CH2_P1			GET_PIN(A, 4)	// P1
+#define GPO_PIN_CH2_P0			GET_PIN(A, 5)	// P0		//SINK D+D- CC
+#define GPO_PIN_CH2_P1			GET_PIN(A, 4)	// P1	  //SOURCE D+D- CC
 #define GPO_PIN_CH2_P2			GET_PIN(A, 1)	// P2
 
 // 鍖楀悜缁х數鍣�3缁�
-#define GPO_PIN_CH3_P0			GET_PIN(C, 5)	// P0
-#define GPO_PIN_CH3_P1			GET_PIN(C, 4)	// P1
+#define GPO_PIN_CH3_P0			GET_PIN(C, 5)	// P0	 //SINK D+D- CC
+#define GPO_PIN_CH3_P1			GET_PIN(C, 4)	// P1  //SOURCE D+D- CC
 #define GPO_PIN_CH3_P2			GET_PIN(A, 7)	// P2
 
 // 鍖楀悜缁х數鍣�4缁�
-#define GPO_PIN_CH4_P0			GET_PIN(B, 15)	// P0
-#define GPO_PIN_CH4_P1			GET_PIN(B, 14)	// P1
+#define GPO_PIN_CH4_P0			GET_PIN(B, 15)	// P0  //SINK D+D- CC
+#define GPO_PIN_CH4_P1			GET_PIN(B, 14)	// P1  //SOURCE D+D- CC
 #define GPO_PIN_CH4_P2			GET_PIN(B, 13)	// P2
 
 // 鍖楀悜閫氫俊鍙ｉ�夐�� U14
diff --git a/apps/chrg/applications/thread/chrg_comm.c b/apps/chrg/applications/thread/chrg_comm.c
index 9258747..4cb1a8f 100644
--- a/apps/chrg/applications/thread/chrg_comm.c
+++ b/apps/chrg/applications/thread/chrg_comm.c
@@ -2563,6 +2563,7 @@ static eMBException chrg_comm_apply_source_effect(rt_uint8_t ch,
 	rt_bool_t protocol_switch_requested;
 	rt_bool_t need_source_reset;
 	rt_uint8_t new_pd_state;
+	rt_uint8_t old_pd_state;
 	struct vc_pd_t old_pd_set;
 	eSRC_PRO old_protocol = pReal->source.protocol;
 	rt_uint8_t old_cc_set = pReal->source.CC_Set;
@@ -2589,8 +2590,10 @@ static eMBException chrg_comm_apply_source_effect(rt_uint8_t ch,
 	protocol_switch_requested = north_config_changed;
 	new_pd_state = chrg_comm_source_pd_state(
 		(rt_uint8_t)pShadow->source.protocol);
-	need_source_reset = (last_pd_pro[ch] != SOURCE_PD_STATE_UNKNOWN) &&
-		(last_pd_pro[ch] != new_pd_state);
+	/* 鍙湁宸茬煡鐨勯潪PD -> PD鍒囨崲鎵ц瀹屾暣纭欢澶嶄綅銆� */
+	old_pd_state = chrg_comm_source_pd_state((rt_uint8_t)old_protocol);
+	need_source_reset = (old_pd_state == SOURCE_PD_STATE_NON_PD) &&
+		(new_pd_state == SOURCE_PD_STATE_PD);
 	target_curr = pShadow->source.pd_set.mm.max_cur;
 
 	/* 褰卞瓙鍖哄彧鎷ユ湁COM閰嶇疆锛涘寳鍚戣В鏋愪骇鐢熺殑杩愯鐩爣鍜屽洖璇绘暟鎹户缁敱pReal鎸佹湁銆� */
@@ -2637,7 +2640,8 @@ static eMBException chrg_comm_apply_source_effect(rt_uint8_t ch,
 			 * sub宸插湪涓婃柟纭畾锛屽寳鍚戣疆璇㈢嚎绋嬫墽琛屾湰鐘舵�佸苟娓呴浂鎴愬姛鍚庯紝缁х画
 			 * CC_CLOSE鎴栧崗璁缃紝涓嶉渶瑕丆OM鐩存帴鍙戦�佷换浣曟竻闆跺懡浠ゃ��
 			 */
-			pReal->source.work_mode = SOURCE_WORK_PROTOCOL_SWITCH;
+			pReal->source.work_mode = need_source_reset ?
+				SOURCE_WORK_FULL_RESET : SOURCE_WORK_PROTOCOL_SWITCH;
 		}
 
 		if (pReal->source.protocol != PRO_NONE) {
diff --git a/apps/chrg/applications/thread/chrg_north.h b/apps/chrg/applications/thread/chrg_north.h
index 532c1aa..8ad285d 100644
--- a/apps/chrg/applications/thread/chrg_north.h
+++ b/apps/chrg/applications/thread/chrg_north.h
@@ -22,8 +22,8 @@
 #define LEN_FRAME_HEAD		(4)			// [甯ч暱, 0x00, id, 鍛戒护]
 #define MIN_FRAME_LENGTH	(5)			// 甯ф渶鐭�5瀛楄妭
 #define WORK_MIN_VOLT			3000			// 宸ヤ綔鐢靛帇涓嬮檺锛屽崟浣峬V
-#define NORTH_FRAME_DEBUG      0x01    // 鍖楀悜UART鍘熷鏀跺彂甯�
-#define NORTH_SOURCE_DEBUG     0x00    // Source鍗忚瑙ｆ瀽鍙婄粍甯�
+#define NORTH_FRAME_DEBUG      0x00    // 鍖楀悜UART鍘熷鏀跺彂甯�
+#define NORTH_SOURCE_DEBUG     0x01    // Source鍗忚瑙ｆ瀽鍙婄粍甯�
 #define NORTH_SINK_DEBUG       0x00    // Sink鍗忚瑙ｆ瀽鍙婄粍甯�
 #define SOUTH_FRAME_DEBUG      0x00    // 鍗楀悜UART鍘熷鏀跺彂甯�
 #define SOUTH_COMMAND_DEBUG    0x01    // 鍗楀悜瀵勫瓨鍣ㄥ啓鍛戒护
diff --git a/apps/chrg/applications/thread/chrg_roll_nor.c b/apps/chrg/applications/thread/chrg_roll_nor.c
index 70af2da..b944c52 100644
--- a/apps/chrg/applications/thread/chrg_roll_nor.c
+++ b/apps/chrg/applications/thread/chrg_roll_nor.c
@@ -157,6 +157,10 @@ static rt_bool_t chrg_roll_nor_source_wait_process(rt_uint8_t ch,
 		chrg_roll_nor_source_switch_reset(ch);
 		return RT_FALSE;
 	}
+	if (pSW->source.work_mode == SOURCE_WORK_INIT_WAIT) {
+		/* 鍗楀悜鍒濆鍖栨壒娆℃湭瀹屾垚鏃讹紝绂佹鍙戦�佸寳鍚戝崗璁懡浠ゃ�� */
+		return RT_TRUE;
+	}
 
 	if (pSW->sub == IDX_WAIT_SOURCE_PROTOCOL) {
 		if ((g_source_protocol_wait_mask & bit) == 0U) {
@@ -795,6 +799,7 @@ static int chrg_roll_nor_auto_request(rt_uint8_t idx,
 	struct chrg_switch_t *pSW, struct chrg_thread_t *pTHR,
 	struct chrg_thread_t *pTN, struct chrg_north_t *pNOR)
 {
+	rt_bool_t advance_sub = RT_TRUE;
 	rt_uint8_t attempt;                  // 褰撳墠鍙戦�佸簭鍙凤細0涓洪娆★紝1~2涓洪噸鍙�
 	rt_uint8_t request_sub = 0;          // 鏈璇锋眰瀹為檯浣跨敤鐨剆ub蹇収
 	rt_uint8_t next_sub = 0;             // 姝ｇ‘鍥炵爜鍚庡噯澶囨彁浜ょ殑鍊欓�塻ub
@@ -868,7 +873,10 @@ static int chrg_roll_nor_auto_request(rt_uint8_t idx,
 				/* ID銆佸懡浠ゃ�丆RC鍜岄厤缃増鏈潎纭鏈夋晥鍚庯紝鎵嶆寮忔帹杩涘疄鏃秙ub銆� */
 				if ((expected_id == ID_SOURCE) &&
 					(request_sub == IDX_SET_SOURCE_RESET)) {
-					/* 鍙備笌閫氶亾鍏ㄩ儴鏀跺埌0x17=3搴旂瓟鍚庯紝鍏变韩涓�娆�300ms淇濇姢绛夊緟銆� */
+					/* 澶嶄綅鍥炵爜鍚庨噸鏂版墽琛孲ource INIT锛屽垵濮嬪寲瀹屾垚鍚庡啀鎺ㄨ繘鍒癙D銆� */
+					pSW->source.work_mode = SOURCE_WORK_INIT;
+					advance_sub = RT_FALSE;
+					/* INIT瀹屾垚鍓嶄繚鎸佸綋鍓峴ub锛岀姝㈤�氱敤閫昏緫鎻愬墠鎺ㄨ繘鍒癙D銆� */
 				} else if ((expected_id == ID_SOURCE) &&
 					(request_sub == IDX_SET_SOURCE_PD)) {
 					/* 0xD0搴旂瓟鍚庢瘡閫氶亾鐙珛绛夊緟100ms锛屽啀杩炴帴鐩爣CC銆� */
@@ -887,7 +895,7 @@ static int chrg_roll_nor_auto_request(rt_uint8_t idx,
 				}
 				/* 涓氬姟瑙ｆ瀽鍙兘涓诲姩鍒囨崲sub锛屼緥濡傛帀鐢垫仮澶嶅悗瑕佹眰閲嶆柊璁剧疆鍗忚銆�
 				 * 鍙湁sub浠嶅睘浜庢湰娆¤姹傛椂锛屾墠搴旂敤璇锋眰鍑芥暟璁＄畻鍑虹殑next_sub銆� */
-				if (pSW->sub == request_sub) {
+				if (advance_sub && (pSW->sub == request_sub)) {
 					pSW->sub = next_sub;
 				}
 				rt_mutex_release(pTHR->mutex);
@@ -960,7 +968,12 @@ void chrg_roll_nor_thread_entry (void *data)
 			if ((pSW->id == ID_SOURCE) &&
 				((pSW->source.work_mode == SOURCE_WORK_INIT) ||
 				 (pSW->source.work_mode == SOURCE_WORK_STOP) ||
-				 (pSW->source.work_mode == SOURCE_WORK_PROTOCOL_SWITCH))) {
+				 (pSW->source.work_mode == SOURCE_WORK_PROTOCOL_SWITCH) ||
+				 (pSW->source.work_mode == SOURCE_WORK_FULL_RESET) ||
+				 (pSW->source.work_mode == SOURCE_WORK_FULL_RESET_WAIT) ||
+				 (pSW->source.work_mode == SOURCE_WORK_FULL_RESET_RELAY) ||
+				 (pSW->source.work_mode == SOURCE_WORK_FULL_RESET_RELAY_WAIT) ||
+				 (pSW->source.work_mode == SOURCE_WORK_INIT_WAIT))) {
 				state_work_ret = chrg_source_work_state(idx, pSW);
 			} else if ((pSW->id == ID_SINK) &&
 				((pSW->sink.work_mode == SINK_WORK_INIT) ||
diff --git a/apps/chrg/applications/thread/chrg_roll_sou.c b/apps/chrg/applications/thread/chrg_roll_sou.c
index ad9d2a8..0643b9f 100644
--- a/apps/chrg/applications/thread/chrg_roll_sou.c
+++ b/apps/chrg/applications/thread/chrg_roll_sou.c
@@ -35,6 +35,11 @@ chrg_rollsou_com_t g_sou_com_batch = {0};
 static rt_uint8_t g_sou_measure_once_pending_mask = 0U;
 static rt_uint8_t g_sou_measure_once_active_mask = 0U;
 
+/* A channel enters normal measurement polling only after its version probe
+ * receives a valid response.  A failed probe remains pending for the next
+ * round, which also covers the south board's slower power-up time. */
+static rt_uint8_t g_sou_version_ready[TOTAL_SOU_CHS] = {0U};
+
 /* COM鎵归噺鍛戒护鎸夐�氶亾杞鍙戦�併�備竴娆″啓鍛戒护鏀跺埌鍖归厤鍥炵爜鍚庢墠绉诲姩娓告爣锛�
  * 鍥炵爜閿欒鎴栬秴鏃舵椂娓告爣淇濇寔涓嶅彉锛屼娇鍚屼竴鏉″懡浠や紭鍏堝畬鎴愰噸鍙戯紝閬垮厤鐮村潖
  * 鏈�氶亾鎵规鍐呯殑瀵勫瓨鍣ㄦ墽琛岄『搴忋�� */
@@ -770,6 +775,7 @@ void chrg_roll_sou_thread_entry (void *data)
 	rt_uint16_t single_value = 0;
 	rt_bool_t command_valid = RT_FALSE;
 	rt_bool_t measure_once = RT_FALSE;
+	rt_bool_t version_probe = RT_FALSE;
 	rt_uint8_t response_part = MB_R_PART1;
 	rt_err_t ret = RT_EOK;
 	struct chrg_rollsou_t *pROLL = &chrgrollsou;
@@ -785,6 +791,7 @@ void chrg_roll_sou_thread_entry (void *data)
 		rt_mutex_release(pTHR->mutex);
 		command_valid = RT_FALSE;
 		measure_once = RT_FALSE;
+		version_probe = RT_FALSE;
 		response_part = MB_R_PART1;
 		if ((run != RUN_COM) && (run != RUN_UPDATA)) {
 			retry_count = 0;
@@ -802,7 +809,12 @@ void chrg_roll_sou_thread_entry (void *data)
 					pROLL->idx = (eIDX_SOU_CH)idx;
 					chrg_south_switch((eIDX_SOU_CH)idx);
 				}
-				chrg_eload_refresh(ID_ELOAD, MB_R_PART1);
+				if (g_sou_version_ready[idx] == 0U) {
+					version_probe = RT_TRUE;
+					chrg_eload_read_version(ID_ELOAD);
+				} else {
+					chrg_eload_refresh(ID_ELOAD, MB_R_PART1);
+				}
 				break;
 			}
 			idx = index%(TOTAL_SOU_CHS); // [0, 3]
@@ -818,7 +830,12 @@ void chrg_roll_sou_thread_entry (void *data)
 					chrg_south_switch((eIDX_SOU_CH)idx);
 					pROLL->part = MB_R_PART1;
 				}
-				chrg_eload_refresh(ID_ELOAD, pROLL->part);
+				if (g_sou_version_ready[idx] == 0U) {
+					version_probe = RT_TRUE;
+					chrg_eload_read_version(ID_ELOAD);
+				} else {
+					chrg_eload_refresh(ID_ELOAD, pROLL->part);
+				}
 				if (pROLL->part < TOTAL_MB_R) {
 					index++;
 				}
@@ -843,6 +860,7 @@ void chrg_roll_sou_thread_entry (void *data)
 			batch_ch = command_ch;
 			command_valid = RT_TRUE;
 			chrg_south_switch((eIDX_SOU_CH)command_ch);
+			rt_kprintf("ch=%d",command_ch);
 			chrg_eload_write_reg(ID_ELOAD, command_reg, command_value);
 		}
 		break;
@@ -907,7 +925,16 @@ void chrg_roll_sou_thread_entry (void *data)
 				} else if (run != RUN_AUTO) {
 					sou_single_command_finish(run);
 				} else {
-					chrg_eload_parse(idx, response_part, pMB_R->payload, pMB_R->length);
+					if (version_probe) {
+						if (chrg_eload_parse_version(idx, pMB_R->payload,
+							pMB_R->length) == 0) {
+							g_sou_version_ready[idx] = 1U;
+							pROLL->part = MB_R_PART1;
+						}
+					} else {
+						chrg_eload_parse(idx, response_part, pMB_R->payload,
+							pMB_R->length);
+					}
 				}
 			} else if (run == RUN_COM) {
 				sou_com_command_failed(batch_ch, command_reg, command_value,
diff --git a/apps/chrg/applications/utils/chrg_eload.c b/apps/chrg/applications/utils/chrg_eload.c
index 2356154..2826834 100644
--- a/apps/chrg/applications/utils/chrg_eload.c
+++ b/apps/chrg/applications/utils/chrg_eload.c
@@ -179,6 +179,14 @@ int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len)
 	return chrg_south_send(buf, 8);
 }
 
+/* Read the version first so a newly powered south board is not queried with
+ * the long measurement frame before its Modbus interface is ready. */
+int chrg_eload_read_version (rt_uint8_t addr)
+{
+	return chrg_eload_read_regs(addr, MODBUSRTU_SW_VERSION_REG,
+		MODBUSRTU_SW_VERSION_LEN);
+}
+
 /*****************************************************************
 鍑芥暟鍚嶇О锛� chrg_eload_send_ymodem_data
 鍑芥暟鎻忚堪锛� 鍚戝崡鍚戝彂閫亂modem鍗忚鍗囩骇鏁版嵁
@@ -292,6 +300,24 @@ int chrg_eload_refresh (rt_uint8_t addr, rt_uint8_t part)
 	return ret;
 }
 
+int chrg_eload_parse_version (rt_uint8_t idx, rt_uint8_t *data, rt_uint16_t len)
+{
+	rt_uint16_t version;
+
+	/* A one-register Modbus 0x03 response is 7 bytes including CRC16. */
+	if ((idx >= TOTAL_SOU_CHS) || (data == RT_NULL) ||
+		(len != (MODBUSRTU_SW_VERSION_LEN * 2U + 5U)) ||
+		(data[0] != ID_ELOAD) || (data[1] != MB_REGISTER_RD) ||
+		(data[2] != 2U) || (mb_crc16(data, len) != 0U)) {
+		return -1;
+	}
+
+	version = u8v_to_u16(&data[3]);
+	/* HOLD_REG_CH0_VERSION is the per-channel south board version register. */
+	usRegHoldBuf[HOLD_REG_CH0_VERSION + idx * TOTAL_HOLD_CH_REGS] = version;
+	return 0;
+}
+
 /*****************************************************************
 鍑芥暟鍚嶇О锛� chrg_eload_parse
 鍑芥暟鎻忚堪锛� 瑙ｆ瀽婧愯浇杩斿洖鏁版嵁
diff --git a/apps/chrg/applications/utils/chrg_eload.h b/apps/chrg/applications/utils/chrg_eload.h
index 10b92e0..0fbd63a 100644
--- a/apps/chrg/applications/utils/chrg_eload.h
+++ b/apps/chrg/applications/utils/chrg_eload.h
@@ -164,6 +164,10 @@ typedef enum {
 	TOTAL_MB_R
 } eIDX_MB_PART;
 
+/* South board firmware version register: one 16-bit register at 0x0301. */
+#define MODBUSRTU_SW_VERSION_REG	0x0301U
+#define MODBUSRTU_SW_VERSION_LEN	1U
+
 #define SIZE_P1_RD		19		// 璇�19涓瘎瀛樺櫒
 #define SIZE_P2_RD		28		// 璇�28涓瘎瀛樺櫒
 
@@ -239,6 +243,15 @@ struct chrg_eload_t {
 *****************************************************************/
 extern int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len);
 
+/*****************************************************************
+Function: chrg_eload_read_version
+Description: Request the south board firmware version register.
+Input: addr: south board address
+Output: -
+Return: <0: error, >0: sent length
+*****************************************************************/
+extern int chrg_eload_read_version (rt_uint8_t addr);
+
 /*****************************************************************
 鍑芥暟鍚嶇О锛� chrg_eload_write_reg
 鍑芥暟鎻忚堪锛� 鍚戝崡鍚戝彂閫佸啓鍗曚釜瀵勫瓨鍣�
@@ -268,6 +281,15 @@ extern int chrg_eload_refresh (rt_uint8_t addr, rt_uint8_t part);
 鍏跺畠璇存槑锛� -
 *****************************************************************/
 extern int chrg_eload_parse (rt_uint8_t idx, rt_uint8_t pt, rt_uint8_t *data, rt_uint16_t len);
+
+/*****************************************************************
+Function: chrg_eload_parse_version
+Description: Parse and store a valid south board firmware version.
+Input: idx: channel, data: Modbus response, len: response length
+Output: firmware version is stored at the channel version register
+Return: 0: valid, <0: invalid response
+*****************************************************************/
+extern int chrg_eload_parse_version (rt_uint8_t idx, rt_uint8_t *data, rt_uint16_t len);
 /*****************************************************************
 鍑芥暟鍚嶇О锛� chrg_eload_get_sample_seq
 鍑芥暟鎻忚堪锛� 鑾峰彇鎸囧畾鍗楀悜閫氶亾P1閲忔祴鏁版嵁鐨勬洿鏂板簭鍙�
diff --git a/apps/chrg/applications/utils/chrg_source.c b/apps/chrg/applications/utils/chrg_source.c
index b38d3ed..f50d3a7 100644
--- a/apps/chrg/applications/utils/chrg_source.c
+++ b/apps/chrg/applications/utils/chrg_source.c
@@ -21,6 +21,16 @@
 
 static int chrg_source_work_running(eIDX_SOU_CH idx,
 	struct chrg_switch_t *pSW);
+static int chrg_source_work_full_reset(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW);
+static int chrg_source_work_full_reset_wait(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW);
+static int chrg_source_work_full_reset_relay(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW);
+static int chrg_source_work_full_reset_relay_wait(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW);
+static int chrg_source_work_init_wait(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW);
 
 /*****************************************************************
 鍑芥暟鍚嶇О锛� chrg_source_init_submit
@@ -39,7 +49,7 @@ int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
 	rt_uint16_t regs[5] = {
 		REG_ELOAD,
 		REG_MODE,
-		0x01,
+		REG_REL_ON,
 		REG_CURRENT_OUT + 1,
 		REG_WORK
 	};
@@ -88,8 +98,38 @@ static int chrg_source_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
     pNOR->enable[idx] = 1;
 	pSOU->online[idx] = 1;
 	chrg_nor_sw_rel((eIDX_NOR_CH)idx, ID_SOURCE);
+	/* 鍒濆鍖栨壒娆″繀椤诲叏閮ㄦ敹鍒板崡鍚戝洖鐮佸悗锛屾墠鑳界户缁崗璁缃垨杈撳嚭鎺у埗銆� */
+	pSW->source.work_mode = SOURCE_WORK_INIT_WAIT;
+	return 0;
+}
+
+static int chrg_source_work_init_wait(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW)
+{
+	int result;
+
+	if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
+		return -1;
+	}
+	if (chrg_sou_com_batch_is_pending(idx)) {
+		return 1;
+	}
+	result = chrg_sou_com_batch_get_result(idx);
+	if (result <= 0) {
+		/* 鍗楀悜鍒濆鍖栧け璐ユ椂锛屼繚鎸佸寳鍚戝崗璁笉鍙樺苟閲嶅彂瀹屾暣鍒濆鍖栨壒娆°�� */
+		pSW->source.work_mode = SOURCE_WORK_INIT;
+		return 1;
+	}
+
+	if (pSW->sub == IDX_SET_SOURCE_RESET) {
+		/* 澶嶄綅鍚庣殑鍒濆鍖栧畬鎴愶紝鎵嶅厑璁歌繘鍏D鍗忚璁剧疆銆� */
+		pSW->sub = IDX_SET_SOURCE_PD;
+		pSW->source.work_mode = SOURCE_WORK_WAIT;
+		return 0;
+	}
+
 	if (pSW->source.protocol == PRO_NONE) {
-		/* 鏍囧噯鍗忚娌℃湁鍗忓晢鍥炵爜锛孖NIT鎴愬姛鍚庣珛鍗崇敱RUNING缁熶竴鍐欏叆鐢靛帇銆� */
+		/* 鏍囧噯鍗忚涓嶇瓑寰呭崗鍟嗭紝鍒濆鍖栧畬鎴愬悗鐩存帴鍐欏叆鐩爣鐢靛帇銆� */
 		pSW->source.work_mode = SOURCE_WORK_RUNING;
 		return chrg_source_work_running(idx, pSW);
 	}
@@ -173,6 +213,87 @@ static int chrg_source_work_protocol_switch(eIDX_SOU_CH idx,
 	return 0;
 }
 
+static int chrg_source_work_full_reset(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW)
+{
+	rt_uint16_t reg = REG_WORK;
+	rt_uint16_t value = WORK_STOP;
+
+	/* Cancel stale south commands so the reset sequence starts from a known state. */
+	if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
+		return -1;
+	}
+	if (chrg_sou_com_batch_cancel(idx) != 0) {
+		return -1;
+	}
+	if (chrg_sou_com_batch_submit(idx, &reg, &value, 1) != 0) {
+		return -1;
+	}
+	pSW->source.set_volt = 0;
+	pSW->source.work_mode = SOURCE_WORK_FULL_RESET_WAIT;
+	return 1;
+}
+
+static int chrg_source_work_full_reset_wait(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW)
+{
+	int result;
+
+	if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
+		return -1;
+	}
+	if (chrg_sou_com_batch_is_pending(idx)) {
+		return 1;
+	}
+	result = chrg_sou_com_batch_get_result(idx);
+	if (result <= 0) {
+		pSW->source.work_mode = SOURCE_WORK_FULL_RESET;
+		return 1;
+	}
+	pSW->source.work_mode = SOURCE_WORK_FULL_RESET_RELAY;
+	return 1;
+}
+
+static int chrg_source_work_full_reset_relay(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW)
+{
+	rt_uint16_t reg = REG_REL_ON;
+	rt_uint16_t value = ALL_REL_OFF;
+
+	if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
+		return -1;
+	}
+	if (chrg_sou_com_batch_submit(idx, &reg, &value, 1) != 0) {
+		return -1;
+	}
+	pSW->source.work_mode = SOURCE_WORK_FULL_RESET_RELAY_WAIT;
+	return 1;
+}
+
+static int chrg_source_work_full_reset_relay_wait(eIDX_SOU_CH idx,
+	struct chrg_switch_t *pSW)
+{
+	int result;
+
+	if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
+		return -1;
+	}
+	if (chrg_sou_com_batch_is_pending(idx)) {
+		return 1;
+	}
+	result = chrg_sou_com_batch_get_result(idx);
+	if (result <= 0) {
+		pSW->source.work_mode = SOURCE_WORK_FULL_RESET_RELAY;
+		return 1;
+	}
+
+	/* South relays are off; now disconnect D+/D- and CC before SOURCE_RESET. */
+	chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0);
+	pSW->sub = IDX_SET_SOURCE_RESET;
+	pSW->source.work_mode = SOURCE_WORK_WAIT;
+	return 1;
+}
+
 /*****************************************************************
 鍑芥暟鍚嶇О锛� chrg_source_work_stop
 鍑芥暟鎻忚堪锛� 鎵ц鐢垫簮涓诲姩鍏虫満娴佺▼
@@ -266,6 +387,16 @@ int chrg_source_work_state(rt_uint8_t idx, struct chrg_switch_t *pSW)
 		return chrg_source_work_switch(idx, pSW);
 	case SOURCE_WORK_PROTOCOL_SWITCH:
 		return chrg_source_work_protocol_switch(idx, pSW);
+	case SOURCE_WORK_FULL_RESET:
+		return chrg_source_work_full_reset(idx, pSW);
+	case SOURCE_WORK_FULL_RESET_WAIT:
+		return chrg_source_work_full_reset_wait(idx, pSW);
+	case SOURCE_WORK_FULL_RESET_RELAY:
+		return chrg_source_work_full_reset_relay(idx, pSW);
+	case SOURCE_WORK_FULL_RESET_RELAY_WAIT:
+		return chrg_source_work_full_reset_relay_wait(idx, pSW);
+	case SOURCE_WORK_INIT_WAIT:
+		return chrg_source_work_init_wait(idx, pSW);
 	default:
 		return -1;
 	}
diff --git a/apps/chrg/applications/utils/chrg_source.h b/apps/chrg/applications/utils/chrg_source.h
index df3ee28..75b6377 100644
--- a/apps/chrg/applications/utils/chrg_source.h
+++ b/apps/chrg/applications/utils/chrg_source.h
@@ -169,6 +169,11 @@ enum {
     SOURCE_WORK_STOP,            // 涓诲姩鍋滄骞跺叧闂�氶亾
     SOURCE_WORK_SWITCH,          // 鍋滄鏃ц礋杞藉悗杩涘叆鐢垫簮INIT
     SOURCE_WORK_PROTOCOL_SWITCH, // 鍗忚/CC鍒囨崲鍓嶆竻闆跺姛鐜囨澘杈撳嚭
+    SOURCE_WORK_FULL_RESET,           // Submit output clear and stop commands
+    SOURCE_WORK_FULL_RESET_WAIT,      // Wait for output clear and stop
+    SOURCE_WORK_FULL_RESET_RELAY,     // Submit south relay-off command
+    SOURCE_WORK_FULL_RESET_RELAY_WAIT,// Wait before disconnecting north relay
+    SOURCE_WORK_INIT_WAIT,             // Wait for Source init batch completion
     SOURCE_WORK_ON_TEST_DYNA,
     SOURCE_WORK_ON_TEST_SHORT,
 };