refactor: 重构校准流程,拆分校准逻辑到南向模块
1. 删除chrg_roll_nor.h中的chrg_roll_trim_set声明 2. 从chrg_north.h中移除trim_step和north_mode成员变量 3. 在chrg_roll_sou.h中新增chrg_sou_trim_submit函数声明 4. 重构chrg_comm.c的校准处理逻辑: - 移除旧的通道关闭逻辑和本地寄存器操作 - 新增校准模式合法性校验 - 调用南向模块提交校准指令 5. 从chrg_roll_nor.c中删除全部校准相关代码 6. 在chrg_roll_sou.c中实现完整的校准指令组包和提交逻辑 7. 重构boot目录下的main.c,新增完整的系统初始化和跳转流程
This commit is contained in:
@@ -1199,13 +1199,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");
|
||||
@@ -1217,7 +1214,7 @@ eMBException funcTrimELoad (rt_uint8_t *reqFrame, rt_uint16_t reqLen,
|
||||
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(ch >= TOTAL_SOU_CHS){
|
||||
rt_kprintf("CH ERROR");
|
||||
return MB_EX_ILLEGAL_DATA_VALUE;
|
||||
}
|
||||
@@ -1226,13 +1223,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;i<RegCount;i++){
|
||||
//计算当前寄存器的协议地址和本地偏移
|
||||
@@ -1281,13 +1276,19 @@ eMBException funcTrimELoad (rt_uint8_t *reqFrame, rt_uint16_t reqLen,
|
||||
//寄存器操作
|
||||
rt_kprintf("com ch=:%d,reg=%02x,value=%d\n",ch,Curr_reg_addr,Curr_write_value);
|
||||
}
|
||||
if (pTrim->trim_mode == 0) {
|
||||
return MB_EX_ILLEGAL_DATA_ADDRESS;
|
||||
}
|
||||
|
||||
/*
|
||||
* COM只负责解析校准数据。完整校准序列由南向模块组装并加入RUN_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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user