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 402a739..b7bd820 100644 --- a/apps/chrg/applications/thread/chrg_comm.c +++ b/apps/chrg/applications/thread/chrg_comm.c @@ -1,7 +1,7 @@ /**************************************************************************** 鏂囦欢鍚嶇О : chrg_comm.c 瀹屾垚鏃ユ湡 : -褰撳墠鐗堟湰鍙 : V1.0 +褰撳墠鐗堟湰鍙 : V1.1.9 涓昏鍔熻兘 : 瀹炵幇瀵瑰閫氳鍗忚 MODBUS 鏈嶅姟绔紝浠ョ嫭绔嬬嚎绋嬬瓑寰呭鐞嗗搷搴旇姹傛暟鎹 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 璇存槑 : @@ -26,6 +26,9 @@ #include "stm32f4xx_hal.h" +#define HOLD_REG_FIRMWARE_VERSION 0x0300U /* 鍗忚鏉垮浐浠剁増鏈紝鍙 */ +#define CHRG_FIRMWARE_VERSION 0x0119U /* 褰撳墠鍗忚鏉跨増鏈細V1.1.9 */ + rt_uint8_t ucDiscInBuf[(TOTAL_DISC_REGS+BITS_UCHAR-1)/BITS_UCHAR]; rt_uint8_t ucCoilBuf[(TOTAL_COIL_REGS+BITS_UCHAR-1)/BITS_UCHAR]; rt_uint16_t usRegInBuf[TOTAL_INPUT_REGS]; @@ -36,10 +39,64 @@ rt_uint8_t g_proto_pData[80] = {0};//涓婁綅鏈哄崗璁寚浠わ紝鎺у埗鍥涗釜閫氶亾 rt_uint16_t g_proto_reqLen = 0; rt_uint8_t mobude_ymodem_buf[MB_YMODEM_DATA_SIZE] = {0};//鍗楀悜鍔熺巼鏉垮崌绾х紦鍐插尯 rt_uint8_t mobude_ymodem_buf_2[MB_YMODEM_DATA_SIZE] = {0};//鍗楀悜鍔熺巼鏉垮崌绾х紦鍐插尯 + +#define YMODEM_C_PERIOD_MS 1000 +#define YMODEM_META_ACK_TIMEOUT_MS 3000 +#define YMODEM_DATA_ACK_TIMEOUT_MS 1000 +#define YMODEM_MAX_RETRIES 3 + +/* COM渚у崌绾т細璇濈姸鎬侊細鎺ユ敹缂撳瓨璐熻矗鎷煎抚锛屽浠界紦瀛樿礋璐ｈ秴鏃/NAK閲嶅彂銆 */ +static rt_uint16_t g_ymodem_rx_len = 0; +static rt_uint16_t g_ymodem_expected_len = 0; +static rt_uint16_t g_ymodem_last_len = 0; +static rt_uint8_t g_ymodem_waiting_ack = 0; +static rt_uint8_t g_ymodem_retry_count = 0; +static rt_uint8_t g_ymodem_eot_done = 0; +static rt_tick_t g_ymodem_send_tick = 0; +static rt_tick_t g_ymodem_c_tick = 0; /* Modbus 褰卞瓙瀵勫瓨鍣: 0x06/0x10 鍐欐搷浣滄殏瀛樺埌姝, PARAM_EFFECT 鐢熸晥鍚庡鍒跺埌瀹為檯 pNOR->sw */ static struct chrg_switch_t g_shadow_sw[TOTAL_NOR_CHS]; static rt_uint8_t g_shadow_dirty[TOTAL_NOR_CHS] = {0}; /* 0=宸茬敓鏁 1=寰呯敓鏁堬紝闃叉閲嶅瑕嗙洊 */ +/* Source鍗忚绫诲埆缂撳瓨锛0xFF琛ㄧず鏈氶亾灏氭湭鎴愬姛涓嬪彂杩囧崗璁 */ +#define SOURCE_PD_STATE_UNKNOWN 0xFFU +#define SOURCE_PD_STATE_NON_PD 0x00U +#define SOURCE_PD_STATE_PD 0x01U +static rt_uint8_t last_pd_pro[TOTAL_NOR_CHS] = { + SOURCE_PD_STATE_UNKNOWN, SOURCE_PD_STATE_UNKNOWN, + SOURCE_PD_STATE_UNKNOWN, SOURCE_PD_STATE_UNKNOWN +}; + +static rt_uint8_t chrg_comm_source_pd_state(rt_uint8_t protocol) +{ + return ((protocol == PRO_PD0PSS) || (protocol == PRO_PD31AVS)) ? + SOURCE_PD_STATE_PD : SOURCE_PD_STATE_NON_PD; +} + +void chrg_comm_source_protocol_ack(rt_uint8_t ch, rt_uint8_t protocol) +{ + if (ch < TOTAL_NOR_CHS) { + last_pd_pro[ch] = chrg_comm_source_pd_state(protocol); + } +} + +/* + * Source鍜孲ink鍏辩敤鐨勫弬鏁板樊寮傜粨鏋溿傚墠浜旈」鏄袱涓鑹查兘鍏峰鐨勬帶鍒跺睘鎬э紝 + * pd_changed鐢ㄤ簬Source瀹屾暣鍗忚鍙傛暟姣旇緝锛屽悗涓夐」鐢ㄤ簬Sink蹇厖鍗忚閰嶇疆銆 + */ +typedef struct +{ + rt_bool_t protocol_changed; + rt_bool_t cc_changed; + rt_bool_t cv_changed; + rt_bool_t voltage_changed; + rt_bool_t current_changed; + rt_bool_t pd_changed; + rt_bool_t group_changed; + rt_bool_t pro_voltage_changed; + rt_bool_t pro_current_changed; +} chrg_param_diff_t; + /* 棣栨鍐欏叆褰卞瓙瀵勫瓨鍣ㄥ墠锛屼粠鐪熷疄缁撴瀯浣撳悓姝ワ紝閬垮厤瑕嗙洊杩愯涓殑鍏抽敭鏍囧織浣 */ static void chrg_shadow_sync(rt_uint8_t ch) { @@ -65,7 +122,12 @@ struct chrg_comm_t chrgcomm = { static void chrg_mb_write_sink(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW); static void chrg_mb_write_src(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW); -static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW, struct chrg_north_t *pNOR, struct chrg_south_t *pSOU); +static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW, struct chrg_north_t *pNOR, struct chrg_south_t *pSOU); +static int chrg_sink_diff_send_reg(eIDX_SOU_CH ch, + const chrg_param_diff_t *pDiff, struct chrg_switch_t *pReal); +static rt_bool_t chrg_comm_handle_sink_load_current( + const chrg_param_diff_t *pDiff, rt_uint8_t old_work_mode, + struct chrg_switch_t *pReal); /*! \brief Function to set bits in a byte buffer. * @@ -185,16 +247,6 @@ rt_uint8_t mb_get_bits (rt_uint8_t * ucByteBuf, rt_uint16_t usBitOffset, rt_uint return (rt_uint8_t)usWordBuf; } -static void set_ymodem_update_channel(struct chrg_north_t *pNOR,struct chrg_south_t *pSOU,eIDX_SOU_CH ch) -{ - for (int i = 0; i < 4; i++) { - pNOR->enable[i] = 0; - pSOU->enable[i] = 0; - } - pNOR->enable[ch] = 1; - pSOU->enable[ch] = 1; -} - static eMBException mb_error (eMBErrorCode eErrorCode) { eMBException eStatus; @@ -221,6 +273,16 @@ static eMBException mb_error (eMBErrorCode eErrorCode) } //extern eMBErrorCode Modbus_Protocal_Set(rt_uint16_t Role_value,rt_uint16_t src,rt_uint16_t pps,rt_uint16_t pro_value,rt_uint16_t volt_value,rt_uint16_t curr_value); +/***************************************************************** +鍑芥暟鍚嶇О锛 mb_reg_input_cb +鍑芥暟鎻忚堪锛 Modbus杈撳叆瀵勫瓨鍣ㄨ鍙栧洖璋冨嚱鏁 +杈撳叆鍙傛暟锛 pucRegBuffer:杈撳叆瀵勫瓨鍣ㄨ繑鍥炴暟鎹紦鍐插尯 + usAddress:杈撳叆瀵勫瓨鍣ㄨ捣濮嬪湴鍧 + usNRegs:闇瑕佽鍙栫殑杈撳叆瀵勫瓨鍣ㄦ暟閲 +杈撳嚭鍙傛暟锛 pucRegBuffer:鎸塎odbus楂樺瓧鑺傚湪鍓嶆牸寮忓～鍏呭瘎瀛樺櫒鏁版嵁 +杩斿洖璇存槑锛 MB_ENOERR:璇诲彇鎴愬姛 MB_ENOREG:鍦板潃鑼冨洿閿欒 +鍏跺畠璇存槑锛 鍙usRegInBuf锛屼笉澶勭悊鍐欐搷浣滐紱姣忎釜杈撳叆瀵勫瓨鍣ㄨ浆鎹负涓や釜瀛楄妭 +*****************************************************************/ eMBErrorCode mb_reg_input_cb (rt_uint8_t *pucRegBuffer, rt_uint16_t usAddress, rt_uint16_t usNRegs) { eMBErrorCode eStatus = MB_ENOERR; @@ -351,20 +413,12 @@ eMBErrorCode mb_reg_test_cb (rt_uint8_t *req, rt_uint8_t *pucRegBuffer, rt_uint1 *****************************************************************/ eMBErrorCode mb_ymodem_updata_cb (rt_uint8_t *state, rt_uint8_t *pucRegBuffer) { - eMBErrorCode eStatus = MB_ENOERR; - - switch (*state) { - /* read current register values from the protocol stack. */ - case 0: - /* 杩斿洖鍊煎弽鏄犲疄闄厃modem鍗囩骇鐘舵: ACK_C=绌洪棽, ACK=鍗囩骇涓 */ - pucRegBuffer[0] = (*state == Ymodem_No) ? ACK_C : ACK; - break; - case 1: - pucRegBuffer[0] = (*state == Ymodem_No) ? ACK_C : ACK; - break; - /* write current register values with new values from the protocol stack. */ - } - return eStatus; + if ((state == RT_NULL) || (pucRegBuffer == RT_NULL)) { + return MB_EINVAL; + } + /* Ymodem_No鐨勬灇涓惧间负0xFF锛屼笉鑳界敤鍙鐩0鍜1鐨剆witch鐢熸垚鍝嶅簲銆 */ + pucRegBuffer[0] = (*state == Ymodem_No) ? ACK_C : ACK; + return MB_ENOERR; } eMBErrorCode mb_reg_coils_cb (rt_uint8_t *req, rt_uint8_t *pucRegBuffer, rt_uint16_t usAddress, @@ -537,8 +591,6 @@ eMBException funcReadHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen, rt_uint8_t *resFrame, rt_uint16_t *resLen) { rt_uint16_t regAddress = 0, cntReg = 0; - struct chrg_north_t *pNOR = &chrgnorth; - struct chrg_switch_t *pSW = &pNOR->sw[0]; eMBException eStatus = MB_EX_NONE; eMBErrorCode eRegStatus; @@ -553,6 +605,23 @@ eMBException funcReadHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen, return MB_EX_ILLEGAL_DATA_VALUE; } + /* + * 鍗忚鏉跨増鏈彿浣跨敤鐙珛鐨勫彧璇诲湴鍧0x0300锛屼笉鍗犵敤鐜版湁閫氶亾淇濇寔瀵勫瓨鍣ㄧ┖闂淬 + * 褰撳墠鐗堟湰V1.1.9缂栫爜涓0x0119锛孧odbus鍝嶅簲鎸夐珮瀛楄妭鍦ㄥ墠杩斿洖01 19銆 + * 璇ョ壒娈婂湴鍧鍙敮鎸佷竴娆¤鍙栦竴涓瘎瀛樺櫒锛岄伩鍏嶄笌鏅氳繛缁瘎瀛樺櫒娣风敤銆 + */ + if (regAddress == HOLD_REG_FIRMWARE_VERSION) { + if (cntReg != 1U) { + return MB_EX_ILLEGAL_DATA_VALUE; + } + resFrame[1] = MB_READ_HOLDING_REGISTER; + resFrame[2] = 2U; + resFrame[3] = (rt_uint8_t)(CHRG_FIRMWARE_VERSION >> 8); + resFrame[4] = (rt_uint8_t)(CHRG_FIRMWARE_VERSION & 0xFFU); + *resLen = 5U; + return MB_EX_NONE; + } + resFrame[1] = MB_READ_HOLDING_REGISTER; resFrame[2] = cntReg * 2; @@ -562,17 +631,18 @@ eMBException funcReadHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen, } else { *resLen = 3+cntReg * 2; } - rt_kprintf("------COM VOLT =%d -------\n------COM CURR =%d-------", pSW->Now_voltage,pSW->Now_current); +// rt_kprintf("------COM READ addr=%d count=%d-------\n", regAddress, cntReg); return eStatus; } /***************************************************************** 鍑芥暟鍚嶇О锛 funcReadInputRegister -鍑芥暟鎻忚堪锛 璇昏緭鍏ュ瘎瀛樺櫒 +鍑芥暟鎻忚堪锛 澶勭悊Modbus鍔熻兘鐮0x04锛岃鍙栬緭鍏ュ瘎瀛樺櫒 杈撳叆鍙傛暟锛 reqFrame: 璇锋眰鏁版嵁 reqLen: 璇锋眰闀垮害 resFrame:鍝嶅簲鏁版嵁 resLen:鍝嶅簲闀垮害 -杈撳嚭鍙傛暟锛 - -杩斿洖璇存槑锛 - -鍏跺畠璇存槑锛 - +杈撳嚭鍙傛暟锛 resFrame:杈撳叆瀵勫瓨鍣ㄥ搷搴斿抚 resLen:鍝嶅簲甯ч暱搴 +杩斿洖璇存槑锛 MB_EX_NONE:璇诲彇鎴愬姛 鍏朵粬:Modbus寮傚父鐮 +鍏跺畠璇存槑锛 璇锋眰鍦板潃鍜屾暟閲忔牎楠屾柟寮忎笌鍔熻兘鐮0x03淇濇寔涓鑷达紱杈撳叆瀵勫瓨鍣 + 鏁版嵁浠巙sRegInBuf璇诲彇锛屽搷搴旀暟鎹寜楂樺瓧鑺傚湪鍓嶈繑鍥 *****************************************************************/ eMBException funcReadInputRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen, rt_uint8_t *resFrame, rt_uint16_t *resLen) @@ -596,13 +666,16 @@ eMBException funcReadInputRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen, resFrame[1] = MB_READ_INPUT_REGISTER; resFrame[2] = cntReg * 2; - eRegStatus = mb_reg_discrete_cb(&resFrame[3], regAddress, cntReg); + eRegStatus = mb_reg_input_cb(&resFrame[3], regAddress, cntReg); if (eRegStatus != MB_ENOERR) { eStatus = mb_error(eRegStatus); } else { *resLen = 3+cntReg*2; } +#if COMM_DEBUG + rt_kprintf("COM read input: addr=%d count=%d\n", regAddress, cntReg); +#endif return eStatus; } @@ -803,6 +876,7 @@ typedef struct { } SrcProtoMap_t; static const SrcProtoMap_t src_proto_map[] = { + {0x20, PRO_NONE}, // 鏍囧噯鍗忚锛堟棤蹇厖锛 {0x2A, PRO_PD0PSS}, // PD {0x22, PRO_FCP}, // FCP {0x23, PRO_SCPB}, // SCPB @@ -846,22 +920,24 @@ static rt_uint16_t src_proto_lookup(rt_uint16_t reg_val) *****************************************************************/ static rt_uint16_t src_type_lookup(rt_uint16_t reg_val,struct chrg_switch_t *pSW) { + struct vc_pd_t *pPD = &pSW->source.pd_set; + switch(reg_val){ case 0: - pSW->source.src = 0; - pSW->source.pps = 0; + pPD->src_type = TYPE_SRC_PDO; + pPD->pps_type = TYPE_PPS_SPRPPS; break; case 1: - pSW->source.src = 0; - pSW->source.pps = 1; + pPD->src_type = TYPE_SRC_PDO; + pPD->pps_type = TYPE_PPS_EPR; break; case 2: - pSW->source.src = 3; - pSW->source.pps = 0; + pPD->src_type = TYPE_SRC_APDO; + pPD->pps_type = TYPE_PPS_SPRPPS; break; case 3: - pSW->source.src = 3; - pSW->source.pps = 1; + pPD->src_type = TYPE_SRC_APDO; + pPD->pps_type = TYPE_PPS_EPR; break; default: return 1; @@ -960,7 +1036,10 @@ eMBException funcWriteHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen, } else if (regAddress_H == HOLD_REG_SYS_BASE) { - chrg_mb_write_sys(ch, reg_offset, sou_value, pSW, pNOR, pSOU); + eStatus = chrg_mb_write_sys(ch, reg_offset, sou_value, pSW, pNOR, pSOU); + if (eStatus != MB_EX_NONE) { + return eStatus; + } } build_response: @@ -1021,378 +1100,6 @@ eMBException funcWriteMultipleCoils (rt_uint8_t *reqFrame, rt_uint16_t reqLen, return eStatus; } -static void parse_load_no_group(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t reqLen, struct chrg_switch_t *pSW) -{ - rt_uint16_t volt_mv = 0; // 鍗忚璇锋眰鐢靛帇(mV) - rt_uint16_t curr_ma = 0; // 璐熻浇鐢垫祦(mA) - - // 鏁版嵁鍖虹储寮曪細0=鐘舵+閫氶亾,1=CC绾,2,閫夋嫨鎭掑帇鎭掓祦妯″紡3-4=鐢靛帇,5-6=鐢垫祦,6-7=淇濈暀 - volt_mv = u8v_to_u16(&pData[3]); // 鐢靛帇(mV锛屽ぇ绔) - curr_ma = u8v_to_u16(&pData[5]); // 鐢垫祦(mA锛屽ぇ绔) - - // 鎸夊崗璁懡浠ょ爜璧嬪 - switch (protoCmd) - { - case 0x11: // QC2.0 - pSW->sink.protocol = LOAD_PRO_QC20; - break; - case 0x12: // QC3.0 - pSW->sink.protocol = LOAD_PRO_QC30; - break; - case 0x13: // FCP - pSW->sink.protocol = LOAD_PRO_FCP; - break; - case 0x14: // AFC - pSW->sink.protocol = LOAD_PRO_AFC; - break; - case 0x15: // SCP - pSW->sink.protocol = LOAD_PRO_SCP; - break; - case 0x16: // VIVO - pSW->sink.protocol = LOAD_PRO_VIVO; - break; - case 0x17: // TFC - pSW->sink.protocol = LOAD_PRO_TFC_RFC; - break; - default: - rt_kprintf("鏃犵粍鍙疯礋杞藉崗璁笉鏀寔锛0x%02X\n", protoCmd); - return; - } - - // 璧嬪奸氱敤鍙傛暟 - pSW->sink.loadv = volt_mv; - pSW->sink.loadc = curr_ma; - pSW->sink.Pro_Group = 0; // 鏃犵粍鍙 - rt_kprintf("pro=%d,volt_mv=%d,curr=%d",pSW->sink.protocol,volt_mv,curr_ma); -} - -static void parse_load_with_group(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t reqLen, struct chrg_switch_t *pSW) -{ - rt_uint8_t group_num = 0; // 缁勫彿 - rt_uint16_t volt_mv = 0; // 鍗忚璇锋眰鐢靛帇(mV) - rt_uint16_t curr_ma = 0; // 璐熻浇鐢垫祦(mA) - - // 鏁版嵁鍖虹储寮曪細0=鐘舵+閫氶亾,1=CC绾,2=鎭掑帇鎭掓祦妯″紡,3=缁勫彿 - group_num = pData[3]; - pSW->sink.Pro_Group = group_num; - - // 鎸夊崗璁懡浠ょ爜鍒嗘敮 - switch (protoCmd) - { - case CMD_LOAD_PD0_MAN: // PD0锛堟墜鍔級 - pSW->sink.protocol = LOAD_PRO_PDO_MANUAL; - // PD0鐗规畩锛氱粍鍙峰悗涓3涓繚鐣2瀛楄妭锛屾棤鐢靛帇鐢垫祦 - volt_mv = 0; - curr_ma = 0; - break; - case CMD_LOAD_PD0_AUTO: // PDO鑷姩 - pSW->sink.protocol = LOAD_PRO_PDO_AUTO; - volt_mv = u8v_to_u16(&pData[4]); // 4-5=鐢靛帇 - curr_ma = u8v_to_u16(&pData[6]); // 6-7=鐢垫祦 - break; - case CMD_LOAD_PPS_MAN: // PPS锛堟墜鍔級 - pSW->sink.protocol = LOAD_PRO_PPS_MANUAL; - volt_mv = u8v_to_u16(&pData[4]); - curr_ma = u8v_to_u16(&pData[6]); - break; - case CMD_LOAD_PPS_AUTO: // PPS锛堣嚜鍔級 - pSW->sink.protocol = LOAD_PRO_PPS_AUTO; - volt_mv = u8v_to_u16(&pData[4]); - curr_ma = u8v_to_u16(&pData[6]); - break; - case CMD_LOAD_PD31: // PD3.1 - pSW->sink.protocol = LOAD_PRO_PD31AVS; - volt_mv = u8v_to_u16(&pData[4]); - curr_ma = u8v_to_u16(&pData[6]); - break; - case CMD_LOAD_UFCS: // UFCS - pSW->sink.protocol = LOAD_PRO_UFCS; - volt_mv = u8v_to_u16(&pData[4]); - curr_ma = u8v_to_u16(&pData[6]); - break; - case CMD_LOAD_VOOC: // VOOC - pSW->sink.protocol = LOAD_PRO_VOOC; - volt_mv = 0; - curr_ma = 0; - break; - case CMD_LOAD_AVS: // AVS - pSW->sink.protocol = LOAD_PRO_AVS; - volt_mv = u8v_to_u16(&pData[4]); - curr_ma = u8v_to_u16(&pData[6]); - break; - default: - rt_kprintf("鏈夌粍鍙疯礋杞藉崗璁笉鏀寔锛0x%02X\n", protoCmd); - return; - } - rt_kprintf("volt_mv=%d,curr_ma=%d\n",volt_mv,curr_ma); - // 璧嬪奸氱敤鍙傛暟 - pSW->sink.loadv = volt_mv; - pSW->sink.loadc = curr_ma; - -} - -// //sink寮鏈哄嚱鏁 -// rt_uint8_t chrg_com_sink_on(rt_uint8_t ch, struct chrg_switch_t *pSW, rt_uint8_t *enable){ - -// *enable = 1; -// pSW->id = ID_SINK; -// pSW->sub = IDX_SET_SINK_CURR; -// pSW->change_flag = 0x01; -// pSW->sink.work_on_step = 0; -// return 0; -// } - -//source寮鏈哄嚱鏁 -rt_uint8_t chrg_com_source_on(rt_uint8_t ch, rt_uint8_t protoCmd, struct chrg_switch_t *pSW, rt_uint8_t *enable){ - *enable = 1; - pSW->id = ID_SOURCE; - pSW->source.LCD_Set_Pro_Flag=3; - pSW->sub = IDX_SET_SOURCE_ID; - pSW->change_flag = 0x01; - pSW->continue_flag = 1; - return 0; -} - -/***************************************************************** -鍑芥暟鍚嶇О锛 funcWriteProtoCal -鍑芥暟鎻忚堪锛 鍐欏叆鍗忚 -杈撳叆鍙傛暟锛 reqFrame: 璇锋眰鏁版嵁 reqLen: 璇锋眰闀垮害 resFrame:鍝嶅簲鏁版嵁 resLen:鍝嶅簲闀垮害 -杈撳嚭鍙傛暟锛 - -杩斿洖璇存槑锛 - -鍏跺畠璇存槑锛 - -*****************************************************************/ -eMBException funcWriteProtoCal (rt_uint8_t *reqFrame, rt_uint16_t reqLen, - rt_uint8_t *resFrame, rt_uint16_t *resLen) -{ - /************ 灞閮ㄥ彉閲忓畾涔 ************/ - struct chrg_north_t *pNOR = &chrgnorth; - struct chrg_south_t *pSOU = &chrgsouth; - struct chrg_switch_t *pSW = RT_NULL; - - rt_uint8_t slaveAddr = 0; // 浠庢満鍦板潃(0x01~0xFF) - rt_uint8_t protoCmd = 0; // 鍗忚鍛戒护鐮(0x11~0x1F/0x22~0x2C/0x2F) - rt_uint16_t regAddress = 0; // 瀵勫瓨鍣ㄨ捣濮嬪湴鍧 - rt_uint8_t *pData = RT_NULL; // 鍗忚鏁版嵁鍖鸿捣濮嬫寚閽堬紙鐘舵+閫氶亾瀛楁寮濮嬶級 - rt_uint8_t statusChByte = 0;// 鐘舵+閫氶亾瀛楄妭(reqFrame[5]) - eIDX_SOU_CH ch = IDX_SOU_CH1;// 閫氶亾鍙(1~4) - rt_uint8_t chNum = 0; // 閫氶亾鍙锋暟鍊(1~4) - rt_uint8_t devStatus = 0; // 璁惧鐘舵(0=涓嶅彉,1=寮鏈,2=鍏虫満) - rt_uint8_t ccSel = 0; // CC绾块夋嫨(0=CC1+CC2,1=CC1,2=CC2,3=鏂紑) -// *g_proto_pData = RT_NULL; - g_proto_reqLen = 0; - // Modbus寮傚父鐮 - eMBException eStatus = MB_EX_NONE; - eMBErrorCode eRegStatus; - rt_uint16_t reg_offset = 0; - rt_uint16_t sout_reg = 0; - rt_uint16_t sou_value = 0; - - /************ 鏍￠獙 ************/ - // 鏈灏忓抚闀垮害锛氬湴鍧(1)+鍛戒护鐮(1)+瀵勫瓨鍣(2)+鏁版嵁鍖(鑷冲皯1)+鏍￠獙(2) = 7瀛楄妭 - if (reqLen < 7) { - rt_kprintf("The long error锛%d must more 7\n", reqLen); - return MB_EX_ILLEGAL_DATA_VALUE; - } - - /************ 瑙ｆ瀽甯 ************/ - slaveAddr = reqFrame[0]; // 浠庢満鍦板潃(0x01~0xFF) - protoCmd = reqFrame[3]; // 鍗忚鍛戒护鐮(璐熻浇0x11~0x1F锛岀數婧0x22~0x2C/0x2F) - rt_kprintf("pro=%04x\n",protoCmd); - pData = &reqFrame[4]; // 鏁版嵁鍖鸿捣濮嬶紙璺宠繃鍦板潃+鍛戒护鐮+瀵勫瓨鍣級 - statusChByte = pData[0]; // 鐘舵+閫氶亾瀛楄妭锛堟暟鎹尯绗1瀛楄妭锛 - - /************ 鍦板潃鏍￠獙 ************/ - if (protoCmd < PRO_REG_START || protoCmd >= TOTAL_PROTOCAL_CNT) { - rt_kprintf("Address error锛0x%04X\n", protoCmd); - return MB_EX_ILLEGAL_DATA_ADDRESS; - } - - /************ 鎻愬彇閫氶亾鍙峰拰鐘舵 ************/ - // bit0-3锛氱姸鎬(0=涓嶅彉,1=寮鏈,2=鍏虫満) - devStatus = statusChByte & 0x0F; - rt_kprintf("status=%d",devStatus); - // bit4-7锛氶氶亾鍙(1=CH1,2=CH2,3=CH3,4=CH4) - chNum = (statusChByte >> 4) & 0x0F; - ccSel = pData[1]; - rt_uint8_t cv_mode = pData[2]; - // 閫氶亾鍙峰悎娉曟ф牎楠 - if (chNum < 1 || chNum > 4) { - rt_kprintf("閫氶亾鍙烽潪娉曪細%d锛堜粎鏀寔1~4锛塡n", chNum); - return MB_EX_ILLEGAL_DATA_ADDRESS; - } - ch = (eIDX_SOU_CH)(chNum - 1); // 杞崲涓烘灇涓剧被鍨(IDX_SOU_CH1=0) - /************ 纭欢缁撴瀯浣撶粦瀹 ************/ - if (pNOR == RT_NULL) { - rt_kprintf("ERROR: pNOR is NULL!\n"); - return MB_EX_SLAVE_DEVICE_FAILURE; - } - pSW = &pNOR->sw[ch]; // 缁戝畾褰撳墠閫氶亾鐨勫崗璁厤缃粨鏋勪綋 - pSW->protoCmd = protoCmd; //com绔崗璁懡浠ょ爜 - pSW->CV_mode = cv_mode; //鎭掑帇鎭掓祦妯″紡閫夋嫨 - - rt_memcpy(g_proto_pData, pData, reqLen - 4); - g_proto_reqLen = reqLen; - rt_kprintf("com_recitive\n"); - /************ 鎸夈岃礋杞/鐢垫簮銆嶅垎鏀В鏋 ************/ - // ========== 璐熻浇鍗忚瑙ｆ瀽 (0x11~0x1F) ========== - if (protoCmd >= 0x11 && protoCmd <= 0x1F) { - pSW->sink.cc_set = ccSel; //璐熻浇CC绾块夋嫨 - if(pSW->source.On_Flag){ //璐熻浇鍒囩數婧 - pSW->source.change_sink_Flag = 1; - chrg_sou_stop(ch,pSW,pNOR); - }else{ - if(devStatus==2){ //璐熻浇鍏虫満 - chrg_sou_stop(ch,pSW,pNOR); - } - else if(devStatus==1){ //璐熻浇寮鏈 - //chrg_com_sink_on(ch,pSW,&pNOR->enable[ch]); - } - } - } - // ==========鐢垫簮鍗忚瑙ｆ瀽 (0x22~0x2C/0x2F) ========== - else if ((protoCmd >= 0x22 && protoCmd <= 0x2C) || protoCmd == 0x2F) { - pSW->source.cc_set = ccSel; //鐢垫簮CC绾块夋嫨 - if(pSW->sink.On_work){ //鐢垫簮鍒囪礋杞 - pSW->sink.change_source_flag = 1; - chrg_sou_stop(ch,pSW,pNOR); - }else{ - if(devStatus==2){ //鐢垫簮鍏虫満 - chrg_sou_stop(ch,pSW,pNOR); - }else if(devStatus==1){ //鐢垫簮寮鏈 - chrg_com_source_on(ch,pSW->protoCmd,pSW,&pNOR->enable[ch]); - } - } - } - // ========== 闈炴硶鍛戒护鐮 ========== - else { - rt_kprintf("闈炴硶鍗忚鍛戒护鐮侊細0x%02X\n", protoCmd); - return MB_EX_ILLEGAL_FUNCTION; - } - - // /************ 閰嶇疆鍙傛暟鍐欏叆淇濇寔瀵勫瓨鍣 ************/ - eRegStatus = mb_reg_holding_cb(&reqFrame[4], &resFrame[3], regAddress, 1, MB_REG_WRITE); - if (eRegStatus != MB_ENOERR) { - eStatus = mb_error(eRegStatus); - rt_kprintf("瀵勫瓨鍣ㄥ啓鍏ュけ璐ワ細%d\n", eRegStatus); - } - - /************ 鏋勫缓鍝嶅簲甯 ************/ - rt_memcpy(resFrame, reqFrame, reqLen); - *resLen = reqLen - 2; // 鍘绘帀CRC鏍￠獙浣 - - /************ 璋冭瘯杈撳嚭 ************/ -// rt_kprintf("Pro Set OK:Ch=%d,Pro0x%02X,Status%d,CC Set%d\n", -// chNum, protoCmd, devStatus, ccSel); - return eStatus; -} - -/***************************************************************** -鍑芥暟鍚嶇О锛 funcSinkTest -鍑芥暟鎻忚堪锛 璐熻浇娴嬭瘯 -杈撳叆鍙傛暟锛 reqFrame: 璇锋眰鏁版嵁 reqLen: 璇锋眰闀垮害 resFrame:鍝嶅簲鏁版嵁 resLen:鍝嶅簲闀垮害 -杈撳嚭鍙傛暟锛 - -杩斿洖璇存槑锛 - -鍏跺畠璇存槑锛 - -*****************************************************************/ -eMBException funcSinkTest (rt_uint8_t *reqFrame, rt_uint16_t reqLen, - rt_uint8_t *resFrame, rt_uint16_t *resLen) -{ - /************ 灞閮ㄥ彉閲忓畾涔 ************/ - struct chrg_north_t *pNOR = &chrgnorth; - struct chrg_south_t *pSOU = &chrgsouth; - struct chrg_switch_t *pSW = RT_NULL; - - rt_uint8_t slaveAddr = 0; // 浠庢満鍦板潃 - rt_uint8_t test_mode = 0; // 娴嬭瘯妯″紡 0x01/0x02/0x03 - rt_uint16_t regAddress = 0; // 瀵勫瓨鍣ㄥ湴鍧 - rt_uint8_t *pData = RT_NULL; // 鏁版嵁鍖烘寚閽 - rt_uint8_t statusChByte = 0; // 鐘舵+閫氶亾瀛楄妭 - eIDX_SOU_CH ch = IDX_SOU_CH1; // 閫氶亾鏋氫妇 - rt_uint8_t chNum = 0; // 閫氶亾鍙 1~4 - rt_uint8_t devStatus = 0; // 璁惧鐘舵 0=鍚姩 1=鍋滄锛2=缁х画锛3=缁撴潫 - - // Modbus寮傚父 - eMBException eStatus = MB_EX_NONE; - eMBErrorCode eRegStatus; - -// /************ 闀垮害鏍￠獙 ************/ -// if (reqLen < 11) { -// rt_kprintf("Len error:%d <11\n", reqLen); -// return MB_EX_ILLEGAL_DATA_VALUE; -// } - - /************ 瑙ｆ瀽甯 ************/ - slaveAddr = reqFrame[0]; - test_mode = reqFrame[3]; // 娴嬭瘯鍛戒护锛0x01鐭矾 0x02OCP 0x03鍔ㄦ - pData = &reqFrame[4]; // 鏁版嵁璧峰 - statusChByte= pData[0]; // 鐘舵侀氶亾瀛楄妭 - - /************ 鍦板潃鏍￠獙 ************/ - if (test_mode < 0x01 || test_mode > 0x03) { - rt_kprintf("Test mode err:0x%02X\n", test_mode); - return MB_EX_ILLEGAL_DATA_ADDRESS; - } - - /************ 瑙ｆ瀽鐘舵 & 閫氶亾 ************/ - devStatus = statusChByte & 0x0F; // 浣4浣嶏細鐘舵 - chNum = (statusChByte >> 4) & 0x0F; // 楂4浣嶏細閫氶亾 - - /************ 閫氶亾鏍￠獙 ************/ - if (chNum <1 || chNum>4) { - rt_kprintf("Ch err:%d\n", chNum); - return MB_EX_ILLEGAL_DATA_ADDRESS; - } - ch = (eIDX_SOU_CH)(chNum -1); - - /************ 缁戝畾缁撴瀯浣 ************/ - pSW = &pNOR->sw[ch]; - pSW->sink.test.test_mode = test_mode; //娴嬭瘯妯″紡 - pSW->sink.test.run_flag = devStatus; //璁惧鐘舵 - pSW->change_flag = 0x01; - struct test *pTset = &pSW->sink.test; - #if SINK_TEST_DEBUG - rt_kprintf("test_mode=%d\n",test_mode); - rt_kprintf("test_flag=%d\n",pTset->test_mode); - #endif - /*********************************************************/ - switch(test_mode) - { - case 0x01: - // 鐭矾娴嬭瘯锛圤CPC锛 - sink_test_short_set(pSW, pData, devStatus); - break; - case 0x02: - // OCP 娴嬭瘯 - sink_test_ocp_set(pSW, pData, devStatus); - break; - case 0x03: - // 鍔ㄦ佹祴璇 - sink_test_dynamic_set(pSW, pData, devStatus); - break; - default: - return MB_EX_ILLEGAL_FUNCTION; - } - /************ 鍚姩 / 鍋滄鎺у埗 ************/ - if(devStatus == 0) //鍚姩 - { - pNOR->enable[ch] = 1; - pSW->id = ID_SINK; - pSW->sink.test.work_step = 0; - pSOU->online[ch] = 1; - } - else if(devStatus == 1) //鍋滄 - { - pSW->id = ID_SINK; - pSW->sink.test.stop_step = 0; - rt_kprintf("Sink Test Stop CH%d\n", chNum); - } - - /************ 鍝嶅簲甯 ************/ - rt_memcpy(resFrame, reqFrame, reqLen-2); - *resLen = reqLen -2; - - return eStatus; -} /***************************************************************** 鍑芥暟鍚嶇О锛 funcWriteMultipleHoldingRegister 鍑芥暟鎻忚堪锛 鍐欏涓繚鎸佸瘎瀛樺櫒(0x10) @@ -1470,13 +1177,15 @@ eMBException funcWriteMultipleHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t switch (sout_reg) { case REG_VOLTAGE_OUT + 1: - pSW->source.max_vol = sou_value; + pSW->source.set_volt = sou_value; pSW->sink.loadv = sou_value; chrg_set_sou_reg(ch, sout_reg, sou_value); +#if COMM_DEBUG rt_kprintf("voltage=%d", sou_value); +#endif break; case REG_CURRENT_OUT + 1: - pSW->source.protective_curr = sou_value; + pSW->source.set_curr = sou_value; pSW->sink.loadc = sou_value; chrg_set_sou_reg(ch, sout_reg, sou_value); break; @@ -1484,7 +1193,9 @@ eMBException funcWriteMultipleHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t rt_kprintf("THE SOUT_REG=%d", sout_reg); break; } +#if COMM_DEBUG rt_kprintf("ch=:%d,reg=%02x,value=%02x", ch, sout_reg, sou_value); +#endif } #else // 姝ｅ父浜у搧妯″紡锛氬垎鍖哄湴鍧閫昏緫 @@ -1515,7 +1226,10 @@ eMBException funcWriteMultipleHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t } else if (regAddress_H == HOLD_REG_SYS_BASE) { - chrg_mb_write_sys(ch, ch_reg_offset, sou_value, pSW, pNOR, pSOU); + eStatus = chrg_mb_write_sys(ch, ch_reg_offset, sou_value, pSW, pNOR, pSOU); + if (eStatus != MB_EX_NONE) { + return eStatus; + } } else { @@ -1554,13 +1268,10 @@ eMBException funcTrimELoad (rt_uint8_t *reqFrame, rt_uint16_t reqLen, rt_uint8_t *resFrame, rt_uint16_t *resLen) { struct chrg_north_t *pNOR = &chrgnorth; - struct chrg_south_t *pSOU = &chrgsouth; - struct chrg_switch_t *pSW = RT_NULL; - rt_uint16_t regAddress = 0, cntReg = 0; + rt_uint16_t regAddress = 0; rt_uint8_t RegCount; eMBException eStatus = MB_EX_NONE; - eMBErrorCode eRegStatus; if (4+MB_PDU_FUNC_WRITE_MUL_SIZE_MIN > reqLen) { rt_kprintf("LEN ERROR"); @@ -1571,8 +1282,11 @@ eMBException funcTrimELoad (rt_uint8_t *reqFrame, rt_uint16_t reqLen, rt_uint8_t enable_flag = (reqFrame[2]>>4)&0x0F; regAddress = reqFrame[3]; RegCount = u8v_to_u16(&reqFrame[4]); - rt_kprintf("ch=%d,enable=%d,reg=0x%02x,count=%d\n",ch+1,enable_flag,regAddress,RegCount); - if(ch<0||ch>3){ +#if COMM_TRIM_DEBUG + rt_kprintf("trim ch=%d enable=%d reg=0x%02x count=%d\n", + ch + 1, enable_flag, regAddress, RegCount); +#endif + if(ch >= TOTAL_SOU_CHS){ rt_kprintf("CH ERROR"); return MB_EX_ILLEGAL_DATA_VALUE; } @@ -1581,13 +1295,11 @@ eMBException funcTrimELoad (rt_uint8_t *reqFrame, rt_uint16_t reqLen, rt_kprintf("Enable Flag ERROR"); return MB_EX_ILLEGAL_DATA_VALUE; } - set_ymodem_update_channel(pNOR, pSOU, ch); //鍏虫帀闄ら夊畾閫氶亾澶栫殑鍏朵粬閫氶亾浣胯兘 //鎻愬彇棣栨寚閽 struct chrg_trim *pTrim = &pNOR->trim[ch]; rt_uint8_t *pWriteData = &reqFrame[7]; - pNOR->north_mode = 1; pTrim->trim_enable_flag = enable_flag; - pTrim->trim_step = 0; + pTrim->trim_mode = 0; //澶氬瘎瀛樺櫒鎺у埗鎿嶄綔 for(int i =0;itrim_mode == 0) { + return MB_EX_ILLEGAL_DATA_ADDRESS; + } + + /* + * COM鍙礋璐ｈВ鏋愭牎鍑嗘暟鎹傚畬鏁存牎鍑嗗簭鍒楃敱鍗楀悜妯″潡缁勮骞跺姞鍏UN_COM闃熷垪锛 + * 鐩爣閫氶亾鐢遍槦鍒楅」纭畾锛屽洜姝ゆ棤闇鍏抽棴浠讳綍鍗楀悜閫氶亾鐨勬甯歌疆璇娇鑳姐 + */ + if (chrg_sou_trim_submit(ch, pTrim) != 0) { + return MB_EX_SLAVE_BUSY; } rt_memcpy(resFrame, reqFrame, reqLen); *resLen = 6; - - //eRegStatus = mb_reg_holding_cb(&reqFrame[7], &resFrame[3], regAddress, cntReg, MB_REG_WRITE); - if (eRegStatus != MB_ENOERR) { - eStatus = mb_error(eRegStatus); - } return eStatus; } @@ -1657,54 +1378,135 @@ eMBException funcTrimELoad (rt_uint8_t *reqFrame, rt_uint16_t reqLen, Ymodem_state ystate = Ymodem_No; rt_uint8_t s_first_soh_rcvd = 0; + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_protocol_reset +鍑芥暟鎻忚堪锛 娓呯┖COM渚modem鎷煎抚銆侀噸鍙戝拰鎻℃墜鐘舵 +杈撳叆鍙傛暟锛 - +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 涓嶆敼鍙樺崡鍚戣疆璇㈡ā寮忓拰鐩爣閫氶亾 +*****************************************************************/ +static void chrg_ymodem_protocol_reset(void) +{ + rt_memset(mobude_ymodem_buf, 0, sizeof(mobude_ymodem_buf)); + rt_memset(mobude_ymodem_buf_2, 0, sizeof(mobude_ymodem_buf_2)); + g_ymodem_rx_len = 0; + g_ymodem_expected_len = 0; + g_ymodem_last_len = 0; + g_ymodem_waiting_ack = 0; + g_ymodem_retry_count = 0; + g_ymodem_eot_done = 0; + g_ymodem_send_tick = 0; + g_ymodem_c_tick = rt_tick_get(); + s_first_soh_rcvd = 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_session_start +鍑芥暟鎻忚堪锛 鍋滄鏅氬崡鍚戣姹傚苟杩涘叆鎸囧畾閫氶亾鐨勫崌绾ч忎紶妯″紡 +杈撳叆鍙傛暟锛 ch:闇瑕佸崌绾х殑鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎴愬姛 <0:绾跨▼浜掓枼閿佹湭灏辩华鎴栧姞閿佸け璐 +鍏跺畠璇存槑锛 涓嶄慨鏀筩hrgnorth.enable鍜宑hrgsouth.enable锛屽崌绾х粨鏉熷悗鎭㈠鑷姩杞 +*****************************************************************/ +static int chrg_ymodem_session_start(eIDX_SOU_CH ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + struct chrg_rollsou_t *pROLL = &chrgrollsou; + struct chrg_south_t *pSOU = &chrgsouth; + + if ((ch >= TOTAL_SOU_CHS) || (pTHR->mutex == RT_NULL)) { + return -1; + } + if (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(100)) != RT_EOK) { + return -2; + } + /* 鍏堥樆姝㈠崡鍚戠嚎绋嬬户缁彂鏅歁odbus璇锋眰锛岀瓑寰呭凡鍙戣姹傞鍑洪偖绠辩瓑寰呫 */ + pROLL->run = RUN_UPDATA; + pROLL->ch = (rt_uint8_t)ch; + pROLL->send_flag = 0; + pROLL->leng = 0; + pROLL->updata_result = 0; + rt_mutex_release(pTHR->mutex); + rt_thread_mdelay(25); + + chrg_eload_clear_ymodem_resp(); + if (pSOU->rb != RT_NULL) { + rt_ringbuffer_reset(pSOU->rb); + } + chrg_ymodem_protocol_reset(); + + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + pROLL->mode = 1; + pROLL->run = RUN_UPDATA; + pROLL->ch = (rt_uint8_t)ch; + rt_mutex_release(pTHR->mutex); + ystate = Ymodem_Wait; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_session_stop +鍑芥暟鎻忚堪锛 閫鍑哄崡鍚戝崌绾ч忎紶妯″紡骞舵仮澶嶆櫘閫氳嚜鍔ㄨ疆璇 +杈撳叆鍙傛暟锛 - +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 娓呴櫎娈嬬暀鍗囩骇搴旂瓟锛岄伩鍏嶅叾琚櫘閫歁odbus瑙ｆ瀽鍣ㄨ璇嗗埆 +*****************************************************************/ +static void chrg_ymodem_session_stop(void) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + struct chrg_rollsou_t *pROLL = &chrgrollsou; + struct chrg_south_t *pSOU = &chrgsouth; + + if (pTHR->mutex != RT_NULL) { + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + pROLL->mode = 0; + pROLL->send_flag = 0; + pROLL->leng = 0; + pROLL->updata_result = 0; + pROLL->run = RUN_AUTO; + rt_mutex_release(pTHR->mutex); + } + chrg_eload_clear_ymodem_resp(); + if (pSOU->rb != RT_NULL) { + rt_ringbuffer_reset(pSOU->rb); + } + chrg_ymodem_protocol_reset(); + ystate = Ymodem_No; +} + eMBException funYmodemUpadata (rt_uint8_t *reqFrame, rt_uint16_t reqLen, rt_uint8_t *resFrame, rt_uint16_t *resLen) { - rt_uint8_t test_mode = 0; // 娴嬭瘯妯″紡 0x01/0x02/0x03 - eIDX_SOU_CH ch = IDX_SOU_CH1; // 閫氶亾鏋氫妇 - rt_uint8_t chNum = 0; // 閫氶亾鍙 1~4 - chNum = reqFrame[4]; - ch = (eIDX_SOU_CH)(chNum); - struct chrg_north_t *pNOR = &chrgnorth; - struct chrg_south_t *pSOU = &chrgsouth; - struct chrg_rollsou_t *pROLL = &chrgrollsou; - // Modbus寮傚父 - eMBException eStatus = MB_EX_NONE; - eMBErrorCode eRegStatus; - if(chNum<0||chNum>3){ - return 0; + rt_uint8_t ch_num; + eIDX_SOU_CH ch; + + if ((reqFrame == RT_NULL) || (resFrame == RT_NULL) || (resLen == RT_NULL) || + (reqLen != 8)) { + return MB_EX_ILLEGAL_DATA_VALUE; } - rt_kprintf("ch = %d",ch); - //瑙ｆ瀽涓婁綅鏈虹殑甯уご鍒ゆ柇鐘舵 - if(reqLen==8){ - if(reqFrame[5] == 0xff){ - pROLL->mode = 1; - set_ymodem_update_channel(pNOR, pSOU, ch); - ystate = Ymodem_Wait; - pROLL->ch = ch; - s_first_soh_rcvd = 0; - chrg_eload_clear_ymodem_resp(); /* 杩涘叆鍗囩骇鏃舵竻闄ゆ畫鐣欏簲绛 */ - } - if(reqFrame[5] == 0x00){ - pROLL->mode = 0; - ystate = Ymodem_No; - set_ymodem_update_channel(pNOR, pSOU, ch); - s_first_soh_rcvd = 0; - chrg_eload_clear_ymodem_resp(); /* 閫鍑哄崌绾ф椂娓呴櫎娈嬬暀搴旂瓟 */ - } + ch_num = reqFrame[4]; + if (ch_num >= TOTAL_SOU_CHS) { + return MB_EX_ILLEGAL_DATA_ADDRESS; + } + ch = (eIDX_SOU_CH)ch_num; + + if (reqFrame[5] == 0xFF) { + if (chrg_ymodem_session_start(ch) != 0) { + return MB_EX_SLAVE_BUSY; } + } else if (reqFrame[5] == 0x00) { + chrg_ymodem_session_stop(); + } else { + return MB_EX_ILLEGAL_DATA_VALUE; + } - #if SINK_TEST_DEBUG - rt_kprintf("test_mode=%d\n",test_mode); - //rt_kprintf("test_flag=%d\n",pTset->test_mode); - #endif - - eRegStatus = mb_ymodem_updata_cb(&ystate,resFrame); - /************ 鍝嶅簲甯 ************/ - // rt_memcpy(resFrame, reqFrame, reqLen-2); - *resLen = 1;//reqLen -2; - - return eStatus; + /* 淇濈暀鍘0x20鍝嶅簲鍐呭锛屽灞傜粺涓琛ヨ澶囧湴鍧鍜孧odbus CRC銆 */ + (void)mb_ymodem_updata_cb(&ystate, resFrame); + *resLen = 1; + return MB_EX_NONE; } static struct code_func_t funcHandlers[MB_HANDLERS_MAX] = { @@ -1783,12 +1585,288 @@ static int chrg_comm_parse_msg (struct chrg_comm_t *pCOMM) u16_to_u8v_com(crc, &pCOMM->tx_buf[pCOMM->tx_len]); pCOMM->tx_len += 2; +#if COMM_FRAME_DEBUG + LOG_HEX("sendC", 32, pCOMM->tx_buf, pCOMM->tx_len); +#endif ret = chrg_tty_send(pCOMM->tty, pCOMM->tx_buf, pCOMM->tx_len); } return ret; } +/* + * 鏃х増Ymodem澶勭悊浠ｇ爜淇濈暀鍦ㄤ笅鏂规敞閲婁腑浣滀负鍘嗗彶鍙傝冦傚綋鍓嶅疄鐜颁娇鐢ㄥ畬鏁存嫾甯с + * CRC鏍￠獙鍜屽仠姝㈢瓑寰呴噸鍙戞満鍒讹紝涓嶅啀渚濊禆涓娆′覆鍙ｆ帴鏀跺垰濂藉緱鍒颁竴鏁村抚銆 + */ + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_frame_size +鍑芥暟鎻忚堪锛 鏍规嵁Ymodem鎺у埗瀛楃鍙栧緱涓甯у簲鎺ユ敹鐨勬婚暱搴 +杈撳叆鍙傛暟锛 header:Ymodem甯уご鎴栨帶鍒跺瓧绗 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 133:SOH甯 1029:STX甯 1:EOT/CAN 0:鏃犳晥瀛楃 +鍏跺畠璇存槑锛 - +*****************************************************************/ +static rt_uint16_t chrg_ymodem_frame_size(rt_uint8_t header) +{ + if (header == SOH) { + return YMODEM_SOH_SIZE; + } + if (header == STX) { + return YMODEM_STX_SIZE; + } + if ((header == EOT) || (header == YM_CAN)) { + return 1; + } + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_crc16 +鍑芥暟鎻忚堪锛 璁＄畻Ymodem鏁版嵁鍖轰娇鐢ㄧ殑CRC16-XMODEM鏍￠獙鍊 +杈撳叆鍙傛暟锛 data:鏁版嵁鍖哄湴鍧 length:鏁版嵁鍖洪暱搴 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 CRC16-XMODEM鏍￠獙鍊 +鍏跺畠璇存槑锛 鍒濆0锛屽椤瑰紡0x1021锛岀粨鏋滄寜楂樺瓧鑺傚湪鍓嶅啓鍏modem甯 +*****************************************************************/ +static rt_uint16_t chrg_ymodem_crc16(const rt_uint8_t *data, rt_uint16_t length) +{ + rt_uint16_t crc = 0; + rt_uint16_t i; + rt_uint8_t bit; + + for (i = 0; i < length; i++) { + crc ^= (rt_uint16_t)data[i] << 8; + for (bit = 0; bit < 8; bit++) { + crc = (crc & 0x8000) ? (rt_uint16_t)((crc << 1) ^ 0x1021) : + (rt_uint16_t)(crc << 1); + } + } + return crc; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_frame_valid +鍑芥暟鎻忚堪锛 鏍￠獙Ymodem鏁版嵁甯ч暱搴︺佸寘鍙峰弽鐮佸拰鏁版嵁鍖篊RC +杈撳叆鍙傛暟锛 frame:瀹屾暣Ymodem甯 length:甯ф婚暱搴 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:鏈夋晥 RT_FALSE:鏃犳晥 +鍏跺畠璇存槑锛 EOT鍜孋AN涓哄崟瀛楄妭鎺у埗甯э紝涓嶅寘鍚寘鍙蜂笌CRC +*****************************************************************/ +static rt_bool_t chrg_ymodem_frame_valid(const rt_uint8_t *frame, rt_uint16_t length) +{ + rt_uint16_t data_len; + rt_uint16_t frame_crc; + + if ((frame == RT_NULL) || (length != chrg_ymodem_frame_size(frame[0]))) { + return RT_FALSE; + } + if ((frame[0] == EOT) || (frame[0] == YM_CAN)) { + return RT_TRUE; + } + if ((rt_uint8_t)(frame[1] + frame[2]) != 0xFF) { + return RT_FALSE; + } + data_len = (frame[0] == SOH) ? 128 : 1024; + frame_crc = ((rt_uint16_t)frame[length - 2] << 8) | frame[length - 1]; + return chrg_ymodem_crc16(&frame[YMODEM_DATA_OFFSET], data_len) == frame_crc; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_resend_last +鍑芥暟鎻忚堪锛 灏嗘渶杩戜竴娆″畬鏁碮modem甯ч噸鏂版彁浜ょ粰鍗楀悜鍙戦佺嚎绋 +杈撳叆鍙傛暟锛 - +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 -1:鏃犲彲閲嶅彂甯 鍏跺畠:鍗楀悜鎻愪氦閿欒 +鍏跺畠璇存槑锛 浠呭湪NAK鎴栫瓑寰呭簲绛旇秴鏃舵椂璋冪敤锛屽缁堜娇鐢ㄥ師甯у疄闄呴暱搴 +*****************************************************************/ +static int chrg_ymodem_resend_last(void) +{ + int ret; + + if (g_ymodem_last_len == 0) { + return -1; + } + ret = chrg_send_sou_upadata_data(mobude_ymodem_buf_2, g_ymodem_last_len); + if (ret == 0) { + g_ymodem_retry_count++; + g_ymodem_send_tick = rt_tick_get(); + g_ymodem_waiting_ack = 1; + } + return ret; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_ymodem_process +鍑芥暟鎻忚堪锛 绱COM涓插彛鍒嗘鏁版嵁锛屽舰鎴愬畬鏁碮modem甯у悗鎻愪氦鍒板崡鍚戠嚎绋 +杈撳叆鍙傛暟锛 data:鏈涓插彛鏁版嵁 length:鏈鏁版嵁闀垮害 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:澶勭悊瀹屾垚 -2:浠嶅湪绛夊緟涓婁竴甯у簲绛 -3:甯ф牎楠屽け璐 -4:鎻愪氦澶辫触 +鍏跺畠璇存槑锛 涓甯у彲鐢卞娆′覆鍙ｆ帴鏀剁粍鎴愶紝鍙湁瀹屾暣涓旀牎楠岄氳繃鍚庢墠浼氬彂閫佸埌鍔熺巼鏉 +*****************************************************************/ +static int chrg_ymodem_process(const rt_uint8_t *data, rt_uint16_t length) +{ + rt_uint16_t offset = 0; + rt_uint16_t copy_len; + int ret; + + if ((data == RT_NULL) || (length == 0)) { + return 0; + } + while (offset < length) { + if (g_ymodem_waiting_ack != 0) { + return -2; + } + if (g_ymodem_expected_len == 0) { + g_ymodem_expected_len = chrg_ymodem_frame_size(data[offset]); + if (g_ymodem_expected_len == 0) { + offset++; + continue; + } + g_ymodem_rx_len = 0; + } + + copy_len = g_ymodem_expected_len - g_ymodem_rx_len; + if (copy_len > (length - offset)) { + copy_len = length - offset; + } + rt_memcpy(&mobude_ymodem_buf[g_ymodem_rx_len], &data[offset], copy_len); + g_ymodem_rx_len += copy_len; + offset += copy_len; + if (g_ymodem_rx_len < g_ymodem_expected_len) { + continue; + } + + if (!chrg_ymodem_frame_valid(mobude_ymodem_buf, g_ymodem_rx_len)) { + g_ymodem_rx_len = 0; + g_ymodem_expected_len = 0; + return -3; + } + + g_ymodem_last_len = g_ymodem_rx_len; + rt_memcpy(mobude_ymodem_buf_2, mobude_ymodem_buf, g_ymodem_last_len); + if (mobude_ymodem_buf[0] == SOH) { + if (g_ymodem_eot_done != 0) { + /* 绗簩娆OT涔嬪悗鐨0鍙风┖SOH鏄痀modem鏀跺熬甯э紝鍙洖澶岮CK銆 */ + ystate = Ymodem_Rec_Finish; + } else if ((mobude_ymodem_buf[1] == 0) && (s_first_soh_rcvd == 0)) { + /* 鍙湁浼犺緭寮濮嬫椂鐨0鍙稴OH鏄枃浠跺悕/澶у皬甯э紝闇瑕佸洖澶岮CK+C銆 */ + ystate = Ymodem_Rec_Start; + s_first_soh_rcvd = 1; + } else { + /* 鍖呭彿闈0鐨凷OH鏄櫘閫128瀛楄妭鍥轰欢鏁版嵁甯э紝鍙洖澶岮CK銆 */ + ystate = Ymodem_Rec_1024; + } + } else if (mobude_ymodem_buf[0] == STX) { + ystate = Ymodem_Rec_1024; + } else if (mobude_ymodem_buf[0] == EOT) { + ystate = Ymodem_Rec_End; + } else { + ystate = Ymodem_Rec_Finish; + } + + ret = chrg_send_sou_upadata_data(mobude_ymodem_buf_2, g_ymodem_last_len); + g_ymodem_rx_len = 0; + g_ymodem_expected_len = 0; + if (ret != 0) { + return -4; + } + g_ymodem_retry_count = 0; + g_ymodem_waiting_ack = 1; + g_ymodem_send_tick = rt_tick_get(); + } + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 ymodem_send +鍑芥暟鎻忚堪锛 澶勭悊鍗楀悜Ymodem搴旂瓟銆佺敓鎴愪笂浣嶆満搴旂瓟骞舵墽琛岃秴鏃堕噸鍙 +杈撳叆鍙傛暟锛 pCOMM:COM閫氫俊瀵硅薄 +杈撳嚭鍙傛暟锛 pCOMM->tx_buf鍜宲COMM->tx_len +杩斿洖璇存槑锛 1:闇瑕佸悜涓婁綅鏈哄彂閫佹暟鎹 0:鏈疆鏃犳暟鎹彂閫 +鍏跺畠璇存槑锛 棣栧寘鍓嶆瘡绉掑彂閫佷竴娆锛汼OH棣栧寘鍜岀浜屾EOT鍚庢寜Ymodem瑙勫垯鍙戦丄CK+C +*****************************************************************/ +static rt_uint8_t ymodem_send(struct chrg_comm_t *pCOMM) +{ + rt_uint8_t south_resp; + rt_uint32_t timeout_ms; + rt_tick_t now; + + pCOMM->tx_len = 0; + now = rt_tick_get(); + if ((s_first_soh_rcvd == 0) && (g_ymodem_waiting_ack == 0) && + ((now - g_ymodem_c_tick) >= rt_tick_from_millisecond(YMODEM_C_PERIOD_MS))) { + pCOMM->tx_buf[0] = ACK_C; + pCOMM->tx_len = 1; + g_ymodem_c_tick = now; + return 1; + } + + south_resp = chrg_eload_get_ymodem_resp(); + if (south_resp == ACK) { + g_ymodem_waiting_ack = 0; + g_ymodem_retry_count = 0; + if (ystate == Ymodem_Rec_Start) { + pCOMM->tx_buf[0] = ACK; + pCOMM->tx_buf[1] = ACK_C; + pCOMM->tx_len = 2; + } else if (ystate == Ymodem_Rec_End) { + pCOMM->tx_buf[0] = ACK; + pCOMM->tx_buf[1] = ACK_C; + pCOMM->tx_len = 2; + g_ymodem_eot_done = 1; + ystate = Ymodem_Rec_Finish; + } else { + pCOMM->tx_buf[0] = ACK; + pCOMM->tx_len = 1; + } + return 1; + } + if (south_resp == NAK) { + if (g_ymodem_retry_count >= YMODEM_MAX_RETRIES) { + pCOMM->tx_buf[0] = YM_CAN; + pCOMM->tx_buf[1] = YM_CAN; + pCOMM->tx_len = 2; + chrg_ymodem_session_stop(); + return 1; + } + (void)chrg_ymodem_resend_last(); + return 0; + } + if (south_resp == ACK_C) { + /* 绛夊緟褰撳墠甯CK鏃跺拷鐣ュ姛鐜囨澘鍛ㄦ湡C锛岄伩鍏嶆墦涔变笂浣嶆満鍋滄绛夊緟鎻℃墜銆 */ + if (g_ymodem_waiting_ack != 0) { + return 0; + } + pCOMM->tx_buf[0] = ACK_C; + pCOMM->tx_len = 1; + return 1; + } + if (south_resp == YM_CAN) { + pCOMM->tx_buf[0] = YM_CAN; + pCOMM->tx_buf[1] = YM_CAN; + pCOMM->tx_len = 2; + chrg_ymodem_session_stop(); + return 1; + } + + if (g_ymodem_waiting_ack != 0) { + timeout_ms = (ystate == Ymodem_Rec_Start) ? + YMODEM_META_ACK_TIMEOUT_MS : YMODEM_DATA_ACK_TIMEOUT_MS; + if ((now - g_ymodem_send_tick) >= rt_tick_from_millisecond(timeout_ms)) { + if (g_ymodem_retry_count >= YMODEM_MAX_RETRIES) { + pCOMM->tx_buf[0] = YM_CAN; + pCOMM->tx_buf[1] = YM_CAN; + pCOMM->tx_len = 2; + chrg_ymodem_session_stop(); + return 1; + } + (void)chrg_ymodem_resend_last(); + } + } + return 0; +} + ///***************************************************************** //鍑芥暟鍚嶇О锛 ymodem_send //鍑芥暟鎻忚堪锛 姣忛殧涓绉掑彂涓娆0x43鍛婅瘔涓婁綅鏈哄噯澶囨暟鎹 @@ -1926,10 +2004,36 @@ static int chrg_comm_parse_msg (struct chrg_comm_t *pCOMM) *****************************************************************/ static int chrg_comm_updata_north (struct chrg_comm_t *pCOMM) { -// if (RT_NULL == pCOMM) { -// return -1; -// } int ret = 0; + int process_ret; + rt_uint8_t need_tx; + + if (pCOMM == RT_NULL) { + return -1; + } + + /* 鍗囩骇妯″紡涓粛鍏佽鎺ユ敹0x20鍋滄鍛戒护锛屽繀椤诲厛鏍￠獙鍦板潃鍜孧odbus CRC銆 */ + if ((pCOMM->rx_len == 8) && (pCOMM->rx_buf[1] == MB_YMODEM_UPDATAE) && + ((pCOMM->rx_buf[0] == pCOMM->addr) || + (pCOMM->rx_buf[0] == MB_ADDRESS_BROADCAST)) && + (mb_crc16(pCOMM->rx_buf, pCOMM->rx_len) == 0)) { + return chrg_comm_parse_msg(pCOMM); + } + + if (pCOMM->rx_len > 0) { + process_ret = chrg_ymodem_process(pCOMM->rx_buf, pCOMM->rx_len); + if ((process_ret == -3) || (process_ret == -4)) { + /* 鏈湴鏍￠獙鎴栧崡鍚戞彁浜ゅけ璐ユ椂瑕佹眰涓婁綅鏈洪噸鍙戝綋鍓嶅抚銆 */ + pCOMM->tx_buf[0] = NAK; + pCOMM->tx_len = 1; + return chrg_tty_send(pCOMM->tty, pCOMM->tx_buf, pCOMM->tx_len); + } + } + + need_tx = ymodem_send(pCOMM); + if ((need_tx != 0) && (pCOMM->tx_len > 0)) { + ret = chrg_tty_send(pCOMM->tty, pCOMM->tx_buf, pCOMM->tx_len); + } // uint8_t need_tx = 0; // pCOMM->tx_len = 0; //杩涙潵鍏堟竻绌哄彂閫佺紦鍐插尯 // eMBException eStatus = MB_EX_NONE; @@ -1997,9 +2101,12 @@ void chrg_comm_thread_entry (void *data) len = chrg_tty_recv(pTTY, pCOMM->rx_buf, sizeof(pCOMM->rx_buf)); // LOG_HEX("Num=", len, pCOMM->rx_buf, len); if(pROLL->mode==0x01){ //鍗囩骇妯″紡璧板崟鐙崗璁 - pCOMM->rx_len = len; + pCOMM->rx_len = (len > 0) ? (rt_uint16_t)len : 0; pCOMM->tx_len = 0; chrg_comm_updata_north(pCOMM); + if (len <= 0) { + rt_thread_mdelay(1); + } }else{ if (len <= 0) { rt_thread_mdelay(1); @@ -2008,6 +2115,9 @@ void chrg_comm_thread_entry (void *data) pCOMM->rx_len = len; pCOMM->tx_len = 0; +#if COMM_FRAME_DEBUG + LOG_HEX("recvC", 32, pCOMM->rx_buf, pCOMM->rx_len); +#endif chrg_comm_parse_msg(pCOMM); } } @@ -2166,7 +2276,6 @@ static void chrg_mb_write_src(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t { case SRC_REG_PROTOCOL: // 0x00: 鍗忚 pSW->source.protocol = src_proto_lookup(sou_value); - pSW->source.Set_Pro_Flag = 1; pSW->protoCmd = (rt_uint8_t)sou_value; // rt_kprintf("[SRC CH%d] Protocol=0x%02X -> 0x%02X\n", ch + 1, sou_value, pSW->source.protocol); break; @@ -2180,22 +2289,21 @@ static void chrg_mb_write_src(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t // rt_kprintf("[SRC CH%d] Mode=%d\n", ch + 1, sou_value); break; case SRC_REG_MIN_VOLT: // 0x03: 鏈灏忕數鍘 (mV) - pSW->source.min_vol = sou_value; + pSW->source.pd_set.mm.min_vol = sou_value; //rt_kprintf("[SRC CH%d] MinVolt=%d mV\n", ch + 1, sou_value); break; case SRC_REG_MAX_VOLT: // 0x04: 鏈澶х數鍘 (mV) - pSW->source.max_vol = sou_value; + pSW->source.pd_set.mm.max_vol = sou_value; // rt_kprintf("[SRC CH%d] MaxVolt=%d mV\n", ch + 1, sou_value); break; case SRC_REG_MAX_CURR: // 0x05: 鏈澶х數娴 (mA) - pSW->source.protective_curr = sou_value; - pSW->source.vc.set_current = sou_value; + pSW->source.pd_set.mm.max_cur = sou_value; //rt_kprintf("[SRC CH%d] MaxCurr=%d mA\n", ch + 1, sou_value); break; case SRC_REG_CC_SEL: // 0x06: CC閫夋嫨 - pSW->source.cc_set = (rt_uint8_t)sou_value; + pSW->source.CC_Set = (rt_uint8_t)sou_value; //rt_kprintf("[SRC CH%d] CC_SEL=%d\n", ch + 1, sou_value); break; @@ -2210,148 +2318,499 @@ static void chrg_mb_write_src(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t //rt_kprintf("ret_offset = %d, value = %d",reg_offset,sou_value); } -static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, - struct chrg_switch_t *pSW, struct chrg_north_t *pNOR, struct chrg_south_t *pSOU) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_comm_get_param_diff +鍑芥暟鎻忚堪锛 鎸夊綋鍓嶈鑹茬粺涓姣旇緝杩愯鍙傛暟涓庡緟鐢熸晥褰卞瓙鍙傛暟 +杈撳叆鍙傛暟锛 role:褰撳墠瑙掕壊 pReal:姝ｅ湪杩愯鐨勫弬鏁 pShadow:寰呯敓鏁堝弬鏁 +杈撳嚭鍙傛暟锛 pDiff:鍚勫叕鍏卞睘鎬у強Sink涓撶敤鍗忚灞炴х殑鍙樺寲鏍囧織 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鏈嚱鏁板彧璁＄畻宸紓锛屼笉淇敼鐘舵併佷笉鍙戦佸懡浠わ紱Source鐩存帴姣旇緝 + 瀹屾暣pd_set锛屽苟浠巔d_set.mm鎻愬彇鏍囧噯鍗忚鐢靛帇鐢垫祦宸紓 +*****************************************************************/ +static void chrg_comm_get_param_diff(eIDX_ID role, + const struct chrg_switch_t *pReal, + const struct chrg_switch_t *pShadow, + chrg_param_diff_t *pDiff) { - struct chrg_comm_t *pCOMM = &chrgcomm; - switch (reg_offset) - { - case SYS_REG_ROLE_SWITCH: // 0x00: 婧/杞界姸鎬佸垏鎹 - if (sou_value == 0x01) - { - pSW->id = ID_SINK; - } - else if (sou_value == 0x02) - { - pSW->id = ID_SOURCE; - pSW->source.Set_Pro_Flag = 1; - } - break; + if ((pReal == RT_NULL) || (pShadow == RT_NULL) || (pDiff == RT_NULL)) { + return; + } + rt_memset(pDiff, 0, sizeof(*pDiff)); + pDiff->cv_changed = (pReal->CV_mode != pShadow->CV_mode); - case SYS_REG_PARAM_EFFECT: // 0x01: 鍙傛暟鐢熸晥鏍囧織 - if (sou_value == 0x01) - { - g_shadow_dirty[ch] = 0; // 鏍囪宸茬敓鏁 + if (role == ID_SOURCE) { + pDiff->protocol_changed = + (pReal->source.protocol != pShadow->source.protocol); + pDiff->cc_changed = + (pReal->source.CC_Set != pShadow->source.CC_Set); + /* 涓や釜鏁扮粍鍧囨潵鑷潤鎬侀浂鍒濆鍖栫粨鏋勶紝濉厖鍓嶆湭瀹氫箟瀛楄妭淇濇寔涓0銆 */ + pDiff->pd_changed = (rt_memcmp(&pReal->source.pd_set, + &pShadow->source.pd_set, sizeof(pReal->source.pd_set)) != 0); + pDiff->voltage_changed = + (pReal->source.pd_set.mm.max_vol != + pShadow->source.pd_set.mm.max_vol); + pDiff->current_changed = + (pReal->source.pd_set.mm.max_cur != + pShadow->source.pd_set.mm.max_cur); + } else if (role == ID_SINK) { + pDiff->protocol_changed = + (pReal->sink.protocol != pShadow->sink.protocol); + pDiff->cc_changed = + (pReal->sink.cc_set != pShadow->sink.cc_set); + pDiff->voltage_changed = + (pReal->sink.loadv != pShadow->sink.loadv); + pDiff->current_changed = + (pReal->sink.loadc != pShadow->sink.loadc); + pDiff->group_changed = + (pReal->sink.Pro_Group != pShadow->sink.Pro_Group); + pDiff->pro_voltage_changed = + (pReal->sink.pro_loadv != pShadow->sink.pro_loadv); + pDiff->pro_current_changed = + (pReal->sink.pro_loadc != pShadow->sink.pro_loadc); + } +} - struct chrg_switch_t *pReal = &pNOR->sw[ch]; - rt_uint8_t pro_change = 0; - sink_proto_diff_t diff_info; - chrg_sink_get_proto_diff(pReal, pSW, &diff_info, &pro_change); - eIDX_ID old_id = pReal->id; - eIDX_ID new_id = pReal->id; - rt_uint16_t sink_work = pSW->sink.Now_State; - rt_uint16_t source_work = pSW->source.Now_State; - //rt_uint8_t old_sink_test = pReal->sink.test.test_mode; - struct chrg_thread_t *pTHR_NOR = &chrgthr[IDX_THR_ROLL_NOR]; - rt_mutex_take(pTHR_NOR->mutex, RT_WAITING_FOREVER); - rt_memcpy(pReal, &g_shadow_sw[ch], sizeof(struct chrg_switch_t)); - if (new_id == ID_SINK) - { - if (sink_work == 0x01) // 璐熻浇鍚姩 - { - rt_uint8_t curr_test = pReal->sink.test.test_mode; - rt_uint8_t curr_test_old = pReal->sink.test.test_mode_old; - // 娴嬭瘯妯″紡鐘舵佸彂鐢熷垏鎹細0<->闈0 - if ((curr_test_old == 0 && curr_test != 0) || (curr_test == 0 && curr_test_old != 0)) - { - if (curr_test_old == 0) - { - // 浠庢甯告ā寮忚繘鍏ユ祴璇曟ā寮 - pReal->sink.work_mode = (curr_test == 3) ? SINK_WORK_ON_TEST_CHANGE : SINK_WORK_ON_TEST_SHOUT; - pReal->sink.test.test_mode_old = curr_test; - } - else - { - // 浠庢祴璇曟ā寮忓垏鍥炴甯告ā寮 - pReal->sub = IDX_SET_SINK_CCLINE; - pReal->sink.work_mode = SINK_WORK_INIT; - } - } - else - { - // 娴嬭瘯妯″紡鏃犲彉鍖栵紝澶勭悊璐熻浇鍒濆鍖/鍙傛暟鏇存柊 - if (pReal->sink.On_work == 0) - { - // 璐熻浇棣栨鍚姩纭欢鍒濆鍖 - pReal->sink.On_work = 1; - pReal->sub = IDX_SET_SINK_CCLINE; - pReal->sink.work_mode = SINK_WORK_INIT; - } - else - { - if (pro_change) - { - // 鍗忚鍙傛暟鍙樻洿锛岄噸鏂板垵濮嬪寲閾捐矾 - pReal->sub = IDX_SET_SINK_CCLINE; - pReal->sink.work_mode = SINK_WORK_WAIT; - } - else - { - // 浠呬笅鍙戝樊寮傚瘎瀛樺櫒 - chrg_sink_diff_send_reg((eIDX_SOU_CH)ch, &diff_info, pReal); - } - } - } +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_comm_apply_sink_effect +鍑芥暟鎻忚堪锛 澶勭悊COM鍙傛暟鐢熸晥鍚庣殑鍚岃鑹茶礋杞藉惎鍋溿佹祴璇曞拰宸紓鏇存柊 +杈撳叆鍙傛暟锛 ch:閫氶亾 pReal:杩愯鍙傛暟 pShadow:寰呯敓鏁堝奖瀛愬弬鏁 +杈撳嚭鍙傛暟锛 鏇存柊pReal骞舵寜闇鎻愪氦鍗楀悜鍛戒护 +杩斿洖璇存槑锛 MB_EX_NONE:鎴愬姛 MB_EX_SLAVE_BUSY:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 瑙掕壊鍒囨崲涓嶅湪鏈嚱鏁板鐞嗭紝鐢眂hrg_mb_write_sys缁熶竴璋冨害 +*****************************************************************/ +static eMBException chrg_comm_apply_sink_effect(rt_uint8_t ch, + struct chrg_switch_t *pReal, const struct chrg_switch_t *pShadow) +{ + rt_bool_t full_handshake_change; + rt_bool_t protocol_voltage_only; + rt_bool_t protocol_current_change; + rt_bool_t protocol_data_changed; + rt_uint8_t curr_test; + rt_uint8_t curr_test_old; + rt_uint8_t old_cv_mode = pReal->CV_mode; + rt_uint16_t old_loadv = pReal->sink.loadv; + rt_uint16_t old_loadc = pReal->sink.loadc; + rt_uint8_t old_on_work = pReal->sink.On_work; + rt_uint8_t old_work_mode = pReal->sink.work_mode; + rt_uint16_t sink_work = pShadow->sink.Now_State; + chrg_param_diff_t diff_info; + + chrg_comm_get_param_diff(ID_SINK, pReal, pShadow, &diff_info); + /* + * 鍗忚绫诲瀷銆丆C鍜屽崗璁粍鍙峰彉鍖栭渶瑕佸畬鏁存彙鎵嬶紱鍗忚鐢靛帇鍜屽崗璁數娴 + * 鍙樺寲鍙渶瑕佽蒋鍗歌浇鍚庨噸鍙戝崗璁紝涓嶅叧闂崡鍚戠户鐢靛櫒銆 + */ + full_handshake_change = diff_info.protocol_changed || diff_info.cc_changed || + diff_info.group_changed; + protocol_data_changed = diff_info.protocol_changed || + diff_info.group_changed || diff_info.pro_voltage_changed || + diff_info.pro_current_changed; + protocol_current_change = diff_info.pro_current_changed && + !full_handshake_change; + protocol_voltage_only = diff_info.pro_voltage_changed && + !full_handshake_change && !protocol_current_change; + rt_memcpy(pReal, pShadow, sizeof(struct chrg_switch_t)); + + if (sink_work == 0x01) { + curr_test = pReal->sink.test.test_mode; + curr_test_old = pReal->sink.test.test_mode_old; + if (((curr_test_old == 0) && (curr_test != 0)) || + ((curr_test == 0) && (curr_test_old != 0))) { + if (curr_test_old == 0) { + if (curr_test == SINK_TEST_DYNA) { + pReal->sink.work_mode = SINK_WORK_ON_TEST_DYNA; + } else if (curr_test == SINK_TEST_OCP) { + pReal->sink.work_mode = SINK_WORK_ON_TEST_OCP; + } else { + pReal->sink.work_mode = SINK_WORK_ON_TEST_SHORT; } - else // sink_work == 0x00 璐熻浇鍋滄 - { - pReal->sink.On_work = 0; - pReal->sink.work_mode = SINK_WORK_STOP; - } - chrg_sink_work(ch, pReal); + pReal->sink.test.test_mode_old = curr_test; + } else { + /* Protocol-before-CC test flow is disabled in this version. */ + pReal->sub = IDX_SET_SINK_CC_BEFORE_PD; + pReal->sink.work_mode = SINK_WORK_INIT; } - else if (new_id == ID_SOURCE && source_work == 0x01) - { - chrg_com_source_on(ch, pReal->protoCmd, pReal, &pNOR->enable[ch]); - } - else if (new_id == ID_SOURCE && source_work == 0x00) - { - chrg_sou_stop(ch, pReal, pNOR); - } - rt_mutex_release(pTHR_NOR->mutex); - } - break; - default: - rt_kprintf("[SYS CH%d] Unknown reg offset=0x%02X\n", ch + 1, reg_offset); - break; - } + } else if (pReal->sink.On_work == 0) { + pReal->sink.On_work = 1; + /* Protocol-before-CC test flow is disabled in this version. */ + pReal->sub = IDX_SET_SINK_CC_BEFORE_PD; + pReal->sink.work_mode = SINK_WORK_INIT; + } else if (full_handshake_change) { + /* + * 鍙湁CC瀹為檯鍙樺寲鏃舵墠鍙戦佺洰鏍嘋C鍛戒护骞剁瓑寰咃紱鍗忚绫诲瀷鎴栫粍鍙 + * 鍗曠嫭鍙樺寲鏃剁洿鎺ラ噸鍙慞D甯э紝涓嶉噸澶嶈缃湭鍙樺寲鐨凜C銆 + * 鍗忚涓嶤C鍚屾椂鍙樺寲鏃跺厛璁剧疆鐩爣CC锛孋C绋冲畾鍚庡啀鍙戦佸崗璁紱 + * 浠呭崗璁彉鍖栨椂涓嶉噸澶嶈缃湭鍙樺寲鐨凜C銆 + */ + if (diff_info.cc_changed && protocol_data_changed) { + /* Protocol-before-CC test flow is disabled in this version. */ + pReal->sub = IDX_SET_SINK_CC_BEFORE_PD; + } else if (diff_info.cc_changed) { + pReal->sub = IDX_SET_SINK_CCLINE; + } else { + pReal->sub = IDX_SET_SINK_PD_ONLY; + } + pReal->sink.work_mode = SINK_WORK_HANDSHAKE_PREPARE; + } else if (protocol_voltage_only || protocol_current_change) { + /* + * 鍗忚鐢靛帇銆佸崗璁數娴佸彉鍖栭兘鍙墽琛岃蒋鍗歌浇锛屼笉鍏抽棴鍗楀悜缁х數鍣ㄣ + * 浣庣數娴佸緟鏈烘湰韬凡缁廤ORK_STOP锛屾棤闇閲嶅鎻愪氦鍗歌浇鍛戒护锛涜繍琛屼腑 + * 鍒欑瓑寰呭疄闄呯數娴侀檷鍒板畨鍏ㄨ寖鍥村悗鍐嶉噸鍙戝崗璁 + */ + pReal->sub = IDX_SET_SINK_PD_ONLY; + if (old_work_mode == SINK_WORK_LOAD_STANDBY) { + pReal->sink.work_mode = SINK_WORK_WAIT; + } else { + /* 杩愯鐘舵佷慨鏀瑰崗璁弬鏁版椂淇濇寔缁х數鍣紝鍙仠姝㈢數瀛愯礋杞姐 */ + pReal->sink.work_mode = SINK_WORK_PROTOCOL_UNLOAD; + } + } else if (chrg_comm_handle_sink_load_current(&diff_info, + old_work_mode, pReal)) { + /* 鐢垫祦璺ㄩ棬闄愮殑鍋滄鎴栨仮澶嶅凡杞崲涓虹嫭绔婼ink鐘舵侊紝鐢辩粺涓鍏ュ彛涓嬪彂銆 */ + } else if (chrg_sink_diff_send_reg((eIDX_SOU_CH)ch, + &diff_info, pReal) != 0) { + pReal->CV_mode = old_cv_mode; + pReal->sink.loadv = old_loadv; + pReal->sink.loadc = old_loadc; + return MB_EX_SLAVE_BUSY; + } + } else { + pReal->sink.On_work = 0; + /* 缁勫悎鎺у埗鎴栦笂浣嶆満閲嶅彂鍙兘鍦ㄥ叧鏈哄皻鏈畬鎴愭椂鍐嶆鎻愪氦OFF銆 + * 姝ゆ椂蹇呴』淇濈暀褰撳墠鍋滄闃舵锛屼笉鑳介噸鏂拌繘鍏TOP骞舵竻闆朵綆鐢垫祦纭娆℃暟锛 + * 鍚﹀垯瀹為檯鐢垫祦鍗充娇涓鐩翠负0锛屼篃姘歌繙绱涓嶅埌杩炵画2甯с */ + if ((old_work_mode == SINK_WORK_STOP_WAIT) || + (old_work_mode == SINK_WORK_STOP_RELAY) || + (old_work_mode == SINK_WORK_STOP_RELAY_WAIT)) { + pReal->sink.work_mode = old_work_mode; + } else if ((old_on_work == 0U) && + (old_work_mode == SINK_WORK_WAIT)) { + /* 宸插畬鎴愬仠姝㈡椂閲嶅OFF淇濇寔WAIT锛屼笉閲嶅鎿嶄綔缁х數鍣ㄣ */ + pReal->sink.work_mode = SINK_WORK_WAIT; + } else { + pReal->sink.work_mode = SINK_WORK_STOP; + } + } + + return (chrg_sink_work((eIDX_SOU_CH)ch, pReal) == 0) ? + MB_EX_NONE : MB_EX_SLAVE_BUSY; } -void chrg_sink_get_proto_diff(struct chrg_switch_t *pReal, - struct chrg_switch_t *pShadow, - sink_proto_diff_t *pDiff, - rt_uint8_t *pChange) + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_comm_handle_sink_load_current +鍑芥暟鎻忚堪锛 澶勭悊鏅氳礋杞界數娴佽法瓒婃渶浣庡甫杞介棬闄愭椂鐨勭姸鎬佽浆鎹 +杈撳叆鍙傛暟锛 pDiff:鏈鍙傛暟宸紓 old_work_mode:鐢熸晥鍓嶅伐浣滅姸鎬 + pReal:宸插鍒舵柊鍙傛暟鐨勮繍琛岀粨鏋勪綋 +杈撳嚭鍙傛暟锛 蹇呰鏃舵洿鏂皊ink.work_mode +杩斿洖璇存槑锛 RT_TRUE:鏈鐢垫祦鍙樺寲宸插鐞嗭紝绂佹鍐嶇洿鎺ュ啓鐢垫祦瀵勫瓨鍣 + RT_FALSE:鏈法闂ㄩ檺锛岀户缁墽琛屾櫘閫氬樊寮備笅鍙 +鍏跺畠璇存槑锛 鍖楀悜鍗忚銆丆C鍜屽崗璁數娴佸彉鍖栧湪璋冪敤鏈嚱鏁板墠澶勭悊锛涙湰鍑芥暟鍙鐞 + 鍗楀悜鐢靛瓙璐熻浇鐨刉ORK_STOP/CURRENT=0鍙婃棤鎻℃墜蹇熸仮澶 +*****************************************************************/ +static rt_bool_t chrg_comm_handle_sink_load_current( + const chrg_param_diff_t *pDiff, rt_uint8_t old_work_mode, + struct chrg_switch_t *pReal) { - pDiff->proto_changed = (pReal->sink.protocol != pShadow->sink.protocol) ? 1 : 0; - pDiff->group_changed = (pReal->sink.Pro_Group != pShadow->sink.Pro_Group) ? 1 : 0; - pDiff->ccset_changed = (pReal->sink.cc_set != pShadow->sink.cc_set) ? 1 : 0; - pDiff->pro_volt_changed = (pReal->sink.pro_loadv != pShadow->sink.pro_loadv) ? 1 : 0; - pDiff->pro_curr_changed = (pReal->sink.pro_loadc != pShadow->sink.pro_loadc) ? 1 : 0; - pDiff->volt_changed = (pReal->sink.loadv != pShadow->sink.loadv) ? 1 : 0; - pDiff->curr_changed = (pReal->sink.loadc != pShadow->sink.loadc) ? 1 : 0; - pDiff->cvmode_changed = (pReal->CV_mode != pShadow->CV_mode) ? 1 : 0; - // 浠绘剰涓椤瑰彉鏇村垯 pro_change = 0锛屽叏閮ㄤ笉鍙 = 1 - *pChange = (!pDiff->proto_changed && !pDiff->group_changed && - !pDiff->pro_volt_changed && !pDiff->pro_curr_changed && - !pDiff->ccset_changed && !pDiff->cvmode_changed) ? 0 : 1; - + rt_bool_t should_start; + + if ((pDiff == RT_NULL) || (pReal == RT_NULL) || + !pDiff->current_changed || + (pReal->CV_mode != MODE_CONSTANT_CURRENT)) { + return RT_FALSE; + } + should_start = chrg_sink_load_should_start(pReal); + + if (old_work_mode == SINK_WORK_RUNING) { + if (!should_start) { + pReal->sink.work_mode = SINK_WORK_LOAD_STOP; + return RT_TRUE; + } + return RT_FALSE; + } + + if (old_work_mode == SINK_WORK_LOAD_STANDBY) { + if (should_start) { + /* + * 浣庣數娴佸緟鏈烘仮澶嶅甫杞芥椂锛屼笉鍏佽鐢盋OM鐩存帴鎵撳紑鐢靛瓙璐熻浇銆 + * 鍏堝己鍒跺洖鍒板寳鍚戠數鍘嬫煡璇㈠叆鍙ｏ紝纭瀹為檯鐢靛帇绋冲畾鍚庡啀杩涘叆RUNING寮杞姐 + */ + pReal->sub = IDX_GET_SINK_VC; + pReal->sink.work_mode = SINK_WORK_WAIT; + } + return RT_TRUE; + } + + /* 鍗忚鎻℃墜鏈熼棿绂佹鎶婁綆浜庨棬闄愮殑灏忕數娴佹彁鍓嶅啓鍏ュ崡鍚戝姛鐜囨澘銆 */ + return should_start ? RT_FALSE : RT_TRUE; } -void chrg_sink_diff_send_reg(eIDX_SOU_CH ch, sink_proto_diff_t *pDiff, struct chrg_switch_t *pReal) -{ - chrg_sou_com_sou_set(); - if(pReal->CV_mode == 0x01){ - if (pDiff->volt_changed) - { - chrg_sou_com_batch_add_reg(ch, REG_VOLTAGE_OUT+1, pReal->sink.loadv); - } - }else{ - if (pDiff->curr_changed) - { - chrg_sou_com_batch_add_reg(ch, REG_CURRENT_OUT+1, pReal->sink.loadc); - } - } - if(pDiff->cvmode_changed){ - chrg_sou_com_batch_add_reg(ch, REG_MODE, pReal->CV_mode); - } + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_comm_apply_source_effect +鍑芥暟鎻忚堪锛 澶勭悊COM鍙傛暟鐢熸晥鍚庣殑鍚岃鑹茬數婧愬惎鍋滃拰鍙傛暟宸紓鏇存柊 +杈撳叆鍙傛暟锛 ch:閫氶亾 pReal:杩愯鍙傛暟 pShadow:寰呯敓鏁堝奖瀛愬弬鏁 +杈撳嚭鍙傛暟锛 鏇存柊pReal銆丼ource鐘舵佸拰蹇呰鐨勫崡鍚戝瘎瀛樺櫒 +杩斿洖璇存槑锛 MB_EX_NONE:鎴愬姛 MB_EX_SLAVE_BUSY:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鍙鍒禨ource閰嶇疆瀛楁锛岄伩鍏嶅奖瀛愮粨鏋勮鐩栧寳鍚戝疄鏃秙et_volt/set_curr锛 + 蹇厖鍙傛暟鍙樺寲杩涘叆WAIT锛屾爣鍑嗗崗璁數鍘嬬粺涓浜ょ粰RUNING鐘舵佷笅鍙 +*****************************************************************/ +static eMBException chrg_comm_apply_source_effect(rt_uint8_t ch, + struct chrg_switch_t *pReal, const struct chrg_switch_t *pShadow) +{ + chrg_param_diff_t diff_info; + rt_bool_t protocol_config_changed; + rt_bool_t cc_changed; + rt_bool_t north_config_changed; + 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; + rt_uint8_t old_now_state = pReal->source.Now_State; + rt_uint8_t old_work_mode = pReal->source.work_mode; + rt_uint8_t old_cv_mode = pReal->CV_mode; + rt_uint8_t old_proto_cmd = pReal->protoCmd; + rt_uint8_t old_sub = pReal->sub; + rt_uint16_t old_set_volt = pReal->source.set_volt; + rt_uint16_t old_set_curr = pReal->source.set_curr; + rt_uint16_t source_work = pShadow->source.Now_State; + rt_uint16_t regs[2]; + rt_uint16_t vals[2]; + rt_uint16_t target_curr; + rt_uint8_t count = 0; + + chrg_comm_get_param_diff(ID_SOURCE, pReal, pShadow, &diff_info); + rt_memcpy(&old_pd_set, &pReal->source.pd_set, sizeof(old_pd_set)); + /* 鏍囧噯鍗忚鐨勭數鍘嬬數娴佺洿鎺ヤ氦缁欏姛鐜囨澘锛屼笉鍥爌d_set鏁板煎彉鍖栭噸鍙0xD0銆 */ + protocol_config_changed = diff_info.protocol_changed || + ((pShadow->source.protocol != PRO_NONE) && diff_info.pd_changed); + cc_changed = diff_info.cc_changed; + north_config_changed = protocol_config_changed || cc_changed; + protocol_switch_requested = north_config_changed; + new_pd_state = chrg_comm_source_pd_state( + (rt_uint8_t)pShadow->source.protocol); + /* PD涓庨潪PD涔嬮棿鍙戠敓璺ㄧ被鍒垏鎹㈡椂鎵ц瀹屾暣纭欢澶嶄綅銆 */ + old_pd_state = chrg_comm_source_pd_state((rt_uint8_t)old_protocol); + need_source_reset = (old_pd_state != new_pd_state); + target_curr = pShadow->source.pd_set.mm.max_cur; + + /* 褰卞瓙鍖哄彧鎷ユ湁COM閰嶇疆锛涘寳鍚戣В鏋愪骇鐢熺殑杩愯鐩爣鍜屽洖璇绘暟鎹户缁敱pReal鎸佹湁銆 */ + pReal->CV_mode = pShadow->CV_mode; + pReal->protoCmd = pShadow->protoCmd; + pReal->source.protocol = pShadow->source.protocol; + pReal->source.CC_Set = pShadow->source.CC_Set; + pReal->source.Now_State = pShadow->source.Now_State; + rt_memcpy(&pReal->source.pd_set, &pShadow->source.pd_set, + sizeof(pReal->source.pd_set)); + + if (source_work == 0x01) { + if (pReal->source.On_Flag == 0) { + /* 姣忔閲嶆柊鍚姩鐨勭涓娆″崗璁笅鍙戜笉鍙戦佸浣嶃 */ + last_pd_pro[ch] = SOURCE_PD_STATE_UNKNOWN; + /* + * 鍋滄鐘舵佸惎鍔ㄤ笉闇瑕佸厛鏂紑CC锛岀洿鎺ヤ粠璁剧疆鍗忚寮濮嬶紱 + * 鏀跺埌0xD0搴旂瓟骞剁瓑寰呬繚鎶ゆ椂闂村悗锛屽啀杩炴帴鐩爣CC銆 + */ + chrg_roll_nor_source_switch_reset(ch); + pReal->sub = IDX_SET_SOURCE_PD; + pReal->source.On_Flag = 1; + pReal->source.work_mode = SOURCE_WORK_INIT; + if (chrg_source_work_state(ch, pReal) != 0) { + goto source_effect_submit_failed; + } + return MB_EX_NONE; + } + + /* + * PD閰嶇疆鎴朇C鍙戠敓鍙樺寲鏃惰繘鍏ュ垏鎹㈡祦绋嬶紱璺≒D绫诲埆鍒囨崲鏃跺厛鎵ц瀹屾暣澶嶄綅銆 + * 鍚岀被鍒崗璁厤缃彉鍖栧拰浠匔C鍒囨崲鐩存帴浠0xD0寮濮嬨 + */ + if (north_config_changed) { + chrg_roll_nor_source_switch_reset(ch); + pReal->sub = need_source_reset ? + IDX_SET_SOURCE_RESET : IDX_SET_SOURCE_PD; + } + + pReal->source.work_mode = SOURCE_WORK_WAIT; + if (protocol_switch_requested) { + /* + * COM鍙繘鍏ュ崗璁垏鎹㈢姸鎬侊紱鍗楀悜杈撳嚭娓呴浂缁熶竴鐢盨ource鐘舵佸嚱鏁版墽琛屻 + * sub宸插湪涓婃柟纭畾锛屽寳鍚戣疆璇㈢嚎绋嬫墽琛屾湰鐘舵佸苟娓呴浂鎴愬姛鍚庯紝缁х画 + * CC_CLOSE鎴栧崗璁缃紝涓嶉渶瑕丆OM鐩存帴鍙戦佷换浣曟竻闆跺懡浠ゃ + */ + pReal->source.work_mode = need_source_reset ? + SOURCE_WORK_FULL_RESET : SOURCE_WORK_PROTOCOL_SWITCH; + } + + if (pReal->source.protocol != PRO_NONE) { + /* 蹇厖鍙洿鏂板崗璁厤缃苟绛夊緟鍗忓晢鍥炵爜锛屼笉鐩存帴鏀瑰姛鐜囨澘杈撳嚭銆 */ + return MB_EX_NONE; + } + + /* 鏍囧噯鍗忚鐨勬ā寮忓拰鐢垫祦鍙洿鎺ユ彁浜わ紝鐢靛帇鍙兘鐢盧UNING鐘舵佸啓鍏ャ */ + if (!protocol_switch_requested && diff_info.cv_changed) { + regs[count] = REG_MODE; + vals[count++] = pReal->CV_mode; + } + if (!protocol_switch_requested && diff_info.current_changed) { + regs[count] = REG_CURRENT_OUT + 1; + vals[count++] = target_curr; + } + + if ((count > 0) && (chrg_sou_com_batch_submit((eIDX_SOU_CH)ch, + regs, vals, count) != 0)) { + goto source_effect_submit_failed; + } + + /* COM鍙洿鏂版爣鍑嗗崗璁厤缃苟淇濇寔WAIT锛涗笅涓甯у寳鍚戣В鏋愯礋璐ｆ瘮杈 + * pd_set鐩爣涓巗et_volt锛屽啀鍐冲畾鏄惁杩涘叆RUNING鍐欑數鍘嬨 */ + pReal->source.set_curr = target_curr; + if (!protocol_switch_requested) { + pReal->source.work_mode = SOURCE_WORK_WAIT; + } + return MB_EX_NONE; + } + + if (pReal->source.On_Flag == 0) { + chrg_roll_nor_source_switch_reset(ch); + pReal->source.work_mode = SOURCE_WORK_WAIT; + return MB_EX_NONE; + } + chrg_roll_nor_source_switch_reset(ch); + pReal->source.work_mode = SOURCE_WORK_STOP; + return (chrg_source_work_state(ch, pReal) == 0) ? + MB_EX_NONE : MB_EX_SLAVE_BUSY; + +source_effect_submit_failed: + /* 鍗楀悜鍛戒护鎻愪氦澶辫触蹇呴』鎭㈠宸紓鍩哄噯锛屼繚璇佷笅涓娆ARAM_EFFECT浠嶄細閲嶅彂銆 */ + pReal->CV_mode = old_cv_mode; + pReal->protoCmd = old_proto_cmd; + pReal->sub = old_sub; + pReal->source.protocol = old_protocol; + pReal->source.CC_Set = old_cc_set; + pReal->source.Now_State = old_now_state; + pReal->source.work_mode = old_work_mode; + pReal->source.set_volt = old_set_volt; + pReal->source.set_curr = old_set_curr; + rt_memcpy(&pReal->source.pd_set, &old_pd_set, + sizeof(pReal->source.pd_set)); + return MB_EX_SLAVE_BUSY; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_mb_write_sys +鍑芥暟鎻忚堪锛 澶勭悊绯荤粺鍖鸿鑹插垏鎹㈠拰褰卞瓙鍙傛暟鐢熸晥 +杈撳叆鍙傛暟锛 ch:閫氶亾 reg_offset:绯荤粺瀵勫瓨鍣ㄥ亸绉 sou_value:鍐欏叆鍊 + pSW:褰卞瓙鍙傛暟 pNOR:鍖楀悜鎬绘帶 pSOU:鍗楀悜鎬绘帶 +杈撳嚭鍙傛暟锛 鏇存柊瑙掕壊鎴栧皢鍙傛暟鍒嗗彂缁欏搴旇鑹插鐞嗗嚱鏁 +杩斿洖璇存槑锛 MB_EX_NONE:鎴愬姛 MB_EX_SLAVE_BUSY:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鍚岃鑹睸ource/Sink閫昏緫鍒嗗埆灏佽锛岃鑹插垏鎹粛缁熶竴璧癝WITCH鐘舵 +*****************************************************************/ +static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, + rt_uint16_t sou_value, struct chrg_switch_t *pSW, + struct chrg_north_t *pNOR, struct chrg_south_t *pSOU) +{ + eMBException status; + struct chrg_switch_t *pReal; + struct chrg_thread_t *pTHR_NOR; + eIDX_ID old_id; + eIDX_ID new_id; + int switch_ret; + + (void)pSOU; + switch (reg_offset) { + case SYS_REG_ROLE_SWITCH: + if (sou_value == 0x01) { + pSW->id = ID_SINK; + } else if (sou_value == 0x02) { + pSW->id = ID_SOURCE; + } + break; + + case SYS_REG_PARAM_EFFECT: + if (sou_value != 0x01) { + break; + } + pReal = &pNOR->sw[ch]; + pTHR_NOR = &chrgthr[IDX_THR_ROLL_NOR]; + rt_mutex_take(pTHR_NOR->mutex, RT_WAITING_FOREVER); + old_id = pReal->id; + new_id = pSW->id; + g_shadow_dirty[ch] = 0; + /* + * 浣挎瘡娆OM鍙傛暟鐢熸晥鎷ユ湁鐙珛鐗堟湰銆傚寳鍚戠嚎绋嬬瓑寰呭洖鐮佹湡闂村鏋滅増鏈彉鍖栵紝 + * 蹇呴』鏀惧純鏃ц姹傦紝闃叉鏃у洖鐮佹妸鏂伴厤缃殑sub閿欒鎺ㄨ繘鍒颁笅涓姝ャ + */ + pNOR->config_version[ch]++; + + if (old_id != new_id) { + /* 瑙掕壊鍒囨崲鏃舵竻闄ゆ棫Source鍗忚鍒囨崲鐨勭瓑寰呬笂涓嬫枃銆 */ + chrg_roll_nor_source_switch_reset(ch); + rt_memcpy(pReal, pSW, sizeof(struct chrg_switch_t)); + if (new_id == ID_SOURCE) { + /* 瑙掕壊閲嶆柊鍒囧埌Source鍚庯紝棣栦釜鍗忚鍛戒护涓嶉渶瑕佸浣嶃 */ + last_pd_pro[ch] = SOURCE_PD_STATE_UNKNOWN; + pReal->source.work_mode = SOURCE_WORK_SWITCH; + switch_ret = chrg_source_work_state(ch, pReal); + } else { + pReal->sink.work_mode = SINK_WORK_SWITCH; + switch_ret = chrg_sink_work((eIDX_SOU_CH)ch, pReal); + } + status = (switch_ret == 0) ? MB_EX_NONE : MB_EX_SLAVE_BUSY; + } else if (new_id == ID_SINK) { + status = chrg_comm_apply_sink_effect(ch, pReal, pSW); + } else { + status = chrg_comm_apply_source_effect(ch, pReal, pSW); + } + + if (status != MB_EX_NONE) { + g_shadow_dirty[ch] = 1; + } + rt_mutex_release(pTHR_NOR->mutex); + return status; + + default: + rt_kprintf("[SYS CH%d] Unknown reg offset=0x%02X\n", ch + 1, reg_offset); + break; + } + return MB_EX_NONE; +} +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_diff_send_reg +鍑芥暟鎻忚堪锛 鏍规嵁缁熶竴宸紓缁撴灉涓嬪彂鏅氳礋杞界殑CV銆佺數鍘嬫垨鐢垫祦鍙樺寲 +杈撳叆鍙傛暟锛 ch:鍗楀悜閫氶亾 pDiff:缁熶竴鍙傛暟宸紓 pReal:宸茬敓鏁堣繍琛屽弬鏁 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鏃犲樊寮傛垨鎻愪氦鎴愬姛 <0:鍗楀悜鎵归噺闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鍗忚銆佺粍鍙峰拰CC鍙樺寲鐢盨ink鐢熸晥鍑芥暟閲嶇疆鍖楀悜sub锛屾湰鍑芥暟鍙鐞 + 涓嶉渶瑕侀噸閰嶅崗璁殑鍔熺巼鍙傛暟 +*****************************************************************/ +static int chrg_sink_diff_send_reg(eIDX_SOU_CH ch, + const chrg_param_diff_t *pDiff, struct chrg_switch_t *pReal) +{ + rt_uint16_t regs[2]; + rt_uint16_t vals[2]; + rt_uint8_t count = 0; + + if (pReal->CV_mode == 0x01) { + if (pDiff->voltage_changed) { + regs[count] = REG_VOLTAGE_OUT + 1; + vals[count++] = pReal->sink.loadv; + } + } else if (pDiff->current_changed) { + regs[count] = REG_CURRENT_OUT + 1; + vals[count++] = pReal->sink.loadc; + } + if (pDiff->cv_changed) { + regs[count] = REG_MODE; + vals[count++] = pReal->CV_mode; + } + + if ((count > 0) && (chrg_sou_com_batch_submit(ch, regs, vals, count) != 0)) { + LOG_E("CH%d sink diff batch submit failed", ch + 1); + return -1; + } + return 0; } diff --git a/apps/chrg/applications/thread/chrg_comm.h b/apps/chrg/applications/thread/chrg_comm.h index 0754c9a..9f294a6 100644 --- a/apps/chrg/applications/thread/chrg_comm.h +++ b/apps/chrg/applications/thread/chrg_comm.h @@ -1,7 +1,7 @@ /**************************************************************************** 鏂囦欢鍚嶇О : chrg_comm.h 瀹屾垚鏃ユ湡 : -褰撳墠鐗堟湰鍙 : V1.0 +褰撳墠鐗堟湰鍙 : V1.1.9 涓昏鍔熻兘 : 瀹炵幇瀵瑰閫氳鍗忚 MODBUS 鏈嶅姟绔紝浠ョ嫭绔嬬嚎绋嬬瓑寰呭鐞嗗搷搴旇姹傛暟鎹 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 璇存槑 : @@ -19,23 +19,8 @@ #define MB_HANDLERS_MAX (16) -typedef struct -{ - //鍖楀悜鍗忚璁剧疆 - rt_uint8_t proto_changed; - rt_uint8_t group_changed; - rt_uint16_t pro_volt_changed; - rt_uint16_t pro_curr_changed; - //鍗楀悜鍔熺巼璁剧疆 - rt_uint8_t volt_changed; - rt_uint8_t curr_changed; - rt_uint8_t ccset_changed; - rt_uint8_t cvmode_changed; -} sink_proto_diff_t; -static void chrg_sink_get_proto_diff(struct chrg_switch_t *pReal, - struct chrg_switch_t *pShadow, - sink_proto_diff_t *pDiff, - rt_uint8_t *pNoChange); +/* 鍖楀悜Source鍗忚璁剧疆鎴愬姛鍚庯紝閫氱煡COM淇濆瓨鏈氶亾鐨凱D/闈濸D绫诲埆銆 */ +extern void chrg_comm_source_protocol_ack(rt_uint8_t ch, rt_uint8_t protocol); typedef enum { MB_REG_READ, /*!< Read register values and pass to protocol stack. */ @@ -228,8 +213,6 @@ extern void chrg_comm_thread_entry (void *data); extern rt_uint8_t chrg_com_sink_on(rt_uint8_t ch, struct chrg_switch_t *pSW, rt_uint8_t *enable); extern rt_uint8_t chrg_com_source_on(rt_uint8_t ch, rt_uint8_t protoCmd, struct chrg_switch_t *pSW, rt_uint8_t *enable); -extern void chrg_sink_diff_send_reg(eIDX_SOU_CH ch, sink_proto_diff_t *pDiff, struct chrg_switch_t *pReal); - #endif diff --git a/apps/chrg/applications/thread/chrg_lcd.c b/apps/chrg/applications/thread/chrg_lcd.c index ba22ca7..9439c26 100644 --- a/apps/chrg/applications/thread/chrg_lcd.c +++ b/apps/chrg/applications/thread/chrg_lcd.c @@ -37,26 +37,6 @@ struct chrg_lcd_t chrglcd = { // 55 41 00 0D 0A 鍋滄 // 55 41 01 0D 0A 杩愯 -void chrg_sou_work(eIDX_SOU_CH ch,struct chrg_switch_t *pSW) -{ - struct chrg_south_t *pSOU = &chrgsouth; - if(pSW->id == ID_SOURCE){ - chrg_set_sou_reg(ch, REG_WORK, WORK_START); -// rt_thread_mdelay(50); - pSW->source.Set_CV_Flag = 1; - pSW->source.Set_Pro_Flag = 1; - pSW->source.On_Flag = 1; - pSW->sub = IDX_SET_SOURCE_PD; - } - else if(pSW->id == ID_SINK) { - pSW->sink.On_work = 1; - pSW->sub=IDX_SET_SINK_PD; - } - pSOU->online[ch] = 1; - chrg_nor_sw_rel((eIDX_NOR_CH)ch, pSW->id); - rt_thread_mdelay(50); -} - void chrg_sou_stop(eIDX_SOU_CH ch,struct chrg_switch_t *pSW,struct chrg_north_t *pNOR) { struct chrg_south_t *pSOU = &chrgsouth; @@ -64,7 +44,6 @@ void chrg_sou_stop(eIDX_SOU_CH ch,struct chrg_switch_t *pSW,struct chrg_north_t return; } if(pSW->id == ID_SOURCE){ - pSW->source.Stop_step_flag = 0; pSW->source.On_Flag = 0; pSW->sub = IDX_GET_SOURCE_VC; } @@ -82,7 +61,6 @@ int chrg_pro_set(struct chrg_switch_t *pSW, rt_uint8_t protocol){ if (pSW->id == ID_SOURCE) { // Source绔 pSW->source.protocol = protocol; - pSW->source.LCD_Set_Pro_Flag = 1; } else if (pSW->id == ID_SINK) { // Sink绔 pSW->sink.protocol = protocol; @@ -211,7 +189,6 @@ static int chrg_lcd_parse (rt_uint8_t *recv, rt_uint16_t len) } pNOR->enable[ch] = 1; rt_kprintf("ch=%d\n",ch); - chrg_sou_work((eIDX_SOU_CH)ch,pSW); pSW->continue_flag = 0; } //鍏抽棴 @@ -235,14 +212,16 @@ static int chrg_lcd_parse (rt_uint8_t *recv, rt_uint16_t len) Recv_Data = recv[LCD_IDX_VAL+1]<<8 | recv[LCD_IDX_VAL]; // 鎷兼帴16浣嶇數鍘嬪 pSW = &pNOR->sw[ch]; // 鎸夎鑹插瓨鍏ource/sink - pSW->source.vc.set_voltage = Recv_Data; // 鐢垫簮渚х數鍘嬶紙mV锛 + pSW->source.pd_set.mm.max_vol = Recv_Data; // 鐢垫簮鍗忚鐩爣鐢靛帇锛坢V锛 + pSW->source.set_volt = Recv_Data; // 褰撳墠鍑嗗鍐欏叆鍔熺巼鏉跨殑鐢靛帇鐩爣 pSW->sink.loadv = Recv_Data; // 璐熻浇渚х數鍘嬶紙mV锛岋級 - pSW->source.Set_Pro_Flag = 1; - // 鍐欏叆鐢靛帇瀵勫瓨鍣 - if(pSW->id==ID_SINK) { - chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_VOLTAGE_OUT+1, Recv_Data); - } - else chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_VOLTAGE_OUT+1, 5000); + /* Sink淇濈暀鍘熺洿鎺ヨ缃柟寮忥紱Source鐢靛帇蹇呴』缁熶竴缁忚繃RUNING鐘舵佽ˉ鍋垮悗涓嬪彂銆 */ + if (pSW->id == ID_SINK) { + chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_VOLTAGE_OUT + 1, Recv_Data); + } else if (pSW->source.On_Flag == 1) { + pSW->source.work_mode = SOURCE_WORK_RUNING; + (void)chrg_source_work_state(ch, pSW); + } break; } @@ -255,9 +234,9 @@ static int chrg_lcd_parse (rt_uint8_t *recv, rt_uint16_t len) Recv_Data = recv[LCD_IDX_VAL+1]<<8 | recv[LCD_IDX_VAL]; // 鎷兼帴16浣嶇數娴佸 pSW = &pNOR->sw[ch]; //鎸夎鑹插瓨鍏ource/sink - pSW->source.vc.set_current = Recv_Data; // 鐢垫簮渚х數娴侊紙mA锛 + pSW->source.pd_set.mm.max_cur = Recv_Data; // 鐢垫簮鍗忚鏈澶х數娴侊紙mA锛 + pSW->source.set_curr = Recv_Data; // 褰撳墠鍑嗗鍐欏叆鍔熺巼鏉跨殑鐢垫祦鐩爣 pSW->sink.loadc = Recv_Data; // 璐熻浇渚х數娴侊紙mA锛 - pSW->source.Set_Pro_Flag = 1; // rt_kprintf("cur=%d",Recv_Data); // 鍐欏叆鐢垫祦瀵勫瓨鍣 for(int i = 0;i<10;i++){ @@ -390,7 +369,9 @@ void chrg_lcd_thread_entry (void *data) return ; } +#if LCD_RX_ENABLE int len = 0; +#endif struct chrg_tty_t *pTTY = RT_NULL; struct chrg_lcd_t *pLCD = &chrglcd; pTTY = chrg_tty_create(pLCD->devname, 921600, 0, -1, 1); @@ -398,8 +379,10 @@ void chrg_lcd_thread_entry (void *data) LOG_E("tty can't create."); return ; } - +#if LCD_RX_ENABLE + /* LCD鎺ユ敹鍔熻兘寮鍚椂锛屾渶澶氱瓑寰100ms灞忓箷鍥炰紶鏁版嵁銆 */ chrg_tty_set_recv_tmo(pTTY, 100); +#endif if (chrg_tty_connect(pTTY) != RT_EOK) { chrg_tty_destory(pTTY); return; @@ -407,6 +390,12 @@ void chrg_lcd_thread_entry (void *data) pLCD->tty = pTTY; +#if LCD_RX_ENABLE + /* + * 淇濈暀鍘烲CD鎺ユ敹鍙婃帶鍒惰В鏋愭祦绋嬶紝闇瑕佹仮澶嶅睆骞曟帶鍒舵椂鍙渶灏 + * LCD_RX_ENABLE鏀逛负1銆傛帴鏀跺叧闂椂鏈涓嶅弬涓庣紪璇戯紝閬垮厤chrg_tty_recv + * 鍦ㄧ瓑寰呭洖浼犳湡闂存寔鏈塗TY閿佸苟闃诲chrg_lcd_send銆 + */ while (1) { rt_memset(pLCD->rx_buf, 0, SIZE_BUF_TTY); len = chrg_tty_recv(pTTY, pLCD->rx_buf, sizeof(pLCD->rx_buf)); @@ -420,6 +409,15 @@ void chrg_lcd_thread_entry (void *data) chrg_lcd_parse(pLCD->rx_buf, len); } } +#else + /* + * 浠呭彂閫佹ā寮忎粛淇濈暀LCD绾跨▼鍜屼覆鍙ｅ疄渚嬨傜嚎绋嬩綆棰戜紤鐪犱笖涓嶈闂甌TY锛 + * 閲忔祴瑙ｆ瀽涓殑LCD鍙戦佸彲浠ョ洿鎺ュ彇寰桾TY閿侊紝涓嶅啀鍙100ms鎺ユ敹瓒呮椂褰卞搷銆 + */ + while (1) { + rt_thread_mdelay(1000); + } +#endif } diff --git a/apps/chrg/applications/thread/chrg_lcd.h b/apps/chrg/applications/thread/chrg_lcd.h index b229c12..5a76824 100644 --- a/apps/chrg/applications/thread/chrg_lcd.h +++ b/apps/chrg/applications/thread/chrg_lcd.h @@ -18,6 +18,9 @@ #define THR_NAME_LCD "thr.lcd" #define DEV_NAME_LCD "uart2" +/* LCD鍙戦佷繚鎸佸惎鐢紱褰撳墠浜у搧涓嶄娇鐢ㄥ睆骞曞洖浼犳帶鍒讹紝鍏抽棴鎺ユ敹鍙伩鍏嶆帴鏀剁嚎绋嬫寔鏈塗TY閿侀樆濉為噺娴嬩笂鎶ャ */ +#define LCD_RX_ENABLE 0 + #define LCD_FRAME_HEAD 0x55 @@ -45,7 +48,6 @@ extern void chrg_lcd_thread_entry (void *data); extern rt_uint8_t On_Flag; extern rt_uint8_t Flag_start; -extern void chrg_sou_work(eIDX_SOU_CH ch,struct chrg_switch_t *pSW); extern void chrg_sou_stop(eIDX_SOU_CH ch,struct chrg_switch_t *pSW,struct chrg_north_t *pNOR); extern void chrg_set_eload_sink(eIDX_SOU_CH ch,struct chrg_switch_t *pSW); extern void chrg_set_eload_source(eIDX_SOU_CH ch,struct chrg_switch_t *pSW); diff --git a/apps/chrg/applications/thread/chrg_north.c b/apps/chrg/applications/thread/chrg_north.c index 39bdd49..d520023 100644 --- a/apps/chrg/applications/thread/chrg_north.c +++ b/apps/chrg/applications/thread/chrg_north.c @@ -1,7 +1,7 @@ /**************************************************************************** 鏂囦欢鍚嶇О : chrg_north.c 瀹屾垚鏃ユ湡 : -褰撳墠鐗堟湰鍙 : V1.0 +褰撳墠鐗堟湰鍙 : V1.1.9 涓昏鍔熻兘 : 瀹炵幇鍖楀悜閫氫俊浜や簰锛屽寘鎷帴鏀跺懡浠よВ鏋愶紝鍙戦佽姹傚懡浠わ紝鍒囨崲閫氳矾銆備互鐙珛绾跨▼澶勭悊銆 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 璇存槑 : @@ -23,249 +23,320 @@ //#define LOG_TAG "chrg.nor" #define DBG_LEVEL DBG_LOG #include -rt_uint16_t volt; -uint16_t chrg_compare(rt_int16_t a, rt_int16_t b) + +#define SOURCE_VOLT_ERROR_MV 200U // Source鐩爣鐢靛帇鍏佽璇樊锛屽崟浣峬V +#define SOURCE_VOLT_RETRY_FRAMES 3U // Source鐢靛帇鎸佺画瓒呭樊鍚庣殑閲嶅彂纭甯ф暟 +#define SOURCE_QC_MIN_VOLT_MV 5000U // QC2.0/QC3.0鍏佽浣跨敤鐨勬渶浣庣洰鏍囩數鍘 +#define SOURCE_QC_SWITCH_ERROR 0x04U // Source鍗忚鎴朇C鍒囨崲澶辫触閿欒浣 +#define SINK_CURRENT_START_GRACE_MS 200U // Sink鍚姩鍚庢殏涓嶅垽鏂棤鐢垫祦鐨勪繚鎶ゆ椂闂 +#define SINK_VOLT_STABLE_ERROR_MV 2000U // Sink瀹為檯鐢靛帇涓庡崗璁洰鏍囩數鍘嬬殑鏈澶у厑璁歌宸 +#define SINK_VOLT_5V_TARGET_MV 5000U // VSafe5V鐩爣鐢靛帇锛岄渶寤堕暱绋冲畾纭鏃堕棿 +#define SINK_VOLT_CONFIRM_NORMAL_COUNT 5U // 闈5V鐩爣杩炵画鏈夋晥鐢靛帇纭甯ф暟 +#define SINK_VOLT_CONFIRM_5V_COUNT 15U // 5V鐩爣杩炵画鏈夋晥鐢靛帇纭甯ф暟锛岄伩鍏嶆妸鎻℃墜闃舵VSafe5V璇垽涓哄崗璁ǔ瀹 + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_apply_protocol_voltage_rule +鍑芥暟鎻忚堪锛 鏍规嵁鐢垫簮鍗忚绫诲瀷淇鍖楀悜瑙ｆ瀽寰楀埌鐨勭洰鏍囩數鍘 +杈撳叆鍙傛暟锛 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 volt_mv:鍖楀悜瑙ｆ瀽鐢靛帇(mV) +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 搴斿啓鍏ource鐘舵佹満鐨勭洰鏍囩數鍘(mV) +鍏跺畠璇存槑锛 QC2.0/QC3.0鍦ㄥ畬鎴愬崌鍘嬪崗鍟嗗墠蹇呴』淇濇寔榛樿5V锛屽洜姝ゅ叾鍖楀悜 + 鍥炵爜浣庝簬5000mV鏃剁粺涓鎸5000mV澶勭悊锛涘叾瀹冨崗璁繚鎸佸師鍊 +*****************************************************************/ +static rt_uint16_t chrg_source_apply_protocol_voltage_rule( + const struct chrg_switch_t *pSW, rt_uint16_t volt_mv) { - if(a>b) return a - b; - else return b - a; + if (pSW == RT_NULL) { + return volt_mv; + } + + if (((pSW->source.protocol == PRO_QC20) || + (pSW->source.protocol == PRO_QC30)) && + (volt_mv < SOURCE_QC_MIN_VOLT_MV)) { + return SOURCE_QC_MIN_VOLT_MV; + } + + return volt_mv; } /***************************************************************** -鍑芥暟鍚嶇О锛 chrg_source_stop -鍔熻兘鎻忚堪锛 鍗楀悜鍔熺巼婧愬仠姝㈡祦绋嬫帶鍒跺嚱鏁帮紙鍒嗘鎵ц鍋滄鎿嶄綔锛 -鍑芥暟鎻忚堪锛 閫氳繃鐘舵佹満鍒嗘鎵ц鍗楀悜鍔熺巼鍋滄娴佺▼锛氬仠姝㈠姛鐜囪緭鍑 -> 鍏抽棴鍖楀悜缁х數鍣 -> 娓呯┖鎺у埗鏍囧織骞剁鐢ㄤ娇鑳 -杈撳叆鍙傛暟锛 - frame_data 锛氬師濮嬫暟鎹抚鎸囬拡锛岀敤浜庢彁鍙栧綋鍓嶇數鍘嬪 - pSW 锛氬寳鍚戦氶亾鎺у埗缁撴瀯浣撴寚閽 - idx 锛氶氶亾缂栧彿锛堝姛鐜囬氶亾/鍖楀悜閫氶亾绱㈠紩锛 - enable 锛氬寳鍚戦氶亾浣胯兘锛屽仠姝㈠悗鍏虫帀浣胯兘 -杩斿洖璇存槑锛 鏃犺繑鍥炲 +鍑芥暟鍚嶇О锛 chrg_sink_voltage_is_stable +鍑芥暟鎻忚堪锛 鍒ゆ柇鍖楀悜杩斿洖鐨凷ink瀹為檯鐢靛帇鏄惁宸茶繘鍏ュ崗璁洰鏍囩數鍘嬪厑璁歌寖鍥 +杈撳叆鍙傛暟锛 actual_volt_mv:鍖楀悜杩斿洖鐨勫疄闄呯數鍘(mV) + target_volt_mv:褰撳墠鍗忚鐢宠鐨勭洰鏍囩數鍘(mV) +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:瀹為檯鐢靛帇涓庣洰鏍囩數鍘嬪樊鍊间笉澶т簬鍏佽璇樊 + RT_FALSE:瀹為檯鐢靛帇灏氭湭鍒拌揪鐩爣鑼冨洿鎴栦粛淇濈暀鏃у崗璁數鍘 +鍏跺畠璇存槑锛 浣跨敤宸肩殑缁濆鍊兼瘮杈冿紝閬垮厤鍙垽鏂笅闄愭椂灏20V娈嬪帇璇垽涓5V宸茬ǔ瀹 *****************************************************************/ -void chrg_source_stop(rt_uint8_t *frame_data,struct chrg_switch_t *pSW,rt_uint8_t idx,rt_uint8_t *enable){ - switch(pSW->source.Stop_step_flag){ - case 0: // 鍋滄宸ヤ綔 - chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_STOP); - rt_thread_mdelay(50); - rt_uint16_t volt_mv_Now = (frame_data[4] << 8) | frame_data[5]; - volt = volt_mv_Now; - if(volt_mv_Now < 1000){ - pSW->source.Stop_step_flag = 1; - } - break; - case 1: // 鍏抽棴鍖楀悜缁х數鍣 - chrg_nor_sw_rel((eIDX_NOR_CH)idx,0); - rt_thread_mdelay(50); - pSW->source.Stop_step_flag = 2; - break; - case 2: // 鐘舵2锛氬凡鎵ц瀹屽仠姝㈡搷浣滐紝娓呯┖鏍囧織浣 - pSW->source.Set_CV_Flag = 0; - *enable = 0; - break; - default: - break; +static rt_bool_t chrg_sink_voltage_is_stable(rt_uint16_t actual_volt_mv, + rt_uint16_t target_volt_mv) +{ + rt_uint16_t voltage_error_mv; + + if (actual_volt_mv >= target_volt_mv) { + voltage_error_mv = actual_volt_mv - target_volt_mv; + } else { + voltage_error_mv = target_volt_mv - actual_volt_mv; } + + return (voltage_error_mv <= SINK_VOLT_STABLE_ERROR_MV) ? + RT_TRUE : RT_FALSE; } /***************************************************************** -鍑芥暟鍚嶇О锛 chrg_source_standard_output -鍔熻兘鎻忚堪锛 鍗楀悜鍔熺巼婧愭爣鍑嗚緭鍑烘帶鍒跺嚱鏁 -鍑芥暟鎻忚堪锛 鏍规嵁CV鏍囧織浣嶏紝鍒嗗埆璁剧疆鐢垫簮杈撳嚭鐢靛帇鎴栬緭鍑虹數娴侊紝瀹炵幇鏍囧噯妯″紡涓嬬殑鎭掑帇/鎭掓祦杈撳嚭 -杈撳叆鍙傛暟锛 - idx 锛氬姛鐜囬氶亾缂栧彿 - pSW 锛氬寳鍚戦氶亾鎺у埗缁撴瀯浣撴寚閽堬紝鍖呭惈鐢靛帇/鐢垫祦璁惧畾鍊笺丆V鎺у埗鏍囧織绛夊弬鏁 -杈撳嚭鍙傛暟锛 - pSW 锛氭洿鏂癈V鎺у埗鏍囧織浣 -杩斿洖璇存槑锛 鏃犺繑鍥炲 +鍑芥暟鍚嶇О锛 chrg_sink_voltage_confirm_count +鍑芥暟鎻忚堪锛 鏍规嵁Sink鍗忚鐩爣鐢靛帇閫夋嫨杩涘叆RUNING鍓嶆墍闇鐨勮繛缁ǔ瀹氬抚鏁 +杈撳叆鍙傛暟锛 target_volt_mv:褰撳墠鍗忚鐢宠鐨勭洰鏍囩數鍘嬶紝鍗曚綅mV +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 5V鐩爣杩斿洖寤堕暱纭甯ф暟锛屽叾瀹冪洰鏍囪繑鍥炴櫘閫氱‘璁ゅ抚鏁 +鍏跺畠璇存槑锛 蹇厖鍗忚鍒囨崲鏃舵荤嚎浼氬厛缁忚繃VSafe5V锛涘綋鐩爣鏈韩涔熸槸5V鏃讹紝 + 鍗曞嚟鐢靛帇鍊兼棤娉曞尯鍒嗚繃娓￠樁娈靛拰鍗忚绋冲畾闃舵锛屽洜姝ゅ鍔犵‘璁ゆ椂闂达紝 + 闃叉鐢靛瓙璐熻浇鎻愬墠鍚姩鍚庡鑷村崗璁澘澶嶄綅 *****************************************************************/ -void chrg_source_standard_output(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +static rt_uint8_t chrg_sink_voltage_confirm_count(rt_uint16_t target_volt_mv) { - if(pSW->source.Set_CV_Flag) { - chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_VOLTAGE_OUT+1, pSW->source.max_vol); -#if DEBUG_NORTH - rt_kprintf("Volt_Set%d\r\n",pSW->source.vc.set_voltage); -#endif - pSW->source.Set_CV_Flag = 1; - pSW->change_flag = 0; - } -// if(pSW->source.Set_CV_Flag==0){ -// chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_CURRENT_OUT+1, pSW->source.max_vol); -//#if DEBUG_NORTH -// rt_kprintf("Curr_set%d\r\n",Curr_mA); -//#endif -// pSW->source.Set_CV_Flag = 0; -// } + return (target_volt_mv == SINK_VOLT_5V_TARGET_MV) ? + SINK_VOLT_CONFIRM_5V_COUNT : SINK_VOLT_CONFIRM_NORMAL_COUNT; } -//鐢垫簮蹇厖 -void chrg_source_fast_output(rt_uint8_t *frame_data, eIDX_SOU_CH idx, - struct chrg_switch_t *pSW, struct chrg_north_t *pNOR) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_voltage_control +鍑芥暟鎻忚堪锛 鏍规嵁鐩爣鐢靛帇涓庡疄闄呯數鍘嬬粺涓鎺у埗Source鐢靛帇涓嬪彂鍜岄噸璇 +杈撳叆鍙傛暟锛 idx:褰撳墠閫氶亾 pSW:閫氶亾鎺у埗缁撴瀯浣 volt_mv:鐩爣鐢靛帇(mV) + curr_ma:鐩爣鐢垫祦(mA) +杈撳嚭鍙傛暟锛 鏇存柊source.set_volt/set_curr銆亀ork_mode鍜岀數鍘嬮噸璇曡鏁 +杩斿洖璇存槑锛 0:鐘舵佸鐞嗘垚鍔 <0:鍙傛暟閿欒鎴栧懡浠ゆ彁浜ゅけ璐 +鍏跺畠璇存槑锛 set_volt鍚屾椂浣滀负涓婃鐩爣锛屽仠姝㈡椂浼氭竻闆讹紱鐩爣鍙樺寲鏃剁珛鍗充笅鍙戯紝 + 鐩爣涓嶅彉浣嗗疄闄呰宸繛缁3甯ц秴杩200mV鏃堕噸鍙 +*****************************************************************/ +static int chrg_source_voltage_control(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW, rt_uint16_t volt_mv, rt_uint16_t curr_ma) { - struct chrg_rollsou_t *pROLL = &chrgrollsou; - rt_uint16_t volt_mv = (frame_data[8] << 8) | frame_data[9]; - rt_uint16_t Curr_mA = (frame_data[10] << 8) | frame_data[11]; - rt_uint16_t volt_mv_Now = (frame_data[4] << 8) | frame_data[5]; - rt_uint16_t Curr_mA_Now = (frame_data[6] << 8) | frame_data[7]; - rt_uint16_t volt_compare = chrg_compare(volt_mv, volt_mv_Now); - rt_uint16_t Curr_compare = chrg_compare(Curr_mA, Curr_mA_Now); - static rt_uint8_t number = 0; -#if LCD_OPEN - // rt_kprintf("volt_mv=%d,volt_mv_Now=%d,compare=%d\r\n",volt_mv,volt_mv_Now,volt_compare); - if(volt_compare<5000){ //姣旇緝璁惧畾鍊间笌瀹為檯鍊煎樊璺濓紝灏忎簬2V璁や负杈炬垚璁惧畾锛屽厑璁稿睆骞曞紑濮嬪彉鎹 - number++; - number = number%10; - if(number == 9) - { - pSW->change_flag = 0; - } - }else { //娌℃湁杈炬垚璁惧畾锛屽睆骞曚笉鍏佽鍙樻崲 - pSW->change_flag = 0x01; + static rt_uint8_t volt_retry_count[TOTAL_SOU_CHS] = {0}; + rt_uint16_t volt_error; + rt_uint16_t old_volt_mv; + rt_uint16_t old_curr_ma; + rt_bool_t need_set = RT_FALSE; + int ret; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; } -#endif -// if(volt_mv_Now==0){ -// chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_START); -// } -// else{ - if (pSW->source.Set_CV_Flag == 0){ - { - chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_VOLTAGE_OUT+1, volt_mv); - } - pSW->source.Set_CV_Flag = 1; -#if DEBUG_NORTH - rt_kprintf("Volt_Set%d\r\n",volt_mv); -#endif - } - else if(pSW->source.Set_CV_Flag==1){ - chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_START); - pSW->source.Set_CV_Flag = 0; - }else{ - pSW->source.Set_CV_Flag=0; + + old_volt_mv = pSW->source.set_volt; + old_curr_ma = pSW->source.set_curr; + pSW->source.set_volt = volt_mv; + pSW->source.set_curr = curr_ma; + if (!pSW->source.On_Flag) { + return 0; + } + volt_error = (pSW->Now_voltage >= volt_mv) ? + (pSW->Now_voltage - volt_mv) : + (volt_mv - pSW->Now_voltage); + + if (volt_mv != old_volt_mv) { + /* 鏂扮洰鏍囦笌set_volt鏃у间笉鍚岋紝闇瑕佺珛鍗冲啓鍏ュ姛鐜囨澘銆 */ + need_set = RT_TRUE; + } else if (volt_error <= SOURCE_VOLT_ERROR_MV) { + volt_retry_count[idx] = 0; + } else { + if (volt_retry_count[idx] < SOURCE_VOLT_RETRY_FRAMES) { + volt_retry_count[idx]++; } + if (volt_retry_count[idx] >= SOURCE_VOLT_RETRY_FRAMES) { + need_set = RT_TRUE; + } + } + + pSW->source.work_mode = need_set ? + SOURCE_WORK_RUNING : SOURCE_WORK_WAIT; + ret = chrg_source_work_state(idx, pSW); + if ((ret == 0) && need_set) { + volt_retry_count[idx] = 0; + } else if ((ret != 0) && need_set) { + /* 鍏ラ槦澶辫触鏃舵仮澶嶆棫鐩爣锛屼娇涓嬩竴甯т粛鑳界珛鍗宠瘑鍒负鐩爣鍙樺寲銆 */ + pSW->source.set_volt = old_volt_mv; + pSW->source.set_curr = old_curr_ma; + } + return ret; } -//鐢垫簮璁剧疆 +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_parse +鍑芥暟鎻忚堪锛 鎸夌數婧愬崗璁被鍨嬪鐞嗙洰鏍囩數鍘嬪苟椹卞姩Source鐘舵佹満 +杈撳叆鍙傛暟锛 frame_data:瀹屾暣鍖楀悜鍥炵爜 idx:褰撳墠閫氶亾 pSW:閫氶亾鎺у埗缁撴瀯浣 + pNOR:鍖楀悜鎬绘帶缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏇存柊鐢靛帇銆佺數娴併乻ource.work_mode鍙婄數鍘嬮噸璇曡鏁 +杩斿洖璇存槑锛 0:鍥炵爜姝ｅ父 <0:鍙傛暟閿欒銆佸垏鎹㈤敊璇垨鍔熺巼鏉垮懡浠ゆ彁浜ゅけ璐 +鍏跺畠璇存槑锛 鏍囧噯鍗忚浣跨敤COM閰嶇疆鐩爣鍙備笌瀹為檯鐢靛帇鏍￠獙锛涘揩鍏呭崗璁鍙 + frame_data[8~11]涓殑鍗忓晢鐩爣鍊硷紱frame_data[14]鐨刡it2琛ㄧず + Source鏉垮崗璁/CC鍒囨崲澶辫触锛岄敊璇洖鐮佷笉寰楅┍鍔ㄥ姛鐜囨澘杈撳嚭 +*****************************************************************/ +int chrg_source_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx, + struct chrg_switch_t *pSW, struct chrg_north_t *pNOR) +{ + rt_uint16_t volt_mv; + rt_uint16_t curr_ma; + + (void)pNOR; + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL) || + (frame_data == RT_NULL)) { + return -1; + } + pSW->source.qc_err = frame_data[14]; + if ((pSW->source.qc_err & SOURCE_QC_SWITCH_ERROR) != 0U) { + return -2; + } + + /* 鏍囧噯鍗忚涓嶄娇鐢ㄥ寳鍚戝抚鍐呯洰鏍囧硷紝浣嗕粛杩涘叆缁熶竴璇樊鍒ゆ柇锛岀‘淇滻NIT鎴 + * COM涓嬪彂鐨勭洰鏍囩數鍘嬫病鏈夌敓鏁堟椂鑳藉鑷姩閲嶈瘯銆 */ + if (pSW->source.protocol == PRO_NONE) { + return chrg_source_voltage_control(idx, pSW, + pSW->source.pd_set.mm.max_vol, + pSW->source.pd_set.mm.max_cur); + } + + if (!pSW->source.On_Flag) { + return 0; + } + volt_mv = (frame_data[8] << 8) | frame_data[9]; + curr_ma = (frame_data[10] << 8) | frame_data[11]; +// /* 鐗规畩鍗忚瑙勫垯鍙慨姝ｈ繍琛岀洰鏍囷紝涓嶈鐩栧寳鍚戝師濮嬪洖鐮佸拰COM鍗忚閰嶇疆銆 */ +// volt_mv = chrg_source_apply_protocol_voltage_rule(pSW, volt_mv); + return chrg_source_voltage_control(idx, pSW, volt_mv, curr_ma); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_setting +鍑芥暟鎻忚堪锛 鏍规嵁鐢垫簮鍗忚绫诲瀷鍜屽惎鍋滄爣蹇楅夋嫨鏍囧噯杈撳嚭鎴栧揩鍏呰В鏋愭祦绋 +杈撳叆鍙傛暟锛 frame_data:鍖楀悜鍥炵爜 idx:褰撳墠閫氶亾 pSW:閫氶亾鎺у埗缁撴瀯浣 + pNOR:鍖楀悜鎬绘帶缁撴瀯浣 +杈撳嚭鍙傛暟锛 鍙兘鏇存柊鍔熺巼鏉胯瀹氬兼垨鍖楀悜瀛愮姸鎬乻ub +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鏍囧噯鍗忚鐩存帴璁剧疆杈撳嚭锛屽揩鍏呭崗璁娇鐢ㄥ崗鍟嗙粨鏋滈┍鍔ㄧ姸鎬佹満 +*****************************************************************/ void chrg_source_setting(rt_uint8_t *frame_data, eIDX_SOU_CH idx, struct chrg_switch_t *pSW, struct chrg_north_t *pNOR) { //鎵ц杈撳嚭璋冩暣 - if (pSW->source.On_Flag == 1) { - if(pSW->source.protocol==0x00){//鏍囧噯涓嬭緭鍑鸿瀹氬 - chrg_source_standard_output(idx, pSW); - } - else{ //蹇厖閮ㄥ垎鎸夊崗鍟嗙粨鏋滆緭鍑 - chrg_source_fast_output(frame_data, idx, pSW, pNOR); -// rt_kprintf("set_end\r\n"); - } + if (pSW->source.On_Flag == 1) { + /* 鏍囧噯鍗忚涓庡揩鍏呭崗璁兘鐢辫В鏋愬叆鍙ｉ夋嫨鍚勮嚜鐩爣鍊煎苟缁熶竴鏍￠獙銆 */ + (void)chrg_source_parse(frame_data, idx, pSW, pNOR); }else if(pSW->source.On_Flag == 0){ //chrg_source_stop(frame_data,pSW,idx,&pNOR->enable[idx]); pSW->sub = IDX_SET_SOURCE_STOP_STATE; } } -////瑙ｆ瀽璐熻浇杩斿洖鏁版嵁 -//void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx, -// struct chrg_switch_t *pSW, struct chrg_north_t *pNOR) -//{ -// rt_uint16_t volt_mv = ((frame_data[4] << 8) | frame_data[5])*10; -// static uint8_t volt_low[TOTAL_SOU_CHS] = {0}; -// static uint8_t no_curr[TOTAL_SOU_CHS] = {0}; -// pSW->VZ = ((frame_data[14] << 8) | frame_data[15]); -// pSW->VF = ((frame_data[16] << 8) | frame_data[17]); -//#if DEBUG_NORTH -// LOG_D("Sink[%d] real volt: %d mV", idx, volt_mv); -//#endif -// -// if(pSW->sink.On_work == 1) { -// if(pSW->sink.test.test_mode == 0){ -// if (volt_mv <= WORK_MIN_VOLT) { // 鐢靛帇杩囦綆锛岀姝㈣繘鍏ュ伐浣滅姸鎬佹満 -// volt_low[idx]++; -// //if(volt_low[idx]>=5) pSW->sink.work_mode = SINK_WORK_LOW; // 澶嶄綅宸ヤ綔鐘舵佹満 -// } -// else{ // 鐢靛帇绋冲畾鏃舵墽琛屽伐浣滅姸鎬佹満锛堢户鐢靛櫒/宸ヤ綔妯″紡鍒囨崲锛 -// volt_low[idx] = 0; -// pSW->change_flag = 0; -// if((pSW->sink.pro_loadv - volt_mv) <= 2000){ -// pSW->sink.work_mode = SINK_WORK_RUNING; -// if(pSW->Now_current<=200){ -// if(no_curr[idx]++>=5){ -// pSW->sink.work_mode = SINK_WORK_WAIT; -// no_curr[idx] = 0; -// } -// } -// else no_curr[idx] = 0; -// } -// } -// } -// } -// else{ -// volt_low[idx] = 0; -//// pSW->sink.work_mode = SINK_WORK_STOP; -// } -// chrg_sink_work(idx,pSW); -//} - -//瑙ｆ瀽璐熻浇杩斿洖鏁版嵁 +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_parse +鍑芥暟鎻忚堪锛 瑙ｆ瀽鍖楀悜璐熻浇鏉垮洖鐮佸苟鏍规嵁鐢靛帇銆佺數娴佸弽棣堥┍鍔⊿ink鐘舵佹満 +杈撳叆鍙傛暟锛 frame_data:瀹屾暣鍖楀悜鍥炵爜 idx:褰撳墠閫氶亾 pSW:閫氶亾鎺у埗缁撴瀯浣 + pNOR:鍖楀悜鎬绘帶缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏇存柊VZ銆乂F銆佷綆鍘嬭鏁般佺ǔ瀹氱數鍘嬭鏁般佹棤鐢垫祦璁℃暟鍙妔ink.work_mode +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鐢靛帇杩炵画浣庝簬闂ㄦ杩涘叆LOW锛涙帀鐢靛鐞嗘仮澶嶅壇缁х數鍣ㄥ悗锛岀數鍘嬮噸鏂 + 鍑虹幇鏃跺厛閲嶈鍗忚鍜孋C锛涗竴甯ф湁鏁堢數鍘嬭揪鍒扮洰鏍囬檮杩戝嵆杩涘叆RUNING +*****************************************************************/ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx, struct chrg_switch_t *pSW, struct chrg_north_t *pNOR) { - rt_uint16_t volt_mv = ((frame_data[4] << 8) | frame_data[5])*10; - static uint8_t volt_low[TOTAL_SOU_CHS] = {0}; - static uint8_t no_curr[TOTAL_SOU_CHS] = {0}; - pSW->VZ = ((frame_data[14] << 8) | frame_data[15]); - pSW->VF = ((frame_data[16] << 8) | frame_data[17]); + rt_uint16_t volt_mv = ((frame_data[4] << 8) | frame_data[5]) * 10; + rt_uint8_t stable_confirm_count; + static rt_uint8_t volt_low[TOTAL_SOU_CHS] = {0}; + static rt_uint8_t no_curr[TOTAL_SOU_CHS] = {0}; + static rt_uint8_t volt_set_ok[TOTAL_SOU_CHS] = {0}; + static rt_uint8_t volt_stable_count[TOTAL_SOU_CHS] = {0}; + static rt_tick_t running_start_tick[TOTAL_SOU_CHS] = {0}; -#if DEBUG_NORTH - LOG_D("Sink[%d] real volt: %d mV", idx, volt_mv); + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return; + } + stable_confirm_count = chrg_sink_voltage_confirm_count( + pSW->sink.pro_loadv); + + pSW->VZ = ((frame_data[14] << 8) | frame_data[15]); + pSW->VF = ((frame_data[16] << 8) | frame_data[17]); + +#if NORTH_SINK_DEBUG + LOG_D("Sink[%d] real volt: %d mV", idx, volt_mv); #endif if(pSW->sink.On_work == 1 && pSW->sink.test.test_mode == 0) { if (volt_mv <= WORK_MIN_VOLT) { // 鐢靛帇杩囦綆锛岀姝㈣繘鍏ュ伐浣滅姸鎬佹満 -// volt_low[idx]++; -// if(volt_low[idx]>=5) pSW->sink.work_on_step = SINK_WORK_LOW; // 澶嶄綅宸ヤ綔鐘舵佹満 + volt_stable_count[idx] = 0; + if (volt_set_ok[idx] == 1) { + if (++volt_low[idx] >= 50) { + volt_set_ok[idx] = 0; + no_curr[idx] = 0; + //pSW->sink.work_mode = SINK_WORK_LOW; + } + } } else{ // 鐢靛帇绋冲畾鏃舵墽琛屽伐浣滅姸鎬佹満锛堢户鐢靛櫒/宸ヤ綔妯″紡鍒囨崲锛 volt_low[idx] = 0; + volt_set_ok[idx] = 1; pSW->change_flag = 0; - if((pSW->sink.pro_loadv - volt_mv) <= 2000){ - pSW->sink.work_mode = SINK_WORK_RUNING; - if(pSW->Now_current<=200){ - if(no_curr[idx]++>=5){ - pSW->sink.work_mode = SINK_WORK_WAIT; + if (pSW->sink.work_mode == SINK_WORK_LOW_MONITOR) { + /* 鍓户鐢靛櫒鎭㈠鍚庨娆￠噸鏂版娴嬪埌杈撳叆鐢靛帇锛屽彧鍚姩鍗忚閲嶆彙鎵嬨 + * 褰撳墠鍥炵爜涓嶈鍏ョǔ瀹氱數鍘嬫鏁帮紝闃叉璺宠繃鍗忚璁剧疆鐩存帴甯﹁浇銆 */ + volt_stable_count[idx] = 0; + no_curr[idx] = 0; + //pSW->sub = IDX_SET_SINK_CC_BEFORE_PD; + pSW->sink.work_mode = SINK_WORK_WAIT; + } else if ((pSW->sink.work_mode == SINK_WORK_LOW) || + (pSW->sink.work_mode == SINK_WORK_LOW_AUX_WAIT)) { + /* 鎺夌數瀹夊叏鎵规瀹屾垚鍓嶏紝鍗充娇鏀跺埌娈嬬暀鍥炵爜涔熶笉寰楄繘鍏UNING銆 */ + volt_stable_count[idx] = 0; + no_curr[idx] = 0; + } + else if (chrg_sink_voltage_is_stable(volt_mv, + pSW->sink.pro_loadv)) { + if ((pSW->sink.work_mode != SINK_WORK_RUNING) && + (pSW->sink.work_mode != SINK_WORK_LOAD_STANDBY)) { + if (volt_stable_count[idx] < stable_confirm_count) { + volt_stable_count[idx]++; + } + if (volt_stable_count[idx] >= stable_confirm_count) { + /* 鍥炵爜宸茬粡杩嘋RC銆両D銆佸懡浠ゅ拰閰嶇疆鐗堟湰鏍￠獙锛屽苟杩炵画杈惧埌褰撳墠 + * 鐩爣瀵瑰簲鐨勭‘璁ゅ抚鏁帮紱5V閲囩敤鏇撮暱绐楀彛杩囨护VSafe5V杩囨浮闃舵銆 */ + volt_stable_count[idx] = 0; + pSW->sink.work_mode = SINK_WORK_RUNING; + running_start_tick[idx] = rt_tick_get(); no_curr[idx] = 0; - } + } + } else if (pSW->sink.work_mode == SINK_WORK_LOAD_STANDBY) { + /* 鍗忚淇濇寔鍦ㄧ嚎浣嗙數瀛愯礋杞戒富鍔ㄥ仠姝紝涓嶆墽琛屾棤鐢垫祦閲嶈瘯銆 */ + volt_stable_count[idx] = 0; + no_curr[idx] = 0; + } else if ((pSW->Now_current > 200) || + (pSW->sink.loadc < 200)) { + volt_stable_count[idx] = 0; + no_curr[idx] = 0; + } else if ((rt_tick_t)(rt_tick_get() - running_start_tick[idx]) >= + rt_tick_from_millisecond(SINK_CURRENT_START_GRACE_MS)) { + volt_stable_count[idx] = 0; + if (++no_curr[idx] >= 2) { + pSW->sink.work_mode = SINK_WORK_WAIT; + no_curr[idx] = 0; + } } - else no_curr[idx] = 0; + } else { + volt_stable_count[idx] = 0; + no_curr[idx] = 0; } } } else{ volt_low[idx] = 0; -// pSW->sink.work_on_step = SINK_WORK_STOP; // 澶嶄綅宸ヤ綔鐘舵佹満 + no_curr[idx] = 0; + volt_set_ok[idx] = 0; + volt_stable_count[idx] = 0; } chrg_sink_work(idx,pSW); } -/***************************************************************** -鍑芥暟鍚嶇О锛 chrg_north_handle_Seting_Volt -鍔熻兘鎻忚堪锛 澶勭悊璁剧疆鐢靛帇/鐢垫祦鍛戒护锛岃В鏋愬懡浠ゆ暟鎹苟鎵ц鐩稿簲鎿嶄綔 -****************************************************/ -rt_uint8_t change_number = 0; -static void chrg_north_handle_Seting_Volt(rt_uint8_t *frame_data, rt_uint16_t frame_len) -{ - // 鎻愬彇鐢靛帇/鐢垫祦鍊 - struct chrg_north_t *pNOR = &chrgnorth; - rt_uint16_t idx = pNOR->idx; - struct chrg_switch_t *pSW = &chrgnorth.sw[idx]; - - static uint8_t number = 0; - //鐢垫簮閮ㄥ垎 - if(pSW->id==ID_SOURCE){ - chrg_source_setting(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR); - } - else{ - chrg_sink_parse(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR); - } -} - struct chrg_north_t chrgnorth = { .devname = DEV_NAME_NORTH, // 璁惧鍚 .tty = RT_NULL, // 涓插彛鍙ユ焺鍒濆涓虹┖ @@ -276,11 +347,11 @@ struct chrg_north_t chrgnorth = { .CV_mode = 2, .change_flag = 0, .show_step = 0, + .sub = IDX_GET_SINK_VC, .id = ID_SINK, // 鍒濆涓鸿礋杞芥ā寮 .source = { // 鐢垫簮渚у弬鏁板垵濮嬪寲 .On_Flag = 0, // 鍚姩鏍囧織鍒濆鍏抽棴 - .Set_CV_Flag = 1, // 鍚仠鎺у埗鍒濆缃1 - .Set_Pro_Flag = 1 // 鐢靛帇/鐢垫祦鍒囨崲鍒濆缃1 + .work_mode = SOURCE_WORK_WAIT, // 涓婄數淇濇寔绛夊緟锛岀姝㈣嚜鍔ㄦ墽琛孲ource INIT }, // 鍏抽敭锛氳ˉ鍏呴楀彿鍒嗛殧source鍜宻ink .sink = { .protocol = 0xFE, @@ -297,8 +368,7 @@ struct chrg_north_t chrgnorth = { .change_flag = 0, .source = { .On_Flag = 0, - .Set_CV_Flag = 1, - .Set_Pro_Flag = 1 + .work_mode = SOURCE_WORK_WAIT, // 涓婄數淇濇寔绛夊緟锛岀姝㈣嚜鍔ㄦ墽琛孲ource INIT }, .sink = { .protocol = 0xFE, @@ -314,8 +384,7 @@ struct chrg_north_t chrgnorth = { .change_flag = 0, .source = { .On_Flag = 0, - .Set_CV_Flag = 1, - .Set_Pro_Flag = 1 + .work_mode = SOURCE_WORK_WAIT, // 涓婄數淇濇寔绛夊緟锛岀姝㈣嚜鍔ㄦ墽琛孲ource INIT }, .sink = { .protocol = 0xFE, @@ -331,8 +400,7 @@ struct chrg_north_t chrgnorth = { .change_flag = 0, .source = { .On_Flag = 0, - .Set_CV_Flag = 1, - .Set_Pro_Flag = 1 + .work_mode = SOURCE_WORK_WAIT, // 涓婄數淇濇寔绛夊緟锛岀姝㈣嚜鍔ㄦ墽琛孲ource INIT }, .sink = { .protocol = 0xFE, @@ -373,8 +441,8 @@ int chrg_north_send (rt_uint8_t *data, rt_size_t length) struct chrg_tty_t *pTTY = chrgnorth.tty; if (RT_NULL != pTTY) { -#if DEBUG_NORTH //鏄惁鎵撳嵃 -// LOG_HEX("sendN", 32, data, length); +#if NORTH_FRAME_DEBUG + LOG_HEX("sendN", 32, data, length); #endif ret = chrg_tty_send(pTTY, data, length); } @@ -383,98 +451,164 @@ int chrg_north_send (rt_uint8_t *data, rt_size_t length) } /***************************************************************** -鍑芥暟鍚嶇О锛 chrg_north_frame_head -鍑芥暟鎻忚堪锛 鍖楀悜閫氶亾鏁版嵁甯уご鎻愬彇 -杈撳叆鍙傛暟锛 *rb: 缂撳啿鍖 *head: 甯уご id:缂栧彿 +鍑芥暟鍚嶇О锛 chrg_north_frame_shape_valid +鍑芥暟鎻忚堪锛 妫鏌ュ寳鍚戝洖鐮佸懡浠ゅ拰闀垮害缁勫悎鏄惁绗﹀悎鍗忚瀹氫箟 +杈撳叆鍙傛暟锛 id:瑙掕壊 length:甯ч暱搴 command:鍥炵爜鍛戒护 杈撳嚭鍙傛暟锛 - -杩斿洖璇存槑锛 <0: 閿欒 >0:甯ч暱搴 -鍏跺畠璇存槑锛 鎻愬彇3瀛楄妭甯уご +杩斿洖璇存槑锛 RT_TRUE:缁勫悎鍚堟硶 RT_FALSE:缁勫悎闈炴硶 +鍏跺畠璇存槑锛 0x20閲忔祴鍥炵爜鍥哄畾21瀛楄妭锛岃缃懡浠ゅ洖鐮佸浐瀹5瀛楄妭 *****************************************************************/ -static int chrg_north_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eIDX_ID id) +static rt_bool_t chrg_north_frame_shape_valid(eIDX_ID id, + rt_uint8_t length, rt_uint8_t command) { - int i = 0; - rt_uint8_t data = 0, stage = 0; - rt_size_t ret = 0; - rt_size_t len_rb = 0; // ring鏁版嵁闀垮害 - rt_uint8_t len_frame = 0; // 甯ч暱搴 + if (command == SRC_CMD_GET_VOLTAGE) { + return (length == 21U) ? RT_TRUE : RT_FALSE; + } + if (command == SRC_CMD_GET_PROTOCOL) { + return (length >= MIN_FRAME_LENGTH) ? RT_TRUE : RT_FALSE; + } - if (RT_NULL == rb) { - rt_kprintf("len_rb=NULL%d\r\n",len_rb); + if (id == ID_SOURCE) { + if ((command == SRC_CMD_SET_CC_LEVEL) || + (command == SRC_CMD_SET_CC_CHOOSE) || + (command == SRC_CMD_RESET) || + (command == SRC_CMD_SET_PROTOCOL)) { + return (length == MIN_FRAME_LENGTH) ? RT_TRUE : RT_FALSE; + } + return RT_FALSE; + } + + if (id == ID_SINK) { + switch (command) { + case SINK_CMD_SET_CC: + case SINK_CMD_SET_LEVEL: + case SINK_CMD_SET_QC20: + case SINK_CMD_SET_QC30: + case SINK_CMD_SET_FCP: + case SINK_CMD_SET_AFC: + case SINK_CMD_SET_SCP: + case SINK_CMD_SET_VIVO: + case SINK_CMD_SET_TFC: + case SINK_CMD_SET_PD0: + case SINK_CMD_SET_PPS: + case SINK_CMD_SET_PD3P1: + case SINK_CMD_SET_UFCS: + case SINK_CMD_SET_VOOC: + case SINK_CMD_SET_AVS: + case LOAD_PRO_NONE: + return (length == MIN_FRAME_LENGTH) ? RT_TRUE : RT_FALSE; + default: + return RT_FALSE; + } + } + + return RT_FALSE; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_north_ringbuffer_byte +鍑芥暟鎻忚堪锛 涓嶇Щ鍔ㄨ鎸囬拡鍦拌鍙栧寳鍚戠幆褰㈢紦鍐插尯鎸囧畾鍋忕Щ瀛楄妭 +杈撳叆鍙傛暟锛 rb:鐜舰缂撳啿鍖 offset:鐩稿褰撳墠璇绘寚閽堝亸绉 data:杈撳嚭瀛楄妭 +杈撳嚭鍙傛暟锛 data杩斿洖璇诲彇鍒扮殑瀛楄妭 +杩斿洖璇存槑锛 0:鎴愬姛 <0:鍙傛暟鎴栧亸绉婚敊璇 +鍏跺畠璇存槑锛 浠呯敱鍖楀悜鎺ユ敹绾跨▼璋冪敤锛屼笉涓庡叾瀹冪嚎绋嬪苟鍙戣闂鐜舰缂撳啿鍖 +*****************************************************************/ +static int chrg_north_ringbuffer_byte(const struct rt_ringbuffer *rb, + rt_size_t offset, rt_uint8_t *data) +{ + rt_size_t index; + + if ((rb == RT_NULL) || (data == RT_NULL) || + (offset >= rt_ringbuffer_data_len((struct rt_ringbuffer *)rb))) { + return -1; + } + + index = rb->read_index + offset; + if (index >= rb->buffer_size) { + index -= rb->buffer_size; + } + *data = rb->buffer_ptr[index]; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_north_ringbuffer_discard +鍑芥暟鎻忚堪锛 浠庡寳鍚戠幆褰㈢紦鍐插尯涓㈠純鎸囧畾鏁伴噺瀛楄妭 +杈撳叆鍙傛暟锛 rb:鐜舰缂撳啿鍖 length:闇瑕佷涪寮冪殑瀛楄妭鏁 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鐢ㄤ簬绉婚櫎甯уご鍓嶅櫔澹帮紝鍚屾椂淇濈暀鏈熬鍙兘鏈帴鏀跺畬鏁寸殑甯уご +*****************************************************************/ +static void chrg_north_ringbuffer_discard(struct rt_ringbuffer *rb, + rt_size_t length) +{ + rt_uint8_t data; + + while ((length > 0U) && (rt_ringbuffer_getchar(rb, &data) != 0U)) { + length--; + } +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_north_frame_head +鍑芥暟鎻忚堪锛 鍦ㄥ寳鍚戝瓧鑺傛祦涓煡鎵惧苟鎻愬彇鍚堟硶鍥涘瓧鑺傚抚澶 +杈撳叆鍙傛暟锛 rb:鐜舰缂撳啿鍖 head:甯уご杈撳嚭鍖 id:褰撳墠閫氶亾瑙掕壊 +杈撳嚭鍙傛暟锛 head杩斿洖闀垮害銆佸浐瀹氬瓧鑺傘佽鑹插拰鍛戒护 +杩斿洖璇存槑锛 >0:瀹屾暣甯ч暱搴 0:鏆傛湭鎵惧埌瀹屾暣甯уご <0:鍙傛暟鎴栬鍙栭敊璇 +鍏跺畠璇存槑锛 鏈壘鍒版椂淇濈暀鏈熬3瀛楄妭锛屾敮鎸佸抚澶磋法澶氭UART鎺ユ敹 +*****************************************************************/ +static int chrg_north_frame_head(struct rt_ringbuffer *rb, + rt_uint8_t *head, eIDX_ID id) +{ + rt_size_t i; + rt_size_t j; + rt_size_t len_rb; + rt_uint8_t length; + rt_uint8_t reserved; + rt_uint8_t frame_id; + rt_uint8_t command; + + if ((rb == RT_NULL) || (head == RT_NULL)) { return -1; } len_rb = rt_ringbuffer_data_len(rb); - - - if (len_rb < LEN_FRAME_HEAD + 2) { // 鏈鐭5瀛楄妭 - // ============================= - // 绠鍗曠増锛氭墦鍗伴敊璇抚 + 娓呯┖缂撳啿鍖 - // ============================= - rt_kprintf("[ERROR] 甯ч暱搴︿笉瓒筹紝len=%d, data: ", len_rb); - - // 鎶婃墍鏈夋暟鎹鍑烘潵銆佹墦鍗般佸悓鏃舵竻绌 - rt_uint8_t dummy; - while (rt_ringbuffer_getchar(rb, &dummy) == RT_EOK) - { - rt_kprintf("%02x ", dummy); // 鎵撳嵃姣忎竴涓瓧鑺 - } - - rt_kprintf("\r\n"); - - return -1; + if (len_rb < LEN_FRAME_HEAD) { + return 0; } - for (i = 0; i < len_rb - 2; i++) { // 鎵惧ご涓変釜瀛楄妭 [甯ч暱, 0x00, id] - ret = rt_ringbuffer_getchar(rb, &data); - if (0 == ret) { + + /* 浣跨敤闈炵牬鍧忚鍙栭愬瓧鑺傛粦鍔紝鏌ユ壘瀹屾暣鐨4瀛楄妭鍊欓夊抚澶淬 */ + for (i = 0; (i + LEN_FRAME_HEAD) <= len_rb; i++) { + if ((chrg_north_ringbuffer_byte(rb, i, &length) != 0) || + (chrg_north_ringbuffer_byte(rb, i + 1U, &reserved) != 0) || + (chrg_north_ringbuffer_byte(rb, i + 2U, &frame_id) != 0) || + (chrg_north_ringbuffer_byte(rb, i + 3U, &command) != 0)) { + break; + } + + /* 闀垮害銆佸浐瀹氬瓧鑺傘佽鑹叉垨鍛戒护涓嶅尮閰嶆椂缁х画鎼滅储涓嬩竴涓欓変綅缃 */ + if ((reserved != 0x00U) || (frame_id != (rt_uint8_t)id) || + (length < MIN_FRAME_LENGTH) || + !chrg_north_frame_shape_valid(id, length, command)) { continue; } - switch (stage) { - case 0: - head[0] = data; - len_frame = data; - if (data < MIN_FRAME_LENGTH) { // 闀垮害涓嶇 - - stage = 0; - continue; + /* 鎵惧埌鍚堟硶甯уご鍚庯紝浠呬涪寮冨畠鍓嶉潰鐨勫櫔澹帮紝鍐嶆寮忓彇鍑4瀛楄妭甯уご銆 */ + chrg_north_ringbuffer_discard(rb, i); + for (j = 0; j < LEN_FRAME_HEAD; j++) { + if (rt_ringbuffer_getchar(rb, &head[j]) == 0U) { + return -1; } - - stage = 1; - break; - - case 1: - head[1] = data; - if (0x00 != data) { - stage = 0; - } else { - stage = 2; - } - break; - - case 2: - head[2] = data; - if ((rt_uint8_t)id != data) { - stage = 0; - } else { -// if (id == ID_SINK) { -// rt_uint8_t ext1, ext2; -// // 涓诲姩璇诲彇骞朵涪寮2瀛楄妭鎵╁睍瀛楁 -// rt_ringbuffer_getchar(rb, &ext1); -// rt_ringbuffer_getchar(rb, &ext2); -// rt_kprintf("Sink:%02X %02X\r\n", ext1, ext2); -// } - return len_frame; - } - break; - - default: - - break; } - + return length; } - return -1; + /* 淇濈暀鏈熬鍙兘灏氭湭鎺ユ敹瀹屾暣鐨4瀛楄妭甯уご锛岀瓑寰呬笅涓鎵筓ART鏁版嵁缁帴銆 */ + if (len_rb > (LEN_FRAME_HEAD - 1U)) { + chrg_north_ringbuffer_discard(rb, + len_rb - (LEN_FRAME_HEAD - 1U)); + } + return 0; } /***************************************************************** @@ -486,10 +620,123 @@ static int chrg_north_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eI 鍏跺畠璇存槑锛 - *****************************************************************/ int a_number; + +#define NORTH_FRAME_TIMEOUT_MS 100 + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_north_frame_reset +鍑芥暟鎻忚堪锛 澶嶄綅鍖楀悜甯ф帴鏀剁姸鎬佸苟鎸夐渶閲婃斁鏈畬鎴愬抚鍐呭瓨 +杈撳叆鍙傛暟锛 pFrame:甯ф帴鏀朵笂涓嬫枃 release:鏄惁閲婃斁pMB鍙妏ayload +杈撳嚭鍙傛暟锛 娓呴浂鎺ユ敹闀垮害銆佸抚澶存爣蹇椼佽秴鏃惰鏃跺拰娑堟伅鎸囬拡 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 瀹屾暣甯у凡绉讳氦閭鏃秗elease搴斾负RT_FALSE锛屽紓甯镐腑姝㈡椂涓篟T_TRUE +*****************************************************************/ +static void chrg_north_frame_reset(struct pickup_info_t *pFrame, rt_bool_t release) +{ + if (RT_NULL == pFrame) { + return; + } + + if (release && (RT_NULL != pFrame->pMB)) { + if (RT_NULL != pFrame->pMB->payload) { + rt_free(pFrame->pMB->payload); + } + rt_free(pFrame->pMB); + } + + pFrame->last_tick = 0; + pFrame->length = 0; + pFrame->findhead = 0; + pFrame->len_msg = 0; + pFrame->pMB = RT_NULL; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_north_frame_append +鍑芥暟鎻忚堪锛 浠庡寳鍚戠幆褰㈢紦鍐插尯杩藉姞鏁版嵁鍒板綋鍓嶆湭瀹屾垚甯 +杈撳叆鍙傛暟锛 rb:鍖楀悜鎺ユ敹鐜舰缂撳啿鍖 pFrame:甯ф帴鏀朵笂涓嬫枃 +杈撳嚭鍙傛暟锛 鏇存柊宸叉帴鏀堕暱搴﹀拰鏈鍚庢帴鏀舵椂闂 +杩斿洖璇存槑锛 1:瀹屾暣甯ф帴鏀跺畬鎴 0:浠嶉渶绛夊緟鏁版嵁 <0:鍙傛暟鎴栫姸鎬佸紓甯 +鍏跺畠璇存槑锛 鍗曟浠呭鍒跺綋鍓嶅抚鍓╀綑闀垮害锛岄伩鍏嶈鍙栦笅涓甯ф暟鎹 +*****************************************************************/ +static int chrg_north_frame_append(struct rt_ringbuffer *rb, + struct pickup_info_t *pFrame) +{ + rt_size_t remaining; + rt_size_t copied; + + if ((RT_NULL == rb)||(RT_NULL == pFrame)||(RT_NULL == pFrame->pMB)|| + (RT_NULL == pFrame->pMB->payload)||(pFrame->len_msg <= 0)|| + (pFrame->length > (rt_size_t)pFrame->len_msg)) { + return -1; + } + + remaining = (rt_size_t)pFrame->len_msg - pFrame->length; + if (0 == remaining) { + return 1; + } + + copied = rt_ringbuffer_data_len(rb); + if (copied > remaining) { + copied = remaining; + } + if (copied > 0) { + copied = rt_ringbuffer_get(rb, + &pFrame->pMB->payload[pFrame->length], copied); + pFrame->length += copied; + pFrame->last_tick = rt_tick_get(); + } + + return (pFrame->length == (rt_size_t)pFrame->len_msg) ? 1 : 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_north_frame_dispatch +鍑芥暟鎻忚堪锛 鏍￠獙骞跺垎鍙戝凡缁忕粍瑁呭畬鎴愮殑鍖楀悜鏁版嵁甯 +杈撳叆鍙傛暟锛 pFrame:鍖呭惈瀹屾暣pMB娑堟伅鐨勫抚鎺ユ敹涓婁笅鏂 +杈撳嚭鍙傛暟锛 鍚堟硶瀹屾暣甯у彂閫佸埌鍖楀悜杞閭 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鏈嚱鏁板彧璐熻矗甯х粨鏋勫拰CRC鏍￠獙锛屼笉鎵цSource/Sink涓氬姟瑙ｆ瀽锛 + 鏍￠獙澶辫触鏃堕噴鏀炬秷鎭紝鏍￠獙鎴愬姛鍚庡皢娑堟伅鎵鏈夋潈绉讳氦鍖楀悜杞绾跨▼ +*****************************************************************/ +static void chrg_north_frame_dispatch(struct pickup_info_t *pFrame) +{ + struct mb_msg_t *pMB; + rt_uint8_t crc_calc; + rt_uint8_t crc_recv; + + if (pFrame == RT_NULL) { + return; + } + pMB = pFrame->pMB; + if ((pMB == RT_NULL) || (pMB->payload == RT_NULL) || + (pMB->length < MIN_FRAME_LENGTH) || + (pMB->length > 0xFFU) || + (pMB->payload[0] != (rt_uint8_t)pMB->length) || + (pMB->payload[1] != 0x00U)) { + LOG_E("invalid north frame: len=%d", pMB ? pMB->length : 0); + chrg_north_frame_reset(pFrame, RT_TRUE); + return; + } + + crc_calc = calc_crc8(pMB->payload, (rt_uint8_t)(pMB->length - 1U)); + crc_recv = pMB->payload[pMB->length - 1U]; + if (crc_calc != crc_recv) { + LOG_E("north crc failed: len=%d calc=%02x recv=%02x", + pMB->length, crc_calc, crc_recv); + chrg_north_frame_reset(pFrame, RT_TRUE); + return; + } + + chrg_north_frame_reset(pFrame, RT_FALSE); + (void)chrg_thread_mb_send(IDX_THR_NORTH, pMB); +} + static int chrg_north_pickup_frame (struct rt_ringbuffer *rb, struct pickup_info_t *pFrame, eIDX_NOR_CH idx) { int cnt = 0; + int status = 0; rt_size_t len_rb = 0; if ((RT_NULL == rb)||(RT_NULL == pFrame)) { return -1; @@ -503,63 +750,52 @@ static int chrg_north_pickup_frame (struct rt_ringbuffer *rb, pFrame->len_msg = chrg_north_frame_head(rb, pFrame->head, pSW->id); // rt_kprintf("msg=:%d",pFrame->len_msg); if (pFrame->len_msg > 0) { + if ((pFrame->len_msg < LEN_FRAME_HEAD)|| + (pFrame->len_msg >= SIZE_BUF_TTY)) { + LOG_E("invalid msg length: %d", pFrame->len_msg); + chrg_north_frame_reset(pFrame, RT_TRUE); + return -3; + } + pFrame->pMB = (struct mb_msg_t *)rt_malloc(sizeof(struct mb_msg_t)); if (RT_NULL == pFrame->pMB) { LOG_E("malloc mb failed."); + chrg_north_frame_reset(pFrame, RT_FALSE); return -2; } pFrame->pMB->length = pFrame->len_msg; - if (pFrame->pMB->length >= SIZE_BUF_TTY) { - rt_free(pFrame->pMB); - pFrame->pMB = RT_NULL; - LOG_E("too long msg."); - return -3; - } + pFrame->pMB->payload = RT_NULL; pFrame->pMB->payload = (rt_uint8_t *)rt_malloc(pFrame->len_msg); if (RT_NULL == pFrame->pMB->payload) { LOG_E("malloc buf failed."); + chrg_north_frame_reset(pFrame, RT_TRUE); return -4; } rt_memcpy(pFrame->pMB->payload, pFrame->head, LEN_FRAME_HEAD); + pFrame->length = LEN_FRAME_HEAD; + pFrame->findhead = 1; + pFrame->last_tick = rt_tick_get(); - len_rb = rt_ringbuffer_data_len(rb); -// rt_kprintf("len_rb=%d\r\n",len_rb); -// rt_kprintf("len=%d",pFrame->len_msg - LEN_FRAME_HEAD); - if (len_rb >= pFrame->len_msg - LEN_FRAME_HEAD) { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[LEN_FRAME_HEAD], - pFrame->len_msg - LEN_FRAME_HEAD); - if(pFrame->pMB->length==21){ - chrg_north_handle_Seting_Volt(pFrame->pMB->payload, pFrame->pMB->length); - } - chrg_thread_mb_send(IDX_THR_NORTH, pFrame->pMB); - pFrame->length = 0; - pFrame->len_msg = 0; + status = chrg_north_frame_append(rb, pFrame); + if (status > 0) { + chrg_north_frame_dispatch(pFrame); cnt++; + } else if (status < 0) { + chrg_north_frame_reset(pFrame, RT_TRUE); + return -5; } else { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[LEN_FRAME_HEAD], len_rb); - pFrame->length = LEN_FRAME_HEAD + len_rb; - pFrame->findhead = 1; - pFrame->last_tick = rt_tick_get(); break; } } } else { - len_rb = rt_ringbuffer_data_len(rb); - int len_need = pFrame->len_msg - LEN_FRAME_HEAD; - if (len_rb >= len_need) { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[pFrame->length], len_need); - - chrg_thread_mb_send(IDX_THR_NORTH, pFrame->pMB); - //chrg_north_pkg_decode(pFrame->pMB->payload, pFrame->len_msg, pSW); - - pFrame->length = 0; - pFrame->findhead = 0; - pFrame->len_msg = 0; + status = chrg_north_frame_append(rb, pFrame); + if (status > 0) { + chrg_north_frame_dispatch(pFrame); cnt++; + } else if (status < 0) { + chrg_north_frame_reset(pFrame, RT_TRUE); + return -5; } else { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[pFrame->length], len_rb); - pFrame->length += len_rb; - pFrame->last_tick = rt_tick_get(); break; } } @@ -587,6 +823,8 @@ void chrg_north_thread_entry (void *data) } int len = 0; + rt_size_t put_len = 0; + eIDX_NOR_CH frame_idx = IDX_NOR_CH1; // 褰撳墠鏈畬鎴愬抚鎵灞炵殑鐗╃悊閫氶亾 struct chrg_tty_t *pTTY = RT_NULL; struct chrg_north_t *pNOR = &chrgnorth; //鍖楀悜鍗忚鏉跨嚎绋嬩綋閫氶亾鍒濆鍖栦负CH1锛 @@ -613,6 +851,13 @@ void chrg_north_thread_entry (void *data) } while (1) { + if (pNOR->frame.findhead && + ((rt_tick_t)(rt_tick_get() - pNOR->frame.last_tick) >= + rt_tick_from_millisecond(NORTH_FRAME_TIMEOUT_MS))) { + chrg_north_frame_reset(&pNOR->frame, RT_TRUE); + LOG_W("partial frame timeout"); + } + rt_memset(pNOR->rx_buf, 0, sizeof(pNOR->rx_buf)); len = chrg_tty_recv(pTTY, pNOR->rx_buf, sizeof(pNOR->rx_buf)); if (len <= 0) { @@ -620,17 +865,27 @@ void chrg_north_thread_entry (void *data) continue; } - rt_ringbuffer_put(pNOR->rb, pNOR->rx_buf, len); -#if DEBUG_NORTH - LOG_HEX("recvN", 32, pNOR->rx_buf, len); -#endif - if (1 == pNOR->frame.findhead) { - if (rt_tick_get() >= pNOR->frame.last_tick + 100) { // 100ms - pNOR->frame.findhead = 0; // reset - //LOG_E("timeo\r\n"); - } + /* + * 鍥涗釜鐗╃悊閫氶亾鍏辩敤涓涓猆ART缁勫抚鍣ㄣ傚垏鎹㈤氶亾鍚庡繀椤荤粓姝㈡棫閫氶亾鐨勬湭瀹屾垚甯э紝 + * 闃叉鏃у抚缁х画鍚炲叆鏂伴氶亾鍥炵爜銆傛湰澶嶄綅鍙湪鎺ユ敹绾跨▼鎵ц锛岄伩鍏嶅彂閫佺嚎绋嬩笌 + * 鎺ユ敹绾跨▼鍚屾椂鎿嶄綔鐜舰缂撳啿鍖哄拰缁勫抚涓婁笅鏂囥 + */ + if (frame_idx != pNOR->idx) { + rt_ringbuffer_reset(pNOR->rb); + chrg_north_frame_reset(&pNOR->frame, RT_TRUE); + frame_idx = pNOR->idx; } + put_len = rt_ringbuffer_put(pNOR->rb, pNOR->rx_buf, len); + if (put_len != (rt_size_t)len) { + LOG_E("north ringbuffer overflow: recv=%d put=%d", len, put_len); + rt_ringbuffer_reset(pNOR->rb); + chrg_north_frame_reset(&pNOR->frame, RT_TRUE); + continue; + } +#if NORTH_FRAME_DEBUG + LOG_HEX("recvN", 32, pNOR->rx_buf, len); +#endif chrg_north_pickup_frame(pNOR->rb, &pNOR->frame, pNOR->idx); } } @@ -654,5 +909,25 @@ static int north_ch(rt_uint8_t argc, char **argv) MSH_CMD_EXPORT(north_ch, north channel select); +static int north_diag(int argc, char **argv) +{ + rt_uint8_t i; + struct chrg_north_t *pNOR = &chrgnorth; + struct chrg_rollnor_t *pROLL = &chrgrollnor; + + rt_kprintf("roll: run=%d idx=%d ch=%d type=%d sub=%d\r\n", + pROLL->run, pROLL->idx, pROLL->ch, pROLL->type, pROLL->sub); + rt_kprintf("rx: rb_len=%d findhead=%d frame_len=%d received=%d\r\n", + pNOR->rb ? rt_ringbuffer_data_len(pNOR->rb) : 0, + pNOR->frame.findhead, pNOR->frame.len_msg, pNOR->frame.length); + for (i = 0; i < TOTAL_NOR_CHS; i++) { + rt_kprintf("ch%d: enable=%d id=%d sub=%d\r\n", i, + pNOR->enable[i], pNOR->sw[i].id, pNOR->sw[i].sub); + } + return 0; +} + +MSH_CMD_EXPORT(north_diag, show north polling and frame state); + #endif diff --git a/apps/chrg/applications/thread/chrg_north.h b/apps/chrg/applications/thread/chrg_north.h index 9004694..8ad285d 100644 --- a/apps/chrg/applications/thread/chrg_north.h +++ b/apps/chrg/applications/thread/chrg_north.h @@ -19,15 +19,20 @@ #define THR_NAME_NORTH "thr.nor" #define DEV_NAME_NORTH "uart3" -#define LEN_FRAME_HEAD (3) // [甯ч暱, 0x00, id] +#define LEN_FRAME_HEAD (4) // [甯ч暱, 0x00, id, 鍛戒护] #define MIN_FRAME_LENGTH (5) // 甯ф渶鐭5瀛楄妭 #define WORK_MIN_VOLT 3000 // 宸ヤ綔鐢靛帇涓嬮檺锛屽崟浣峬V -#define DEBUG_NORTH 0x00 // 0 = 鍏抽棴锛1 = 寮鍚 +#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 // 鍗楀悜瀵勫瓨鍣ㄥ啓鍛戒护 +#define COMM_FRAME_DEBUG 0x00 // COM UART鍘熷鏀跺彂甯 +#define COMM_DEBUG 0x00 // COM瀵勫瓨鍣ㄨ鍐欒繃绋 +#define COMM_TRIM_DEBUG 0x00 // COM鏍″噯鍙傛暟瑙ｆ瀽 #define LCD_OPEN 0x01 // 0涓哄叧闂睆骞曟樉绀 1涓烘墦寮 #define TRIM_NORTH 0x00 // 0 = 鍏抽棴, 1 = 寮鍚 #define SINK_TEST_DEBUG 0x00 // 0 = 鍏抽棴锛1 = 寮鍚 -#define PRO_TEST_DEBUG 0x00 // -#define DEBUG_SOUTH 0x00 // 0 = 鍏抽棴锛1 = 寮鍚 // 鍖楀悜4閫氳矾绱㈠紩 U14 -> typedef enum { IDX_NOR_CH1 = IDX_CH1, // J3 @@ -95,7 +100,6 @@ struct chrg_trim { rt_int16_t trim_source_curr_b; // 鏍″噯鐢垫簮鐢垫祦鍊糱 mA rt_int16_t trim_zero; // 鏍″噯椋橀浂鍊 mV/mA rt_uint8_t trim_mode; // 鏍″噯妯″紡, 0-榛樿鍊硷紝1-鏍″噯鐢靛帇锛2-鏍″噯鐢垫祦锛3-鏍″噯鐢垫簮鐢垫祦 - rt_uint8_t trim_step; rt_uint8_t trim_enable_flag; //0灏辨槸榛樿鍐欑敤鎴峰尯锛1鍒欏啓鍑哄満鏁版嵁鍖 }; @@ -105,6 +109,7 @@ struct chrg_north_t { struct chrg_tty_t *tty; struct rt_ringbuffer *rb; struct pickup_info_t frame; + rt_uint32_t config_version[TOTAL_NOR_CHS]; // COM閰嶇疆鐗堟湰锛岀敤浜庤瘑鍒瓑寰呮湡闂村埌杈剧殑鏃у洖鐮 struct chrg_trim trim[TOTAL_NOR_CHS]; rt_uint8_t rx_buf[SIZE_BUF_TTY]; rt_uint8_t free_flag; @@ -112,11 +117,34 @@ struct chrg_north_t { rt_uint8_t manual; // 鎵嬪姩鎻掑叆鍛戒护 eIDX_NOR_CH idx; // 褰撳墠閫氳矾 struct chrg_switch_t sw[TOTAL_NOR_CHS]; - rt_uint8_t north_mode; // 0-姝ｅ父妯″紡锛 1-鏍″噯妯″紡 }; extern struct chrg_north_t chrgnorth; +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_parse +鍑芥暟鎻忚堪锛 瑙ｆ瀽Source鐨0x20鐢靛帇鐢垫祦鍥炵爜骞堕┍鍔ㄧ數婧愮姸鎬佹満 +杈撳叆鍙傛暟锛 frame_data:宸查氳繃CRC鏍￠獙鐨勫畬鏁村洖鐮 idx:瀵瑰簲閫氶亾 + pSW:閫氶亾鎺у埗缁撴瀯浣 pNOR:鍖楀悜鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏇存柊Source鐩爣鐢靛帇銆佺數娴佸拰宸ヤ綔鐘舵 +杩斿洖璇存槑锛 0:鍥炵爜姝ｅ父 <0:鍙傛暟閿欒銆丼ource鍒囨崲閿欒鎴栧姛鐜囧懡浠ゆ彁浜ゅけ璐 +鍏跺畠璇存槑锛 浠呯敱鍖楀悜杞绾跨▼鍦ㄧ‘璁ゅ洖鐮佽鑹层佸懡浠ゅ拰閫氶亾鍖归厤鍚庤皟鐢 +*****************************************************************/ +extern int chrg_source_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx, + struct chrg_switch_t *pSW, struct chrg_north_t *pNOR); + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_parse +鍑芥暟鎻忚堪锛 瑙ｆ瀽Sink鐨0x20鐢靛帇鐢垫祦鍥炵爜骞堕┍鍔ㄨ礋杞界姸鎬佹満 +杈撳叆鍙傛暟锛 frame_data:宸查氳繃CRC鏍￠獙鐨勫畬鏁村洖鐮 idx:瀵瑰簲閫氶亾 + pSW:閫氶亾鎺у埗缁撴瀯浣 pNOR:鍖楀悜鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏇存柊Sink鍗忚閲忔祴鍊煎拰宸ヤ綔鐘舵 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 浠呯敱鍖楀悜杞绾跨▼鍦ㄧ‘璁ゅ洖鐮佽鑹层佸懡浠ゅ拰閫氶亾鍖归厤鍚庤皟鐢 +*****************************************************************/ +extern void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx, + struct chrg_switch_t *pSW, struct chrg_north_t *pNOR); + /***************************************************************** 鍑芥暟鍚嶇О锛 chrg_north_switch 鍑芥暟鎻忚堪锛 鍖楀悜閫氶亾閫夋嫨 diff --git a/apps/chrg/applications/thread/chrg_roll_nor.c b/apps/chrg/applications/thread/chrg_roll_nor.c index 52e1f01..c70d52b 100644 --- a/apps/chrg/applications/thread/chrg_roll_nor.c +++ b/apps/chrg/applications/thread/chrg_roll_nor.c @@ -1,7 +1,7 @@ /**************************************************************************** 鏂囦欢鍚嶇О : chrg_roll_nor.c 瀹屾垚鏃ユ湡 : -褰撳墠鐗堟湰鍙 : V1.0 +褰撳墠鐗堟湰鍙 : V1.1.9 涓昏鍔熻兘 : 瀹炵幇鍖楀悜閫氫俊杞贰璇锋眰鍛戒护銆備互鐙珛绾跨▼澶勭悊銆 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 璇存槑 : @@ -17,6 +17,8 @@ #include "chrg_sink.h" #include "chrg_source.h" #include "chrg_roll_nor.h" +#include "chrg_roll_sou.h" +#include "chrg_comm.h" #include "chrg_north.h" #include "chrg_switch.h" #include "chrg_utils.h" @@ -24,6 +26,17 @@ #include "chrg_wdt.h" #define LOG_TAG "chrg.rollnor" #include + +#define NORTH_RESPONSE_TIMEOUT_MS 50U // 鍗曟鍖楀悜璇锋眰绛夊緟鍖归厤鍥炵爜鐨勬绘椂闂 +#define NORTH_REQUEST_MAX_RETRIES 2U // 棣栨鍙戦佸け璐ュ悗鏈澶氶噸鍙2娆★紝鎬诲彂閫佹鏁颁负3娆 +#define NORTH_MEASURE_MAX_ATTEMPTS 1U // 0x20閲忔祴鏌ヨ澶辫触鍚庣洿鎺ョ暀缁欎笅涓杞疆璇㈤噸鍙 +#define NORTH_RETRY_INTERVAL_MS 5U // 鐩稿悓璇锋眰涓ゆ鍙戦佷箣闂寸殑淇濇姢闂撮殧 +#define NORTH_POLL_INTERVAL_MS 10U // 涓涓氶亾浜嬪姟缁撴潫鍚庡埌涓嬩竴閫氶亾鐨勮疆璇㈤棿闅 +#define SOURCE_PROTOCOL_WAIT_MS 100U // 姣忛氶亾0xD0搴旂瓟鍚庣殑鍗忚鐢熸晥淇濇姢鏃堕棿 +#define SINK_CC_WAIT_MS 50U // Sink璁剧疆鐩爣CC搴旂瓟鍚庣殑闈為樆濉炰繚鎶ゆ椂闂 +#define SINK_HANDSHAKE_FIRST_QUERY_DELAY_MS 50U // 鍗忚/CC鍥炵爜鍚庨鏉0x20鐨勭瓑寰呮椂闂 +#define SINK_HANDSHAKE_QUERY_INTERVAL_MS 50U // 鎻℃墜鏈畬鎴愭椂鍚庣画0x20鏌ヨ闂撮殧 +#define SOURCE_CHANNEL_BIT(ch) ((rt_uint8_t)(1U << (ch))) const rt_base_t sw_uart[TOTAL_NOR_CHS] = { IDX_GPO_UART_SW1, IDX_GPO_UART_SW2, @@ -37,6 +50,273 @@ struct chrg_rollnor_t chrgrollnor = { // .Set_Role = ID_SINK, // .group = 0, }; + +/* 鎵鏈夊弬涓嶤C_CLOSE鐨勯氶亾鍏变韩300ms灞忛殰锛涘崗璁瓑寰呬粛鎸夐氶亾鐙珛璁℃椂銆 */ +static rt_uint8_t g_source_protocol_wait_mask = 0U; +static rt_tick_t g_source_protocol_wait_start[TOTAL_NOR_CHS] = {0}; +static rt_uint8_t g_sink_cc_wait_mask = 0U; +static rt_tick_t g_sink_cc_wait_start[TOTAL_NOR_CHS] = {0}; +/* Sink鍗忚/CC鎻℃墜鏈熼棿鐨0x20鏌ヨ鑺傛祦璁板綍锛屾寜閫氶亾鐙珛璁℃椂銆 */ +static rt_bool_t g_sink_query_throttle[TOTAL_NOR_CHS] = {RT_FALSE}; +static rt_bool_t g_sink_query_first_pending[TOTAL_NOR_CHS] = {RT_FALSE}; +static rt_tick_t g_sink_query_tick[TOTAL_NOR_CHS] = {0}; + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_sink_query_is_slow +鍑芥暟鎻忚堪锛 鍒ゆ柇褰撳墠Sink鐘舵佹槸鍚︿粛澶勪簬鍗忚鎻℃墜閲忔祴闃舵 +杈撳叆鍙傛暟锛 pSW:褰撳墠璐熻浇閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:0x20鏌ヨ鎸夋彙鎵嬭妭濂忓彂閫 RT_FALSE:浣跨敤姝ｅ父杞鍛ㄦ湡 +鍏跺畠璇存槑锛 鍙湁鍗忚/CC璁剧疆鍚庣瓑寰呭崗鍟嗙數鍘嬬殑闃舵闄愰燂紱RUNING鍜屼綆鐢垫祦 + 寰呮満涓嶅彈褰卞搷锛岄伩鍏嶅奖鍝嶆甯搁噺娴嬪埛鏂伴熷害 +*****************************************************************/ +static rt_bool_t chrg_roll_nor_sink_query_is_slow( + const struct chrg_switch_t *pSW) +{ + if (pSW == RT_NULL) { + return RT_FALSE; + } + return (pSW->sink.work_mode == SINK_WORK_WAIT) || + (pSW->sink.work_mode == SINK_WORK_INIT_AUX_WAIT) || + (pSW->sink.work_mode == SINK_WORK_LOW_MONITOR); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_sink_query_wait_start +鍑芥暟鎻忚堪锛 鍚姩Sink鎻℃墜闃舵鐨0x20鏌ヨ鑺傛祦璁℃椂 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 +杈撳嚭鍙傛暟锛 璁板綍褰撳墠tick骞跺紑鍚妭娴 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鍗忚鎴朇C鍥炵爜鎴愬姛鍚庤皟鐢紝閬垮厤涓嬩竴杞珛鍗虫煡璇㈠崗璁澘 +*****************************************************************/ +static void chrg_roll_nor_sink_query_wait_start(rt_uint8_t ch) +{ + if (ch >= TOTAL_NOR_CHS) { + return; + } + g_sink_query_throttle[ch] = RT_TRUE; + g_sink_query_first_pending[ch] = RT_TRUE; + g_sink_query_tick[ch] = rt_tick_get(); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_source_switch_reset +鍑芥暟鎻忚堪锛 娓呯悊鎸囧畾Source閫氶亾鐨凜C_CLOSE鍙婂崗璁瓑寰呰褰 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 +杈撳嚭鍙傛暟锛 娓呴櫎瀵瑰簲閫氶亾鐨勫睆闅滀綅鍜屽崗璁瓑寰呰鏃 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 璋冪敤鑰呭繀椤绘寔鏈夊寳鍚戣疆璇㈢嚎绋嬩簰鏂ラ攣 +*****************************************************************/ +void chrg_roll_nor_source_switch_reset(rt_uint8_t ch) +{ + if (ch >= TOTAL_NOR_CHS) { + return; + } + g_source_protocol_wait_mask &= + (rt_uint8_t)~SOURCE_CHANNEL_BIT(ch); + g_source_protocol_wait_start[ch] = 0U; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_source_cc_close_register +鍑芥暟鎻忚堪锛 灏哠ource閫氶亾鐧昏鍒版湰杞叡浜獵C_CLOSE绛夊緟灞忛殰 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 +杈撳嚭鍙傛暟锛 璁剧疆pending浣嶅苟娓呴櫎璇ラ氶亾鏃CK鍜岀瓑寰呯姸鎬 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鏂伴氶亾鍔犲叆宸茬粡寮濮嬬殑灞忛殰鏃堕噸鏂扮瓑寰咃紝淇濊瘉鎵鏈夌櫥璁伴氶亾鍏变韩瀹屾暣淇濇姢鏃堕棿 +*****************************************************************/ +static void chrg_roll_nor_source_protocol_wait_start(rt_uint8_t ch) +{ + if (ch >= TOTAL_NOR_CHS) { + return; + } + g_source_protocol_wait_mask |= SOURCE_CHANNEL_BIT(ch); + g_source_protocol_wait_start[ch] = rt_tick_get(); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_source_wait_process +鍑芥暟鎻忚堪锛 澶勭悊Source鍏变韩CC_CLOSE绛夊緟鍜屾瘡閫氶亾鍗忚鐢熸晥绛夊緟 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 pSW:閫氶亾鐘舵 +杈撳嚭鍙傛暟锛 CC_CLOSE绛夊緟鍒版湡杩涘叆0xD0锛屽崗璁瓑寰呭埌鏈熻繘鍏ョ洰鏍嘋C璁剧疆 +杩斿洖璇存槑锛 RT_TRUE:鏈疆浠嶅浜庣瓑寰咃紝涓嶅彂閫佸懡浠 RT_FALSE:鍙户缁彂閫 +鍏跺畠璇存槑锛 CC_CLOSE浣跨敤鍏变韩300ms灞忛殰锛屽崗璁瓵CK鍚庢瘡閫氶亾鐙珛绛夊緟100ms +*****************************************************************/ +static rt_bool_t chrg_roll_nor_source_wait_process(rt_uint8_t ch, + struct chrg_switch_t *pSW) +{ + rt_uint8_t bit; + rt_tick_t elapsed; + + if ((ch >= TOTAL_NOR_CHS) || (pSW == RT_NULL)) { + return RT_FALSE; + } + bit = SOURCE_CHANNEL_BIT(ch); + + if ((pSW->id != ID_SOURCE) || !pSW->source.On_Flag) { + 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) { + pSW->sub = IDX_SET_SOURCE_CC_SET; + return RT_FALSE; + } + elapsed = (rt_tick_t)(rt_tick_get() - + g_source_protocol_wait_start[ch]); + if (elapsed < rt_tick_from_millisecond(SOURCE_PROTOCOL_WAIT_MS)) { + return RT_TRUE; + } + g_source_protocol_wait_mask &= (rt_uint8_t)~bit; + g_source_protocol_wait_start[ch] = 0U; + pSW->sub = IDX_SET_SOURCE_CC_SET; + return RT_FALSE; + } + return RT_FALSE; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_sink_cc_wait_start +鍑芥暟鎻忚堪锛 Sink鐩爣CC璁剧疆鏀跺埌鏈夋晥搴旂瓟鍚庡惎鍔ㄨ閫氶亾鐨勭ǔ瀹氳鏃 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 +杈撳嚭鍙傛暟锛 璁板綍閫氶亾绛夊緟鏍囧織鍜岃捣濮媡ick +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 姣忎釜閫氶亾鐙珛璁℃椂锛屽涓氶亾鍒囨崲CC鏃剁瓑寰呮椂闂翠笉浼氫覆琛岀疮鍔 +*****************************************************************/ +static void chrg_roll_nor_sink_cc_wait_start(rt_uint8_t ch) +{ + if (ch >= TOTAL_NOR_CHS) { + return; + } + g_sink_cc_wait_mask |= SOURCE_CHANNEL_BIT(ch); + g_sink_cc_wait_start[ch] = rt_tick_get(); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_sink_wait_process +鍑芥暟鎻忚堪锛 绠＄悊Sink瀹夊叏鍗歌浇銆佸崡鍖楀苟琛屾彙鎵嬪拰CC璁剧疆鍚庣殑绋冲畾绛夊緟 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 pSW:閫氶亾瀹炴椂鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鍗楀悜鎵规瀹屾垚鍚庡厑璁稿崗璁/CC锛涗綆鐢垫祦鍜孋C鍧囨弧瓒冲悗鍏佽鏌ヨ +杩斿洖璇存槑锛 RT_TRUE:鏈疆浠嶉渶绛夊緟锛屼笉鍙戦佸寳鍚戝懡浠 RT_FALSE:鍙户缁彂閫 +鍏跺畠璇存槑锛 瀹屾暣閲嶆彙鎵嬩腑锛屽崡鍚戞壒娆″畬鎴愬悗鍗忚/CC涓庝綆鐢垫祦纭骞惰锛 + 杩涘叆GET_SINK_VC鍚庯紝蹇呴』绛変綆鐢垫祦纭瀹屾垚鎵嶅厑璁稿彂閫0x20 +*****************************************************************/ +static rt_bool_t chrg_roll_nor_sink_wait_process(rt_uint8_t ch, + struct chrg_switch_t *pSW) +{ + rt_uint8_t bit; + rt_tick_t elapsed; + + if ((ch >= TOTAL_NOR_CHS) || (pSW == RT_NULL)) { + return RT_FALSE; + } + bit = SOURCE_CHANNEL_BIT(ch); + + /* 鍏虫満蹇呴』鍏堝畬鎴愬崡鍚戜綆鐢垫祦纭鍜岀户鐢靛櫒鎵规锛屾湡闂寸姝㈠寳鍚戝彂閫併 */ + if ((pSW->sink.work_mode == SINK_WORK_STOP_WAIT) || + (pSW->sink.work_mode == SINK_WORK_STOP_RELAY) || + (pSW->sink.work_mode == SINK_WORK_STOP_RELAY_WAIT)) { + return RT_TRUE; + } + + if ((pSW->id != ID_SINK) || !pSW->sink.On_work) { + g_sink_cc_wait_mask &= (rt_uint8_t)~bit; + g_sink_cc_wait_start[ch] = 0U; + g_sink_query_throttle[ch] = RT_FALSE; + g_sink_query_first_pending[ch] = RT_FALSE; + g_sink_query_tick[ch] = 0U; + return RT_FALSE; + } + /* 鏅氳蒋鍗歌浇鍜屼綆鐢垫祦鎭㈠浠嶇姝㈠寳鍚戯紱INIT_AUX_WAIT鍏佽鍗楀寳鍚戝苟琛屻 */ + if ((pSW->sink.work_mode == SINK_WORK_UNLOAD_WAIT) || + (pSW->sink.work_mode == SINK_WORK_LOW_AUX_WAIT)) { + return RT_TRUE; + } + + /* 鍗忚鎴朇C鍒囨崲蹇呴』鍏堝畬鎴愪綆鐢垫祦纭锛涜杩囩▼淇濇寔鍗楀悜缁х數鍣ㄧ姸鎬佷笉鍙樸 */ + if (pSW->sink.work_mode == SINK_WORK_HANDSHAKE_WAIT) { + return RT_TRUE; + } + + /* D0鍥炵爜纭鍚庡厛缁忚繃涓涓潪鍙戦佺姸鎬侊紝绂佹鎶婂崗璁洖鐮佸綋鎴愰噺娴嬪洖鐮併 */ + if (pSW->sub == IDX_WAIT_SINK_PD_ACK) { + pSW->sub = IDX_GET_SINK_VC; + chrg_roll_nor_sink_query_wait_start(ch); + return RT_TRUE; + } + + if ((pSW->sub != IDX_WAIT_SINK_CC) && + (pSW->sub != IDX_WAIT_SINK_CC_BEFORE_PD)) { + /* COM鍦ㄧ瓑寰呮湡闂存彁浜ゆ柊閰嶇疆鏃讹紝娓呯悊鏃т簨鍔＄暀涓嬬殑CC璁℃椂璁板綍銆 */ + g_sink_cc_wait_mask &= (rt_uint8_t)~bit; + g_sink_cc_wait_start[ch] = 0U; + if (!chrg_roll_nor_sink_query_is_slow(pSW)) { + g_sink_query_throttle[ch] = RT_FALSE; + g_sink_query_first_pending[ch] = RT_FALSE; + g_sink_query_tick[ch] = 0U; + } + } else { + if ((g_sink_cc_wait_mask & bit) == 0U) { + if (pSW->sub == IDX_WAIT_SINK_CC_BEFORE_PD) { + pSW->sub = IDX_SET_SINK_PD; + } else { + pSW->sub = IDX_GET_SINK_VC; + chrg_roll_nor_sink_query_wait_start(ch); + } + return RT_TRUE; + } + elapsed = (rt_tick_t)(rt_tick_get() - g_sink_cc_wait_start[ch]); + if (elapsed < rt_tick_from_millisecond(SINK_CC_WAIT_MS)) { + return RT_TRUE; + } + + if (pSW->sub == IDX_WAIT_SINK_CC_BEFORE_PD) { + /* CC鍏堣缃畬鎴愬悗杩涘叆鍗忚璁剧疆锛屼笉绔嬪嵆鏌ヨ鐢靛帇銆 */ + g_sink_query_throttle[ch] = RT_FALSE; + g_sink_query_first_pending[ch] = RT_FALSE; + g_sink_query_tick[ch] = 0U; + g_sink_cc_wait_mask &= (rt_uint8_t)~bit; + g_sink_cc_wait_start[ch] = 0U; + pSW->sub = IDX_SET_SINK_PD; + return RT_TRUE; + } + + /* 鍗忚宸插厛璁剧疆锛汣C搴旂瓟骞跺畬鎴愪繚鎶ょ瓑寰呭悗杩涘叆鐢靛帇鏌ヨ銆 */ + g_sink_query_throttle[ch] = RT_TRUE; + g_sink_query_first_pending[ch] = RT_TRUE; + g_sink_query_tick[ch] = g_sink_cc_wait_start[ch]; + g_sink_cc_wait_mask &= (rt_uint8_t)~bit; + g_sink_cc_wait_start[ch] = 0U; + pSW->sub = IDX_GET_SINK_VC; + return RT_TRUE; + } + + /* 棣栨潯0x20绛夊緟200ms锛涙彙鎵嬫湭绋冲畾鏃讹紝鍚庣画鏌ヨ闂撮殧缂╃煭涓100ms銆 */ + if (chrg_roll_nor_sink_query_is_slow(pSW) && + (pSW->sub == IDX_GET_SINK_VC)) { + rt_uint32_t query_interval_ms; + + if (!g_sink_query_throttle[ch]) { + chrg_roll_nor_sink_query_wait_start(ch); + return RT_TRUE; + } + query_interval_ms = g_sink_query_first_pending[ch] ? + SINK_HANDSHAKE_FIRST_QUERY_DELAY_MS : + SINK_HANDSHAKE_QUERY_INTERVAL_MS; + elapsed = (rt_tick_t)(rt_tick_get() - g_sink_query_tick[ch]); + if (elapsed < rt_tick_from_millisecond(query_interval_ms)) { + return RT_TRUE; + } + g_sink_query_first_pending[ch] = RT_FALSE; + g_sink_query_tick[ch] = rt_tick_get(); + } + return RT_FALSE; +} /***************************************************************** 鍑芥暟鍚嶇О锛 sink_fill_pd_buf 鍑芥暟鎻忚堪锛 鏍规嵁蹇厖鍗忚绫诲瀷濉厖PD鎸囦护鐨5瀛楄妭鏁版嵁缂撳啿鍖 @@ -67,8 +347,8 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt case 0xF6: // QC3.0鍗忚 case 0xF2: // FCP鍗忚 buf[0] = pd_volt / 100; // 绗5瀛楄妭=鐢靛帇(0.1V) - buf[1] = pd_curr / 100; // 绗6瀛楄妭=鐢垫祦(0.1A) - #if PRO_TEST_DEBUG + buf[1] = 0x00;//pd_curr / 100; // 绗6瀛楄妭=鐢垫祦(0.1A) + #if NORTH_SINK_DEBUG rt_kprintf("type: %02X, Voltage(0.1V)=%d\n", pd_val, pd_volt/100); rt_kprintf("type: %02x, Curr(0.1A)=%d\n",pd_curr,pd_curr/100); #endif @@ -82,7 +362,7 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt buf[2] = pd_volt & 0xFF; // 绗7瀛楄妭=鐢靛帇浣8浣(mV) buf[3] = (pd_curr >> 8) & 0xFF; // 绗8瀛楄妭=鐢垫祦楂8浣(mA) buf[4] = pd_curr & 0xFF; // 绗9瀛楄妭=鐢垫祦浣8浣(mA) - #if PRO_TEST_DEBUG + #if NORTH_SINK_DEBUG rt_kprintf("type: %02X, Group=0, Voltage=%d mV, Current=%d mA\n", pd_val, pd_volt, pd_curr); #endif break; @@ -95,7 +375,7 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt buf[2] = pd_volt & 0xFF; // 绗7瀛楄妭=鐢靛帇浣8浣(mV) buf[3] = (pd_curr >> 8) & 0xFF; // 绗8瀛楄妭=鐢垫祦楂8浣(mA) buf[4] = pd_curr & 0xFF; // 绗9瀛楄妭=鐢垫祦浣8浣(mA) - #if PRO_TEST_DEBUG + #if NORTH_SINK_DEBUG rt_kprintf("type: %02X, Group=0, Voltage=%d mV, Current=%d mA\n", pd_val, pd_volt, pd_curr); #endif break; @@ -108,15 +388,15 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt buf[1] = pd_volt & 0xFF; // 绗7瀛楄妭=鐢靛帇浣8浣(mV) buf[2] = (pd_curr >> 8) & 0xFF; // 绗8瀛楄妭=鐢垫祦楂8浣(mA) buf[3] = pd_curr & 0xFF; // 绗9瀛楄妭=鐢垫祦浣8浣(mA) - buf[4] = 0; - #if PRO_TEST_DEBUG + buf[4] = 0x00; + #if NORTH_SINK_DEBUG rt_kprintf("type: %02X, Voltage=%d mV, Current=%d mA\n", pd_val, pd_volt, pd_curr); #endif break; // VOOC锛堟棤鍙傛暟锛 case 0xE2: // VOOC鍗忚 - #if PRO_TEST_DEBUG + #if NORTH_SINK_DEBUG rt_kprintf("type: VOOC(0xE2), No parameters\n"); #endif break; @@ -129,7 +409,7 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt rt_uint8_t volt_v = pd_volt / 1000; // 杞垚V锛5000mV鈫5V锛 volt_hex = volt_v - 5; // 5V瀵瑰簲0锛20V瀵瑰簲15锛0xF锛 } else { - #if PRO_TEST_DEBUG + #if NORTH_SINK_DEBUG rt_kprintf("AFC VOLT ERROR VOLT=:%d mV Set 5000~20000\n", pd_volt); #endif return -1; @@ -140,9 +420,11 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt if (pd_curr >= 750 && pd_curr <= 3000) { // 鐢垫祦鑼冨洿锛0.75A(750mA)~3.0A(3000mA) rt_uint16_t curr_ma_step = (pd_curr - 750) / 150; // 姝ラ暱150mA锛0.75鈫1.5鈫...鈫3.0锛 curr_hex = curr_ma_step; // 0.75A瀵瑰簲0锛3.0A瀵瑰簲15锛0xF锛 +#if NORTH_SINK_DEBUG rt_kprintf("curr_ma_step = %d",curr_ma_step); +#endif } else { - #if PRO_TEST_DEBUG + #if NORTH_SINK_DEBUG rt_kprintf("AFC CURR ERROR%d mA SET 750~3000 \n", pd_curr); #endif return -1; @@ -150,8 +432,10 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt // 3. 鍚堝苟鐢靛帇Hex锛堥珮4浣嶏級鍜岀數娴丠ex锛堜綆4浣嶏級鈫 濉厖绗簲瀛楄妭 buf[0] = (volt_hex << 4) | curr_hex; +#if NORTH_SINK_DEBUG rt_kprintf("type: AFC(0xF9), Voltage=%d V, Current=%.2f A, volaue=0x%X\n", pd_volt/1000, pd_curr/1000.0, buf[0]); +#endif } break; // 鏈煡绫诲瀷 @@ -162,38 +446,6 @@ int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt return 0; } -rt_uint16_t v1=0,v2=0; - - -//鐢垫簮鍏抽棴 -void chrg_nor_source_stop(struct chrg_switch_t *pSW,rt_uint8_t idx,rt_uint8_t *enable){ - switch(pSW->source.Stop_step_flag){ - case 0: - chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_STOP); - pSW->source.Stop_step_flag = 1; - break; - case 1: // 鍋滄宸ヤ綔 - chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_STOP); - pSW->source.Stop_step_flag = 2; - break; - case 2: // 鍏抽棴鍖楀悜缁х數鍣 - chrg_nor_sw_rel((eIDX_NOR_CH)idx,0); - pSW->source.Stop_step_flag = 3; - break; - case 3: // 鐘舵2锛氬凡鎵ц瀹屽仠姝㈡搷浣滐紝娓呯┖鏍囧織浣 - pSW->source.Set_CV_Flag = 0; - if(pSW->source.change_sink_Flag == 1){ - pSW->source.change_sink_Flag = 0; -// chrg_com_sink_on(idx,pSW,enable); - }else{ - *enable = 0; - } - break; - default: - pSW->source.Stop_step_flag = 0; - break; - } -} /***************************************************************** 鍑芥暟鍚嶇О锛 chrg_roll_nor_sw_uart @@ -217,106 +469,237 @@ static void chrg_roll_nor_sw_uart (eIDX_NOR_CH ch, eIDX_ID id) } -//璁剧疆璐熻浇鍗忚 -void chrg_roll_nor_sink_pro_set(struct chrg_switch_t *pSW) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_sink_pro_set +鍑芥暟鎻忚堪锛 鏍规嵁褰撳墠璐熻浇鍗忚鍙傛暟缁勫抚骞朵笅鍙戣礋杞藉崗璁缃懡浠 +杈撳叆鍙傛暟锛 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 >0:鍙戦侀暱搴 <0:鍙傛暟缁勫抚鎴栦覆鍙ｅ彂閫佸け璐 +鍏跺畠璇存槑锛 鏈嚱鏁板彧璐熻矗鍙戦侊紝涓嶄慨鏀筽SW->sub锛岀姸鎬佺敱鏈夋晥鍥炵爜纭鍚庢帹杩 +*****************************************************************/ +static int chrg_roll_nor_sink_pro_set(struct chrg_switch_t *pSW) { rt_uint8_t buf[6] = {0}; - sink_fill_pd_buf(pSW->sink.Pro_Group,pSW->sink.protocol,pSW->sink.pro_loadv,pSW->sink.pro_loadc,buf); - sink_set_pd(pSW->sink.protocol,buf); -#if DEBUG_NORTH + if (sink_fill_pd_buf(pSW->sink.Pro_Group, pSW->sink.protocol, + pSW->sink.pro_loadv, pSW->sink.pro_loadc, buf) != 0) { + return -1; + } +#if NORTH_SINK_DEBUG rt_kprintf("set_pro\r\n"); -#endif +#endif + return sink_set_pd(pSW->sink.protocol, buf); } -//璁剧疆鐢垫簮鍗忚 -void chrg_roll_nor_source_pro_set(struct chrg_switch_t *pSW){ - if(pSW->source.Set_Pro_Flag == 1){ - pSW->source.Set_Pro_Flag = 0; - if(pSW->source.LCD_Set_Pro_Flag==1){ - source_set_pd(pSW->source.protocol,0,0,pSW->source.vc.set_voltage,0,pSW->source.vc.set_current); - } - else if(pSW->source.LCD_Set_Pro_Flag==2){ - source_set_pd_com(pSW->source.protocol,pSW->source.pro_gear_idx); - } - else if(pSW->source.LCD_Set_Pro_Flag==3){ - source_set_pd_new_com(pSW->source.protocol,pSW); - } - }else { - pSW->sub = IDX_GET_SOURCE_VC; - } -} -static int chrg_roll_nor_parse (struct chrg_rollnor_t *pROLL, rt_uint8_t *data) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_source_pro_set +鍑芥暟鎻忚堪锛 鏍规嵁褰撳墠鐢垫簮鍗忚鍙傛暟缁勫抚骞朵笅鍙戠數婧愬崗璁缃懡浠 +杈撳叆鍙傛暟锛 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 >0:鍙戦侀暱搴 <0:鍙傛暟缁勫抚鎴栦覆鍙ｅ彂閫佸け璐 +鍏跺畠璇存槑锛 鏈嚱鏁板彧璐熻矗鍙戦侊紝涓嶄慨鏀筽SW->sub锛岀姸鎬佺敱鏈夋晥鍥炵爜纭鍚庢帹杩 +*****************************************************************/ +static int chrg_roll_nor_source_pro_set(struct chrg_switch_t *pSW) { - if ((RT_NULL == pROLL)||(RT_NULL == data)) { - return -1; + return source_set_pro(pSW->source.protocol, pSW); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_expected_cmd +鍑芥暟鎻忚堪锛 鏍规嵁褰撳墠瑙掕壊鍜宻ub鐘舵佸彇寰楁湰娆″寳鍚戣姹傛湡鏈涚殑鍥炵爜鍛戒护 +杈撳叆鍙傛暟锛 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 闈0:鏈熸湜鍛戒护鐮 0:褰撳墠鐘舵佹病鏈夊彲璇嗗埆鐨勫寳鍚戣姹 +鍏跺畠璇存槑锛 蹇呴』鍦╟hrg_roll_nor_set鍙戦佸懡浠ゅ墠璋冪敤锛岀‘淇濅繚瀛樼殑鏈熸湜鍛戒护 + 涓庡疄闄呭彂閫佸懡浠や竴鑷 +*****************************************************************/ +static rt_uint8_t chrg_roll_nor_expected_cmd(const struct chrg_switch_t *pSW) +{ + if (pSW == RT_NULL) { + return 0; } - chrg_north_switch(IDX_NOR_CH1); - // 璇诲彇鍖楀悜鍏ㄥ眬缁撴瀯浣撲腑褰撳墠閫氶亾鐨凷ource/Sink鍙傛暟 - struct chrg_switch_t *pSW = &chrgnorth.sw[pROLL->ch]; - if (1 == pROLL->type) { - switch (pROLL->sub) { - case IDX_GET_SOURCE_VC: { - - } - break; - - case IDX_GET_SOURCE_PD: { - - } - break; - - case IDX_SET_SOURCE_PD: { - - } - break; - - case IDX_SET_SOURCE_CCLVL: { - - } - break; + if (pSW->id == ID_SOURCE) { + switch (pSW->sub) { + case IDX_GET_SOURCE_VC: + return SRC_CMD_GET_VOLTAGE; + case IDX_GET_SOURCE_PD: + return SRC_CMD_GET_PROTOCOL; + case IDX_SET_SOURCE_PD: + return SRC_CMD_SET_PROTOCOL; + case IDX_SET_SOURCE_RESET: + return SRC_CMD_RESET; + case IDX_SET_SOURCE_CC_SET: + return SRC_CMD_SET_CC_CHOOSE; + case IDX_SET_SOURCE_CCLVL: + return SRC_CMD_SET_CC_LEVEL; default: - return -1; - break; + return 0; } + } - } else if (0 == pROLL->type) { - chrg_roll_nor_sw_uart(IDX_NOR_CH1,ID_SINK); - switch (pROLL->sub) { - case IDX_GET_SINK_VC: { - sink_get_vc(pSW->sink.pro_loadv,pSW->sink.pro_loadc); - } - break; - - case IDX_GET_SINK_PD: { - - } - break; - - case IDX_SET_SINK_PD: { - - } - break; - - case IDX_SET_SINK_CCLINE: { - - } - break; - - case IDX_SET_SINK_CCLVL: { - - } - break; - + if (pSW->id == ID_SINK) { + switch (pSW->sub) { + case IDX_GET_SINK_VC: + return SINK_CMD_GET_VOLTAGE; + case IDX_GET_SINK_PD: + return SINK_CMD_GET_PD; + case IDX_SET_SINK_PD: + case IDX_SET_SINK_PD_ONLY: +#if 0 + case IDX_SET_SINK_PD_BEFORE_CC: +#endif + return pSW->sink.protocol; + case IDX_SET_SINK_CCLINE: + case IDX_SET_SINK_CC_BEFORE_PD: + return SINK_CMD_SET_CC; + case IDX_SET_SINK_CCLVL: + return SINK_CMD_SET_LEVEL; default: - return -1; + return 0; } - } else { - return -1; } return 0; } + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_response_matches +鍑芥暟鎻忚堪锛 鏍￠獙鍖楀悜鍥炵爜涓庡綋鍓嶈姹傜殑閫氶亾瑙掕壊銆佸懡浠ゅ拰鍥哄畾闀垮害鏄惁鍖归厤 +杈撳叆鍙傛暟锛 pMB:宸查氳繃north.c缁撴瀯鍙奀RC鏍￠獙鐨勫洖鐮 expected_idx:璇锋眰閫氶亾 + expected_id:璇锋眰瑙掕壊 expected_cmd:璇锋眰鍛戒护 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍥炵爜鍖归厤 <0:鍙傛暟閿欒鎴栧洖鐮佷笌璇锋眰涓嶅尮閰 +鍏跺畠璇存槑锛 鏈嚱鏁板彧鍒ゆ柇璇锋眰褰掑睘锛屼笟鍔¤В鏋愬湪閰嶇疆鐗堟湰澶嶆牳閫氳繃鍚庢墽琛 +*****************************************************************/ +static int chrg_roll_nor_response_matches(const struct mb_msg_t *pMB, + rt_uint8_t expected_idx, eIDX_ID expected_id, rt_uint8_t expected_cmd) +{ + if ((pMB == RT_NULL) || (pMB->payload == RT_NULL) || + (pMB->length < MIN_FRAME_LENGTH) || + (expected_idx >= TOTAL_NOR_CHS) || (expected_cmd == 0U)) { + return -1; + } + + if ((pMB->payload[2] != (rt_uint8_t)expected_id) || + (pMB->payload[3] != expected_cmd)) { + LOG_W("north response mismatch: ch=%d id=%02x/%02x cmd=%02x/%02x", + expected_idx + 1U, pMB->payload[2], expected_id, + pMB->payload[3], expected_cmd); + return -2; + } + + if ((expected_cmd == SRC_CMD_GET_VOLTAGE) && (pMB->length != 21U)) { + return -3; + } + if ((expected_cmd != SRC_CMD_GET_VOLTAGE) && + (expected_cmd != SRC_CMD_GET_PROTOCOL) && + (pMB->length != MIN_FRAME_LENGTH)) { + return -4; + } + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_free_response +鍑芥暟鎻忚堪锛 閲婃斁鍖楀悜閭鍥炵爜鍙婂叾payload +杈撳叆鍙傛暟锛 pMB:寰呴噴鏀鹃偖绠辨秷鎭 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 缁熶竴鍖归厤鎴愬姛銆佸け閰嶅拰鎵嬪姩妯″紡涓嬬殑娑堟伅閲婃斁璺緞 +*****************************************************************/ +static void chrg_roll_nor_free_response(struct mb_msg_t *pMB) +{ + if (pMB == RT_NULL) { + return; + } + if (pMB->payload != RT_NULL) { + rt_free(pMB->payload); + } + rt_free(pMB); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_drain_mailbox +鍑芥暟鎻忚堪锛 闈為樆濉炴竻鐞嗕笂涓浜嬪姟閬楃暀鍦ㄥ寳鍚戦偖绠变腑鐨勫洖鐮 +杈撳叆鍙傛暟锛 pTN:鍖楀悜鎺ユ敹绾跨▼淇℃伅 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 蹇呴』鍦ㄥ彂閫佹柊璇锋眰鍓嶈皟鐢紝閬垮厤鏃у洖鐮佽璇涓烘湰娆¤姹傚洖鐮 +*****************************************************************/ +static void chrg_roll_nor_drain_mailbox(struct chrg_thread_t *pTN) +{ + struct mb_msg_t *pMB = RT_NULL; + + if ((pTN == RT_NULL) || (pTN->mb == RT_NULL)) { + return; + } + while (rt_mb_recv(pTN->mb, (rt_uint32_t *)&pMB, 0) == RT_EOK) { + chrg_roll_nor_free_response(pMB); + pMB = RT_NULL; + } +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_wait_response +鍑芥暟鎻忚堪锛 鍦ㄧ粺涓鎴鏃堕棿鍐呯瓑寰呬笌褰撳墠瑙掕壊鍜屽懡浠ゅ尮閰嶇殑鍖楀悜鍥炵爜 +杈撳叆鍙傛暟锛 pTN:鍖楀悜鎺ユ敹绾跨▼ expected_idx:璇锋眰閫氶亾 expected_id:璇锋眰瑙掕壊 + expected_cmd:璇锋眰鍛戒护 matched_response:鍖归厤鍥炵爜杈撳嚭鎸囬拡 +杈撳嚭鍙傛暟锛 matched_response杩斿洖鍖归厤娑堟伅锛屾墍鏈夋潈浜ょ粰璋冪敤鑰 +杩斿洖璇存槑锛 0:鏀跺埌鍖归厤鍥炵爜 <0:鍙傛暟閿欒鎴栫瓑寰呰秴鏃 +鍏跺畠璇存槑锛 涓嶅尮閰嶄絾CRC姝ｇ‘鐨勬棫鍥炵爜浼氶噴鏀撅紝骞剁户缁瓑寰呰嚦鏈鎬昏秴鏃 +*****************************************************************/ +static int chrg_roll_nor_wait_response(struct chrg_thread_t *pTN, + rt_uint8_t expected_idx, eIDX_ID expected_id, rt_uint8_t expected_cmd, + struct mb_msg_t **matched_response) +{ + rt_tick_t start_tick; + rt_tick_t timeout_tick; + rt_tick_t elapsed; + rt_tick_t remaining; + rt_err_t ret; + struct mb_msg_t *pMB = RT_NULL; + + if ((pTN == RT_NULL) || (pTN->mb == RT_NULL) || + (matched_response == RT_NULL)) { + return -1; + } + *matched_response = RT_NULL; + start_tick = rt_tick_get(); + timeout_tick = rt_tick_from_millisecond(NORTH_RESPONSE_TIMEOUT_MS); + + while (1) { + elapsed = (rt_tick_t)(rt_tick_get() - start_tick); + if (elapsed >= timeout_tick) { + return -1; + } + remaining = timeout_tick - elapsed; + ret = rt_mb_recv(pTN->mb, (rt_uint32_t *)&pMB, remaining); + if (ret != RT_EOK) { + return -1; + } + if (pMB == RT_NULL) { + continue; + } + + if (chrg_roll_nor_response_matches(pMB, expected_idx, + expected_id, expected_cmd) == 0) { + *matched_response = pMB; + return 0; + } + + /* CRC姝ｇ‘浣嗕笉灞炰簬鏈璇锋眰鐨勬棫鍥炵爜涓嶈兘缁撴潫褰撳墠绛夊緟銆 */ + chrg_roll_nor_free_response(pMB); + pMB = RT_NULL; + } +} +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_cmd +鍑芥暟鎻忚堪锛 鎵ц鍖楀悜鎵嬪姩鎻掑叆鍛戒护鐨勫叆鍙ｆ鏌 +杈撳叆鍙傛暟锛 pROLL:鍖楀悜杞鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍙傛暟鏈夋晥 <0:鍙傛暟涓虹┖ +鍏跺畠璇存槑锛 褰撳墠浠呬繚鐣欏叆鍙ｏ紝鍏蜂綋鎵嬪姩鍛戒护鐢卞悗缁姛鑳芥墿灞 +*****************************************************************/ static int chrg_roll_nor_cmd (struct chrg_rollnor_t *pROLL) { if (RT_NULL == pROLL) { @@ -324,71 +707,213 @@ static int chrg_roll_nor_cmd (struct chrg_rollnor_t *pROLL) } return 0; } -void chrg_roll_nor_set(rt_uint8_t ch, struct chrg_switch_t *pSW,rt_uint8_t *enable) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_set +鍑芥暟鎻忚堪锛 鎸夊綋鍓嶈鑹插拰sub鐘舵佸彂閫佷竴鏉″寳鍚戝崗璁懡浠 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 pSW:閫氶亾鎺у埗缁撴瀯浣 next_sub:鍊欓変笅涓鐘舵佽緭鍑烘寚閽 +杈撳嚭鍙傛暟锛 next_sub淇濆瓨姝ｇ‘鍥炵爜鍚庡簲杩涘叆鐨勭姸鎬侊紝涓嶇洿鎺ヤ慨鏀筽SW->sub +杩斿洖璇存槑锛 >0:鍙戦侀暱搴 <0:鍙戦佸け璐ユ垨鐘舵佷笉鏀寔 + 鍏跺畠璇存槑锛 Source鎸夊樊寮傛墽琛屽崗璁丆C鎴栫粍鍚堝懡浠わ紱娑夊強PD鐨勮繍琛屼腑鍒囨崲鍏堝彂閫丆C_CLOSE锛 + 鍋滄鐘舵佸惎鍔ㄥ拰涓诲姩鍋滄鍧囦笉棰濆鍙戦丆C_CLOSE锛 + Sink瀹屾暣鎻℃墜渚濇鎵ц鍗忚璁剧疆銆佺洰鏍嘋C绾块夋嫨銆佺ǔ瀹氱瓑寰呭拰VC鏌ヨ +*****************************************************************/ +static int chrg_roll_nor_set(rt_uint8_t ch, struct chrg_switch_t *pSW, + rt_uint8_t *next_sub) { + if ((pSW == RT_NULL) || (next_sub == RT_NULL)) { + return -1; + } + *next_sub = pSW->sub; + if(pSW->id==ID_SOURCE){ //鐢垫簮 chrg_roll_nor_sw_uart((eIDX_NOR_CH)ch, ID_SOURCE); - switch(pSW->sub){ - case IDX_SET_SOURCE_ID: //瑙掕壊 - chrg_set_eload_source(ch,pSW); - if(pSW->continue_flag) - pSW->sub = IDX_SET_SOURCE_CC_SET; -// rt_kprintf("set_start\r\n"); - break; - case IDX_SET_SOURCE_CC_SET: - source_set_cc_choose(pSW->source.cc_set); - pSW->sub = IDX_SET_SOURCE_CV; - break; - case IDX_SET_SOURCE_CV: //鎭掑帇鎭掓祦 - pSW->sub = IDX_SER_SOURCE_VOLT; - break; - case IDX_SER_SOURCE_VOLT://鐢靛帇 - chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_VOLTAGE_OUT+1, 0); - pSW->sub = IDX_SER_SOURCE_CURR; - break; - case IDX_SER_SOURCE_CURR://鐢垫祦 - chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_CURRENT_OUT+1, pSW->source.protective_curr); - pSW->sub = IDX_SET_SOURCE_WORK; - break; - case IDX_SET_SOURCE_WORK: - chrg_sou_work(ch,pSW); - break; + switch(pSW->sub){ + case IDX_SET_SOURCE_RESET: + *next_sub = IDX_SET_SOURCE_PD; + return source_reset(); case IDX_SET_SOURCE_PD: - chrg_roll_nor_source_pro_set(pSW); - pSW->source.On_Flag = 1; - break; + *next_sub = IDX_WAIT_SOURCE_PROTOCOL; + return chrg_roll_nor_source_pro_set(pSW); + case IDX_SET_SOURCE_CC_SET: + *next_sub = IDX_GET_SOURCE_VC; + return source_set_cc_choose(pSW->source.CC_Set); case IDX_GET_SOURCE_VC: - source_get_vc(pSW->source.vc.set_voltage, pSW->source.vc.set_current); - break; - case IDX_SET_SOURCE_CCLVL: - source_set_cc_lvl(pSW->source.vol_lvl); - break; - case IDX_SET_SOURCE_STOP_STATE: - chrg_nor_source_stop(pSW,ch,enable); - break; + return source_get_vc(pSW->source.set_volt, + pSW->source.set_curr); + case IDX_GET_SOURCE_PD: + *next_sub = IDX_GET_SOURCE_VC; + return source_get_pd(); default: - - break; + return -1; } - }else{ + } + else if (pSW->id == ID_SINK) { chrg_roll_nor_sw_uart((eIDX_NOR_CH)ch, ID_SINK); switch(pSW->sub){ case IDX_GET_SINK_VC: //鏌ヨ - sink_get_vc(pSW->sink.pro_loadv,pSW->sink.pro_loadc); - break; + return sink_get_vc(pSW->sink.pro_loadv, + pSW->sink.pro_loadc); + case IDX_GET_SINK_PD: + *next_sub = IDX_GET_SINK_VC; + return sink_get_pd(); case IDX_SET_SINK_CCLINE: //CC绾块夋嫨 - sink_set_cc_line(pSW->sink.cc_set); - pSW->sub = IDX_SET_SINK_PD; - break; + *next_sub = IDX_WAIT_SINK_CC; + return sink_set_cc_line(pSW->sink.cc_set); + case IDX_SET_SINK_CC_BEFORE_PD: + *next_sub = IDX_WAIT_SINK_CC_BEFORE_PD; + return sink_set_cc_line(pSW->sink.cc_set); case IDX_SET_SINK_CCLVL: //CC鐢靛钩 - sink_set_cc_lvl(pSW->sink.cc_lvl); - break; + return sink_set_cc_lvl(pSW->sink.cc_lvl); case IDX_SET_SINK_PD: - chrg_roll_nor_sink_pro_set(pSW); - pSW->sub = IDX_GET_SINK_VC; - break; + /* 鍙湁鍗忚鍥炵爜纭鍚庯紝涓嬩竴杞墠鍏佽杩涘叆鐢靛帇鏌ヨ銆 */ + *next_sub = IDX_WAIT_SINK_PD_ACK; + return chrg_roll_nor_sink_pro_set(pSW); + case IDX_SET_SINK_PD_ONLY: + *next_sub = IDX_WAIT_SINK_PD_ACK; + return chrg_roll_nor_sink_pro_set(pSW); +#if 0 + case IDX_SET_SINK_PD_BEFORE_CC: + /* 鍗忚鍥炵爜纭鍚庡啀璁剧疆CC锛屼笉鎻愬墠鏌ヨ鐢靛帇銆 */ + *next_sub = IDX_SET_SINK_CCLINE; + return chrg_roll_nor_sink_pro_set(pSW); +#endif + default: + return -1; + } + } + + return -1; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_auto_request +鍑芥暟鎻忚堪锛 鎵ц涓娆¤嚜鍔ㄥ寳鍚戣姹備簨鍔★紝骞跺湪瓒呮椂鍚庢湁闄愭鏁伴噸鍙 +杈撳叆鍙傛暟锛 idx:閫氶亾 pSW:閫氶亾鐘舵 pTHR:杞绾跨▼ pTN:鍖楀悜鎺ユ敹绾跨▼ + pNOR:鍖楀悜鍏变韩鐘舵 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:璇锋眰鎴愬姛 1:绛夊緟鏈熼棿COM閰嶇疆鍙樺寲锛屾棫浜嬪姟宸插彇娑 <0:閲嶈瘯鍚庡け璐 +鍏跺畠璇存槑锛 鍖归厤鍥炵爜鏈夋晥涓旈厤缃増鏈湭鍙樺寲鏃惰В鏋愰噺娴嬪煎苟鎻愪氦next_sub锛 + 鍙戦佹椂涓嶄慨鏀瑰疄鏃秙ub锛孋RC閿欒甯х敱north.c涓㈠純骞惰〃鐜颁负鏈绛夊緟瓒呮椂 +*****************************************************************/ +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 + rt_uint8_t expected_cmd = 0; // 鏈璇锋眰鏈熸湜鏀跺埌鐨勫懡浠ょ爜 + rt_uint8_t max_attempts; // 鏈璇锋眰鍏佽鐨勬诲彂閫佹鏁 + eIDX_ID expected_id = ID_SINK; // 鏈璇锋眰鍙戦佹椂鐨勮鑹插揩鐓 + rt_uint32_t request_version = 0; // 鏈璇锋眰鍙戦佹椂鐨凜OM閰嶇疆鐗堟湰 + int send_ret; // 褰撳墠鍛戒护鐨勪覆鍙ｅ彂閫佺粨鏋 + int wait_ret; // 褰撳墠鍛戒护鐨勫洖鐮佺瓑寰呯粨鏋 + struct mb_msg_t *pMB = RT_NULL; // 宸插尮閰嶅洖鐮侊紝澶勭悊鍚庣粺涓閲婃斁 + + if ((idx >= TOTAL_NOR_CHS) || (pSW == RT_NULL) || + (pTHR == RT_NULL) || (pTN == RT_NULL) || (pNOR == RT_NULL)) { + return -1; + } + + /* 榛樿淇濈暀璁剧疆鍛戒护鐨3娆″彂閫侊紱棣栬疆鍙栧緱瀹為檯鍛戒护鐮佸悗锛0x20浼氭敼涓 + * 鍗曟鍙戦佸苟鐣欑粰涓嬩竴杞疆璇㈤噸璇曪紝閬垮厤閲忔祴鏃犲洖鐮佹椂闀挎湡鍗犵敤閫氶亾銆 */ + max_attempts = NORTH_REQUEST_MAX_RETRIES + 1U; + for (attempt = 0; attempt < max_attempts; attempt++) { + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + if (attempt == 0U) { + /* 棣栨鍙戦佸浐瀹氳姹傜姸鎬侊紝鍚庣画閲嶅彂蹇呴』缁х画浣跨敤鍚屼竴浠借姹備笂涓嬫枃銆 */ + request_sub = pSW->sub; + expected_id = pSW->id; + expected_cmd = chrg_roll_nor_expected_cmd(pSW); + if (expected_cmd == SRC_CMD_GET_VOLTAGE) { + max_attempts = NORTH_MEASURE_MAX_ATTEMPTS; + } + request_version = pNOR->config_version[idx]; + /* 鏂颁簨鍔″彂閫佸墠娓呯悊宸茬粨鏉熸垨宸茶秴鏃朵簨鍔￠仐鐣欑殑閭鍥炵爜銆 */ + chrg_roll_nor_drain_mailbox(pTN); + } else if ((pNOR->config_version[idx] != request_version) || + (pSW->id != expected_id) || (pSW->sub != request_sub)) { + /* COM鎴栧叾瀹冩帶鍒跺叆鍙ｅ凡淇敼閰嶇疆锛岀姝㈢户缁噸鍙戞棫鍛戒护銆 */ + rt_mutex_release(pTHR->mutex); + return 1; + } + + if (expected_cmd == 0U) { + rt_mutex_release(pTHR->mutex); + return -1; + } + send_ret = chrg_roll_nor_set(idx, pSW, &next_sub); + rt_mutex_release(pTHR->mutex); + + if (send_ret > 0) { + wait_ret = chrg_roll_nor_wait_response(pTN, idx, + expected_id, expected_cmd, &pMB); + if ((wait_ret == 0) && (pMB != RT_NULL)) { + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + if ((pNOR->config_version[idx] != request_version) || + (pSW->id != expected_id) || (pSW->sub != request_sub)) { + /* 鍥炵爜鍒拌揪鍓嶉厤缃凡鍙樺寲锛岃鍥炵爜灞炰簬鏃т簨鍔★紝鍙噴鏀句笉瑙ｆ瀽銆 */ + rt_mutex_release(pTHR->mutex); + chrg_roll_nor_free_response(pMB); + return 1; + } + + /* 鍙湁鍥哄畾21瀛楄妭鐨0x20閲忔祴鍥炵爜闇瑕佽繘鍏ource/Sink涓氬姟瑙ｆ瀽銆 */ + if ((expected_cmd == SRC_CMD_GET_VOLTAGE) && + (pMB->length == 21U)) { + if (expected_id == ID_SOURCE) { + (void)chrg_source_parse(pMB->payload, + (eIDX_SOU_CH)idx, pSW, pNOR); + } else { + chrg_sink_parse(pMB->payload, + (eIDX_SOU_CH)idx, pSW, pNOR); + } + } + /* ID銆佸懡浠ゃ丆RC鍜岄厤缃増鏈潎纭鏈夋晥鍚庯紝鎵嶆寮忔帹杩涘疄鏃秙ub銆 */ + if ((expected_id == ID_SOURCE) && + (request_sub == IDX_SET_SOURCE_RESET)) { + /* 澶嶄綅鍥炵爜鍚庨噸鏂版墽琛孲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銆 */ + chrg_roll_nor_source_protocol_wait_start(idx); + chrg_comm_source_protocol_ack(idx, + (rt_uint8_t)pSW->source.protocol); + } else if ((expected_id == ID_SINK) && + ((request_sub == IDX_SET_SINK_CCLINE) || + (request_sub == IDX_SET_SINK_CC_BEFORE_PD))) { + /* 鍖楀悜Sink缁х數鍣ㄤ繚鎸佹帴閫氾紝浠呯瓑寰呯洰鏍嘋C閰嶇疆绋冲畾銆 */ + chrg_roll_nor_sink_cc_wait_start(idx); + } else if ((expected_id == ID_SINK) && + (request_sub == IDX_SET_SINK_PD_ONLY)) { + /* 浠呴噸鍙戝崗璁椂娌℃湁CC鍥炵爜浣滀负鑺傛祦鍏ュ彛锛岀洿鎺ュ惎鍔200ms璁℃椂銆 */ + chrg_roll_nor_sink_query_wait_start(idx); + } + /* 涓氬姟瑙ｆ瀽鍙兘涓诲姩鍒囨崲sub锛屼緥濡傛帀鐢垫仮澶嶅悗瑕佹眰閲嶆柊璁剧疆鍗忚銆 + * 鍙湁sub浠嶅睘浜庢湰娆¤姹傛椂锛屾墠搴旂敤璇锋眰鍑芥暟璁＄畻鍑虹殑next_sub銆 */ + if (advance_sub && (pSW->sub == request_sub)) { + pSW->sub = next_sub; + } + rt_mutex_release(pTHR->mutex); + chrg_roll_nor_free_response(pMB); + return 0; } } + + if ((attempt + 1U) < max_attempts) { + /* 鏈鍙戦佸け璐ユ垨绛夊緟瓒呮椂锛屼繚鎸乺equest_sub骞跺噯澶囬噸鍙戝悓涓鍛戒护銆 */ + rt_thread_mdelay(NORTH_RETRY_INTERVAL_MS); + } + } + + LOG_W("north request failed: ch=%d id=%02x cmd=%02x sub=%d attempts=%d", + idx + 1U, expected_id, expected_cmd, request_sub, + max_attempts); + return -1; } /***************************************************************** @@ -408,7 +933,10 @@ void chrg_roll_nor_thread_entry (void *data) } rt_uint8_t index = 0, idx = 0, i = 0; - rt_uint8_t run = 0, crc = 0; + rt_uint8_t run = 0; + rt_bool_t source_waiting = RT_FALSE; + rt_bool_t sink_waiting = RT_FALSE; + int state_work_ret = 0; rt_err_t ret = RT_EOK; struct chrg_rollnor_t *pROLL = &chrgrollnor; struct chrg_thread_t *pTN = &chrgthr[IDX_THR_NORTH]; @@ -419,15 +947,67 @@ void chrg_roll_nor_thread_entry (void *data) chrg_roll_nor_sw_uart((eIDX_NOR_CH)i, ID_SINK); } while (1) { - chrg_wdt_feed(); + chrg_wdt_feed(); rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); run = pROLL->run; rt_mutex_release(pTHR->mutex); switch (run) { case RUN_AUTO: { idx = index%TOTAL_NOR_CHS; + pSW = &pNOR->sw[idx]; + source_waiting = RT_FALSE; + sink_waiting = RT_FALSE; + state_work_ret = 0; + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + /* + * INIT/STOP蹇呴』鍦╡nable杩囨护鍓嶆墽琛岋細STOP浼氭妸enable娓呴浂锛岃孋OM + * 鍚姩鏃跺彧鏀瑰彉work_mode銆傝嫢鍏堝垽鏂璭nable锛屽仠鏈洪氶亾浼氱洿鎺ontinue锛 + * INIT姘歌繙娌℃湁鏈轰細鎶奺nable閲嶆柊缃1锛屼篃灏辨棤娉曟仮澶嶅寳鍚戣疆璇€ + * Source->Sink鍒囨崲鍚庣殑SINK_WORK_INIT鍚屾牱浠庤繖閲岄娆℃墽琛屻 + */ + 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_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) || + (pSW->sink.work_mode == SINK_WORK_INIT_AUX_WAIT) || + (pSW->sink.work_mode == SINK_WORK_UNLOAD_WAIT) || + (pSW->sink.work_mode == SINK_WORK_LOW) || + (pSW->sink.work_mode == SINK_WORK_LOW_AUX_WAIT) || + (pSW->sink.work_mode == SINK_WORK_HANDSHAKE_PREPARE) || + (pSW->sink.work_mode == SINK_WORK_HANDSHAKE_WAIT) || + (pSW->sink.work_mode == SINK_WORK_STOP_WAIT) || + (pSW->sink.work_mode == SINK_WORK_STOP_RELAY) || + (pSW->sink.work_mode == SINK_WORK_STOP_RELAY_WAIT))) { + state_work_ret = chrg_sink_work((eIDX_SOU_CH)idx, pSW); + } + /* + * 鍗忚鍒囨崲绛夊緟鍙帹杩涙椂闂寸姸鎬侊紝涓嶅彂閫佷覆鍙ｅ懡浠ゃ傝妫鏌ヤ綅浜巈nable + * 杩囨护鍓嶏紝浣垮仠姝㈡垨瑙掕壊鍒囨崲鍚庣殑閫氶亾涔熻兘鍙婃椂娓呯悊娈嬬暀浜嬪姟璁板綍銆 + */ + source_waiting = chrg_roll_nor_source_wait_process(idx, pSW); + sink_waiting = chrg_roll_nor_sink_wait_process(idx, pSW); + rt_mutex_release(pTHR->mutex); + if (state_work_ret != 0) { + /* 鍗楀悜鐘舵佸姩浣滄湭鎴愬姛鍏ラ槦鏃朵繚鐣欏師鐘舵侊紝涓嬭疆閲嶈瘯涓旂姝㈠寳鍚戝厛琛屻 */ + CHRG_CHANNEL_NEXT(index); + rt_thread_mdelay(2); + continue; + } + if (source_waiting || sink_waiting) { + CHRG_CHANNEL_NEXT(index); + rt_thread_mdelay(2); + continue; + } if (0 == pNOR->enable[idx]) { - index++; + CHRG_CHANNEL_NEXT(index); rt_thread_mdelay(2); continue; } else { @@ -435,17 +1015,12 @@ void chrg_roll_nor_thread_entry (void *data) chrg_north_switch((eIDX_NOR_CH)idx); chrgnorth.idx = idx; pROLL->idx = idx; - pSW = &pNOR->sw[idx]; - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); - if(pNOR->north_mode == 0){ - chrg_roll_nor_set(pROLL->idx,pSW,&pNOR->enable[idx]); - } - if(pNOR->north_mode == 1){ - chrg_roll_trim_set(pROLL->idx,pNOR); - } - rt_mutex_release(pTHR->mutex); + (void)chrg_roll_nor_auto_request(idx, pSW, + pTHR, pTN, pNOR); } - index++; + CHRG_CHANNEL_NEXT(index); + rt_thread_mdelay(NORTH_POLL_INTERVAL_MS); + continue; } break; @@ -469,32 +1044,19 @@ void chrg_roll_nor_thread_entry (void *data) break; } - ret = rt_mb_recv(pTN->mb, (rt_uint32_t *)&pMB_R, 200); // 瓒呮椂 200ms + ret = rt_mb_recv(pTN->mb, (rt_uint32_t *)&pMB_R, 50); // 1kHz tick涓嬭秴鏃剁害50ms if ((RT_EOK == ret)&&(RT_NULL != pMB_R)) { // 瀛樺湪杩斿洖鏁版嵁 - crc = calc_crc8(pMB_R->payload, pMB_R->length-1); - if (crc == pMB_R->payload[pMB_R->length-1]) { // 鏁版嵁姝ｇ‘ - if (RUN_AUTO != run) { // 鎭㈠鑷姩杞贰 - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); - pROLL->run = RUN_AUTO; - rt_mutex_release(pTHR->mutex); - } else { - chrg_roll_nor_parse(pROLL, pMB_R->payload); - } - } else { - LOG_E("crc failed."); + /* north.c鍙細鍚戦偖绠辨彁浜ゅ凡缁忛氳繃缁撴瀯鍜孋RC鏍￠獙鐨勫畬鏁村抚銆 */ + if (RUN_AUTO != run) { // 鎭㈠鑷姩杞贰 + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + pROLL->run = RUN_AUTO; + rt_mutex_release(pTHR->mutex); } - if (RT_NULL != pMB_R->payload) { - rt_free(pMB_R->payload); - pMB_R->payload = RT_NULL; - } + chrg_roll_nor_free_response(pMB_R); + pMB_R = RT_NULL; - if (RT_NULL != pMB_R) { - rt_free(pMB_R); - pMB_R = RT_NULL; - } - - rt_thread_mdelay(20); // 闂撮殧 200ms + rt_thread_mdelay(10); // 鐩搁偦鍖楀悜璇锋眰闂撮殧50ms } else { if (RUN_AUTO != run) { // 闈炶嚜鍔ㄨ疆宸 rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); @@ -503,9 +1065,7 @@ void chrg_roll_nor_thread_entry (void *data) rt_mutex_release(pTHR->mutex); } } - } - } #if 1 @@ -704,171 +1264,3 @@ MSH_CMD_EXPORT(source, north source test); #endif -//鏍″噯CRC璁＄畻 -rt_uint16_t chrg_trim_crc(rt_uint8_t ch, struct chrg_north_t *pNOR) -{ - struct chrg_trim *pTrim = &pNOR->trim[ch]; - rt_uint8_t buf[22]; - int idx = 0; - - buf[idx++] = (pTrim->trim_volt_k_H >> 8) & 0xFF; - buf[idx++] = pTrim->trim_volt_k_H & 0xFF; - - buf[idx++] = (pTrim->trim_volt_k_L >> 8) & 0xFF; - buf[idx++] = pTrim->trim_volt_k_L & 0xFF; - - buf[idx++] = (pTrim->trim_volt_b >> 8) & 0xFF; - buf[idx++] = pTrim->trim_volt_b & 0xFF; - - buf[idx++] = (pTrim->trim_curr_k_H >> 8) & 0xFF; - buf[idx++] = pTrim->trim_curr_k_H & 0xFF; - - buf[idx++] = (pTrim->trim_curr_k_L >> 8) & 0xFF; - buf[idx++] = pTrim->trim_curr_k_L & 0xFF; - - buf[idx++] = (pTrim->trim_curr_b >> 8) & 0xFF; - buf[idx++] = pTrim->trim_curr_b & 0xFF; - - buf[idx++] = (pTrim->trim_source_curr_k_H >> 8) & 0xFF; - buf[idx++] = pTrim->trim_source_curr_k_H & 0xFF; - - buf[idx++] = (pTrim->trim_source_curr_k_L >> 8) & 0xFF; - buf[idx++] = pTrim->trim_source_curr_k_L & 0xFF; - - buf[idx++] = (pTrim->trim_source_curr_b >> 8) & 0xFF; - buf[idx++] = pTrim->trim_source_curr_b & 0xFF; - - buf[idx++] = (pTrim->trim_zero >> 8) & 0xFF; - buf[idx++] = pTrim->trim_zero & 0xFF; - - return mb_crc16(buf, 20); -} -//鐢垫簮鏍″噯璁剧疆 -void chrg_trim_set_volt(rt_uint8_t ch,struct chrg_north_t *pNOR){ - struct chrg_trim *pTRIM = &pNOR->trim[ch]; - switch(pTRIM->trim_step){ - case 0: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Volt_CAL_K_H, pTRIM->trim_volt_k_H); - break; - case 1: - break; - case 2: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Volt_CAL_K_L, pTRIM->trim_volt_k_L); - break; - case 3: - break; - case 4: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Volt_CAL_B, pTRIM->trim_volt_b); - break; - pNOR->north_mode = 0; - break; - } - pTRIM->trim_step++; -} -//鐢垫祦鏍″噯璁剧疆 -void chrg_trim_set_curr(rt_uint8_t ch,struct chrg_north_t *pNOR){ - struct chrg_trim *pTRIM = &pNOR->trim[ch]; - switch(pTRIM->trim_step){ - case 0: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Current_CAL_K_H, pTRIM->trim_curr_k_H); - break; - case 1: - break; - case 2: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Current_CAL_K_L, pTRIM->trim_curr_k_L); - break; - case 3: - break; - case 4: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Current_CAL_B, pTRIM->trim_curr_b); - pNOR->north_mode = 0; - break; - } - pTRIM->trim_step++; -} -//鐢垫簮鏍″噯璁剧疆 -void chrg_trim_set_source_curr(rt_uint8_t ch,struct chrg_north_t *pNOR){ - struct chrg_trim *pTRIM = &pNOR->trim[ch]; - rt_uint16_t crc = 0; - switch(pTRIM->trim_step){ - case 0: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_SourceCurrent_CAL_K_H, pTRIM->trim_source_curr_k_H); - break; - case 1: - break; - case 2: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_SourceCurrent_CAL_K_L, pTRIM->trim_source_curr_k_L); - break; - case 3: - break; - case 4: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_SourceCurrent_CAL_B, pTRIM->trim_source_curr_b); - break; - case 5: - break; - case 6: - crc = chrg_trim_crc(ch, pNOR); - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Trim_CRC_CAL, crc); - rt_kprintf("crc=%04X\n",crc); - break; - case 7: - break; - case 8: - if(pTRIM->trim_enable_flag == 0){ - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_CAL_WriteEnable_ADD,ModbusRTU_CAL_WriteValue); - }else{ - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_CAL_WriteRecovery,ModbusRTU_CAL_WriteRecovery_Value); - } - pNOR->north_mode = 0; - break; - } - pTRIM->trim_step++; -} -//鏍″噯椋橀浂璁剧疆 -void chrg_trim_set_zero(rt_uint8_t ch,struct chrg_north_t *pNOR){ - struct chrg_trim *pTRIM = &pNOR->trim[ch]; - rt_uint16_t crc = 0; - switch(pTRIM->trim_step){ - case 0: - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Trim_Zero_CAL, pTRIM->trim_zero); - break; - case 1: - break; - case 2: - crc = chrg_trim_crc(ch, pNOR); - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_Trim_CRC_CAL, crc); - break; - case 3: - break; - case 4: - if(pTRIM->trim_enable_flag == 0){ - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_CAL_WriteEnable_ADD,ModbusRTU_CAL_WriteValue); - }else{ - chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_CAL_WriteRecovery,ModbusRTU_CAL_WriteRecovery_Value); - } - pNOR->north_mode = 0; - break; - } - pTRIM->trim_step++; -} -//鏍″噯璁剧疆 -void chrg_roll_trim_set(rt_uint8_t ch, struct chrg_north_t *pNOR){ - struct chrg_trim *pTRIM = &pNOR->trim[ch]; - switch(pTRIM->trim_mode){ - case MODE_VOLT_CAL: - chrg_trim_set_volt(ch, pNOR); - break; - case MODE_CURR_CAL: - chrg_trim_set_curr(ch, pNOR); - break; - case MODE_SOURCE_CURR_CAL: - chrg_trim_set_source_curr(ch, pNOR); - break; - case MODE_ZERO_CAL: - chrg_trim_set_zero(ch, pNOR); - break; - } -} - - - diff --git a/apps/chrg/applications/thread/chrg_roll_nor.h b/apps/chrg/applications/thread/chrg_roll_nor.h index 8fbc669..5e638a3 100644 --- a/apps/chrg/applications/thread/chrg_roll_nor.h +++ b/apps/chrg/applications/thread/chrg_roll_nor.h @@ -1,7 +1,7 @@ /**************************************************************************** 鏂囦欢鍚嶇О : chrg_roll_nor.h 瀹屾垚鏃ユ湡 : -褰撳墠鐗堟湰鍙 : V1.0 +褰撳墠鐗堟湰鍙 : V1.1.9 涓昏鍔熻兘 : 瀹炵幇鍖楀悜閫氫俊杞贰璇锋眰鍛戒护銆備互鐙珛绾跨▼澶勭悊銆 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 璇存槑 : @@ -41,6 +41,20 @@ enum { IDX_SET_SINK_WORK_STATE, IDX_SET_SINK_STOP_TEST,//鍋滄璐熻浇娴嬭瘯 IDX_SET_SINK_STORP_WAIT, + + /* Source鍖楀悜浜嬪姟鐘舵侊紝杩藉姞鍦ㄦ湯灏句互淇濇寔鍘熸湁sub鏁板间笉鍙樸 */ + IDX_SET_SOURCE_RESET, // PD涓庨潪PD鍗忚璺ㄧ被鍒囨崲鍓嶅彂閫丼ource澶嶄綅 + IDX_WAIT_SOURCE_PROTOCOL, // 0xD0搴旂瓟鍚庣殑鍗忚鐢熸晥绛夊緟 + + /* Sink鍖楀悜浜嬪姟鐘舵佽拷鍔犲湪鏈熬锛岄伩鍏嶆敼鍙樺凡鏈塻ub鏁板笺 */ + IDX_SET_SINK_PD_ONLY, // 浠呴噸鍙戝崗璁紝鍗忚搴旂瓟鍚庣洿鎺ユ煡璇㈠崗鍟嗙數鍘 + IDX_WAIT_SINK_CC, // CC璁剧疆搴旂瓟鍚庣殑闈為樆濉炵ǔ瀹氱瓑寰 + IDX_SET_SINK_CC_BEFORE_PD, // 鍏堣缃瓹C锛岀ǔ瀹氬悗鍐嶈缃崗璁 + IDX_WAIT_SINK_CC_BEFORE_PD, // 绛夊緟CC绋冲畾鍚庤繘鍏ュ崗璁缃 + IDX_WAIT_SINK_PD_ACK, // 鍗忚鍥炵爜纭鍚庣殑闈炲彂閫佽繃娓＄姸鎬 +#if 0 + IDX_SET_SINK_PD_BEFORE_CC, // 鍏堣缃崗璁紝鍗忚鍥炵爜鍚庡啀璁剧疆CC +#endif }; struct chrg_rollnor_t { @@ -80,8 +94,26 @@ extern struct chrg_rollnor_t chrgrollnor; extern void chrg_roll_nor_thread_entry (void *data); extern int sink_fill_pd_buf(rt_uint8_t group,rt_uint8_t pd_val, rt_uint16_t pd_volt, rt_uint16_t pd_curr, rt_uint8_t *buf); -extern void chrg_roll_trim_set(rt_uint8_t ch, struct chrg_north_t *pNOR); extern void roll_nor_set(void); + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_source_cc_close_register +鍑芥暟鎻忚堪锛 灏哠ource閫氶亾鐧昏鍒版湰杞叡浜獵C_CLOSE绛夊緟灞忛殰 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 浠呴渶瑕佸湪鍗忚鍒囨崲鍏ュ彛涓篒DX_SET_SOURCE_CC_CLOSE鏃惰皟鐢 +*****************************************************************/ +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_roll_nor_source_switch_reset +鍑芥暟鎻忚堪锛 娓呯悊鎸囧畾Source閫氶亾鐨凜C_CLOSE鍙婂崗璁瓑寰呰褰 +杈撳叆鍙傛暟锛 ch:鍖楀悜閫氶亾缂栧彿 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鍋滄銆佽鑹插垏鎹㈡垨鏂伴厤缃鐩栨棫鍒囨崲鐘舵佹椂璋冪敤 +*****************************************************************/ +extern void chrg_roll_nor_source_switch_reset(rt_uint8_t ch); + #define sink_time 3 #endif diff --git a/apps/chrg/applications/thread/chrg_roll_sou.c b/apps/chrg/applications/thread/chrg_roll_sou.c index 94be810..4c91f93 100644 --- a/apps/chrg/applications/thread/chrg_roll_sou.c +++ b/apps/chrg/applications/thread/chrg_roll_sou.c @@ -1,373 +1,3 @@ -// /**************************************************************************** -// 鏂囦欢鍚嶇О : chrg_roll_sou.c -// 瀹屾垚鏃ユ湡 : -// 褰撳墠鐗堟湰鍙 : V1.0 -// 涓昏鍔熻兘 : 瀹炵幇鍗楀悜閫氫俊杞贰璇锋眰鍛戒护銆備互鐙珛绾跨▼澶勭悊銆 -// 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 -// 璇存槑 : -// ******************************************************************************/ - -// #include -// #include -// #include - -// #include "chrg_def.h" -// #include "chrg_led.h" -// #include "chrg_thread.h" -// #include "chrg_roll_sou.h" -// #include "chrg_eload.h" -// #include "chrg_utils.h" - -// #define LOG_TAG "chrg.rollsou" -// #include - -// struct chrg_rollsou_t chrgrollsou = { -// .run = RUN_AUTO, -// .ch = IDX_SOU_CH1, -// .part = MB_R_PART1, -// .mode = 0, -// }; - -// #define SOU_CMD_QUEUE_SIZE 4 - -// struct chrg_sou_cmd_t { -// eIDX_SOU_CH ch; -// rt_uint16_t reg; -// rt_uint16_t value; -// }; - -// static struct chrg_sou_cmd_t sou_cmd_queue[SOU_CMD_QUEUE_SIZE]; -// static rt_uint8_t sou_cmd_head = 0; -// static rt_uint8_t sou_cmd_tail = 0; -// static rt_uint8_t sou_cmd_count = 0; - -// static void sou_cmd_enqueue(eIDX_SOU_CH ch, rt_uint16_t reg, rt_uint16_t value) -// { -// if (sou_cmd_count < SOU_CMD_QUEUE_SIZE) { -// sou_cmd_queue[sou_cmd_tail].ch = ch; -// sou_cmd_queue[sou_cmd_tail].reg = reg; -// sou_cmd_queue[sou_cmd_tail].value = value; -// sou_cmd_tail = (sou_cmd_tail + 1) % SOU_CMD_QUEUE_SIZE; -// sou_cmd_count++; -// } else { -// LOG_W("sou command queue full, drop command\n"); -// } -// } - -// static int sou_cmd_dequeue(struct chrg_sou_cmd_t *cmd) -// { -// if (sou_cmd_count == 0) { -// return -1; -// } - -// cmd->ch = sou_cmd_queue[sou_cmd_head].ch; -// cmd->reg = sou_cmd_queue[sou_cmd_head].reg; -// cmd->value = sou_cmd_queue[sou_cmd_head].value; -// sou_cmd_head = (sou_cmd_head + 1) % SOU_CMD_QUEUE_SIZE; -// sou_cmd_count--; -// return 0; -// } - -// static int sou_cmd_exists(void) -// { -// return sou_cmd_count > 0; -// } - -// /***************************************************************** -// 鍑芥暟鍚嶇О锛 chrg_set_sou_reg -// 鍑芥暟鎻忚堪锛 鍗楀悜閫氶亾璁剧疆瀵勫瓨鍣ㄨ姹傚懡浠 -// 杈撳叆鍙傛暟锛 idx:閫氶亾 reg:瀵勫瓨鍣ㄥ湴鍧 value:瀵勫瓨鍣ㄥ -// 杈撳嚭鍙傛暟锛 - -// 杩斿洖璇存槑锛 - -// 鍏跺畠璇存槑锛 - -// *****************************************************************/ -// void chrg_set_sou_reg (eIDX_SOU_CH idx, rt_uint16_t reg, rt_uint16_t value) -// { -// struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; -// struct chrg_rollsou_t *pROLL = &chrgrollsou; - -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// sou_cmd_enqueue(idx, reg, value); -// pROLL->run = RUN_LCD; -// rt_mutex_release(pTHR->mutex); -// rt_kprintf("ch=:%d,reg=%02x,value=%02x\n",idx,reg,value); -// } - -// /***************************************************************** -// 鍑芥暟鍚嶇О锛 chrg_send_sou_upadata_data -// 鍑芥暟鎻忚堪锛 鍗楀悜閫氶亾鍗囩骇鍛戒护 -// 杈撳叆鍙傛暟锛 idx:閫氶亾 reg:瀵勫瓨鍣ㄥ湴鍧 value:瀵勫瓨鍣ㄥ -// 杈撳嚭鍙傛暟锛 - -// 杩斿洖璇存槑锛 - -// 鍏跺畠璇存槑锛 - -// *****************************************************************/ -// void chrg_send_sou_upadata_data (rt_uint8_t *buf,rt_uint16_t leng) -// { -// struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; -// struct chrg_rollsou_t *pROLL = &chrgrollsou; -// pROLL->updata_data = buf; -// pROLL->leng = leng; -// // rt_kprintf("idx=%d,reg=%02x,value=%02x\n",RUN_UPDATAidx,reg,value); -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// pROLL->run = RUN_UPDATA; -// rt_mutex_release(pTHR->mutex); -// } - -// ///***************************************************************** -// //鍑芥暟鍚嶇О锛 chrg_set_sou_more_reg -// //鍑芥暟鎻忚堪锛 鍗楀悜閫氶亾璁剧疆瀵勫瓨鍣ㄨ姹傚懡浠 -// //杈撳叆鍙傛暟锛 idx:閫氶亾 reg:瀵勫瓨鍣ㄥ湴鍧 value:瀵勫瓨鍣ㄥ value2:绗簩涓瘎瀛樺櫒鍊 -// //杈撳嚭鍙傛暟锛 - -// //杩斿洖璇存槑锛 - -// //鍏跺畠璇存槑锛 - -// //*****************************************************************/ -// //void chrg_set_sou_more_reg (eIDX_SOU_CH idx, rt_uint16_t reg, rt_uint16_t value,rt_uint16_t value2) -// //{ -// // struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; -// // struct chrg_rollsou_t *pROLL = &chrgrollsou; -// // pROLL->more_reg_flag = 1; // 浣跨敤澶氬瘎瀛樺櫒鏍囧織浣 -// // pROLL->ch = idx; -// // pROLL->reg = reg; -// // pROLL->value = value; -// // pROLL->value2 = value2; -// // rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// // pROLL->run = RUN_LCD; -// // rt_mutex_release(pTHR->mutex); -// //} -// /***************************************************************** -// 鍑芥暟鍚嶇О锛 chrg_roll_sou_thread_entry -// 鍑芥暟鎻忚堪锛 鍗楀悜閫氶亾杞贰璇锋眰鏁版嵁绾跨▼浣 -// 杈撳叆鍙傛暟锛 *data: 鏈嚎绋嬩俊鎭 -// 杈撳嚭鍙傛暟锛 - -// 杩斿洖璇存槑锛 - -// 鍏跺畠璇存槑锛 - -// *****************************************************************/ -// rt_uint8_t aaaaaa = 0; -// void chrg_roll_sou_thread_entry (void *data) -// { -// struct chrg_thread_t *pTHR = (struct chrg_thread_t *)data; - -// if (RT_NULL == pTHR) { -// return ; -// } - -// rt_uint8_t run = 0; -// rt_uint8_t index = 0, idx = 0; -// rt_err_t ret = RT_EOK; -// struct chrg_rollsou_t *pROLL = &chrgrollsou; -// struct chrg_thread_t *pTS = &chrgthr[IDX_THR_SOUTH]; -// struct mb_msg_t *pMB_R = RT_NULL; -// rt_uint8_t number = 0; -// while (1) { -// /* 姣忚疆鍏堥潪闃诲鎺掔┖绉帇娑堟伅锛岄槻姝㈤偖绠辨弧瀵艰嚧 south 绾跨▼姘镐箙闃诲 */ -// { -// rt_uint8_t drain_cnt = 0; -// struct mb_msg_t *pDrain = RT_NULL; -// while (drain_cnt < 8) { -// ret = rt_mb_recv(pTS->mb, (rt_uint32_t *)&pDrain, 0); -// if (ret != RT_EOK) break; -// if (pDrain != RT_NULL) { -// if (pDrain->payload != RT_NULL) rt_free(pDrain->payload); -// rt_free(pDrain); -// } -// drain_cnt++; -// } -// } - -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// run = pROLL->run; -// rt_mutex_release(pTHR->mutex); -// switch (run) { -// // rt_kprintf("-------- ROLL SOU TIME START \n --------"); -// case RUN_AUTO: { -// if(pROLL->mode!=0){ - -// }else{ -// idx = index%(TOTAL_SOU_CHS); // [0, 3] -// // rt_kprintf("start_idx = %d",idx); -// if (0 == chrgsouth.enable[idx]) { // 閫氶亾鏈惎鐢 -// index++; -// rt_thread_mdelay(5); -// continue; -// } else { // 閫氶亾鍚敤 -// chrg_led_flashing(IDX_LED3, TIMES_ONE, PULSE_TIME*2, PULSE_TIME*2); -// if (idx != (rt_uint8_t)pROLL->idx) { -// pROLL->idx = (eIDX_SOU_CH)idx; -// chrg_south_switch((eIDX_SOU_CH)idx); -// pROLL->part = MB_R_PART1; -// } -// chrg_eload_refresh(ID_ELOAD, pROLL->part); -// if (pROLL->part < TOTAL_MB_R) { -// //pROLL->part++; -// //if (pROLL->part > MB_R_PART1) { // 浠1鏉★紝鑻ラ渶杞贰鍏ㄩ儴锛屾敞閲婃鏉′欢 -// index++; -// //} -// } else { -// index++; -// } -// } -// } -// } -// break; - -// case RUN_LCD: { -// struct chrg_sou_cmd_t cmd; -// rt_uint8_t do_cmd = 0; -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// if (sou_cmd_dequeue(&cmd) == 0) { -// do_cmd = 1; -// pROLL->ch = cmd.ch; -// } -// rt_mutex_release(pTHR->mutex); -// if (do_cmd) { -// chrg_south_switch(cmd.ch); -// chrg_eload_write_reg(ID_ELOAD, cmd.reg, cmd.value); -// } -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// if (!sou_cmd_exists()) { -// pROLL->run = RUN_AUTO; -// } -// rt_mutex_release(pTHR->mutex); -// } -// break; - -// case RUN_CONSOLE: { -// chrg_south_switch((eIDX_SOU_CH)pROLL->ch); -// chrg_eload_refresh(ID_ELOAD, pROLL->part); -// } -// break; -// case RUN_UPDATA:{ -// chrg_south_switch((eIDX_SOU_CH)pROLL->ch); -// if(pROLL->send_flag==1){ -// chrg_eload_send_ymodem_data(pROLL->updata_data,pROLL->leng); -// pROLL->send_flag = 0; -// } -// /* 鍗囩骇妯″紡涓嶄笅鍙慚odbus閭欢锛岀瓑寰卻outh绾跨▼鎹曡幏ymodem搴旂瓟鍚庣户缁 */ -// rt_thread_mdelay(50); -// continue; -// } -// break; -// case RUN_COM: { -// chrg_south_switch((eIDX_SOU_CH)pROLL->ch); -// chrg_eload_write_reg(ID_ELOAD, pROLL->reg, pROLL->value); -// } -// break; -// case RUN_NONE: -// default: -// rt_thread_mdelay(5); -// continue; -// break; -// } - -// ret = rt_mb_recv(pTS->mb, (rt_uint32_t *)&pMB_R, 100 ); // 瓒呮椂 200ms -// if ((RT_EOK == ret)&&(RT_NULL != pMB_R)) { // 瀛樺湪杩斿洖鏁版嵁 -// if (0 == mb_crc16(pMB_R->payload, pMB_R->length)) { -// if (RUN_AUTO != run) { // 鎭㈠鑷姩杞贰鎴栫户缁墽琛屽緟鍙戝懡浠 -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// pROLL->run = sou_cmd_exists() ? RUN_LCD : RUN_AUTO; -// rt_mutex_release(pTHR->mutex); -// } -// else { // 鑷姩杞贰鎬侊紝鍒嗘瀽鎺ユ敹鐨勬暟鎹 -// #if DEBUG_SOUTH -// rt_kprintf("length = %d",pMB_R->length); -// #endif -// if(pMB_R->length!=43){//31淇敼鎴43锛屼竴鍏19涓瘎瀛樺櫒*2+4,澶氳浜4浣 -// ret = rt_mb_recv(pTS->mb, (rt_uint32_t *)&pMB_R, 30); // 瓒呮椂 200ms -// #if DEBUG_SOUTH -// rt_kprintf("ret = %d\n",ret); -// #endif -// if ((RT_EOK == ret)&&(RT_NULL != pMB_R)) { // 瀛樺湪杩斿洖鏁版嵁 -// chrg_eload_parse(idx, pROLL->part, pMB_R->payload, pMB_R->length); -// } -// } -// else chrg_eload_parse(idx, pROLL->part, pMB_R->payload, pMB_R->length); -// } -// } -// else { -// LOG_E("crc failed."); -// } - -// if (RT_NULL != pMB_R->payload) { -// rt_free(pMB_R->payload); -// pMB_R->payload = RT_NULL; -// } - -// if (RT_NULL != pMB_R) { -// rt_free(pMB_R); -// pMB_R = RT_NULL; -// } -// // rt_thread_mdelay(200); // 闂撮殧 20ms -// rt_thread_mdelay(10); // 闂撮殧 200ms -// } else { // 璁惧搴旂瓟瓒呮椂 -// if (RUN_AUTO != run) { // 闈炶嚜鍔ㄨ疆宸 -// rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); -// pROLL->run = sou_cmd_exists() ? RUN_LCD : RUN_AUTO; // 鍒囨崲浼氳嚜鍔ㄨ疆宸℃垨缁х画鎵ц寰呭彂鍛戒护 -// rt_mutex_release(pTHR->mutex); -// } -// } -// // rt_kprintf("-------- ROLL SOU TIME END\n --------"); -// } -// } - -// #if 1 -// static int south_send(rt_uint8_t argc, char **argv) -// { -// int ch = 0, pt = 0; - -// if (3 != argc) { -// rt_kprintf("help : %s [0-3] [0-1]\r\n", argv[0]); -// return -1; -// } - -// ch = (rt_uint8_t)atoi(argv[1]); -// if ((ch < 0)||(ch >= TOTAL_SOU_CHS)) { -// rt_kprintf("help : %s [0-3] [0-1]\r\n", argv[0]); -// return -1; -// } - -// pt = (rt_uint8_t)atoi(argv[2]); -// if ((pt < 0)||(pt >= TOTAL_MB_R)) { -// rt_kprintf("help : %s [0-3] [0-1]\r\n", argv[0]); -// return -1; -// } - -// struct chrg_rollsou_t *pROLL = &chrgrollsou; -// pROLL->run = RUN_CONSOLE; -// pROLL->ch = (rt_uint8_t)ch; -// pROLL->part = (rt_uint8_t)pt; - - -// return 0; -// } - -// MSH_CMD_EXPORT(south_send, south send test); - -// static int south_run (int argc, char **argv) -// { -// if (2 != argc) { -// rt_kprintf("help : %s start|stop\r\n", argv[0]); -// return -1; -// } - -// struct chrg_rollsou_t *pROLL = &chrgrollsou; - -// if (rt_strcmp(argv[1], "start") == 0) { -// pROLL->run = RUN_AUTO; -// } else if (rt_strcmp(argv[1], "stop") == 0) { -// pROLL->run = RUN_NONE; -// } else { -// rt_kprintf("help : %s start|stop\r\n", argv[0]); -// return -1; -// } - -// return 0; -// } - -// MSH_CMD_EXPORT(south_run, south auto run); - -// #endif - - /**************************************************************************** 鏂囦欢鍚嶇О : chrg_roll_sou.c 瀹屾垚鏃ユ湡 : @@ -385,13 +15,35 @@ #include "chrg_led.h" #include "chrg_thread.h" #include "chrg_roll_sou.h" +#include "chrg_north.h" #include "chrg_eload.h" #include "chrg_utils.h" #define LOG_TAG "chrg.rollsou" #include +#define SOU_MUTEX_TIMEOUT_MS 100 +#define SOU_RESPONSE_TIMEOUT_MS 20 +#define SOU_COM_MAX_ATTEMPTS 3 +#define SOU_REL_SWITCH_DELAY_MS 100U +#define SOU_CHANNEL_BIT(ch) ((rt_uint8_t)(1U << (ch))) + chrg_rollsou_com_t g_sou_com_batch = {0}; +/* 涓娆℃1閲忔祴鍒嗗埆璁板綍寰呭彂閫佽姹傚拰姝ｅ湪绛夊緟鍥炵爜鐨勮姹傘 + * 褰撳墠甯у皻鏈粨鏉熸椂鍐嶆鐢宠鐨勪笅涓甯т繚瀛樺湪pending涓紝涓嶈兘琚綋鍓嶅抚 + * 鐨勫畬鎴愬鐞嗘竻闄わ紝鍚﹀垯澶氶氶亾杩愯鏃朵綆鐢垫祦纭浼氶棿姝囨у仠姝㈡帹杩涖 */ +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鎵归噺鍛戒护鎸夐氶亾杞鍙戦併備竴娆″啓鍛戒护鏀跺埌鍖归厤鍥炵爜鍚庢墠绉诲姩娓告爣锛 + * 鍥炵爜閿欒鎴栬秴鏃舵椂娓告爣淇濇寔涓嶅彉锛屼娇鍚屼竴鏉″懡浠や紭鍏堝畬鎴愰噸鍙戯紝閬垮厤鐮村潖 + * 鏈氶亾鎵规鍐呯殑瀵勫瓨鍣ㄦ墽琛岄『搴忋 */ +static rt_uint8_t g_sou_com_batch_rr_next_ch = 0U; struct chrg_rollsou_t chrgrollsou = { .run = RUN_AUTO, @@ -399,31 +51,434 @@ struct chrg_rollsou_t chrgrollsou = { .part = MB_R_PART1, }; -//鍚戦氶亾鎵归噺缂撳瓨娣诲姞涓鏉″瘎瀛樺櫒 -int chrg_sou_com_batch_add_reg(eIDX_SOU_CH ch, rt_uint16_t reg, rt_uint16_t val) -{ - if(ch >= TOTAL_SOU_CHS) return -1; - sou_com_batch_ch_t *pBatch = &g_sou_com_batch.ch[ch]; - if(pBatch->reg_cnt >= SOU_COM_BATCH_REG_MAX) - { - LOG_E("sou com batch reg full"); - return -2; - } - pBatch->reg_list[pBatch->reg_cnt] = reg; - pBatch->val_list[pBatch->reg_cnt] = val; - pBatch->reg_cnt++; - pBatch->pending = RT_TRUE; - return 0; -} -//鍚姩鎵归噺涓嬪彂锛堝～鍏呭畬褰卞瓙缁撴瀯浣撳悗璋冪敤锛 -void chrg_sou_com_sou_set(void) + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_send_sou_upadata_data +鍑芥暟鎻忚堪锛 缂撳瓨涓甯у崌绾ф暟鎹苟鍒囨崲鍗楀悜绾跨▼鍒板崌绾у彂閫佺姸鎬 +杈撳叆鍙傛暟锛 buf:鍗囩骇甯ф暟鎹 leng:鍗囩骇甯ч暱搴 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 -1:鍙傛暟閿欒 -2:涓婁竴甯у皻鏈彂閫 -3:浜掓枼閿佽秴鏃 +鍏跺畠璇存槑锛 浣跨敤缁撴瀯浣撳唴閮ㄦ暟缁勪繚瀛樻暟鎹紝闃叉COM鎺ユ敹缂撳瓨鍙樺寲瀵艰嚧鍗囩骇甯ф崯鍧 +*****************************************************************/ +int chrg_send_sou_upadata_data(const rt_uint8_t *buf, rt_uint16_t leng) { struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; struct chrg_rollsou_t *pROLL = &chrgrollsou; - pROLL->run = RUN_COM; - + + if ((buf == RT_NULL) || (leng == 0) || (leng > sizeof(pROLL->updata_buf)) || + (pTHR->mutex == RT_NULL)) { + return -1; + } + if (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK) { + return -3; + } + if (pROLL->send_flag != 0) { + rt_mutex_release(pTHR->mutex); + return -2; + } + + memcpy(pROLL->updata_buf, buf, leng); + pROLL->leng = leng; + pROLL->updata_result = 0; + pROLL->send_flag = 1; + pROLL->run = RUN_UPDATA; + rt_mutex_release(pTHR->mutex); + return 0; } +//鍚戦氶亾鎵归噺缂撳瓨娣诲姞涓鏉″瘎瀛樺櫒 +int chrg_sou_com_batch_submit(eIDX_SOU_CH ch, const rt_uint16_t *regs, + const rt_uint16_t *vals, rt_uint8_t count) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + struct chrg_rollsou_t *pROLL = &chrgrollsou; + sou_com_batch_ch_t *pBatch; + rt_uint16_t remaining; + rt_uint8_t i; + + if ((ch >= TOTAL_SOU_CHS) || (RT_NULL == regs) || (RT_NULL == vals) || + (count == 0) || (count > SOU_COM_BATCH_REG_MAX) || (RT_NULL == pTHR->mutex)) { + return -1; + } + if (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK) { + LOG_E("sou com batch lock timeout"); + return -3; + } + + pBatch = &g_sou_com_batch.ch[ch]; + if (pBatch->cur_idx > pBatch->reg_cnt) { + LOG_E("sou com batch index invalid: ch=%d cur=%d cnt=%d", + ch, pBatch->cur_idx, pBatch->reg_cnt); + pBatch->pending = RT_FALSE; + pBatch->cur_idx = 0; + pBatch->reg_cnt = 0; + pBatch->next_send_tick = 0U; + } + + /* + * cur_idx 涔嬪墠鐨勫懡浠ゅ潎宸叉敹鍒版湁鏁堝搷搴旓紝杩藉姞鏂颁簨鍔″墠鍏堝洖鏀惰繖浜涚┖闂淬 + * 鍚﹀垯蹇熻繛缁啓鍏ユ椂锛屽嵆浣垮ぇ閮ㄥ垎鍛戒护宸茬粡鎵ц瀹屾垚锛屼篃鍙兘鍥犱负 + * reg_cnt 鏈竻闆惰岃鎶ユ壒闃熷垪宸叉弧銆 + */ + if (pBatch->cur_idx > 0) { + remaining = pBatch->reg_cnt - pBatch->cur_idx; + if (remaining > 0) { + memmove(pBatch->reg_list, &pBatch->reg_list[pBatch->cur_idx], + remaining * sizeof(pBatch->reg_list[0])); + memmove(pBatch->val_list, &pBatch->val_list[pBatch->cur_idx], + remaining * sizeof(pBatch->val_list[0])); + } + pBatch->reg_cnt = remaining; + pBatch->cur_idx = 0; + } + + /* + * 鐢垫祦璋冭妭閲囩敤鏈鏂板兼湁鏁堢瓥鐣ャ傝嫢鍚屼竴閫氶亾浠嶆湁灏氭湭鍙戦佺殑鐢垫祦鍛戒护锛 + * 鐩存帴瑕嗙洊鏃у硷紝閬垮厤鍥涢氶亾蹇熸祴璇曟椂闃熷垪绉疮杩囨椂鐨勭數娴佽缃 + * 褰撳墠鍛戒护宸茬粡鍙戦佹椂涓嶈鐩栵紝淇濊瘉鍝嶅簲浠嶄笌鍘熷懡浠ゅ尮閰嶃 + */ + if ((count == 1) && (regs[0] == (REG_CURRENT_OUT + 1))) { + for (i = pBatch->cur_idx; i < pBatch->reg_cnt; i++) { + if (pBatch->reg_list[i] == regs[0]) { + pBatch->val_list[i] = vals[0]; + pBatch->pending = RT_TRUE; + pROLL->run = RUN_COM; + rt_mutex_release(pTHR->mutex); + return 0; + } + } + } + + if ((pBatch->reg_cnt > SOU_COM_BATCH_REG_MAX) || + (count > (SOU_COM_BATCH_REG_MAX - pBatch->reg_cnt))) { + LOG_E("sou com batch reg full: ch=%d queued=%d append=%d max=%d", + ch, pBatch->reg_cnt, count, SOU_COM_BATCH_REG_MAX); + rt_mutex_release(pTHR->mutex); + return -2; + } + if (pBatch->reg_cnt == 0U) { + pBatch->next_send_tick = 0U; + } + + for (i = 0; i < count; i++) { + pBatch->reg_list[pBatch->reg_cnt] = regs[i]; + pBatch->val_list[pBatch->reg_cnt] = vals[i]; + pBatch->reg_cnt++; + } + pBatch->result = 0; + pBatch->pending = RT_TRUE; + pROLL->run = RUN_COM; + rt_mutex_release(pTHR->mutex); + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_com_batch_is_pending +鍑芥暟鎻忚堪锛 鏌ヨ鎸囧畾閫氶亾鏄惁浠嶆湁COM鍗楀悜鎵归噺鍛戒护绛夊緟鎵ц鎴栫瓑寰呮湁鏁堝簲绛 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:鎵归噺浜嬪姟鏈畬鎴愭垨鏌ヨ浜掓枼閿佸け璐 RT_FALSE:鎵归噺浜嬪姟宸插畬鎴 +鍏跺畠璇存槑锛 鏌ヨ澶辫触鏃舵寜鏈畬鎴愬鐞嗭紝闃叉鍖楀悜鍗忚閰嶇疆瓒婅繃鍗楀悜鍗歌浇鍛戒护鎻愬墠鎵ц +*****************************************************************/ +rt_bool_t chrg_sou_com_batch_is_pending(eIDX_SOU_CH ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + rt_bool_t pending; + + if ((ch >= TOTAL_SOU_CHS) || (pTHR->mutex == RT_NULL) || + (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return RT_TRUE; + } + + pending = g_sou_com_batch.ch[ch].pending; + rt_mutex_release(pTHR->mutex); + return pending; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_com_batch_get_result +鍑芥暟鎻忚堪锛 鑾峰彇鎸囧畾閫氶亾鏈杩戜竴娆″崡鍚慍OM鎵规鐨勬墽琛岀粨鏋 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 1:鍏ㄩ儴鍛戒护鏀跺埌鍖归厤鍥炵爜 0:鎵ц涓/鏃犵粨鏋 -1:澶辫触鍙栨秷 -2:鍙傛暟鎴栭攣閿欒 +鍏跺畠璇存槑锛 pending娓呴浂鏃㈠彲鑳芥槸鎴愬姛涔熷彲鑳芥槸澶辫触锛屽嵏杞界‘璁ゅ繀椤婚氳繃鏈粨鏋滃尯鍒 +*****************************************************************/ +int chrg_sou_com_batch_get_result(eIDX_SOU_CH ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + int result; + + if ((ch >= TOTAL_SOU_CHS) || (pTHR->mutex == RT_NULL) || + (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -2; + } + result = g_sou_com_batch.ch[ch].result; + rt_mutex_release(pTHR->mutex); + return result; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_measure_once_submit +鍑芥暟鎻忚堪锛 鐧昏鎸囧畾閫氶亾鐨勪竴娆℃1閲忔祴浼樺厛璇锋眰 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 璁剧疆閫氶亾璇锋眰浣 +杩斿洖璇存槑锛 0:鐧昏鎴愬姛鎴栬姹傚凡瀛樺湪 <0:鍙傛暟鎴栦簰鏂ラ攣閿欒 +鍏跺畠璇存槑锛 RUN_COM鎵规瀹屾垚骞跺垏鍥濺UN_AUTO鍚庯紝鍗楀悜绾跨▼浼氫紭鍏堟墽琛岃鏌ヨ +*****************************************************************/ +int chrg_sou_measure_once_submit(eIDX_SOU_CH ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + + if ((ch >= TOTAL_SOU_CHS) || (pTHR->mutex == RT_NULL) || + (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } + g_sou_measure_once_pending_mask |= SOU_CHANNEL_BIT(ch); + rt_mutex_release(pTHR->mutex); + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 sou_measure_once_next +鍑芥暟鎻忚堪锛 鑾峰彇褰撳墠寰呮墽琛岀殑涓娆℃1閲忔祴閫氶亾 +杈撳叆鍙傛暟锛 ch:杈撳嚭閫氶亾鎸囬拡 +杈撳嚭鍙傛暟锛 ch:鏈浣庣紪鍙风殑寰呮煡璇㈤氶亾 +杩斿洖璇存槑锛 1:瀛樺湪璇锋眰 0:鏃犺姹 <0:鍙傛暟鎴栦簰鏂ラ攣閿欒 +鍏跺畠璇存槑锛 璇锋眰浣嶅湪鏈鏌ヨ瀹屾垚鎴栬秴鏃跺悗娓呴櫎锛屾煡璇㈡湡闂翠繚鎸佺疆浣嶄互闃查噸澶嶆帓闃 +*****************************************************************/ +static int sou_measure_once_next(rt_uint8_t *ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + rt_uint8_t idx; + + if ((ch == RT_NULL) || (pTHR->mutex == RT_NULL) || + (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } + for (idx = 0; idx < TOTAL_SOU_CHS; idx++) { + rt_uint8_t bit = SOU_CHANNEL_BIT(idx); + + if ((g_sou_measure_once_pending_mask & bit) != 0U) { + /* 鍙戦佸墠浠巔ending杞Щ鍒癮ctive銆傛煡璇㈢瓑寰呮湡闂寸殑鏂扮敵璇蜂細閲嶆柊 + * 缃畃ending浣嶏紝骞跺湪褰撳墠鏌ヨ缁撴潫鍚庣户缁墽琛屻 */ + g_sou_measure_once_pending_mask &= (rt_uint8_t)~bit; + g_sou_measure_once_active_mask |= bit; + *ch = idx; + rt_mutex_release(pTHR->mutex); + return 1; + } + } + rt_mutex_release(pTHR->mutex); + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 sou_measure_once_finish +鍑芥暟鎻忚堪锛 缁撴潫鎸囧畾閫氶亾鐨勪竴娆℃1閲忔祴璇锋眰 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 娓呴櫎瀵瑰簲璇锋眰浣 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 鏈夋晥鍥炵爜鍜岃秴鏃堕兘浼氱粨鏉熸湰娆¤姹傦紱璐熻浇鐘舵佹満鎸夐噺娴嬪簭鍙峰喅瀹氭槸鍚﹂噸鏌 +*****************************************************************/ +static void sou_measure_once_finish(rt_uint8_t ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + + if ((ch >= TOTAL_SOU_CHS) || (pTHR->mutex == RT_NULL) || + (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return; + } + /* 鍙粨鏉熷綋鍓嶆鍦ㄧ瓑寰呯殑鏌ヨ锛涚瓑寰呮湡闂寸櫥璁扮殑涓嬩竴甯ending璇锋眰蹇呴』淇濈暀銆 */ + g_sou_measure_once_active_mask &= (rt_uint8_t)~SOU_CHANNEL_BIT(ch); + rt_mutex_release(pTHR->mutex); +} + +int chrg_sou_com_batch_add_reg(eIDX_SOU_CH ch, rt_uint16_t reg, rt_uint16_t val) +{ + return chrg_sou_com_batch_submit(ch, ®, &val, 1); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_crc +鍑芥暟鎻忚堪锛 鎸夊姛鐜囨澘鍗忚椤哄簭璁＄畻鍏ㄩ儴鏍″噯鍙傛暟鐨凪odbus CRC16 +杈撳叆鍙傛暟锛 pTrim:鏍″噯鍙傛暟缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 鏍″噯鍙傛暟CRC16 +鍏跺畠璇存槑锛 CRC瑕嗙洊鐢靛帇銆佽礋杞界數娴併佺數婧愮數娴佸強闆剁偣鍏20瀛楄妭 +*****************************************************************/ +static rt_uint16_t chrg_sou_trim_crc(const struct chrg_trim *pTrim) +{ + rt_uint8_t buf[20]; + rt_uint8_t idx = 0; + rt_uint16_t value; + +#define TRIM_CRC_APPEND(_value) \ + do { \ + value = (rt_uint16_t)(_value); \ + buf[idx++] = (rt_uint8_t)(value >> 8); \ + buf[idx++] = (rt_uint8_t)(value & 0xFF); \ + } while (0) + + TRIM_CRC_APPEND(pTrim->trim_volt_k_H); + TRIM_CRC_APPEND(pTrim->trim_volt_k_L); + TRIM_CRC_APPEND(pTrim->trim_volt_b); + TRIM_CRC_APPEND(pTrim->trim_curr_k_H); + TRIM_CRC_APPEND(pTrim->trim_curr_k_L); + TRIM_CRC_APPEND(pTrim->trim_curr_b); + TRIM_CRC_APPEND(pTrim->trim_source_curr_k_H); + TRIM_CRC_APPEND(pTrim->trim_source_curr_k_L); + TRIM_CRC_APPEND(pTrim->trim_source_curr_b); + TRIM_CRC_APPEND(pTrim->trim_zero); + +#undef TRIM_CRC_APPEND + + return mb_crc16(buf, sizeof(buf)); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_set_commit +鍑芥暟鎻忚堪锛 鏍规嵁鏍″噯鍖烘爣蹇楀～鍐欐渶鍚庝竴鏉″啓浣胯兘鍛戒护 +杈撳叆鍙傛暟锛 pTrim:鏍″噯鍙傛暟 reg:瀵勫瓨鍣ㄥ湴鍧鎸囬拡 value:瀵勫瓨鍣ㄥ兼寚閽 +杈撳嚭鍙傛暟锛 reg:鍐欎娇鑳藉湴鍧 value:瀵瑰簲榄旀暟 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 0鍐欑敤鎴锋牎鍑嗗尯锛1鍐欏嚭鍘傛牎鍑嗗尯 +*****************************************************************/ +static void chrg_sou_trim_set_commit(const struct chrg_trim *pTrim, + rt_uint16_t *reg, rt_uint16_t *value) +{ + if (pTrim->trim_enable_flag == 0) { + *reg = ModbusRTU_CAL_WriteEnable_ADD; + *value = ModbusRTU_CAL_WriteValue; + } else { + *reg = ModbusRTU_CAL_WriteRecovery; + *value = ModbusRTU_CAL_WriteRecovery_Value; + } +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_set_volt +鍑芥暟鎻忚堪锛 缁勮鐢垫簮鐢靛帇鏍″噯銆丆RC鍜屽啓浣胯兘鎸囦护 +杈撳叆鍙傛暟锛 ch:鍗楀悜閫氶亾 pTrim:鏍″噯鍙傛暟 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鎸囦护椤哄簭涓篕_H銆並_L銆丅銆丆RC銆佸啓浣胯兘 +*****************************************************************/ +static int chrg_sou_trim_set_volt(eIDX_SOU_CH ch, const struct chrg_trim *pTrim) +{ + rt_uint16_t regs[5] = { + ModbusRTU_Volt_CAL_K_H, ModbusRTU_Volt_CAL_K_L, + ModbusRTU_Volt_CAL_B, ModbusRTU_Trim_CRC_CAL, 0 + }; + rt_uint16_t vals[5] = { + pTrim->trim_volt_k_H, pTrim->trim_volt_k_L, + (rt_uint16_t)pTrim->trim_volt_b, chrg_sou_trim_crc(pTrim), 0 + }; + + chrg_sou_trim_set_commit(pTrim, ®s[4], &vals[4]); + return chrg_sou_com_batch_submit(ch, regs, vals, 5); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_set_curr +鍑芥暟鎻忚堪锛 缁勮璐熻浇鐢垫祦鏍″噯銆丆RC鍜屽啓浣胯兘鎸囦护 +杈撳叆鍙傛暟锛 ch:鍗楀悜閫氶亾 pTrim:鏍″噯鍙傛暟 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鎸囦护椤哄簭涓篕_H銆並_L銆丅銆丆RC銆佸啓浣胯兘 +*****************************************************************/ +static int chrg_sou_trim_set_curr(eIDX_SOU_CH ch, const struct chrg_trim *pTrim) +{ + rt_uint16_t regs[5] = { + ModbusRTU_Current_CAL_K_H, ModbusRTU_Current_CAL_K_L, + ModbusRTU_Current_CAL_B, ModbusRTU_Trim_CRC_CAL, 0 + }; + rt_uint16_t vals[5] = { + pTrim->trim_curr_k_H, pTrim->trim_curr_k_L, + (rt_uint16_t)pTrim->trim_curr_b, chrg_sou_trim_crc(pTrim), 0 + }; + + chrg_sou_trim_set_commit(pTrim, ®s[4], &vals[4]); + return chrg_sou_com_batch_submit(ch, regs, vals, 5); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_set_source_curr +鍑芥暟鎻忚堪锛 缁勮鐢垫簮鐢垫祦鏍″噯銆丆RC鍜屽啓浣胯兘鎸囦护 +杈撳叆鍙傛暟锛 ch:鍗楀悜閫氶亾 pTrim:鏍″噯鍙傛暟 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鎸囦护椤哄簭涓篕_H銆並_L銆丅銆丆RC銆佸啓浣胯兘 +*****************************************************************/ +static int chrg_sou_trim_set_source_curr(eIDX_SOU_CH ch, + const struct chrg_trim *pTrim) +{ + rt_uint16_t regs[5] = { + ModbusRTU_SourceCurrent_CAL_K_H, ModbusRTU_SourceCurrent_CAL_K_L, + ModbusRTU_SourceCurrent_CAL_B, ModbusRTU_Trim_CRC_CAL, 0 + }; + rt_uint16_t vals[5] = { + pTrim->trim_source_curr_k_H, pTrim->trim_source_curr_k_L, + (rt_uint16_t)pTrim->trim_source_curr_b, chrg_sou_trim_crc(pTrim), 0 + }; + + chrg_sou_trim_set_commit(pTrim, ®s[4], &vals[4]); + return chrg_sou_com_batch_submit(ch, regs, vals, 5); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_set_zero +鍑芥暟鎻忚堪锛 缁勮闆剁偣鏍″噯銆丆RC鍜屽啓浣胯兘鎸囦护 +杈撳叆鍙傛暟锛 ch:鍗楀悜閫氶亾 pTrim:鏍″噯鍙傛暟 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鎸囦护椤哄簭涓篫ERO銆丆RC銆佸啓浣胯兘 +*****************************************************************/ +static int chrg_sou_trim_set_zero(eIDX_SOU_CH ch, const struct chrg_trim *pTrim) +{ + rt_uint16_t regs[3] = {ModbusRTU_Trim_Zero_CAL, ModbusRTU_Trim_CRC_CAL, 0}; + rt_uint16_t vals[3] = { + (rt_uint16_t)pTrim->trim_zero, chrg_sou_trim_crc(pTrim), 0 + }; + + chrg_sou_trim_set_commit(pTrim, ®s[2], &vals[2]); + return chrg_sou_com_batch_submit(ch, regs, vals, 3); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_submit +鍑芥暟鎻忚堪锛 鏍规嵁鏍″噯绫诲瀷閫夋嫨缁勫寘鍑芥暟骞舵彁浜ゅ埌鍗楀悜RUN_COM闃熷垪 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 pTrim:宸茶В鏋愮殑鏍″噯鍙傛暟 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:鍙傛暟銆佹牎鍑嗘ā寮忔垨闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鏈嚱鏁颁笉淇敼鍗楀悜enable锛孯UN_COM鎸塩h涓诲姩鍒囨崲鐩爣閫氶亾 +*****************************************************************/ +int chrg_sou_trim_submit(eIDX_SOU_CH ch, const struct chrg_trim *pTrim) +{ + if ((ch >= TOTAL_SOU_CHS) || (pTrim == RT_NULL)) { + return -1; + } + + switch (pTrim->trim_mode) { + case MODE_VOLT_CAL: + return chrg_sou_trim_set_volt(ch, pTrim); + case MODE_CURR_CAL: + return chrg_sou_trim_set_curr(ch, pTrim); + case MODE_SOURCE_CURR_CAL: + return chrg_sou_trim_set_source_curr(ch, pTrim); + case MODE_ZERO_CAL: + return chrg_sou_trim_set_zero(ch, pTrim); + default: + return -1; + } +} +//鍚姩鎵归噺涓嬪彂锛堝～鍏呭畬褰卞瓙缁撴瀯浣撳悗璋冪敤锛 + /***************************************************************** 鍑芥暟鍚嶇О锛 chrg_set_sou_reg 鍑芥暟鎻忚堪锛 鍗楀悜閫氶亾璁剧疆瀵勫瓨鍣ㄨ姹傚懡浠 @@ -437,11 +492,16 @@ void chrg_set_sou_reg (eIDX_SOU_CH idx, rt_uint16_t reg, rt_uint16_t value) struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; struct chrg_rollsou_t *pROLL = &chrgrollsou; + if (RT_NULL == pTHR->mutex) { + return; + } + if (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(100)) != RT_EOK) { + LOG_E("sou command lock timeout"); + return; + } pROLL->ch = idx; pROLL->reg = reg; pROLL->value = value; - - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); pROLL->run = RUN_LCD; rt_mutex_release(pTHR->mutex); } @@ -455,18 +515,233 @@ void chrg_set_sou_reg (eIDX_SOU_CH idx, rt_uint16_t reg, rt_uint16_t value) 鍏跺畠璇存槑锛 - *****************************************************************/ void chrg_set_sou_reg_com (eIDX_SOU_CH idx, rt_uint16_t reg, rt_uint16_t value) +{ + chrg_sou_com_batch_add_reg(idx, reg, value); +} + +static int sou_com_batch_next(rt_uint8_t *ch, rt_uint16_t *reg, rt_uint16_t *value) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + struct chrg_rollsou_t *pROLL = &chrgrollsou; + rt_bool_t pending_wait = RT_FALSE; + rt_tick_t now; + rt_uint8_t idx; + rt_uint8_t offset; + + if ((RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } + + now = rt_tick_get(); + /* 浠庝笂涓娆℃垚鍔熷懡浠ょ殑涓嬩竴涓氶亾寮濮嬫煡鎵撅紝浣垮閫氶亾鎵规鎸 + * "CH1涓鏉 -> CH2涓鏉 -> ..." 浜ゆ浛鎵ц锛岃屼笉鏄綆缂栧彿閫氶亾鐙崰鎬荤嚎銆 */ + for (offset = 0; offset < TOTAL_SOU_CHS; offset++) { + idx = (rt_uint8_t)((g_sou_com_batch_rr_next_ch + offset) % + TOTAL_SOU_CHS); + sou_com_batch_ch_t *pBatch = &g_sou_com_batch.ch[idx]; + if (pBatch->pending != RT_TRUE) { + continue; + } + if ((pBatch->reg_cnt == 0) || (pBatch->cur_idx >= pBatch->reg_cnt)) { + pBatch->pending = RT_FALSE; + pBatch->result = -1; + pBatch->cur_idx = 0; + pBatch->reg_cnt = 0; + pBatch->next_send_tick = 0U; + continue; + } + pending_wait = RT_TRUE; + if ((pBatch->next_send_tick != 0U) && + ((rt_int32_t)(now - pBatch->next_send_tick) < 0)) { + /* 褰撳墠閫氶亾澶勪簬缁х數鍣ㄤ繚鎶ゆ椂闂存椂锛岀户缁煡鎵惧叾瀹冨彲鍙戦侀氶亾銆 */ + continue; + } + pBatch->next_send_tick = 0U; + + *ch = idx; + *reg = pBatch->reg_list[pBatch->cur_idx]; + *value = pBatch->val_list[pBatch->cur_idx]; + rt_mutex_release(pTHR->mutex); + return 1; + } + + if (!pending_wait) { + pROLL->run = RUN_AUTO; + } + rt_mutex_release(pTHR->mutex); + return 0; +} + +static int sou_com_batch_complete(rt_uint8_t ch, rt_uint16_t reg, rt_uint16_t value) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + sou_com_batch_ch_t *pBatch; + + if ((ch >= TOTAL_SOU_CHS) || (RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } + + pBatch = &g_sou_com_batch.ch[ch]; + if ((pBatch->pending != RT_TRUE) || (pBatch->cur_idx >= pBatch->reg_cnt) || + (pBatch->reg_list[pBatch->cur_idx] != reg) || + (pBatch->val_list[pBatch->cur_idx] != value)) { + rt_mutex_release(pTHR->mutex); + return -1; + } + + pBatch->cur_idx++; + /* 褰撳墠瀵勫瓨鍣ㄥ凡鏀跺埌鍖归厤鍐欏洖鐮併備笅涓娆¤皟搴︿粠涓嬩竴涓氶亾寮濮嬶紱 + * 褰撳墠閫氶亾鐨勪笅涓鏉″懡浠や細鍦ㄥ叾瀹冨氨缁氶亾鍚勬墽琛屼竴鏉″悗缁х画鍙戦併 */ + g_sou_com_batch_rr_next_ch = (rt_uint8_t)((ch + 1U) % TOTAL_SOU_CHS); + /* 鏆傛椂鍏抽棴鍓户鐢靛櫒涓庝富缁х數鍣ㄤ箣闂寸殑鍥哄畾寤舵椂锛涢渶瑕佹仮澶嶆椂閲嶆柊鍚敤鏈銆 */ + if ((reg == REG_REL_ON) && (value == ALL_REL_OFF) && + (pBatch->cur_idx < pBatch->reg_cnt) && + (pBatch->reg_list[pBatch->cur_idx] == REG_REL_ON) && + (pBatch->val_list[pBatch->cur_idx] == FU_REL_ON)) { + pBatch->next_send_tick = rt_tick_get() + + rt_tick_from_millisecond(SOU_REL_SWITCH_DELAY_MS); + } else if ((reg == REG_REL_ON) && (value == FU_REL_ON) && + (pBatch->cur_idx < pBatch->reg_cnt) && + (pBatch->reg_list[pBatch->cur_idx] == REG_REL_ON) && + (pBatch->val_list[pBatch->cur_idx] == ALL_REL_ON)) { + pBatch->next_send_tick = rt_tick_get() + + rt_tick_from_millisecond(SOU_REL_SWITCH_DELAY_MS); + } + if (pBatch->cur_idx >= pBatch->reg_cnt) { + pBatch->pending = RT_FALSE; + pBatch->result = 1; + pBatch->cur_idx = 0; + pBatch->reg_cnt = 0; + pBatch->next_send_tick = 0U; + } + rt_mutex_release(pTHR->mutex); + return 0; +} + +int chrg_sou_com_batch_cancel(eIDX_SOU_CH ch) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + sou_com_batch_ch_t *pBatch; + + if ((ch >= TOTAL_SOU_CHS) || (RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } + pBatch = &g_sou_com_batch.ch[ch]; + pBatch->pending = RT_FALSE; + pBatch->result = -1; + pBatch->cur_idx = 0; + pBatch->reg_cnt = 0; + pBatch->next_send_tick = 0U; + /* 宸插彇娑堜簨鍔″搴旂殑浼樺厛P1閲忔祴鍚屾牱澶辨晥锛屽悗缁姸鎬佷細閲嶆柊鐢宠鏂伴噺娴嬨 */ + g_sou_measure_once_pending_mask &= (rt_uint8_t)~SOU_CHANNEL_BIT(ch); + g_sou_measure_once_active_mask &= (rt_uint8_t)~SOU_CHANNEL_BIT(ch); + rt_mutex_release(pTHR->mutex); + return 0; +} + +static rt_bool_t sou_com_batch_pending_locked(void) +{ + rt_uint8_t idx; + + for (idx = 0; idx < TOTAL_SOU_CHS; idx++) { + if (g_sou_com_batch.ch[idx].pending == RT_TRUE) { + return RT_TRUE; + } + } + return RT_FALSE; +} + +static void sou_single_command_finish(rt_uint8_t expected_run) { struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; struct chrg_rollsou_t *pROLL = &chrgrollsou; - pROLL->ch = idx; - pROLL->reg = reg; - pROLL->value = value; - - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); - pROLL->run = RUN_COM; + if ((RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return; + } + if (pROLL->run == expected_run) { + pROLL->run = sou_com_batch_pending_locked() ? RUN_COM : RUN_AUTO; + } rt_mutex_release(pTHR->mutex); - rt_kprintf("ch=:%d,reg=%02x,value=%02x\n",idx,reg,value); +} + +static rt_bool_t sou_com_response_matches(struct mb_msg_t *pMB, rt_uint16_t reg, + rt_uint16_t value) +{ + return (pMB != RT_NULL) && (pMB->payload != RT_NULL) && (pMB->length == 8) && + (pMB->payload[0] == ID_ELOAD) && (pMB->payload[1] == MB_REGISTER_WR) && + (u8v_to_u16(&pMB->payload[2]) == reg) && + (u8v_to_u16(&pMB->payload[4]) == value) && + (mb_crc16(pMB->payload, pMB->length) == 0); +} + +static void sou_msg_free(struct mb_msg_t **ppMB) +{ + if ((ppMB == RT_NULL) || (*ppMB == RT_NULL)) { + return; + } + if ((*ppMB)->payload != RT_NULL) { + rt_free((*ppMB)->payload); + (*ppMB)->payload = RT_NULL; + } + rt_free(*ppMB); + *ppMB = RT_NULL; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 sou_com_batch_current_matches +鍑芥暟鎻忚堪锛 鍒ゆ柇褰撳墠鍗楀悜鎵规姝ｅ湪绛夊緟鐨勫懡浠ゆ槸鍚︿粛涓庢寚瀹氬懡浠や竴鑷 +杈撳叆鍙傛暟锛 ch:鍗楀悜閫氶亾 reg:瀵勫瓨鍣ㄥ湴鍧 value:瀵勫瓨鍣ㄥ +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:鎸囧畾鍛戒护浠嶆槸璇ラ氶亾褰撳墠鎵规鐨勭瓑寰呴」 + RT_FALSE:鎵规宸插彇娑堛佸凡鏇挎崲鎴栧綋鍓嶇瓑寰呴」涓嶅悓 +鍏跺畠璇存槑锛 鐢ㄤ簬蹇界暐鍙栨秷鏃ф壒娆″悗杩熷埌鐨勫洖鐮侊紝闃叉鏃у洖鐮佽Е鍙戞柊瀹夊叏鎵规閲嶈瘯鎴栧彇娑 +*****************************************************************/ +static rt_bool_t sou_com_batch_current_matches(rt_uint8_t ch, + rt_uint16_t reg, rt_uint16_t value) +{ + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + sou_com_batch_ch_t *pBatch; + rt_bool_t matched; + + if ((ch >= TOTAL_SOU_CHS) || (RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, + rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return RT_FALSE; + } + + pBatch = &g_sou_com_batch.ch[ch]; + matched = (pBatch->pending == RT_TRUE) && + (pBatch->cur_idx < pBatch->reg_cnt) && + (pBatch->reg_list[pBatch->cur_idx] == reg) && + (pBatch->val_list[pBatch->cur_idx] == value); + rt_mutex_release(pTHR->mutex); + return matched; +} + +static void sou_com_command_failed(rt_uint8_t ch, rt_uint16_t reg, rt_uint16_t value, + const char *reason, rt_uint8_t *retry_count) +{ + /* 璇ュ懡浠ゆ墍灞炴壒娆″凡琚畨鍏ㄧ姸鎬佹浛鎹㈡椂锛岃繜鍒板洖鐮佹垨瓒呮椂涓嶅緱褰卞搷鏂版壒娆° */ + if (!sou_com_batch_current_matches(ch, reg, value)) { + *retry_count = 0; + return; + } + + (*retry_count)++; + if (*retry_count < SOU_COM_MAX_ATTEMPTS) { + return; + } + + LOG_E("com batch failed after %d attempts: ch=%d reg=0x%04x value=0x%04x (%s)", + SOU_COM_MAX_ATTEMPTS, ch, reg, value, reason); + if (chrg_sou_com_batch_cancel((eIDX_SOU_CH)ch) == 0) { + *retry_count = 0; + } } @@ -489,22 +764,63 @@ void chrg_roll_sou_thread_entry (void *data) rt_uint8_t run = 0; rt_uint8_t index = 0, idx = 0; + rt_uint8_t batch_ch = 0; + rt_uint8_t retry_count = 0; + rt_uint8_t command_ch = 0; + rt_uint8_t single_ch = 0; + rt_uint8_t single_part = 0; + rt_uint16_t command_reg = 0; + rt_uint16_t command_value = 0; + rt_uint16_t single_reg = 0; + 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; struct chrg_thread_t *pTS = &chrgthr[IDX_THR_SOUTH]; struct mb_msg_t *pMB_R = RT_NULL; - sou_com_batch_ch_t *pCurBatch = RT_NULL; while (1) { rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); run = pROLL->run; + single_ch = pROLL->ch; + single_part = pROLL->part; + single_reg = pROLL->reg; + single_value = pROLL->value; rt_mutex_release(pTHR->mutex); - rt_uint8_t batch_ch = 0; // 缂撳瓨褰撳墠姝ｅ湪涓嬪彂鐨勬壒閲忛氶亾 + 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; + } // rt_kprintf("------ROLL SOU START \n--------"); switch (run) { case RUN_AUTO: { + int measure_ret = sou_measure_once_next(&idx); + if (measure_ret > 0) { + /* 鍗歌浇纭浼樺厛璇诲彇褰撳墠閫氶亾P1锛屼笉绛夊緟鍥涢氶亾鏅氳疆璇㈣蛋瀹屻 */ + measure_once = RT_TRUE; + response_part = MB_R_PART1; + chrg_led_flashing(IDX_LED3, TIMES_ONE, PULSE_TIME*2, PULSE_TIME*2); + if (idx != (rt_uint8_t)pROLL->idx) { + pROLL->idx = (eIDX_SOU_CH)idx; + chrg_south_switch((eIDX_SOU_CH)idx); + } + 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] + response_part = pROLL->part; if (0 == chrgsouth.enable[idx]) { // 閫氶亾鏈惎鐢 - index++; + CHRG_CHANNEL_NEXT(index); rt_thread_mdelay(10); continue; } else { // 閫氶亾鍚敤 @@ -514,53 +830,66 @@ 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++; + CHRG_CHANNEL_NEXT(index); } } } break; case RUN_LCD: { - chrg_south_switch((eIDX_SOU_CH)pROLL->ch); - chrg_eload_write_reg(ID_ELOAD, pROLL->reg, pROLL->value); + chrg_south_switch((eIDX_SOU_CH)single_ch); + chrg_eload_write_reg(ID_ELOAD, single_reg, single_value); } break; case RUN_COM: { - pCurBatch = RT_NULL; - // 閬嶅巻鏌ユ壘鏈夊緟涓嬪彂鎵归噺浠诲姟鐨勯氶亾 - for(idx = 0; idx < TOTAL_SOU_CHS; idx++) - { - if(g_sou_com_batch.ch[idx].pending == RT_TRUE) - { - pCurBatch = &g_sou_com_batch.ch[idx]; - break; - } + int next_ret = sou_com_batch_next(&command_ch, &command_reg, &command_value); + if (next_ret <= 0) { + retry_count = 0; + rt_thread_mdelay(1); + continue; } - // 鏃犱换浣曟壒閲忎换鍔★紝鍒囧洖鑷姩杞贰 - if(pCurBatch == RT_NULL) - { - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); - pROLL->run = RUN_AUTO; - rt_mutex_release(pTHR->mutex); - break; - } - // 鍒囨崲褰撳墠閫氶亾涓插彛 - chrg_south_switch((eIDX_SOU_CH)idx); - batch_ch = idx; - // 鍙戦佸綋鍓嶄笅鏍囧瘎瀛樺櫒 - rt_uint16_t reg = pCurBatch->reg_list[pCurBatch->cur_idx]; - rt_uint16_t val = pCurBatch->val_list[pCurBatch->cur_idx]; - chrg_eload_write_reg(ID_ELOAD, reg, val); + 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; + case RUN_UPDATA: + { + /* + * 鍗囩骇鍝嶅簲鏄崟瀛楄妭ACK/NAK/C锛屼笉鏄疢odbus娑堟伅锛屽洜姝ゆ湰鍒嗘敮鍙戦佸悗 + * 鐩存帴杩斿洖寰幆锛岀敱COM鍗囩骇鐘舵佹満璇诲彇鍝嶅簲锛屼笉鑳借繘鍏ヤ笅鏂归偖绠辩瓑寰呫 + */ + if ((pROLL->mode != 1) || (pROLL->send_flag == 0) || + (pROLL->leng == 0) || (pROLL->leng > sizeof(pROLL->updata_buf))) { + rt_thread_mdelay(1); + continue; + } + chrg_south_switch((eIDX_SOU_CH)single_ch); + ret = chrg_eload_send_ymodem_data(pROLL->updata_buf, pROLL->leng); + + rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); + pROLL->updata_result = (rt_int16_t)ret; + pROLL->send_flag = 0; + rt_mutex_release(pTHR->mutex); + rt_thread_mdelay(1); + continue; + } + case RUN_CONSOLE: { - chrg_south_switch((eIDX_SOU_CH)pROLL->ch); - chrg_eload_refresh(ID_ELOAD, pROLL->part); + chrg_south_switch((eIDX_SOU_CH)single_ch); + chrg_eload_refresh(ID_ELOAD, single_part); } break; @@ -571,76 +900,63 @@ void chrg_roll_sou_thread_entry (void *data) break; } - ret = rt_mb_recv(pTS->mb, (rt_uint32_t *)&pMB_R, 50); - if ((RT_EOK == ret)&&(RT_NULL != pMB_R)) - { - if (0 == mb_crc16(pMB_R->payload, pMB_R->length)) - { - if (RUN_AUTO != run) - { - if(run == RUN_COM) - { - // CRC鏍￠獙鎴愬姛锛屾湰鏉″彂閫佸畬鎴愶紝涓嬫爣+1锛屼笅鍙戜笅涓鏉 - sou_com_batch_ch_t *pBatch = &g_sou_com_batch.ch[batch_ch]; - pBatch->cur_idx++; - // 褰撳墠閫氶亾鍏ㄩ儴鎸囦护鍙戝畬锛屾竻闄ending鏍囪 - if(pBatch->cur_idx >= pBatch->reg_cnt) - { - pBatch->pending = RT_FALSE; - pBatch->cur_idx = 0; - pBatch->reg_cnt = 0; - } - } - else - { - // LCD/CONSOLE鍗曟潯妯″紡锛屽簲绛旀垚鍔熺洿鎺ュ垏鍥炶嚜鍔ㄨ疆宸 - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); - pROLL->run = RUN_AUTO; - rt_mutex_release(pTHR->mutex); - } - } - else - { - // AUTO鑷姩閲囬泦锛岃В鏋愯繑鍥炴暟鎹 - chrg_eload_parse(idx, pROLL->part, pMB_R->payload, pMB_R->length); - } - } - else - { - LOG_E("crc failed, resend current reg"); - // CRC閿欒锛屼笉閫掑cur_idx锛屼笅涓杞噸鍙戞湰鏉 + pMB_R = RT_NULL; + ret = rt_mb_recv(pTS->mb, (rt_uint32_t *)&pMB_R, + rt_tick_from_millisecond(SOU_RESPONSE_TIMEOUT_MS)); + if ((RT_EOK == ret) && (RT_NULL != pMB_R)) { + rt_bool_t response_valid; + + if (run == RUN_COM) { + response_valid = command_valid && + sou_com_response_matches(pMB_R, command_reg, command_value); + } else { + response_valid = (pMB_R->payload != RT_NULL) && + (mb_crc16(pMB_R->payload, pMB_R->length) == 0); } - // 閲婃斁鎶ユ枃鍐呭瓨 - if (RT_NULL != pMB_R->payload) - { - rt_free(pMB_R->payload); - pMB_R->payload = RT_NULL; - } - if (RT_NULL != pMB_R) - { - rt_free(pMB_R); - pMB_R = RT_NULL; - } - rt_thread_mdelay(20); - } - else - { - // 搴旂瓟瓒呮椂澶勭悊 - if (RUN_AUTO != run) - { - if(run == RUN_COM) - { - // 鎵归噺涓嬪彂瓒呮椂锛氫笉閫掑cur_idx锛屼笅涓杞惊鐜噸鍙戝綋鍓嶅瘎瀛樺櫒 - LOG_E("com batch timeout, resend current reg"); - } - else - { - // LCD/CONSOLE鍗曟潯瓒呮椂锛屽垏鍥炶嚜鍔ㄨ疆宸 - rt_mutex_take(pTHR->mutex, RT_WAITING_FOREVER); - pROLL->run = RUN_AUTO; - rt_mutex_release(pTHR->mutex); + if (response_valid) { + if (run == RUN_COM) { + if (sou_com_batch_complete(batch_ch, command_reg, command_value) == 0) { + retry_count = 0; + } else { + sou_com_command_failed(batch_ch, command_reg, command_value, + "batch changed", &retry_count); + } + } else if (run != RUN_AUTO) { + sou_single_command_finish(run); + } else { + 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, + "invalid response", &retry_count); + } else { + LOG_E("crc failed"); + } + if ((run == RUN_AUTO) && measure_once) { + sou_measure_once_finish(idx); + } + + sou_msg_free(&pMB_R); + } else { + sou_msg_free(&pMB_R); + if ((run == RUN_AUTO) && measure_once) { + sou_measure_once_finish(idx); + } + if ((run == RUN_COM) && command_valid) { + sou_com_command_failed(batch_ch, command_reg, command_value, + "timeout", &retry_count); + } else if (run != RUN_AUTO) { + sou_single_command_finish(run); } } // rt_kprintf("------ROLL SOU END \n--------"); @@ -670,10 +986,15 @@ static int south_send(rt_uint8_t argc, char **argv) } struct chrg_rollsou_t *pROLL = &chrgrollsou; + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + if ((RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } pROLL->run = RUN_CONSOLE; pROLL->ch = (rt_uint8_t)ch; pROLL->part = (rt_uint8_t)pt; - + rt_mutex_release(pTHR->mutex); return 0; } @@ -688,15 +1009,23 @@ static int south_run (int argc, char **argv) } struct chrg_rollsou_t *pROLL = &chrgrollsou; + struct chrg_thread_t *pTHR = &chrgthr[IDX_THR_ROLL_SOU]; + rt_uint8_t new_run; if (rt_strcmp(argv[1], "start") == 0) { - pROLL->run = RUN_AUTO; + new_run = RUN_AUTO; } else if (rt_strcmp(argv[1], "stop") == 0) { - pROLL->run = RUN_NONE; + new_run = RUN_NONE; } else { rt_kprintf("help : %s start|stop\r\n", argv[0]); return -1; } + if ((RT_NULL == pTHR->mutex) || + (rt_mutex_take(pTHR->mutex, rt_tick_from_millisecond(SOU_MUTEX_TIMEOUT_MS)) != RT_EOK)) { + return -1; + } + pROLL->run = new_run; + rt_mutex_release(pTHR->mutex); return 0; } diff --git a/apps/chrg/applications/thread/chrg_roll_sou.h b/apps/chrg/applications/thread/chrg_roll_sou.h index b707c96..f1427b8 100644 --- a/apps/chrg/applications/thread/chrg_roll_sou.h +++ b/apps/chrg/applications/thread/chrg_roll_sou.h @@ -12,11 +12,13 @@ #include +struct chrg_trim; #define THR_NAME_ROLL_SOU "thr.rollsou" // 鍗曢氶亾鎵归噺涓嬪彂缂撳瓨锛氫繚瀛樺綋鍓嶉渶瑕佸悓姝ョ殑瀵勫瓨鍣ㄥ垪琛 -#define SOU_COM_BATCH_REG_MAX 16 +/* 涓鸿繛缁彁浜ゅ垵濮嬪寲銆佹櫘閫氬惎鍔ㄥ拰鍔ㄦ佸惎鍔ㄥ懡浠ら鐣欒冻澶熺┖闂淬 */ +#define SOU_COM_BATCH_REG_MAX 32 typedef struct { rt_uint16_t reg_cnt; // 褰撳墠寰呬笅鍙戝瘎瀛樺櫒鏁伴噺 @@ -24,6 +26,8 @@ typedef struct rt_uint16_t val_list[SOU_COM_BATCH_REG_MAX]; // 瀵瑰簲瀵勫瓨鍣ㄥ兼暟缁 rt_uint8_t cur_idx; // 褰撳墠涓嬪彂鍒扮鍑犳潯 rt_bool_t pending; // 鏈氶亾鏈夊緟涓嬪彂鎵归噺鎸囦护 + rt_int8_t result; // 0:鎵ц涓/鏃犵粨鏋 1:鎴愬姛 -1:澶辫触鍙栨秷 + rt_tick_t next_send_tick; // 闈0鏃朵笅涓鏉″懡浠や笉寰楁棭浜庤tick鍙戦 } sou_com_batch_ch_t; // COM鎵归噺涓嬪彂鎬绘帶缁撴瀯浣 @@ -46,9 +50,10 @@ struct chrg_rollsou_t { rt_uint16_t reg; // LCD 瑙﹀彂鏃讹紝瀵勫瓨鍣ㄥ湴鍧 rt_uint16_t value; // LCD 瑙﹀彂鏃讹紝瀵勫瓨鍣ㄥ - rt_uint8_t *updata_data;//鍗楀悜鍗囩骇鐨勬暟鎹 - rt_uint16_t leng; - rt_uint8_t send_flag; //鍙戦佹爣蹇椾綅 + rt_uint8_t updata_buf[YMODEM_STX_SIZE];/* 鍗楀悜鍗囩骇甯х紦瀛橈紝閬垮厤涓婂眰缂撳啿鍖鸿鎻愬墠瑕嗙洊 */ + rt_uint16_t leng; /* 褰撳墠寰呭彂閫佸崌绾у抚鐨勫疄闄呴暱搴 */ + rt_int16_t updata_result;/* 鏈杩戜竴娆″崌绾у抚鍙戦佺粨鏋 */ + rt_uint8_t send_flag; /* 1:鍗囩骇甯у緟鍙戦佹垨姝ｅ湪鍙戦侊紝0:鍏佽鎻愪氦涓嬩竴甯 */ rt_uint8_t mode;// 0 涓烘甯歌疆璇紝1涓哄崌绾э紝2涓烘牎鍑 }; @@ -82,9 +87,56 @@ extern void chrg_set_sou_reg_com (eIDX_SOU_CH idx, rt_uint16_t reg, rt_uint16_t *****************************************************************/ extern void chrg_roll_sou_thread_entry (void *data); -extern void chrg_send_sou_upadata_data (rt_uint8_t *buf,rt_uint16_t leng); -extern void chrg_sou_com_sou_set(void); +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_send_sou_upadata_data +鍑芥暟鎻忚堪锛 灏嗕竴甯у崌绾ф暟鎹鍒跺埌鍗楀悜鍗囩骇缂撳瓨骞跺敜閱掑崌绾у彂閫佸垎鏀 +杈撳叆鍙傛暟锛 buf:鍗囩骇甯ф暟鎹 leng:鍗囩骇甯ч暱搴 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 -1:鍙傛暟閿欒 -2:涓婁竴甯у皻鏈彂閫 -3:浜掓枼閿佽秴鏃 +鍏跺畠璇存槑锛 鏁版嵁鍦ㄥ嚱鏁板唴瀹屾垚澶嶅埗锛岃皟鐢ㄨ呰繑鍥炲悗鍙互绔嬪嵆澶嶇敤鍘熺紦鍐插尯 +*****************************************************************/ +extern int chrg_send_sou_upadata_data(const rt_uint8_t *buf, rt_uint16_t leng); extern int chrg_sou_com_batch_add_reg(eIDX_SOU_CH ch, rt_uint16_t reg, rt_uint16_t val); +extern int chrg_sou_com_batch_submit(eIDX_SOU_CH ch, const rt_uint16_t *regs, + const rt_uint16_t *vals, rt_uint8_t count); +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_com_batch_cancel +鍑芥暟鎻忚堪锛 鍙栨秷鎸囧畾閫氶亾灏氭湭瀹屾垚鐨勫崡鍚慍OM鎵规 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎵规宸插彇娑 <0:鍙傛暟鎴栦簰鏂ラ攣閿欒 +鍏跺畠璇存槑锛 宸插彂閫佸埌鍔熺巼鏉跨殑褰撳墠鍛戒护鏃犳硶鎾ゅ洖锛屼絾鍏跺悗缁湭鍙戦佸懡浠ゅ皢琚竻闄わ紱 + 褰撳墠鍛戒护鐨勮繜鍒板洖鐮佷細鎸夋壒娆″凡鍙樻洿澶勭悊锛屼笉鍐嶆帹杩涙棫鎵规 +*****************************************************************/ +extern int chrg_sou_com_batch_cancel(eIDX_SOU_CH ch); +extern rt_bool_t chrg_sou_com_batch_is_pending(eIDX_SOU_CH ch); +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_com_batch_get_result +鍑芥暟鎻忚堪锛 鑾峰彇鎸囧畾閫氶亾鏈杩戜竴娆″崡鍚慍OM鎵规鐨勬墽琛岀粨鏋 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 1:鍏ㄩ儴鍛戒护鏀跺埌鍖归厤鍥炵爜 0:鎵ц涓/鏃犵粨鏋 -1:澶辫触鍙栨秷 -2:鍙傛暟鎴栭攣閿欒 +鍏跺畠璇存槑锛 鐢ㄤ簬鍖哄垎pending娓呴浂鏄甯稿畬鎴愯繕鏄噸璇曡楀敖鍚庣殑澶辫触鍙栨秷 +*****************************************************************/ +extern int chrg_sou_com_batch_get_result(eIDX_SOU_CH ch); +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_measure_once_submit +鍑芥暟鎻忚堪锛 璇锋眰鍗楀悜绾跨▼浼樺厛鏌ヨ鎸囧畾閫氶亾鐨勪竴甯1閲忔祴鏁版嵁 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:璇锋眰鎴愬姛鎴栧凡瀛樺湪鍚岄氶亾璇锋眰 <0:鍙傛暟鎴栦簰鏂ラ攣閿欒 +鍏跺畠璇存槑锛 鍙櫥璁颁竴娆℃ц姹傦紝瀹為檯鍒囬氶亾銆佸彂閫0x03鍜岃В鏋愪粛鐢卞崡鍚戠嚎绋嬪畬鎴 +*****************************************************************/ +extern int chrg_sou_measure_once_submit(eIDX_SOU_CH ch); +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sou_trim_submit +鍑芥暟鎻忚堪锛 鏍规嵁鏍″噯绫诲瀷缁勮鍔熺巼鏉挎牎鍑嗘寚浠ゅ苟鎻愪氦鍒板崡鍚慍OM闃熷垪 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼鏉块氶亾 pTrim:宸茶В鏋愮殑鏍″噯鍙傛暟 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:鍙傛暟銆佹牎鍑嗘ā寮忔垨闃熷垪鎻愪氦澶辫触 +鍏跺畠璇存槑锛 瀹為檯鍙戦併佸簲绛旀牎楠屽拰閲嶈瘯鐢盧UN_COM鍒嗘敮缁熶竴绠＄悊 +*****************************************************************/ +extern int chrg_sou_trim_submit(eIDX_SOU_CH ch, const struct chrg_trim *pTrim); #endif diff --git a/apps/chrg/applications/thread/chrg_south.c b/apps/chrg/applications/thread/chrg_south.c index 2fb6463..3c8fcd5 100644 --- a/apps/chrg/applications/thread/chrg_south.c +++ b/apps/chrg/applications/thread/chrg_south.c @@ -23,6 +23,8 @@ #define DBG_LEVEL DBG_LOG #include +#define SOUTH_FRAME_TIMEOUT_MS 100 + #define MB_ACK_HEAD_SIZE 3 // modbus 鍝嶅簲澶3瀛楄妭 struct chrg_south_t chrgsouth = { @@ -157,6 +159,9 @@ int chrg_south_send (rt_uint8_t *data, rt_size_t length) struct chrg_tty_t *pTTY = chrgsouth.tty; if (RT_NULL != pTTY) { +#if SOUTH_FRAME_DEBUG + LOG_HEX("sendS", 32, data, length); +#endif ret = chrg_tty_send(pTTY, data, length); } return ret; @@ -183,7 +188,9 @@ static int chrg_south_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eI len_rb = rt_ringbuffer_data_len(rb); if (len_rb < MB_ACK_HEAD_SIZE) { // 甯уご3瀛楄妭 +#if SOUTH_FRAME_DEBUG rt_kprintf("len_rb=:%d",len_rb); +#endif return -1; } @@ -249,10 +256,70 @@ static int chrg_south_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eI 杩斿洖璇存槑锛 <0: 閿欒 >0:甯ч暱搴 鍏跺畠璇存槑锛 - *****************************************************************/ +static void chrg_south_frame_reset(struct pickup_info_t *pFrame, rt_bool_t release) +{ + if (RT_NULL == pFrame) { + return; + } + + if (release && (RT_NULL != pFrame->pMB)) { + if (RT_NULL != pFrame->pMB->payload) { + rt_free(pFrame->pMB->payload); + } + rt_free(pFrame->pMB); + } + + pFrame->last_tick = 0; + pFrame->length = 0; + pFrame->findhead = 0; + pFrame->len_msg = 0; + pFrame->pMB = RT_NULL; +} + +static int chrg_south_frame_append(struct rt_ringbuffer *rb, + struct pickup_info_t *pFrame) +{ + rt_size_t remaining; + rt_size_t copied; + + if ((RT_NULL == rb)||(RT_NULL == pFrame)||(RT_NULL == pFrame->pMB)|| + (RT_NULL == pFrame->pMB->payload)||(pFrame->len_msg <= 0)|| + (pFrame->length > (rt_size_t)pFrame->len_msg)) { + return -1; + } + + remaining = (rt_size_t)pFrame->len_msg - pFrame->length; + if (0 == remaining) { + return 1; + } + + copied = rt_ringbuffer_data_len(rb); + if (copied > remaining) { + copied = remaining; + } + if (copied > 0) { + copied = rt_ringbuffer_get(rb, + &pFrame->pMB->payload[pFrame->length], copied); + pFrame->length += copied; + pFrame->last_tick = rt_tick_get(); + } + + return (pFrame->length == (rt_size_t)pFrame->len_msg) ? 1 : 0; +} + +static void chrg_south_frame_dispatch(struct pickup_info_t *pFrame) +{ + struct mb_msg_t *pMB = pFrame->pMB; + + chrg_south_frame_reset(pFrame, RT_FALSE); + chrg_thread_mb_send(IDX_THR_SOUTH, pMB); +} + static int chrg_south_pickup_frame (struct rt_ringbuffer *rb, struct pickup_info_t *pFrame) { int cnt = 0; + int status = 0; rt_size_t len_rb = 0; if ((RT_NULL == rb)||(RT_NULL == pFrame)) { @@ -263,63 +330,55 @@ static int chrg_south_pickup_frame (struct rt_ringbuffer *rb, if (0 == pFrame->findhead) { pFrame->len_msg = chrg_south_frame_head(rb, pFrame->head, ID_ELOAD); if (pFrame->len_msg > 0) { + if ((pFrame->len_msg < MB_ACK_HEAD_SIZE)|| + (pFrame->len_msg >= SIZE_BUF_TTY)) { + LOG_E("invalid msg length: %d", pFrame->len_msg); + chrg_south_frame_reset(pFrame, RT_TRUE); + return -3; + } + pFrame->pMB = (struct mb_msg_t *)rt_malloc(sizeof(struct mb_msg_t)); if (RT_NULL == pFrame->pMB) { LOG_E("malloc mb failed."); + chrg_south_frame_reset(pFrame, RT_FALSE); return -2; } pFrame->pMB->length = pFrame->len_msg; - if (pFrame->pMB->length >= SIZE_BUF_TTY) { - rt_free(pFrame->pMB); - pFrame->pMB = RT_NULL; - LOG_E("too long msg."); - return -3; - } - + pFrame->pMB->payload = RT_NULL; pFrame->pMB->payload = (rt_uint8_t *)rt_malloc(pFrame->len_msg); if (RT_NULL == pFrame->pMB->payload) { LOG_E("malloc buf failed."); + chrg_south_frame_reset(pFrame, RT_TRUE); return -4; } rt_memcpy(pFrame->pMB->payload, pFrame->head, MB_ACK_HEAD_SIZE); + pFrame->length = MB_ACK_HEAD_SIZE; + pFrame->findhead = 1; + pFrame->last_tick = rt_tick_get(); - len_rb = rt_ringbuffer_data_len(rb); - if (len_rb >= pFrame->len_msg - MB_ACK_HEAD_SIZE) { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[MB_ACK_HEAD_SIZE], - pFrame->len_msg - MB_ACK_HEAD_SIZE); - - chrg_thread_mb_send(IDX_THR_SOUTH, pFrame->pMB); - - pFrame->length = 0; - pFrame->len_msg = 0; + status = chrg_south_frame_append(rb, pFrame); + if (status > 0) { + chrg_south_frame_dispatch(pFrame); cnt++; + } else if (status < 0) { + chrg_south_frame_reset(pFrame, RT_TRUE); + return -5; } else { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[MB_ACK_HEAD_SIZE], len_rb); - pFrame->length = MB_ACK_HEAD_SIZE + len_rb; - pFrame->findhead = 1; - pFrame->last_tick = rt_tick_get(); break; } } } else { - len_rb = rt_ringbuffer_data_len(rb); - int len_need = pFrame->len_msg - MB_ACK_HEAD_SIZE; - if (len_rb >= len_need) { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[pFrame->length], len_need); - - chrg_thread_mb_send(IDX_THR_SOUTH, pFrame->pMB); - - pFrame->length = 0; - pFrame->findhead = 0; - pFrame->len_msg = 0; + status = chrg_south_frame_append(rb, pFrame); + if (status > 0) { + chrg_south_frame_dispatch(pFrame); cnt++; + } else if (status < 0) { + chrg_south_frame_reset(pFrame, RT_TRUE); + return -5; } else { - rt_ringbuffer_get(rb, &pFrame->pMB->payload[pFrame->length], len_rb); - pFrame->length += len_rb; - pFrame->last_tick = rt_tick_get(); break; } } @@ -373,6 +432,13 @@ void chrg_south_thread_entry (void *data) } while (1) { + if (pSOU->frame.findhead && + ((rt_tick_t)(rt_tick_get() - pSOU->frame.last_tick) >= + rt_tick_from_millisecond(SOUTH_FRAME_TIMEOUT_MS))) { + chrg_south_frame_reset(&pSOU->frame, RT_TRUE); + LOG_W("partial frame timeout"); + } + rt_memset(pSOU->rx_buf, 0, sizeof(pSOU->rx_buf)); len = chrg_tty_recv(pTTY, pSOU->rx_buf, sizeof(pSOU->rx_buf)); if (len <= 0) { @@ -387,21 +453,17 @@ void chrg_south_thread_entry (void *data) rt_uint8_t resp_byte; while (rt_ringbuffer_data_len(pSOU->rb) > 0) { rt_ringbuffer_getchar(pSOU->rb, &resp_byte); - if (resp_byte == ACK || resp_byte == NAK || resp_byte == ACK_C) { + if (resp_byte == ACK || resp_byte == NAK || + resp_byte == ACK_C || resp_byte == YM_CAN) { chrg_eload_set_ymodem_resp(resp_byte); } } continue; } - //LOG_HEX("recvS", 32, pSOU->rx_buf, len); - - if (1 == pSOU->frame.findhead) { - if (rt_tick_get() >= pSOU->frame.last_tick + 100) { // 100ms - pSOU->frame.findhead = 0; // reset - //LOG_E("timeo\r\n"); - } - } +#if SOUTH_FRAME_DEBUG + LOG_HEX("recvS", 32, pSOU->rx_buf, len); +#endif chrg_south_pickup_frame(pSOU->rb, &pSOU->frame); } diff --git a/apps/chrg/applications/thread/chrg_thread.c b/apps/chrg/applications/thread/chrg_thread.c index d15de89..cdfb7fe 100644 --- a/apps/chrg/applications/thread/chrg_thread.c +++ b/apps/chrg/applications/thread/chrg_thread.c @@ -146,32 +146,40 @@ rt_err_t chrg_thread_evt_send (eIDX_THRS idx, rt_uint32_t data) 杩斿洖璇存槑锛 0: OK , !=0 : FAILED 鍏跺畠璇存槑锛 - *****************************************************************/ +static void chrg_thread_mb_free(void *data) +{ + struct mb_msg_t *pMB = (struct mb_msg_t *)data; + + if (RT_NULL == pMB) { + return; + } + if (RT_NULL != pMB->payload) { + rt_free(pMB->payload); + } + rt_free(pMB); +} + rt_err_t chrg_thread_mb_send (eIDX_THRS idx, void *data) { - rt_err_t ret = RT_EOK; + rt_err_t ret; - if (idx >= TOTAL_THRS) { + if ((idx >= TOTAL_THRS)||(RT_NULL == data)) { + chrg_thread_mb_free(data); return -RT_ERROR; } struct chrg_thread_t *pTHR = &chrgthr[idx]; - if (RT_NULL != pTHR->mb) { - ret = rt_mb_send(pTHR->mb, (rt_uint32_t)data); - if (RT_EOK != ret) { - if (ret == -RT_EFULL) { - LOG_E("mb full, drop message. [%d]", ret); - if (RT_NULL != data) { - struct mb_msg_t *pMB = (struct mb_msg_t *)data; - if (RT_NULL != pMB->payload) { - rt_free(pMB->payload); - } - rt_free(pMB); - } - } else { - LOG_E("mb send failed. [%d]", ret); - } - } + if (RT_NULL == pTHR->mb) { + LOG_E("mb '%s' is not ready.", pTHR->name); + chrg_thread_mb_free(data); + return -RT_ERROR; + } + + ret = rt_mb_send(pTHR->mb, (rt_uint32_t)data); + if (RT_EOK != ret) { + LOG_E("mb send failed, drop message. [%d]", ret); + chrg_thread_mb_free(data); } return ret; diff --git a/apps/chrg/applications/utils/chrg_def.h b/apps/chrg/applications/utils/chrg_def.h index 3ed8388..181f43c 100644 --- a/apps/chrg/applications/utils/chrg_def.h +++ b/apps/chrg/applications/utils/chrg_def.h @@ -12,6 +12,19 @@ #include +/* + * Channel polling mode: + * 1 - multi-channel hardware, advance the polling channel index; + * 0 - single-channel hardware, keep polling channel 0. + */ +#define CHRG_MULTI_CHANNEL 1 + +#if CHRG_MULTI_CHANNEL +#define CHRG_CHANNEL_NEXT(index) do { (index)++; } while (0) +#else +#define CHRG_CHANNEL_NEXT(index) do { } while (0) +#endif + // 4璺夐 typedef enum { IDX_CH1 = 0, // 閫氳矾1 @@ -88,7 +101,7 @@ struct vc_pd_t { rt_uint8_t group_num; // 鎸′綅鏁伴噺 rt_uint8_t src_type; // 婧愮被鍨 rt_uint8_t pps_type; // PPS绫诲瀷 - struct vc_mm_t mm[2]; // 鐢靛帇鐢垫祦鏋佸 + struct vc_mm_t mm; // 鐢靛帇鐢垫祦鏋佸 }; /* 閭欢鍐呭 */ diff --git a/apps/chrg/applications/utils/chrg_eload.c b/apps/chrg/applications/utils/chrg_eload.c index d5986ef..2826834 100644 --- a/apps/chrg/applications/utils/chrg_eload.c +++ b/apps/chrg/applications/utils/chrg_eload.c @@ -18,7 +18,29 @@ #include "chrg_regs.h" #include "chrg_utils.h" #include "chrg_south.h" + +#define ELOAD_VALID_VOLTAGE_MIN_MV 2000U + extern void LCD_SHOW(rt_uint8_t idx, struct eload_p1_t *pP1, struct chrg_eload_t *pLOAD, struct chrg_switch_t *pSW, rt_uint8_t online); + +/* 姣忛氶亾P1閲忔祴鏇存柊搴忓彿锛32浣嶈鍐欏湪STM32F405涓婁负鍘熷瓙璁块棶銆 */ +static volatile rt_uint32_t g_eload_sample_seq[TOTAL_SOU_CHS] = {0}; + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_eload_get_sample_seq +鍑芥暟鎻忚堪锛 鑾峰彇鎸囧畾鍗楀悜閫氶亾P1閲忔祴鏁版嵁鐨勬洿鏂板簭鍙 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 褰撳墠閫氶亾閲忔祴搴忓彿锛岄氶亾闈炴硶鏃惰繑鍥0 +鍏跺畠璇存槑锛 鍗歌浇纭璁板綍鍛戒护涓嬪彂鍓嶅簭鍙凤紝鍙帴鍙楀簭鍙峰彉鍖栧悗鐨勬柊閲忔祴 +*****************************************************************/ +rt_uint32_t chrg_eload_get_sample_seq(rt_uint8_t idx) +{ + if (idx >= TOTAL_SOU_CHS) { + return 0; + } + return g_eload_sample_seq[idx]; +} static rt_uint16_t ripple_base[TOTAL_SOU_CHS] = {0}; static rt_uint8_t ripple_cal_flag[TOTAL_SOU_CHS] = {0}; rt_uint16_t real_ripple[TOTAL_SOU_CHS] = {0}; @@ -32,10 +54,31 @@ static rt_uint8_t g_eload_ymodem_ready = 0; // 搴旂瓟灏辩华鏍囧織(1=鏈夋柊搴 鍑芥暟鎻忚堪锛 瀛樺偍鍗楀悜鏉胯繑鍥炵殑ymodem搴旂瓟瀛楄妭(鐢眂hrg_roll_sou鍦≧UN_UPDATA璋冪敤) 杈撳叆鍙傛暟锛 resp: 鍗楀悜ymodem搴旂瓟 (ACK=0x06 / NAK=0x15 / 'C'=0x43) *****************************************************************/ +#define ELOAD_YMODEM_RESP_DEPTH 8 +static rt_uint8_t g_ymodem_resp_queue[ELOAD_YMODEM_RESP_DEPTH]; +static rt_uint8_t g_ymodem_resp_read = 0; +static rt_uint8_t g_ymodem_resp_write = 0; +static rt_uint8_t g_ymodem_resp_count = 0; + void chrg_eload_set_ymodem_resp(rt_uint8_t resp) { - g_eload_ymodem_resp = resp; - g_eload_ymodem_ready = 1; + rt_base_t level = rt_hw_interrupt_disable(); + + /* 闃熷垪宸叉弧鏃朵涪寮冨懆鏈熸х殑C锛屼繚鐣欐洿鍏抽敭鐨凙CK/NAK/CAN銆 */ + if (g_ymodem_resp_count >= ELOAD_YMODEM_RESP_DEPTH) { + if (resp == ACK_C) { + rt_hw_interrupt_enable(level); + return; + } + g_ymodem_resp_read = (g_ymodem_resp_read + 1) % ELOAD_YMODEM_RESP_DEPTH; + g_ymodem_resp_count--; + } + g_ymodem_resp_queue[g_ymodem_resp_write] = resp; + g_ymodem_resp_write = (g_ymodem_resp_write + 1) % ELOAD_YMODEM_RESP_DEPTH; + g_ymodem_resp_count++; + g_eload_ymodem_resp = resp; + g_eload_ymodem_ready = 1; + rt_hw_interrupt_enable(level); } /***************************************************************** @@ -45,13 +88,19 @@ void chrg_eload_set_ymodem_resp(rt_uint8_t resp) *****************************************************************/ rt_uint8_t chrg_eload_get_ymodem_resp(void) { - rt_uint8_t resp = 0; - if (g_eload_ymodem_ready) { - resp = g_eload_ymodem_resp; - g_eload_ymodem_ready = 0; - g_eload_ymodem_resp = 0; - } - return resp; + rt_uint8_t resp = 0; + rt_base_t level = rt_hw_interrupt_disable(); + + if (g_ymodem_resp_count > 0) { + resp = g_ymodem_resp_queue[g_ymodem_resp_read]; + g_ymodem_resp_read = (g_ymodem_resp_read + 1) % ELOAD_YMODEM_RESP_DEPTH; + g_ymodem_resp_count--; + } + g_eload_ymodem_ready = (g_ymodem_resp_count > 0); + g_eload_ymodem_resp = g_eload_ymodem_ready ? + g_ymodem_resp_queue[g_ymodem_resp_read] : 0; + rt_hw_interrupt_enable(level); + return resp; } /***************************************************************** @@ -60,8 +109,15 @@ rt_uint8_t chrg_eload_get_ymodem_resp(void) *****************************************************************/ void chrg_eload_clear_ymodem_resp(void) { - g_eload_ymodem_resp = 0; - g_eload_ymodem_ready = 0; + rt_base_t level = rt_hw_interrupt_disable(); + + g_ymodem_resp_read = 0; + g_ymodem_resp_write = 0; + g_ymodem_resp_count = 0; + g_eload_ymodem_resp = 0; + g_eload_ymodem_ready = 0; + rt_memset(g_ymodem_resp_queue, 0, sizeof(g_ymodem_resp_queue)); + rt_hw_interrupt_enable(level); } static int memcmp_8bytes(const rt_uint8_t *buf1, const rt_uint8_t *buf2) @@ -116,9 +172,20 @@ int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len) u16_to_u8v(value, &buf[4]); crc = mb_crc16(buf, 6); u16_to_u8v(swap_u16(crc), &buf[6]); - rt_kprintf("addr = %d,reg = %02x,value = %02x\n",addr,reg,value); - return chrg_south_send(buf, 8); - } +#if SOUTH_COMMAND_DEBUG + rt_kprintf("south write: addr=%d reg=0x%04x value=0x%04x\n", + addr, reg, value); +#endif + 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 @@ -233,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 鍑芥暟鎻忚堪锛 瑙ｆ瀽婧愯浇杩斿洖鏁版嵁 @@ -276,9 +361,25 @@ int chrg_eload_parse (rt_uint8_t idx, rt_uint8_t pt, rt_uint8_t *data, rt_uint16 pLOAD->vpkn = swap_u16(pP1->Vpkn); pLOAD->vpp = swap_u16(pP1->Vpp); pLOAD->Ripple = swap_u16(pP1->Ripple); - pSW->Now_voltage = pLOAD->voltage; + /* 淇濈暀鍔熺巼鏉胯繑鍥炵殑鐪熷疄鐢垫祦锛屼緵鍗歌浇淇濇姢鍒ゆ柇浣跨敤銆 */ pSW->Now_current = pLOAD->current; - if(idx == 0) + /* + * 浣庝簬2V鏃剁洿鎺ユ竻闆堕噺娴嬬粨鏋溿傚彧娓呯悊閲忔祴瀛楁锛屼繚鐣欏伐浣滅姸鎬併 + * 鏁呴殰銆佹ā寮忓強娴嬭瘯缁撴灉锛岄伩鍏嶅奖鍝嶉氶亾鐘舵佸垽鏂 + */ + if (pLOAD->voltage < ELOAD_VALID_VOLTAGE_MIN_MV) { + pLOAD->voltage = 0; + pLOAD->current = 0; + pLOAD->vpkp = 0; + pLOAD->vpkn = 0; + pLOAD->vpp = 0; + pLOAD->Ripple = 0; + pSW->VZ = 0; + pSW->VF = 0; + } + pSW->Now_voltage = pLOAD->voltage; + /* 鐢靛帇銆佺數娴佸潎鏇存柊瀹屾垚鍚庡啀鍙戝竷搴忓彿锛岄伩鍏嶇姸鎬佹満璇诲彇鍒板崐鏇存柊鏁版嵁銆 */ + g_eload_sample_seq[idx]++; #if LCD_OPEN // for(int i = 0;i<4;i++){ // if(pNOR->sw[i].change_flag == 0x01){ @@ -338,17 +439,12 @@ void Show_Curr(rt_uint8_t idx, struct chrg_eload_t *pLOAD, char *tmp, rt_uint8_t } void Show_Ripple(rt_uint8_t idx, struct chrg_eload_t *pLOAD, char *tmp, rt_uint8_t online,struct chrg_switch_t *pSW) { - rt_int32_t ripple_rand = rand() % 11; // 鐢熸垚0鍒10涔嬮棿鐨勯殢鏈烘暟 - if(online == 0){ + if ((online == 0) || + (pSW->Now_voltage < ELOAD_VALID_VOLTAGE_MIN_MV)) { snprintf(tmp, 36, "status.CH%d_Ripple.val=0",idx+1); return; - }else{ - if(pSW->Now_voltage<200){ - snprintf(tmp, 36, "status.CH%d_Ripple.val=%d",idx+1, ripple_rand); - }else{ - snprintf(tmp, 36, "status.CH%d_Ripple.val=%d",idx+1, pLOAD->Ripple); - } } + snprintf(tmp, 36, "status.CH%d_Ripple.val=%d",idx+1, pLOAD->Ripple); } void Show_DZF(rt_uint8_t idx, struct chrg_eload_t *pLOAD, char *tmp, rt_uint8_t online,rt_uint32_t vzf) { @@ -391,4 +487,4 @@ void LCD_SHOW(rt_uint8_t idx, struct eload_p1_t *pP1, struct chrg_eload_t *pLOAD case SHOW_DZF: Show_DZF(idx, pLOAD, tmp, online,vzf); pSW->show_step = SHOW_STATUS; break; } chrg_lcd_send(tmp); -} \ No newline at end of file +} diff --git a/apps/chrg/applications/utils/chrg_eload.h b/apps/chrg/applications/utils/chrg_eload.h index ceaa267..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,24 @@ 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閲忔祴鏁版嵁鐨勬洿鏂板簭鍙 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 褰撳墠閫氶亾閲忔祴搴忓彿锛岄氶亾闈炴硶鏃惰繑鍥0 +鍏跺畠璇存槑锛 姣忔垚鍔熻В鏋愪竴甯1鏁版嵁鍚庨掑锛岀敤浜庡尯鍒嗘帶鍒跺懡浠ゅ墠鍚庣殑鏂版棫閲忔祴 +*****************************************************************/ +extern rt_uint32_t chrg_eload_get_sample_seq(rt_uint8_t idx); // 瀹氫箟2鏉＄户鐢靛櫒鎸囦护锛屾帶鍒朵富缁х數鍣ㄥ拰婊ゆ尝缁х數鍣紙淇濈暀鍘熸湁鏈夋晥鎸囦护锛岀Щ闄ゆ湭浣跨敤鐨勫仠姝㈡寚浠わ級 static const rt_uint8_t EXTRA_CMD_SOURCE[8] = {0x03, 0x06, 0x00, 0x01, 0x00, 0x01, 0x18, 0x28}; extern int chrg_eload_send_relay(rt_uint8_t cmd_type); diff --git a/apps/chrg/applications/utils/chrg_north_pkg.c b/apps/chrg/applications/utils/chrg_north_pkg.c index b442e14..bc6e685 100644 --- a/apps/chrg/applications/utils/chrg_north_pkg.c +++ b/apps/chrg/applications/utils/chrg_north_pkg.c @@ -41,14 +41,9 @@ int chrg_north_pkg_encode (eIDX_ID id, rt_uint8_t cmd, rt_uint8_t *data_in, if (len_in > 0) { rt_memcpy(&data_out[4], data_in, len_in); } - data_out[len_in+4] = 0x2a;//calc_crc8(data_out, len_in+4); -// rt_kprintf("pro_data= \n"); + data_out[len_in+4] = calc_crc8(data_out, len_in+4);//0x2a; *len_out = 5+len_in; -// for(int i = 0; i < *len_out;i++) -// { -// rt_kprintf("%02x ",data_out[i]); -// } -// rt_kprintf("\n"); + return 0; } @@ -81,7 +76,7 @@ int chrg_north_pkg_decode (rt_uint8_t *data, rt_uint16_t length, struct chrg_swi struct get_vol_ack_t *pAck = (struct get_vol_ack_t *)data; pS->vc.voltage = pAck->voltage; pS->vc.version = pAck->version; - // ? + // } break; @@ -89,9 +84,9 @@ int chrg_north_pkg_decode (rt_uint8_t *data, rt_uint16_t length, struct chrg_swi struct get_pd_pro_ack_t *pAck = (struct get_pd_pro_ack_t *)data; pS->pd_get[0].src_type = pAck->type; pS->pd_get[0].pps_type = pAck->pps; - pS->pd_get[0].mm[0].max_vol = pAck->vmax; - pS->pd_get[0].mm[0].min_vol = pAck->vmin; - pS->pd_get[0].mm[0].max_cur = pAck->curpwr; + pS->pd_get[0].mm.max_vol = pAck->vmax; + pS->pd_get[0].mm.min_vol = pAck->vmin; + pS->pd_get[0].mm.max_cur = pAck->curpwr; } break; diff --git a/apps/chrg/applications/utils/chrg_regs.h b/apps/chrg/applications/utils/chrg_regs.h index 635a128..c18391e 100644 --- a/apps/chrg/applications/utils/chrg_regs.h +++ b/apps/chrg/applications/utils/chrg_regs.h @@ -93,60 +93,17 @@ enum { TOTAL_COIL_REGS // 继电器总数（24个） }; -#define TOTAL_INPUT_CH_REGS (10) // 单通道 输入寄存器 - +#define TOTAL_INPUT_CH_REGS (50) // 单通道输入寄存器，通道地址步长为50 +#define TOTAL_INPUT_REGS TOTAL_INPUT_CH_REGS * 4 // 输入寄存器列表 +// 每个通道占用50个地址，当前实际使用前4个寄存器，其余地址预留。 enum { INPUT_REG_CH0_STA1 = INPUT_REG_START, // 通道0 工作状态1 定义同源载 INPUT_REG_CH0_STA2, // 通道0 工作状态2 定义同源载 INPUT_REG_CH0_FAULT1, // 通道0 故障状态1 定义同源载 - INPUT_REG_CH0_FAULT2, // 通道0 故障状态2 定义同源载 - INPUT_REG_04, // 输入寄存器04 - INPUT_REG_05, // 输入寄存器05 - INPUT_REG_06, // 输入寄存器06 - INPUT_REG_07, // 输入寄存器07 - INPUT_REG_08, // 输入寄存器08 - INPUT_REG_09, // 输入寄存器09 - // add more TOTAL_INPUT_CH_REGS - - INPUT_REG_CH1_STA1, // 通道1 工作状态1 - INPUT_REG_CH1_STA2, // 通道1 工作状态2 - INPUT_REG_CH1_FAULT1, // 通道1 故障状态1 - INPUT_REG_CH1_FAULT2, // 通道1 故障状态2 - INPUT_REG_14, // 输入寄存器14 - INPUT_REG_15, // 输入寄存器15 - INPUT_REG_16, // 输入寄存器16 - INPUT_REG_17, // 输入寄存器17 - INPUT_REG_18, // 输入寄存器18 - INPUT_REG_19, // 输入寄存器19 - - INPUT_REG_CH2_STA1, // 通道2 工作状态1 - INPUT_REG_CH2_STA2, // 通道2 工作状态2 - INPUT_REG_CH2_FAULT1, // 通道2 故障状态1 - INPUT_REG_CH2_FAULT2, // 通道2 故障状态2 - INPUT_REG_24, // 输入寄存器24 - INPUT_REG_25, // 输入寄存器25 - INPUT_REG_26, // 输入寄存器26 - INPUT_REG_27, // 输入寄存器27 - INPUT_REG_28, // 输入寄存器28 - INPUT_REG_29, // 输入寄存器29 - - INPUT_REG_CH3_STA1, // 通道3 工作状态1 - INPUT_REG_CH3_STA2, // 通道3 工作状态2 - INPUT_REG_CH3_FAULT1, // 通道3 故障状态1 - INPUT_REG_CH3_FAULT2, // 通道3 故障状态2 - INPUT_REG_34, // 输入寄存器34 - INPUT_REG_35, // 输入寄存器35 - INPUT_REG_36, // 输入寄存器36 - INPUT_REG_37, // 输入寄存器37 - INPUT_REG_38, // 输入寄存器38 - INPUT_REG_39, // 输入寄存器39 - INPUT_REG_40, // 输入寄存器40 - - - TOTAL_INPUT_REGS // 输入寄存器总数 + INPUT_REG_CH0_FAULT2 // 通道0 故障状态2 定义同源载 + }; -//AI修改，不一定准确 // ======================== 新寄存器映射 (基于0x06/0x10标准Modbus功能码) ======================== // 地址空间规划: // 负载(Sink): 0x0000 + 通道号×29 + 参数偏移 (4通道×29=116个, 0x0000~0x0073) diff --git a/apps/chrg/applications/utils/chrg_sink.c b/apps/chrg/applications/utils/chrg_sink.c index 64b705d..97361d3 100644 --- a/apps/chrg/applications/utils/chrg_sink.c +++ b/apps/chrg/applications/utils/chrg_sink.c @@ -18,6 +18,110 @@ #include "chrg_def.h" #include "chrg_rel.h" #include "chrg_comm.h" +#include "chrg_eload.h" + +#define SINK_UNLOAD_QUERY_INTERVAL_MS 20U // 鍗歌浇鏈熼棿涓ゆ浼樺厛閲忔祴璇锋眰鐨勬渶灏忛棿闅 +#define SINK_UNLOAD_CURRENT_MAX_MA 200U // 鍒ゅ畾璐熻浇宸插畨鍏ㄥ嵏杞界殑鏈澶у疄闄呯數娴 +#define SINK_UNLOAD_CONFIRM_COUNT 2U // 杩炵画婊¤冻浣庣數娴佹潯浠剁殑閲忔祴甯ф暟 + +/* 涓荤户鐢靛櫒闂悎璺熻釜锛1=宸叉彁浜LL_REL_ON锛堜富缁х數鍣ㄥ簲宸查棴鍚堬級 0=鏈棴鍚/宸叉柇寮銆 + * 鐢ㄤ簬0V纭繚鎶ゅ尯鍒"棣栨寮杞/鎻℃墜鎭㈠"锛堜富缁х數鍣ㄦ湭闂悎锛孨ow_voltage=0灞炴甯革級 + * 涓"杩愯鎴栧緟鏈轰腑涓荤户鐢靛櫒宸查棴鍚堜絾杈撳叆鐢靛帇涓0"锛堝崗璁澘鏂數绐楀彛锛岀姝㈠紑杞斤級銆 */ +static rt_uint8_t g_sink_rel_main_closed[TOTAL_SOU_CHS] = {0}; + +/* 涓荤户鐢靛櫒鐢靛帇鍒颁綅纭锛1=鎻愪氦闂悎鍚庡疄娴嬬數鍘嬪凡鍒拌揪宸ヤ綔涓嬮檺锛岀户鐢靛櫒纭闂悎銆 + * 鎸佺画0V鐩戞帶鍙宸插埌浣嶉氶亾鐢熸晥锛岄伩鍏嶇户鐢靛櫒鍔ㄤ綔鏈熼棿锛堢數鍘嬪皻鏈缓绔嬶級璇Е鍙戞帀鐢典繚鎶ゃ */ +static rt_uint8_t g_sink_rel_main_ready[TOTAL_SOU_CHS] = {0}; + +/* 鍗歌浇纭鍙帴鍙楀仠姝㈡壒娆℃垚鍔熷悗浜х敓鐨勬柊P1閲忔祴銆 */ +static rt_uint32_t g_sink_unload_sample_seq[TOTAL_SOU_CHS] = {0}; +static rt_bool_t g_sink_unload_batch_confirmed[TOTAL_SOU_CHS] = {RT_FALSE}; +static rt_tick_t g_sink_unload_query_tick[TOTAL_SOU_CHS] = {0}; +static rt_uint8_t g_sink_unload_confirm_count[TOTAL_SOU_CHS] = {0}; + +enum { + SINK_UNLOAD_NEXT_RUNNING = 0, + SINK_UNLOAD_NEXT_HANDSHAKE, + SINK_UNLOAD_NEXT_STOP_RELAY +}; + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_load_should_start +鍑芥暟鎻忚堪锛 鍒ゆ柇鏅氳礋杞界殑璁惧畾鍊兼槸鍚﹀厑璁稿惎鍔ㄥ崡鍚戠數瀛愯礋杞 +杈撳叆鍙傛暟锛 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:鍏佽WORK_START RT_FALSE:搴斾繚鎸乄ORK_STOP +鍏跺畠璇存槑锛 闂ㄩ檺鍙綔鐢ㄤ簬鎭掓祦妯″紡鐨勮礋杞界數娴乴oadc锛涘崗璁數娴乸ro_loadc鏃犺 + 澶у皬閮界户缁弬涓庡寳鍚戞彙鎵嬶紝鎭掑帇妯″紡涓嶅彈璇ユ亽娴侀棬闄愰檺鍒 +*****************************************************************/ +rt_bool_t chrg_sink_load_should_start(const struct chrg_switch_t *pSW) +{ + if (pSW == RT_NULL) { + return RT_FALSE; + } + if (pSW->CV_mode != MODE_CONSTANT_CURRENT) { + return RT_TRUE; + } + return (pSW->sink.loadc >= SINK_LOAD_ENABLE_MIN_MA) ? + RT_TRUE : RT_FALSE; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_unload_confirm_reset +鍑芥暟鎻忚堪锛 娓呴櫎鎸囧畾閫氶亾鐨勫嵏杞芥壒娆″拰浣庣數娴佺‘璁や笂涓嬫枃 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 娓呴浂閲忔祴搴忓彿銆佹壒娆＄‘璁ゆ爣蹇椼佹煡璇ick鍜岃繛缁‘璁ゆ鏁 +杩斿洖璇存槑锛 - +鍏跺畠璇存槑锛 姣忔寮濮嬭蒋鍗歌浇鎴栧畬鏁撮噸鎻℃墜鍓嶈皟鐢紝绂佹娌跨敤鏃ч噺娴嬬粨鏋 +*****************************************************************/ +static void chrg_sink_unload_confirm_reset(eIDX_SOU_CH idx) +{ + if (idx >= TOTAL_SOU_CHS) { + return; + } + g_sink_unload_sample_seq[idx] = 0U; + g_sink_unload_batch_confirmed[idx] = RT_FALSE; + g_sink_unload_query_tick[idx] = 0U; + g_sink_unload_confirm_count[idx] = 0U; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_handshake_north_ready +鍑芥暟鎻忚堪锛 鍒ゆ柇瀹屾暣鎻℃墜鐨勫崡鍚戝畨鍏ㄦ壒娆℃槸鍚﹀凡缁忔墽琛屽畬鎴 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 RT_TRUE:杈呭姪缁х數鍣ㄥ懡浠ゅ凡瀹屾垚骞跺凡寤虹珛浣庣數娴侀噺娴嬪熀绾 + RT_FALSE:鍗楀悜瀹夊叏鎵规浠嶅湪鎵ц +鍏跺畠璇存槑锛 鍩虹嚎寤虹珛鍚庤繑鍥炴垚鍔燂紝瀹為檯浣庣數娴佺‘璁や粛鐢卞綋鍓嶇姸鎬佸嚱鏁扮户缁墽琛岋紱 + 鐢ㄤ簬鍏佽鍖楀悜鍗忚/CC涓庡崡鍚戜綆鐢垫祦纭骞惰鎺ㄨ繘 +*****************************************************************/ +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_unload_query_submit +鍑芥暟鎻忚堪锛 鎸夋渶灏忛棿闅旀彁浜ゅ綋鍓嶉氶亾鐨勪竴娆℃1閲忔祴璇锋眰 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 force:RT_TRUE绔嬪嵆鎻愪氦 RT_FALSE鎸夐棿闅旀彁浜 +杈撳嚭鍙傛暟锛 鏇存柊鏈氶亾鏈杩戜竴娆℃煡璇ick +杩斿洖璇存槑锛 0:璇锋眰鎴愬姛銆佸凡瀛樺湪鎴栧皻鏈埌鏌ヨ鏃堕棿 <0:璇锋眰鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鐢垫祦闀挎湡涓嶅綊闆舵椂淇濈暀鏅氳疆璇㈢獥鍙ｏ紝閬垮厤鎸佺画浼樺厛鏌ヨ闃诲鍏跺畠閫氶亾 +*****************************************************************/ +static int chrg_sink_unload_query_submit(eIDX_SOU_CH idx, rt_bool_t force) +{ + rt_tick_t now; + + if (idx >= TOTAL_SOU_CHS) { + return -1; + } + now = rt_tick_get(); + if (!force && + ((rt_tick_t)(now - g_sink_unload_query_tick[idx]) < + rt_tick_from_millisecond(SINK_UNLOAD_QUERY_INTERVAL_MS))) { + return 0; + } + if (chrg_sou_measure_once_submit(idx) != 0) { + return -1; + } + g_sink_unload_query_tick[idx] = now; + return 0; +} /***************************************************************** 鍑芥暟鍚嶇О锛 sink_get_vc 鍑芥暟鎻忚堪锛 sink鐢靛帇鐢垫祦鏌ヨ璇锋眰 @@ -128,454 +232,738 @@ int sink_set_pd (rt_uint8_t pd, rt_uint8_t *buf) return chrg_north_send(frame, len); } -//// 鐭矾娴嬭瘯鍙傛暟瑙ｆ瀽 鎸囦护鐮侊細0x01 -//void sink_test_short_set(struct chrg_switch_t *pSW, rt_uint8_t *pData, rt_uint8_t run_flag) -//{ -// struct test_short *pTest = &pSW->sink.test.short_test; - -// // 瑙ｆ瀽鎶ユ枃锛氶珮瀛楄妭pData[1]銆佷綆瀛楄妭pData[2] 鈫 娴嬭瘯淇濇寔鏃堕棿 -// pTest->hold_time = (pData[1] << 8) | pData[2]; -// pTest->set_mode = pData[3]; // 妯″紡閫夋嫨锛0=娴嬭瘯鍚庝竴鐩翠繚鎸侊紱1=淇濇寔鎸囧畾鏃堕暱鍚庢仮澶嶅師鏈夌數娴 -// rt_kprintf("[SINK] Short Test: time=%d, mode=%d\n", -// pTest->hold_time, pTest->set_mode); -//} - -////============================================================================= -//// OCP杩囨祦淇濇姢娴嬭瘯鍙傛暟瑙ｆ瀽 鎸囦护鐮侊細0x02 -////============================================================================= -//void sink_test_ocp_set(struct chrg_switch_t *pSW, rt_uint8_t *pData, rt_uint8_t run_flag) -//{ -// struct test_OCP *pTest = &pSW->sink.test.OCP_test; - -// pTest->start_curr = (pData[1] << 8) | pData[2]; // 瑙ｆ瀽锛歄CP娴嬭瘯璧峰鐢垫祦 -// pTest->end_curr = (pData[3] << 8) | pData[4]; // 瑙ｆ瀽锛歄CP娴嬭瘯缁堟鐢垫祦 -// pTest->change_curr = (pData[5] << 8) | pData[6]; // 瑙ｆ瀽锛氱數娴佹杩涘 -// pTest->change_keep_time = (pData[7] << 8) | pData[8]; // 瑙ｆ瀽锛氬崟姝ョ數娴佷繚鎸佹椂闂 -// pTest->hold_time = (pData[9] << 8) | pData[10]; // 瑙ｆ瀽锛歄CP瑙﹀彂鍚庝繚鎸佹椂闂 -// pTest->stop_volt = (pData[11]<< 8) | pData[12]; // 瑙ｆ瀽锛氬仠姝㈠垽瀹氱數鍘 -// pTest->set_mode = pData[13]; // 娴嬭瘯缁撴潫妯″紡锛0=淇濇寔璁惧畾鏃堕棿鍚庢仮澶嶏紱1=涓鐩翠繚鎸 -// pTest->hold_curr = pData[14]; // OCP瑙﹀彂鍚庢槸鍚﹀甫杞斤紝0=甯﹁浇锛1=涓嶅甫杞 -// // pTest->change_mode = pData[11]; // 鐢垫祦鍙樺寲妯″紡(棰勭暀)锛0=缃0锛1=杈炬爣绔嬪嵆缃0锛2=淇濇寔褰撳墠鐢垫祦 -// // pTest->interval_time = pData[12]; // 鎸囦护淇濇姢闂撮殧鏃堕棿(棰勭暀) - -// pSW->sink.loadc = pTest->start_curr; // 璐熻浇鐢垫祦鍒濆鍖栦负OCP璧峰鐢垫祦 -//#if SINK_TEST_DEBUG -// rt_kprintf("[SINK] OCP Test: start=%d, end=%d\n", -// pTest->start_curr, pTest->end_curr); -//#endif -//} - -////============================================================================= -//// 鍔ㄦ佽礋杞芥祴璇曞弬鏁拌В鏋 鎸囦护鐮侊細0x03 -////============================================================================= -//void sink_test_dynamic_set(struct chrg_switch_t *pSW, rt_uint8_t *pData, rt_uint8_t run_flag) -//{ -// struct test_change *pTest = &pSW->sink.test.change_test; -//// rt_uint16_t change_curr = 0; -// pTest->curr1_set = (pData[1] << 8) | pData[2]; // 瑙ｆ瀽锛氱涓闃舵璁惧畾鐢垫祦 -// pTest->time1_set = (pData[3] << 8) | pData[4]; // 瑙ｆ瀽锛氱涓闃舵淇濇寔鏃堕暱 -// pTest->curr2_set = (pData[5] << 8) | pData[6]; // 瑙ｆ瀽锛氱浜岄樁娈佃瀹氱數娴 -// pTest->time2_set = (pData[7]<< 8) | pData[8]; // 瑙ｆ瀽锛氱浜岄樁娈典繚鎸佹椂闀 -// pTest->k_Rise = (pData[9] << 8) | pData[10]; // 鐢垫祦涓婂崌鏂滅巼 -// pTest->k_Fall = (pData[11]<< 8) | pData[12]; // 鐢垫祦涓嬮檷鏂滅巼 -// // pTest->start_time = (pData[14]<< 8) | pData[13]; // 浜у搧绋冲畾鏃堕暱(棰勭暀) - -// // pSW->sink.loadc = pTest->curr1_set; -//#if SINK_TEST_DEBUG -// rt_kprintf("[SINK] Dynamic Test: curr1=%d, curr2=%d\n", -// pTest->curr1_set, pTest->curr2_set); -//#endif -//} - -////============================================================================= -//// 鐭矾娴嬭瘯鐘舵佹満鎵ц鍑芥暟 -//// 渚濇嵁 work_step 鍒嗘閰嶇疆瀵勫瓨鍣紝鍚姩鐭矾娴嬭瘯 -////============================================================================= -//void chrg_nor_sink_short_test(rt_uint8_t ch, struct chrg_switch_t *pSW) -//{ -// struct test *pTest = &pSW->sink.test; -// -// switch (pTest->work_step) -// { -// case 0: -// // 绗竴姝ワ細鍒囨崲涓虹數瀛愯礋杞芥ā寮忥紝鍚稿悎璐熻浇寮鍏 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_ELOAD, ELOAD_LOAD); -//// rt_kprintf("first\r\n"); -// chrg_nor_sw_rel((eIDX_NOR_CH)ch,ID_SINK); -// pTest->work_step = 1; -// break; -// case 1: -// // 鏍规嵁妯″紡鍒嗘敮閰嶇疆鍙傛暟 -// if(pTest->short_test.set_mode == 0x00) { //鐩存帴閲婃斁 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_ShortTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN_NO_CURR); //鐩存帴涓0 -// pTest->work_step = 2; -// } -// else{ //鎸夎瀹氱殑鏃堕棿鍚庨噴鏀 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_ShortTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN_ALWAYS_KEPP); //淇濇寔 -// pTest->work_step = 4; -// } -// -// rt_kprintf("set_mode = %d",pTest->short_test.set_mode); -// break; -// case 2: -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_ShortTest_Hold_Time , pTest->short_test.hold_time); -// pTest->work_step = 4; -// break; -// case 4: -// // 鍚姩鏁存満宸ヤ綔锛屾竻闆剁姸鎬佹爣蹇 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_WORK, WORK_START); -// pTest->work_step = 5; -// pSW->change_flag = 0; -// break; -// case 5: -// break; -// default: -// pTest->work_step = 0; -// break; -// } -//} - -////============================================================================= -//// OCP杩囨祦淇濇姢娴嬭瘯鐘舵佹満鎵ц鍑芥暟 -//// 鍒嗘閰嶇疆鐢垫祦銆佹椂闀裤佹ā寮忓瘎瀛樺櫒锛屾渶缁堝惎鍔∣CP娴嬭瘯 -////============================================================================= -//// OCP娴嬭瘯鎵ц -//void chrg_nor_sink_OCP_test(rt_uint8_t ch, struct chrg_switch_t *pSW) -//{ -// struct test *pTest = &pSW->sink.test; - -// switch (pTest->work_step) -// { -// case 0: // 鍒濆鍖栵細鍒囪礋杞芥ā寮忋侀棴鍚堣礋杞藉紑鍏 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_ELOAD, ELOAD_LOAD); -//// rt_kprintf("first\r\n"); -// chrg_nor_sw_rel((eIDX_NOR_CH)ch,ID_SINK); -// pTest->work_step = SET_OCP_STARTCURR; -// break; -// case SET_OCP_STARTCURR: // 璁剧疆OCP璧峰鐢垫祦 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_StartCurrent, pTest->OCP_test.start_curr); -// pTest->work_step = SET_OCP_ENDCURR; -// break; -// case SET_OCP_ENDCURR: // 璁剧疆OCP缁堟鐢垫祦 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_StopCurrent , pTest->OCP_test.end_curr); -// pTest->work_step = SET_OCP_STEP; -// break; -// case SET_OCP_STEP: // 璁剧疆鐢垫祦姝ヨ繘鍊 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_Step_CURR , pTest->OCP_test.change_curr); -// pTest->work_step = SET_OCP_STEP_HOLD_TIME; -// break; -// case SET_OCP_STEP_HOLD_TIME: // 璁剧疆鍗曟淇濇寔鏃堕棿 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_Step_Hold_Time , pTest->OCP_test.change_keep_time); -// pTest->work_step = SINK_OCP_STOP_VOLT; -// break; -// case SINK_OCP_STOP_VOLT: //璁剧疆鎴鐢靛帇 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_Vtrig_Stop , pTest->OCP_test.stop_volt); -// pTest->work_step = SET_OCP_CMD_MODE_RUN; -// break; -// case SET_OCP_CMD_MODE_RUN: // 鏍囪娴嬭瘯杩愯妯″紡 -// if(pTest->OCP_test.set_mode == 0x00) { //閲婃斁 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN_NO_CURR); //鐩存帴涓0 -// pTest->work_step = SET_OCP_HOLD_TIME; -// } -// else{ //淇濇寔 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN_ALWAYS_KEPP); //淇濇寔 -// pTest->work_step = SET_OCP_RUNNING; -// } -// break; -// case SET_OCP_HOLD_TIME: // 璁剧疆OCP瑙﹀彂鍚庝繚鎸佹椂闂 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_OCPTest_Hold_Time , pTest->OCP_test.hold_time); -// pTest->work_step = SET_OCP_RUNNING; -// break; -// case SET_OCP_RUNNING: // 鍚姩OCP娴嬭瘯 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_WORK, WORK_START); -// pSW->change_flag = 0; -// pTest->work_step = 0x10; -// break; -// case 0x10: -// break; -// default: -// break; -// } -//} -////============================================================================= -//// 鍔ㄦ佽礋杞芥祴璇曠姸鎬佹満鎵ц鍑芥暟 -//// 渚濇閰嶇疆涓ゆ鐢垫祦銆佹椂闀裤佸崌闄嶆枩鐜囷紝鍚姩鍔ㄦ佽礋杞芥祴璇 -////============================================================================= -//void chrg_nor_sink_change_test(rt_uint8_t ch, struct chrg_switch_t *pSW) -//{ -// struct test *pTest = &pSW->sink.test; - -// switch (pTest->work_step) -// { -// case 0: // 鍒濆姝ラ锛氬垏鎹㈢數瀛愯礋杞芥ā寮忋侀棴鍚堣礋杞藉紑鍏 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_ELOAD, ELOAD_LOAD); -// chrg_nor_sw_rel((eIDX_NOR_CH)ch,ID_SINK); -// pTest->work_step = SET_DYNA_CURR1; -// break; -// case SET_DYNA_CURR1: // 璁剧疆绗竴璺緭鍑虹數娴 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_L1, pTest->change_test.curr1_set); -// pTest->work_step = SET_DYNA_TIME1; -// #if SINK_TEST_DEBUG -// rt_kprintf("Curr1: %d\n", pTest->change_test.curr1_set); -// #endif -// break; -// case SET_DYNA_TIME1: // 璁剧疆绗竴闃舵淇濇寔鏃堕棿 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_T1 , pTest->change_test.time1_set); -// pTest->work_step = SET_DYNA_CURR2; -// #if SINK_TEST_DEBUG -// rt_kprintf("Time1: %d\n", pTest->change_test.time1_set); -// #endif -// break; -// case SET_DYNA_CURR2: // 璁剧疆绗簩璺緭鍑虹數娴 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_L2 , pTest->change_test.curr2_set); -// pTest->work_step = SET_DYNA_TIME2; -// #if SINK_TEST_DEBUG -// rt_kprintf("Curr2: %d\n", pTest->change_test.curr2_set); -// #endif -// break; -// case SET_DYNA_TIME2: // 璁剧疆绗簩闃舵淇濇寔鏃堕棿 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_T2 , pTest->change_test.time2_set); -// pTest->work_step = SET_DYNA_RISE_SLEW_RATE; -// #if SINK_TEST_DEBUG -// rt_kprintf("Time2: %d\n", pTest->change_test.time2_set); -// #endif -// break; -// case SET_DYNA_RISE_SLEW_RATE: // 璁剧疆鐢垫祦涓婂崌鏂滅巼 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_Rise_Slew_Rate , pTest->change_test.k_Rise); -// pTest->work_step = SET_DYNA_FALL_SLEW_RATE; -// #if SINK_TEST_DEBUG -// rt_kprintf("Rise Slew Rate: %d\n", pTest->change_test.k_Rise); -// #endif -// break; -// case SET_DYNA_FALL_SLEW_RATE: // 璁剧疆鐢垫祦涓嬮檷鏂滅巼 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_Fall_Slew_Rate , pTest->change_test.k_Fall); -// pTest->work_step = SET_DYNA_CND_MODE; -// #if SINK_TEST_DEBUG -// rt_kprintf("Fall Slew Rate: %d\n", pTest->change_test.k_Fall); -// #endif -// break; -// case SET_DYNA_CND_MODE: // 鏍囪鍔ㄦ佹祴璇曚负杩愯鐘舵 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN); -// pTest->work_step = SET_DYNA_RUNNING; -// pTest->work_step = SET_DYNA_CND_MODE; -// #if SINK_TEST_DEBUG -// rt_kprintf("Fall Slew Rate: %d\n", pTest->change_test.k_Fall); -// #endif -// break; -// case SET_DYNA_RUNNING: // 鍚姩鏁存満宸ヤ綔锛岄攣瀹氬綋鍓嶈繍琛屾楠ゃ佹竻绌烘爣蹇椾綅 -// chrg_set_sou_reg((eIDX_SOU_CH)ch, REG_WORK, WORK_START); -// pTest->work_step = SET_DYNA_RUNNING; -// pTest->work_step = 0x11; -// pSW->change_flag = 0; -// break; -// case 0x11: -// break; -// default: -// #if SINK_TEST_DEBUG -// rt_kprintf("Invalid work step: %d\n", pTest->work_step); -// #endif -// break; -// } -//} - -////============================================================================= -//// 鐭矾娴嬭瘯鍋滄澶勭悊鍑芥暟 -//// 渚濇嵁 stop_step 鍒嗘鎵ц鍋滄娴佺▼锛屾竻闄ゆ祴璇曟爣璁板苟璺宠浆鐘舵 -////============================================================================= -//void chrg_nor_sink_short_test_stop(rt_uint8_t idx, struct chrg_switch_t *pSW,rt_uint8_t *enable) -//{ -// struct test *pTest = &pSW->sink.test; -// switch (pTest->stop_step) -// { -// case TEST_STOP_CMD_MODE: // 涓嬪彂鍋滄鎸囦护锛屽叧闂煭璺祴璇曡繍琛屾ā寮 -// chrg_set_sou_reg(idx, ModbusRTU_ShortTest_CMD_MODE_FLAG, ModbusRTU_DYNA_CMD_MODE_STOP); -// // pTest->stop_step = TEST_STOP_RUN; -// // break; -// // case TEST_STOP_RUN: // 娓呴櫎娴嬭瘯鏍囧織锛屽垏鎹㈣嚦璐熻浇鐘舵佺鐞嗘祦绋 -// //chrg_set_sou_reg(idx, REG_WORK, WORK_STOP); -// //pTest->stop_step = TEST_STOP_REL; -// //chrg_nor_sw_rel((eIDX_NOR_CH)idx,0); -// //*enable = 0; -// pSW->change_flag = 0; -// pSW->sink.test.test_mode = 0; // 娓呯┖鐭矾娴嬭瘯鏍囪 -// pSW->sub = 21; // IDX_SET_SINK_WORK_STATE; 璺宠浆鑷宠礋杞藉伐浣滅姸鎬佸鐞 -// break; -// default: -// break; -// } -//} - -////============================================================================= -//// OCP杩囨祦淇濇姢娴嬭瘯鍋滄澶勭悊鍑芥暟 -////============================================================================= -//void chrg_nor_sink_OCP_test_stop(rt_uint8_t idx, struct chrg_switch_t *pSW,rt_uint8_t *enable) -//{ -// struct test *pTest = &pSW->sink.test; -// switch (pTest->stop_step) -// { -// case TEST_STOP_CMD_MODE: // 涓嬪彂鍋滄鎸囦护锛屽叧闂璒CP娴嬭瘯杩愯妯″紡 -// chrg_set_sou_reg((eIDX_SOU_CH)idx, ModbusRTU_OCPTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_STOP); -// pSW->change_flag = 0; -// pSW->sink.test.test_mode = 0; // 娓呯┖OCP娴嬭瘯鏍囪 -// pSW->sub = 21; // IDX_SET_SINK_WORK_STATE; -// break; -// default: -// break; -// } -//} - -////============================================================================= -//// 鍔ㄦ佽礋杞芥祴璇曞仠姝㈠鐞嗗嚱鏁 -////============================================================================= -//void chrg_nor_sink_change_test_stop(rt_uint8_t idx, struct chrg_switch_t *pSW,rt_uint8_t *enable) -//{ -// struct test *pTest = &pSW->sink.test; -// switch (pTest->stop_step) -// { -// case TEST_STOP_CMD_MODE: // 涓嬪彂鍋滄鎸囦护锛屽叧闂姩鎬佹祴璇曡繍琛屾ā寮 -// chrg_set_sou_reg((eIDX_SOU_CH)idx, ModbusRTU_DYNA_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_STOP); -// pSW->change_flag = 0; -// pSW->sink.test.test_mode = 0; // 娓呯┖鍔ㄦ佹祴璇曟爣璁 -// pSW->sub = 21; // IDX_SET_SINK_WORK_STATE; -// break; -// default: -// break; -// } -//} - -//sink寮鏈哄垵濮嬪寲 -void chrg_sink_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) -{ - struct chrg_south_t *pSOU = &chrgsouth; +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_init +鍑芥暟鎻忚堪锛 鎵ц璐熻浇INIT鍏ュ彛锛屽皢鍓户鐢靛櫒鍜屽垵濮嬪寲鍛戒护鎸夐『搴忔彁浜ゅ崡鍚 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 绔嬪嵆鎵撳紑鍖楀悜Sink缁х數鍣ㄥ拰enable锛屽苟杩涘叆INIT_AUX_WAIT鍚庡彴纭 +杩斿洖璇存槑锛 0:鍒濆鍖栨壒娆℃彁浜ゆ垚鍔 <0:鍙傛暟鎴栧懡浠ゆ彁浜ゅけ璐 + 鍏跺畠璇存槑锛 鍗楀悜椤哄簭涓篎U_REL_ON銆丆URRENT=0銆丮ODE銆乂ON鍜屽彲閫夋祴璇曞仠姝紱 + 鍖楀悜鎸夆淐C绾->鍗忚->鐢靛帇鏌ヨ鈥濋『搴忔墽琛岋紝鍗楀寳鍚戜粠鎵规鍏ラ槦鍚庡苟琛屾墽琛 +*****************************************************************/ +static int chrg_sink_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ struct chrg_north_t *pNOR = &chrgnorth; - - pSW->sink.On_work = 1; - pSOU->enable[idx] = 1; - pSOU->online[idx] = 1; - pNOR->enable[idx] = 1; - - chrg_nor_sw_rel((eIDX_NOR_CH)idx, ID_SINK); //鎵撳紑鍖楀悜缁х數鍣 - // 1. 鐢垫祦杈撳嚭缃0 - chrg_sou_com_batch_add_reg(idx, REG_CURRENT_OUT+1, 0); - // 2. 璁剧疆纭欢鎭掑帇/鎭掓祦妯″紡 - chrg_sou_com_batch_add_reg(idx,REG_MODE,pSW->CV_mode); - switch(pSW->sink.test.test_mode_old){ - case 0: - - break; - case 1://鐭矾娴嬭瘯閫鍑 - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)idx, ModbusRTU_ShortTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_STOP); - break; - case 2: - - break; - case 3: - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)idx, ModbusRTU_DYNA_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_STOP); - break; + rt_uint16_t regs[5] = {REG_REL_ON, REG_CURRENT_OUT + 1, + REG_MODE, Eload_Start_V_ON, 0}; + rt_uint16_t vals[5] = {FU_REL_ON, 0, 0, 0, 0}; + rt_bool_t first_start; + rt_uint8_t count = 4U; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; } + /* COM杩涘叆INIT鍓嶅凡缁忚缃甇n_work锛屼娇鐢ㄥ師宸ヤ綔鐘舵佸尯鍒嗛娆℃彁浜ゅ拰鍚庡彴閲嶈瘯銆 */ + first_start = (pSW->sink.work_mode != SINK_WORK_INIT_AUX_WAIT) ? + RT_TRUE : RT_FALSE; + vals[2] = pSW->CV_mode; + vals[3] = pSW->sink.volt_on <= 500 ? 500 : pSW->sink.volt_on; + if (pSW->sink.test.test_mode_old == SINK_TEST_SHORT) { + regs[count] = ModbusRTU_ShortTest_CMD_MODE_FLAG; + vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP; + } else if (pSW->sink.test.test_mode_old == SINK_TEST_OCP) { + regs[count] = ModbusRTU_OCPTest_CMD_MODE_FLAG; + vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP; + } else if (pSW->sink.test.test_mode_old == SINK_TEST_DYNA) { + regs[count] = ModbusRTU_DYNA_CMD_MODE_FLAG; + vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP; + } + if (chrg_sou_com_batch_submit(idx, regs, vals, count) != 0) { + return -1; + } + + pSW->sink.On_work = 1; + if (first_start) { + /* 鍗楀悜鎵规宸插叆闃燂紝鍖楀悜鎸夆淐C->鍗忚鈥濋『搴忕珛鍗冲紑濮嬪畬鏁存彙鎵嬨 */ + chrg_nor_sw_rel((eIDX_NOR_CH)idx, ID_SINK); + pNOR->enable[idx] = 1; + /* Protocol-before-CC test flow is disabled in this version. */ + pSW->sub = IDX_SET_SINK_CC_BEFORE_PD; + } + pSW->sink.work_mode = SINK_WORK_INIT_AUX_WAIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_init_aux_wait +鍑芥暟鎻忚堪锛 鍚庡彴绛夊緟鏁寸粍鍗楀悜鍒濆鍖栧懡浠ゅ畬鎴愶紝涓嶉樆濉炲寳鍚戝崗璁彙鎵 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鍒濆鍖栧畬鎴愬悗杩涘叆SINK_WORK_WAIT锛屽け璐ユ椂閲嶆彁鏁翠釜鍒濆鍖栨壒娆 +杩斿洖璇存槑锛 0:缁х画绛夊緟鎴栧垵濮嬪寲瀹屾垚 <0:鍙傛暟閿欒 +鍏跺畠璇存槑锛 閲嶈瘯鏃朵繚鐣欏綋鍓嶅寳鍚憇ub锛岀姝㈡妸姝ｅ湪鎵ц鐨勫崗璁/CC浜嬪姟鎷夊洖璧风偣 +*****************************************************************/ +static int chrg_sink_work_init_aux_wait(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + struct chrg_south_t *pSOU = &chrgsouth; + int batch_result; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (chrg_sou_com_batch_is_pending(idx)) { + return 0; + } + batch_result = chrg_sou_com_batch_get_result(idx); + if (batch_result <= 0) { + /* 鍖楀悜淇濇寔褰撳墠浜嬪姟锛屽崡鍚戠嫭绔嬮噸璇曞畬鏁村垵濮嬪寲鎵规銆 */ + return chrg_sink_work_init(idx, pSW); + } + + /* 鍖楀悜鍙兘宸叉帹杩涘埌CC鎴栫數鍘嬫煡璇紝姝ゅ鍙洿鏂板崡鍚戝畬鎴愮姸鎬併 */ + pSOU->online[idx] = 1; pSW->sink.test.test_mode_old = 0; pSW->sink.work_mode = SINK_WORK_WAIT; + return 0; } -//sink杩涘叆杩愯鐘舵 -void chrg_sink_work_volt_runing(eIDX_SOU_CH idx, struct chrg_switch_t *pSW){ - chrg_sou_com_batch_add_reg(idx, 0x01, 0x02); - //鎵撳紑涓荤户鐢靛櫒 - chrg_sou_com_batch_add_reg(idx, 0x01, 0x03); - if(pSW->CV_mode == MODE_CONSTANT_VOLTAGE) - { - chrg_sou_com_batch_add_reg(idx, REG_VOLTAGE_OUT+1, pSW->sink.loadv); - } - else - { - chrg_sou_com_batch_add_reg(idx, REG_CURRENT_OUT+1, pSW->sink.loadc); - } - chrg_sou_com_batch_add_reg(idx, REG_WORK, WORK_START); -} - -//sink杩涘叆浣庣數鍘嬬姸鎬 -void chrg_sink_nor_work_low(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_volt_low_protect +鍑芥暟鎻忚堪锛 涓荤户鐢靛櫒闂悎鍚庢寔缁洃鎺у崡鍚戝疄娴嬭緭鍏ョ數鍘嬶紝鎺夌數绔嬪嵆杞帀鐢典繚鎶 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鐢靛帇鍒颁綅鏃剁‘璁eady锛涙帀鐢垫椂寮哄埗杩涘叆SINK_WORK_LOW骞舵墽琛屾帀鐢垫壒娆 +杩斿洖璇存槑锛 0:姝ｅ父鎴栦繚鎶ゆ壒娆″凡鎻愪氦 <0:鍙傛暟閿欒鎴栦繚鎶ゆ壒娆℃彁浜ゅけ璐 +鍏跺畠璇存槑锛 鐢卞寳鍚戣疆璇㈢嚎绋嬫瘡杞皟鐢紝涓嶄緷璧栧寳鍚0x20鍥炵爜銆傚崗璁澘鏂數鏃跺寳鍚 + 鍥炵爜浼氫腑鏂紙volt_low璁℃暟涓嶅啀绱Н锛夛紝鑰屽崡鍚慞1閲忔祴鐢卞姛鐜囨澘鐙珛 + 渚涚數鎸佺画鍒锋柊锛屾槸鏈繚鎶ゅ敮涓鍙潬鐨勭數閲忔潵婧愩傚彧鏈"鎻愪氦闂悎涓斿疄娴 + 鐢靛帇宸插埌浣"鐨勯氶亾鎵嶅惎鐢ㄦ帀鐢靛垽瀹氾紝缁х數鍣ㄥ姩浣滄湡闂翠笉璇Е鍙 +*****************************************************************/ +int chrg_sink_volt_low_protect(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) { - chrg_sou_com_batch_add_reg(idx, 0x01, 0x00); - chrg_sou_com_batch_add_reg(idx, REG_WORK, WORK_STOP); + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (g_sink_rel_main_closed[idx] == 0) { + return 0; + } + if (pSW->Now_voltage >= WORK_MIN_VOLT) { + /* 瀹炴祴鐢靛帇鍒拌揪宸ヤ綔涓嬮檺锛岀‘璁や富缁х數鍣ㄥ凡闂悎銆 */ + g_sink_rel_main_ready[idx] = 1; + return 0; + } + if (g_sink_rel_main_ready[idx] != 0) { + /* 鏇剧粡鍒颁綅鍚庡啀娆℃帀鐢碉細鍗忚鏉垮浜庢柇鐢电獥鍙ｏ紝绂佹璐熻浇甯﹁浇锛 + * 寮哄埗杩涘叆鎺夌數瀹夊叏澶勭悊绛夊緟鍗忚鏉块噸鏂颁笂鐢点 */ + pSW->sink.work_mode = SINK_WORK_LOW; + return chrg_sink_work(idx, pSW); + } + /* 宸叉彁浜ら棴鍚堜絾鐢靛帇灏氭湭寤虹珛锛堢户鐢靛櫒鍔ㄤ綔涓級锛岀户缁瓑寰呬笉淇濇姢銆 */ + return 0; } -//com绔叧鏈烘祦绋 -void chrg_sink_nor_work_off(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) -{ +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_volt_runing +鍑芥暟鎻忚堪锛 鎵ц璐熻浇RUNING鐘舵侊紝闂悎鍏ㄩ儴缁х數鍣ㄥ苟鍚姩璐熻浇 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 闈0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 杈呭姪缁х數鍣ㄥ凡鍦↖NIT銆侀噸鎻℃墜鎴栨帀鐢垫仮澶嶉樁娈垫墦寮锛汻UNING鍙彂閫 + ALL_REL_ON銆佺洰鏍囪礋杞藉煎拰WORK_START锛岄伩鍏岶U_REL_ON閲嶅鍏抽棴涓荤户鐢靛櫒 +*****************************************************************/ +static int chrg_sink_work_volt_runing(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + rt_uint16_t regs[3] = {REG_REL_ON, 0, REG_WORK}; + rt_uint16_t vals[3] = {ALL_REL_ON, 0, WORK_START}; + int ret; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (!chrg_sink_load_should_start(pSW)) { + /* + * 鍖楀悜鍗忚宸插畬鎴愶紝浣庣數娴佽瀹氫粛闇瑕佹帴閫氫富缁х數鍣紝浣胯礋杞介氳矾 + * 澶勪簬瀹屾暣杩炴帴鐘舵侊紱浣嗙姝㈢數瀛愯礋杞藉甫杞斤紝浠呭彂閫乄ORK_STOP锛 + * 涓嶆敼鍐欑數娴佽瀹氾紝閬垮厤绌鸿浇寰呮満褰卞搷涓嬩竴娆℃湁鏁堢數娴佽缃 + */ + rt_uint16_t stop_regs[2] = {REG_REL_ON, REG_WORK}; + rt_uint16_t stop_vals[2] = {ALL_REL_ON, WORK_STOP}; + + ret = chrg_sou_com_batch_submit(idx, stop_regs, stop_vals, 2U); + if (ret == 0) { + pSW->sink.work_mode = SINK_WORK_LOAD_STANDBY; + g_sink_rel_main_closed[idx] = 1; + } + return ret; + } + + /* 鍙湁鍗楀悜瀹炴祴鐢靛帇鏇剧粡鍒颁綅鍚庡啀娆℃帀鍒颁綆鍘嬶紝鎵嶅垽瀹氫负鎺夌數銆 + * 鍒濇RUNING鏃剁户鐢靛櫒鎵规鍒氬叆闃燂紝Now_voltage鍙兘浠嶆槸涓婁竴甯х殑0锛 + * 姝ゆ椂涓嶈兘鍙栨秷灏氭湭鍙戦佸埌WORK_START鐨勫惎鍔ㄦ壒娆° */ + if ((g_sink_rel_main_ready[idx] != 0) && + (pSW->Now_voltage < WORK_MIN_VOLT)) { + pSW->sink.work_mode = SINK_WORK_LOW; + return 0; + } + + if (pSW->CV_mode == MODE_CONSTANT_VOLTAGE) { + regs[1] = REG_VOLTAGE_OUT + 1; + vals[1] = pSW->sink.loadv; + } else { + regs[1] = REG_CURRENT_OUT + 1; + vals[1] = pSW->sink.loadc; + } + /* RUNING鎵规蹇呴』瀹屾暣鍙戦侊細ALL_REL_ON銆佺洰鏍囪礋杞藉笺乄ORK_START銆 */ + ret = chrg_sou_com_batch_submit(idx, regs, vals, 3U); + if (ret == 0) { + g_sink_rel_main_closed[idx] = 1; + } + return ret; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_load_stop +鍑芥暟鎻忚堪锛 鏅氳礋杞借繍琛屼腑璁惧畾鐢垫祦闄嶅埌鏈浣庨棬闄愪互涓嬫椂瀹夊叏鍋滄甯﹁浇 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鍛戒护鍏ラ槦鎴愬姛鍚庤繘鍏INK_WORK_LOAD_STANDBY +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 <0:鍙傛暟鎴栧懡浠ゆ彁浜ゅけ璐 +鍏跺畠璇存槑锛 鍛戒护鍙彂閫乄ORK_STOP锛涗笉鏀瑰彉鍖楀悜鍗忚銆丆C銆佺數娴佽瀹氬拰 + 涓诲壇缁х數鍣紝淇濊瘉鍚庣画鎭㈠鏈夋晥鐢垫祦鏃舵棤闇閲嶆柊鍗忚鎻℃墜 +*****************************************************************/ +static int chrg_sink_work_load_stop(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + rt_uint16_t reg = REG_WORK; + rt_uint16_t val = WORK_STOP; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (chrg_sou_com_batch_submit(idx, ®, &val, 1U) != 0) { + return -1; + } + pSW->sink.work_mode = SINK_WORK_LOAD_STANDBY; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_load_start +鍑芥暟鎻忚堪锛 浠庝富缁х數鍣ㄦ湭鎵撳紑鐨勪綆鐢垫祦寰呮満鐘舵佺瓑寰呭寳鍚戠數鍘嬬ǔ瀹氬悗鍐嶅惎鍔ㄨ礋杞 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鍛戒护鍏ラ槦鎴愬姛鍚庤繘鍏INK_WORK_RUNING +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 <0:鍙傛暟鎴栧懡浠ゆ彁浜ゅけ璐 +鍏跺畠璇存槑锛 鏈姸鎬佸彧浣滀负寰呭惎鍔ㄦ爣璁帮紝涓嶇洿鎺ヤ笅鍙戠户鐢靛櫒鎴朩ORK_START锛涘繀椤荤敱鍖楀悜 + 瑙ｆ瀽纭瀹為檯鐢靛帇绋冲畾鍚庤浆鍏INK_WORK_RUNING锛屽啀鎵ц鏍囧噯鍚姩椤哄簭 +*****************************************************************/ +static int chrg_sink_work_load_start(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (!chrg_sink_load_should_start(pSW)) { + return -1; + } + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_nor_work_low +鍑芥暟鎻忚堪锛 鎵ц璐熻浇鎺夌數澶勭悊锛屽嵏杞藉悗鍏抽棴涓诲壇缁х數鍣ㄥ苟閲嶆柊鎵撳紑鍓户鐢靛櫒 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 闈0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鍛戒护椤哄簭涓篧ORK_STOP銆丆URRENT=1000mA銆丄LL_REL_OFF銆丗U_REL_ON锛 + ALL_REL_OFF鍚庣珛鍗虫仮澶嶅壇缁х數鍣紝涓哄崗璁澘閲嶆柊寰楃數淇濈暀閫氳矾 +*****************************************************************/ +static int chrg_sink_nor_work_low(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + rt_uint16_t reg = REG_WORK; + rt_uint16_t value = WORK_STOP; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + /* 浣庡帇淇濇姢浼樺厛绾ф渶楂橈紝鍏堜涪寮冭閫氶亾娈嬬暀鐨勫惎鍔ㄦ垨璁惧畾鍛戒护銆 */ + if (chrg_sou_com_batch_cancel(idx) != 0) { + return -1; + } + /* Low voltage stops the electronic load only. Do not alter South relays: + * an intentional protocol transition must not cause a relay-induced drop. */ + if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) { + return -1; + } + /* 涓荤户鐢靛櫒宸查殢鎺夌數鎵规鏂紑锛岄棴鍚堣窡韪笌鐢靛帇鍒颁綅纭涓骞舵竻闄ゃ */ + g_sink_rel_main_closed[idx] = 0; + g_sink_rel_main_ready[idx] = 0; + pSW->sink.work_mode = SINK_WORK_LOW_AUX_WAIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_low_aux_wait +鍑芥暟鎻忚堪锛 绛夊緟鎺夌數瀹夊叏鎵规鍜屽壇缁х數鍣ㄦ仮澶嶅懡浠ゅ叏閮ㄦ敹鍒版湁鏁堝洖鐮 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鎴愬姛鍚庤繘鍏INK_WORK_LOW_MONITOR骞舵仮澶嶅寳鍚戠數鍘嬫煡璇㈠叆鍙 +杩斿洖璇存槑锛 0:缁х画绛夊緟鎴栫姸鎬佽浆鎹㈡垚鍔 <0:鍙傛暟閿欒 +鍏跺畠璇存槑锛 鎵规澶辫触鏃堕噸鏂版墽琛屽畬鏁存帀鐢靛鐞嗭紝涓嶅厑璁歌烦杩囧壇缁х數鍣ㄧ‘璁 +*****************************************************************/ +static int chrg_sink_work_low_aux_wait(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + int batch_result; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (chrg_sou_com_batch_is_pending(idx)) { + return 0; + } + batch_result = chrg_sou_com_batch_get_result(idx); + if (batch_result <= 0) { + return chrg_sink_nor_work_low(idx, pSW); + } + + pSW->sub = IDX_GET_SINK_VC; + pSW->sink.work_mode = SINK_WORK_LOW_MONITOR; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_nor_work_off +鍑芥暟鎻忚堪锛 鎵ц璐熻浇涓诲姩鍏虫満娴佺▼ +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 娓呴櫎杩愯銆佷娇鑳藉拰鍦ㄧ嚎鏍囧織锛屽叧闂寳鍚戠户鐢靛櫒 +杩斿洖璇存槑锛 0:鍏虫満鎴愬姛 <0:鍋滄鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鍏堟柇寮鍔熺巼缁х數鍣ㄥ苟鍙戦乄ORK_STOP锛屽啀鍏抽棴杞欢閫氶亾 +*****************************************************************/ +static int chrg_sink_work_stop_prepare(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + rt_uint16_t reg = REG_WORK; + rt_uint16_t value = WORK_STOP; + + 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, ®, &value, 1U) != 0) { + return -1; + } + + /* 涓诲姩鍏虫満鍏堝仠姝㈢數瀛愯礋杞姐俉ORK_STOP鏀跺埌鍖归厤鍥炵爜鍚庯紝蹇呴』閫氳繃 + * 鍋滄鍛戒护涔嬪悗鐨勬柊P1閲忔祴杩炵画纭浣庣數娴侊紝鎵嶅厑璁告柇寮鍔熺巼缁х數鍣ㄣ */ + chrg_sink_unload_confirm_reset(idx); + pSW->sink.work_mode = SINK_WORK_STOP_WAIT; + return 0; +} + +static int chrg_sink_work_stop_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, ®, &value, 1U) != 0) { + return -1; + } + + /* 缁х數鍣ㄥ叧闂懡浠ゅ凡鎻愪氦锛岀瓑寰呭崡鍚戝洖鐮佸悗鍐嶆竻鐞嗚蒋浠堕氶亾銆 */ + pSW->sink.work_mode = SINK_WORK_STOP_RELAY_WAIT; + return 0; +} + +static int chrg_sink_work_stop_relay_wait(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ struct chrg_south_t *pSOU = &chrgsouth; struct chrg_north_t *pNOR = &chrgnorth; + int result; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (chrg_sou_com_batch_is_pending(idx)) { + return 0; + } + result = chrg_sou_com_batch_get_result(idx); + if (result <= 0) { + return chrg_sink_work_stop_relay(idx, pSW); + } pSW->sink.On_work = 0; - pSOU->enable[idx] = 0; pSOU->online[idx] = 0; pNOR->enable[idx] = 0; + g_sink_rel_main_closed[idx] = 0; + g_sink_rel_main_ready[idx] = 0; - chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0); //鍏抽棴鍖楀悜缁х數鍣 - chrg_sou_com_batch_add_reg(idx, 0x01, 0x00); - chrg_sou_com_batch_add_reg(idx, REG_WORK, WORK_STOP); + chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0); + /* 涓诲姩鍋滄宸茬粡瀹屾垚锛岄鍑哄紓姝ョ瓑寰呯姸鎬侊紝绂佹涓嬩竴杞噸澶嶆墽琛屻 */ + pSW->sink.work_mode = SINK_WORK_WAIT; + return 0; } -//鍔ㄦ佹祴璇曞惎鍔 -void chrg_sink_change_ON(rt_uint8_t ch, struct chrg_switch_t *pSW) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_switch +鍑芥暟鎻忚堪锛 澶勭悊鈥滅數婧愬垏鎹㈠埌璐熻浇鈥濈殑杩囨浮鐘舵 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 娓呴櫎鏃х數婧愯繍琛屾爣蹇楋紝璁剧疆璐熻浇鍖楀悜鍏ュ彛鍜孖NIT鐘舵 +杩斿洖璇存槑锛 0:鍋滄鍛戒护鎴愬姛鍔犲叆闃熷垪 闈0:鍛戒护鍏ラ槦澶辫触 +鍏跺畠璇存槑锛 pSW->id宸茬敱COM鏇存柊涓篒D_SINK锛涘厛鎻愪氦鏃х數婧怶ORK_STOP锛 + 鍚庣画璐熻浇INIT浣跨敤鍚屼竴閫氶亾闃熷垪锛屼繚璇佸仠姝㈠懡浠ゅ厛鎵ц +*****************************************************************/ +static int chrg_sink_work_switch(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + rt_uint16_t reg = REG_WORK; + rt_uint16_t value = WORK_STOP; + rt_uint16_t eload_reg = REG_ELOAD; + rt_uint16_t eload_value = ELOAD_LOAD; + int ret; + + ret = chrg_sou_com_batch_submit(idx, ®, &value, 1); + if (ret != 0) { + return ret; + } + /* 绛夊緟婧愭ā寮忓仠姝㈠懡浠ゅ叆闃熷悗锛屽啀鍗曠嫭鍒囧洖璐熻浇瑙掕壊锛岄伩鍏嶅悓涓鎵规 + * 鍙戠敓婧愯浇妯″紡鍒囨崲鍚庡悗缁礋杞藉垵濮嬪寲鍛戒护琚姛鐜囨澘蹇界暐銆 */ + ret = chrg_sou_com_batch_submit(idx, &eload_reg, &eload_value, 1); + if (ret != 0) { + return ret; + } + + /* 鍋滄鎴愬姛鍏ラ槦鍚庯紝娓呴櫎鏃ource杩愯鏍囧織銆 */ + pSW->source.On_Flag = 0; + /* 棣栨杩涘叆Sink鏃跺厛璁剧疆鐩爣CC绾匡紝CC绋冲畾鍚庡啀璁剧疆鍗忚銆 */ + /* Protocol-before-CC test flow is disabled in this version. */ + pSW->sub = IDX_SET_SINK_CC_BEFORE_PD; + /* SWITCH鍙礋璐ｆ棫瑙掕壊閫鍑猴紝鍚庣画鍚姩缁熶竴浜ょ粰Sink INIT鐘舵併 */ + pSW->sink.work_mode = SINK_WORK_INIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_protocol_unload +鍑芥暟鎻忚堪锛 鍗忚鐢靛帇鎴栫數娴佸彉鍖栧墠鐨勮蒋鍗歌浇锛氬仠姝㈢數瀛愯礋杞 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 <0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 涓嶆搷浣滃寳鍚戝拰鍗楀悜鍔熺巼缁х數鍣紱WORK_STOP瀹屾垚鍚庤繘鍏NLOAD_WAIT锛 + 杩炵画纭涓ゅ抚瀹為檯鐢垫祦涓嶅ぇ浜200mA锛屾墠鍏佽鍖楀悜閲嶉厤鍗忚骞朵娇鐢ㄨ蒋鎭㈠娴佺▼ +*****************************************************************/ +static int chrg_sink_work_protocol_unload(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + rt_uint16_t reg = REG_WORK; + rt_uint16_t value = WORK_STOP; + + if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) { + return -1; + } + + /* WORK_STOP鍥炵爜鍙‘璁ゅ懡浠ゆ帴鏀讹紱杩橀渶杩炵画璇诲彇涓ゅ抚鍚堟牸鐨勫疄闄呯數娴併 */ + chrg_sink_unload_confirm_reset(idx); + pSW->sink.work_mode = SINK_WORK_UNLOAD_WAIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_handshake_prepare +鍑芥暟鎻忚堪锛 鎵ц鍗忚鎴朇C瀹屾暣閲嶆彙鎵嬪墠鐨勫崡鍚戝畨鍏ㄦ柇寮鍜屽壇缁х數鍣ㄦ仮澶 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鍛戒护鎻愪氦鎴愬姛鍚庤繘鍏INK_WORK_HANDSHAKE_WAIT +杩斿洖璇存槑锛 0:鍥涙潯鍛戒护鎻愪氦鎴愬姛 <0:鍙傛暟鎴栧懡浠ゆ彁浜ゅけ璐 +鍏跺畠璇存槑锛 鍛戒护椤哄簭鍥哄畾涓篧ORK_STOP銆丆URRENT=1000mA銆丄LL_REL_OFF銆丗U_REL_ON锛 + WORK_STOP宸插叧闂數瀛愯礋杞斤紝1000mA浠呬负鍔熺巼鏉垮仠姝㈤樁娈典繚瀛樼殑鐢垫祦璁惧畾鍊硷紱 + 涓诲壇缁х數鍣ㄥ叏閮ㄦ柇寮骞剁‘璁ゅ洖鐮佸悗鍐嶅崟鐙墦寮鍓户鐢靛櫒锛 + 鍖楀悜Sink缁х數鍣ㄤ繚鎸佹帴閫氾紝浣庣數娴佺‘璁ゅ畬鎴愬悗鎵嶅厑璁搁噸鏂版彙鎵 +*****************************************************************/ +static int chrg_sink_work_handshake_prepare(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + rt_uint16_t reg = REG_WORK; + rt_uint16_t value = WORK_STOP; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + /* 鏂癈C/鍗忚浜嬪姟蹇呴』鎶㈠崰鏈氶亾灏氭湭鍙戦佺殑鏃у惎鍔ㄥ拰璁惧畾鍛戒护銆 */ + if (chrg_sou_com_batch_cancel(idx) != 0) { + return -1; + } + if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) { + return -1; + } + + /* 鍗忚鎴朇C鍒囨崲鍏堝仠姝㈢數瀛愯礋杞斤紝杩炵画2娆＄‘璁や綆鐢垫祦鍚庡啀鎿嶄綔缁х數鍣ㄣ */ + chrg_sink_unload_confirm_reset(idx); + pSW->sink.work_mode = SINK_WORK_HANDSHAKE_WAIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work_current_wait +鍑芥暟鎻忚堪锛 绛夊緟璐熻浇瀹夊叏鏂紑鎵规瀹屾垚锛屽苟杩炵画纭涓ゅ抚瀹為檯鐢垫祦涓嶅ぇ浜200mA +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼鏉块氶亾 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 + full_handshake:RT_TRUE涓哄畬鏁撮噸鎻℃墜 RT_FALSE涓哄崗璁弬鏁拌蒋鍗歌浇 +杈撳嚭鍙傛暟锛 纭鎴愬姛鍚庡皢sink.work_mode鍒囨崲涓篠INK_WORK_WAIT +杩斿洖璇存槑锛 0:缁х画绛夊緟鎴栫‘璁ゆ垚鍔 <0:鐘舵佹煡璇㈡垨浼樺厛閲忔祴璇锋眰澶辫触 +鍏跺畠璇存槑锛 杞嵏杞藉彧瑕佹眰WORK_STOP鏀跺埌鍖归厤鍥炵爜鍚庡缓绔嬮噺娴嬪熀绾匡紱瀹屾暣閲嶆彙鎵 + 杩樿姹侰URRENT=1000mA銆丄LL_REL_OFF鍜孎U_REL_ON鍥炵爜鎴愬姛锛屼絾淇濇寔鍖楀悜Sink缁х數鍣ㄦ帴閫 +*****************************************************************/ +static int chrg_sink_work_current_wait(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW, rt_uint8_t next_action) +{ + rt_uint32_t sample_seq; + int batch_result; + + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + if (chrg_sou_com_batch_is_pending(idx)) { + return 0; + } + + batch_result = chrg_sou_com_batch_get_result(idx); + if (batch_result < 0) { + /* 鍐欏懡浠ゅけ璐ユ椂閲嶆柊鎵ц鍋滄鍛戒护锛岀姝娇鐢ㄩ噺娴嬪兼彁鍓嶆斁琛屻 */ + if (next_action == SINK_UNLOAD_NEXT_HANDSHAKE) { + return chrg_sink_work_handshake_prepare(idx, pSW); + } + if (next_action == SINK_UNLOAD_NEXT_STOP_RELAY) { + return chrg_sink_work_stop_prepare(idx, pSW); + } + return chrg_sink_work_protocol_unload(idx, pSW); + } + if (batch_result == 0) { + /* 鏃犳湁鏁堟壒娆＄粨鏋滄椂淇濇寔闃诲锛屽苟閲嶆柊鎻愪氦鍋滄鍔ㄤ綔銆 */ + if (next_action == SINK_UNLOAD_NEXT_HANDSHAKE) { + return chrg_sink_work_handshake_prepare(idx, pSW); + } + if (next_action == SINK_UNLOAD_NEXT_STOP_RELAY) { + return chrg_sink_work_stop_prepare(idx, pSW); + } + return chrg_sink_work_protocol_unload(idx, pSW); + } + + if (!g_sink_unload_batch_confirmed[idx]) { + /* 浠庢渶鍚庝竴鏉″啓鍥炵爜涔嬪悗寤虹珛鍩虹嚎锛屾帓闄UN_COM涔嬪墠娈嬬暀鐨勬棫閲忔祴銆 */ + g_sink_unload_sample_seq[idx] = chrg_eload_get_sample_seq(idx); + g_sink_unload_batch_confirmed[idx] = RT_TRUE; + return chrg_sink_unload_query_submit(idx, RT_TRUE); + } + + sample_seq = chrg_eload_get_sample_seq(idx); + if (sample_seq != g_sink_unload_sample_seq[idx]) { + g_sink_unload_sample_seq[idx] = sample_seq; + if (pSW->Now_current <= SINK_UNLOAD_CURRENT_MAX_MA) { + g_sink_unload_confirm_count[idx]++; + if (g_sink_unload_confirm_count[idx] >= SINK_UNLOAD_CONFIRM_COUNT) { + g_sink_unload_batch_confirmed[idx] = RT_FALSE; + g_sink_unload_confirm_count[idx] = 0U; + if (next_action == SINK_UNLOAD_NEXT_HANDSHAKE) { + /* 鍗忚鎴朇C鍒囨崲淇濇寔鍗楀悜缁х數鍣ㄧ姸鎬侊紝浣庣數娴佺‘璁ゅ悗鐩存帴寮濮嬪寳鍚戦厤缃 */ + pSW->sink.work_mode = SINK_WORK_WAIT; + } else if (next_action == SINK_UNLOAD_NEXT_STOP_RELAY) { + pSW->sink.work_mode = SINK_WORK_STOP_RELAY; + } else { + /* Keep relays closed and resume through the common + * voltage-confirmed RUNING path. */ + pSW->sink.work_mode = SINK_WORK_WAIT; + } + return 0; + } + } else { + /* 蹇呴』鏄繛缁袱甯у悎鏍奸噺娴嬶紱涓棿鍑虹幇甯﹁浇鐢垫祦鏃堕噸鏂拌鏁般 */ + g_sink_unload_confirm_count[idx] = 0U; + } + } + + /* 褰撳墠甯т粛鏈夌數娴佹垨鏌ヨ鏈繑鍥炴椂锛岃姹備笅涓甯э紱鎺ュ彛鎸変綅鐧昏锛屼笉浼氶噸澶嶆帓闃熴 */ + return chrg_sink_unload_query_submit(idx, RT_FALSE); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_TEST_DYNA_ON +鍑芥暟鎻忚堪锛 閰嶇疆骞跺惎鍔ㄥ姩鎬佽礋杞芥祴璇 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 闈0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 涓娆℃彁浜や袱缁勮礋杞姐佷繚鎸佹椂闂淬佹枩鐜囥佹祴璇曞懡浠ゅ拰WORK_START +*****************************************************************/ +static int chrg_sink_TEST_DYNA_ON(rt_uint8_t ch, struct chrg_switch_t *pSW) { struct test *pTest = &pSW->sink.test; - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_L1, pTest->change_test.curr1_set); - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_T1 , pTest->change_test.time1_set); - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_L2 , pTest->change_test.curr2_set); - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_T2 , pTest->change_test.time2_set); - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, ModbusRTU_DYNA_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN); - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, REG_WORK, WORK_START); + rt_uint16_t regs[8] = {REG_REL_ON, REG_REL_ON, + ModbusRTU_DYNA_L1, ModbusRTU_DYNA_T1, ModbusRTU_DYNA_L2, + ModbusRTU_DYNA_T2, ModbusRTU_DYNA_CMD_MODE_FLAG, REG_WORK}; + rt_uint16_t vals[8] = {0x02, 0x03, + pTest->change_test.curr1_set, pTest->change_test.time1_set, + pTest->change_test.curr2_set, pTest->change_test.time2_set, + ModbusRTU_DYNA_CMD_MODE_RUN, WORK_START}; + + /* + * 鍔ㄦ佹祴璇曞彲鑳藉湪鏅 RUNING 鐘舵佹墦寮鍔熺巼鏉跨户鐢靛櫒涔嬪墠杩涘叆銆 + * 鍥犳鍔ㄦ佸惎鍔ㄦ祦绋嬪繀椤昏嚜琛屾墦寮涓よ矾缁х數鍣紝閬垮厤蹇熶粠 PD 璁剧疆 + * 鍒囨崲鍒板姩鎬佹祴璇曟椂锛岃礋杞藉凡缁忓惎鍔ㄤ絾鍔熺巼鏉跨户鐢靛櫒浠嶅浜庡叧闂姸鎬併 + */ + return chrg_sou_com_batch_submit((eIDX_SOU_CH)ch, regs, vals, 8); } -//鐭矾娴嬭瘯鍚姩 -void chrg_sink_SHOUT_ON(rt_uint8_t ch, struct chrg_switch_t *pSW) +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_TEST_SHORT_ON +鍑芥暟鎻忚堪锛 閰嶇疆骞跺惎鍔ㄨ礋杞界煭璺祴璇 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 闈0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鏍规嵁set_mode閫夋嫨瀹氭椂鏃犺浇鎴栨寔缁繚鎸佹ā寮 +*****************************************************************/ +static int chrg_sink_TEST_SHORT_ON(rt_uint8_t ch, struct chrg_switch_t *pSW) { - struct test *pTest = &pSW->sink.test; - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, ModbusRTU_ShortTest_CMD_MODE_FLAG , ModbusRTU_DYNA_CMD_MODE_RUN_ALWAYS_KEPP); //淇濇寔 - chrg_sou_com_batch_add_reg((eIDX_SOU_CH)ch, REG_WORK, WORK_START); + rt_uint16_t regs[3] = {ModbusRTU_ShortTest_Hold_Time,ModbusRTU_ShortTest_CMD_MODE_FLAG, REG_WORK}; + rt_uint16_t vals[3] = {0,0,0}; + if(pSW->sink.test.short_test.set_mode == 0) + { + vals[0] = pSW->sink.test.short_test.hold_time; + vals[1] = ModbusRTU_DYNA_CMD_MODE_RUN_NO_CURR; + } + else{ + vals[1] = ModbusRTU_DYNA_CMD_MODE_RUN_ALWAYS_KEPP; + } + vals[2] = WORK_START; + return chrg_sou_com_batch_submit((eIDX_SOU_CH)ch, regs, vals, 3); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_TEST_OCP_ON +鍑芥暟鎻忚堪锛 閰嶇疆骞跺惎鍔ㄨ礋杞絆CP杩囨祦淇濇姢娴嬭瘯 +杈撳叆鍙傛暟锛 ch:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 闈0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 涓娆℃彁浜ゅ姛鐜囩户鐢靛櫒銆丱CP鍙傛暟銆佹祴璇曞懡浠ゅ拰WORK_START锛 + set_mode涓0鏃朵繚鎸佹寚瀹氭椂闂村悗鎭㈠锛屼负1鏃朵竴鐩翠繚鎸 +*****************************************************************/ +static int chrg_sink_TEST_OCP_ON(rt_uint8_t ch, struct chrg_switch_t *pSW) +{ + struct test_OCP *pOCP = &pSW->sink.test.OCP_test; + rt_uint16_t regs[11] = {REG_REL_ON, REG_REL_ON, + ModbusRTU_OCPTest_StartCurrent, ModbusRTU_OCPTest_StopCurrent, + ModbusRTU_OCPTest_Step_CURR, ModbusRTU_OCPTest_Step_Hold_Time, + ModbusRTU_OCPTest_Vtrig_Stop, ModbusRTU_OCPTest_Hold_Time, + ModbusRTU_OCPTest_HOLD_CURR, ModbusRTU_OCPTest_CMD_MODE_FLAG, + REG_WORK}; + rt_uint16_t vals[11] = {0x02, 0x03, + pOCP->start_curr, pOCP->end_curr, pOCP->change_curr, + pOCP->change_keep_time, pOCP->stop_volt, pOCP->hold_time, + pOCP->hold_curr, ModbusRTU_DYNA_CMD_MODE_RUN_NO_CURR, + WORK_START}; + + if (pOCP->set_mode != 0) { + vals[9] = ModbusRTU_DYNA_CMD_MODE_RUN_ALWAYS_KEPP; + } + return chrg_sou_com_batch_submit((eIDX_SOU_CH)ch, regs, vals, 11); } -//璐熻浇宸ヤ綔 -void chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW){ +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_sink_work +鍑芥暟鎻忚堪锛 璐熻浇宸ヤ綔鐘舵佹満缁熶竴鍏ュ彛 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏍规嵁sink.work_mode鎵ц瀵瑰簲鐘舵佸姩浣 +杩斿洖璇存槑锛 0:鐘舵佸鐞嗘垚鍔 <0:鍙傛暟銆佺姸鎬佹垨鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 姣忛氶亾璁板綍涓婃鎴愬姛鐘舵侊紝鐩稿悓鐘舵佷笉閲嶅涓嬪彂瀵勫瓨鍣 +*****************************************************************/ +int workmode = 0; +int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ static uint8_t last_state[TOTAL_SOU_CHS] ={100,100,100,100}; - rt_uint8_t work_mode = pSW->sink.work_mode; + rt_uint8_t work_mode; + int ret = -1; - // 鏈鐘舵佸拰涓婃涓鑷达紝鐩存帴璺宠繃锛屼笉閲嶅涓嬪彂瀵勫瓨鍣 - if (work_mode == last_state[idx]) - { - return; - } - chrg_sou_com_sou_set(); + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + work_mode = pSW->sink.work_mode; + workmode = work_mode; + /* 寮傛绛夊緟鐘舵侀渶瑕佹寔缁鏌ユ壒娆℃垨鏂伴噺娴嬶紝鍏朵綑鐩稿悓鐘舵佷繚鎸佸幓閲嶃 */ + if ((work_mode == last_state[idx]) && + (work_mode != SINK_WORK_INIT_AUX_WAIT) && + (work_mode != SINK_WORK_STOP_WAIT) && + (work_mode != SINK_WORK_STOP_RELAY_WAIT) && + (work_mode != SINK_WORK_UNLOAD_WAIT) && + (work_mode != SINK_WORK_LOW_AUX_WAIT) && + (work_mode != SINK_WORK_HANDSHAKE_WAIT)) { + return 0; + } switch(work_mode){ case SINK_WORK_INIT: - chrg_sink_work_init(idx,pSW); + ret = chrg_sink_work_init(idx,pSW); + break; + case SINK_WORK_INIT_AUX_WAIT: + ret = chrg_sink_work_init_aux_wait(idx, pSW); break; case SINK_WORK_WAIT: - + ret = 0; break; case SINK_WORK_RUNING: - chrg_sink_work_volt_runing(idx,pSW); + ret = chrg_sink_work_volt_runing(idx,pSW); break; - case SINK_WORK_RUNING_2: - chrg_sink_work_volt_runing(idx,pSW); - break; - case SINK_WORK_ON_TEST_CHANGE: - chrg_sink_change_ON(idx,pSW); + case SINK_WORK_ON_TEST_DYNA: + ret = chrg_sink_TEST_DYNA_ON(idx,pSW); break; - case SINK_WORK_ON_TEST_SHOUT: - chrg_sink_SHOUT_ON(idx,pSW); + case SINK_WORK_ON_TEST_SHORT: + ret = chrg_sink_TEST_SHORT_ON(idx,pSW); + break; + case SINK_WORK_ON_TEST_OCP: + ret = chrg_sink_TEST_OCP_ON(idx,pSW); break; case SINK_WORK_LOW: - chrg_sink_nor_work_low(idx,pSW); + ret = chrg_sink_nor_work_low(idx,pSW); + break; + case SINK_WORK_LOW_AUX_WAIT: + ret = chrg_sink_work_low_aux_wait(idx, pSW); + break; + case SINK_WORK_LOW_MONITOR: + ret = 0; break; case SINK_WORK_STOP: - chrg_sink_nor_work_off(idx,pSW); - break; + ret = chrg_sink_work_stop_prepare(idx, pSW); + break; + case SINK_WORK_STOP_WAIT: + ret = chrg_sink_work_current_wait(idx, pSW, + SINK_UNLOAD_NEXT_STOP_RELAY); + break; + case SINK_WORK_STOP_RELAY: + ret = chrg_sink_work_stop_relay(idx, pSW); + break; + case SINK_WORK_STOP_RELAY_WAIT: + ret = chrg_sink_work_stop_relay_wait(idx, pSW); + break; + case SINK_WORK_SWITCH: + ret = chrg_sink_work_switch(idx,pSW); + break; + case SINK_WORK_PROTOCOL_UNLOAD: + ret = chrg_sink_work_protocol_unload(idx, pSW); + break; + case SINK_WORK_UNLOAD_WAIT: + ret = chrg_sink_work_current_wait(idx, pSW, + SINK_UNLOAD_NEXT_RUNNING); + break; + case SINK_WORK_HANDSHAKE_PREPARE: + ret = chrg_sink_work_handshake_prepare(idx, pSW); + break; + case SINK_WORK_HANDSHAKE_WAIT: + ret = chrg_sink_work_current_wait(idx, pSW, + SINK_UNLOAD_NEXT_HANDSHAKE); + break; + case SINK_WORK_LOAD_STANDBY: + ret = 0; + break; + case SINK_WORK_LOAD_STOP: + ret = chrg_sink_work_load_stop(idx, pSW); + break; + case SINK_WORK_LOAD_START: + ret = chrg_sink_work_load_start(idx, pSW); + break; + default: + break; } -// 鏇存柊缂撳瓨锛屼繚瀛樻湰娆℃渶鏂扮姸鎬 - last_state[idx] = work_mode; + if (ret == 0) { + last_state[idx] = work_mode; + } + return ret; } diff --git a/apps/chrg/applications/utils/chrg_sink.h b/apps/chrg/applications/utils/chrg_sink.h index 6eba83d..ecce436 100644 --- a/apps/chrg/applications/utils/chrg_sink.h +++ b/apps/chrg/applications/utils/chrg_sink.h @@ -201,16 +201,40 @@ enum { #define SINK_CMD_SET_AVS 0xE3 // AVS +/* + * 鏅氭亽娴佽礋杞藉厑璁告墽琛學ORK_START鐨勬渶浣庤瀹氱數娴侊紝鍗曚綅mA銆 + * 灏忎簬璇ュ兼椂鍖楀悜浠嶅畬鎴愬崗璁彙鎵嬶紝浣嗗崡鍚戜繚鎸乄ORK_STOP涓斾笉鏀瑰啓鐢垫祦璁惧畾锛 + * 閬垮厤鍔熺巼鏉垮湪闆剁數娴佹垨鍑犲崄mA鐨勫皬鐢垫祦璁惧畾涓嬪惎鍔ㄧ數瀛愯礋杞戒骇鐢熷啿鍑汇 + */ +#define SINK_LOAD_ENABLE_MIN_MA 100U + +/* 涓荤户鐢靛櫒闂悎鍚庣殑0V鎸佺画鐩戞帶锛氱敱鍖楀悜杞绾跨▼姣忚疆璋冪敤锛屾帀鐢电珛鍗宠浆鎺夌數淇濇姢銆 */ +extern int chrg_sink_volt_low_protect(eIDX_SOU_CH idx, struct chrg_switch_t *pSW); + enum { - SINK_WORK_INIT =0, - SINK_WORK_WAIT, - SINK_WORK_VOLT_OK, - SINK_WORK_RUNING, - SINK_WORK_RUNING_2, - SINK_WORK_LOW, - SINK_WORK_STOP, - SINK_WORK_ON_TEST_CHANGE, - SINK_WORK_ON_TEST_SHOUT, + SINK_WORK_INIT = 0, // 鍚姩鍏ュ彛锛氱涓鏉″崡鍚戝懡浠ゅ彧鎵撳紑鍓户鐢靛櫒 + SINK_WORK_INIT_AUX_WAIT, // 绛夊緟鍚姩鍓户鐢靛櫒鏀跺埌鏈夋晥鍗楀悜鍥炵爜 + SINK_WORK_WAIT, // 鍖楀悜鍗忚璁剧疆鎴栫數鍘嬫煡璇㈢瓑寰呯姸鎬 + SINK_WORK_VOLT_OK, // 棰勭暀鐨勭數鍘嬭揪鏍囩姸鎬 + SINK_WORK_RUNING, // 鐢靛帇绋冲畾鍚庢彁浜ょ户鐢靛櫒銆佺數娴佸拰鍚姩鍛戒护 + SINK_WORK_LOW, // 杩愯鐢靛帇杩囦綆锛屾墽琛屾帀鐢靛畨鍏ㄥ鐞 + SINK_WORK_LOW_AUX_WAIT, // 绛夊緟鎺夌數澶勭悊鍙婂壇缁х數鍣ㄦ仮澶嶆壒娆″畬鎴 + SINK_WORK_LOW_MONITOR, // 鍓户鐢靛櫒宸叉仮澶嶏紝绛夊緟杈撳叆鐢靛帇閲嶆柊鍑虹幇 + SINK_WORK_STOP, // 鐢ㄦ埛涓诲姩鍋滄锛氬厛鍋滄璐熻浇骞剁‘璁や綆鐢垫祦 + SINK_WORK_SWITCH, // 鍋滄鏃х數婧愬悗杩涘叆璐熻浇INIT + SINK_WORK_PROTOCOL_UNLOAD, // 鍗忚鐢靛帇鎴栫數娴佸彉鍖栵細鎺夎浇浣嗕笉鍒囨崲缁х數鍣 + SINK_WORK_UNLOAD_WAIT, // 绛夊緟杞嵏杞藉畬鎴愬苟杩炵画涓ゆ纭鐢垫祦涓嶅ぇ浜200mA + SINK_WORK_ON_TEST_DYNA, // 鍔ㄦ佽礋杞芥祴璇曞惎鍔ㄧ姸鎬 + SINK_WORK_ON_TEST_SHORT, // 鐭矾娴嬭瘯鍚姩鐘舵 + SINK_WORK_ON_TEST_OCP, // OCP杩囨祦淇濇姢娴嬭瘯鍚姩鐘舵 + SINK_WORK_HANDSHAKE_PREPARE, // 瀹屾暣閲嶆彙鎵嬶細鍋滄銆佹竻娴併佸叏鍏崇户鐢靛櫒鍚庢墦寮鍓户鐢靛櫒 + SINK_WORK_HANDSHAKE_WAIT, // 鍗楀悜浣庣數娴佺‘璁や笌鍖楀悜鍗忚/CC骞惰 + SINK_WORK_LOAD_STANDBY, // 鍗忚宸插氨缁絾涓荤户鐢靛櫒鏈墦寮锛屼綆璁惧畾鐢垫祦涓嬩繚鎸佸仠姝 + SINK_WORK_LOAD_STOP, // 杩愯涓法鍒颁綆鐢垫祦锛氬彧鍙戦乄ORK_STOP鍏抽棴鐢靛瓙璐熻浇 + SINK_WORK_LOAD_START, // 涓荤户鐢靛櫒鏈墦寮鐨勪綆鐢垫祦寰呮満鎭㈠锛氱瓑寰呭寳鍚戠數鍘嬬ǔ瀹氬悗杩涘叆RUNING + SINK_WORK_STOP_WAIT, // 鍏虫満锛氱瓑寰呰繛缁2娆″疄闄呯數娴佽揪鍒板畨鍏ㄨ寖鍥 + SINK_WORK_STOP_RELAY, // 鍏虫満锛氫綆鐢垫祦纭鍚庢彁浜ゅ叧闂崡鍚戠户鐢靛櫒 + SINK_WORK_STOP_RELAY_WAIT // 鍏虫満锛氱瓑寰呭叧闂崡鍚戠户鐢靛櫒鐨勫洖鐮 }; // sink 鍙傛暟缁撴瀯 @@ -234,11 +258,9 @@ struct chrg_sink_t { rt_uint8_t work_mode; // 0=鍋滄 1=宸ヤ綔 2=浣庣數鍘 }; - //绾规尝瀵勫瓨鍣 #define ModbusRTU_Ripple_Value 0x35 //璇诲彇绾规尝 - /******************** 璐熻浇娴嬭瘯 ************************* */ #define ModbusRTU_CAL_WriteEnable 0x34 //浣胯兘鍐欏叆锛0x4361浠ｈ〃浣胯兘鍐欏叆锛汣+a ASCII鐮 #define ModbusRTU_Test_CMD 0x4361 // @@ -384,7 +406,9 @@ extern void chrg_nor_sink_change_test(rt_uint8_t ch, struct chrg_switch_t *pSW); extern void chrg_nor_sink_test_stop(rt_uint8_t ch,struct chrg_switch_t *pSW,rt_uint8_t *enable); extern void chrg_nor_sink_test_run(rt_uint8_t ch, struct chrg_switch_t *pSW); -extern void chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW); +/* 鍒ゆ柇鏅氳礋杞界殑褰撳墠璁惧畾鏄惁鍏佽鍚姩鐢靛瓙璐熻浇銆 */ +extern rt_bool_t chrg_sink_load_should_start(const struct chrg_switch_t *pSW); +extern int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW); #endif diff --git a/apps/chrg/applications/utils/chrg_source.c b/apps/chrg/applications/utils/chrg_source.c index 76ebabf..01626a3 100644 --- a/apps/chrg/applications/utils/chrg_source.c +++ b/apps/chrg/applications/utils/chrg_source.c @@ -1,7 +1,7 @@ /**************************************************************************** 鏂囦欢鍚嶇О : chrg_source.c 瀹屾垚鏃ユ湡 : -褰撳墠鐗堟湰鍙 : V1.0 +褰撳墠鐗堟湰鍙 : V1.1.9 涓昏鍔熻兘 : 鍖楀悜鏁版嵁source璇锋眰鏁版嵁濉厖鍙婂彂閫併 鐗堟湰鍘嗗彶 : 鍒涘缓鍘熷鐗堟湰 璇存槑 : @@ -13,6 +13,395 @@ #include "chrg_utils.h" #include "chrg_roll_nor.h" #include "chrg_source.h" +#include "chrg_eload.h" +#include "chrg_roll_sou.h" +#include "chrg_rel.h" + +#define SOURCE_VOLT_COMPENSATION_MV 200U + +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 +鍑芥暟鎻忚堪锛 灏嗙數婧愭ā寮忓垵濮嬪寲鍙傛暟鎵归噺鎻愪氦鍒板崡鍚戝姛鐜囨澘鍛戒护闃熷垪 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鎻愪氦鎴愬姛 <0:鍙傛暟閿欒鎴栭槦鍒楁彁浜ゅけ璐 +鍏跺畠璇存槑锛 INIT涓嶅啓鐢靛帇锛涚數鍘嬬粺涓鐢盧UNING鐘舵佸啓鍏ワ紝閬垮厤澶氫釜鍏ュ彛閲嶅鎺у埗 +*****************************************************************/ +int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW) +{ + /* Source鍚姩鍙傛暟涓娆″叆闃燂紝鏈鍚庡彂閫乄ORK_START浣垮姛鐜囨澘寮濮嬭緭鍑恒 */ + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + rt_uint16_t regs[5] = { + REG_ELOAD, + REG_MODE, + REG_REL_ON, + REG_CURRENT_OUT + 1, + REG_WORK + }; + rt_uint16_t vals[5] = { + ELOAD_SOURCE, + pSW->CV_mode, + 0x03, + pSW->source.set_curr, + WORK_START + }; + + return chrg_sou_com_batch_submit(idx, regs, vals, 5); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_work_init +鍑芥暟鎻忚堪锛 鎵ц鐢垫簮INIT鐘舵侊紝鍒濆鍖栧姛鐜囨澘骞舵墦寮瀵瑰簲鍖楀悜閫氶亾 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏇存柊鐢垫簮杩愯鏍囧織銆侀氶亾浣胯兘銆佸湪绾跨姸鎬佸強work_mode +杩斿洖璇存槑锛 0:鍒濆鍖栧懡浠ゆ彁浜ゆ垚鍔 闈0:鍒濆鍖栧け璐 +鍏跺畠璇存槑锛 鏍囧噯鍗忚浠巔d_set鍑嗗鐩爣骞惰浆鍏UNING锛涘揩鍏呭崗璁竻绌烘棫鐢靛帇鍚 + 杩涘叆WAIT锛岀瓑寰呭寳鍚戝崗鍟嗙粨鏋滐紝INIT鏈韩涓嶅啓鍔熺巼鏉跨數鍘 +*****************************************************************/ +static int chrg_source_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + struct chrg_south_t *pSOU = &chrgsouth; + struct chrg_north_t *pNOR = &chrgnorth; + int ret; + + /* 鏈澶х數娴佹槸鍔熺巼鏉垮惎鍔ㄤ繚鎶ゅ硷紝蹇厖鍥炵爜鍒拌揪鍚庡彲鍐嶆洿鏂拌繍琛岀洰鏍囥 */ + pSW->source.set_curr = pSW->source.pd_set.mm.max_cur; + if (pSW->source.protocol == PRO_NONE) { + pSW->source.set_volt = pSW->source.pd_set.mm.max_vol; + } else { + /* 绂佹蹇厖閲嶆柊鍚姩鏃舵部鐢ㄤ笂涓娆″崗鍟嗙數鍘嬨 */ + pSW->source.set_volt = 0; + } + + ret = chrg_source_init_submit(idx, pSW); + if (ret != 0) { + return ret; + } + + pSW->source.On_Flag = 1; + pSW->source.qc_err = 0; + 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) { + /* 鏍囧噯鍗忚涓嶇瓑寰呭崗鍟嗭紝鍒濆鍖栧畬鎴愬悗鐩存帴鍐欏叆鐩爣鐢靛帇銆 */ + pSW->source.work_mode = SOURCE_WORK_RUNING; + return chrg_source_work_running(idx, pSW); + } + pSW->source.work_mode = SOURCE_WORK_WAIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_work_wait +鍑芥暟鎻忚堪锛 鎵ц鐢垫簮WAIT鐘舵 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鐘舵佸鐞嗗畬鎴 +鍏跺畠璇存槑锛 WAIT鐘舵佷笉涓嬪彂鍛戒护锛岀敱鍖楀悜瑙ｆ瀽鍑芥暟鍒ゆ柇鐩爣鐢靛帇鏄惁鍙樺寲 +*****************************************************************/ +static int chrg_source_work_wait(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + /* WAIT鐘舵佷笉浜х敓鍗楀悜鍛戒护锛岀瓑寰呬笅涓甯у寳鍚戠數鍘嬫暟鎹 */ + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_work_running +鍑芥暟鎻忚堪锛 鎵ц鐢垫簮RUNING鐘舵侊紝涓嬪彂琛ュ伩鍚庣殑鏈鏂扮洰鏍囩數鍘 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 - +杩斿洖璇存槑锛 0:鍛戒护鎻愪氦鎴愬姛 闈0:鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鍔熺巼鏉胯瀹氬煎浐瀹氭瘮鐩爣楂200mV锛岄槻姝㈤檺鍘嬪鑷磋緭鍑鸿繘鍏ョǔ娴佹ā寮忥紱 + 鐩爣鏈澶у间负48000mV锛屾棤闇鍋歶int16_t楗卞拰澶勭悊 +*****************************************************************/ +static int chrg_source_work_running(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + /* 鍙鏈涓嬪彂鍊艰ˉ鍋匡紝涓嶄慨鏀箂et_volt锛岄槻姝㈠娆℃墽琛屾椂绱澧炲姞銆 */ + rt_uint16_t reg = REG_VOLTAGE_OUT + 1; + rt_uint16_t value = pSW->source.set_volt; + + return chrg_sou_com_batch_submit(idx, ®, &value, 1); +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_work_protocol_switch +鍑芥暟鎻忚堪锛 鎵ц鐢垫簮鍗忚鎴朇C鍒囨崲鍓嶇殑鍔熺巼鏉胯緭鍑烘竻闆 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 娓呴浂source.set_volt锛屽苟鍦ㄥ懡浠ゅ叆闃熸垚鍔熷悗杩涘叆WAIT鐘舵 +杩斿洖璇存槑锛 0:娓呴浂鍛戒护鎻愪氦鎴愬姛 闈0:鐘舵佹垨鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 COM鍦ㄨ繘鍏ユ湰鐘舵佸墠蹇呴』灏唖ub璁剧疆涓哄崗璁丆C鎴栫粍鍚堜簨鍔″叆鍙ｏ紱 + 鏈姸鎬佸彧绠＄悊鍗楀悜娓呴浂锛屼笉淇敼鍖楀悜sub锛 + 鏍囧噯鍗忚鍚屾椂鎸0V銆佹ā寮忋佺數娴侀『搴忓叆闃燂紝淇濊瘉鍗楀悜鍛戒护椤哄簭鍥哄畾 +*****************************************************************/ +static int chrg_source_work_protocol_switch(eIDX_SOU_CH idx, + struct chrg_switch_t *pSW) +{ + rt_uint16_t regs[3]; + rt_uint16_t vals[3]; + rt_uint8_t count = 0; + int ret; + + if ((pSW->sub != IDX_SET_SOURCE_PD) && + (pSW->sub != IDX_SET_SOURCE_RESET)) { + return -1; + } + + regs[count] = REG_VOLTAGE_OUT + 1; + vals[count++] = 0; + if (pSW->source.protocol == PRO_NONE) { + /* 鏍囧噯鍗忚鍒囨崲鏃讹紝妯″紡鍜岄檺娴佸煎繀椤绘帓鍦0V鍛戒护涔嬪悗鐢熸晥銆 */ + regs[count] = REG_MODE; + vals[count++] = pSW->CV_mode; + regs[count] = REG_CURRENT_OUT + 1; + vals[count++] = pSW->source.pd_set.mm.max_cur; + } + + /* 鍙湁鏁存壒鍛戒护鎴愬姛鍔犲叆鍗楀悜闃熷垪鍚庯紝鎵嶅厑璁稿寳鍚戠户缁崗璁垏鎹€ */ + ret = chrg_sou_com_batch_submit(idx, regs, vals, count); + if (ret != 0) { + return ret; + } + + pSW->source.set_volt = 0; + pSW->source.work_mode = SOURCE_WORK_WAIT; + 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, ®, &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, ®, &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 +鍑芥暟鎻忚堪锛 鎵ц鐢垫簮涓诲姩鍏虫満娴佺▼ +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 娓呴櫎鐩爣鐢靛帇銆佽繍琛屾爣蹇椼侀氶亾浣胯兘鍜屽湪绾跨姸鎬 +杩斿洖璇存槑锛 0:鍋滄鎴愬姛 闈0:鍋滄鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 渚濇鍏抽棴鍔熺巼鏉夸袱璺户鐢靛櫒銆佹竻闆剁數鍘嬪苟鍙戦乄ORK_STOP锛 + 鍋滄鍛戒护鎴愬姛鍏ラ槦鍚庣珛鍗冲叧闂寳鍚戦氶亾锛屼笉棰濆鍙戦丆C_CLOSE +*****************************************************************/ +static int chrg_source_work_stop(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + struct chrg_south_t *pSOU = &chrgsouth; + struct chrg_north_t *pNOR = &chrgnorth; + int ret; + + rt_uint16_t regs[3] = {REG_REL_ON, REG_VOLTAGE_OUT + 1, REG_WORK}; + rt_uint16_t vals[3] = {ALL_REL_OFF, 0, WORK_STOP}; + + /* 鍏堟柇寮涓よ矾鍔熺巼缁х數鍣紝鍐嶆竻闆惰緭鍑哄苟鍋滄锛岄伩鍏嶅叧鏈虹灛闂寸户缁悜澶栦緵鐢点 */ + ret = chrg_sou_com_batch_submit(idx, regs, vals, 3); + if (ret != 0) { + return ret; + } + + pSW->source.set_volt = 0; + pSW->source.On_Flag = 0; + pSW->source.qc_err = 0; + pNOR->enable[idx] = 0; + pSOU->online[idx] = 0; + chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0); + pSW->sub = IDX_SET_SOURCE_STOP_STATE; + pSW->source.work_mode = SOURCE_WORK_WAIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_work_switch +鍑芥暟鎻忚堪锛 澶勭悊鈥滆礋杞藉垏鎹㈠埌鐢垫簮鈥濈殑杩囨浮鐘舵 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 娓呴櫎鏃ц礋杞借繍琛屾爣蹇楋紝璁剧疆鐢垫簮鍖楀悜鍏ュ彛鍜孖NIT鐘舵 +杩斿洖璇存槑锛 0:鍋滄鍛戒护鎴愬姛鍔犲叆闃熷垪 闈0:鍛戒护鍏ラ槦澶辫触 +鍏跺畠璇存槑锛 pSW->id宸茬敱COM鏇存柊涓篒D_SOURCE锛涘厛鍏抽棴鏃ц礋杞界户鐢靛櫒骞舵彁浜 + WORK_STOP锛屽悗缁數婧怚NIT浣跨敤鍚屼竴閫氶亾闃熷垪锛屼繚璇佸仠姝㈠懡浠ゅ厛鎵ц +*****************************************************************/ +static int chrg_source_work_switch(eIDX_SOU_CH idx, struct chrg_switch_t *pSW) +{ + rt_uint16_t regs[3] = {REG_REL_ON, REG_VOLTAGE_OUT + 1, REG_WORK}; + rt_uint16_t vals[3] = {ALL_REL_OFF, 0, WORK_STOP}; + int ret; + + ret = chrg_sou_com_batch_submit(idx, regs, vals, 3); + if (ret != 0) { + return ret; + } + + /* 鍋滄鎴愬姛鍏ラ槦鍚庯紝娓呴櫎鏃ink杩愯鏍囧織銆 */ + pSW->sink.On_work = 0; + pSW->source.set_volt = 0; + /* 棣栨杩涘叆Source鎸夆滆缃崗璁->杩炴帴CC鈥濆惎鍔紝涓嶈兘娌跨敤Sink鐨剆ub鐘舵併 */ + pSW->sub = IDX_SET_SOURCE_PD; + /* SWITCH鍙礋璐ｆ棫瑙掕壊閫鍑猴紝鍚庣画鍚姩缁熶竴浜ょ粰Source INIT鐘舵併 */ + pSW->source.work_mode = SOURCE_WORK_INIT; + return 0; +} + +/***************************************************************** +鍑芥暟鍚嶇О锛 chrg_source_work_state +鍑芥暟鎻忚堪锛 鐢垫簮宸ヤ綔鐘舵佹満缁熶竴鍏ュ彛 +杈撳叆鍙傛暟锛 idx:鍗楀悜鍔熺巼閫氶亾缂栧彿 pSW:褰撳墠閫氶亾鎺у埗缁撴瀯浣 +杈撳嚭鍙傛暟锛 鏍规嵁source.work_mode鎵ц瀵瑰簲鐘舵佸姩浣 +杩斿洖璇存槑锛 0:鐘舵佸鐞嗘垚鍔 <0:鍙傛暟銆佺姸鎬佹垨鍛戒护鎻愪氦澶辫触 +鍏跺畠璇存槑锛 鏀寔INIT銆乄AIT銆丷UNING銆丼TOP銆丼WITCH鍜孭ROTOCOL_SWITCH鐘舵 +*****************************************************************/ +int chrg_source_work_state(rt_uint8_t idx, struct chrg_switch_t *pSW) +{ + if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) { + return -1; + } + + /* 鎵鏈塖ource鍔熺巼鏉挎帶鍒剁粺涓浠庢湰鐘舵佹満鍑哄彛鎵ц銆 */ + switch (pSW->source.work_mode) { + case SOURCE_WORK_INIT: + return chrg_source_work_init(idx, pSW); + case SOURCE_WORK_WAIT: + return chrg_source_work_wait(idx, pSW); + case SOURCE_WORK_RUNING: + return chrg_source_work_running(idx, pSW); + case SOURCE_WORK_STOP: + return chrg_source_work_stop(idx, pSW); + case SOURCE_WORK_SWITCH: + 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; + } +} + rt_uint8_t Pro_Group_VCMM[11][8] = { {0} // 11涓尅浣嶏紝8涓弬鏁帮紙src, pps, vmin_H,vmin_L, vmax_H,vmax_L,cur_set_H,cur_set_L锛 }; @@ -58,6 +447,18 @@ int source_get_pd (void) return chrg_north_send(frame, len); } +int source_reset (void) +{ + rt_uint16_t len = 0; + rt_uint8_t data[8] = {0}; + rt_uint8_t frame[16] = {0}; + + data[0] = 0x00; + chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_RESET, data, 1, frame, &len); + + return chrg_north_send(frame, len); +} + /***************************************************************** 鍑芥暟鍚嶇О锛 source_set_cc_lvl 鍑芥暟鎻忚堪锛 source 璁剧疆 cc 绛夌骇 @@ -96,11 +497,13 @@ int source_set_cc_choose (rt_uint8_t cc_set) data[0] = cc_set; chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_SET_CC_CHOOSE, data, 1, frame, &len); - rt_kprintf("\n"); - for(int i=0;i> 8) & 0xFF; // vmax_H Pro_Group_VCMM[0][5] = max_volt_mv & 0xFF; // vmax_L Pro_Group_VCMM[0][6] = (max_curr_ma >> 8) & 0xFF; // cur_set_H +#if NORTH_SOURCE_DEBUG rt_kprintf("H_C=%02x",Pro_Group_VCMM[0][6]); +#endif Pro_Group_VCMM[0][7] = max_curr_ma & 0xFF; // cur_set_L +#if NORTH_SOURCE_DEBUG rt_kprintf("L_C=%02x\n",Pro_Group_VCMM[0][7]); +#endif return 0; } @@ -152,12 +559,12 @@ void parse_power_single_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t // rt_kprintf("%0x",pData[i]); // } // rt_kprintf("\n"); - #if PRO_TEST_DEBUG +#if NORTH_SOURCE_DEBUG rt_kprintf("one_gear"); rt_kprintf("min_volt_mv = %d\n",min_volt_mv); rt_kprintf("max_volt_mv = %d\n",max_volt_mv); rt_kprintf("prtect_curr= %04x",*protect_curr); - #endif +#endif *pro_gear_idx = 1; // 鍗曟。鍗忚鍥哄畾1 // 鎸夊崗璁懡浠ょ爜璧嬪 switch (protoCmd) @@ -264,7 +671,7 @@ void parse_pd_11group_pdo(rt_uint8_t *pdoData, rt_uint8_t pdo_group_num) { // 鐢垫祦/鍔熺巼鎷嗗垎 Pro_Group_VCMM[i][6] = (cur_power >> 8) & 0xFF; // cur_set_H Pro_Group_VCMM[i][7] = cur_power & 0xFF; // cur_set_L - #if PRO_TEST_DEBUG + #if NORTH_SOURCE_DEBUG // 璋冭瘯鎵撳嵃 rt_kprintf("max_H=%d",Pro_Group_VCMM[i][4]); rt_kprintf("max_L=%d",Pro_Group_VCMM[i][5]); @@ -305,9 +712,13 @@ void parse_power_pdo_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t re rt_int16_t comp_volt_mv = 0; // 琛ュ伩鐢靛帇(mV) // 鏁版嵁鍖虹储寮曪細0=鐘舵+閫氶亾,1=CC绾,2=鎭掑帇鎭掓祦妯″紡,3=PDO缁勬暟(bit12-15) +#if NORTH_SOURCE_DEBUG rt_kprintf("pdata=%04x",pData[3]); +#endif pdo_group_num = (pData[3] >> 4) & 0x0F; // Bit12-15鎻愬彇缁勬暟 +#if NORTH_SOURCE_DEBUG rt_kprintf("num=%d\n",pdo_group_num); +#endif *pro = PRO_PD0PSS; *pro_gear_idx = pdo_group_num; // 瑙ｆ瀽11缁凱DO锛堝皬绔簭锛44瀛楄妭锛 @@ -316,13 +727,11 @@ void parse_power_pdo_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t re // 瑙ｆ瀽淇濈暀瀛楁(20瀛楄妭) + 淇濇姢鐢垫祦 + 琛ュ伩鐢靛帇 *protect_ma = u8v_to_u16(&pData[4 + 44 + 20]); // 67-68瀛楄妭 comp_volt_mv = (rt_int16_t)u8v_to_u16(&pData[4 + 44 + 22]); // 69-70瀛楄妭 -// #if PRO_TEST_DEBUG +#if NORTH_SOURCE_DEBUG rt_kprintf("project_curr=%d mA, add_volt=%d mV\n", *protect_ma, comp_volt_mv); -// #endif. +#endif } - - /***************************************************************** 鍑芥暟鍚嶇О锛 parse_mulit_gear_more 鍑芥暟鎻忚堪锛 瑙ｆ瀽涓-鍥涙尅浣嶅師濮嬫暟鎹紝濉厖8鍙傛暟楂樹綆瀛楄妭缂撳啿鍖猴紙鍚屾淇敼锛 @@ -408,7 +817,7 @@ rt_uint8_t parse_mulit_gear_more(rt_uint8_t *pData, rt_uint8_t gear_num) { Pro_Group_VCMM[i][5] = vmax_mv & 0xFF; // vmax_L Pro_Group_VCMM[i][6] = (cur_power >> 8) & 0xFF; // cur_set_H Pro_Group_VCMM[i][7] = cur_power & 0xFF; // cur_set_L - #if PRO_TEST_DEBUG + #if NORTH_SOURCE_DEBUG // 璋冭瘯鎵撳嵃 rt_kprintf("parse_mulit_gear_pd0 PDO[%d]:rc=0x%02X, pps=0x%02X,V_Min=%dmV,V_MAX=%dmV,C/P=%d\n", i, Pro_Group_VCMM[i][0], Pro_Group_VCMM[i][1], vmin_mv, vmax_mv, cur_power); @@ -443,7 +852,9 @@ void parse_multi_gear_more(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t r return; } *pro_gear_idx = gear_num; +#if NORTH_SOURCE_DEBUG rt_kprintf("pro_gear_idx = %d\n",gear_num); +#endif // 瑙ｆ瀽淇濇姢鐢垫祦鍜岃ˉ鍋跨數鍘嬶紙涓嶅悓鍗忚鍋忕Щ涓嶅悓锛 switch (protoCmd) { @@ -462,7 +873,7 @@ void parse_multi_gear_more(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t r } *protect_ma = u8v_to_u16(&pData[4 + 16]); // 19-20瀛楄妭 comp_volt_mv = (rt_int16_t)u8v_to_u16(&pData[4 + 18]); - #if PRO_TEST_DEBUG + #if NORTH_SOURCE_DEBUG for(int i = 0;i<30;i++){ rt_kprintf("data[%d]=%02x",i,pData[i]); } @@ -524,7 +935,7 @@ rt_uint8_t parse_ufcs_gear_more(rt_uint8_t *pData, rt_uint8_t gear_num) { Pro_Group_VCMM[i][5] = vmax_mv & 0xFF; Pro_Group_VCMM[i][6] = (cur_ma >> 8) & 0xFF; Pro_Group_VCMM[i][7] = cur_ma & 0xFF; - #if PRO_TEST_DEBUG + #if NORTH_SOURCE_DEBUG // ================= 鎵撳嵃鏍煎紡 ================= rt_kprintf("parse_ufcs_gear_more PDO[%d]:PPS/AVS,V_Min=%dmV,V_MAX=%dmV,Max_Current=%dmA\n", i, vmin_mv, vmax_mv, cur_ma); @@ -568,10 +979,10 @@ void parse_power_ufcs(rt_uint8_t *pData, rt_uint16_t reqLen, uint8_t *pro_gear_i // rt_kprintf("data[%d]=%02x",i,pData[i]); // } comp_volt_mv = 0;//(rt_int16_t)u8v_to_u16(&pData[3 + 14]); -//#if PRO_TEST_DEBUG +#if NORTH_SOURCE_DEBUG rt_kprintf("parse_power_ufcs:gear=%d,protect=%dmA,comp=%dmV\n", gear_num,*protect_ma, comp_volt_mv); -//#endif +#endif // 璋冪敤涓嬮潰鐨勫惊鐜В鏋 parse_ufcs_gear_more(&pData[4], gear_num); @@ -705,6 +1116,8 @@ rt_uint8_t pd_fill_single_group_need_src_com(rt_uint8_t *data, rt_uint8_t start_ rt_uint8_t idx = start_idx; struct chrg_src_t *source = &psw->source; + const struct vc_pd_t *pd = &source->pd_set; + const struct vc_mm_t *mm = &pd->mm; // 1. src + pps锛2瀛楄妭锛 data[idx++] = 0x00; data[idx++] = 0x00; @@ -715,23 +1128,23 @@ rt_uint8_t pd_fill_single_group_need_src_com(rt_uint8_t *data, rt_uint8_t start_ data[idx++] = 0x13; data[idx++] = 0x88; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; - data[idx++] = source->src; - data[idx++] = source->pps; - rt_kprintf("src = %d pps = %d\n",source->src,source->pps); + data[idx++] = pd->src_type; + data[idx++] = pd->pps_type; + //rt_kprintf("src = %d pps = %d\n", pd->src_type, pd->pps_type); // 2. 鏈灏忕數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->min_vol >> 8; - data[idx++] = source->min_vol & 0xFF; + data[idx++] = mm->min_vol >> 8; + data[idx++] = mm->min_vol & 0xFF; // 3. 鏈澶х數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->max_vol >> 8; - data[idx++] = source->max_vol & 0xFF; + data[idx++] = mm->max_vol >> 8; + data[idx++] = mm->max_vol & 0xFF; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; @@ -742,28 +1155,30 @@ rt_uint8_t pd_fill_single_group_no_src_com(rt_uint8_t *data, rt_uint8_t start_id rt_uint8_t idx = start_idx; struct chrg_src_t *source = &psw->source; + const struct vc_mm_t *mm = &source->pd_set.mm; // 1. src + pps锛2瀛楄妭锛 data[idx++] = 0x00; data[idx++] = 0x00; // 2. 鏈灏忕數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->min_vol >> 8; - data[idx++] = source->min_vol & 0xFF; + data[idx++] = 0x13;//mm->min_vol >> 8; + data[idx++] = 0x18;//mm->min_vol & 0xFF; // 3. 鏈澶х數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->max_vol >> 8; - data[idx++] = source->max_vol & 0xFF; + data[idx++] = mm->max_vol >> 8; + data[idx++] = mm->max_vol & 0xFF; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; return idx - start_idx; // 杩斿洖濉厖鐨勬诲瓧鑺傛暟 } -rt_uint8_t pd_fill_single_group_FCP_AFC(rt_uint8_t *data, rt_uint8_t start_idx,struct chrg_switch_t *psw){ +rt_uint8_t pd_fill_single_group_AFC(rt_uint8_t *data, rt_uint8_t start_idx,struct chrg_switch_t *psw){ rt_uint8_t idx = start_idx; struct chrg_src_t *source = &psw->source; + const struct vc_mm_t *mm = &source->pd_set.mm; // 1. src + pps锛2瀛楄妭锛 data[idx++] = 0x00; data[idx++] = 0x00; @@ -774,8 +1189,8 @@ rt_uint8_t pd_fill_single_group_FCP_AFC(rt_uint8_t *data, rt_uint8_t start_idx,s data[idx++] = 0x13; data[idx++] = 0x88; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; @@ -783,14 +1198,14 @@ rt_uint8_t pd_fill_single_group_FCP_AFC(rt_uint8_t *data, rt_uint8_t start_idx,s data[idx++] = 0x00; data[idx++] = 0x00; // 2. 鏈灏忕數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->max_vol >> 8; - data[idx++] = source->max_vol & 0xFF; + data[idx++] = mm->max_vol >> 8; + data[idx++] = mm->max_vol & 0xFF; // 3. 鏈澶х數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->max_vol >> 8; - data[idx++] = source->max_vol & 0xFF; + data[idx++] = mm->max_vol >> 8; + data[idx++] = mm->max_vol & 0xFF; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; @@ -801,6 +1216,7 @@ rt_uint8_t pd_fill_single_group_UFCS(rt_uint8_t *data, rt_uint8_t start_idx,stru rt_uint8_t idx = start_idx; struct chrg_src_t *source = &psw->source; + const struct vc_mm_t *mm = &source->pd_set.mm; // 1. src + pps锛2瀛楄妭锛 data[idx++] = 0x00; data[idx++] = 0x00; @@ -811,8 +1227,8 @@ rt_uint8_t pd_fill_single_group_UFCS(rt_uint8_t *data, rt_uint8_t start_idx,stru data[idx++] = 0x13; data[idx++] = 0x88; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; @@ -820,48 +1236,47 @@ rt_uint8_t pd_fill_single_group_UFCS(rt_uint8_t *data, rt_uint8_t start_idx,stru data[idx++] = 0x00; data[idx++] = 0x00; // 2. 鏈灏忕數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->min_vol >> 8; - data[idx++] = source->min_vol & 0xFF; + data[idx++] = mm->min_vol >> 8; + data[idx++] = mm->min_vol & 0xFF; // 3. 鏈澶х數鍘嬶紙楂+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->max_vol >> 8; - data[idx++] = source->max_vol & 0xFF; + data[idx++] = mm->max_vol >> 8; + data[idx++] = mm->max_vol & 0xFF; // 4. 鐢垫祦/鍔熺巼锛堥珮+浣庯紝鐩存帴鍙栧凡鎷嗗垎濂界殑鍊硷級 - data[idx++] = source->protective_curr >> 8; - data[idx++] = source->protective_curr & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; // 5. 淇濈暀浣6瀛楄妭锛堢洿鎺ュ～0锛 memset(&data[idx], 0x00, 6); idx+=6; return idx - start_idx; // 杩斿洖濉厖鐨勬诲瓧鑺傛暟 } -int source_set_pd_com(rt_uint8_t pro,rt_uint8_t pro_gear_idx) +static rt_uint8_t chrg_source_fill_AFC_three_gears(rt_uint8_t *data, + rt_uint8_t start_idx, struct chrg_switch_t *psw) { - rt_uint16_t len = 0; - rt_uint8_t data[150] = {0}; - rt_uint8_t frame[150] = {0}; - rt_uint8_t send_len = 0; //鏁版嵁闀垮害 - rt_uint8_t max_group_idx = 0; //鎸′綅绱㈠紩 - data[0] = pro; //鍗忚 - rt_uint8_t idx = 1; - for(rt_uint8_t i = 0;isource.pd_set.mm; + rt_uint8_t idx = start_idx; + rt_uint8_t gear; - chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_SET_PROTOCOL, data, send_len, frame, &len); -// for(rt_uint8_t i=0;i> 8; + data[idx++] = fixed_voltages[gear] & 0xFF; + data[idx++] = fixed_voltages[gear] >> 8; + data[idx++] = fixed_voltages[gear] & 0xFF; + data[idx++] = mm->max_cur >> 8; + data[idx++] = mm->max_cur & 0xFF; + memset(&data[idx], 0x00, 6); + idx += 6; + } + + return idx - start_idx; } -int source_set_pd_new_com(rt_uint8_t pro, struct chrg_switch_t *pSW) +int source_set_pro(rt_uint8_t pro, struct chrg_switch_t *pSW) { rt_uint16_t len = 0; rt_uint8_t data[150] = {0}; @@ -872,19 +1287,25 @@ int source_set_pd_new_com(rt_uint8_t pro, struct chrg_switch_t *pSW) rt_uint8_t idx = 1; //浠巇ata[1]寮濮嬪～鍏 rt_uint8_t fill_len = 0; rt_uint8_t protocal = pSW->source.protocol; - if(protocal == 0x0A){ + if(protocal == PRO_PD0PSS){ fill_len = pd_fill_single_group_need_src_com(data, idx, pSW); - }else if(protocal == 0x03||protocal == 0x07||protocal == 0x08 ){ + }else if(protocal == PRO_SCPB||protocal == PRO_QC30||protocal == PRO_QC20 ||protocal == PRO_FCP ){ fill_len = pd_fill_single_group_no_src_com(data, idx, pSW); - }else if(protocal == 0x0C){ + }else if(protocal == PRO_UFCS){ fill_len = pd_fill_single_group_UFCS(data, idx, pSW); }else{ - fill_len = pd_fill_single_group_FCP_AFC(data, idx, pSW); + fill_len = chrg_source_fill_AFC_three_gears(data, idx, pSW); } idx += fill_len; send_len = idx; // 鎬诲～鍏呭瓧鑺傛暟 chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_SET_PROTOCOL, data, send_len, frame, &len); - rt_kprintf("idx = %d ",idx); +#if NORTH_SOURCE_DEBUG + rt_kprintf("source protocol frame:"); + for (rt_uint16_t i = 0; i < len; i++) { + rt_kprintf(" %02x", frame[i]); + } + rt_kprintf("\n"); +#endif // for(rt_uint8_t i=0;i1 0 0 - 0 + 1 1 4096 @@ -275,7 +275,7 @@ 1 - 0x8040000 + 0x8000000 0x40000 diff --git a/apps/chrg/codex_build.log b/apps/chrg/codex_build.log new file mode 100644 index 0000000..5b5cbf5 --- /dev/null +++ b/apps/chrg/codex_build.log @@ -0,0 +1,9 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_roll_nor.c... +linking... +Program Size: Code=146668 RO-data=15332 RW-data=9328 ZI-data=15968 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:02 diff --git a/apps/chrg/codex_low_voltage_relay_verify.log b/apps/chrg/codex_low_voltage_relay_verify.log new file mode 100644 index 0000000..7d4c47d --- /dev/null +++ b/apps/chrg/codex_low_voltage_relay_verify.log @@ -0,0 +1,9 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_sink.c... +linking... +Program Size: Code=147156 RO-data=15312 RW-data=9328 ZI-data=15984 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:02 diff --git a/apps/chrg/codex_protocol_ack_verify.log b/apps/chrg/codex_protocol_ack_verify.log new file mode 100644 index 0000000..0b3c0f9 --- /dev/null +++ b/apps/chrg/codex_protocol_ack_verify.log @@ -0,0 +1,18 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_north_pkg.c... +compiling chrg_lcd.c... +compiling chrg_thread.c... +compiling chrg_south.c... +compiling chrg_sink.c... +compiling chrg_north.c... +compiling chrg_source.c... +compiling chrg_roll_nor.c... +compiling chrg_roll_sou.c... +compiling chrg_comm.c... +linking... +Program Size: Code=146988 RO-data=15312 RW-data=9328 ZI-data=15984 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:03 diff --git a/apps/chrg/codex_soft_resume_remove.log b/apps/chrg/codex_soft_resume_remove.log new file mode 100644 index 0000000..5f103a7 --- /dev/null +++ b/apps/chrg/codex_soft_resume_remove.log @@ -0,0 +1,21 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_rel.c... +compiling chrg_vcom.c... +compiling chrg_north_pkg.c... +compiling chrg_lcd.c... +compiling chrg_thread.c... +compiling chrg_south.c... +compiling chrg_eload.c... +compiling chrg_sink.c... +compiling chrg_north.c... +compiling chrg_source.c... +compiling chrg_roll_nor.c... +compiling chrg_roll_sou.c... +compiling chrg_comm.c... +linking... +Program Size: Code=146964 RO-data=15312 RW-data=9328 ZI-data=15984 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:02 diff --git a/apps/chrg/codex_stop_current_confirm_verify.log b/apps/chrg/codex_stop_current_confirm_verify.log new file mode 100644 index 0000000..df56d49 --- /dev/null +++ b/apps/chrg/codex_stop_current_confirm_verify.log @@ -0,0 +1,21 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_vcom.c... +compiling chrg_thread.c... +compiling chrg_north_pkg.c... +compiling chrg_lcd.c... +compiling chrg_rel.c... +compiling chrg_eload.c... +compiling chrg_sink.c... +compiling chrg_south.c... +compiling chrg_source.c... +compiling chrg_north.c... +compiling chrg_roll_nor.c... +compiling chrg_roll_sou.c... +compiling chrg_comm.c... +linking... +Program Size: Code=147032 RO-data=15312 RW-data=9328 ZI-data=15984 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:03 diff --git a/apps/chrg/codex_stop_direct_verify.log b/apps/chrg/codex_stop_direct_verify.log new file mode 100644 index 0000000..53e6e21 --- /dev/null +++ b/apps/chrg/codex_stop_direct_verify.log @@ -0,0 +1,21 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_rel.c... +compiling chrg_north_pkg.c... +compiling chrg_thread.c... +compiling chrg_vcom.c... +compiling chrg_lcd.c... +compiling chrg_eload.c... +compiling chrg_sink.c... +compiling chrg_source.c... +compiling chrg_south.c... +compiling chrg_north.c... +compiling chrg_roll_nor.c... +compiling chrg_roll_sou.c... +compiling chrg_comm.c... +linking... +Program Size: Code=146976 RO-data=15312 RW-data=9328 ZI-data=15984 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:03 diff --git a/apps/chrg/codex_stop_repeat_guard_verify.log b/apps/chrg/codex_stop_repeat_guard_verify.log new file mode 100644 index 0000000..ccbd541 --- /dev/null +++ b/apps/chrg/codex_stop_repeat_guard_verify.log @@ -0,0 +1,9 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_comm.c... +linking... +Program Size: Code=147096 RO-data=15312 RW-data=9328 ZI-data=15984 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:02 diff --git a/apps/chrg/codex_verify.log b/apps/chrg/codex_verify.log new file mode 100644 index 0000000..72d757a --- /dev/null +++ b/apps/chrg/codex_verify.log @@ -0,0 +1,9 @@ +*** Using Compiler 'V6.16', folder: 'D:\keil mdk 2\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_sink.c... +linking... +Program Size: Code=147104 RO-data=15312 RW-data=9328 ZI-data=16000 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:01 diff --git a/apps/chrg/debug_hot.ini b/apps/chrg/debug_hot.ini index bccb64e..d5b340e 100644 --- a/apps/chrg/debug_hot.ini +++ b/apps/chrg/debug_hot.ini @@ -1 +1,4 @@ -LOAD %L INCREMENTAL \ No newline at end of file +LOAD %L INCREMENTAL +BS HardFault_Handler +BS rt_assert_handler +G diff --git a/apps/chrg/keil_flash.log b/apps/chrg/keil_flash.log new file mode 100644 index 0000000..69d25eb --- /dev/null +++ b/apps/chrg/keil_flash.log @@ -0,0 +1,2 @@ +Load "D:\\HUACE_Project\\3_Code\\HCDF_MID_405_Charger\\chrg_V.3.0\\apps\\chrg\\build\\keil\\Obj\\chrg.axf" +Erase Done.Programming Done.Verify OK.Flash Load finished at 18:22:08 diff --git a/apps/chrg/keil_pd_dynamic_build.log b/apps/chrg/keil_pd_dynamic_build.log new file mode 100644 index 0000000..13afe79 --- /dev/null +++ b/apps/chrg/keil_pd_dynamic_build.log @@ -0,0 +1,18 @@ +*** Using Compiler 'V6.16', folder: 'D:\Program Files\Keil_v5\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_roll_nor.c... +compiling chrg_north.c... +compiling chrg_south.c... +compiling chrg_comm.c... +compiling chrg_roll_sou.c... +compiling chrg_lcd.c... +compiling chrg_thread.c... +compiling chrg_sink.c... +compiling chrg_north_pkg.c... +compiling chrg_eload.c... +linking... +Program Size: Code=141040 RO-data=15212 RW-data=8544 ZI-data=13968 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:06 diff --git a/apps/chrg/keil_rebuild.log b/apps/chrg/keil_rebuild.log new file mode 100644 index 0000000..53f749a --- /dev/null +++ b/apps/chrg/keil_rebuild.log @@ -0,0 +1,130 @@ +*** Using Compiler 'V6.16', folder: 'D:\Program Files\Keil_v5\ARM\ARMCLANG\Bin' +Rebuild target 'chrg' +compiling main.c... +compiling chrg_switch.c... +compiling chrg_wdt.c... +compiling chrg_gpio.c... +compiling chrg_tmr.c... +compiling chrg_fal.c... +compiling chrg_tty.c... +compiling chrg_led.c... +compiling chrg_vcom.c... +compiling chrg_rel.c... +compiling chrg_roll_nor.c... +compiling chrg_north.c... +compiling chrg_south.c... +compiling chrg_comm.c... +compiling chrg_roll_sou.c... +compiling chrg_lcd.c... +compiling chrg_thread.c... +compiling chrg_source.c... +compiling chrg_sink.c... +compiling chrg_north_pkg.c... +compiling chrg_eload.c... +compiling chrg_utils.c... +compiling syscall_mem.c... +compiling syscalls.c... +compiling cctype.c... +compiling cstdlib.c... +compiling cstring.c... +compiling ctime.c... +compiling cunistd.c... +compiling cwchar.c... +compiling device.c... +compiling hwtimer.c... +compiling completion_comm.c... +compiling completion_up.c... +compiling condvar.c... +compiling dataqueue.c... +compiling pipe.c... +compiling ringblk_buf.c... +compiling ringbuffer.c... +compiling waitqueue.c... +compiling workqueue.c... +compiling dev_pin.c... +compiling dev_serial.c... +compiling dev_watchdog.c... +compiling stm32f4xx_hal_msp.c... +compiling board.c... +compiling drv_flash_f4.c... +compiling drv_gpio.c... +compiling drv_tim.c... +compiling drv_usart.c... +compiling drv_usbd.c... +compiling drv_wdt.c... +compiling drv_common.c... +compiling fal.c... +compiling fal_flash.c... +compiling fal_partition.c... +compiling fal_rtt.c... +compiling shell.c... +compiling msh_parse.c... +compiling cmd.c... +compiling msh.c... +compiling clock.c... +compiling components.c... +compiling cpu_up.c... +compiling defunct.c... +compiling idle.c... +compiling ipc.c... +compiling irq.c... +compiling kservice.c... +compiling memheap.c... +compiling mempool.c... +compiling object.c... +compiling scheduler_comm.c... +compiling scheduler_up.c... +compiling thread.c... +compiling timer.c... +compiling rt_vsnprintf_tiny.c... +compiling kerrno.c... +compiling kstring.c... +compiling rt_vsscanf.c... +compiling kstdio.c... +compiling atomic_arm.c... +compiling div0.c... +compiling showmem.c... +assembling context_rvds.S... +compiling cpuport.c... +compiling usbdevice.c... +compiling cdc_vcom.c... +compiling usbdevice_core.c... +assembling startup_stm32f405xx.s... +compiling system_stm32f4xx.c... +compiling stm32f4xx_hal_gpio.c... +compiling stm32f4xx_hal_flash.c... +compiling stm32f4xx_hal_usart.c... +compiling stm32f4xx_hal_rng.c... +compiling stm32f4xx_hal_uart.c... +compiling stm32f4xx_hal_wwdg.c... +compiling stm32f4xx_hal_tim.c... +compiling stm32f4xx_hal_cryp_ex.c... +compiling stm32f4xx_hal_pwr.c... +compiling stm32f4xx_hal_rcc.c... +compiling stm32f4xx_hal_hcd.c... +compiling stm32f4xx_ll_usb.c... +compiling stm32f4xx_hal_pccard.c... +compiling stm32f4xx_hal_flash_ex.c... +compiling stm32f4xx_hal_flash_ramfunc.c... +compiling stm32f4xx_hal_tim_ex.c... +compiling stm32f4xx_hal_lptim.c... +compiling stm32f4xx_hal_cec.c... +compiling stm32f4xx_hal_cryp.c... +compiling stm32f4xx_hal.c... +compiling stm32f4xx_hal_iwdg.c... +compiling stm32f4xx_hal_pcd_ex.c... +compiling stm32f4xx_hal_pcd.c... +compiling stm32f4xx_hal_crc.c... +compiling stm32f4xx_hal_dma_ex.c... +compiling stm32f4xx_hal_cortex.c... +compiling stm32f4xx_hal_dma.c... +compiling stm32f4xx_hal_rcc_ex.c... +compiling stm32f4xx_hal_pwr_ex.c... +compiling ulog.c... +compiling console_be.c... +linking... +Program Size: Code=139712 RO-data=15040 RW-data=8544 ZI-data=13704 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:29 diff --git a/apps/chrg/keil_sink_retry_rebuild.log b/apps/chrg/keil_sink_retry_rebuild.log new file mode 100644 index 0000000..c6f7b18 --- /dev/null +++ b/apps/chrg/keil_sink_retry_rebuild.log @@ -0,0 +1,130 @@ +*** Using Compiler 'V6.16', folder: 'D:\Program Files\Keil_v5\ARM\ARMCLANG\Bin' +Rebuild target 'chrg' +compiling main.c... +compiling chrg_switch.c... +compiling chrg_wdt.c... +compiling chrg_gpio.c... +compiling chrg_tmr.c... +compiling chrg_fal.c... +compiling chrg_tty.c... +compiling chrg_led.c... +compiling chrg_vcom.c... +compiling chrg_rel.c... +compiling chrg_roll_nor.c... +compiling chrg_north.c... +compiling chrg_south.c... +compiling chrg_comm.c... +compiling chrg_roll_sou.c... +compiling chrg_lcd.c... +compiling chrg_thread.c... +compiling chrg_source.c... +compiling chrg_sink.c... +compiling chrg_north_pkg.c... +compiling chrg_eload.c... +compiling chrg_utils.c... +compiling syscall_mem.c... +compiling syscalls.c... +compiling cctype.c... +compiling cstdlib.c... +compiling cstring.c... +compiling ctime.c... +compiling cunistd.c... +compiling cwchar.c... +compiling device.c... +compiling hwtimer.c... +compiling completion_comm.c... +compiling completion_up.c... +compiling condvar.c... +compiling dataqueue.c... +compiling pipe.c... +compiling ringblk_buf.c... +compiling ringbuffer.c... +compiling waitqueue.c... +compiling workqueue.c... +compiling dev_pin.c... +compiling dev_serial.c... +compiling dev_watchdog.c... +compiling stm32f4xx_hal_msp.c... +compiling board.c... +compiling drv_flash_f4.c... +compiling drv_gpio.c... +compiling drv_tim.c... +compiling drv_usart.c... +compiling drv_usbd.c... +compiling drv_wdt.c... +compiling drv_common.c... +compiling fal.c... +compiling fal_flash.c... +compiling fal_partition.c... +compiling fal_rtt.c... +compiling shell.c... +compiling msh_parse.c... +compiling cmd.c... +compiling msh.c... +compiling clock.c... +compiling components.c... +compiling cpu_up.c... +compiling defunct.c... +compiling idle.c... +compiling ipc.c... +compiling irq.c... +compiling kservice.c... +compiling memheap.c... +compiling mempool.c... +compiling object.c... +compiling scheduler_comm.c... +compiling scheduler_up.c... +compiling thread.c... +compiling timer.c... +compiling rt_vsnprintf_tiny.c... +compiling kerrno.c... +compiling kstring.c... +compiling rt_vsscanf.c... +compiling kstdio.c... +compiling atomic_arm.c... +compiling div0.c... +compiling showmem.c... +assembling context_rvds.S... +compiling cpuport.c... +compiling usbdevice.c... +compiling cdc_vcom.c... +compiling usbdevice_core.c... +assembling startup_stm32f405xx.s... +compiling system_stm32f4xx.c... +compiling stm32f4xx_hal_gpio.c... +compiling stm32f4xx_hal_flash.c... +compiling stm32f4xx_hal_usart.c... +compiling stm32f4xx_hal_rng.c... +compiling stm32f4xx_hal_uart.c... +compiling stm32f4xx_hal_wwdg.c... +compiling stm32f4xx_hal_tim.c... +compiling stm32f4xx_hal_cryp_ex.c... +compiling stm32f4xx_hal_pwr.c... +compiling stm32f4xx_hal_rcc.c... +compiling stm32f4xx_hal_hcd.c... +compiling stm32f4xx_ll_usb.c... +compiling stm32f4xx_hal_pccard.c... +compiling stm32f4xx_hal_flash_ex.c... +compiling stm32f4xx_hal_flash_ramfunc.c... +compiling stm32f4xx_hal_tim_ex.c... +compiling stm32f4xx_hal_lptim.c... +compiling stm32f4xx_hal_cec.c... +compiling stm32f4xx_hal_cryp.c... +compiling stm32f4xx_hal.c... +compiling stm32f4xx_hal_iwdg.c... +compiling stm32f4xx_hal_pcd_ex.c... +compiling stm32f4xx_hal_pcd.c... +compiling stm32f4xx_hal_crc.c... +compiling stm32f4xx_hal_dma_ex.c... +compiling stm32f4xx_hal_cortex.c... +compiling stm32f4xx_hal_dma.c... +compiling stm32f4xx_hal_rcc_ex.c... +compiling stm32f4xx_hal_pwr_ex.c... +compiling ulog.c... +compiling console_be.c... +linking... +Program Size: Code=140360 RO-data=15152 RW-data=8544 ZI-data=13712 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:29 diff --git a/apps/chrg/keil_trace_build.log b/apps/chrg/keil_trace_build.log new file mode 100644 index 0000000..d96d67b --- /dev/null +++ b/apps/chrg/keil_trace_build.log @@ -0,0 +1,130 @@ +*** Using Compiler 'V6.16', folder: 'D:\Program Files\Keil_v5\ARM\ARMCLANG\Bin' +Rebuild target 'chrg' +compiling main.c... +compiling chrg_switch.c... +compiling chrg_wdt.c... +compiling chrg_gpio.c... +compiling chrg_tmr.c... +compiling chrg_fal.c... +compiling chrg_tty.c... +compiling chrg_led.c... +compiling chrg_vcom.c... +compiling chrg_rel.c... +compiling chrg_roll_nor.c... +compiling chrg_north.c... +compiling chrg_south.c... +compiling chrg_comm.c... +compiling chrg_roll_sou.c... +compiling chrg_lcd.c... +compiling chrg_thread.c... +compiling chrg_source.c... +compiling chrg_sink.c... +compiling chrg_north_pkg.c... +compiling chrg_eload.c... +compiling chrg_utils.c... +compiling syscall_mem.c... +compiling syscalls.c... +compiling cctype.c... +compiling cstdlib.c... +compiling cstring.c... +compiling ctime.c... +compiling cunistd.c... +compiling cwchar.c... +compiling device.c... +compiling hwtimer.c... +compiling completion_comm.c... +compiling completion_up.c... +compiling condvar.c... +compiling dataqueue.c... +compiling pipe.c... +compiling ringblk_buf.c... +compiling ringbuffer.c... +compiling waitqueue.c... +compiling workqueue.c... +compiling dev_pin.c... +compiling dev_serial.c... +compiling dev_watchdog.c... +compiling stm32f4xx_hal_msp.c... +compiling board.c... +compiling drv_flash_f4.c... +compiling drv_gpio.c... +compiling drv_tim.c... +compiling drv_usart.c... +compiling drv_usbd.c... +compiling drv_wdt.c... +compiling drv_common.c... +compiling fal.c... +compiling fal_flash.c... +compiling fal_partition.c... +compiling fal_rtt.c... +compiling shell.c... +compiling msh_parse.c... +compiling cmd.c... +compiling msh.c... +compiling clock.c... +compiling components.c... +compiling cpu_up.c... +compiling defunct.c... +compiling idle.c... +compiling ipc.c... +compiling irq.c... +compiling kservice.c... +compiling memheap.c... +compiling mempool.c... +compiling object.c... +compiling scheduler_comm.c... +compiling scheduler_up.c... +compiling thread.c... +compiling timer.c... +compiling rt_vsnprintf_tiny.c... +compiling kerrno.c... +compiling kstring.c... +compiling rt_vsscanf.c... +compiling kstdio.c... +compiling atomic_arm.c... +compiling div0.c... +compiling showmem.c... +assembling context_rvds.S... +compiling cpuport.c... +compiling usbdevice.c... +compiling cdc_vcom.c... +compiling usbdevice_core.c... +assembling startup_stm32f405xx.s... +compiling system_stm32f4xx.c... +compiling stm32f4xx_hal_gpio.c... +compiling stm32f4xx_hal_flash.c... +compiling stm32f4xx_hal_usart.c... +compiling stm32f4xx_hal_rng.c... +compiling stm32f4xx_hal_uart.c... +compiling stm32f4xx_hal_wwdg.c... +compiling stm32f4xx_hal_tim.c... +compiling stm32f4xx_hal_cryp_ex.c... +compiling stm32f4xx_hal_pwr.c... +compiling stm32f4xx_hal_rcc.c... +compiling stm32f4xx_hal_hcd.c... +compiling stm32f4xx_ll_usb.c... +compiling stm32f4xx_hal_pccard.c... +compiling stm32f4xx_hal_flash_ex.c... +compiling stm32f4xx_hal_flash_ramfunc.c... +compiling stm32f4xx_hal_tim_ex.c... +compiling stm32f4xx_hal_lptim.c... +compiling stm32f4xx_hal_cec.c... +compiling stm32f4xx_hal_cryp.c... +compiling stm32f4xx_hal.c... +compiling stm32f4xx_hal_iwdg.c... +compiling stm32f4xx_hal_pcd_ex.c... +compiling stm32f4xx_hal_pcd.c... +compiling stm32f4xx_hal_crc.c... +compiling stm32f4xx_hal_dma_ex.c... +compiling stm32f4xx_hal_cortex.c... +compiling stm32f4xx_hal_dma.c... +compiling stm32f4xx_hal_rcc_ex.c... +compiling stm32f4xx_hal_pwr_ex.c... +compiling ulog.c... +compiling console_be.c... +linking... +Program Size: Code=139960 RO-data=15064 RW-data=8544 ZI-data=13704 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:27 diff --git a/apps/chrg/keil_trace_build2.log b/apps/chrg/keil_trace_build2.log new file mode 100644 index 0000000..37fa659 --- /dev/null +++ b/apps/chrg/keil_trace_build2.log @@ -0,0 +1,9 @@ +*** Using Compiler 'V6.16', folder: 'D:\Program Files\Keil_v5\ARM\ARMCLANG\Bin' +Build target 'chrg' +compiling chrg_north.c... +linking... +Program Size: Code=140256 RO-data=15160 RW-data=8544 ZI-data=13704 +FromELF: creating hex file... +After Build - User command #1: fromelf --bin .\build\keil\Obj\chrg.axf -o build/chrg.bin +".\build\keil\Obj\chrg.axf" - 0 Error(s), 0 Warning(s). +Build Time Elapsed: 00:00:02 diff --git a/docs/2026-07-21-source-state-machine-remediation-plan.md b/docs/2026-07-21-source-state-machine-remediation-plan.md new file mode 100644 index 0000000..43f98d0 --- /dev/null +++ b/docs/2026-07-21-source-state-machine-remediation-plan.md @@ -0,0 +1,121 @@ +# Source 鐘舵佹満鏀归犱笌瑙掕壊鍒囨崲缁存姢璁″垝 + +## 1. 鏀归犵洰鏍 + +灏嗙數婧愶紙Source锛夋帶鍒舵暣鐞嗕负涓庤礋杞斤紙Sink锛夌被浼肩殑鐙珛鐘舵佹満锛屼絾淇濈暀涓よ呬笟鍔″樊寮傦細 + +- 鍖楀悜鍗忚鏉垮彧璐熻矗瑙掕壊/CC 绾块夋嫨銆佸崗璁缃強鍛ㄦ湡璇诲彇鍗忚鏉跨數鍘嬬數娴併 +- 鍔熺巼鏉胯鑹层佹ā寮忋佺數鍘嬨佺數娴併佺户鐢靛櫒鍜屽惎鍋滃叏閮ㄧ敱 `chrg_source.c` 绠＄悊銆 +- 鎵鏈 Source 鍗楀悜瀵勫瓨鍣ㄥ懡浠ょ粺涓浣跨敤 `chrg_sou_com_batch_submit()`锛屼笉鍐嶆暎钀借皟鐢 `chrg_set_sou_reg()`銆 +- Source 涓嶅垽鏂甫杞界數娴併傚崗璁澘杩斿洖鐢靛帇鏈夋晥鍒欒繘鍏 `RUNNING`锛涘惎鍔ㄥ悗鎸佺画鏃犵數鍘嬪垯鍥炲埌 `WAIT`銆 +- 鍗忚銆佸崗璁數鍘嬫垨鍗忚鐢垫祦鍙戠敓鍙樺寲鏃讹紝閲嶆柊杩涘叆 `INIT`銆 +- Source/Sink 涓嶅仠鏈哄垏鎹㈡椂锛屽繀椤诲厛鍋滄鏃ц鑹诧紝纭瀹屾垚鍚庡啀鍒濆鍖栨柊瑙掕壊銆 + +## 2. 褰撳墠宸插畬鎴愮殑淇敼 + +褰撳墠宸ヤ綔鍖哄凡瀹屾垚绗竴闃舵锛屽皻鏈舰鎴愬畬鏁寸姸鎬佹満锛 + +1. `apps/chrg/applications/utils/chrg_source.c` + - 鏂板 `chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)`銆 + - 閫氳繃涓涓壒娆′笅鍙 `REG_ELOAD`銆乣REG_MODE`銆乣REG_VOLTAGE_OUT + 1`銆乣REG_CURRENT_OUT + 1` 鍜 `REG_WORK = WORK_STOP`銆 +2. `apps/chrg/applications/utils/chrg_source.h` + - 澧炲姞涓婅堪鍑芥暟澹版槑銆 +3. `apps/chrg/applications/thread/chrg_roll_nor.c` + - Source 鍗忚璁剧疆娴佺▼杩涘叆 `IDX_GET_SOURCE_VC` 鍚庢彁浜ゅ崡鍚戝垵濮嬪寲鎵规銆 + - 浠呭綋鎵规鎻愪氦鎴愬姛鏃惰缃 `source.On_Flag = 1`銆 + +娉ㄦ剰锛氬綋鍓嶄粛鏈夋棫 Source 璺緞鍦 `chrg_north.c`銆乣chrg_roll_nor.c` 鍜 `chrg_lcd.c` 涓洿鎺ヨ皟鐢 `chrg_set_sou_reg()`銆傚湪瀹屾垚鍚庣画姝ラ鍓嶏紝鏂版棫閫昏緫浼氬悓鏃跺瓨鍦紝涓嶈兘浣滀负鏈缁堢増鏈彂甯冦 + +## 3. 鐩爣鐘舵佹満 + +鍦 `chrg_source.h` 涓鍔犳槑纭殑 Source 鐘舵侊細 + +```c +typedef enum { + SOURCE_WORK_STOP = 0, + SOURCE_WORK_WAIT, + SOURCE_WORK_INIT, + SOURCE_WORK_START, + SOURCE_WORK_RUNNING, + SOURCE_WORK_STOPPING, + SOURCE_WORK_FAULT +} source_work_mode_t; +``` + +鍦 `chrg_src_t` 涓鍔犳瘡閫氶亾鐘舵佸強鍙傛暟蹇収锛歚work_mode`銆乣last_protocol`銆乣last_voltage`銆乣last_current`銆乣zero_volt_count`銆乣retry_count`銆傚弬鏁板揩鐓у彧鑳藉湪瀵瑰簲鍛戒护纭瀹屾垚鍚庢洿鏂般 + +鐘舵佸姩浣滐細 + +| 鐘舵 | 鍔ㄤ綔 | 鍚庣画鐘舵 | +|---|---|---| +| `INIT` | 鎵归噺璁剧疆 Source 瑙掕壊銆佹ā寮忋佺數鍘嬨佺數娴佸強缁х數鍣紝淇濇寔鍋滄 | `START` | +| `START` | 鎵归噺涓嬪彂 `REG_WORK = WORK_START` | `WAIT` | +| `WAIT` | 鍖楀悜鍛ㄦ湡璇诲彇鍗忚鏉 VC | 鏈夌數鍘嬭繘鍏 `RUNNING` | +| `RUNNING` | 鏇存柊 VC锛涙娴嬪崗璁/鐢靛帇/鐢垫祦鍙樺寲 | 鍙樺寲杩涘叆 `INIT` | +| `STOPPING` | 鎵归噺鍋滄杈撳嚭銆佸叧闂姛鐜囨澘缁х數鍣 | `STOP` | +| `STOP` | 娓呯悊浣胯兘骞舵柇寮鍖楀悜缁х數鍣 | 淇濇寔 | + +寤鸿鐢靛帇澶т簬 `WORK_MIN_VOLT` 鍗宠涓烘湁鏁堛傜數鍘嬩负闆惰繛缁 3 娆″啀鐢 `RUNNING` 鍥炲埌 `WAIT`锛岄伩鍏嶅崟甯у紓甯搁犳垚鐘舵佹姈鍔ㄣ + +## 4. COM 绔敼閫 + +淇敼 `chrg_mb_write_sys()`锛 + +- 褰撶洰鏍囪鑹蹭负 Source 涓斿綋鍓嶆湭宸ヤ綔鏃讹紝鍙缃 `pSW->sub = IDX_SET_SOURCE_CC_SET`锛岀敱鍖楀悜渚濇瀹屾垚 CC 鍜屽崗璁缃紱鍗忚搴旂瓟瀹屾垚鍚庢墠杩涘叆 `SOURCE_WORK_INIT`銆 +- 鍚岃鑹蹭笅锛屾瘮杈冨崗璁佸崗璁數鍘嬨佸崗璁數娴併備换涓鍙樺寲鍒欒繘鍏 `SOURCE_WORK_INIT`锛涚浉鍚屽弬鏁颁笉寰楅噸澶嶅垵濮嬪寲銆 +- 涓嶈鍦ㄦ敹鍒 `SYS_REG_ROLE_SWITCH` 鏃剁珛鍗宠鐩栧疄闄呰鑹层傚簲淇濆瓨 `target_role`锛屽湪鍙傛暟鐢熸晥鏃跺惎鍔ㄥ垏鎹㈡祦绋嬨 +- 鍒囨崲鏈熼棿杩斿洖 `MB_EX_SLAVE_BUSY`锛屾垨鑰呭彧鏇存柊褰卞瓙鍙傛暟骞剁瓑寰呮湰娆″垏鎹㈠畬鎴愩 + +瑙掕壊鍒囨崲椤哄簭锛 + +```text +Source -> Sink: Source STOPPING -> STOP -> 鍒囨崲瑙掕壊/缁х數鍣 -> Sink INIT +Sink -> Source: Sink STOP -> 鍒囨崲瑙掕壊/缁х數鍣 -> 鍖楀悜 CC/鍗忚 -> Source INIT +``` + +绂佹 Source 鍜 Sink 鐨勫姛鐜囨澘缁х數鍣ㄣ佸伐浣滃懡浠ゅ湪鍚屼竴閫氶亾鍚屾椂鏈夋晥銆 + +## 5. 鍖楀悜娴佺▼鏀归 + +绮剧畝 `chrg_roll_nor_set()` 鐨 Source 鍒嗘敮锛屽彧淇濈暀锛 + +1. `IDX_SET_SOURCE_CC_SET`锛氳缃 CC 绾匡紝鎴愬姛鍚庤繘鍏 `IDX_SET_SOURCE_PD`銆 +2. `IDX_SET_SOURCE_PD`锛氳缃崗璁紝搴旂瓟鎴愬姛鍚庤缃 `SOURCE_WORK_INIT`銆 +3. `IDX_GET_SOURCE_VC`锛氳鍙栧崗璁澘鐢靛帇鐢垫祦銆 + +鍒犻櫎 Source 鍒嗘敮涓殑 `IDX_SET_SOURCE_ID`銆乣IDX_SET_SOURCE_CV`銆乣IDX_SER_SOURCE_VOLT`銆乣IDX_SER_SOURCE_CURR`銆乣IDX_SET_SOURCE_WORK` 鍗楀悜璁剧疆鍔ㄤ綔銆傛牎鍑嗐佹帶鍒跺彴鍜 Sink 鍒嗘敮涓嶅湪鏈鑼冨洿鍐呫 + +`chrg_north.c` 鍙В鏋 Source VC锛氭洿鏂 `source.vc`銆乣Now_voltage`銆乣Now_current`锛屽苟鏍规嵁鐢靛帇鎺ㄨ繘 `WAIT/RUNNING`銆傜Щ闄 `chrg_source_standard_output()`銆乣chrg_source_fast_output()` 鍜屾棫鐨勫垎姝ュ仠鏈烘帶鍒讹紝閬垮厤瑙ｆ瀽鍑芥暟鐩存帴涓嬪彂鍗楀悜鍛戒护銆 + +## 6. 鍗楀悜瀹屾垚纭 + +`chrg_sou_com_batch_submit()` 杩斿洖鎴愬姛浠呰〃绀哄叆闃熸垚鍔燂紝涓嶈〃绀哄姛鐜囨澘宸茬粡鎵ц銆傞渶瑕佷负姣忛氶亾澧炲姞鎵规瀹屾垚搴忓彿鎴栧畬鎴愪簨浠讹細 + +- `INIT` 鎵规鍏ㄩ儴搴旂瓟鍖归厤鍚庢墠鑳借繘鍏 `START`銆 +- `START` 搴旂瓟鎴愬姛鍚庢墠鑳借繘鍏 `WAIT`銆 +- `STOPPING` 鎵规瀹屾垚鍚庢墠鑳芥柇寮鍖楀悜缁х數鍣ㄥ拰淇敼瀹為檯瑙掕壊銆 +- CRC 閿欒銆佸瘎瀛樺櫒涓嶅尮閰嶆垨瓒呮椂涓嶅緱鎺ㄨ繘鐘舵侊紱杈惧埌閲嶈瘯涓婇檺鍚庤繘鍏 `FAULT`銆 + +## 7. 鎺ㄨ崘瀹炴柦椤哄簭 + +1. 澧炲姞 Source 鐘舵佹灇涓俱佸弬鏁板揩鐓у強 `chrg_source_work()`銆 +2. 灏 INIT銆丼TART銆丼TOPPING 鐨勫崡鍚戝姩浣滃叏閮ㄨ縼绉诲埌 `chrg_source.c`銆 +3. 澧炲姞鍗楀悜鎵规瀹屾垚閫氱煡锛屽啀鏀逛负搴旂瓟椹卞姩鐘舵佽浆鎹€ +4. 绮剧畝鍖楀悜 Source 瀛愮姸鎬侊紝鍙繚鐣 CC銆佸崗璁拰 VC銆 +5. 淇敼 COM 鍚岃鑹插弬鏁板樊寮傚強璺ㄨ鑹插垏鎹€ +6. 娓呯悊 `chrg_lcd.c` 涓噸澶嶇殑 Source 鍚仠鍜岃鑹插瘎瀛樺櫒鍐欏叆銆 +7. 缂栬瘧骞跺湪纭欢楠岃瘉鍚庡垹闄ゆ棫瀛楁鍜屾棫鍑芥暟銆 + +## 8. 楠岃瘉娓呭崟 + +- Keil 缂栬瘧 `apps/chrg/chrg.uvprojx`锛岀‘璁ゆ棤鏈畾涔夌鍙峰拰澶存枃浠跺惊鐜緷璧栥 +- 鍗曢氶亾楠岃瘉 Source 棣栨鍚姩銆佸仠姝€佺浉鍚屽弬鏁伴噸澶嶇敓鏁堛 +- 鍒嗗埆鏀瑰彉鍗忚銆佸崗璁數鍘嬪拰鍗忚鐢垫祦锛岀‘璁ゅ彧鎵ц涓娆￠噸鏂 INIT銆 +- 妯℃嫙鍗忚鏉跨數鍘嬫寔缁负闆讹紝纭杩涘叆 WAIT 涓斾笉浼氬弽澶嶆彁浜ょ浉鍚屾壒娆° +- 楠岃瘉 Source -> Sink銆丼ink -> Source锛岀ず娉㈠櫒纭鍒囨崲鏈熼棿鏃犺緭鍑洪噸鍙犮 +- 鍥涢氶亾鍚屾椂杩愯骞朵氦鍙夊垏鎹紝妫鏌ュ崡鍚戦槦鍒楅ゥ楗裤佸搷搴旈敊閰嶃佽秴鏃跺拰缂撳瓨涓查氶亾銆 +- 鍥炲綊 Sink 姝ｅ父璐熻浇銆佸姩鎬佹祴璇曘佹棤鐢垫祦閲嶅惎鍙婁綆鍘嬪鐞嗐 + +## 9. 鎺ユ墜娉ㄦ剰浜嬮」 + +寮濮嬩慨鏀瑰墠鍏堟墽琛 `git status --short` 鍜 `git diff`銆傚綋鍓 `chrg_north.c` 杩樺寘鍚鍓 Sink 杩炵画纭娆℃暟鏀逛负 3 鐨勪慨鏀瑰強娉ㄩ噴娓呯悊锛屼笉鑳藉湪 Source 閲嶆瀯鏃跺洖閫銆備笉瑕佹彁浜 Keil `build/`銆乣Obj/`銆丄XF銆丅IN 鎴 MAP 绛夌敓鎴愭枃浠躲 diff --git a/docs/2026-07-30-source-cc-close-protocol-switch.md b/docs/2026-07-30-source-cc-close-protocol-switch.md new file mode 100644 index 0000000..924f571 --- /dev/null +++ b/docs/2026-07-30-source-cc-close-protocol-switch.md @@ -0,0 +1,101 @@ +# Source CC_CLOSE 鍗忚鍒囨崲淇敼璇存槑 + +## 淇敼鐩爣 + +淇 Source 鍖楀悜鍗忚鏉跨殑鍛戒护椤哄簭锛岄伩鍏嶅湪 CC 淇濇寔 Attached 鏃剁洿鎺ラ噸閰 +`0xD0`銆傚閫氶亾鍚屾椂鍒囨崲鏃堕噰鐢ㄥ叡浜瓑寰呭睆闅滐紝浣夸繚鎶ゆ椂闂村苟琛屽彂鐢燂紝涓嶆寜 +閫氶亾涓茶绱銆 + +## 鏈疆瀹炴柦姝ラ + +### 绗竴姝ワ細缁熶竴鐘舵佸懡鍚 + +鏂紑 CC 鐨勫懡浠ょ姸鎬佸懡鍚嶄负 `IDX_SET_SOURCE_CC_CLOSE`锛岀瓑寰呯姸鎬佸懡鍚嶄负 +`IDX_WAIT_SOURCE_CC_CLOSE`銆俙CC_CLOSE` 鍥哄畾鍙戦 `0x17=0x03`锛屼笉瑕嗙洊 +COM 淇濆瓨鐨勭洰鏍 `CC_Set`銆 + +### 绗簩姝ワ細璋冩暣鍋滄鎬佸惎鍔ㄩ『搴 + +Source 浠庡仠姝㈢姸鎬佸惎鍔ㄤ互鍙 Sink 鍒囨崲涓 Source 鏃讹紝涓嶅彂閫 `CC_CLOSE`锛 +鐩存帴鎸変互涓嬮『搴忔墽琛岋細 + +```text +IDX_SET_SOURCE_PD +-> IDX_WAIT_SOURCE_PROTOCOL +-> IDX_SET_SOURCE_CC_SET +-> IDX_GET_SOURCE_VC +``` + +鍗冲厛璁剧疆鍗忚锛屾敹鍒 `0xD0` ACK 骞跺畬鎴愪繚鎶ょ瓑寰呭悗锛屽啀杩炴帴鐩爣 CC銆 + +### 绗笁姝ワ細璇嗗埆蹇呴』鏂紑 CC 鐨勫垏鎹 + +COM 鍙傛暟鐢熸晥鏃讹紝婊¤冻浠ヤ笅浠讳竴鏉′欢杩涘叆 `CC_CLOSE`锛 + +- 鏂板崗璁负 PD/PPS 鎴 PD3.1/AVS锛屽苟涓斿崗璁垨 CC 绾夸笌涓婃涓嶅悓銆 +- 涓婃鍗忚涓 PD/PPS 鎴 PD3.1/AVS锛屾湰娆″垏鎹负闈 PD 鍗忚銆 + +鍏跺畠鍗忚閰嶇疆鍙樺寲浠 `IDX_SET_SOURCE_PD` 寮濮嬨傛爣鍑嗗崗璁粎鏀瑰彉鐢靛帇銆佺數娴 +鏃剁洿鎺ユ洿鏂板姛鐜囨澘锛屼笉閲嶅涓嬪彂 `0xD0`銆 + +### 绗洓姝ワ細鎵ц CC_CLOSE 鍛戒护閾 + +COM鍏堢‘瀹氬寳鍚慲sub`锛屽崗璁垨CC鍙戠敓鍙樺寲鏃惰繘鍏 +`SOURCE_WORK_PROTOCOL_SWITCH`锛屼笉鍦–OM涓皟鐢ㄥ彂閫佸嚱鏁般傚寳鍚戣疆璇㈢嚎绋 +鎵ц璇ource宸ヤ綔鐘舵侊紝璐熻矗鍚戝崡鍚戝姛鐜囨澘鍐欏叆0V锛涙爣鍑嗗崗璁繕浼氬湪鍚屼竴鎵 +鍛戒护涓緷娆″啓妯″紡鍜岀數娴併傛彁浜ゆ垚鍔熷悗娓呴浂`set_volt`骞惰繘鍏 +`SOURCE_WORK_WAIT`锛岄殢鍚庢寜宸茬粡閫夊畾鐨刞sub`缁х画鎵ц銆 + +闇瑕佹柇寮 CC 鐨勯氶亾鎸変互涓嬮『搴忔墽琛岋細 + +```text +IDX_SET_SOURCE_CC_CLOSE 鍙戦 0x17=0x03 +-> IDX_WAIT_SOURCE_CC_CLOSE 绛夊緟鍏变韩淇濇姢鏃堕棿 +-> IDX_SET_SOURCE_PD 鍙戦 0xD0 +-> IDX_WAIT_SOURCE_PROTOCOL 绛夊緟鍗忚 ACK 鍚庝繚鎶ゆ椂闂 +-> IDX_SET_SOURCE_CC_SET 鍙戦 0x17=鐩爣 CC +-> IDX_GET_SOURCE_VC 鎭㈠ 0x20 鏌ヨ +``` + +姣忔潯璁剧疆鍛戒护浠嶉渶鏀跺埌瑙掕壊銆佸懡浠ゃ侀暱搴﹀拰 CRC 鍧囨纭殑鍥炵爜鍚庢墠鑳芥帹杩 +`sub`锛涢敊璇洖鐮佺户缁部鐢ㄧ幇鏈変涪寮冨拰鏈夐檺閲嶅彂閫昏緫銆 + +### 绗簲姝ワ細澶氶氶亾鍏变韩 CC_CLOSE 绛夊緟 + +浣跨敤 `pending_mask` 鍜 `acked_mask` 绠＄悊鏈疆鍙備笌鍒囨崲鐨 Source 閫氶亾銆 +鎵鏈夊凡鐧昏閫氶亾閮芥敹鍒 `0x17` ACK 鍚庯紝鍙惎鍔ㄤ竴娆 300 ms 淇濇姢绛夊緟銆 +涓涓氶亾鍜屽洓涓氶亾鐨勪繚鎶ょ瓑寰呮湰韬潎涓 300 ms锛涘洓閫氶亾鍙澶栦骇鐢熷繀瑕佺殑 +鍛戒护鏀跺彂鏃堕棿锛屼笉浼氱疮璁′负鍥涙 300 ms銆 + +### 绗叚姝ワ細鎻℃墜绋冲畾纭锛堟湰杞笉淇敼锛 + +鏈疆涓嶅鍔犫滆繛缁袱娆 `0x20` 鐢靛帇绋冲畾鍚庢墠杩涘叆 RUNNING鈥濈殑鏂伴昏緫锛岀户缁 +浣跨敤鐜版湁 `chrg_source_parse()` 鐢靛帇璇樊鍜岄噸璇曡鍒欍 + +### 绗竷姝ワ細閰嶇疆瑕嗙洊淇濇姢 + +缁х画浣跨敤 `config_version` 闃叉 COM 鏂伴厤缃鏃у洖鐮佹帹杩涖傚仠姝€佽鑹插垏鎹 +鎴栦笉鍐嶉渶瑕 `CC_CLOSE` 鏃讹紝浼氭妸閫氶亾绉诲嚭鍏变韩绛夊緟灞忛殰锛岄伩鍏嶆畫鐣欑姸鎬佸奖鍝 +涓嬩竴娆″惎鍔ㄣ + +### 绗叓姝ワ細瀹屾暣澶辫触鎭㈠锛堟湰杞笉淇敼锛 + +鏈疆涓嶅鍔犳彙鎵嬫昏秴鏃躲佸啀娆 detach銆佹暣濂楁祦绋嬫渶澶氶噸璇曚袱杞互鍙婃晠闅滀笂鎶ャ +鍗曟潯鍖楀悜鍛戒护浠嶄娇鐢ㄧ幇鏈夌殑涓夋鍙戦佹満鍒躲傚畬鏁存仮澶嶆祦绋嬪緟鍗曠嫭楠岃瘉鍚庡疄鏂姐 + +## 鏃堕棿鍙傛暟 + +| 鍙傛暟 | 褰撳墠鍊 | 璇存槑 | +|---|---:|---| +| `SOURCE_CC_CLOSE_WAIT_MS` | 300 ms | 浠庢湰杞渶鍚庝竴涓湁鏁 `CC_CLOSE` ACK 寮濮 | +| `SOURCE_PROTOCOL_WAIT_MS` | 100 ms | 姣忛氶亾鏀跺埌 `0xD0` ACK 鍚庡苟琛岀瓑寰 | +| `NORTH_RESPONSE_TIMEOUT_MS` | 50 ms | 鍗曟鍖楀悜鍥炵爜绛夊緟 | +| `NORTH_REQUEST_MAX_RETRIES` | 2 | 棣栨鍙戦佸鏈澶氶噸鍙戜袱娆 | + +## 寤鸿楠岃瘉椤哄簭 + +1. 鍗曢氶亾鍋滄鎬佸惎鍔 PD锛岀‘璁ゅ彂閫侀『搴忎负 `D0 -> 17(鐩爣CC) -> 20`銆 +2. 鍗曢氶亾 PD 鏀瑰崗璁垨 CC锛岀‘璁ら『搴忎负 `17(03) -> 绛夊緟 -> D0 -> 17(鐩爣CC) -> 20`銆 +3. 鍗曢氶亾 PD 鍒囨崲 QC/FCP/鏍囧噯锛岀‘璁ゅ垏鎹㈠墠鍏堝彂閫 `17(03)`銆 +4. 鍥涢氶亾杩炵画鐢熸晥锛岀‘璁ゅ洓璺 `17(03)` 鍧囧洖鐮佸悗鍏变韩涓娆＄害 300 ms 绛夊緟銆 +5. 杩炵画鎵ц 20 鑷 30 杞崗璁垏鎹紝妫鏌ユ槸鍚︿粛鍑虹幇 Source 鑺墖 PD 鐘舵佸紓甯搞 diff --git a/docs/Allegro.jrl b/docs/Allegro.jrl new file mode 100644 index 0000000..b56c5ce --- /dev/null +++ b/docs/Allegro.jrl @@ -0,0 +1,2519 @@ +\t (00:00:05) Allegro 17.2 S079 Windows SPB 64-bit Edition +\t (00:00:05) Journal start - Tue Aug 25 19:43:26 2026 +\t (00:00:05) Host=DESKTOP-5RA9F3K User=Adminuser Pid=39932 CPUs=20 +\t (00:00:05) CmdLine= D:\Cadence\SPB_17.2\tools\bin\Allegro.exe D:\HC-PMP-SW\Power_ControlPannel\MP_Control_sw_405\MP_SW_Chrg\chrg\docs\HC_DFCD_Protocol_V3_0.brd +\t (00:00:05) + (00:00:05) Loading axlcore.cxt +\t (00:00:06) Opening existing design... +\i (00:00:06) QtSignal SPBFoldDockArea FoldAreaTabWidget currentChanged HC_DFCD_Protocol_V3_0 +\d (00:00:06) Design opened: D:/HC-PMP-SW/Power_ControlPannel/MP_Control_sw_405/MP_SW_Chrg/chrg/docs/HC_DFCD_Protocol_V3_0.brd +\i (00:00:06) trapsize 8975 +\i (00:00:06) trapsize 9251 +\i (00:00:06) trapsize 9375 +\i (00:00:07) trapsize 8018 +\i (00:00:07) trapsize 8018 +\i (00:00:07) generaledit +\i (00:00:10) zoom out 1 +\i (00:00:10) setwindow pcb +\i (00:00:10) zoom out 138.1616 64.8823 +\i (00:00:10) trapsize 16037 +\i (00:00:10) zoom out 1 +\i (00:00:10) setwindow pcb +\i (00:00:10) zoom out 201.4873 63.2786 +\i (00:00:10) trapsize 32073 +\i (00:00:10) zoom out 1 +\i (00:00:10) setwindow pcb +\i (00:00:10) zoom out 502.3331 132.2094 +\i (00:00:10) trapsize 64146 +\i (00:00:11) zoom in 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom in -32.0050 32.1412 +\i (00:00:11) trapsize 32073 +\i (00:00:11) zoom in 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom in -32.0050 32.1412 +\i (00:00:11) trapsize 16037 +\i (00:00:11) zoom in 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom in -32.0049 32.1412 +\i (00:00:11) trapsize 8018 +\i (00:00:11) zoom in 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom in -32.8068 31.0187 +\i (00:00:11) trapsize 4009 +\i (00:00:11) zoom out 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom out 8.5676 58.6818 +\i (00:00:11) trapsize 8018 +\i (00:00:11) zoom out 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom out 8.4072 58.2007 +\i (00:00:11) trapsize 16037 +\i (00:00:11) zoom in 1 +\i (00:00:11) setwindow pcb +\i (00:00:11) zoom in 80.5716 56.2764 +\i (00:00:11) trapsize 8018 +\i (00:00:12) zoom out 1 +\i (00:00:12) setwindow pcb +\i (00:00:12) zoom out 26.5284 75.0392 +\i (00:00:12) trapsize 16037 +\i (00:00:13) zoom in 1 +\i (00:00:13) setwindow pcb +\i (00:00:13) zoom in 7.2846 90.8350 +\i (00:00:13) trapsize 8018 +\i (00:00:13) zoom in 1 +\i (00:00:13) setwindow pcb +\i (00:00:13) zoom in 7.2846 90.8350 +\i (00:00:13) trapsize 4009 +\i (00:00:14) zoom out 1 +\i (00:00:14) setwindow pcb +\i (00:00:14) zoom out 38.3956 49.0598 +\i (00:00:14) trapsize 8018 +\i (00:00:14) zoom in 1 +\i (00:00:14) setwindow pcb +\i (00:00:14) zoom in 38.3955 49.2202 +\i (00:00:14) trapsize 4009 +\i (00:00:14) zoom out 1 +\i (00:00:14) setwindow pcb +\i (00:00:14) zoom out 38.2352 49.3004 +\i (00:00:14) trapsize 8018 +\i (00:00:15) zoom in 1 +\i (00:00:15) setwindow pcb +\i (00:00:15) zoom in 44.3291 43.6876 +\i (00:00:15) trapsize 4009 +\i (00:00:15) zoom in 1 +\i (00:00:15) setwindow pcb +\i (00:00:15) zoom in 44.3291 43.6876 +\i (00:00:15) trapsize 2005 +\i (00:00:15) zoom out 1 +\i (00:00:15) setwindow pcb +\i (00:00:15) zoom out 41.4425 44.9305 +\i (00:00:15) trapsize 4009 +\i (00:00:16) zoom out 1 +\i (00:00:16) setwindow pcb +\i (00:00:16) zoom out 35.8297 45.3314 +\i (00:00:16) trapsize 8018 +\i (00:00:16) zoom out 1 +\i (00:00:16) setwindow pcb +\i (00:00:16) zoom out 33.7449 44.0484 +\i (00:00:16) trapsize 16037 +\i (00:00:16) zoom out 1 +\i (00:00:16) setwindow pcb +\i (00:00:16) zoom out 37.2732 25.7668 +\i (00:00:16) trapsize 32073 +\i (00:00:16) zoom out 1 +\i (00:00:16) setwindow pcb +\i (00:00:16) zoom out 173.2635 25.1253 +\i (00:00:16) trapsize 64146 +\i (00:00:16) zoom out 1 +\i (00:00:16) setwindow pcb +\i (00:00:16) zoom out 413.1708 40.5204 +\i (00:00:16) trapsize 128293 +\i (00:00:16) zoom out 1 +\i (00:00:16) setwindow pcb +\i (00:00:16) zoom out 859.6295 35.3887 +\i (00:00:16) trapsize 256585 +\i (00:00:17) zoom out 1 +\i (00:00:17) setwindow pcb +\i (00:00:17) zoom out 402.9074 158.5498 +\i (00:00:17) trapsize 513171 +\i (00:00:17) zoom out 1 +\i (00:00:17) setwindow pcb +\i (00:00:17) zoom out 895.5514 382.3806 +\i (00:00:17) trapsize 723589 +\i (00:00:17) zoom out 1 +\i (00:00:17) setwindow pcb +\i (00:00:17) zoom out 1303.7627 580.1737 +\i (00:00:17) trapsize 723589 +\i (00:00:18) zoom in 1 +\i (00:00:18) setwindow pcb +\i (00:00:18) zoom in 30.2460 -56.5847 +\i (00:00:18) trapsize 361795 +\i (00:00:18) zoom in 1 +\i (00:00:18) setwindow pcb +\i (00:00:18) zoom in 30.2460 -56.5846 +\i (00:00:18) trapsize 180897 +\i (00:00:18) zoom in 1 +\i (00:00:18) setwindow pcb +\i (00:00:18) zoom in 30.2460 -56.5846 +\i (00:00:18) trapsize 90449 +\i (00:00:18) zoom in 1 +\i (00:00:18) setwindow pcb +\i (00:00:18) zoom in 28.4371 -60.2025 +\i (00:00:18) trapsize 45224 +\i (00:00:18) zoom out 1 +\i (00:00:18) setwindow pcb +\i (00:00:18) zoom out 24.8191 -9.5513 +\i (00:00:18) trapsize 90449 +\i (00:00:18) zoom out 1 +\i (00:00:18) setwindow pcb +\i (00:00:18) zoom out 32.0551 1.3025 +\i (00:00:18) trapsize 180897 +\i (00:00:19) zoom out 1 +\i (00:00:19) setwindow pcb +\i (00:00:19) zoom out 17.5833 59.1896 +\i (00:00:19) trapsize 361795 +\i (00:00:19) zoom out 1 +\i (00:00:19) setwindow pcb +\i (00:00:19) zoom out 10.3474 211.1433 +\i (00:00:19) trapsize 723589 +\i (00:00:19) zoom in 1 +\i (00:00:19) setwindow pcb +\i (00:00:19) zoom in -13.1693 15.7742 +\i (00:00:19) trapsize 361795 +\i (00:00:20) zoom in 1 +\i (00:00:20) setwindow pcb +\i (00:00:20) zoom in -13.1693 15.7742 +\i (00:00:20) trapsize 180897 +\i (00:00:20) zoom in 1 +\i (00:00:20) setwindow pcb +\i (00:00:20) zoom in -13.1692 15.7743 +\i (00:00:20) trapsize 90449 +\i (00:00:21) zoom out 1 +\i (00:00:21) setwindow pcb +\i (00:00:21) zoom out 3.1116 1.3025 +\i (00:00:21) trapsize 180897 +\i (00:00:21) zoom out 1 +\i (00:00:21) setwindow pcb +\i (00:00:21) zoom out 3.1116 15.7743 +\i (00:00:21) trapsize 361795 +\i (00:00:21) zoom out 1 +\i (00:00:21) setwindow pcb +\i (00:00:21) zoom out 15.7742 15.7743 +\i (00:00:21) trapsize 723589 +\i (00:00:22) zoom in 1 +\i (00:00:22) setwindow pcb +\i (00:00:22) zoom in 1.3025 -42.1129 +\i (00:00:22) trapsize 361795 +\i (00:00:22) zoom in 1 +\i (00:00:22) setwindow pcb +\i (00:00:22) zoom in 1.3025 -42.1128 +\i (00:00:22) trapsize 180897 +\i (00:00:23) zoom in 1 +\i (00:00:23) setwindow pcb +\i (00:00:23) zoom in 1.3025 -24.0231 +\i (00:00:23) trapsize 90449 +\i (00:00:23) zoom in 1 +\i (00:00:23) setwindow pcb +\i (00:00:23) zoom in 1.3025 -24.0230 +\i (00:00:23) trapsize 45224 +\i (00:00:24) zoom in 1 +\i (00:00:24) setwindow pcb +\i (00:00:24) zoom in 4.0160 1.3026 +\i (00:00:24) trapsize 22612 +\i (00:00:24) zoom out 1 +\i (00:00:24) setwindow pcb +\i (00:00:24) zoom out 3.5638 28.4372 +\i (00:00:24) trapsize 45224 +\i (00:00:24) zoom out 1 +\i (00:00:24) setwindow pcb +\i (00:00:24) zoom out -1.8631 25.7237 +\i (00:00:24) trapsize 90449 +\i (00:00:25) zoom in 1 +\i (00:00:25) setwindow pcb +\i (00:00:25) zoom in -7.2901 53.7627 +\i (00:00:25) trapsize 45224 +\i (00:00:25) zoom in 1 +\i (00:00:25) setwindow pcb +\i (00:00:25) zoom in -2.7677 50.1448 +\i (00:00:25) trapsize 22612 +\i (00:00:25) zoom in 1 +\i (00:00:25) setwindow pcb +\i (00:00:25) zoom in -2.7677 50.1448 +\i (00:00:25) trapsize 11306 +\i (00:00:25) zoom in 1 +\i (00:00:25) setwindow pcb +\i (00:00:25) zoom in -2.7677 50.1448 +\i (00:00:25) trapsize 5653 +\i (00:00:26) zoom out 1 +\i (00:00:26) setwindow pcb +\i (00:00:26) zoom out 25.1583 52.9713 +\i (00:00:26) trapsize 11306 +\i (00:00:27) zoom out 1 +\i (00:00:27) setwindow pcb +\i (00:00:27) zoom out 13.8523 41.6653 +\i (00:00:27) trapsize 22612 +\i (00:00:27) zoom out 1 +\i (00:00:27) setwindow pcb +\i (00:00:27) zoom out 12.9477 40.7608 +\i (00:00:27) trapsize 45224 +\i (00:00:27) zoom in 1 +\i (00:00:27) setwindow pcb +\i (00:00:27) zoom in 19.3922 20.8622 +\i (00:00:27) trapsize 22612 +\i (00:00:28) zoom in 1 +\i (00:00:28) setwindow pcb +\i (00:00:28) zoom in 22.5579 11.3651 +\i (00:00:28) trapsize 11306 +\i (00:00:28) zoom in 1 +\i (00:00:28) setwindow pcb +\i (00:00:28) zoom in 22.5579 11.3651 +\i (00:00:28) trapsize 5653 +\i (00:00:28) zoom in 1 +\i (00:00:28) setwindow pcb +\i (00:00:28) zoom in 22.5579 11.3652 +\i (00:00:28) trapsize 2827 +\i (00:00:29) zoom out 1 +\i (00:00:29) setwindow pcb +\i (00:00:29) zoom out 29.3416 34.6558 +\i (00:00:29) trapsize 5653 +\i (00:00:30) zoom in 1 +\i (00:00:30) setwindow pcb +\i (00:00:30) zoom in 27.5326 45.7357 +\i (00:00:30) trapsize 2827 +\i (00:00:30) zoom in 1 +\i (00:00:30) setwindow pcb +\i (00:00:30) zoom in 28.4936 46.3576 +\i (00:00:30) trapsize 1413 +\i (00:00:31) zoom in 1 +\i (00:00:31) setwindow pcb +\i (00:00:31) zoom in 28.4937 45.3400 +\i (00:00:31) trapsize 707 +\i (00:00:31) zoom in 1 +\i (00:00:31) setwindow pcb +\i (00:00:31) zoom in 28.4654 45.2977 +\i (00:00:31) trapsize 353 +\i (00:00:31) zoom out 1 +\i (00:00:31) setwindow pcb +\i (00:00:31) zoom out 29.2992 45.4531 +\i (00:00:31) trapsize 707 +\i (00:00:32) zoom out 1 +\i (00:00:32) setwindow pcb +\i (00:00:32) zoom out 29.2993 45.4108 +\i (00:00:32) trapsize 1413 +\i (00:00:32) zoom in 1 +\i (00:00:32) setwindow pcb +\i (00:00:32) zoom in 30.0341 47.7003 +\i (00:00:32) trapsize 707 +\i (00:00:32) zoom in 1 +\i (00:00:32) setwindow pcb +\i (00:00:32) zoom in 30.0341 47.7003 +\i (00:00:32) trapsize 353 +\i (00:00:33) zoom out 1 +\i (00:00:33) setwindow pcb +\i (00:00:33) zoom out 29.7868 46.8523 +\i (00:00:33) trapsize 707 +\i (00:00:33) zoom out 1 +\i (00:00:33) setwindow pcb +\i (00:00:33) zoom out 29.7869 46.8524 +\i (00:00:33) trapsize 1413 +\i (00:00:33) zoom in 1 +\i (00:00:33) setwindow pcb +\i (00:00:33) zoom in 29.4194 39.9840 +\i (00:00:33) trapsize 707 +\i (00:00:33) zoom in 1 +\i (00:00:33) setwindow pcb +\i (00:00:33) zoom in 29.4336 40.3232 +\i (00:00:33) trapsize 353 +\i (00:00:34) zoom out 1 +\i (00:00:34) setwindow pcb +\i (00:00:34) zoom out 29.5396 40.5988 +\i (00:00:34) trapsize 707 +\i (00:00:34) zoom out 1 +\i (00:00:34) setwindow pcb +\i (00:00:34) zoom out 29.8506 42.9449 +\i (00:00:34) trapsize 1413 +\i (00:00:34) zoom out 1 +\i (00:00:34) setwindow pcb +\i (00:00:34) zoom out 29.8506 42.9448 +\i (00:00:34) trapsize 2827 +\i (00:00:35) zoom in 1 +\i (00:00:35) setwindow pcb +\i (00:00:35) zoom in 30.6985 48.5414 +\i (00:00:35) trapsize 1413 +\i (00:00:35) zoom in 1 +\i (00:00:35) setwindow pcb +\i (00:00:35) zoom in 30.6985 48.5414 +\i (00:00:35) trapsize 707 +\i (00:00:35) zoom in 1 +\i (00:00:35) setwindow pcb +\i (00:00:35) zoom in 30.1191 48.5697 +\i (00:00:35) trapsize 353 +\i (00:00:36) zoom out 1 +\i (00:00:36) setwindow pcb +\i (00:00:36) zoom out 29.5962 48.0963 +\i (00:00:36) trapsize 707 +\i (00:00:36) zoom in 1 +\i (00:00:36) setwindow pcb +\i (00:00:36) zoom in 29.6811 44.6762 +\i (00:00:36) trapsize 353 +\i (00:00:37) zoom in 1 +\i (00:00:37) setwindow pcb +\i (00:00:37) zoom in 29.8154 44.8741 +\i (00:00:37) trapsize 177 +\i (00:00:37) zoom out 1 +\i (00:00:37) setwindow pcb +\i (00:00:37) zoom out 29.8154 44.8918 +\i (00:00:37) trapsize 353 +\i (00:00:37) zoom out 1 +\i (00:00:37) setwindow pcb +\i (00:00:37) zoom out 29.8013 44.8918 +\i (00:00:37) trapsize 707 +\i (00:00:37) zoom out 1 +\i (00:00:37) setwindow pcb +\i (00:00:37) zoom out 29.6741 45.0756 +\i (00:00:37) trapsize 1413 +\i (00:00:37) zoom out 1 +\i (00:00:37) setwindow pcb +\i (00:00:37) zoom out 29.6740 45.0756 +\i (00:00:37) trapsize 2827 +\i (00:00:38) zoom out 1 +\i (00:00:38) setwindow pcb +\i (00:00:38) zoom out 29.6741 45.5278 +\i (00:00:38) trapsize 5653 +\i (00:00:38) zoom in 1 +\i (00:00:38) setwindow pcb +\i (00:00:38) zoom in 29.6741 45.5277 +\i (00:00:38) trapsize 2827 +\i (00:00:38) zoom in 1 +\i (00:00:38) setwindow pcb +\i (00:00:38) zoom in 29.6741 45.3016 +\i (00:00:38) trapsize 1413 +\i (00:00:38) zoom in 1 +\i (00:00:38) setwindow pcb +\i (00:00:38) zoom in 29.7024 45.6973 +\i (00:00:38) trapsize 707 +\i (00:00:39) zoom in 1 +\i (00:00:39) setwindow pcb +\i (00:00:39) zoom in 29.5187 45.9376 +\i (00:00:39) trapsize 353 +\i (00:00:39) zoom in 1 +\i (00:00:39) setwindow pcb +\i (00:00:39) zoom in 29.5328 45.9023 +\i (00:00:39) trapsize 177 +\i (00:00:39) zoom out 1 +\i (00:00:39) setwindow pcb +\i (00:00:39) zoom out 29.6671 45.7186 +\i (00:00:39) trapsize 353 +\i (00:00:40) zoom out 1 +\i (00:00:40) setwindow pcb +\i (00:00:40) zoom out 29.9426 44.7011 +\i (00:00:40) trapsize 707 +\i (00:00:41) zoom out 1 +\i (00:00:41) setwindow pcb +\i (00:00:41) zoom out 29.6317 43.7825 +\i (00:00:41) trapsize 1413 +\i (00:00:41) zoom out 1 +\i (00:00:41) setwindow pcb +\i (00:00:41) zoom out 30.3384 42.8214 +\i (00:00:41) trapsize 2827 +\i (00:00:41) zoom out 1 +\i (00:00:41) setwindow pcb +\i (00:00:41) zoom out 30.1688 42.7083 +\i (00:00:41) trapsize 5653 +\i (00:00:41) zoom out 1 +\i (00:00:41) setwindow pcb +\i (00:00:41) zoom out 30.1689 42.7083 +\i (00:00:41) trapsize 11306 +\i (00:00:42) zoom out 1 +\i (00:00:42) setwindow pcb +\i (00:00:42) zoom out 26.0987 42.4822 +\i (00:00:42) trapsize 22612 +\i (00:00:42) zoom out 1 +\i (00:00:42) setwindow pcb +\i (00:00:42) zoom out 54.2149 41.5778 +\i (00:00:42) trapsize 45224 +\i (00:00:42) zoom out 1 +\i (00:00:42) setwindow pcb +\i (00:00:42) zoom out 208.4298 45.1957 +\i (00:00:42) trapsize 90449 +\i (00:00:42) zoom in 1 +\i (00:00:42) setwindow pcb +\i (00:00:42) zoom in 10.3473 3.5893 +\i (00:00:42) trapsize 45224 +\i (00:00:42) zoom in 1 +\i (00:00:42) setwindow pcb +\i (00:00:42) zoom in 10.3474 3.5893 +\i (00:00:42) trapsize 22612 +\i (00:00:42) zoom in 1 +\i (00:00:42) setwindow pcb +\i (00:00:42) zoom in 10.3474 3.5893 +\i (00:00:42) trapsize 11306 +\i (00:00:43) zoom in 1 +\i (00:00:43) setwindow pcb +\i (00:00:43) zoom in 10.3474 3.5894 +\i (00:00:43) trapsize 5653 +\i (00:00:43) zoom in 1 +\i (00:00:43) setwindow pcb +\i (00:00:43) zoom in 10.3474 3.5894 +\i (00:00:43) trapsize 2827 +\i (00:00:44) zoom out 1 +\i (00:00:44) setwindow pcb +\i (00:00:44) zoom out 12.0434 18.1178 +\i (00:00:44) trapsize 5653 +\i (00:00:44) zoom out 1 +\i (00:00:44) setwindow pcb +\i (00:00:44) zoom out 12.0433 18.0046 +\i (00:00:44) trapsize 11306 +\i (00:00:44) zoom in 1 +\i (00:00:44) setwindow pcb +\i (00:00:44) zoom in 19.0531 53.5058 +\i (00:00:44) trapsize 5653 +\i (00:00:45) zoom in 1 +\i (00:00:45) setwindow pcb +\i (00:00:45) zoom in 27.1935 45.5915 +\i (00:00:45) trapsize 2827 +\i (00:00:45) zoom in 1 +\i (00:00:45) setwindow pcb +\i (00:00:45) zoom in 27.1935 45.5916 +\i (00:00:45) trapsize 1413 +\i (00:00:46) zoom in 1 +\i (00:00:46) setwindow pcb +\i (00:00:46) zoom in 28.7481 45.3089 +\i (00:00:46) trapsize 707 +\i (00:03:01) zoom out 1 +\i (00:03:01) setwindow pcb +\i (00:03:01) zoom out 30.9669 43.6271 +\i (00:03:01) trapsize 1413 +\i (00:03:01) zoom out 1 +\i (00:03:01) setwindow pcb +\i (00:03:01) zoom out 30.6561 43.0619 +\i (00:03:01) trapsize 2827 +\i (00:03:01) zoom out 1 +\i (00:03:01) setwindow pcb +\i (00:03:01) zoom out 30.0342 41.6486 +\i (00:03:01) trapsize 5653 +\i (00:03:02) zoom in 1 +\i (00:03:02) setwindow pcb +\i (00:03:02) zoom in 14.8840 27.2898 +\i (00:03:02) trapsize 2827 +\i (00:03:02) zoom in 1 +\i (00:03:02) setwindow pcb +\i (00:03:02) zoom in 14.8840 27.2898 +\i (00:03:02) trapsize 1413 +\i (00:03:03) zoom out 1 +\i (00:03:03) setwindow pcb +\i (00:03:03) zoom out 15.1667 26.6680 +\i (00:03:03) trapsize 2827 +\i (00:03:03) zoom out 1 +\i (00:03:03) setwindow pcb +\i (00:03:03) zoom out 17.1452 27.7987 +\i (00:03:03) trapsize 5653 +\i (00:03:03) zoom out 1 +\i (00:03:03) setwindow pcb +\i (00:03:03) zoom out 17.1451 27.7986 +\i (00:03:03) trapsize 11306 +\i (00:03:06) zoom in 1 +\i (00:03:06) setwindow pcb +\i (00:03:06) zoom in 15.3362 29.1554 +\i (00:03:06) trapsize 5653 +\i (00:03:06) zoom in 1 +\i (00:03:06) setwindow pcb +\i (00:03:06) zoom in 15.5624 28.4770 +\i (00:03:06) trapsize 2827 +\i (00:03:06) zoom in 1 +\i (00:03:06) setwindow pcb +\i (00:03:06) zoom in 18.1062 28.3075 +\i (00:03:06) trapsize 1413 +\i (00:03:06) zoom in 1 +\i (00:03:06) setwindow pcb +\i (00:03:06) zoom in 18.2476 28.4489 +\i (00:03:06) trapsize 707 +\i (00:03:07) zoom out 1 +\i (00:03:07) setwindow pcb +\i (00:03:07) zoom out 18.9684 29.2686 +\i (00:03:07) trapsize 1413 +\i (00:03:07) zoom out 1 +\i (00:03:07) setwindow pcb +\i (00:03:07) zoom out 18.9684 29.2686 +\i (00:03:07) trapsize 2827 +\i (00:03:07) zoom out 1 +\i (00:03:07) setwindow pcb +\i (00:03:07) zoom out 21.1731 31.2472 +\i (00:03:07) trapsize 5653 +\i (00:03:08) zoom in 1 +\i (00:03:08) setwindow pcb +\i (00:03:08) zoom in 22.6430 41.1966 +\i (00:03:08) trapsize 2827 +\i (00:03:08) zoom in 1 +\i (00:03:08) setwindow pcb +\i (00:03:08) zoom in 24.7347 41.9315 +\i (00:03:08) trapsize 1413 +\i (00:03:09) zoom in 1 +\i (00:03:09) setwindow pcb +\i (00:03:09) zoom in 26.5154 42.4403 +\i (00:03:09) trapsize 707 +\i (00:03:09) zoom in 1 +\i (00:03:09) setwindow pcb +\i (00:03:09) zoom in 28.7202 42.9632 +\i (00:03:09) trapsize 353 +\i (00:03:10) zoom in 1 +\i (00:03:10) setwindow pcb +\i (00:03:10) zoom in 29.7448 42.5816 +\i (00:03:10) trapsize 177 +\i (00:03:10) zoom out 1 +\i (00:03:10) setwindow pcb +\i (00:03:10) zoom out 29.7130 42.5569 +\i (00:03:10) trapsize 353 +\i (00:03:17) zoom in 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom in 29.8615 43.1151 +\i (00:03:17) trapsize 177 +\i (00:03:17) zoom in 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom in 29.8615 43.1151 +\i (00:03:17) trapsize 88 +\i (00:03:17) zoom in 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom in 29.8615 43.1151 +\i (00:03:17) trapsize 44 +\i (00:03:17) zoom in 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom in 29.8615 43.1151 +\i (00:03:17) trapsize 22 +\i (00:03:17) zoom out 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom out 29.8606 43.1151 +\i (00:03:17) trapsize 44 +\i (00:03:17) zoom out 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom out 29.8526 43.1151 +\i (00:03:17) trapsize 88 +\i (00:03:17) zoom out 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom out 29.8525 43.1151 +\i (00:03:17) trapsize 177 +\i (00:03:17) zoom in 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom in 29.8525 43.1151 +\i (00:03:17) trapsize 88 +\i (00:03:17) zoom out 1 +\i (00:03:17) setwindow pcb +\i (00:03:17) zoom out 29.8525 43.1151 +\i (00:03:17) trapsize 177 +\i (00:03:18) zoom out 1 +\i (00:03:18) setwindow pcb +\i (00:03:18) zoom out 29.5840 43.1469 +\i (00:03:18) trapsize 353 +\i (00:03:18) zoom out 1 +\i (00:03:18) setwindow pcb +\i (00:03:18) zoom out 29.5841 43.1468 +\i (00:03:18) trapsize 707 +\i (00:03:19) zoom out 1 +\i (00:03:19) setwindow pcb +\i (00:03:19) zoom out 29.5841 43.1468 +\i (00:03:19) trapsize 1413 +\i (00:03:19) zoom in 1 +\i (00:03:19) setwindow pcb +\i (00:03:19) zoom in 29.0188 48.5735 +\i (00:03:19) trapsize 707 +\i (00:03:20) zoom in 1 +\i (00:03:20) setwindow pcb +\i (00:03:20) zoom in 29.1036 48.5736 +\i (00:03:20) trapsize 353 +\i (00:03:20) zoom out 1 +\i (00:03:20) setwindow pcb +\i (00:03:20) zoom out 29.8244 48.1284 +\i (00:03:20) trapsize 707 +\i (00:03:20) zoom out 1 +\i (00:03:20) setwindow pcb +\i (00:03:20) zoom out 29.8102 48.1002 +\i (00:03:20) trapsize 1413 +\i (00:03:20) zoom out 1 +\i (00:03:20) setwindow pcb +\i (00:03:20) zoom out 29.7820 47.9871 +\i (00:03:20) trapsize 2826 +\i (00:03:20) zoom out 1 +\i (00:03:20) setwindow pcb +\i (00:03:20) zoom out 25.5425 39.1688 +\i (00:03:20) trapsize 5653 +\i (00:03:20) zoom out 1 +\i (00:03:20) setwindow pcb +\i (00:03:20) zoom out 25.5424 38.2643 +\i (00:03:20) trapsize 11306 +\i (00:03:21) zoom in 1 +\i (00:03:21) setwindow pcb +\i (00:03:21) zoom in 14.8648 24.0193 +\i (00:03:21) trapsize 5653 +\i (00:03:21) zoom in 1 +\i (00:03:21) setwindow pcb +\i (00:03:21) zoom in 14.8648 24.0193 +\i (00:03:21) trapsize 2826 +\i (00:03:22) zoom in 1 +\i (00:03:22) setwindow pcb +\i (00:03:22) zoom in 13.3385 30.3504 +\i (00:03:22) trapsize 1413 +\i (00:03:22) zoom in 1 +\i (00:03:22) setwindow pcb +\i (00:03:22) zoom in 13.5929 30.4918 +\i (00:03:22) trapsize 707 +\i (00:03:22) zoom out 1 +\i (00:03:22) setwindow pcb +\i (00:03:22) zoom out 14.0169 31.5235 +\i (00:03:22) trapsize 1413 +\i (00:03:22) zoom out 1 +\i (00:03:22) setwindow pcb +\i (00:03:22) zoom out 14.0170 31.4952 +\i (00:03:22) trapsize 2826 +\i (00:03:22) zoom out 1 +\i (00:03:22) setwindow pcb +\i (00:03:22) zoom out 14.1865 30.8734 +\i (00:03:22) trapsize 5653 +\i (00:03:22) zoom out 1 +\i (00:03:22) setwindow pcb +\i (00:03:22) zoom out 14.4126 30.5342 +\i (00:03:22) trapsize 11306 +\i (00:03:23) zoom in 1 +\i (00:03:23) setwindow pcb +\i (00:03:23) zoom in 19.3871 42.0659 +\i (00:03:23) trapsize 5653 +\i (00:03:23) zoom in 1 +\i (00:03:23) setwindow pcb +\i (00:03:23) zoom in 19.1610 41.3876 +\i (00:03:23) trapsize 2826 +\i (00:03:24) zoom in 1 +\i (00:03:24) setwindow pcb +\i (00:03:24) zoom in 19.7263 38.7308 +\i (00:03:24) trapsize 1413 +\i (00:03:29) zoom out 1 +\i (00:03:29) setwindow pcb +\i (00:03:29) zoom out 30.6079 43.8749 +\i (00:03:29) trapsize 2826 +\i (00:03:29) zoom out 1 +\i (00:03:29) setwindow pcb +\i (00:03:29) zoom out 30.6079 43.8749 +\i (00:03:29) trapsize 5653 +\i (00:03:30) zoom in 1 +\i (00:03:30) setwindow pcb +\i (00:03:30) zoom in 34.5649 51.5628 +\i (00:03:30) trapsize 2826 +\i (00:03:30) zoom in 1 +\i (00:03:30) setwindow pcb +\i (00:03:30) zoom in 34.5649 51.5628 +\i (00:03:30) trapsize 1413 +\i (00:03:31) zoom in 1 +\i (00:03:31) setwindow pcb +\i (00:03:31) zoom in 30.4949 47.8885 +\i (00:03:31) trapsize 707 +\i (00:03:31) zoom in 1 +\i (00:03:31) setwindow pcb +\i (00:03:31) zoom in 30.1699 47.6342 +\i (00:03:31) trapsize 353 +\i (00:03:31) zoom in 1 +\i (00:03:31) setwindow pcb +\i (00:03:31) zoom in 30.1699 47.6342 +\i (00:03:31) trapsize 177 +\i (00:03:32) zoom out 1 +\i (00:03:32) setwindow pcb +\i (00:03:32) zoom out 30.1593 47.5812 +\i (00:03:32) trapsize 353 +\i (00:03:32) zoom out 1 +\i (00:03:32) setwindow pcb +\i (00:03:32) zoom out 30.1523 47.5600 +\i (00:03:32) trapsize 707 +\i (00:04:44) zoom out 1 +\i (00:04:44) setwindow pcb +\i (00:04:44) zoom out 24.4713 44.8467 +\i (00:04:44) trapsize 1413 +\i (00:04:45) zoom out 1 +\i (00:04:45) setwindow pcb +\i (00:04:45) zoom out 24.1886 45.2141 +\i (00:04:45) trapsize 2826 +\i (00:04:45) zoom out 1 +\i (00:04:45) setwindow pcb +\i (00:04:45) zoom out 24.1320 45.2141 +\i (00:04:45) trapsize 5653 +\i (00:04:45) zoom in 1 +\i (00:04:45) setwindow pcb +\i (00:04:45) zoom in 19.3836 42.7268 +\i (00:04:45) trapsize 2826 +\i (00:04:46) zoom in 1 +\i (00:04:46) setwindow pcb +\i (00:04:46) zoom in 19.2706 41.4267 +\i (00:04:46) trapsize 1413 +\i (00:04:46) zoom in 1 +\i (00:04:46) setwindow pcb +\i (00:04:46) zoom in 33.0634 45.1858 +\i (00:04:46) trapsize 707 +\i (00:04:47) zoom in 1 +\i (00:04:47) setwindow pcb +\i (00:04:47) zoom in 33.0634 45.1858 +\i (00:04:47) trapsize 353 +\i (00:04:47) zoom out 1 +\i (00:04:47) setwindow pcb +\i (00:04:47) zoom out 31.0920 45.7581 +\i (00:04:47) trapsize 707 +\i (00:04:47) zoom out 1 +\i (00:04:47) setwindow pcb +\i (00:04:47) zoom out 31.0921 45.7582 +\i (00:04:47) trapsize 1413 +\i (00:04:48) zoom in 1 +\i (00:04:48) setwindow pcb +\i (00:04:48) zoom in 28.0678 48.5563 +\i (00:04:48) trapsize 707 +\i (00:04:48) zoom in 1 +\i (00:04:48) setwindow pcb +\i (00:04:48) zoom in 27.3047 48.6694 +\i (00:04:48) trapsize 353 +\i (00:06:16) zoom out 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom out 29.7001 47.4399 +\i (00:06:16) trapsize 707 +\i (00:06:16) zoom in 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom in 29.7001 47.4400 +\i (00:06:16) trapsize 353 +\i (00:06:16) zoom out 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom out 29.7001 47.4400 +\i (00:06:16) trapsize 707 +\i (00:06:16) zoom out 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom out 29.7001 47.4401 +\i (00:06:16) trapsize 1413 +\i (00:06:16) zoom in 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom in 27.1845 45.6029 +\i (00:06:16) trapsize 707 +\i (00:06:16) zoom in 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom in 27.4248 45.7018 +\i (00:06:16) trapsize 353 +\i (00:06:16) zoom in 1 +\i (00:06:16) setwindow pcb +\i (00:06:16) zoom in 27.5803 45.9774 +\i (00:06:16) trapsize 177 +\i (00:06:17) zoom out 1 +\i (00:06:17) setwindow pcb +\i (00:06:17) zoom out 28.9829 45.9774 +\i (00:06:17) trapsize 353 +\i (00:06:17) zoom out 1 +\i (00:06:17) setwindow pcb +\i (00:06:17) zoom out 28.9971 45.9775 +\i (00:06:17) trapsize 707 +\i (00:06:17) zoom in 1 +\i (00:06:17) setwindow pcb +\i (00:06:17) zoom in 30.6506 47.9277 +\i (00:06:17) trapsize 353 +\i (00:06:17) zoom in 1 +\i (00:06:17) setwindow pcb +\i (00:06:17) zoom in 30.6506 47.9347 +\i (00:06:17) trapsize 177 +\i (00:06:18) zoom out 1 +\i (00:06:18) setwindow pcb +\i (00:06:18) zoom out 30.1596 48.0372 +\i (00:06:18) trapsize 353 +\i (00:07:57) zoom out 1 +\i (00:07:57) setwindow pcb +\i (00:07:57) zoom out 26.9728 45.2108 +\i (00:07:57) trapsize 707 +\i (00:07:57) zoom out 1 +\i (00:07:57) setwindow pcb +\i (00:07:57) zoom out 26.9728 45.2107 +\i (00:07:57) trapsize 1413 +\i (00:11:49) zoom out 1 +\i (00:11:49) setwindow pcb +\i (00:11:49) zoom out 18.6067 51.6549 +\i (00:11:49) trapsize 2826 +\i (00:11:49) zoom in 1 +\i (00:11:49) setwindow pcb +\i (00:11:49) zoom in 18.1544 50.8071 +\i (00:11:49) trapsize 1413 +\i (00:11:49) zoom out 1 +\i (00:11:49) setwindow pcb +\i (00:11:49) zoom out 18.1545 50.8071 +\i (00:11:49) trapsize 2826 +\i (00:11:49) zoom out 1 +\i (00:11:49) setwindow pcb +\i (00:11:49) zoom out 18.0979 50.6375 +\i (00:11:49) trapsize 5653 +\i (00:11:49) zoom out 1 +\i (00:11:49) setwindow pcb +\i (00:11:49) zoom out 17.5326 52.4464 +\i (00:11:49) trapsize 11306 +\i (00:11:50) zoom in 1 +\i (00:11:50) setwindow pcb +\i (00:11:50) zoom in -8.6964 92.6943 +\i (00:11:50) trapsize 5653 +\i (00:11:50) zoom in 1 +\i (00:11:50) setwindow pcb +\i (00:11:50) zoom in -9.4878 93.4857 +\i (00:11:50) trapsize 2826 +\i (00:11:50) zoom in 1 +\i (00:11:50) setwindow pcb +\i (00:11:50) zoom in -9.6008 93.5988 +\i (00:11:50) trapsize 1413 +\i (00:11:50) zoom out 1 +\i (00:11:50) setwindow pcb +\i (00:11:50) zoom out 5.9161 87.2394 +\i (00:11:50) trapsize 2826 +\i (00:11:50) zoom out 1 +\i (00:11:50) setwindow pcb +\i (00:11:50) zoom out 5.9726 86.9002 +\i (00:11:50) trapsize 5653 +\i (00:11:51) zoom in 1 +\i (00:11:51) setwindow pcb +\i (00:11:51) zoom in 13.9996 86.7872 +\i (00:11:51) trapsize 2826 +\i (00:11:51) zoom in 1 +\i (00:11:51) setwindow pcb +\i (00:11:51) zoom in 14.3388 87.6916 +\i (00:11:51) trapsize 1413 +\i (00:11:51) zoom in 1 +\i (00:11:51) setwindow pcb +\i (00:11:51) zoom in 13.7170 87.9178 +\i (00:11:51) trapsize 707 +\i (00:11:51) zoom out 1 +\i (00:11:51) setwindow pcb +\i (00:11:51) zoom out 8.3328 90.2778 +\i (00:11:51) trapsize 1413 +\i (00:11:52) zoom out 1 +\i (00:11:52) setwindow pcb +\i (00:11:52) zoom out 8.3610 90.2496 +\i (00:11:52) trapsize 2826 +\i (00:11:52) zoom in 1 +\i (00:11:52) setwindow pcb +\i (00:11:52) zoom in 8.1914 95.0545 +\i (00:11:52) trapsize 1413 +\i (00:11:52) zoom in 1 +\i (00:11:52) setwindow pcb +\i (00:11:52) zoom in 7.9653 94.7719 +\i (00:11:52) trapsize 707 +\i (00:11:52) zoom in 1 +\i (00:11:52) setwindow pcb +\i (00:11:52) zoom in 8.3893 94.1360 +\i (00:11:52) trapsize 353 +\i (00:11:53) zoom in 1 +\i (00:11:53) setwindow pcb +\i (00:11:53) zoom in 9.9862 92.0304 +\i (00:11:53) trapsize 177 +\i (00:11:53) zoom out 1 +\i (00:11:53) setwindow pcb +\i (00:11:53) zoom out 9.5906 92.0374 +\i (00:11:53) trapsize 353 +\i (00:11:53) zoom out 1 +\i (00:11:53) setwindow pcb +\i (00:11:53) zoom out 9.5905 91.9951 +\i (00:11:53) trapsize 707 +\i (00:11:54) zoom in 1 +\i (00:11:54) setwindow pcb +\i (00:11:54) zoom in 9.8167 89.5220 +\i (00:11:54) trapsize 353 +\i (00:11:54) zoom in 1 +\i (00:11:54) setwindow pcb +\i (00:11:54) zoom in 9.8167 89.4161 +\i (00:11:54) trapsize 177 +\i (00:11:55) zoom out 1 +\i (00:11:55) setwindow pcb +\i (00:11:55) zoom out 9.6436 89.6210 +\i (00:11:55) trapsize 353 +\i (00:12:04) zoom out 1 +\i (00:12:04) setwindow pcb +\i (00:12:04) zoom out 9.8979 91.1402 +\i (00:12:04) trapsize 707 +\i (00:12:04) zoom out 1 +\i (00:12:04) setwindow pcb +\i (00:12:04) zoom out 9.8838 91.1402 +\i (00:12:04) trapsize 1413 +\i (00:12:04) zoom out 1 +\i (00:12:04) setwindow pcb +\i (00:12:04) zoom out 9.8838 91.1401 +\i (00:12:04) trapsize 2826 +\i (00:12:05) zoom out 1 +\i (00:12:05) setwindow pcb +\i (00:12:05) zoom out 10.8448 79.7215 +\i (00:12:05) trapsize 5653 +\i (00:12:05) zoom out 1 +\i (00:12:05) setwindow pcb +\i (00:12:05) zoom out 11.2970 79.4953 +\i (00:12:05) trapsize 11306 +\i (00:12:05) zoom in 1 +\i (00:12:05) setwindow pcb +\i (00:12:05) zoom in 5.8204 58.9192 +\i (00:12:05) trapsize 5653 +\i (00:12:06) zoom in 1 +\i (00:12:06) setwindow pcb +\i (00:12:06) zoom in 3.8984 65.3634 +\i (00:12:06) trapsize 2826 +\i (00:12:06) zoom in 1 +\i (00:12:06) setwindow pcb +\i (00:12:06) zoom in 8.1380 67.3419 +\i (00:12:06) trapsize 1413 +\i (00:12:07) zoom in 1 +\i (00:12:07) setwindow pcb +\i (00:12:07) zoom in 12.1798 69.3769 +\i (00:12:07) trapsize 707 +\i (00:12:07) zoom in 1 +\i (00:12:07) setwindow pcb +\i (00:12:07) zoom in 12.0667 71.0587 +\i (00:12:07) trapsize 353 +\i (00:12:57) zoom out 1 +\i (00:12:57) setwindow pcb +\i (00:12:57) zoom out 10.7948 71.5745 +\i (00:12:57) trapsize 707 +\i (00:12:57) zoom out 1 +\i (00:12:57) setwindow pcb +\i (00:12:57) zoom out 10.3851 71.3060 +\i (00:12:57) trapsize 1413 +\i (00:12:57) zoom out 1 +\i (00:12:57) setwindow pcb +\i (00:12:57) zoom out 9.9611 71.1081 +\i (00:12:57) trapsize 2826 +\i (00:12:58) zoom in 1 +\i (00:12:58) setwindow pcb +\i (00:12:58) zoom in 1.8210 67.8296 +\i (00:12:58) trapsize 1413 +\i (00:12:58) zoom in 1 +\i (00:12:58) setwindow pcb +\i (00:12:58) zoom in 1.7363 67.6600 +\i (00:12:58) trapsize 707 +\i (00:12:58) zoom in 1 +\i (00:12:58) setwindow pcb +\i (00:12:58) zoom in 1.8352 68.8188 +\i (00:12:58) trapsize 353 +\i (00:12:58) zoom in 1 +\i (00:12:58) setwindow pcb +\i (00:12:58) zoom in 1.8352 68.8189 +\i (00:12:58) trapsize 177 +\i (00:12:59) zoom out 1 +\i (00:12:59) setwindow pcb +\i (00:12:59) zoom out 2.6442 69.4195 +\i (00:12:59) trapsize 353 +\i (00:12:59) zoom out 1 +\i (00:12:59) setwindow pcb +\i (00:12:59) zoom out 2.6372 69.4054 +\i (00:12:59) trapsize 707 +\i (00:12:59) zoom out 1 +\i (00:12:59) setwindow pcb +\i (00:12:59) zoom out 3.3015 69.1794 +\i (00:12:59) trapsize 1413 +\i (00:12:59) zoom out 1 +\i (00:12:59) setwindow pcb +\i (00:12:59) zoom out 3.6407 68.3315 +\i (00:12:59) trapsize 2826 +\i (00:12:59) zoom out 1 +\i (00:12:59) setwindow pcb +\i (00:12:59) zoom out 3.6406 68.3315 +\i (00:12:59) trapsize 5653 +\i (00:13:00) zoom out 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom out 16.5290 88.2293 +\i (00:13:00) trapsize 11306 +\i (00:13:00) zoom in 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom in 57.1478 77.3761 +\i (00:13:00) trapsize 5653 +\i (00:13:00) zoom in 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom in 56.5825 75.4541 +\i (00:13:00) trapsize 2826 +\i (00:13:00) zoom in 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom in 56.2998 75.3410 +\i (00:13:00) trapsize 1413 +\i (00:13:00) zoom out 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom out 44.2876 74.6627 +\i (00:13:00) trapsize 2826 +\i (00:13:00) zoom out 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom out 44.2877 74.6628 +\i (00:13:00) trapsize 5653 +\i (00:13:00) zoom out 1 +\i (00:13:00) setwindow pcb +\i (00:13:00) zoom out 44.5137 73.5322 +\i (00:13:00) trapsize 11306 +\i (00:13:01) zoom in 1 +\i (00:13:01) setwindow pcb +\i (00:13:01) zoom in 3.3614 84.6117 +\i (00:13:01) trapsize 5653 +\i (00:13:01) zoom in 1 +\i (00:13:01) setwindow pcb +\i (00:13:01) zoom in 3.2483 84.6117 +\i (00:13:01) trapsize 2826 +\i (00:13:01) zoom in 1 +\i (00:13:01) setwindow pcb +\i (00:13:01) zoom in 3.1918 84.6118 +\i (00:13:01) trapsize 1413 +\i (00:13:02) zoom in 1 +\i (00:13:02) setwindow pcb +\i (00:13:02) zoom in 10.3143 72.6279 +\i (00:13:02) trapsize 707 +\i (00:13:02) zoom in 1 +\i (00:13:02) setwindow pcb +\i (00:13:02) zoom in 10.2720 72.2464 +\i (00:13:02) trapsize 353 +\i (00:13:03) zoom out 1 +\i (00:13:03) setwindow pcb +\i (00:13:03) zoom out 12.8722 72.1263 +\i (00:13:03) trapsize 707 +\i (00:13:06) zoom out 1 +\i (00:13:06) setwindow pcb +\i (00:13:06) zoom out 11.2613 74.0766 +\i (00:13:06) trapsize 1413 +\i (00:13:06) zoom out 1 +\i (00:13:06) setwindow pcb +\i (00:13:06) zoom out 9.4806 73.7374 +\i (00:13:06) trapsize 2826 +\i (00:13:06) zoom out 1 +\i (00:13:06) setwindow pcb +\i (00:13:06) zoom out 8.8589 73.5677 +\i (00:13:06) trapsize 5653 +\i (00:13:06) zoom out 1 +\i (00:13:06) setwindow pcb +\i (00:13:06) zoom out 6.5977 72.7764 +\i (00:13:06) trapsize 11306 +\i (00:13:07) zoom in 1 +\i (00:13:07) setwindow pcb +\i (00:13:07) zoom in -9.7814 89.2825 +\i (00:13:08) trapsize 5653 +\i (00:13:08) zoom in 1 +\i (00:13:08) setwindow pcb +\i (00:13:08) zoom in 9.6642 89.9609 +\i (00:13:08) trapsize 2826 +\i (00:13:08) zoom in 1 +\i (00:13:08) setwindow pcb +\i (00:13:08) zoom in 9.3251 89.2826 +\i (00:13:08) trapsize 1413 +\i (00:13:09) zoom in 1 +\i (00:13:09) setwindow pcb +\i (00:13:09) zoom in 11.5863 92.5895 +\i (00:13:09) trapsize 707 +\i (00:13:11) zoom in 1 +\i (00:13:11) setwindow pcb +\i (00:13:11) zoom in 10.4416 91.7558 +\i (00:13:11) trapsize 353 +\i (00:13:12) zoom out 1 +\i (00:13:12) setwindow pcb +\i (00:13:12) zoom out 9.7703 91.2188 +\i (00:13:12) trapsize 707 +\i (00:13:12) zoom out 1 +\i (00:13:12) setwindow pcb +\i (00:13:12) zoom out 9.7704 91.2188 +\i (00:13:12) trapsize 1413 +\i (00:13:16) zoom out 1 +\i (00:13:16) setwindow pcb +\i (00:13:16) zoom out 20.3411 87.6859 +\i (00:13:16) trapsize 2826 +\i (00:13:16) zoom out 1 +\i (00:13:16) setwindow pcb +\i (00:13:16) zoom out 20.5673 87.4597 +\i (00:13:16) trapsize 5653 +\i (00:13:16) zoom out 1 +\i (00:13:16) setwindow pcb +\i (00:13:16) zoom out 28.8203 77.8499 +\i (00:13:16) trapsize 11306 +\i (00:13:16) zoom out 1 +\i (00:13:16) setwindow pcb +\i (00:13:16) zoom out 108.0229 77.8500 +\i (00:13:16) trapsize 22611 +\i (00:13:17) zoom in 1 +\i (00:13:17) setwindow pcb +\i (00:13:17) zoom in 38.3805 37.1498 +\i (00:13:17) trapsize 11306 +\i (00:13:17) zoom in 1 +\i (00:13:17) setwindow pcb +\i (00:13:17) zoom in 38.1544 37.1498 +\i (00:13:17) trapsize 5653 +\i (00:13:19) zoom out 1 +\i (00:13:19) setwindow pcb +\i (00:13:19) zoom out 40.1895 53.5429 +\i (00:13:19) trapsize 11306 +\i (00:13:20) zoom in 1 +\i (00:13:20) setwindow pcb +\i (00:13:20) zoom in 25.2660 68.4663 +\i (00:13:20) trapsize 5653 +\i (00:13:20) zoom out 1 +\i (00:13:20) setwindow pcb +\i (00:13:20) zoom out 11.0209 73.6669 +\i (00:13:20) trapsize 11306 +\i (00:13:22) zoom in 1 +\i (00:13:22) setwindow pcb +\i (00:13:22) zoom in -14.7559 94.9214 +\i (00:13:22) trapsize 5653 +\i (00:13:22) zoom in 1 +\i (00:13:22) setwindow pcb +\i (00:13:22) zoom in -14.7558 94.8084 +\i (00:13:22) trapsize 2826 +\i (00:13:22) zoom in 1 +\i (00:13:22) setwindow pcb +\i (00:13:22) zoom in -14.7558 94.8084 +\i (00:13:22) trapsize 1413 +\i (00:13:23) zoom in 1 +\i (00:13:23) setwindow pcb +\i (00:13:23) zoom in 14.6670 89.9753 +\i (00:13:23) trapsize 707 +\i (00:13:23) zoom out 1 +\i (00:13:23) setwindow pcb +\i (00:13:23) zoom out 14.5823 89.9753 +\i (00:13:23) trapsize 1413 +\i (00:13:23) zoom out 1 +\i (00:13:23) setwindow pcb +\i (00:13:23) zoom out 14.5822 89.9754 +\i (00:13:23) trapsize 2826 +\i (00:13:24) zoom in 1 +\i (00:13:24) setwindow pcb +\i (00:13:24) zoom in 17.6912 90.6536 +\i (00:13:24) trapsize 1413 +\i (00:13:24) zoom in 1 +\i (00:13:24) setwindow pcb +\i (00:13:24) zoom in 11.4166 91.1058 +\i (00:13:24) trapsize 707 +\i (00:13:25) zoom in 1 +\i (00:13:25) setwindow pcb +\i (00:13:25) zoom in 10.4274 91.1200 +\i (00:13:25) trapsize 353 +\i (00:13:37) zoom out 1 +\i (00:13:37) setwindow pcb +\i (00:13:37) zoom out 7.3042 91.9679 +\i (00:13:37) trapsize 707 +\i (00:13:37) zoom out 1 +\i (00:13:37) setwindow pcb +\i (00:13:37) zoom out 7.3749 91.7842 +\i (00:13:37) trapsize 1413 +\i (00:13:38) zoom in 1 +\i (00:13:38) setwindow pcb +\i (00:13:38) zoom in 15.7128 90.5123 +\i (00:13:38) trapsize 707 +\i (00:13:38) zoom in 1 +\i (00:13:38) setwindow pcb +\i (00:13:38) zoom in 15.4585 90.2862 +\i (00:13:38) trapsize 353 +\i (00:13:39) zoom out 1 +\i (00:13:39) setwindow pcb +\i (00:13:39) zoom out 13.0278 90.6466 +\i (00:13:39) trapsize 707 +\i (00:13:59) zoom in 1 +\i (00:13:59) setwindow pcb +\i (00:13:59) zoom in 18.7796 87.8202 +\i (00:13:59) trapsize 353 +\i (00:13:59) zoom out 1 +\i (00:13:59) setwindow pcb +\i (00:13:59) zoom out 18.7796 87.8202 +\i (00:13:59) trapsize 707 +\i (00:14:18) zoom out 1 +\i (00:14:18) setwindow pcb +\i (00:14:18) zoom out 20.5178 89.3464 +\i (00:14:18) trapsize 1413 +\i (00:14:18) zoom out 1 +\i (00:14:18) setwindow pcb +\i (00:14:18) zoom out 20.5178 89.3464 +\i (00:14:18) trapsize 2826 +\i (00:14:18) zoom out 1 +\i (00:14:18) setwindow pcb +\i (00:14:18) zoom out 20.5178 89.3465 +\i (00:14:18) trapsize 5653 +\i (00:14:18) zoom out 1 +\i (00:14:18) setwindow pcb +\i (00:14:18) zoom out 20.5178 89.3464 +\i (00:14:18) trapsize 11306 +\i (00:14:19) zoom out 1 +\i (00:14:19) setwindow pcb +\i (00:14:19) zoom out 37.0238 62.2130 +\i (00:14:19) trapsize 22611 +\i (00:14:20) zoom in 1 +\i (00:14:20) setwindow pcb +\i (00:14:20) zoom in 17.1260 21.0606 +\i (00:14:20) trapsize 11306 +\i (00:14:20) zoom in 1 +\i (00:14:20) setwindow pcb +\i (00:14:20) zoom in 17.1260 20.8345 +\i (00:14:20) trapsize 5653 +\i (00:14:20) zoom in 1 +\i (00:14:20) setwindow pcb +\i (00:14:20) zoom in 17.1260 20.8346 +\i (00:14:20) trapsize 2826 +\i (00:14:20) zoom in 1 +\i (00:14:20) setwindow pcb +\i (00:14:20) zoom in 19.5002 23.7741 +\i (00:14:20) trapsize 1413 +\i (00:14:21) zoom out 1 +\i (00:14:21) setwindow pcb +\i (00:14:21) zoom out 15.0911 25.2438 +\i (00:14:21) trapsize 2826 +\i (00:14:21) zoom out 1 +\i (00:14:21) setwindow pcb +\i (00:14:21) zoom out 15.0911 25.2438 +\i (00:14:21) trapsize 5653 +\i (00:14:21) zoom out 1 +\i (00:14:21) setwindow pcb +\i (00:14:21) zoom out 15.0910 25.2439 +\i (00:14:21) trapsize 11306 +\i (00:14:22) zoom out 1 +\i (00:14:22) setwindow pcb +\i (00:14:22) zoom out 15.0909 25.2438 +\i (00:14:22) trapsize 22611 +\i (00:14:23) zoom in 1 +\i (00:14:23) setwindow pcb +\i (00:14:23) zoom in -31.0359 19.8172 +\i (00:14:23) trapsize 11306 +\i (00:14:23) zoom in 1 +\i (00:14:23) setwindow pcb +\i (00:14:23) zoom in -31.0359 19.8172 +\i (00:14:23) trapsize 5653 +\i (00:14:26) zoom in 1 +\i (00:14:26) setwindow pcb +\i (00:14:26) zoom in 43.8071 20.6086 +\i (00:14:26) trapsize 2826 +\i (00:14:26) zoom in 1 +\i (00:14:26) setwindow pcb +\i (00:14:26) zoom in 43.8071 20.6086 +\i (00:14:26) trapsize 1413 +\i (00:14:26) zoom in 1 +\i (00:14:26) setwindow pcb +\i (00:14:26) zoom in 37.9847 22.4740 +\i (00:14:26) trapsize 707 +\i (00:14:26) zoom in 1 +\i (00:14:26) setwindow pcb +\i (00:14:26) zoom in 34.7627 23.2371 +\i (00:14:26) trapsize 353 +\i (00:14:27) zoom in 1 +\i (00:14:27) setwindow pcb +\i (00:14:27) zoom in 34.7627 23.2442 +\i (00:14:27) trapsize 177 +\i (00:14:28) zoom out 1 +\i (00:14:28) setwindow pcb +\i (00:14:28) zoom out 35.8756 23.5798 +\i (00:14:28) trapsize 353 +\i (00:14:29) zoom in 1 +\i (00:14:29) setwindow pcb +\i (00:14:29) zoom in 35.9534 24.8518 +\i (00:14:29) trapsize 177 +\i (00:14:34) zoom out 1 +\i (00:14:34) setwindow pcb +\i (00:14:34) zoom out 35.6743 24.3077 +\i (00:14:34) trapsize 353 +\i (00:14:34) zoom out 1 +\i (00:14:34) setwindow pcb +\i (00:14:34) zoom out 35.6955 24.3006 +\i (00:14:34) trapsize 707 +\i (00:14:34) zoom out 1 +\i (00:14:34) setwindow pcb +\i (00:14:34) zoom out 37.2500 23.9333 +\i (00:14:34) trapsize 1413 +\i (00:14:34) zoom out 1 +\i (00:14:34) setwindow pcb +\i (00:14:34) zoom out 37.3630 23.8485 +\i (00:14:34) trapsize 2826 +\i (00:14:34) zoom out 1 +\i (00:14:34) setwindow pcb +\i (00:14:34) zoom out 39.9633 24.0180 +\i (00:14:34) trapsize 5653 +\i (00:14:38) zoom out 1 +\i (00:14:38) setwindow pcb +\i (00:14:38) zoom out 52.9648 39.7328 +\i (00:14:38) trapsize 11306 +\i (00:14:39) zoom in 1 +\i (00:14:39) setwindow pcb +\i (00:14:39) zoom in 60.9917 57.1434 +\i (00:14:39) trapsize 5653 +\i (00:14:40) zoom in 1 +\i (00:14:40) setwindow pcb +\i (00:14:40) zoom in 55.6781 61.3265 +\i (00:14:40) trapsize 2826 +\i (00:14:40) zoom in 1 +\i (00:14:40) setwindow pcb +\i (00:14:40) zoom in 56.1868 61.4395 +\i (00:14:40) trapsize 1413 +\i (00:14:40) zoom in 1 +\i (00:14:40) setwindow pcb +\i (00:14:40) zoom in 58.3914 55.7868 +\i (00:14:40) trapsize 707 +\i (00:14:40) zoom in 1 +\i (00:14:40) setwindow pcb +\i (00:14:40) zoom in 58.4762 56.3662 +\i (00:14:40) trapsize 353 +\i (00:14:41) zoom out 1 +\i (00:14:41) setwindow pcb +\i (00:14:41) zoom out 58.1794 57.2636 +\i (00:14:41) trapsize 707 +\i (00:14:42) zoom out 1 +\i (00:14:42) setwindow pcb +\i (00:14:42) zoom out 57.2327 58.0268 +\i (00:14:42) trapsize 1413 +\i (00:14:42) zoom in 1 +\i (00:14:42) setwindow pcb +\i (00:14:42) zoom in 57.1761 59.5531 +\i (00:14:42) trapsize 707 +\i (00:14:42) zoom in 1 +\i (00:14:42) setwindow pcb +\i (00:14:42) zoom in 57.1761 59.5673 +\i (00:14:42) trapsize 353 +\i (00:14:43) zoom out 1 +\i (00:14:43) setwindow pcb +\i (00:14:43) zoom out 56.7521 58.7901 +\i (00:14:43) trapsize 707 +\i (00:14:43) zoom out 1 +\i (00:14:43) setwindow pcb +\i (00:14:43) zoom out 57.1761 59.3130 +\i (00:14:43) trapsize 1413 +\i (00:14:44) zoom in 1 +\i (00:14:44) setwindow pcb +\i (00:14:44) zoom in 58.1937 59.8217 +\i (00:14:44) trapsize 707 +\i (00:14:45) zoom in 1 +\i (00:14:45) setwindow pcb +\i (00:14:45) zoom in 54.6607 58.3520 +\i (00:14:45) trapsize 353 +\i (00:14:46) zoom out 1 +\i (00:14:46) setwindow pcb +\i (00:14:46) zoom out 56.5756 57.3557 +\i (00:14:46) trapsize 707 +\i (00:14:46) zoom out 1 +\i (00:14:46) setwindow pcb +\i (00:14:46) zoom out 56.5756 57.3558 +\i (00:14:46) trapsize 1413 +\i (00:14:50) zoom in 1 +\i (00:14:50) setwindow pcb +\i (00:14:50) zoom in 57.5365 58.5994 +\i (00:14:50) trapsize 707 +\i (00:14:51) zoom in 1 +\i (00:14:51) setwindow pcb +\i (00:14:51) zoom in 58.4269 57.3275 +\i (00:14:51) trapsize 353 +\i (00:14:52) zoom in 1 +\i (00:14:52) setwindow pcb +\i (00:14:52) zoom in 59.6563 57.2851 +\i (00:14:52) trapsize 177 +\i (00:14:52) zoom out 1 +\i (00:14:52) setwindow pcb +\i (00:14:52) zoom out 59.6387 57.2675 +\i (00:14:52) trapsize 353 +\i (00:15:56) zoom in 1 +\i (00:15:56) setwindow pcb +\i (00:15:56) zoom in 55.7666 57.3381 +\i (00:15:56) trapsize 177 +\i (00:15:57) zoom in 1 +\i (00:15:57) setwindow pcb +\i (00:15:57) zoom in 55.9327 57.4618 +\i (00:15:57) trapsize 88 +\i (00:15:57) zoom out 1 +\i (00:15:57) setwindow pcb +\i (00:15:57) zoom out 55.9945 57.4230 +\i (00:15:57) trapsize 177 +\i (00:15:58) zoom out 1 +\i (00:15:58) setwindow pcb +\i (00:15:58) zoom out 55.9945 57.4229 +\i (00:15:58) trapsize 353 +\i (00:15:58) zoom out 1 +\i (00:15:58) setwindow pcb +\i (00:15:58) zoom out 55.9946 57.4230 +\i (00:15:58) trapsize 707 +\i (00:15:59) zoom in 1 +\i (00:15:59) setwindow pcb +\i (00:15:59) zoom in 55.9946 57.4513 +\i (00:15:59) trapsize 353 +\i (00:15:59) zoom in 1 +\i (00:15:59) setwindow pcb +\i (00:15:59) zoom in 56.0228 57.6068 +\i (00:15:59) trapsize 177 +\i (00:16:00) zoom in 1 +\i (00:16:00) setwindow pcb +\i (00:16:00) zoom in 56.0229 57.6068 +\i (00:16:00) trapsize 88 +\i (00:16:02) zoom out 1 +\i (00:16:02) setwindow pcb +\i (00:16:02) zoom out 56.0229 57.6069 +\i (00:16:02) trapsize 177 +\i (00:16:02) zoom out 1 +\i (00:16:02) setwindow pcb +\i (00:16:02) zoom out 56.0193 57.5962 +\i (00:16:02) trapsize 353 +\i (00:16:03) zoom out 1 +\i (00:16:03) setwindow pcb +\i (00:16:03) zoom out 55.9628 57.5186 +\i (00:16:03) trapsize 707 +\i (00:16:03) zoom out 1 +\i (00:16:03) setwindow pcb +\i (00:16:03) zoom out 55.9064 57.4620 +\i (00:16:03) trapsize 1413 +\i (00:16:03) zoom out 1 +\i (00:16:03) setwindow pcb +\i (00:16:03) zoom out 55.1150 54.0421 +\i (00:16:03) trapsize 2826 +\i (00:16:04) zoom out 1 +\i (00:16:04) setwindow pcb +\i (00:16:04) zoom out 50.5927 52.9680 +\i (00:16:04) trapsize 5653 +\i (00:16:04) zoom out 1 +\i (00:16:04) setwindow pcb +\i (00:16:04) zoom out 50.1404 52.5158 +\i (00:16:04) trapsize 11306 +\i (00:16:04) zoom out 1 +\i (00:16:04) setwindow pcb +\i (00:16:04) zoom out 28.2075 28.7740 +\i (00:16:04) trapsize 22611 +\i (00:16:04) zoom out 1 +\i (00:16:04) setwindow pcb +\i (00:16:04) zoom out 22.7809 22.8951 +\i (00:16:04) trapsize 45222 +\i (00:16:04) zoom out 1 +\i (00:16:04) setwindow pcb +\i (00:16:04) zoom out 108.9274 10.2329 +\i (00:16:04) trapsize 90445 +\i (00:16:05) zoom in 1 +\i (00:16:05) setwindow pcb +\i (00:16:05) zoom in -18.5997 28.4315 +\i (00:16:05) trapsize 45222 +\i (00:16:05) zoom in 1 +\i (00:16:05) setwindow pcb +\i (00:16:05) zoom in -18.5997 28.4316 +\i (00:16:05) trapsize 22611 +\i (00:16:05) zoom in 1 +\i (00:16:05) setwindow pcb +\i (00:16:05) zoom in -18.5996 28.4316 +\i (00:16:05) trapsize 11306 +\i (00:16:05) zoom in 1 +\i (00:16:05) setwindow pcb +\i (00:16:05) zoom in -18.5996 28.4316 +\i (00:16:05) trapsize 5653 +\i (00:16:05) zoom in 1 +\i (00:16:05) setwindow pcb +\i (00:16:05) zoom in 7.9686 29.4492 +\i (00:16:05) trapsize 2826 +\i (00:16:06) zoom out 1 +\i (00:16:06) setwindow pcb +\i (00:16:06) zoom out 13.8475 31.0320 +\i (00:16:06) trapsize 5653 +\i (00:16:07) drag_start grid 36.0065 29.7884 +\i (00:16:07) drag_stop 32.3887 39.7373 +\i (00:16:08) drag_start grid -18.0342 33.1801 +\i (00:16:08) drag_stop -15.9992 47.0860 +\i (00:16:09) zoom in 1 +\i (00:16:09) setwindow pcb +\i (00:16:09) zoom in 35.1021 20.4048 +\i (00:16:09) trapsize 2826 +\i (00:16:09) zoom in 1 +\i (00:16:09) setwindow pcb +\i (00:16:09) zoom in 35.1021 20.4048 +\i (00:16:09) trapsize 1413 +\i (00:16:09) zoom in 1 +\i (00:16:09) setwindow pcb +\i (00:16:09) zoom in 35.1304 20.8005 +\i (00:16:09) trapsize 707 +\i (00:16:09) zoom in 1 +\i (00:16:09) setwindow pcb +\i (00:16:09) zoom in 35.2717 21.7756 +\i (00:16:09) trapsize 353 +\i (00:16:09) zoom in 1 +\i (00:16:09) setwindow pcb +\i (00:16:09) zoom in 35.2718 21.7756 +\i (00:16:09) trapsize 177 +\i (00:16:10) zoom out 1 +\i (00:16:10) setwindow pcb +\i (00:16:10) zoom out 35.3107 22.9026 +\i (00:16:10) trapsize 353 +\i (00:16:10) zoom out 1 +\i (00:16:10) setwindow pcb +\i (00:16:10) zoom out 35.2895 22.8956 +\i (00:16:10) trapsize 707 +\i (00:16:10) zoom in 1 +\i (00:16:10) setwindow pcb +\i (00:16:10) zoom in 37.1408 24.2805 +\i (00:16:10) trapsize 353 +\i (00:16:10) zoom in 1 +\i (00:16:10) setwindow pcb +\i (00:16:10) zoom in 37.1408 24.2805 +\i (00:16:10) trapsize 177 +\i (00:16:11) zoom in 1 +\i (00:16:11) setwindow pcb +\i (00:16:11) zoom in 36.2081 23.8848 +\i (00:16:11) trapsize 88 +\i (00:16:13) zoom out 1 +\i (00:16:13) setwindow pcb +\i (00:16:13) zoom out 36.3495 23.8407 +\i (00:16:13) trapsize 177 +\i (00:16:15) zoom out 1 +\i (00:16:15) setwindow pcb +\i (00:16:15) zoom out 36.3353 23.7559 +\i (00:16:15) trapsize 353 +\i (00:16:15) zoom out 1 +\i (00:16:15) setwindow pcb +\i (00:16:15) zoom out 36.3353 23.7559 +\i (00:16:15) trapsize 707 +\i (00:16:15) zoom out 1 +\i (00:16:15) setwindow pcb +\i (00:16:15) zoom out 35.9679 24.7876 +\i (00:16:15) trapsize 1413 +\i (00:16:16) zoom out 1 +\i (00:16:16) setwindow pcb +\i (00:16:16) zoom out 33.8199 27.5009 +\i (00:16:16) trapsize 2826 +\i (00:16:17) zoom in 1 +\i (00:16:17) setwindow pcb +\i (00:16:17) zoom in 34.9505 36.9411 +\i (00:16:17) trapsize 1413 +\i (00:16:17) zoom in 1 +\i (00:16:17) setwindow pcb +\i (00:16:17) zoom in 35.1766 36.7715 +\i (00:16:17) trapsize 707 +\i (00:16:17) zoom out 1 +\i (00:16:17) setwindow pcb +\i (00:16:17) zoom out 35.3038 32.6026 +\i (00:16:17) trapsize 1413 +\i (00:16:17) zoom out 1 +\i (00:16:17) setwindow pcb +\i (00:16:17) zoom out 35.3038 32.5178 +\i (00:16:17) trapsize 2826 +\i (00:16:18) zoom in 1 +\i (00:16:18) setwindow pcb +\i (00:16:18) zoom in 34.0037 22.1731 +\i (00:16:18) trapsize 1413 +\i (00:16:18) zoom in 1 +\i (00:16:18) setwindow pcb +\i (00:16:18) zoom in 34.2864 23.6994 +\i (00:16:18) trapsize 707 +\i (00:16:19) zoom in 1 +\i (00:16:19) setwindow pcb +\i (00:16:19) zoom in 34.3429 23.9256 +\i (00:16:19) trapsize 353 +\i (00:16:19) zoom out 1 +\i (00:16:19) setwindow pcb +\i (00:16:19) zoom out 31.8557 23.7631 +\i (00:16:19) trapsize 707 +\i (00:16:20) zoom out 1 +\i (00:16:20) setwindow pcb +\i (00:16:20) zoom out 31.9829 25.1621 +\i (00:16:20) trapsize 1413 +\i (00:16:20) zoom out 1 +\i (00:16:20) setwindow pcb +\i (00:16:20) zoom out 32.3787 25.3034 +\i (00:16:20) trapsize 2826 +\i (00:16:27) zoom out 1 +\i (00:16:27) setwindow pcb +\i (00:16:27) zoom out 40.4056 12.6977 +\i (00:16:27) trapsize 5653 +\i (00:16:27) zoom out 1 +\i (00:16:27) setwindow pcb +\i (00:16:27) zoom out 51.1460 15.9763 +\i (00:16:27) trapsize 11306 +\i (00:16:28) zoom in 1 +\i (00:16:28) setwindow pcb +\i (00:16:28) zoom in 19.9424 21.8553 +\i (00:16:28) trapsize 5653 +\i (00:16:28) zoom in 1 +\i (00:16:28) setwindow pcb +\i (00:16:28) zoom in 24.6908 21.8553 +\i (00:16:28) trapsize 2826 +\i (00:16:29) zoom in 1 +\i (00:16:29) setwindow pcb +\i (00:16:29) zoom in 29.9479 17.0505 +\i (00:16:29) trapsize 1413 +\i (00:16:30) zoom in 1 +\i (00:16:30) setwindow pcb +\i (00:16:30) zoom in 25.9910 17.3614 +\i (00:16:30) trapsize 707 +\i (00:16:30) zoom in 1 +\i (00:16:30) setwindow pcb +\i (00:16:30) zoom in 26.4997 17.6441 +\i (00:16:30) trapsize 353 +\i (00:16:31) zoom out 1 +\i (00:16:31) setwindow pcb +\i (00:16:31) zoom out 25.3692 18.3012 +\i (00:16:31) trapsize 707 +\i (00:16:32) zoom out 1 +\i (00:16:32) setwindow pcb +\i (00:16:32) zoom out 27.5737 18.0045 +\i (00:16:32) trapsize 1413 +\i (00:16:33) zoom out 1 +\i (00:16:33) setwindow pcb +\i (00:16:33) zoom out 34.6680 17.9196 +\i (00:16:33) trapsize 2826 +\i (00:16:33) zoom out 1 +\i (00:16:33) setwindow pcb +\i (00:16:33) zoom out 34.6680 17.9197 +\i (00:16:33) trapsize 5653 +\i (00:16:34) zoom in 1 +\i (00:16:34) setwindow pcb +\i (00:16:34) zoom in 19.2924 23.1202 +\i (00:16:34) trapsize 2826 +\i (00:16:35) zoom in 1 +\i (00:16:35) setwindow pcb +\i (00:16:35) zoom in 19.2924 23.1768 +\i (00:16:35) trapsize 1413 +\i (00:16:35) zoom out 1 +\i (00:16:35) setwindow pcb +\i (00:16:35) zoom out 20.4230 23.3747 +\i (00:16:35) trapsize 2826 +\i (00:16:36) zoom in 1 +\i (00:16:36) setwindow pcb +\i (00:16:36) zoom in 36.9291 24.2791 +\i (00:16:36) trapsize 1413 +\i (00:16:36) zoom in 1 +\i (00:16:36) setwindow pcb +\i (00:16:36) zoom in 36.9291 24.2508 +\i (00:16:36) trapsize 707 +\i (00:16:47) zoom out 1 +\i (00:16:47) setwindow pcb +\i (00:16:47) zoom out 37.7205 24.2650 +\i (00:16:47) trapsize 1413 +\i (00:16:48) zoom out 1 +\i (00:16:48) setwindow pcb +\i (00:16:48) zoom out 37.4096 25.5369 +\i (00:16:48) trapsize 2826 +\i (00:16:53) zoom in 1 +\i (00:16:53) setwindow pcb +\i (00:16:53) zoom in 34.6963 23.6715 +\i (00:16:53) trapsize 1413 +\i (00:16:53) zoom in 1 +\i (00:16:53) setwindow pcb +\i (00:16:53) zoom in 34.6963 23.6715 +\i (00:16:53) trapsize 707 +\i (00:16:54) zoom in 1 +\i (00:16:54) setwindow pcb +\i (00:16:54) zoom in 34.8659 23.6856 +\i (00:16:54) trapsize 353 +\i (00:18:46) zoom out 1 +\i (00:18:46) setwindow pcb +\i (00:18:46) zoom out 33.3609 23.1274 +\i (00:18:46) trapsize 707 +\i (00:18:46) zoom out 1 +\i (00:18:46) setwindow pcb +\i (00:18:46) zoom out 33.2337 23.1133 +\i (00:18:46) trapsize 1413 +\i (00:18:46) zoom out 1 +\i (00:18:46) setwindow pcb +\i (00:18:46) zoom out 33.0359 23.0002 +\i (00:18:46) trapsize 2826 +\i (00:18:47) zoom out 1 +\i (00:18:47) setwindow pcb +\i (00:18:47) zoom out 32.8662 24.0176 +\i (00:18:47) trapsize 5653 +\i (00:18:47) zoom out 1 +\i (00:18:47) setwindow pcb +\i (00:18:47) zoom out 32.8663 24.0177 +\i (00:18:47) trapsize 11306 +\i (00:18:47) zoom out 1 +\i (00:18:47) setwindow pcb +\i (00:18:47) zoom out 32.8662 24.0177 +\i (00:18:47) trapsize 22611 +\i (00:18:47) zoom in 1 +\i (00:18:47) setwindow pcb +\i (00:18:47) zoom in -37.5931 84.6156 +\i (00:18:47) trapsize 11306 +\i (00:18:47) zoom in 1 +\i (00:18:47) setwindow pcb +\i (00:18:47) zoom in -14.0774 83.2590 +\i (00:18:47) trapsize 5653 +\i (00:18:47) zoom in 1 +\i (00:18:47) setwindow pcb +\i (00:18:47) zoom in -5.5982 83.4851 +\i (00:18:47) trapsize 2826 +\i (00:18:48) zoom in 1 +\i (00:18:48) setwindow pcb +\i (00:18:48) zoom in 32.5017 85.5202 +\i (00:18:48) trapsize 1413 +\i (00:18:48) zoom in 1 +\i (00:18:48) setwindow pcb +\i (00:18:48) zoom in 26.2836 85.1811 +\i (00:18:48) trapsize 707 +\i (00:18:48) zoom out 1 +\i (00:18:48) setwindow pcb +\i (00:18:48) zoom out 22.3408 86.5661 +\i (00:18:48) trapsize 1413 +\i (00:18:49) zoom out 1 +\i (00:18:49) setwindow pcb +\i (00:18:49) zoom out 20.1928 87.4988 +\i (00:18:49) trapsize 2826 +\i (00:18:49) zoom out 1 +\i (00:18:49) setwindow pcb +\i (00:18:49) zoom out 20.1928 87.4987 +\i (00:18:49) trapsize 5653 +\i (00:18:50) zoom in 1 +\i (00:18:50) setwindow pcb +\i (00:18:50) zoom in 16.8012 94.9604 +\i (00:18:50) trapsize 2826 +\i (00:18:50) zoom in 1 +\i (00:18:50) setwindow pcb +\i (00:18:50) zoom in 16.8012 94.9604 +\i (00:18:50) trapsize 1413 +\i (00:18:51) zoom in 1 +\i (00:18:51) setwindow pcb +\i (00:18:51) zoom in 18.1296 92.1906 +\i (00:18:51) trapsize 707 +\i (00:18:51) zoom in 1 +\i (00:18:51) setwindow pcb +\i (00:18:51) zoom in 18.1014 92.1623 +\i (00:18:51) trapsize 353 +\i (00:18:52) zoom out 1 +\i (00:18:52) setwindow pcb +\i (00:18:52) zoom out 19.1260 91.2367 +\i (00:18:52) trapsize 707 +\i (00:28:15) zoom out 1 +\i (00:28:15) setwindow pcb +\i (00:28:15) zoom out 20.6240 92.1411 +\i (00:28:15) trapsize 1413 +\i (00:28:15) zoom out 1 +\i (00:28:15) setwindow pcb +\i (00:28:15) zoom out 20.1718 91.5193 +\i (00:28:15) trapsize 2826 +\i (00:28:15) zoom out 1 +\i (00:28:15) setwindow pcb +\i (00:28:15) zoom out 23.4504 89.6538 +\i (00:28:15) trapsize 5653 +\i (00:28:15) zoom out 1 +\i (00:28:15) setwindow pcb +\i (00:28:15) zoom out 23.5635 88.9756 +\i (00:28:15) trapsize 11306 +\i (00:28:16) zoom in 1 +\i (00:28:16) setwindow pcb +\i (00:28:16) zoom in 60.3133 82.1922 +\i (00:28:16) trapsize 5653 +\i (00:28:17) zoom in 1 +\i (00:28:17) setwindow pcb +\i (00:28:17) zoom in 8.9860 87.2797 +\i (00:28:17) trapsize 2826 +\i (00:28:17) zoom in 1 +\i (00:28:17) setwindow pcb +\i (00:28:17) zoom in 7.3467 86.9405 +\i (00:28:17) trapsize 1413 +\i (00:28:17) zoom in 1 +\i (00:28:17) setwindow pcb +\i (00:28:17) zoom in 7.3468 87.0254 +\i (00:28:17) trapsize 707 +\i (00:28:19) zoom out 1 +\i (00:28:19) setwindow pcb +\i (00:28:19) zoom out 7.5164 87.1526 +\i (00:28:19) trapsize 1413 +\i (00:28:20) zoom in 1 +\i (00:28:20) setwindow pcb +\i (00:28:20) zoom in 13.3105 90.0638 +\i (00:28:20) trapsize 707 +\i (00:28:21) zoom in 1 +\i (00:28:21) setwindow pcb +\i (00:28:21) zoom in 15.6989 89.1028 +\i (00:28:21) trapsize 353 +\i (00:28:23) zoom out 1 +\i (00:28:23) setwindow pcb +\i (00:28:23) zoom out 15.5505 88.9545 +\i (00:28:23) trapsize 707 +\i (00:28:23) zoom in 1 +\i (00:28:23) setwindow pcb +\i (00:28:23) zoom in 15.5505 88.9545 +\i (00:28:23) trapsize 353 +\i (00:28:24) zoom in 1 +\i (00:28:24) setwindow pcb +\i (00:28:24) zoom in 15.5505 88.9545 +\i (00:28:24) trapsize 177 +\i (00:28:25) zoom out 1 +\i (00:28:25) setwindow pcb +\i (00:28:25) zoom out 15.5505 88.9545 +\i (00:28:25) trapsize 353 +\i (00:28:26) zoom in 1 +\i (00:28:26) setwindow pcb +\i (00:28:26) zoom in 13.1763 89.3573 +\i (00:28:26) trapsize 177 +\i (00:28:26) zoom out 1 +\i (00:28:26) setwindow pcb +\i (00:28:26) zoom out 12.7170 89.4456 +\i (00:28:26) trapsize 353 +\i (00:28:26) zoom in 1 +\i (00:28:26) setwindow pcb +\i (00:28:26) zoom in 12.7170 89.4457 +\i (00:28:26) trapsize 177 +\i (00:28:26) zoom in 1 +\i (00:28:26) setwindow pcb +\i (00:28:26) zoom in 12.7170 89.4457 +\i (00:28:26) trapsize 88 +\i (00:28:27) zoom out 1 +\i (00:28:27) setwindow pcb +\i (00:28:27) zoom out 12.7170 89.4457 +\i (00:28:27) trapsize 177 +\i (00:28:28) zoom in 1 +\i (00:28:28) setwindow pcb +\i (00:28:28) zoom in 12.7170 89.4457 +\i (00:28:28) trapsize 88 +\i (00:28:28) zoom out 1 +\i (00:28:28) setwindow pcb +\i (00:28:28) zoom out 12.7170 89.4457 +\i (00:28:28) trapsize 177 +\i (00:28:28) zoom out 1 +\i (00:28:28) setwindow pcb +\i (00:28:28) zoom out 12.7170 89.4422 +\i (00:28:28) trapsize 353 +\i (00:28:29) zoom out 1 +\i (00:28:29) setwindow pcb +\i (00:28:29) zoom out 12.7170 89.4069 +\i (00:28:29) trapsize 707 +\i (00:28:29) zoom out 1 +\i (00:28:29) setwindow pcb +\i (00:28:29) zoom out 12.6747 89.0960 +\i (00:28:29) trapsize 1413 +\i (00:28:29) zoom out 1 +\i (00:28:29) setwindow pcb +\i (00:28:29) zoom out 12.5334 88.5307 +\i (00:28:29) trapsize 2826 +\i (00:28:29) zoom out 1 +\i (00:28:29) setwindow pcb +\i (00:28:29) zoom out 12.5334 87.2871 +\i (00:28:29) trapsize 5653 +\i (00:28:29) zoom out 1 +\i (00:28:29) setwindow pcb +\i (00:28:29) zoom out 18.6384 82.4257 +\i (00:28:29) trapsize 11306 +\i (00:28:29) zoom out 1 +\i (00:28:29) setwindow pcb +\i (00:28:29) zoom out 19.5427 74.9640 +\i (00:28:29) trapsize 22611 +\i (00:28:30) zoom in 1 +\i (00:28:30) setwindow pcb +\i (00:28:30) zoom in -8.9474 10.7482 +\i (00:28:30) trapsize 11306 +\i (00:28:30) zoom in 1 +\i (00:28:30) setwindow pcb +\i (00:28:30) zoom in -8.9474 10.7482 +\i (00:28:30) trapsize 5653 +\i (00:36:11) zoom in 1 +\i (00:36:11) setwindow pcb +\i (00:36:11) zoom in 5.1846 56.7619 +\i (00:36:11) trapsize 2826 +\i (00:36:11) zoom in 1 +\i (00:36:11) setwindow pcb +\i (00:36:11) zoom in 5.1846 56.7620 +\i (00:36:11) trapsize 1413 +\i (00:36:11) zoom in 1 +\i (00:36:11) setwindow pcb +\i (00:36:11) zoom in 5.1847 56.7620 +\i (00:36:11) trapsize 707 +\i (00:36:11) zoom in 1 +\i (00:36:11) setwindow pcb +\i (00:36:11) zoom in 10.1733 56.5641 +\i (00:36:11) trapsize 353 +\i (00:38:18) zoom out 1 +\i (00:38:18) setwindow pcb +\i (00:38:18) zoom out 9.2759 56.6489 +\i (00:38:18) trapsize 707 +\i (00:38:18) zoom out 1 +\i (00:38:18) setwindow pcb +\i (00:38:18) zoom out 9.2619 56.5359 +\i (00:38:18) trapsize 1413 +\i (00:38:18) zoom out 1 +\i (00:38:18) setwindow pcb +\i (00:38:18) zoom out 9.1488 56.3945 +\i (00:38:18) trapsize 2826 +\i (00:38:18) zoom out 1 +\i (00:38:18) setwindow pcb +\i (00:38:18) zoom out 9.1488 56.2815 +\i (00:38:18) trapsize 5653 +\i (00:38:18) zoom out 1 +\i (00:38:18) setwindow pcb +\i (00:38:18) zoom out 9.1488 56.2815 +\i (00:38:18) trapsize 11306 +\i (00:38:19) zoom out 1 +\i (00:38:19) setwindow pcb +\i (00:38:19) zoom out 14.5754 75.0488 +\i (00:38:19) trapsize 22611 +\i (00:38:19) zoom out 1 +\i (00:38:19) setwindow pcb +\i (00:38:19) zoom out 116.1630 183.0921 +\i (00:38:19) trapsize 45222 +\i (00:38:19) zoom out 1 +\i (00:38:19) setwindow pcb +\i (00:38:19) zoom out 336.8482 449.9041 +\i (00:38:19) trapsize 90445 +\i (00:38:20) zoom in 1 +\i (00:38:20) setwindow pcb +\i (00:38:20) zoom in -31.2620 98.9785 +\i (00:38:20) trapsize 45222 +\i (00:38:21) zoom in 1 +\i (00:38:21) setwindow pcb +\i (00:38:21) zoom in -33.0709 67.3229 +\i (00:38:21) trapsize 22611 +\i (00:38:21) zoom in 1 +\i (00:38:21) setwindow pcb +\i (00:38:21) zoom in -33.0708 67.3229 +\i (00:38:21) trapsize 11306 +\i (00:38:22) zoom in 1 +\i (00:38:22) setwindow pcb +\i (00:38:22) zoom in 27.7533 89.2557 +\i (00:38:22) trapsize 5653 +\i (00:38:22) zoom in 1 +\i (00:38:22) setwindow pcb +\i (00:38:22) zoom in 25.9445 88.6904 +\i (00:38:22) trapsize 2826 +\i (00:38:22) zoom out 1 +\i (00:38:22) setwindow pcb +\i (00:38:22) zoom out 25.4923 87.6730 +\i (00:38:22) trapsize 5653 +\i (00:38:23) zoom in 1 +\i (00:38:23) setwindow pcb +\i (00:38:23) zoom in 47.6512 90.7254 +\i (00:38:23) trapsize 2826 +\i (00:38:23) zoom in 1 +\i (00:38:23) setwindow pcb +\i (00:38:23) zoom in 51.5517 91.8560 +\i (00:38:23) trapsize 1413 +\i (00:38:23) zoom in 1 +\i (00:38:23) setwindow pcb +\i (00:38:23) zoom in 51.5517 91.8843 +\i (00:38:23) trapsize 707 +\i (00:38:24) zoom out 1 +\i (00:38:24) setwindow pcb +\i (00:38:24) zoom out 50.3082 91.2908 +\i (00:38:24) trapsize 1413 +\i (00:38:24) zoom out 1 +\i (00:38:24) setwindow pcb +\i (00:38:24) zoom out 50.2233 91.1777 +\i (00:38:24) trapsize 2826 +\i (00:38:25) zoom out 1 +\i (00:38:25) setwindow pcb +\i (00:38:25) zoom out 31.5126 88.5773 +\i (00:38:25) trapsize 5653 +\i (00:38:25) zoom out 1 +\i (00:38:25) setwindow pcb +\i (00:38:25) zoom out 20.4331 90.7254 +\i (00:38:25) trapsize 11306 +\i (00:38:26) zoom out 1 +\i (00:38:26) setwindow pcb +\i (00:38:26) zoom out 20.4329 88.0121 +\i (00:38:26) trapsize 22611 +\i (00:38:26) zoom out 1 +\i (00:38:26) setwindow pcb +\i (00:38:26) zoom out 20.4329 87.5599 +\i (00:38:26) trapsize 45222 +\i (00:38:26) zoom out 1 +\i (00:38:26) setwindow pcb +\i (00:38:26) zoom out 20.4329 87.5600 +\i (00:38:26) trapsize 90445 +\i (00:40:54) zoom in 1 +\i (00:40:54) setwindow pcb +\i (00:40:54) zoom in -15.7449 26.6227 +\i (00:40:54) trapsize 45222 +\i (00:40:54) zoom in 1 +\i (00:40:54) setwindow pcb +\i (00:40:54) zoom in -14.8405 26.6227 +\i (00:40:54) trapsize 22611 +\i (00:40:54) zoom in 1 +\i (00:40:54) setwindow pcb +\i (00:40:54) zoom in -14.3882 26.6228 +\i (00:40:54) trapsize 11306 +\i (00:40:54) zoom in 1 +\i (00:40:54) setwindow pcb +\i (00:40:54) zoom in -1.0476 49.0079 +\i (00:40:54) trapsize 5653 +\i (00:40:54) zoom in 1 +\i (00:40:54) setwindow pcb +\i (00:40:54) zoom in -1.0476 49.0079 +\i (00:40:54) trapsize 2826 +\i (00:40:55) zoom in 1 +\i (00:40:55) setwindow pcb +\i (00:40:55) zoom in 3.2486 55.5086 +\i (00:40:55) trapsize 1413 +\i (00:40:55) zoom out 1 +\i (00:40:55) setwindow pcb +\i (00:40:55) zoom out 5.3119 60.3983 +\i (00:40:55) trapsize 2826 +\i (00:40:55) zoom out 1 +\i (00:40:55) setwindow pcb +\i (00:40:55) zoom out 5.3119 60.3984 +\i (00:40:55) trapsize 5653 +\i (00:41:09) zoom in 1 +\i (00:41:09) setwindow pcb +\i (00:41:09) zoom in 11.1909 65.1467 +\i (00:41:09) trapsize 2826 +\i (00:41:10) zoom in 1 +\i (00:41:10) setwindow pcb +\i (00:41:10) zoom in 11.1909 65.1467 +\i (00:41:10) trapsize 1413 +\i (00:41:10) zoom in 1 +\i (00:41:10) setwindow pcb +\i (00:41:10) zoom in 9.4668 65.0619 +\i (00:41:10) trapsize 707 +\i (00:41:11) zoom in 1 +\i (00:41:11) setwindow pcb +\i (00:41:11) zoom in 9.2407 65.7686 +\i (00:41:11) trapsize 353 +\i (00:41:11) zoom in 1 +\i (00:41:11) setwindow pcb +\i (00:41:11) zoom in 11.2050 65.3093 +\i (00:41:11) trapsize 177 +\i (00:41:12) zoom out 1 +\i (00:41:12) setwindow pcb +\i (00:41:12) zoom out 11.3923 65.2528 +\i (00:41:12) trapsize 353 +\i (00:41:14) drag_start grid 10.7352 65.2246 +\i (00:41:14) drag_stop 10.9754 65.2246 +\i (00:41:14) zoom out 1 +\i (00:41:14) setwindow pcb +\i (00:41:14) zoom out 11.1521 65.1398 +\i (00:41:14) trapsize 707 +\i (00:41:15) zoom in 1 +\i (00:41:15) setwindow pcb +\i (00:41:15) zoom in 5.8809 65.5638 +\i (00:41:15) trapsize 353 +\i (00:41:16) zoom in 1 +\i (00:41:16) setwindow pcb +\i (00:41:16) zoom in 9.8166 65.4719 +\i (00:41:16) trapsize 177 +\i (00:43:11) zoom out 1 +\i (00:43:11) setwindow pcb +\i (00:43:11) zoom out 9.3291 65.8005 +\i (00:43:11) trapsize 353 +\i (00:52:31) zoom out 1 +\i (00:52:31) setwindow pcb +\i (00:52:31) zoom out 9.2655 65.2070 +\i (00:52:31) trapsize 707 +\i (00:52:31) zoom out 1 +\i (00:52:31) setwindow pcb +\i (00:52:31) zoom out 9.1525 65.0940 +\i (00:52:31) trapsize 1413 +\i (00:52:31) zoom in 1 +\i (00:52:31) setwindow pcb +\i (00:52:31) zoom in 8.4177 64.5571 +\i (00:52:31) trapsize 707 +\i (00:52:31) zoom out 1 +\i (00:52:31) setwindow pcb +\i (00:52:31) zoom out 8.3612 64.5147 +\i (00:52:31) trapsize 1413 +\i (00:52:32) zoom out 1 +\i (00:52:32) setwindow pcb +\i (00:52:32) zoom out 8.1068 62.5646 +\i (00:52:32) trapsize 2826 +\i (00:52:32) zoom out 1 +\i (00:52:32) setwindow pcb +\i (00:52:32) zoom out 9.4069 62.4515 +\i (00:52:32) trapsize 5653 +\i (00:52:32) zoom out 1 +\i (00:52:32) setwindow pcb +\i (00:52:32) zoom out 9.8591 63.0167 +\i (00:52:32) trapsize 11306 +\i (00:52:32) zoom out 1 +\i (00:52:32) setwindow pcb +\i (00:52:32) zoom out 25.7182 70.0262 +\i (00:52:32) trapsize 22611 +\i (00:52:32) zoom in 1 +\i (00:52:32) setwindow pcb +\i (00:52:32) zoom in 154.1498 87.2206 +\i (00:52:32) trapsize 11306 +\i (00:52:33) zoom out 1 +\i (00:52:33) setwindow pcb +\i (00:52:33) zoom out 38.3805 78.8545 +\i (00:52:33) trapsize 22611 +\i (00:52:33) zoom out 1 +\i (00:52:33) setwindow pcb +\i (00:52:33) zoom out 38.3805 77.4978 +\i (00:52:33) trapsize 45222 +\i (00:52:33) zoom out 1 +\i (00:52:33) setwindow pcb +\i (00:52:33) zoom out 38.3805 238.2634 +\i (00:52:33) trapsize 90445 +\i (00:52:34) zoom in 1 +\i (00:52:34) setwindow pcb +\i (00:52:34) zoom in -24.9309 60.9917 +\i (00:52:34) trapsize 45222 +\i (00:52:34) zoom in 1 +\i (00:52:34) setwindow pcb +\i (00:52:34) zoom in -14.9820 107.1186 +\i (00:52:34) trapsize 22611 +\i (00:52:34) zoom in 1 +\i (00:52:34) setwindow pcb +\i (00:52:34) zoom in -15.8864 102.1442 +\i (00:52:34) trapsize 11306 +\i (00:52:34) zoom in 1 +\i (00:52:34) setwindow pcb +\i (00:52:34) zoom in -15.8864 100.3353 +\i (00:52:34) trapsize 5653 +\i (00:52:35) zoom out 1 +\i (00:52:35) setwindow pcb +\i (00:52:35) zoom out 18.7087 95.4740 +\i (00:52:35) trapsize 11306 +\i (00:52:35) zoom out 1 +\i (00:52:35) setwindow pcb +\i (00:52:35) zoom out 18.0304 95.0217 +\i (00:52:35) trapsize 22611 +\i (00:52:35) zoom in 1 +\i (00:52:35) setwindow pcb +\i (00:52:35) zoom in 6.7248 77.8372 +\i (00:52:35) trapsize 11306 +\i (00:52:35) zoom in 1 +\i (00:52:35) setwindow pcb +\i (00:52:35) zoom in 6.7248 78.0634 +\i (00:52:35) trapsize 5653 +\i (00:52:36) zoom in 1 +\i (00:52:36) setwindow pcb +\i (00:52:36) zoom in 12.4906 83.9423 +\i (00:52:36) trapsize 2826 +\i (00:52:36) zoom in 1 +\i (00:52:36) setwindow pcb +\i (00:52:36) zoom in 12.4906 83.9989 +\i (00:52:36) trapsize 1413 +\i (00:52:36) zoom in 1 +\i (00:52:36) setwindow pcb +\i (00:52:36) zoom in 17.6630 88.6342 +\i (00:52:36) trapsize 707 +\i (00:52:59) zoom out 1 +\i (00:52:59) setwindow pcb +\i (00:52:59) zoom out 27.9229 89.8354 +\i (00:52:59) trapsize 1413 +\i (00:52:59) zoom out 1 +\i (00:52:59) setwindow pcb +\i (00:52:59) zoom out 26.4814 89.3549 +\i (00:52:59) trapsize 2826 +\i (00:52:59) zoom out 1 +\i (00:52:59) setwindow pcb +\i (00:52:59) zoom out 20.1502 91.7291 +\i (00:52:59) trapsize 5653 +\i (00:52:59) zoom out 1 +\i (00:52:59) setwindow pcb +\i (00:52:59) zoom out 20.6024 80.4236 +\i (00:52:59) trapsize 11306 +\i (00:53:03) zoom in 1 +\i (00:53:03) setwindow pcb +\i (00:53:03) zoom in -5.7113 94.6686 +\i (00:53:03) trapsize 5653 +\i (00:53:03) zoom in 1 +\i (00:53:03) setwindow pcb +\i (00:53:03) zoom in -5.5982 93.8772 +\i (00:53:03) trapsize 2826 +\i (00:53:04) zoom in 1 +\i (00:53:04) setwindow pcb +\i (00:53:04) zoom in 21.0830 90.2594 +\i (00:53:04) trapsize 1413 +\i (00:53:04) zoom in 1 +\i (00:53:04) setwindow pcb +\i (00:53:04) zoom in 21.3092 90.4573 +\i (00:53:04) trapsize 707 +\i (00:53:05) zoom in 1 +\i (00:53:05) setwindow pcb +\i (00:53:05) zoom in 24.7857 90.1464 +\i (00:53:05) trapsize 353 +\i (00:53:05) zoom out 1 +\i (00:53:05) setwindow pcb +\i (00:53:05) zoom out 24.7291 90.1252 +\i (00:53:05) trapsize 707 +\i (00:53:05) zoom out 1 +\i (00:53:05) setwindow pcb +\i (00:53:05) zoom out 24.7292 90.1253 +\i (00:53:05) trapsize 1413 +\i (00:53:06) zoom in 1 +\i (00:53:06) setwindow pcb +\i (00:53:06) zoom in 27.0469 90.1535 +\i (00:53:06) trapsize 707 +\i (00:53:07) zoom out 1 +\i (00:53:07) setwindow pcb +\i (00:53:07) zoom out 27.3437 90.3090 +\i (00:53:07) trapsize 1413 +\i (00:53:07) zoom out 1 +\i (00:53:07) setwindow pcb +\i (00:53:07) zoom out 27.6829 89.4610 +\i (00:53:07) trapsize 2826 +\i (00:53:08) zoom in 1 +\i (00:53:08) setwindow pcb +\i (00:53:08) zoom in 27.6830 89.4610 +\i (00:53:08) trapsize 1413 +\i (00:53:08) zoom in 1 +\i (00:53:08) setwindow pcb +\i (00:53:08) zoom in 27.7113 89.4610 +\i (00:53:08) trapsize 707 +\i (00:53:09) zoom out 1 +\i (00:53:09) setwindow pcb +\i (00:53:09) zoom out 27.0189 89.6730 +\i (00:53:09) trapsize 1413 +\i (00:53:09) zoom out 1 +\i (00:53:09) setwindow pcb +\i (00:53:09) zoom out 27.0189 89.6730 +\i (00:53:09) trapsize 2826 +\i (00:53:10) zoom out 1 +\i (00:53:10) setwindow pcb +\i (00:53:10) zoom out 29.3365 87.6379 +\i (00:53:10) trapsize 5653 +\i (00:53:11) zoom in 1 +\i (00:53:11) setwindow pcb +\i (00:53:11) zoom in 40.0763 88.3163 +\i (00:53:11) trapsize 2826 +\i (00:53:11) zoom in 1 +\i (00:53:11) setwindow pcb +\i (00:53:11) zoom in 37.3065 88.6555 +\i (00:53:11) trapsize 1413 +\i (00:53:11) zoom in 1 +\i (00:53:11) setwindow pcb +\i (00:53:11) zoom in 33.8583 89.6165 +\i (00:53:11) trapsize 707 +\i (00:53:13) zoom in 1 +\i (00:53:13) setwindow pcb +\i (00:53:13) zoom in 32.2756 90.1111 +\i (00:53:13) trapsize 353 +\i (00:53:13) zoom out 1 +\i (00:53:13) setwindow pcb +\i (00:53:13) zoom out 32.7702 89.9556 +\i (00:53:13) trapsize 707 +\i (00:53:14) zoom out 1 +\i (00:53:14) setwindow pcb +\i (00:53:14) zoom out 34.6922 90.2666 +\i (00:53:14) trapsize 1413 +\i (00:53:15) zoom out 1 +\i (00:53:15) setwindow pcb +\i (00:53:15) zoom out 36.8402 89.6731 +\i (00:53:15) trapsize 2826 +\i (00:53:16) zoom in 1 +\i (00:53:16) setwindow pcb +\i (00:53:16) zoom in 40.4015 89.1078 +\i (00:53:16) trapsize 1413 +\i (00:53:16) zoom in 1 +\i (00:53:16) setwindow pcb +\i (00:53:16) zoom in 40.4015 89.1079 +\i (00:53:16) trapsize 707 +\i (00:53:16) zoom in 1 +\i (00:53:16) setwindow pcb +\i (00:53:16) zoom in 40.4015 89.1079 +\i (00:53:16) trapsize 353 +\i (00:53:17) zoom out 1 +\i (00:53:17) setwindow pcb +\i (00:53:17) zoom out 40.0765 89.1927 +\i (00:53:17) trapsize 707 +\i (01:06:24) zoom out 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom out 36.0631 89.7722 +\i (01:06:24) trapsize 1413 +\i (01:06:24) zoom in 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom in 36.0348 89.7440 +\i (01:06:24) trapsize 707 +\i (01:06:24) zoom out 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom out 35.9924 89.6875 +\i (01:06:24) trapsize 1413 +\i (01:06:24) zoom out 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom out 35.5120 89.0374 +\i (01:06:24) trapsize 2826 +\i (01:06:24) zoom out 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom out 35.5120 89.0373 +\i (01:06:24) trapsize 5653 +\i (01:06:24) zoom out 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom out 23.9802 95.5946 +\i (01:06:24) trapsize 11306 +\i (01:06:24) zoom out 1 +\i (01:06:24) setwindow pcb +\i (01:06:24) zoom out 96.4912 87.0023 +\i (01:06:24) trapsize 22611 +\i (01:06:25) zoom out 1 +\i (01:06:25) setwindow pcb +\i (01:06:25) zoom out 300.6703 77.0534 +\i (01:06:25) trapsize 45222 +\i (01:06:25) zoom in 1 +\i (01:06:25) setwindow pcb +\i (01:06:25) zoom in -45.7331 36.5716 +\i (01:06:25) trapsize 22611 +\i (01:06:25) zoom in 1 +\i (01:06:25) setwindow pcb +\i (01:06:25) zoom in -44.3764 36.5716 +\i (01:06:25) trapsize 11306 +\i (01:06:26) zoom in 1 +\i (01:06:26) setwindow pcb +\i (01:06:26) zoom in -2.7718 36.3455 +\i (01:06:26) trapsize 5653 +\i (01:06:26) zoom in 1 +\i (01:06:26) setwindow pcb +\i (01:06:26) zoom in -5.3721 36.0063 +\i (01:06:26) trapsize 2826 +\i (01:06:26) zoom out 1 +\i (01:06:26) setwindow pcb +\i (01:06:26) zoom out 41.3766 42.5636 +\i (01:06:26) trapsize 5653 +\i (01:06:27) zoom in 1 +\i (01:06:27) setwindow pcb +\i (01:06:27) zoom in 58.3349 52.2863 +\i (01:06:27) trapsize 2826 +\i (01:06:28) zoom in 1 +\i (01:06:28) setwindow pcb +\i (01:06:28) zoom in 58.6176 55.5084 +\i (01:06:28) trapsize 1413 +\i (01:06:28) zoom in 1 +\i (01:06:28) setwindow pcb +\i (01:06:28) zoom in 58.8438 57.0065 +\i (01:06:28) trapsize 707 +\i (01:06:30) zoom in 1 +\i (01:06:30) setwindow pcb +\i (01:06:30) zoom in 54.3923 57.5576 +\i (01:06:30) trapsize 353 +\i (01:06:31) zoom in 1 +\i (01:06:31) setwindow pcb +\i (01:06:31) zoom in 54.1591 57.7131 +\i (01:06:31) trapsize 177 +\i (01:06:31) zoom out 1 +\i (01:06:31) setwindow pcb +\i (01:06:31) zoom out 54.1910 57.7167 +\i (01:06:31) trapsize 353 +\i (01:06:31) zoom out 1 +\i (01:06:31) setwindow pcb +\i (01:06:31) zoom out 54.1838 57.7025 +\i (01:06:31) trapsize 707 +\i (01:06:31) zoom out 1 +\i (01:06:31) setwindow pcb +\i (01:06:31) zoom out 54.1698 57.5895 +\i (01:06:31) trapsize 1413 +\i (01:06:32) zoom in 1 +\i (01:06:32) setwindow pcb +\i (01:06:32) zoom in 60.2466 57.7592 +\i (01:06:32) trapsize 707 +\i (01:06:32) zoom in 1 +\i (01:06:32) setwindow pcb +\i (01:06:32) zoom in 60.9956 58.0560 +\i (01:06:32) trapsize 353 +\i (01:06:32) zoom out 1 +\i (01:06:32) setwindow pcb +\i (01:06:32) zoom out 60.6281 57.6603 +\i (01:06:32) trapsize 707 +\i (01:06:32) zoom out 1 +\i (01:06:32) setwindow pcb +\i (01:06:32) zoom out 60.5858 57.4907 +\i (01:06:32) trapsize 1413 +\i (01:06:33) zoom out 1 +\i (01:06:33) setwindow pcb +\i (01:06:33) zoom out 59.0596 56.9255 +\i (01:06:33) trapsize 2826 +\i (01:06:33) zoom out 1 +\i (01:06:33) setwindow pcb +\i (01:06:33) zoom out 58.7770 56.3602 +\i (01:06:33) trapsize 5653 +\i (01:06:37) zoom out 1 +\i (01:06:37) setwindow pcb +\i (01:06:37) zoom out 72.2307 30.9226 +\i (01:06:37) trapsize 11306 +\i (01:06:37) zoom out 1 +\i (01:06:37) setwindow pcb +\i (01:06:37) zoom out 159.1242 30.9227 +\i (01:06:37) trapsize 22611 +\i (01:06:38) zoom in 1 +\i (01:06:38) setwindow pcb +\i (01:06:38) zoom in 98.0740 24.1393 +\i (01:06:38) trapsize 11306 +\i (01:06:39) zoom in 1 +\i (01:06:39) setwindow pcb +\i (01:06:39) zoom in 53.7561 22.1043 +\i (01:06:39) trapsize 5653 +\i (01:06:39) zoom in 1 +\i (01:06:39) setwindow pcb +\i (01:06:39) zoom in 53.7561 22.1043 +\i (01:06:39) trapsize 2826 +\i (01:06:40) zoom in 1 +\i (01:06:40) setwindow pcb +\i (01:06:40) zoom in 62.1788 33.0708 +\i (01:06:40) trapsize 1413 +\i (01:06:41) zoom out 1 +\i (01:06:41) setwindow pcb +\i (01:06:41) zoom out 65.7966 34.5123 +\i (01:06:41) trapsize 2826 +\i (01:06:41) zoom in 1 +\i (01:06:41) setwindow pcb +\i (01:06:41) zoom in 64.7226 42.2001 +\i (01:06:41) trapsize 1413 +\i (01:06:41) zoom in 1 +\i (01:06:41) setwindow pcb +\i (01:06:41) zoom in 66.4750 42.9915 +\i (01:06:41) trapsize 707 +\i (01:10:08) zoom out 1 +\i (01:10:08) setwindow pcb +\i (01:10:08) zoom out 63.0692 39.9814 +\i (01:10:08) trapsize 1413 +\i (01:10:08) zoom out 1 +\i (01:10:08) setwindow pcb +\i (01:10:08) zoom out 62.8713 39.9248 +\i (01:10:08) trapsize 2826 +\i (01:10:09) zoom out 1 +\i (01:10:09) setwindow pcb +\i (01:10:09) zoom out 49.8698 43.3165 +\i (01:10:09) trapsize 5653 +\i (01:10:09) zoom out 1 +\i (01:10:09) setwindow pcb +\i (01:10:09) zoom out 49.7568 43.3166 +\i (01:10:09) trapsize 11306 +\i (01:10:09) zoom out 1 +\i (01:10:09) setwindow pcb +\i (01:10:09) zoom out 49.7568 43.3166 +\i (01:10:09) trapsize 22611 +\i (01:10:09) zoom out 1 +\i (01:10:09) setwindow pcb +\i (01:10:09) zoom out 49.3045 101.2396 +\i (01:10:09) trapsize 45222 +\i (01:10:10) zoom in 1 +\i (01:10:10) setwindow pcb +\i (01:10:10) zoom in -13.1023 85.4117 +\i (01:10:10) trapsize 22611 +\i (01:10:10) zoom in 1 +\i (01:10:10) setwindow pcb +\i (01:10:10) zoom in -13.1023 85.4118 +\i (01:10:10) trapsize 11306 +\i (01:10:11) zoom in 1 +\i (01:10:11) setwindow pcb +\i (01:10:11) zoom in -1.5705 90.8385 +\i (01:10:11) trapsize 5653 +\i (01:10:11) zoom in 1 +\i (01:10:11) setwindow pcb +\i (01:10:11) zoom in -2.0227 90.6124 +\i (01:10:11) trapsize 2826 +\i (01:10:11) zoom in 1 +\i (01:10:11) setwindow pcb +\i (01:10:11) zoom in 19.1753 88.5209 +\i (01:10:11) trapsize 1413 +\i (01:10:12) zoom in 1 +\i (01:10:12) setwindow pcb +\i (01:10:12) zoom in 13.2116 89.4819 +\i (01:10:12) trapsize 707 +\i (01:10:12) zoom in 1 +\i (01:10:12) setwindow pcb +\i (01:10:12) zoom in 14.3988 89.9483 +\i (01:10:12) trapsize 353 +\i (01:10:13) zoom out 1 +\i (01:10:13) setwindow pcb +\i (01:10:13) zoom out 14.7874 90.0049 +\i (01:10:13) trapsize 707 +\i (13:16:02) zoom out 1 +\i (13:16:02) setwindow pcb +\i (13:16:02) zoom out 20.4120 90.6549 +\i (13:16:02) trapsize 1413 +\i (13:16:02) zoom out 1 +\i (13:16:02) setwindow pcb +\i (13:16:02) zoom out 20.4403 90.5702 +\i (13:16:02) trapsize 2826 +\i (13:16:02) zoom out 1 +\i (13:16:02) setwindow pcb +\i (13:16:02) zoom out 20.4404 90.5702 +\i (13:16:02) trapsize 5653 +\i (13:16:02) zoom out 1 +\i (13:16:02) setwindow pcb +\i (13:16:02) zoom out 20.4404 90.5702 +\i (13:16:02) trapsize 11306 +\i (13:16:03) zoom out 1 +\i (13:16:03) setwindow pcb +\i (13:16:03) zoom out 61.4439 29.9723 +\i (13:16:03) trapsize 22611 +\i (13:16:04) zoom out 1 +\i (13:16:04) setwindow pcb +\i (13:16:04) zoom out 4.4637 29.0678 +\i (13:16:04) trapsize 45222 +\i (13:16:04) zoom out 1 +\i (13:16:04) setwindow pcb +\i (13:16:04) zoom out 57.3739 40.8256 +\i (13:16:04) trapsize 90445 +\i (13:16:04) zoom out 1 +\i (13:16:04) setwindow pcb +\i (13:16:04) zoom out 77.2717 55.2968 +\i (13:16:04) trapsize 180890 +\i (13:16:05) zoom in 1 +\i (13:16:05) setwindow pcb +\i (13:16:05) zoom in 23.0049 -24.0264 +\i (13:16:05) trapsize 90445 +\i (13:16:05) zoom in 1 +\i (13:16:05) setwindow pcb +\i (13:16:05) zoom in 21.1960 -24.0264 +\i (13:16:05) trapsize 45222 +\i (13:16:07) zoom out 1 +\i (13:16:07) setwindow pcb +\i (13:16:07) zoom out -5.0329 13.9604 +\i (13:16:07) trapsize 90445 +\i (13:16:08) zoom in 1 +\i (13:16:08) setwindow pcb +\i (13:16:08) zoom in -8.6507 50.1383 +\i (13:16:08) trapsize 45222 +\i (13:16:08) zoom in 1 +\i (13:16:08) setwindow pcb +\i (13:16:08) zoom in -8.6507 50.1383 +\i (13:16:08) trapsize 22611 +\i (13:16:09) zoom in 1 +\i (13:16:09) setwindow pcb +\i (13:16:09) zoom in -8.6507 49.2339 +\i (13:16:09) trapsize 11306 +\i (13:16:09) zoom in 1 +\i (13:16:09) setwindow pcb +\i (13:16:09) zoom in -0.2845 50.1384 +\i (13:16:09) trapsize 5653 +\i (13:16:09) zoom in 1 +\i (13:16:09) setwindow pcb +\i (13:16:09) zoom in -0.2845 50.1385 +\i (13:16:09) trapsize 2826 +\i (13:16:32) exit +\t (13:16:32) Journal end - Wed Aug 26 08:59:54 2026 diff --git a/docs/HC_DFCD_Protocol_V3_0.brd b/docs/HC_DFCD_Protocol_V3_0.brd new file mode 100644 index 0000000..8cd4f63 Binary files /dev/null and b/docs/HC_DFCD_Protocol_V3_0.brd differ diff --git a/docs/QMP4810300-4澶氬崗璁彲缂栫▼鍙屽悜鐢垫簮閫氫俊鍗忚V_1.1.xlsx b/docs/QMP4810300-4澶氬崗璁彲缂栫▼鍙屽悜鐢垫簮閫氫俊鍗忚V_1.1.xlsx new file mode 100644 index 0000000..7c05d2f Binary files /dev/null and b/docs/QMP4810300-4澶氬崗璁彲缂栫▼鍙屽悜鐢垫簮閫氫俊鍗忚V_1.1.xlsx differ diff --git a/docs/QMP4810300-4澶氬崗璁彲缂栫▼鍙屽悜鐢垫簮閫氫俊鍗忚V_1.2.xlsx b/docs/QMP4810300-4澶氬崗璁彲缂栫▼鍙屽悜鐢垫簮閫氫俊鍗忚V_1.2.xlsx new file mode 100644 index 0000000..c263bf5 Binary files /dev/null and b/docs/QMP4810300-4澶氬崗璁彲缂栫▼鍙屽悜鐢垫簮閫氫俊鍗忚V_1.2.xlsx differ diff --git a/docs/generate_five_port_test_plans.ps1 b/docs/generate_five_port_test_plans.ps1 new file mode 100644 index 0000000..94547ad --- /dev/null +++ b/docs/generate_five_port_test_plans.ps1 @@ -0,0 +1,310 @@ +锘縫aram( + [string]$OutputDirectory = 'D:\HC-PMP-SW\Power_ControlPannel\MP_Control_sw_405\鎷栨嫿寮忓钩鍙癨docs' +) + +$ErrorActionPreference = 'Stop' + +function New-Criteria { + param([int]$VoltageToleranceMv, [int]$CurrentToleranceMa) + [ordered]@{ + VoltageToleranceMv = $VoltageToleranceMv + CurrentToleranceMa = $CurrentToleranceMa + ShortVoltageMinMv = 0 + ShortVoltageMaxMv = 1000 + ShortCurrentMinMa = 0 + ShortCurrentMaxMa = 1000 + OcpVoltageMinMv = 0 + OcpVoltageMaxMv = 5000 + OcpCurrentMinMa = 4500 + OcpCurrentMaxMa = 5500 + DynamicVpkPlusMinMv = 0 + DynamicVpkPlusMaxMv = 65535 + DynamicVpkMinusMinMv = 0 + DynamicVpkMinusMaxMv = 65535 + } +} + +function New-DmpItem { + param( + [string]$Name, + [int]$Channel, + [string]$Protocol, + [int]$VoltageMv, + [int]$ProtocolCurrentMa, + [int]$LoadCurrentMa, + [int]$VoltageToleranceMv, + [int]$CurrentToleranceMa, + [int]$QueryDelayMs, + [string]$OutputAction = 'Start', + [int]$Gear = 0, + [int]$CcSelection = -1, + [string]$SinkFunction = 'StandardLoad' + ) + + [ordered]@{ + Id = [guid]::NewGuid().ToString() + Name = $Name + Channel = $Channel + Direction = 'Sink' + OutputAction = $OutputAction + Protocol = $Protocol + Mode = 'ConstantCurrent' + PdoType = 'Fpdo' + SinkFunction = $SinkFunction + Gear = $Gear + CcSelection = if ($CcSelection -ge 0) { $CcSelection } elseif ($Channel -eq 2) { 1 } else { 0 } + MinVoltageMv = 3300 + VoltageMv = $VoltageMv + CurrentMa = $ProtocolCurrentMa + LoadVoltageMv = $VoltageMv + LoadCurrentMa = $LoadCurrentMa + VonVoltageMv = 100 + ShortHoldTimeMs = 1000 + HoldAfterTest = $false + OcpStartCurrentMa = 1000 + OcpEndCurrentMa = 5000 + OcpStepCurrentMa = 100 + OcpStepTimeMs = 10 + OcpRecoveryTimeMs = 1000 + OcpStopVoltageMv = 4000 + OcpRecoveryWithLoad = $true + DynamicCurrent1Ma = 1000 + DynamicTime1 = 100 + DynamicCurrent2Ma = 5000 + DynamicTime2 = 100 + DynamicRiseSlope = 1 + DynamicFallSlope = 1 + ApplyDelayMs = 500 + QueryDelayMs = $QueryDelayMs + DurationMs = 1000 + StopOnFault = $true + Criteria = New-Criteria $VoltageToleranceMv $CurrentToleranceMa + Status = 'Pending' + Result = '' + Verdict = '' + MeasuredVoltageMv = $null + MeasuredCurrentMa = $null + QueryTime = $null + Measurements = @() + } +} + +function New-PortConfig { + param( + [string]$Port, + [int]$Channel, + [string]$Protocol, + [int]$VoltageMv, + [int]$ProtocolCurrentMa, + [int]$LoadCurrentMa, + [int]$VoltageToleranceMv, + [int]$CurrentToleranceMa, + [int]$Gear = 0 + ) + [pscustomobject]@{ + Port = $Port + Channel = $Channel + Protocol = $Protocol + VoltageMv = $VoltageMv + ProtocolCurrentMa = $ProtocolCurrentMa + LoadCurrentMa = $LoadCurrentMa + VoltageToleranceMv = $VoltageToleranceMv + CurrentToleranceMa = $CurrentToleranceMa + Gear = $Gear + } +} + +function Add-SingleTest { + param( + [System.Collections.Generic.List[object]]$Items, + [string]$Prefix, + [pscustomobject]$Config, + [int]$CcSelection = -1 + ) + $voltage = $Config.VoltageMv / 1000 + $current = $Config.LoadCurrentMa / 1000 + $Items.Add((New-DmpItem "$Prefix-$($Config.Port)-$voltage`V-$current`A" $Config.Channel $Config.Protocol ` + $Config.VoltageMv $Config.ProtocolCurrentMa $Config.LoadCurrentMa ` + $Config.VoltageToleranceMv $Config.CurrentToleranceMa 10000 'Start' $Config.Gear $CcSelection)) + $Items.Add((New-DmpItem "$Prefix-$($Config.Port)-鍋滄" $Config.Channel $Config.Protocol ` + $Config.VoltageMv $Config.ProtocolCurrentMa $Config.LoadCurrentMa 0 0 1000 'Stop' $Config.Gear $CcSelection)) +} + +function Add-SequencedPortTest { + param( + [System.Collections.Generic.List[object]]$Items, + [string]$Face, + [int]$CcSelection, + [pscustomobject]$Case, + [string]$Port, + [int]$Channel + ) + + $sinkFunction = if ($Case.SinkFunction) { $Case.SinkFunction } else { 'StandardLoad' } + $namePrefix = "$Face-$($Case.Label)-$Port" + $start = New-DmpItem "$namePrefix-鍚姩" $Channel $Case.Protocol $Case.Voltage ` + $Case.ProtocolCurrent $Case.LoadCurrent $Case.VTol $Case.ITol 5000 'Start' 0 $CcSelection $sinkFunction + if ($sinkFunction -eq 'ShortCircuit') { + $start.Criteria.ShortVoltageMinMv = 0 + $start.Criteria.ShortVoltageMaxMv = 3000 + $start.Criteria.ShortCurrentMinMa = 0 + $start.Criteria.ShortCurrentMaxMa = 65535 + } + $Items.Add($start) + $Items.Add((New-DmpItem "$namePrefix-鍋滄" $Channel $Case.Protocol $Case.Voltage ` + $Case.ProtocolCurrent $Case.LoadCurrent 0 0 5000 'Stop' 0 $CcSelection $sinkFunction)) +} + +function Add-CombinationTest { + param( + [System.Collections.Generic.List[object]]$Items, + [string]$Prefix, + [object[]]$Configs + ) + + foreach ($config in $Configs) { + $Items.Add((New-DmpItem "$Prefix-$($config.Port)-閰嶇疆" $config.Channel $config.Protocol ` + $config.VoltageMv $config.ProtocolCurrentMa $config.LoadCurrentMa 0 0 100 'Start' $config.Gear)) + } + for ($index = 0; $index -lt $Configs.Count; $index++) { + $config = $Configs[$index] + $delay = if ($index -eq 0) { 10000 } else { 1000 } + $Items.Add((New-DmpItem "$Prefix-$($config.Port)-楠岃瘉" $config.Channel $config.Protocol ` + $config.VoltageMv $config.ProtocolCurrentMa $config.LoadCurrentMa ` + $config.VoltageToleranceMv $config.CurrentToleranceMa $delay 'Start' $config.Gear)) + } + foreach ($config in $Configs) { + $Items.Add((New-DmpItem "$Prefix-$($config.Port)-鍋滄" $config.Channel $config.Protocol ` + $config.VoltageMv $config.ProtocolCurrentMa $config.LoadCurrentMa 0 0 1000 'Stop' $config.Gear)) + } +} + +function Write-Plan { + param([string]$FileName, [string]$Name, [System.Collections.Generic.List[object]]$Items) + $plan = [ordered]@{ + ProductId = 'DMP' + Name = $Name + Communication = [ordered]@{ + PortName = 'COM6' + BaudRate = 115200 + DataBits = 8 + Parity = 'None' + StopBits = 1 + SlaveAddress = 1 + TimeoutMs = 500 + RetryCount = 2 + } + Items = $Items + } + $path = Join-Path $OutputDirectory $FileName + $json = $plan | ConvertTo-Json -Depth 20 + [System.IO.File]::WriteAllText($path, $json, [System.Text.UTF8Encoding]::new($false)) + Get-Item -LiteralPath $path +} + +$c1 = 1 +$c2 = 2 +$a1 = 3 + +# 1. C1/C2鍚屾椂鎻掑叆锛屼絾渚濇瀵瑰崟涓氶亾甯﹁浇銆傚厛娴婣闈(CC1)锛屽啀娴婤闈(CC2)銆 +$items = [System.Collections.Generic.List[object]]::new() +$dualCases = @( + [pscustomobject]@{ Label = '5V3A'; Protocol = 'Standard'; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 240; ITol = 300; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '5V3.8A杩囪浇'; Protocol = 'Standard'; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 3800; VTol = 0; ITol = 0; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '5V0A绌鸿浇'; Protocol = 'Standard'; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 0; VTol = 240; ITol = 0; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '5V-QC2.0'; Protocol = 'Qc20'; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 0; VTol = 240; ITol = 0; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '5V鐭矾'; Protocol = 'Standard'; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 0; VTol = 0; ITol = 0; SinkFunction = 'ShortCircuit' }, + [pscustomobject]@{ Label = '5V0A鐭矾鎭㈠'; Protocol = 'Standard'; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 0; VTol = 240; ITol = 0; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '9V3A'; Protocol = 'Pdo'; Voltage = 9000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 440; ITol = 300; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '15V3A'; Protocol = 'Pdo'; Voltage = 15000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 740; ITol = 300; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '20V2.25A'; Protocol = 'Pdo'; Voltage = 20000; ProtocolCurrent = 2250; LoadCurrent = 2250; VTol = 790; ITol = 225; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '20V0A绌鸿浇'; Protocol = 'Pdo'; Voltage = 20000; ProtocolCurrent = 2250; LoadCurrent = 0; VTol = 790; ITol = 0; SinkFunction = 'StandardLoad' }, + [pscustomobject]@{ Label = '20V2.82A杩囪浇'; Protocol = 'Pdo'; Voltage = 20000; ProtocolCurrent = 2250; LoadCurrent = 2820; VTol = 0; ITol = 0; SinkFunction = 'StandardLoad' } +) +foreach ($face in @( + [pscustomobject]@{ Name = 'A闈'; CcSelection = 1 }, + [pscustomobject]@{ Name = 'B闈'; CcSelection = 2 } +)) { + foreach ($case in $dualCases) { + Add-SequencedPortTest $items $face.Name $face.CcSelection $case 'C1' $c1 + Add-SequencedPortTest $items $face.Name $face.CcSelection $case 'C2' $c2 + } +} +Write-Plan '01_C1-C2鍙屽彛鍚屾椂鎻掑叆娴嬭瘯.json' '01 C1/C2鍙屽彛鍚屾椂鎻掑叆銆佷緷娆″崟鍙ｈ礋杞芥祴璇' $items + +# 2. A1鍗曞彛锛5V鏍囧噯锛9V/12V浣跨敤QC2.0銆 +$items = [System.Collections.Generic.List[object]]::new() +$a1Cases = @( + [pscustomobject]@{ Label = '264VAC'; Protocol = 'Standard'; Voltage = 5000; Current = 3000; VTol = 240; ITol = 300 }, + [pscustomobject]@{ Label = '264VAC'; Protocol = 'Qc20'; Voltage = 9000; Current = 2000; VTol = 440; ITol = 200 }, + [pscustomobject]@{ Label = '264VAC'; Protocol = 'Qc20'; Voltage = 12000; Current = 1500; VTol = 590; ITol = 150 }, + [pscustomobject]@{ Label = '90VAC'; Protocol = 'Standard'; Voltage = 5000; Current = 3000; VTol = 240; ITol = 300 }, + [pscustomobject]@{ Label = '90VAC'; Protocol = 'Qc20'; Voltage = 12000; Current = 1500; VTol = 590; ITol = 150 } +) +foreach ($case in $a1Cases) { + Add-SingleTest $items $case.Label (New-PortConfig 'A1' $a1 $case.Protocol $case.Voltage ` + $case.Current $case.Current $case.VTol $case.ITol) +} +Add-SingleTest $items 'SCP-10V2.25A' (New-PortConfig 'A1' $a1 'Scp' 10000 2250 2250 490 225) +Write-Plan '02_A1鍗曞彛娴嬭瘯.json' '02 A1鍗曞彛娴嬭瘯' $items + +# 3. C1/C2鍗曞彛澶氬崗璁傚厛娴婣闈(CC1)锛屽啀娴婤闈(CC2)銆 +# PPS3-5娌℃湁瑙勬牸鍊硷紝浠呭仛9V绌鸿浇鎻℃墜锛岄伩鍏嶆湭纭鐨勫ぇ鐢垫祦甯﹁浇銆 +$items = [System.Collections.Generic.List[object]]::new() +$multiProtocolCases = @( + [pscustomobject]@{ Label = '鏍囧噯5V3A'; Protocol = 'Standard'; Gear = 0; Voltage = 5000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 240; ITol = 300 }, + [pscustomobject]@{ Label = 'PDO9V3A'; Protocol = 'Pdo'; Gear = 0; Voltage = 9000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 440; ITol = 300 }, + [pscustomobject]@{ Label = 'PDO15V3A'; Protocol = 'Pdo'; Gear = 0; Voltage = 15000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 740; ITol = 300 }, + [pscustomobject]@{ Label = 'PDO20V2.25A'; Protocol = 'Pdo'; Gear = 0; Voltage = 20000; ProtocolCurrent = 2250; LoadCurrent = 2250; VTol = 790; ITol = 225 }, + [pscustomobject]@{ Label = 'PPS1-9V4.5A'; Protocol = 'Pps'; Gear = 1; Voltage = 9000; ProtocolCurrent = 4500; LoadCurrent = 4500; VTol = 450; ITol = 225 }, + [pscustomobject]@{ Label = 'PPS2-19V2A'; Protocol = 'Pps'; Gear = 2; Voltage = 19000; ProtocolCurrent = 2000; LoadCurrent = 2000; VTol = 950; ITol = 150 }, + [pscustomobject]@{ Label = 'PPS3-9V绌鸿浇鎻℃墜'; Protocol = 'Pps'; Gear = 3; Voltage = 9000; ProtocolCurrent = 1000; LoadCurrent = 0; VTol = 450; ITol = 100 }, + [pscustomobject]@{ Label = 'PPS4-9V绌鸿浇鎻℃墜'; Protocol = 'Pps'; Gear = 4; Voltage = 9000; ProtocolCurrent = 1000; LoadCurrent = 0; VTol = 450; ITol = 100 }, + [pscustomobject]@{ Label = 'PPS5-9V绌鸿浇鎻℃墜'; Protocol = 'Pps'; Gear = 5; Voltage = 9000; ProtocolCurrent = 1000; LoadCurrent = 0; VTol = 450; ITol = 100 } +) +$avsCases = @( + [pscustomobject]@{ Label = 'AVS-9V3A'; Protocol = 'Avs'; Gear = 0; Voltage = 9000; ProtocolCurrent = 3000; LoadCurrent = 3000; VTol = 150; ITol = 300 }, + [pscustomobject]@{ Label = 'AVS-20V2.25A'; Protocol = 'Avs'; Gear = 0; Voltage = 20000; ProtocolCurrent = 2250; LoadCurrent = 2250; VTol = 650; ITol = 225 } +) +$cPorts = @([pscustomobject]@{ Name = 'C1'; Channel = $c1 }, [pscustomobject]@{ Name = 'C2'; Channel = $c2 }) +foreach ($face in @( + [pscustomobject]@{ Name = 'A闈'; CcSelection = 1 }, + [pscustomobject]@{ Name = 'B闈'; CcSelection = 2 } +)) { + foreach ($case in $multiProtocolCases) { + foreach ($port in $cPorts) { + Add-SingleTest $items "$($face.Name)-$($case.Label)" (New-PortConfig $port.Name $port.Channel $case.Protocol ` + $case.Voltage $case.ProtocolCurrent $case.LoadCurrent $case.VTol $case.ITol $case.Gear) $face.CcSelection + } + } + foreach ($case in $avsCases) { + Add-SingleTest $items "$($face.Name)-$($case.Label)" (New-PortConfig 'C1' $c1 $case.Protocol ` + $case.Voltage $case.ProtocolCurrent $case.LoadCurrent $case.VTol $case.ITol $case.Gear) $face.CcSelection + } +} +Write-Plan '03_C1-C2鍗曞彛澶氬崗璁祴璇.json' '03 C1/C2鍗曞彛澶氬崗璁瓵/B闈㈡祴璇曪紙鍚玃PS1~5銆丄VS锛' $items + +# 4. 涓ゅ彛缁勫悎锛氬彧鏈20V椤圭洰浣跨敤PDO锛屽叾浣5V鍧囦负鏍囧噯鍗忚銆 +$items = [System.Collections.Generic.List[object]]::new() +Add-CombinationTest $items '缁勫悎1-C1+C2' @( + (New-PortConfig 'C1' $c1 'Pdo' 20000 1500 1500 990 150), + (New-PortConfig 'C2' $c2 'Standard' 5000 3000 3000 240 300) +) +Add-CombinationTest $items '缁勫悎2-C1+A1' @( + (New-PortConfig 'C1' $c1 'Pdo' 20000 1500 1500 990 150), + (New-PortConfig 'A1' $a1 'Standard' 5000 3000 3000 240 300) +) +Add-CombinationTest $items '缁勫悎3-C2+A1' @( + (New-PortConfig 'C2' $c2 'Standard' 5000 1500 1500 240 150), + (New-PortConfig 'A1' $a1 'Standard' 5000 1500 1500 240 150) +) +Write-Plan '04_涓ゅ彛缁勫悎杈撳嚭娴嬭瘯.json' '04 涓ゅ彛缁勫悎杈撳嚭娴嬭瘯' $items + +# 5. 涓夊彛缁勫悎锛欳1涓篜D 20V锛孋2/A1涓烘爣鍑5V銆 +$items = [System.Collections.Generic.List[object]]::new() +Add-CombinationTest $items '涓夊彛缁勫悎-C1+C2+A1' @( + (New-PortConfig 'C1' $c1 'Pdo' 20000 1500 1500 990 150), + (New-PortConfig 'C2' $c2 'Standard' 5000 1500 1500 240 150), + (New-PortConfig 'A1' $a1 'Standard' 5000 1500 1500 240 150) +) +Write-Plan '05_C1-C2-A1涓夊彛缁勫悎杈撳嚭娴嬭瘯.json' '05 C1/C2/A1涓夊彛缁勫悎杈撳嚭娴嬭瘯' $items diff --git a/docs/south_regs.h b/docs/south_regs.h new file mode 100644 index 0000000..d535cab --- /dev/null +++ b/docs/south_regs.h @@ -0,0 +1,190 @@ +#ifndef __DigtalPower_ModbusRTU_REG_List_H__ +#define __DigtalPower_ModbusRTU_REG_List_H__ + +#include "USART1_Modbus_RTU.h" +#include "dac.h" + +#define ModbusRTU_SW_Version 0x0301; //01是电源代号，02是负载代号，03是非节能源载代号，04是节能电源代号;低字节01是版本号，V0.1 + +//ModbusRTU 从站地址//工作状态及运行参数显示 +#define ModbusRTU_Power_Status 0x00 //R,工作状态指示，00 预充电；01就绪/停止 02 缓启动；03 运行；04 故障:03 03 00 00 00 01 85 E8 +#define ModbusRTU_Relay_Status 0x01 //bit0=0 主继电器断开 bit0=1 主继电器闭合；；；bit1=0 滤波继电器断开 bit1=1 滤波继电器闭合 +#define ModbusRTU_Fault_Status 0x02 //故障状态寄存器 +#define ModbusRTU_Flash_Status 0x03 //flash存储状态 +#define ModbusRTU_Role_ModeFlag 0x04 //0x04 源载指令，默认是电子负载，1是supply，2是eload + +//故障寄存器 +/*****************************故障类型*****************/ +#define F_NOERR 0x0000//无故障 +#define F_SW_VIN_UVP 0x0001//输入欠压 +#define F_SW_VIN_OVP 0x0002//输入过压 +#define F_SW_VOUT_UVP 0x0004//输出欠压 +#define F_SW_VOUT_OVP 0x0008//输出过压 +#define F_SW_IOUT_OCP 0x0010//输出过流 +#define F_SW_SHORT 0x0020//输出短路 +#define F_SW_OTP 0x0040//过温保护 + +//电源控制指令 +#define ModbusRTU_PowerCmd 0x05 //05 W 0x01 开机，0x02 关机，0x03故障复位；0xAA 存储数据到flash；0xBB 恢复默认参数 +#define ModbusRTU_WorkMode 0x06 //06 WR 0x01 恒压，0x02 恒流，0x03开环，04 恒功率，05恒阻 +#define ModbusRTU_Volt 0x07 //07-08 WR 设置输出电压 uint32，0.001V, 0~60V,默认5V，查询电压也是这个指令 +#define ModbusRTU_Current 0x09 //09-0A WR 设置输出电流 uint32 ，0.001A，, 0~60A,默认值1A，查询电压也是这个指令 + +#define ModbusRTU_ShortTest_VoltShort 0x0B //无论short测试成功或者失败，都给出短路恒流值的时候的电压 +#define ModbusRTU_ShortTest_CurrentShort 0x0C //无论测试成功或者失败，都给出短路恒流值的时候的电压 +#define ModbusRTU_OCPTest_VoltOCP 0x0D //无论short测试成功或者失败，都给出短路恒流值的时候的电压 +#define ModbusRTU_OCPTest_CurrentOCP 0x0E //无论测试成功或者失败，都给出短路恒流值的时候的电压 + +#define ModbusRTU_DUT_Vpkp 0x0F //量测正峰值 +#define ModbusRTU_DUT_Vpkn 0x10 //量测负峰值 +#define ModbusRTU_DUT_Vpp 0x11 //量测峰峰值 +//纹波寄存器 +#define ModbusRTU_Ripple_Value 0x12 //读取纹波 + +#define ModbusRTU_Temp 0x1A //WR 11,当前内部温度读取点 +#define ModbusADDR_SW_Version 0x1B //10,12地址，读取版本号，03代表buckboost半桥，01是版本号 +#define ModbusADDR_SlaveID_Modify 0x1C //11,13地址,修订SlaveID + + +#define Line_Compensation 0X1D //1F 14d地址，线损补偿，正负5V，1mv，精度0.001，放大1000倍，5000 + +#define Eload_Start_VON 0x20 //10 16寄存器存储电子负载启动电压，负载检测到电压值为启动电压，才开启电子负载； +#define Eload_Stop_Volt 0x21 //11 17寄存器存储电子负载关闭电压； +#define Eload_Slew_Rate 0x22 //12 18寄存器存储电子负载上升斜率参数； + +#define ModbusRTU_CPower 0x24 //36-37 功率值 +#define ModbusRTU_CResistor 0x26 //38 电阻值 + +//6.3.1电源控制参数 +#define ModbusRTU_VoltLimit 0x28 //0x29 40-41 0x2A 42寄存器输出电压限值,默认是6.0V,可以微调到6.5V； +#define ModbusRTU_CurrentLimit_H 0x2A //42~43WR 输出电流限值 +#define ModbusRTU_CurrentLimit_L 0x2B //42~43WR 输出电流限值 + +#define ModbusRTU_Volt_CAL_K 0x2C //2C~2D 电压校准K值,被放大Q16倍，再移动16回去；使用两个字节 +#define ModbusRTU_Volt_CAL_K_L 0x2D +#define ModbusRTU_Volt_CAL_B 0x2E //2E 电压校准B值 +#define ModbusRTU_Current_CAL_K 0x2F //2F-30 电流校准K值 +#define ModbusRTU_Current_CAL_K_L 0x30 + +#define ModbusRTU_Current_CAL_B 0x31 //31 电流校准B值 + +#define ModbusRTU_SourceCurrent_CAL_K 0x32 //32-33 电流校准K值 +#define ModbusRTU_SourceCurrent_CAL_K_L 0x33 + +#define ModbusRTU_SourceCurrent_CAL_B 0x34 //34 电流校准B值 + +#define ModbusRTU_SourceSink_Current_Offset 0x35 //电源的电流上报offset +//#define ModbusRTU_Sink_Current_Offset 0x33 //负载的电流上报offset + +#define ModbusRTU_CALI_CRC 0x36 //校准偏移6参数的校验值；使用CRC16-Modbus校验； + + +#define ModbusRTU_CAL_WriteEnable 0x37 //使能写入FLASH；下次调用使用这个参数；是个魔数：0x4361 （C+a） +#define ModbusRTU_CAL_WriteRecovery 0x38 //使能写入出厂数据区域；0x5763 +#define ModbusRTU_CAL_ReadRecovery 0x39 //使能读出；将出厂数据读到当前的bank中，并更新6个参数 + +//short测试 +#define ModbusRTU_ShortTest_CMD_MODE_FLAG 0x40 //16位；0x0101; 01启动，低字节的01，保持电流，为0是释放电流； 20260601新增一个低字节的bit7=0用于是恢复以前的状态，bit7=1是将卸载电流归零； +#define ModbusRTU_ShortTest_Hold_Time 0x41 //单位是ms，最大65535ms，给0是立即释放，给一个时间值，是保持这个时间不变； +//#define ModbusRTU_ShortTest_CurrentShort 0x42 //无论测试成功或者失败，都给出短路恒流值的时候的电压 + +//OCP测试 +#define ModbusRTU_OCPTest_CMD_MODE_FLAG 0x43 //16位；0x0101; 01启动，低字节的01，保持电流，为0是释放电流； 20260601新增一个低字节的bit7=0用于是恢复以前的状态，bit7=1是将卸载电流归零； +#define ModbusRTU_OCPTest_StartCurrent 0x44 //起始电流 +#define ModbusRTU_OCPTest_StopCurrent 0x45 //终止电流 +#define ModbusRTU_OCPTest_StepCurrent 0x46 //每一步的电流 +#define ModbusRTU_OCPTest_Step_Hold_Time 0x47 //每一步的保持时间；默认10ms；范围1ms到100ms; +#define ModbusRTU_OCPTest_Vtrig_Stop 0x48 //达到触发OCP流点的电压值； +#define ModbusRTU_OCPTest_Hold_Time 0x49 +//#define ModbusRTU_OCPTest_VoltOCP 0x49 //无论short测试成功或者失败，都给出短路恒流值的时候的电压 +//#define ModbusRTU_OCPTest_CurrentOCP 0x4A //无论测试成功或者失败，都给出短路恒流值的时候的电压 + +//DYNA 电子负载的动态测试模式，也叫动态负载或瞬态测试。在该模式下，负载会按设定的斜率、频率和占空比，在两个电流值（如高负载和低负载）之间周期性跳变，用来测试电源的瞬态响应、恢复时间等特性。 +#define ModbusRTU_DYNA_CMD_MODE_FLAG 0x4B //动态测试 CMD启动、退出、 以及模式：Continuous、PULSE、Toggle；LSB8 BIT7 短路测试时候的电流：保持/归零；bit1 过流； bit0 成功/失败 +#define ModbusRTU_DYNA_L1 0x4C //动态测试电流1 +#define ModbusRTU_DYNA_L2 0x4D //动态测试电流2 +#define ModbusRTU_DYNA_T1 0x4E //动态测试电流1的时间 +#define ModbusRTU_DYNA_T2 0x4F //动态测试电流2的时间 +#define ModbusRTU_DYNA_Rise_Slew_Rate 0x50 //动态测试上升斜率 +#define ModbusRTU_DYNA_Fall_Slew_Rate 0x51 //动态测试下降斜率 + + +#define ModbusRTU_DUT_ValueReset 0x5D //复位数值 + +#define ModbusRTU_SYS_Reset 0x61 //系统复位指令，如果异常过压，通常发指令，让系统复位 + +//#define ModbusRTU_Volt_Kp 0x30 //48-49 RW 电压环kp +//#define ModbusRTU_Volt_Ki 0x32 //50-51WR 电压环ki +//#define ModbusRTU_Curr_Kp 0x34 //52-53WR 电流环kp +//#define ModbusRTU_Curr_Ki 0x36 //54-55WR 电流环ki + +//#define ModbusRTU_CP_Kp 0x38 //56-57 RW 功率环kp +//#define ModbusRTU_CP_Ki 0x3A //58-59 WR 功率环ki +//#define ModbusRTU_CR_Kp 0x3C //60-61 WR 电阻环kp +//#define ModbusRTU_CR_Ki 0x3E //62-63 WR 电阻环ki + +//112,0x70寄存器，改为当前内部温度读取点； + +#define ModbusRTU_TempLimit 0x71 //WR 温度限值 +#define ModbusRTU_FANSpeed 0x72 //风速控制，上位机可以设定；自动模式下，温度高于一个值，最大风速跑，低于则最小风速跑 + +#define SMU_Relay_ON 0x0001 //源载主继电器 +#define SMU_EL_PB15_EMI_Bypass_ON 0x0002 //旁路滤波继电器 +//定义电流保护值的关系：Y(VDAC) = K*X(I-real)+B +#define Init_OCP_VALUE 12000 //12A +//正向： +#define K_COEFF_FWD_Q16 (9960) +#define B_Intercept_FWD (1846) +//反向： +#define K_COEFF_REV_Q16 (-9960) +#define B_Intercept_REV (1846) + +//结构体 +//6.2.1工作状态及运行参数显示 PowerStatusAndParaShow +typedef struct { + uint16_t Power_Status; + uint16_t Relay_Status; + uint16_t Fault_Status; + uint16_t Flash_Status; + uint32_t InputVolt; + uint32_t InputCurr; + uint32_t OutputVolt; + uint32_t OutputCurr; + uint32_t OutputPower; + uint16_t statusRsv1; //预留位 + uint16_t statusRsv2; +}S_PowerStatusAndParaShow; + +extern S_PowerStatusAndParaShow PowerStatusAndParaShow; + +//6.2.2电源控制指令PowerControlCmd +typedef struct{ + uint16_t PowerCmd; + uint16_t WorkMode; + uint32_t Vout; + uint32_t Iout; + uint8_t Remote_Power_ON_Flag; //开关机指示 + uint8_t Remote_Power_Reset_Flag; //复位指示 +}S_PowerControlCmd; + +extern S_PowerControlCmd PowerControlCmd; + + +//6.3.1电源控制参数 +typedef struct{ + uint32_t VoutLimit; + uint32_t IoutLimit; + uint16_t DutyLimit; + uint16_t FrequnceLimit; + float VoltKp; + float VoltKi; + float CurrKp; + float CurrKi; +}S_PowerControlPara; + +extern uint8_t Power_OnOff_Flag,Power_OnOff_Flag; + +extern S_PowerControlPara PowerControlPara; +//Modbus 参数初始化 +extern void Modbus_Para_Init(void); +#endif diff --git a/docs/淇敼鏃ュ織.md b/docs/淇敼鏃ュ織.md new file mode 100644 index 0000000..5748045 --- /dev/null +++ b/docs/淇敼鏃ュ織.md @@ -0,0 +1,238 @@ +# 淇敼鏃ュ織 + +## V1.1.9 - 2026-08-25 + +### Source 澶嶄綅鍚庣殑鍒濆鍖栨祦绋 +- 浠庡叾浠栧崗璁垏鎹㈠埌 PD 鏃跺浣嶅姞鍏ユ柇寮CC锛孌+D-锛孏ND閫昏緫锛岀瓑鏂紑鍚庡啀澶嶄綅锛屽啀鍒濆鍖 +- 澧炲姞 PD 鍒囨崲鍒伴潪 PD 鍗忚鏃剁殑瀹屾暣澶嶄綅锛汸D/闈濸D璺ㄧ被鍒垏鎹㈢粺涓鎵ц澶嶄綅銆 +- PD鍒嘝D銆侀潪PD鍒囬潪PD浠ュ強浠呭垏鎹C绾挎椂涓嶅浣嶃 +- 鏂板 `SOURCE_WORK_INIT_WAIT`锛屽浣嶅洖鐮佸悗閲嶆柊鎵ц Source 鍒濆鍖栵紝骞剁瓑寰呭崡鍚戝垵濮嬪寲鎵规瀹屾垚銆 +- 鍔犲叆浜嗚鍙栫増鏈彿 + +## V1.1.8 - 2026-08-24 + +### 淇敼涓婚 +淇浜唖ource閮ㄥ垎鐨凱D鍗忚闀挎椂闂磋繍琛屽悗浼氬嚭涓嶆潵鐨勯棶棰 +瀵瑰簲鑺捣3221/source鐗堟湰V_1.07 + +### Source鍗忚澶嶄綅鍒囨崲 +- 鏂板`SOURCE_RESET`鍛戒护锛氬彂閫乣06 00 02 18 00 0E`锛屾牎楠屽洖鐮乣05 00 02 18 16`銆 +- 棣栨鍙戦佸崗璁笉澶嶄綅锛汸D涓庨潪PD璺ㄧ被鍒垏鎹㈡椂鍏堝浣嶃 +- PD鍒嘝D銆侀潪PD鍒囬潪PD浠ュ強浠呭垏鎹C绾挎椂涓嶅浣嶃 +- 鍒犻櫎`CC_CLOSE`鐘舵佸強鍏跺叡浜瓑寰呭睆闅溿 +- 鍗忚璁剧疆鍥炵爜鏈夋晥鍚庢洿鏂癭last_pd_pro`锛岄伩鍏嶅崗璁皻鏈敓鏁堟椂閿欒鍒ゆ柇銆 + +### 楠岃瘉璁板綍 +- 浣跨敤1-2锛3-4娴嬭瘯鑷妇渚嬬▼娴嬭瘯淇╃櫨娆℃甯 +- git diff --check`锛氶氳繃銆 +- 鏃CC_CLOSE`鐘舵併佸畯鍜岃皟鐢ㄥ紩鐢細宸叉鏌ユ竻鐞嗐 +- Keil缂栬瘧锛氭寜褰撳墠瑕佹眰鏈墽琛岋紝寰呯幇鍦虹儳褰曞悗楠岃瘉澶嶄綅鍥炵爜鍜屽崗璁垏鎹㈡椂搴忋 + +## V1.1.7 - 2026-08-08 + +### 淇敼涓婚 + +骞惰鎵цSink瀹屾暣鎻℃墜涓殑鍗楀悜浣庣數娴佺‘璁や笌鍖楀悜鍗忚/CC璁剧疆銆 + +### 涓昏淇敼 + +- 鍗楀悜瀹夊叏鎵规瀹屾垚骞舵敹鍒拌緟鍔╃户鐢靛櫒鍥炵爜銆佸缓绔嬮噺娴嬪熀绾垮悗锛岀珛鍗冲厑璁稿寳鍚戣缃崗璁拰CC绾裤 +- 鍗楀悜瀹為檯鐢垫祦杩炵画涓ゆ涓嶅ぇ浜 `100mA` 鐨勭‘璁よ繃绋嬩笌鍖楀悜鍗忚/CC璁剧疆骞惰鎵ц銆 +- 鍖楀悜杩涘叆 `GET_SINK_VC` 鍚庯紝鍙湁浣庣數娴佺‘璁ゅ畬鎴愪笖CC鍚庣殑 `200ms` 鏌ヨ淇濇姢鏃堕棿鍒版湡锛屾墠鍙戦佺涓鏉 `0x20`銆 +- 鐢靛帇绋冲畾鍚庡啀鍙戦 `ALL_REL_ON -> 鐩爣鐢垫祦 -> WORK_START`锛岄槻姝㈠崗璁崗鍟嗘湡闂存彁鍓嶅甫杞姐 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/thread/chrg_roll_nor.c` +- `apps/chrg/applications/utils/chrg_sink.c` +- `apps/chrg/applications/utils/chrg_sink.h` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 + +## V1.1.5 - 2026-08-08 + +### 淇敼涓婚 + +鍗忚鐢靛帇鍜屽崗璁數娴佸彉鍖栫粺涓閲囩敤杞嵏杞介噸鍙戝崗璁祦绋嬨 + +### 涓昏淇敼 + +- 鍗忚绫诲瀷銆丆C绾垮拰鍗忚缁勫彿鍙樺寲浠嶈繘鍏ュ畬鏁存彙鎵嬪苟鍒囨崲鍗楀悜缁х數鍣ㄣ +- 鍗忚鐢靛帇銆佸崗璁數娴佸崟鐙彉鍖栨垨鍚屾椂鍙樺寲鏃讹紝鍙彂閫 `WORK_STOP`锛屼笉鍏抽棴鍗楀悜缁х數鍣ㄣ +- 杞嵏杞戒笉鍐嶉澶栧彂閫 `CURRENT=0`锛屼粎閫氳繃瀹為檯鐢垫祦杩炵画涓ゆ涓嶅ぇ浜 `100mA`纭鐢靛瓙璐熻浇宸插仠姝€ +- 鍗忚閲嶆柊鐢熸晥涓旂數鍘嬬ǔ瀹氬悗锛岀敱RUNNING鍏堝啓鍏ュ疄闄呰礋杞界數娴侊紝鍐嶅彂閫 `WORK_START`銆 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/thread/chrg_comm.c` +- `apps/chrg/applications/utils/chrg_sink.c` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 + +## V1.1.4 - 2026-08-07 + +### 淇敼涓婚 + +璋冩暣璐熻浇浣庣數娴佸惎鍔ㄦ椂鐨勭户鐢靛櫒鍜屽伐浣滃懡浠ら『搴忋 + +### 涓昏淇敼 + +- 璁惧畾鐢垫祦涓 `0A` 鎴栦綆浜 `100mA` 鏃讹紝鍗忚鎻℃墜浠嶆甯告墽琛屻 +- 鐢靛帇杈惧埌鐩爣鍚庡彂閫 `ALL_REL_ON`锛岀‘淇濅富缁х數鍣ㄦ墦寮銆 +- 涓荤户鐢靛櫒鎵撳紑鍚庣户缁彂閫 `WORK_STOP` 鍜 `CURRENT=0`锛屼繚鎸佺數瀛愯礋杞戒笉甯﹁浇銆 +- 宸茬粡澶勪簬杩愯鐘舵佸垏鎹㈠埌浣庣數娴佹椂锛屾部鐢ㄥ師鏈夊仠姝㈡祦绋嬶紝涓嶉噸澶嶅垏鎹㈢户鐢靛櫒銆 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/utils/chrg_sink.c` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 + +## V1.1.3 - 2026-08-07 + +### 淇敼涓婚 + +骞惰鎵цSink鍗楀悜鍒濆鍖栦笌鍖楀悜鎻℃墜锛屽苟浼樺寲鎻℃墜鏌ヨ鍜孯UNING缁х數鍣ㄦ椂搴忋 + +### 涓昏淇敼 + +- `INIT`灏 `FU_REL_ON -> CURRENT=0 -> MODE -> VON` 浣滀负涓涓湁搴忓崡鍚戞壒娆℃彁浜ゃ +- 鍗楀悜鍒濆鍖栨壒娆℃垚鍔熷叆闃熷悗绔嬪嵆鎵撳紑鍖楀悜Sink缁х數鍣ㄣ佽缃 `enable=1` 骞跺紑濮嬪崗璁彙鎵嬨 +- `SINK_WORK_INIT_AUX_WAIT`鏀逛负鍚庡彴鐩戞帶鍗楀悜鍒濆鍖栵紝涓嶅啀闃诲鍖楀悜鍗忚銆丆C鍜岀數鍘嬫煡璇€ +- 鍗楀悜鍒濆鍖栧け璐ラ噸璇曟椂淇濈暀褰撳墠鍖楀悜 `sub`锛屼笉閲嶅鎷夊洖鍗忚璁剧疆璧风偣銆 +- 鍗忚鎴朇C鏈夋晥鍥炵爜鍚庯紝棣栨潯 `0x20` 绛夊緟 `200ms`锛涚數鍘嬫湭绋冲畾鏃跺悗缁瘡 `100ms` 鏌ヨ涓娆° +- 涓甯ч氳繃CRC銆両D銆佸懡浠ゅ拰閰嶇疆鐗堟湰鏍￠獙鐨勭數鍘嬭揪鍒扮洰鏍囧悗绔嬪嵆杩涘叆 `RUNING`锛屼笉鍐嶇瓑寰呯浜屽抚銆 +- 杩涘叆绋冲畾杩愯鍚庣珛鍗宠В闄ゆ煡璇㈣妭娴侊紝鎭㈠鍖楀悜姝ｅ父杞閫熷害銆 +- `RUNING`鍒犻櫎閲嶅鐨 `FU_REL_ON`锛岃皟鏁翠负 `ALL_REL_ON -> 鐩爣璐熻浇鍊 -> WORK_START`銆 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/utils/chrg_sink.c` +- `apps/chrg/applications/thread/chrg_roll_nor.c` +- `apps/chrg/applications/thread/chrg_north.c` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 + +### 纭欢楠岃瘉 + +- 寰呯‘璁ゅ崡鍚戝垵濮嬪寲鍛戒护涓庡寳鍚戝崗璁/CC璁剧疆骞惰鎵ц涓斾簰涓嶉噸缃姸鎬併 +- 寰呯‘璁ら鏉″拰鍚庣画 `0x20` 闂撮殧鍒嗗埆绾︿负 `200ms` 鍜 `100ms`銆 +- 寰呯‘璁よ繘鍏 `RUNING` 鏃朵笉鍐嶅彂閫 `FU_REL_ON`锛屼富缁х數鍣ㄤ笉浼氳閲嶅鏂紑銆 + +## V1.1.2 - 2026-08-07 + +### 淇敼涓婚 + +闄嶄綆Sink鍗忚鎻℃墜闃舵鐨勫寳鍚戠數鍘嬬數娴佹煡璇㈤鐜囥 + +### 涓昏淇敼 + +- 鏂板 `SINK_HANDSHAKE_QUERY_INTERVAL_MS`锛岃缃负 `200ms`銆 +- Sink鍗忚鎴朇C璁剧疆鏀跺埌鏈夋晥鍥炵爜鍚庯紝涓嶇珛鍗冲彂閫佹垨杩炵画蹇熷彂閫 `0x20` 鏌ヨ銆 +- CC璺緞鐨 `200ms` 浠庢湁鏁 `0x17` 鍥炵爜鏃跺埢寮濮嬭鏃讹紝鍖呭惈鍘熸湁 `50ms` CC绋冲畾淇濇姢銆 +- 鍗忚鎻℃墜銆佽蒋鎭㈠绛夊緟鍜屾帀鐢垫仮澶嶇洃鎺ч樁娈电殑 `0x20` 鏌ヨ鎸夋瘡 `200ms` 涓娆℃墽琛屻 +- 鍖楀悜閲忔祴杩炵画涓ゆ杈惧埌绋冲畾鏉′欢鍚庤В闄よ妭娴侊紝`RUNING` 鍜屼綆鐢垫祦寰呮満鎭㈠姝ｅ父鏌ヨ棰戠巼銆 +- 浠呴噸鍙戝崗璁殑 `IDX_SET_SINK_PD_ONLY` 璺緞鍚屾牱鍚姩 `200ms` 鏌ヨ绛夊緟銆 +- 璁剧疆鍗忚鍜孋C鍛戒护浠嶇劧鎸夋湁鏁堝洖鐮併佽秴鏃跺拰鍘熸湁閲嶈瘯鏈哄埗澶勭悊銆 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/thread/chrg_roll_nor.c` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 + +### 纭欢楠岃瘉 + +- 寰呰瀵熷崗璁/CC璁剧疆鍚 `0x20` 鐨勫彂閫侀棿闅旀槸鍚︾ǔ瀹氫负涓嶅皬浜 `200ms`銆 +- 寰呴獙璇佺數鍘嬭繛缁袱娆＄ǔ瀹氬悗鏄惁鎭㈠姝ｅ父閲忔祴棰戠巼銆 + +## V1.1.1 - 2026-08-07 + +### 淇敼涓婚 + +澧炲姞鏅氳礋杞芥渶浣庡甫杞界數娴佹帶鍒讹紝浣庣數娴佹椂淇濇寔鍗忚鍦ㄧ嚎浣嗗叧闂數瀛愯礋杞姐 + +### 涓昏淇敼 + +- 鏂板 `SINK_LOAD_ENABLE_MIN_MA`锛屾亽娴佽礋杞借瀹氫綆浜 `100mA` 鏃剁姝㈠彂閫 `WORK_START`銆 +- 鏈浣庡甫杞介棬闄愬彧鍒ゆ柇鍗楀悜璐熻浇鐢垫祦 `loadc`锛屼笉褰卞搷鍖楀悜鍗忚鐢垫祦 `pro_loadc` 鍜屽崗璁彙鎵嬨 +- 棣栨鍚姩鎴栧畬鏁撮噸鎻℃墜鍚庝负浣庣數娴佹椂锛屽彂閫 `WORK_STOP -> CURRENT=0` 骞朵繚鎸佷富缁х數鍣ㄥ叧闂 +- 杩愯涓敱鏈夋晥鐢垫祦闄嶈嚦浣庣數娴佹椂锛屽彂閫 `WORK_STOP -> CURRENT=0`锛屼繚鎸佸崗璁丆C鍜岀户鐢靛櫒涓嶅彉銆 +- 杩愯涓綆鐢垫祦寰呮満鎭㈠鏈夋晥鐢垫祦鏃讹紝鍙彂閫佺洰鏍囩數娴佸拰 `WORK_START`锛屼笉閲嶆柊鎻℃墜鎴栧垏鎹㈢户鐢靛櫒銆 +- 涓荤户鐢靛櫒鏈墦寮鐨勪綆鐢垫祦寰呮満浣跨敤鐙珛 `SINK_WORK_LOAD_START` 鎭㈠鍏ュ彛锛岄伩鍏嶈 `RUNING` 鐘舵佸幓閲嶃 +- 浣庣數娴佸緟鏈烘湡闂翠粎淇敼鍗忚鐢靛帇鏃朵笉閲嶅鍗歌浇锛屽苟淇濇寔鍘熸湁涓荤户鐢靛櫒鐘舵佽涔夈 +- 灏 COM 绔繍琛岀數娴佽法闂ㄩ檺鍒ゆ柇灏佽涓 `chrg_comm_handle_sink_load_current()`锛岄伩鍏嶇敓鏁堝垎鏀户缁啫鑳銆 +- 鍖楀悜瑙ｆ瀽灏嗕袱绉嶄綆鐢垫祦寰呮満鐘舵佷綔涓虹ǔ瀹氱姸鎬侊紝涓嶅洜瀹為檯鐢垫祦涓洪浂鍙嶅杩涘叆 `RUNING`銆 +- 浣庣數娴佸緟鏈烘仮澶嶆湁鏁堢數娴佹椂锛宍SINK_WORK_LOAD_START`/`SINK_WORK_LOAD_RESUME` 鍙綔涓哄緟鍚姩鏍囪锛屽繀椤荤瓑鍖楀悜瀹為檯鐢靛帇绋冲畾鍚庢墠涓嬪彂 `WORK_START`銆 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/utils/chrg_sink.h` +- `apps/chrg/applications/utils/chrg_sink.c` +- `apps/chrg/applications/thread/chrg_comm.c` +- `apps/chrg/applications/thread/chrg_north.c` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 + +### 纭欢楠岃瘉 + +- 寰呴獙璇 `20V/3A -> 20V/0A -> 20V/3A` 鐨勫崡鍚戝懡浠ら『搴忓拰鍗忚淇濇寔鎯呭喌銆 +- 寰呴獙璇侀娆′互浣庝簬 `100mA` 鐨勭數娴佸惎鍔ㄦ椂锛屽寳鍚戞彙鎵嬫甯镐笖鍗楀悜涓嶆墽琛 `WORK_START`銆 + +## V1.1.0 - 2026-08-07 + +### 淇敼涓婚 + +璐熻浇鍚姩銆佹帀鐢垫仮澶嶃佸崗璁噸鎻℃墜鍜屽崗璁數鍘嬭蒋鍒囨崲鏃跺簭璋冩暣銆 + +### 涓昏淇敼 + +- 璐熻浇鍚姩鏃跺厛鍚戝崡鍚戝彂閫 `FU_REL_ON`锛屾敹鍒版湁鏁堝洖鐮佸悗鎵嶆墦寮鍖楀悜 Sink 缁х數鍣ㄣ +- 鍓╀綑鐨勮礋杞藉垵濮嬪寲鍛戒护鍦ㄥ壇缁х數鍣ㄧ‘璁ゅ悗鍏ラ槦锛屽寳鍚戝崗璁彙鎵嬩笌鍗楀悜鍒濆鍖栧苟琛屾墽琛屻 +- `RUNING` 闃舵鐨勫崡鍚戝懡浠ょ户缁拷鍔犲埌鍚屼竴闃熷垪锛屼繚鎸佸垵濮嬪寲閰嶇疆銆佺户鐢靛櫒銆佺洰鏍囩數娴/鐢靛帇鍜 `WORK_START` 鐨勯『搴忋 +- 鎺夌數鎭㈠鏃舵墽琛 `WORK_STOP -> CURRENT=0 -> ALL_REL_OFF -> FU_REL_ON`锛屽壇缁х數鍣ㄦ仮澶嶅悗绛夊緟杈撳叆鐢靛帇閲嶆柊鍑虹幇銆 +- 鎺夌數鎭㈠妫娴嬪埌鐢靛帇鍚庨噸鏂拌缃崗璁拰 CC锛屼笉鑳戒娇鐢ㄦ帀鐢靛墠鐨勭數鍘嬫牱鏈洿鎺ヨ繘鍏 `RUNING`銆 +- 鍗忚绫诲瀷銆丆C銆佸崗璁粍鍙锋垨鍗忚鐢垫祦鍙樺寲杩涘叆瀹屾暣閲嶆彙鎵嬶紝鍏抽棴涓诲壇缁х數鍣ㄥ悗閲嶆柊鎵撳紑鍓户鐢靛櫒銆 +- 浠呭崗璁數鍘嬪彉鍖栦娇鐢ㄨ蒋鍗歌浇锛屽彧鍙戦 `WORK_STOP` 鍜 `CURRENT=0`锛屼笉鍒囨崲缁х數鍣ㄣ +- 杞嵏杞芥仮澶嶆椂鍙彂閫佺洰鏍囩數娴/鐢靛帇鍜 `WORK_START`锛屼笉鍐嶅彂閫佺户鐢靛櫒鍛戒护銆 +- 淇濈暀杩炵画涓ゆ瀹為檯鐢垫祦涓嶅ぇ浜 `100mA` 鐨勫畨鍏ㄧ‘璁わ紝浠ュ強杩炵画涓ゆ绋冲畾鐢靛帇纭銆 +- 鏆傛椂淇濇寔鍗楀悜涓诲壇缁х數鍣ㄤ箣闂寸殑鍥哄畾寤舵椂涓哄睆钄界姸鎬併 + +### 娑夊強鏂囦欢 + +- `apps/chrg/applications/utils/chrg_sink.h` +- `apps/chrg/applications/utils/chrg_sink.c` +- `apps/chrg/applications/thread/chrg_comm.c` +- `apps/chrg/applications/thread/chrg_roll_nor.c` +- `apps/chrg/applications/thread/chrg_north.c` + +### 缂栬瘧楠岃瘉 + +- Keil MDK 缂栬瘧缁撴灉锛歚0 Error(s), 0 Warning(s)`銆 +- 灏氭湭瀹屾垚纭欢楠岃瘉锛岄渶閲嶇偣瑙傚療鍗楀悜鍛戒护椤哄簭銆佸寳鍚戝崗璁彙鎵嬫椂鍒汇佹帀鐢垫仮澶嶅拰鍗忚鐢靛帇杞垏鎹€ + +### 鍚庣画璁板綍鏍煎紡 + +鍚庣画姣忔淇敼鎸変互涓嬫牸寮忚拷鍔狅細 + +```text +## Vx.y.z - YYYY-MM-DD + +### 淇敼涓婚 +### 涓昏淇敼 +### 娑夊強鏂囦欢 +### 缂栬瘧楠岃瘉 +### 纭欢楠岃瘉 +``` diff --git a/docs/淇敼璁″垝.md b/docs/淇敼璁″垝.md new file mode 100644 index 0000000..15d3a41 --- /dev/null +++ b/docs/淇敼璁″垝.md @@ -0,0 +1,111 @@ +闈欐佹帓鏌ュ悗锛屾殏鏈湅鍒版槑纭殑 ABBA 鍨嬩簰鏂ラ攣鐜傚綋鍓嶇幇璞℃洿鍍忊滃唴瀛樼牬鍧/璧勬簮娉勬紡鍚庣嚎绋嬪仠婊炩濇垨鈥滅姸鎬佹満鏃犻檺閲嶈瘯鈥濓紝鑰屼笉鏄暣涓 RTOS 璋冨害鍣ㄦ閿併 + +鍙﹀锛屼唬鐮佷腑浣跨敤鐨勬槸 STM32 鍐呴儴 IWDG锛屼笉鏄閮ㄧ嫭绔嬬湅闂ㄧ嫍銆 + +**鍙枒鐐** + +1. **楂橀闄╋細鍗楀寳鍚戝垎鍖呮帴鏀跺瓨鍦ㄧ‘瀹氱殑瓒婄晫鍐欏拰娉勬紡璺緞** + +[north](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_north.c:548) 鍜 [south](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_south.c:309) 鍦ㄧ画鎺ュ垎鍖呮椂璁＄畻锛 + +```text +len_need = len_msg - 甯уご闀垮害 +``` + +浣嗘鏃 `pFrame->length` 宸茬粡鍖呭惈涔嬪墠鏀跺埌鐨勬暟鎹紝姝ｇ‘鐨勫墿浣欓暱搴﹀簲鍩轰簬 `len_msg - pFrame->length`銆傚綋鍓嶄唬鐮佸嵈浠 `payload[pFrame->length]` 寮濮嬪啓鍏ユ暣涓滃抚澶村悗鐨勬婚暱搴︹濄 + +渚嬪鎬婚暱 21 瀛楄妭锛岄鎵瑰凡瀛 8 瀛楄妭锛屼笅涓娆′粛鍙兘浠庡亸绉 8 鍐欏叆 18 瀛楄妭锛屾渶缁堝啓鍒板亸绉 26锛岃秺杩 21 瀛楄妭鍫嗗潡銆傝繖浼氱牬鍧忕浉閭诲爢鍧椼侀偖绠辨秷鎭敋鑷 RT-Thread 鍐呮牳瀵硅薄锛屾渶缁堣〃鐜颁负闅忔満绾跨▼鍗℃銆佷簰鏂ラ噺寮傚父鎴栧爢鍒嗛厤澶辫触銆 + +鍚屾椂锛屽垎鍖呰秴鏃惰矾寰勫彧娓呴櫎浜 `findhead`锛 + +- [chrg_north.c:627](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_north.c:627) +- [chrg_south.c:399](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_south.c:399) + +娌℃湁閲婃斁 `pMB/payload`锛屼篃娌℃湁娓呴櫎 `length/len_msg`銆傝屼笖娌℃湁鏂版暟鎹椂浼氭彁鍓 `continue`锛岃秴鏃舵鏌ユ牴鏈笉浼氭墽琛屻備覆鍙ｅ櫔澹般佷涪瀛楄妭鎴栨甯稿垎鍖呴兘鍙兘涓嶆柇绉疮娉勬紡銆 + +姝ゅ锛宲ayload 鍒嗛厤澶辫触鏃跺彧杩斿洖锛屾病鏈夐噴鏀惧垰鍒嗛厤鐨 `pMB`锛 + +- [chrg_north.c:518](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_north.c:518) +- [chrg_south.c:280](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_south.c:280) + +杩欐槸鐩墠鏈绗﹀悎鈥滆繍琛屾椂闂磋秺闀胯秺瀹规槗鍑虹幇鈥濈殑鍙枒鐐广 + +2. **楂橀闄╋細鐪嬮棬鐙楀杺娉曟棤娉曡鐩栦笟鍔＄嚎绋嬫閿** + +涓荤嚎绋嬫瘡绉掓棤鏉′欢鍠傜嫍锛歔main.c:36](D:/proj/char/chrg_v/apps/chrg/applications/main.c:36)銆 + +鍖楀悜杞绾跨▼鍙堝湪姣忚疆鏃犳潯浠跺杺鍚屼竴鍙嫍锛歔chrg_roll_nor.c:421](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_nor.c:421)銆 + +鍥犳鍗充娇 `thr.comm`銆乣thr.sou`銆乣thr.rollsou`銆丩CD 绾跨▼鍏ㄩ儴鍋滄宸ヤ綔锛屽彧瑕佷富绾跨▼鎴栧寳鍚戣疆璇㈢嚎绋嬩粛鑳借皟搴︼紝IWDG 灏辨案杩滀笉浼氬浣嶃傝繖鍙槸鍦ㄦ娴嬧淐PU/璋冨害鍣ㄦ槸鍚﹀畬鍏ㄥ仠姝⑩濓紝娌℃湁妫娴嬩笟鍔＄嚎绋嬫槸鍚﹀仴搴枫 + +椹卞姩鏈缁堣皟鐢ㄧ殑鏄 `HAL_IWDG_Refresh()`锛歔drv_wdt.c:40](D:/proj/char/chrg_v/rt-thread/bsp/stm32/libraries/HAL_Drivers/drivers/drv_wdt.c:40)銆備唬鐮佷腑娌℃湁鎵惧埌澶栭儴 WDI 寮曡剼缈昏浆鎴栧閮ㄧ湅闂ㄧ嫍椹卞姩銆 + +3. **楂橀闄╋細褰撳墠鏂板鐨勫崡鍚戞壒澶勭悊鍙兘姘镐箙鍋滃湪 `RUN_COM`** + +鍗楀悜鎵瑰鐞嗛亣鍒 CRC 閿欒鎴栧簲绛旇秴鏃跺悗锛屼笉澧炲姞閲嶈瘯娆℃暟銆佷笉璁剧疆鎴鏃堕棿锛屼篃涓嶆竻闄や换鍔★細 + +- CRC 閿欒锛歔chrg_roll_sou.c:608](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_sou.c:608) +- 搴旂瓟瓒呮椂锛歔chrg_roll_sou.c:627](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_sou.c:627) + +绾跨▼浼氫竴鐩撮噸鍙戝悓涓涓瘎瀛樺櫒锛宍pending` 姘歌繙涓嶆竻闄わ紝`run` 姘歌繙淇濇寔 `RUN_COM`锛屾甯稿崡鍚戣疆璇㈡棤娉曟仮澶嶃傝繖灞炰簬涓氬姟鐘舵佹満姝婚攣锛岃皟搴﹀櫒浠嶆甯歌繍琛岋紝鎵浠ョ湅闂ㄧ嫍涓嶄細澶嶄綅銆 + +杩欏鎵瑰鐞嗛昏緫鏄綋鍓嶅伐浣滃尯鐩稿 `HEAD` 鏂板鐨勶紝浼樺厛绾у緢楂樸 + +4. **楂橀闄╋細鍗楀悜鍏变韩鐘舵佺殑浜掓枼淇濇姢瀹為檯鏃犳晥** + +[chrg_set_sou_reg](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_sou.c:435) 鍏堝湪閿佸鍐欏叆锛 + +```text +pROLL->ch +pROLL->reg +pROLL->value +``` + +闅忓悗浜掓枼閲忓彧淇濇姢 `pROLL->run`銆傛秷璐硅呬篃鍙湪閿佸唴璇诲彇 `run`锛屽疄闄呬娇鐢 `ch/reg/value` 鏃跺凡缁忕寮閿併 + +澶氫釜鐢熶骇鑰呭寘鎷 LCD銆丮odbus 鍜岀姸鎬佹満鍙兘浜ゅ弶瑕嗙洊杩欎簺瀛楁锛屽舰鎴愨滈氶亾鏉ヨ嚜鍛戒护 A銆佸瘎瀛樺櫒鏉ヨ嚜鍛戒护 B銆佸兼潵鑷懡浠 C鈥濈殑缁勫悎銆 + +鎵瑰鐞嗘暟缁 `g_sou_com_batch` 鍚屾牱鐢辩敓浜ц呭拰 `thr.rollsou` 鍚屾椂璇诲啓锛屽嵈娌℃湁鍏卞悓鐨勯攣锛歔chrg_roll_sou.c:394](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_sou.c:394)銆 + +5. **涓珮椋庨櫓锛氬厛鍒囨崲 `RUN_COM`锛屽啀濉厖鎵瑰鐞嗘暟鎹** + +[chrg_sink_diff_send_reg](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_comm.c:2338) 鍏堣皟鐢 `chrg_sou_com_sou_set()` 灏嗙姸鎬佸垏鍒 `RUN_COM`锛岀劧鍚庢墠杩藉姞瀵勫瓨鍣ㄣ + +`chrg_sink_work()` 涔熸槸鐩稿悓椤哄簭锛歔chrg_sink.c:541](D:/proj/char/chrg_v/apps/chrg/applications/utils/chrg_sink.c:541)銆 + +濡傛灉娑堣垂鑰呭湪鐘舵佸垏鎹㈠悗鐪嬪埌灏氭湭濉厖鐨勬壒娆★紝浼氳涓烘病鏈変换鍔″苟鍒囧洖鑷姩妯″紡锛涢殢鍚庡姞鍏ョ殑 `pending` 鏁版嵁鍙兘涓鐩存棤浜哄鐞嗐傚綋鍓嶇嚎绋嬩紭鍏堢骇闄嶄綆浜嗛儴鍒嗙獥鍙ｆ鐜囷紝浣嗘病鏈変粠鍚屾鏈哄埗涓婃秷闄ょ珵鎬併 + +6. **涓珮椋庨櫓锛氬簲绛旈偖绠辨病鏈夎姹傘侀氶亾鎴栧簭鍙峰叧鑱** + +閭娑堟伅鍙湁 `length + payload`锛歔chrg_def.h:95](D:/proj/char/chrg_v/apps/chrg/applications/utils/chrg_def.h:95)銆 + +鍗楀寳杞绾跨▼榛樿鈥滄敹鍒扮殑涓嬩竴甯у氨鏄垰鎵嶈姹傜殑鍝嶅簲鈥濄傚崡鍚戞壒澶勭悊鍙鏌 CRC锛屼换浣曞欢杩熷埌杈剧殑鏃у搷搴旈兘鍙兘璁╁綋鍓嶆壒娆 `cur_idx++`锛歔chrg_roll_sou.c:574](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_sou.c:574)銆 + +鍦ㄨ秴鏃躲侀噸鍙戙侀氶亾鍒囨崲鎴栭偖绠辩Н鍘嬪悗锛岃姹備笌鍝嶅簲寰堝鏄撻敊浣嶏紝鏈缁堥犳垚鐘舵佹満鍋滃湪閿欒姝ラ鎴栨棤闄愰噸璇曘 + +7. **涓闄╋細鎵鏈変笟鍔′簰鏂ラ噺閮芥槸姘镐箙绛夊緟** + +TTY銆佸崡鍖楄疆璇簰鏂ラ噺缁熶竴浣跨敤 `RT_WAITING_FOREVER`銆備緥濡傦細 + +- [chrg_tty.c:457](D:/proj/char/chrg_v/apps/chrg/applications/bsp/chrg_tty.c:457) +- [chrg_comm.c:2246](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_comm.c:2246) +- [chrg_roll_nor.c:439](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_roll_nor.c:439) + +鐩墠娌℃湁鍙戠幇纭畾鐨勫弽鍚戝姞閿佺幆锛屼絾涓鏃﹂攣鎵鏈夎呭洜鍫嗙牬鍧忋佺姸鎬佹満鍗℃鎴栬澶囧啓闃诲鑰屼笉鍐嶉噴鏀撅紝鍏朵粬绾跨▼浼氭案涔呮寕璧凤紝娌℃湁瓒呮椂鍜屾晠闅滀笂鎶ャ + +8. **涓闄╋細涓插彛 RingBuffer 鍐欏叆缁撴灉琚拷鐣** + +[chrg_north.c:623](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_north.c:623) 鍜 [chrg_south.c:383](D:/proj/char/chrg_v/apps/chrg/applications/thread/chrg_south.c:383) 娌℃湁妫鏌 `rt_ringbuffer_put()` 瀹為檯鍐欏叆闀垮害銆 + +缂撳啿鍖烘弧鏃朵細闈欓粯涓㈠瓧鑺傦紝闅忓悗瑙﹀彂鍒嗗寘瓒呮椂銆佹硠婕忓拰涓婅堪瓒婄晫璺緞锛屾槸闀挎湡杩愯鍚庡嚭鐜伴棶棰樼殑閲嶈鏀惧ぇ鍣ㄣ + +**浼樺厛鍒ゆ柇** + +鏈鍙兘鐨勪袱鏉℃晠闅滈摼鏄細 + +1. 涓插彛鍒嗗寘 鈫 闀垮害璁＄畻閿欒/瓒呮椂娉勬紡 鈫 鍫嗘崯鍧忔垨鑰楀敖 鈫 鏌愪簺涓氬姟绾跨▼姘镐箙绛夊緟锛涗富绾跨▼缁х画鍠傜嫍銆 +2. 鍗楀悜鏌愭潯鍛戒护瓒呮椂鎴栧搷搴旈敊浣 鈫 `RUN_COM` 鏃犻檺閲嶅彂 鈫 鍗楀悜涓氬姟姘镐箙鍋滄锛涗富绾跨▼鍜屽寳鍚戠嚎绋嬬户缁杺鐙椼 + +鐜板満鏁呴殰灏氳兘杩涘叆 Shell 鏃讹紝浼樺厛淇濆瓨 `list_thread`銆乣list_mutex`銆乣list_mailbox`銆乣free` 杈撳嚭锛屽苟妫鏌ユ槸鍚︽寔缁墦鍗 `com batch timeout, resend current reg`銆傝繖鍑犻」鍙互鐩存帴鍖哄垎閿佺瓑寰呫佸爢鑰楀敖鍜岀姸鎬佹満鏃犻檺閲嶈瘯銆 + +鏈慨鏀逛换浣曟枃浠躲 \ No newline at end of file diff --git a/docs/娴嬭瘯鏃ュ織.md b/docs/娴嬭瘯鏃ュ織.md new file mode 100644 index 0000000..c55b9ad --- /dev/null +++ b/docs/娴嬭瘯鏃ュ織.md @@ -0,0 +1,36 @@ +# 娴嬭瘯鏃ュ織 + +## V1.1.8 - 2026-08-24 + +### 娴嬭瘯瀵硅薄 + +Source鍗忚鍒囨崲澶嶄綅閫昏緫銆 + +### 楠岃瘉璁板綍 + +| 缂栧彿 | 娴嬭瘯椤 | 棰勬湡缁撴灉 | 褰撳墠缁撴灉 | +| --- | --- | --- | --- | +| 1 | 棣栨鍙戦丼ource鍗忚 | 鐩存帴鍙戦佸崗璁紝涓嶅彂閫乣SOURCE_RESET` | 闈欐佹鏌ラ氳繃 | +| 2 | PD鍒囨崲鍒伴潪PD | 鍏堝浣嶏紝鍐嶅彂閫佸崗璁 | 闈欐佹鏌ラ氳繃 | +| 3 | 闈濸D鍒囨崲鍒癙D | 鍏堝浣嶏紝鍐嶅彂閫佸崗璁 | 闈欐佹鏌ラ氳繃 | +| 4 | PD鍒嘝D | 涓嶅浣嶏紝鐩存帴鍙戦佸崗璁 | 闈欐佹鏌ラ氳繃 | +| 5 | 闈濸D鍒囬潪PD | 涓嶅浣嶏紝鐩存帴鍙戦佸崗璁 | 闈欐佹鏌ラ氳繃 | +| 6 | 浠呭垏鎹C绾 | 涓嶅浣 | 闈欐佹鏌ラ氳繃 | +| 7 | 澶嶄綅鍛戒护甯 | 鍙戦乣06 00 02 18 00 0E` | 闈欐佹鏌ラ氳繃 | +| 8 | 澶嶄綅鍥炵爜 | 鏀跺埌`05 00 02 18 16`鍚庢帹杩涚姸鎬 | 寰呯‖浠堕獙璇 | + +### 闈欐侀獙璇 + +- 宸叉墽琛宍git diff --check`锛屾棤鏍煎紡閿欒銆 +- 宸叉鏌ュ浣嶅懡浠ゃ佺姸鎬佹槧灏勩佸洖鐮侀暱搴︽牎楠屽拰`last_pd_pro`鏇存柊璺緞銆 +- Keil缂栬瘧鍙婄‖浠跺疄娴嬫湭鎵ц銆 + +### 寰呰ˉ鍏呯幇鍦轰俊鎭 + +- 鏉垮崱缂栧彿锛 +- 娴嬭瘯杩炴帴鏂瑰紡锛 +- 娴嬭瘯寮濮/缁撴潫鏃堕棿锛 +- 澶嶄綅鍙戦佹棩蹇楋細 +- 澶嶄綅鍥炵爜鏃ュ織锛 +- 鍗忚鍒囨崲缁撴灉锛 +- 鏈缁堢粨璁猴細 diff --git a/docs/绋嬪簭娴佺▼涓庡嚱鏁拌鏄.md b/docs/绋嬪簭娴佺▼涓庡嚱鏁拌鏄.md new file mode 100644 index 0000000..32df2a4 --- /dev/null +++ b/docs/绋嬪簭娴佺▼涓庡嚱鏁拌鏄.md @@ -0,0 +1,325 @@ +# 绋嬪簭娴佺▼涓庡嚱鏁拌鏄 + +## 1. 鏂囨。鑼冨洿 + +鏈枃鎸夊綋鍓嶆簮鐮侊紙2026-07-19锛夎鏄 `apps/chrg/applications/` 鐨勮嚜鐮斿嚱鏁般佽繍琛屾祦绋嬪拰鍑芥暟绾ц皟鐢ㄥ叧绯伙紝骞惰ˉ鍏 `apps/boot/` 鐨勫惎鍔ㄤ富閾俱俙rt-thread/`銆乣libs/`銆丆ubeMX 鐢熸垚浠ｇ爜銆丠AL 涓柇妯℃澘浠ュ強璋冭瘯 shell 鍛戒护鐨勫唴閮ㄥ簱璋冪敤涓嶅睍寮銆傝皟鐢ㄥ叧绯荤敱婧愮爜闈欐佸垎鏋愬緱鍒帮紱閫氳繃 `INIT_*_EXPORT`銆佺嚎绋嬪叆鍙ｃ佸洖璋冨拰鍑芥暟鎸囬拡鍙戠敓鐨勮皟鐢ㄤ細鍗曠嫭鏍囨槑銆 + +## 2. 涓婄數涓庡垵濮嬪寲娴佺▼ + +```mermaid +flowchart TD + R["鑺墖澶嶄綅"] --> B["Boot main()"] + B --> SI["System_Init()"] + SI --> AI["APP_Init()"] + AI --> AR["APP_Running()"] + AR --> CK["boot_CheckAndHandle()"] + CK -->|APP 鏈夋晥| JA["boot_JumpToAPP()"] + CK -->|闇瑕佸崌绾 RX["recvDataHandler()"] + RX --> YH["ymodemHandler()"] + YH --> BP["boot_ProtocolDataHandle()"] + BP --> FM["FM_* 鎿﹀啓/鏍￠獙鍑芥暟"] + FM --> JA + JA --> RTT["RT-Thread 鍚姩"] + RTT --> INIT["INIT_PREV/DEVICE/ENV/APP_EXPORT"] + INIT --> TI["chrg_thread_init()"] + TI --> TC["chrg_thread_create() x 6"] + TC --> MAIN["main() 绌洪棽寰幆"] +``` + +`main()` 涓嶆槸涓氬姟鍏ュ彛銆侴PIO銆丗AL銆佸畾鏃跺櫒銆佷覆鍙ｃ佺户鐢靛櫒鍜岀湅闂ㄧ嫍鐢 RT-Thread 鑷姩鍒濆鍖栨璋冪敤锛沗chrg_thread_init()` 鍐嶅垱寤哄叚涓父椹荤嚎绋嬨傚垵濮嬪寲澶辫触鐩墠涓嶄細闃绘鍚庣画绾跨▼缁х画鍒涘缓锛屾帓闅滄椂蹇呴』鏌ョ湅鍚姩鏃ュ織銆 + +## 3. 杩愯鏈熺嚎绋嬩笌鏁版嵁娴 + +| 绾跨▼鍏ュ彛 | 鑱岃矗 | 涓昏杈撳叆 | 涓昏杈撳嚭 | +|---|---|---|---| +| `chrg_north_thread_entry` | 鎺ユ敹鍗忚鏉/Sink/Source 鍖楀悜甯 | 鍖楀悜 UART ringbuffer | 鏇存柊 `chrgnorth.sw[]`锛屾姇閫掑抚 | +| `chrg_south_thread_entry` | 鎺ユ敹鍔熺巼鏉 Modbus 鍝嶅簲 | 鍗楀悜 UART ringbuffer | 鎶曢掑搷搴斿埌杞/閫氫俊妯″潡 | +| `chrg_comm_thread_entry` | 涓婁綅鏈 Modbus銆佸瘎瀛樺櫒鏄犲皠鍜屼笟鍔″懡浠 | mailbox銆丮odbus 鍥炶皟 | 淇敼鐩爣鐘舵侊紝鐢熸垚鍗楀寳鍚戝懡浠 | +| `chrg_lcd_thread_entry` | HMI 鎶ユ枃瑙ｆ瀽鍜岀姸鎬佹樉绀 | LCD 涓插彛 | 淇敼閰嶇疆銆佸埛鏂伴〉闈 | +| `chrg_roll_nor_thread_entry` | 鍒嗘椂椹卞姩鍥涜矾 Sink/Source 鍗忚鏉 | event銆侀氶亾鐘舵 | 鏌ヨ/璁剧疆鍗忚鏉匡紝杩愯 Sink 鐘舵佹満 | +| `chrg_roll_sou_thread_entry` | 涓茶鎵ц鍔熺巼鏉垮瘎瀛樺櫒璇诲啓 | event銆佹壒鍛戒护闃熷垪 | Modbus RTU 璇锋眰涓庡畬鎴愮姸鎬 | + +```mermaid +flowchart LR + PC["涓婁綅鏈"] --> MB["Modbus 鍥炶皟 func* / mb_reg_*_cb"] + LCD["HMI"] --> LP["chrg_lcd_parse()"] + MB --> CM["chrg_comm_parse_msg()"] + LP --> ST["chrgnorth.sw[] 鐩爣鐘舵"] + CM --> ST + RN["chrg_roll_nor_thread_entry()"] --> SET["chrg_roll_nor_set()"] + ST --> SET + SET --> SK["sink/source 璁剧疆鍑芥暟"] + SK --> NTX["chrg_north_send()"] + DEV["鍗忚鏉"] --> NRX["chrg_north_thread_entry()"] + NRX --> FD["chrg_north_frame_dispatch()"] + FD --> SP["chrg_sink_parse() / Source 瑙ｆ瀽"] + SP --> SW["chrg_sink_work()"] + SW --> SR["chrg_set_sou_reg()"] + CM --> SR + SR --> RS["chrg_roll_sou_thread_entry()"] + RS --> STX["chrg_south_send()"] + PWR["鍔熺巼鏉"] --> SRX["chrg_south_thread_entry()"] + SRX --> SD["chrg_south_frame_dispatch()"] + SD --> RS +``` + +## 4. Sink 宸ヤ綔鐘舵佹満 + +```mermaid +stateDiagram-v2 + [*] --> INIT + INIT --> WAIT: 涓嬪彂鍋滄/瀹夊叏缁х數鍣ㄧ姸鎬 + WAIT --> RUNING: 鐢靛帇姝ｅ父涓旀帴杩戠洰鏍 + RUNING --> WAIT: 鐢靛帇姝ｅ父浣嗙數娴佽繛缁亸浣 + RUNING --> LOW: 鐢靛帇杩炵画浣庝簬 WORK_MIN_VOLT + WAIT --> LOW: 鐢靛帇杩炵画杩囦綆 + LOW --> WAIT: 鐢靛帇鎭㈠骞堕噸鏂板噯澶 + RUNING --> OFF: 鍋滄宸ヤ綔 + WAIT --> OFF: 鍋滄宸ヤ綔 +``` + +鍑芥暟绾т富閾撅細`chrg_roll_nor_thread_entry()` 鈫 `chrg_roll_nor_set()` 鈫 `sink_get_vc()` 鈫 鍖楀悜鍝嶅簲 鈫 `chrg_north_frame_dispatch()` 鈫 `chrg_sink_parse()` 鈫 `chrg_sink_work()` 鈫 `chrg_sink_work_init()` / `chrg_sink_work_volt_runing()` / `chrg_sink_nor_work_low()` / `chrg_sink_nor_work_off()`銆傜户鐢靛櫒鍔ㄤ綔鐢 `chrg_sink_change_ON()`銆乣chrg_sink_SHOUT_ON()`銆乣chrg_nor_sw_rel()` 瀹屾垚锛屽姛鐜囨澘鍛戒护鏈缁堢粡 `chrg_set_sou_reg()` 浜ょ粰鍗楀悜杞绾跨▼銆 + +## 5. 鍑芥暟璇存槑锛氬叆鍙ｄ笌绾跨▼鍩虹璁炬柦 + +### `main.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `show_app_version()` | 鎵撳嵃 RT-Thread 鐗堟湰鍜屽浐浠剁紪璇戞椂闂达紝鏃犺緭鍏ュ拰杩斿洖鍊笺 | +| `main()` | 璁剧疆 shell 鎻愮ず绗﹀悗杩涘叆 1 绉掑欢鏃跺惊鐜紱涓氬姟绾跨▼鐢辫嚜鍔ㄥ垵濮嬪寲娈垫彁鍓嶅垱寤恒 | + +### `thread/chrg_thread.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `chrg_thread_evt_send()` | 鍚戞寚瀹氱嚎绋嬪彂閫佷簨浠朵綅锛涚嚎绋嬫垨浜嬩欢瀵硅薄鏃犳晥鏃惰繑鍥為敊璇 | +| `chrg_thread_mb_free()` | 閲婃斁閭娑堟伅鍙婂叾 `payload`锛屼粎渚涙湰鏂囦欢澶辫触璺緞浣跨敤銆 | +| `chrg_thread_mb_send()` | 鍚戞寚瀹氱嚎绋嬮偖绠辫浆绉绘秷鎭墍鏈夋潈锛涘彂閫佸け璐ユ椂鑷姩閲婃斁娑堟伅銆 | +| `chrg_thread_mq_send()` | 鍚戞寚瀹氱嚎绋嬫秷鎭槦鍒楀鍒跺畾闀挎秷鎭 | +| `chrg_thread_create()` | 鎸 `chrgthr[]` 閰嶇疆鍒涘缓 IPC 瀵硅薄銆佺嚎绋嬪苟鍚姩绾跨▼銆 | +| `chrg_thread_init()` | 閬嶅巻鍏釜绾跨▼閰嶇疆骞跺垱寤猴紱鐢 `INIT_APP_EXPORT` 闅愬紡璋冪敤銆 | + +## 6. 鍑芥暟璇存槑锛氶氫俊绾跨▼ + +### `thread/chrg_north.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `chrg_compare()` | 璁＄畻涓や釜鏈夌鍙烽噺鐨勭粷瀵瑰樊鍊笺 | +| `chrg_source_stop()` | 鎸夋楠ゅ仠姝 Source 杈撳嚭骞跺鐞嗙户鐢靛櫒/鐘舵佸浣嶃 | +| `chrg_source_standard_output()` | 鎵ц Source 鏍囧噯杈撳嚭鎺у埗娴佺▼銆 | +| `chrg_source_fast_output()` | 鎵ц Source 蹇厖鍗忚杈撳嚭娴佺▼銆 | +| `chrg_source_setting()` | 鏍规嵁 Source 褰撳墠閰嶇疆閫夋嫨鍜屾帹杩涜缃繃绋嬨 | +| `chrg_sink_parse()` | 瑙ｆ瀽 Sink 鐢靛帇銆佺數娴佸強鐘舵侊紝鍋氫綆鍘/鏃犳祦鍒ゅ畾骞惰皟鐢 `chrg_sink_work()`銆 | +| `chrg_north_handle_Seting_Volt()` | 瑙ｆ瀽鍖楀悜璁剧疆鐢靛帇绫诲搷搴斿苟鏇存柊閫氶亾鐘舵併 | +| `chrg_north_switch()` | 閫夋嫨褰撳墠鍖楀悜鐗╃悊閫氶亾銆 | +| `chrg_north_send()` | 閫氳繃鍖楀悜 TTY 鍙戦佷竴甯ф暟鎹 | +| `chrg_north_frame_head()` | 浠 ringbuffer 鎼滅储鍚堟硶甯уご銆 | +| `chrg_north_frame_reset()` | 閲嶇疆缁勫抚涓婁笅鏂囷紝骞舵寜鍙傛暟鍐冲畾鏄惁閲婃斁缂撳瓨銆 | +| `chrg_north_frame_append()` | 灏嗘帴鏀跺瓧鑺傝拷鍔犲埌褰撳墠甯х紦瀛樸 | +| `chrg_north_frame_dispatch()` | 鏍￠獙瀹屾暣甯у苟鍒嗘淳鍒 Source/Sink 涓氬姟瑙ｆ瀽銆 | +| `chrg_north_pickup_frame()` | 椹卞姩鈥滄壘甯уご鈥旀敹甯т綋鈥斿垎娲锯濈姸鎬佹満銆 | +| `chrg_north_thread_entry()` | 鍖楀悜鎺ユ敹绾跨▼涓诲惊鐜紝浠 UART ringbuffer 鎸佺画鎻愬彇甯с | +| `north_ch()` / `north_diag()` | FinSH 璋冭瘯鍛戒护锛氬垏鎹㈤氶亾銆佹煡鐪嬭瘖鏂鏁般 | + +### `thread/chrg_south.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `chrg_south_switch_lv1()` / `chrg_south_switch_lv2_1()` / `chrg_south_switch_lv2_2()` | 鎺у埗绾ц仈閫夋嫨绾匡紝瀹屾垚鍗楀悜閫氶亾纭欢閫夐氥 | +| `chrg_south_switch()` | 鏍￠獙閫氶亾骞剁粍鍚堣皟鐢ㄤ笁绾ч夋嫨鍑芥暟銆 | +| `chrg_south_send()` | 閫氳繃鍗楀悜 TTY 鍙戦 Modbus RTU 甯с | +| `chrg_south_frame_head()` | 浠 ringbuffer 璇嗗埆鐩爣鍦板潃鍜屽姛鑳界爜銆 | +| `chrg_south_frame_reset()` | 娓呯悊鍗楀悜缁勫抚鐘舵佸拰鍔ㄦ佺紦瀛樸 | +| `chrg_south_frame_append()` | 杩藉姞鍗楀悜鎺ユ敹瀛楄妭銆 | +| `chrg_south_frame_dispatch()` | 鏍￠獙 CRC 鍚庡皢鍝嶅簲鎶曢掔粰娑堣垂鑰呫 | +| `chrg_south_pickup_frame()` | 鎺ㄨ繘鍗楀悜缁勫抚鐘舵佹満銆 | +| `chrg_south_thread_entry()` | 鍗楀悜鎺ユ敹绾跨▼涓诲惊鐜 | +| `south_ch()` | FinSH 鍗楀悜閫氶亾璋冭瘯鍛戒护銆 | + +### `thread/chrg_roll_nor.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `sink_fill_pd_buf()` | 鎸夊崗璁被鍨嬫妸缁勫彿銆佺數鍘嬨佺數娴佺紪鐮佷负 Sink 鍙傛暟瀛楄妭銆 | +| `chrg_nor_source_stop()` | 鍒嗘楠ゅ仠姝 Source锛屽叧闂户鐢靛櫒骞舵竻鐞嗗垏鎹㈡爣蹇椼 | +| `chrg_roll_nor_sw_uart()` | 鍦ㄦ寚瀹氶氶亾閫夋嫨 Sink 鎴 Source UART銆 | +| `chrg_roll_nor_sink_pro_set()` | 缁勮骞跺彂閫 Sink 蹇厖鍗忚璁剧疆銆 | +| `chrg_roll_nor_source_pro_set()` | 鎸夎缃潵婧愰夋嫨 Source 鍗忚涓嬪彂鍑芥暟銆 | +| `chrg_roll_nor_parse()` | 鏍规嵁瑙掕壊鍜屽瓙鍛戒护鐢熸垚涓娆″寳鍚戞煡璇/璁剧疆鍔ㄤ綔銆 | +| `chrg_roll_nor_cmd()` | 鍖楀悜鍛戒护鍙傛暟妫鏌ユ帴鍙ｏ紱褰撳墠浠呭仛绌烘寚閽堟鏌ャ | +| `chrg_roll_nor_set()` | 鍖楀悜杞鏍稿績鐘舵佹満锛屾帹杩涙瘡閫氶亾 Source/Sink 瀛愭楠ゃ | +| `chrg_roll_nor_thread_entry()` | 杞鍥涗釜鍖楀悜閫氶亾锛岀瓑寰呭搷搴斿苟鎺у埗瓒呮椂/閲嶈瘯銆 | +| `sink()` / `source()` | FinSH 鎵嬪伐閰嶇疆 Sink/Source 鐨勮皟璇曞叆鍙ｃ | +| `chrg_trim_crc()` | 璁＄畻鏍″噯鏁版嵁 CRC銆 | +| `chrg_trim_set_volt()` / `chrg_trim_set_curr()` / `chrg_trim_set_source_curr()` | 鍐欏叆鐢靛帇銆佺數娴佸強 Source 鐢垫祦鏍″噯鍊笺 | +| `chrg_trim_set_zero()` | 鎵ц闆剁偣鏍″噯璁剧疆銆 | +| `chrg_roll_trim_set()` | 鎸夋牎鍑嗙被鍨嬪垎娲惧叿浣撴牎鍑嗗嚱鏁般 | + +### `thread/chrg_roll_sou.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `chrg_sou_com_batch_submit()` | 鎻愪氦涓鎵瑰崡鍚戣繛缁啓瀵勫瓨鍣ㄥ懡浠ゃ | +| `chrg_sou_com_batch_add_reg()` | 鍚戝綋鍓嶆壒娆¤拷鍔犻氶亾銆佸瘎瀛樺櫒鍜屽笺 | +| `chrg_set_sou_reg()` | 鎻愪氦鍗曚釜寮傛瀵勫瓨鍣ㄥ啓鍛戒护銆 | +| `chrg_set_sou_reg_com()` | 灏嗗瘎瀛樺櫒鍐欏叆鍚堝苟鎵规銆 | +| `sou_com_batch_next()` | 鍦ㄩ攣淇濇姢涓嬪彇涓嬩竴鏉℃壒鍛戒护銆 | +| `sou_com_batch_complete()` | 鏍囪鎵瑰懡浠ゅ畬鎴愬苟鎺ㄨ繘闃熷垪銆 | +| `sou_com_batch_cancel()` | 鍙栨秷鎸囧畾閫氶亾鎵瑰懡浠ゃ | +| `sou_com_batch_pending_locked()` | 鍒ゆ柇閿佸唴鏄惁杩樻湁寰呭鐞嗘壒鍛戒护銆 | +| `sou_single_command_finish()` | 缁撴潫鍗曞懡浠わ紝鎭㈠鏈熸湜杩愯鐘舵併 | +| `sou_com_response_matches()` | 鍒ゆ柇鍝嶅簲鏄惁鍖归厤褰撳墠璇锋眰銆 | +| `sou_msg_free()` | 閲婃斁鍗楀悜閭娑堟伅銆 | +| `sou_com_command_failed()` | 缁熶竴澶勭悊瓒呮椂/鍗忚閿欒鍜屾壒娆″洖婊氥 | +| `chrg_roll_sou_thread_entry()` | 涓茶鍙戦佸崡鍚戝懡浠ゃ佺瓑寰呭搷搴斿苟澶勭悊閲嶈瘯銆 | +| `south_send()` / `south_run()` | FinSH 鍙戦佸瘎瀛樺櫒鍜屽惎鍋滆皟璇曞懡浠ゃ | + +## 7. 鍑芥暟璇存槑锛氫笟鍔′笌鍗忚 + +### `utils/chrg_sink.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `sink_get_vc()` / `sink_get_pd()` | 鐢熸垚 Sink 鐢靛帇鐢垫祦/鍗忚鏌ヨ甯с | +| `sink_set_cc_line()` / `sink_set_cc_lvl()` | 璁剧疆 CC 绾块夋嫨鍜岀數骞炽 | +| `sink_set_pd()` | 缂栫爜骞跺彂閫 Sink 蹇厖鍗忚鍙傛暟銆 | +| `chrg_sink_work_init()` | 鍒濆鍖栧伐浣滄楠ゅ苟涓嬪彂鍋滄/瀹夊叏缁х數鍣ㄥ懡浠ゃ | +| `chrg_sink_work_volt_runing()` | 鍦ㄧ數鍘嬫弧瓒虫潯浠舵椂鎺ㄨ繘 RUNING 鍔ㄤ綔銆 | +| `chrg_sink_nor_work_low()` | 澶勭悊鎸佺画浣庡帇鐘舵佸苟澶嶄綅杩愯鏉′欢銆 | +| `chrg_sink_nor_work_off()` | 鎵ц Sink 鍋滄満鏀跺熬銆 | +| `chrg_sink_change_ON()` / `chrg_sink_SHOUT_ON()` | 鎺у埗鎹㈠悜鍜岀煭鎺ョ浉鍏崇户鐢靛櫒姝ラ銆 | +| `chrg_sink_work()` | 鏍规嵁 `work_mode` 鍒嗘淳 Sink 宸ヤ綔鐘舵併 | + +### `utils/chrg_source.c` + +| 鍑芥暟缁 | 璇存槑 | +|---|---| +| `source_get_vc()` / `source_get_pd()` | 鐢熸垚 Source 鐢靛弬/鍗忚鏌ヨ甯с | +| `source_set_cc_lvl()` / `source_set_cc_choose()` | 閰嶇疆 Source CC 鐢靛钩鍜岄夋嫨鏂瑰紡銆 | +| `parse_mulit_gear_One()` / `parse_power_single_gear()` | 瑙ｆ瀽鍗曠粍鍥哄畾妗ｅ揩鍏呰兘鍔涖 | +| `parse_pd_11group_pdo()` / `parse_power_pdo_gear()` | 瑙ｆ瀽 PDO/PPS 澶氭。鑳藉姏銆 | +| `parse_mulit_gear_more()` / `parse_multi_gear_more()` | 瑙ｆ瀽澶氱粍澶氭。鍗忚鑳藉姏銆 | +| `parse_ufcs_gear_more()` / `parse_power_ufcs()` | 瑙ｆ瀽 UFCS 妗ｄ綅銆 | +| `pd_fill_single_group()` | 閫氱敤鍗曠粍鍗忚鍙傛暟缂栫爜銆 | +| `source_set_pd()` | 鎸夊崗璁佺數鍘嬪拰鐢垫祦鐢熸垚 Source 璁剧疆甯с | +| `pd_fill_single_group_com()` | 鎸夐氫俊瀵勫瓨鍣ㄦ。浣嶇紪鐮佸崟缁勫弬鏁般 | +| `pd_fill_single_group_need_src_com()` / `pd_fill_single_group_no_src_com()` | 鍒嗗埆缂栫爜闇瑕/涓嶉渶瑕 Source 鍙傛暟鐨勫崗璁 | +| `pd_fill_single_group_FCP_AFC()` / `pd_fill_single_group_UFCS()` | 缂栫爜 FCP/AFC 鍜 UFCS 涓撶敤鍙傛暟銆 | +| `source_set_pd_com()` / `source_set_pd_new_com()` | 鏍规嵁瀵勫瓨鍣ㄩ厤缃垨瀹屾暣閫氶亾鐘舵佷笅鍙 Source 鍗忚銆 | + +### `utils/chrg_eload.c` + +| 鍑芥暟缁 | 璇存槑 | +|---|---| +| `chrg_eload_set_ymodem_resp()` / `chrg_eload_get_ymodem_resp()` / `chrg_eload_clear_ymodem_resp()` | 璁剧疆銆佽鍙栧拰娓呴櫎鐢靛瓙璐熻浇鍗囩骇鍝嶅簲鏍囧織銆 | +| `memcmp_8bytes()` | 姣旇緝鍥哄畾 8 瀛楄妭鏍囪瘑銆 | +| `chrg_eload_read_regs()` / `chrg_eload_write_reg()` / `chrg_eload_write_More_reg()` | 鐢熸垚鐢靛瓙璐熻浇 Modbus 璇汇佸崟鍐欏拰澶氬啓璇锋眰銆 | +| `chrg_eload_send_ymodem_data()` | 杞彂 YModem 鍗囩骇鏁版嵁銆 | +| `chrg_write_cv()` | 鍐欏叆鐢靛瓙璐熻浇 CV 鍙傛暟銆 | +| `chrg_eload_send_relay()` | 涓嬪彂鐢靛瓙璐熻浇缁х數鍣ㄥ姩浣溿 | +| `chrg_eload_refresh()` | 鍒锋柊鐢靛瓙璐熻浇娴嬮噺鐘舵併 | +| `chrg_eload_parse()` | 瑙ｆ瀽鐢靛瓙璐熻浇鍝嶅簲骞舵洿鏂伴氶亾鏁版嵁銆 | +| `snp_ch()` | 閫夋嫨鐢靛瓙璐熻浇閫氶亾銆 | +| `Show_Volt()` / `Show_Curr()` / `Show_Ripple()` / `Show_DZF()` | 璁＄畻鎴栧埛鏂板搴旀祴閲忔樉绀洪」銆 | +| `Sta_compute()` | 姹囨绘祴閲忕姸鎬併 | +| `LCD_SHOW()` | 灏嗙數瀛愯礋杞芥祴閲忕粨鏋滄帹閫佸埌 LCD銆 | + +### `utils/chrg_north_pkg.c` 涓 `utils/chrg_utils.c` + +| 鍑芥暟 | 璇存槑 | +|---|---| +| `chrg_north_pkg_encode()` / `chrg_north_pkg_decode()` | 缂栫爜鍜岃В鐮佸寳鍚戝崗璁寘锛屽苟鏍￠獙闀垮害/鏍￠獙鍊笺 | +| `mb_crc16()` | 璁＄畻 Modbus CRC16銆 | +| `_crc8()` / `calc_crc8()` | 鍗曞瓧鑺傛帹杩涘強鏁存 CRC8 璁＄畻銆 | +| `u16_to_u8v()` / `u16_to_u8v_com()` / `u8v_to_u16()` | 16 浣嶆暣鏁颁笌瀛楄妭搴忓垪浜掕浆銆 | +| `u32_to_u8v()` / `u8v_to_u32()` | 32 浣嶆暣鏁颁笌瀛楄妭搴忓垪浜掕浆銆 | +| `swap_u16()` / `swap_u32()` | 浜ゆ崲 16/32 浣嶆暣鏁扮搴忋 | + +## 8. 鍑芥暟璇存槑锛氫笂浣嶆満銆丩CD 涓庢澘绾у皝瑁 + +### `thread/chrg_comm.c` + +| 鍑芥暟缁 | 璇存槑 | +|---|---| +| `chrg_shadow_sync()` / `chrg_shadow_init()` | 鍚屾/鍒濆鍖 Modbus 瀵勫瓨鍣ㄥ奖瀛愭暟鎹 | +| `mb_set_bits()` / `mb_get_bits()` | 鍦 Modbus 浣嶇紦鍐插尯鍐欏叆/璇诲彇鎸囧畾浣嶆銆 | +| `mb_reg_input_cb()` / `mb_reg_holding_cb()` / `mb_reg_test_cb()` | 杈撳叆銆佷繚鎸佸拰娴嬭瘯瀵勫瓨鍣ㄥ洖璋冦 | +| `mb_ymodem_updata_cb()` | 澶勭悊鍗囩骇瀵勫瓨鍣ㄦ暟鎹 | +| `mb_reg_coils_cb()` / `mb_reg_discrete_cb()` | 绾垮湀涓庣鏁ｈ緭鍏ュ洖璋冦 | +| `funcReadCoils()` / `funcReadDiscreteInputs()` / `funcReadHoldingRegister()` / `funcReadInputRegister()` | 瀹炵幇瀵瑰簲 Modbus 璇诲姛鑳姐 | +| `funcWriteCoil()` / `funcWriteHoldingRegister()` / `funcWriteMultipleCoils()` / `funcWriteMultipleHoldingRegister()` | 鏍￠獙骞舵墽琛屽搴斿啓鍔熻兘銆 | +| `sink_proto_lookup()` / `src_proto_lookup()` / `src_type_lookup()` | 灏嗗瘎瀛樺櫒鏋氫妇鏄犲皠涓哄唴閮ㄥ崗璁/Source 绫诲瀷銆 | +| `parse_load_no_group()` / `parse_load_with_group()` | 瑙ｆ瀽鏃犵粍鍙/甯︾粍鍙风殑璐熻浇鍗忚鍙傛暟銆 | +| `chrg_com_source_on()` | 鏍规嵁閫氫俊閰嶇疆鍚姩 Source 娴佺▼銆 | +| `funcWriteProtoCal()` / `funcSinkTest()` / `funcTrimELoad()` | 澶勭悊鍗忚鏍″噯銆丼ink 娴嬭瘯鍜岀數瀛愯礋杞芥牎鍑嗗懡浠ゃ | +| `funYmodemUpadata()` | 鎺ㄨ繘鍥轰欢鍗囩骇鍛戒护銆 | +| `chrg_comm_parse_msg()` | 瑙ｆ瀽閫氫俊绾跨▼閭娑堟伅骞跺垎娲惧姛鑳界爜銆 | +| `chrg_comm_updata_north()` | 灏嗗疄鏃跺寳鍚戠姸鎬佸悓姝ュ埌瀵勫瓨鍣ㄥ尯銆 | +| `chrg_comm_thread_entry()` | 鍒濆鍖 Modbus 浠庣珯骞跺惊鐜鐞嗘秷鎭/鐘舵佸悓姝ャ | +| `chrg_mb_write_sink()` / `chrg_mb_write_src()` / `chrg_mb_write_sys()` | 灏嗕繚鎸佸瘎瀛樺櫒鍙樺寲鍐欏叆 Sink銆丼ource 鍜岀郴缁熺姸鎬併 | +| `chrg_sink_get_proto_diff()` | 姣旇緝鐩爣涓庡疄闄 Sink 鍗忚鍙傛暟銆 | +| `chrg_sink_diff_send_reg()` | 浠呭彂閫佸瓨鍦ㄥ樊寮傜殑 Sink 瀵勫瓨鍣ㄣ | +| `set_ymodem_update_channel()` / `mb_error()` / `rs485snd()` | 鍒嗗埆璁剧疆鍗囩骇閫氶亾銆佽浆鎹㈤敊璇爜鍜屾彁渚 RS485 璋冭瘯鍛戒护銆 | + +### `thread/chrg_lcd.c` + +| 鍑芥暟缁 | 璇存槑 | +|---|---| +| `chrg_sou_work()` / `chrg_sou_stop()` | 鍚姩/鍋滄鎸囧畾鍔熺巼閫氶亾銆 | +| `chrg_pro_set()` | 搴旂敤 LCD 杈撳叆鐨勫揩鍏呭崗璁厤缃 | +| `chrg_set_eload_sink()` / `chrg_set_eload_source()` | 閰嶇疆鐢靛瓙璐熻浇鐨 Sink/Source 瑙掕壊銆 | +| `chrg_set_CV()` / `chrg_set_CC()` / `chrg_roll_set_cv()` | 璁剧疆 CV銆丆C 鍙婅疆璇㈢浉鍏崇洰鏍囧笺 | +| `chrg_lcd_parse()` | 瑙ｆ瀽 HMI 鍛戒护骞朵慨鏀瑰搴旈氶亾閰嶇疆銆 | +| `chrg_lcd_send()` | 鍚 HMI 鍙戦佹暟鎹 | +| `chrg_lcd_thread_entry()` | LCD 涓插彛鏀跺彂涓庡懆鏈熷埛鏂颁富寰幆銆 | +| `lcdsend()` | FinSH LCD 鍘熷鍙戦佽皟璇曞懡浠ゃ | + +### `bsp/` + +| 妯″潡 | 鍑芥暟璇存槑 | +|---|---| +| `chrg_fal.c` | `chrg_fal_read()`銆乣chrg_fal_write()`銆乣chrg_fal_erase()`銆乣chrg_fal_erase_all()` 灏佽鍒嗗尯璁块棶锛沗chrg_fal_init()` 鍒濆鍖 FAL銆 | +| `chrg_gpio.c` | `chrg_gpio_mode_set()`銆乣chrg_gpio_get()`銆乣chrg_gpio_set()` 灏佽 GPIO锛沗chrg_gpios_init()` 鍒濆鍖栧紩鑴氥 | +| `chrg_rel.c` | `chrg_nor_sw_rel()` 鎺у埗鍖楀悜缁х數鍣紱`chrg_nor_rel_init()` 鍒濆鍖栵紱`rel_test()` 鐢ㄤ簬 shell 娴嬭瘯銆 | +| `chrg_switch.c` | `chrg_switch_ch()` 椹卞姩閫氶亾璇戠爜閫夋嫨绾裤 | +| `chrg_vcom.c` | `chrg_vcom_init()` 鍒濆鍖 USB 铏氭嫙涓插彛锛沗chrg_vcom_console_init()` 娉ㄥ唽鎺у埗鍙般 | +| `chrg_wdt.c` | `chrg_wdt_feed()` 鍠傜嫍锛沗chrg_wdt_init()` 鍒濆鍖栧苟鍚姩鐪嬮棬鐙椼 | +| `chrg_tmr.c` | `chrg_tmr_get_count()`銆乣chrg_tmr_start()`銆乣chrg_tmr_stop()`銆乣chrg_tmr_release()`銆乣chrg_tmr_open()` 绠＄悊杞欢绉掑畾鏃跺櫒锛沗chrg_tmr_1s_callback()` 璁℃椂锛沗chrg_tmrs_init()` 鍒濆鍖栵紱`uptime()`銆乣sec_tmr()` 涓 shell 鍛戒护銆 | +| `chrg_led.c` | `chrg_led_get()`銆乣chrg_led_set()`銆乣chrg_led_toggle()`銆乣chrg_led_pulsing()`銆乣chrg_led_flashing()` 鎺у埗 LED锛沗chrg_led_timer_set_on()`銆乣chrg_led_timer_set_off()`銆乣chrg_led_timer_start()`銆乣chrg_led_timer_delete()`銆乣chrg_led_timer_timeout_callback()`銆乣chrg_led_show()` 绠＄悊闂儊鏃跺簭锛沗chrg_leds_init()` 鍒濆鍖栥 | +| `chrg_tty.c` | `chrg_tty_send_comp_hook()`銆乣chrg_tty_recv_ind_hook()` 涓洪┍鍔ㄥ洖璋冿紱`chrg_tty_cal_byte_tmo()`銆乣chrg_tty_mode_set()`銆乣chrg_tty_dev_open()`銆乣chrg_tty_config()` 閰嶇疆涓插彛锛沗chrg_tty_connect()`銆乣chrg_tty_disconn()`銆乣chrg_tty_destory()` 绠＄悊杩炴帴锛沗chrg_tty_set_recv_tmo()`銆乣chrg_tty_set_byte_tmo()` 璁剧疆瓒呮椂锛沗chrg_tty_recv()`銆乣chrg_tty_send()`銆乣chrg_tty_break_recv()`銆乣chrg_tty_send_then_recv()` 瀹屾垚闃诲寮忔敹鍙戙 | + +## 9. Bootloader 鍑芥暟绾т富閾 + +```mermaid +flowchart TD + M["main()"] --> SI["System_Init()"] + M --> GPIO["MX_GPIO_Init() / MX_DMA_Init() / MX_USART_Init()"] + M --> AI["APP_Init()"] + AI --> DTI["DT_Init()"] + AI --> YI["ymodem_init()"] + AI --> FI["FM_Init()"] + M --> AR["APP_Running()"] + AR --> RD["recvDataHandler()"] + RD --> DPR["DT_PollingReceive()"] + RD --> YH["ymodemHandler()"] + YH --> BPD["boot_ProtocolDataHandle()"] + AR --> BCH["boot_CheckAndHandle()"] + BCH --> BCF["boot_CheckFirmware()"] + BCH --> BAU["boot_AutoUpdate()"] + BAU --> FMR["FM_ReadFirmwareHead()"] + BAU --> FMV["FM_VerifyFirmware()"] + BAU --> FMU["FM_UpdateToAPP()"] + BCH --> J["boot_JumpToAPP()"] +``` + +Boot 杈呭姪妯″潡鑱岃矗锛歚firmware.c` 鐨 `FM_*` 鍑芥暟璐熻矗鍒嗗尯澶淬佹摝鍐欍丆RC 鏍￠獙銆佺増鏈拰鎼繍锛沗ymodem.c` 鐨 `ymodemHandler()`銆乣ymodemConfig()` 璐熻矗鍗囩骇鍗忚鐘舵佹満锛沗transfer.c` 鐨 `DT_Init()`銆乣DT_Send()`銆乣DT_PollingReceive()` 璐熻矗涓插彛甯т紶杈擄紱`drv_timer.c` 鎻愪緵鍚姩銆侀噸鍚佹殏鍋溿佹敞閿銆佸鐞嗗拰鐢ㄦ埛鏁版嵁缁戝畾锛沗bsp_uart.c`/`bsp_uart_port.c` 鎻愪緵 UART銆丏MA銆佷腑鏂強鎺ユ敹瀹屾垚鍥炶皟銆 + +## 10. 闃呰涓庤皟璇曢『搴 + +1. 鍚姩寮傚父鍏堢湅 `chrg_thread_init()` 鍜屽悇 `INIT_*_EXPORT` 鍒濆鍖栬繑鍥炲笺 +2. 鍖楀悜鏃犳暟鎹緷娆¤窡韪 `chrg_north_thread_entry()`銆乣chrg_north_frame_head()`銆乣chrg_north_pickup_frame()`銆乣chrg_north_frame_dispatch()`銆 +3. Sink 涓嶅惎鍔ㄤ緷娆℃鏌 `chrg_sink_parse()` 鐨勭數鍘/鐢垫祦鍒ゅ畾銆乣work_mode`銆乣chrg_sink_work()` 鍜 `chrg_set_sou_reg()`銆 +4. 鍔熺巼鏉垮懡浠ゆ湭鐢熸晥渚濇妫鏌 `chrg_set_sou_reg()`銆乣chrg_roll_sou_thread_entry()`銆乣chrg_south_send()` 鍜屽崡鍚戝搷搴斿尮閰嶃 +5. 涓婁綅鏈哄啓鍏ユ湭鐢熸晥渚濇妫鏌 Modbus `funcWrite*()`銆乣chrg_mb_write_*()`銆佸叡浜姸鎬佸拰涓や釜杞绾跨▼銆 diff --git a/rt-thread/components/fal/src/fal_rtt.c b/rt-thread/components/fal/src/fal_rtt.c index 9ae93ea..93c93ee 100644 --- a/rt-thread/components/fal/src/fal_rtt.c +++ b/rt-thread/components/fal/src/fal_rtt.c @@ -890,7 +890,7 @@ static void fal(rt_uint8_t argc, char **argv) { { if (write_data[index] != read_data[index]) { - rt_kprintf("%d %d %02x %02x.\n", i, index, write_data[index], read_data[index]); +// rt_kprintf("%d %d %02x %02x.\n", i, index, write_data[index], read_data[index]); } } diff --git a/rt-thread/components/legacy/usb/usbdevice/core/usbdevice_core.c b/rt-thread/components/legacy/usb/usbdevice/core/usbdevice_core.c index 015473f..ab76558 100644 --- a/rt-thread/components/legacy/usb/usbdevice/core/usbdevice_core.c +++ b/rt-thread/components/legacy/usb/usbdevice/core/usbdevice_core.c @@ -2237,6 +2237,7 @@ static struct rt_thread usb_thread; /* internal of the message queue: every message is associated with a pointer, * so in order to recveive USBD_MQ_MAX_MSG messages, we have to allocate more * than USBD_MQ_MSG_SZ*USBD_MQ_MAX_MSG memory. */ +rt_align(RT_ALIGN_SIZE) static rt_uint8_t usb_mq_pool[(USBD_MQ_MSG_SZ+sizeof(void*))*USBD_MQ_MAX_MSG]; /**