单体温感排线错误故障

.gitignore

@@ -12,6 +12,7 @@
 *.o
 *.s19
 *.dbgconf
+*.uv*
 # 忽略编译器输出目录（如果您有自定义的输出目录）
 Objects/
 Listings/

app/stm32fxxx_app/app/bmu_adbms1818.c

@@ -102,8 +102,8 @@ void bmu_config_init(void)
 	
 	drv_gpio_set_pin_status(kGpioType_SP1_Cs_En2, kGpioStatus_Low);
 	//drv_gpio_set_pin_status(kGpioType_SP1_Cs_En1, kGpioStatus_Low);
-	//bmu_data.bmu_num = get_eeprom_data(kEep_DevAddr_SlaverNum, kEepromDataType_Low);
+	bmu_data.bmu_num = get_eeprom_data(kEep_DevAddr_SlaverNum, kEepromDataType_Low);
-	bmu_data.bmu_num = 2;
+	//bmu_data.bmu_num = 2;
 	if (bmu_data.bmu_num > BMU_MAX_NUM || bmu_data.bmu_num == 0)
 	{
 		bmu_data.bmu_num = BMU_MAX_NUM;
@@ -112,11 +112,11 @@ void bmu_config_init(void)
 	bmu_data.bmu_ic_num = get_eeprom_data(kEep_AfeNum_CellNum, kEepromDataType_High);
 	bmu_data.total_ic_num = bmu_data.bmu_num * bmu_data.bmu_ic_num;
 	bmu_data.ic = bsp_adbms1818_global();
-	//bmu_data.total_cell_num = get_eeprom_data(kEep_CellNum, kEepromDataType_Full);
+	bmu_data.total_cell_num = get_eeprom_data(kEep_CellNum, kEepromDataType_Full);
-	//bmu_data.total_temp_num = get_eeprom_data(kEep_TempNum, kEepromDataType_Full);
+	bmu_data.total_temp_num = get_eeprom_data(kEep_TempNum, kEepromDataType_Full);
 	
-	bmu_data.total_cell_num = 32;
+	//bmu_data.total_cell_num = 32;
-	bmu_data.total_temp_num = 18;
+	//bmu_data.total_temp_num = 18;
 	
 	//set num from hmi =>adapt num for furture
 	cell_num = bmu_data.total_cell_num / bmu_data.bmu_num;
@@ -240,14 +240,20 @@ void bmu_vlot_breakline_check()
 	
 }
 
+static int tempJudge_cnt[26][9] = {0};
 //@wkun the here can add temp line break or connect
-void bmu_temp_breakline_check()
+void bmu_temp_breakline_check(int value, int bmuIdx, int tempIdx)
 {
 	//核心逻辑是通过每个bmu中的温度是否大于60000来确定温感排线是否有问题，通过for循环，然后将故障塞入kFaultCode_TempCable对应的故障中
 	//bms_get_bmu_fault_bit(kBmuFaultBit_TempCable)，将这个接口中的数据，如果有则置1，否则为0
-	
+	if (value > 6000)
-	
+	{
-	
+		tempJudge_cnt[bmuIdx][tempIdx]++;
+	}
+	if(tempJudge_cnt[bmuIdx][tempIdx] > 1)
+	{
+		bms_set_bmu_fault_bit(kBmuFaultBit_TempCable, 1);
+	}
 }
 
 
@@ -361,7 +367,7 @@ static void bmu_statistic_cell_temp(uint16_t bmuIdx)
 void bmu_data_handler(uint32_t base_time)
 {
 	uint8_t bmuIdx = 0,cellIdx = 0,_cellIdx = 0,_bmuIdx = 0,_ntcIdx = 0;
-	uint16_t current = 0,load = 0;
+	uint16_t current = 0,load = 0, tempJudge = 0;
 	//calc cell volt
 	for(bmuIdx = 0;bmuIdx < bmu_data.total_ic_num;bmuIdx++)
 	{
@@ -388,7 +394,9 @@ void bmu_data_handler(uint32_t base_time)
 				current = 1;
 			}
 			load = (bmu_data.ic[bmuIdx].aux.a_codes[_ntcIdx] / 10) * 1000 / current; //修订索引错误
-			bmu_data.bmu_unit[bmuIdx].cell_temp_buf[cellIdx] = (bms_get_linear_temp(load, kNtcType_CWFH708_H713) - 500) / 10;
+			tempJudge = (bms_get_linear_temp(load, kNtcType_CWFH708_H713) - 500) / 10;
+			bmu_data.bmu_unit[bmuIdx].cell_temp_buf[cellIdx] = tempJudge;
+			bmu_temp_breakline_check(tempJudge, bmuIdx, _ntcIdx);
 		}
 		//统计温度
 		bmu_statistic_cell_temp(bmuIdx);
@@ -396,7 +404,6 @@ void bmu_data_handler(uint32_t base_time)
 	//alarm monitor
 	//bmu_comm_offline_check(base_time);
 	bmu_vlot_breakline_check();
-	bmu_temp_breakline_check();
 
 }
 
@@ -418,6 +425,8 @@ void bms_bmu_init()
 	 
 }
 
+
+
 void bms_poll_bmu(uint32_t base_time)
 {
 	//Automatic Recognition
@@ -435,10 +444,14 @@ void bms_poll_bmu(uint32_t base_time)
 	run_command(6,bmu_data.bmu_num*bmu_data.bmu_ic_num);
 	bmu_data_handler(base_time);
 	
+	//温感检测是否脱落，加上了防抖，需要两次大于6000，才设置温感排线错误，温感排线错误显示的有点慢
+	memset(tempJudge_cnt, 0, sizeof(tempJudge_cnt));
 	//2-5 @wangk add this line bcu statistic data is show
 	bms_poll_statistic(0);
 	//2-6 @wangk
 	bms_poll_run_status(base_time); 
+	//2-10 @wangk 
+	task_dido_ctrl_handle(1000);
 }
 
 

app/stm32fxxx_app/app/bmu_adbms1818.h

@@ -19,6 +19,7 @@ extern "C" {
 //2-6
 #include "statistic_manager.h"
 #include "run_status.h"
+#include "logic_ctrl.h"
 
 typedef struct
 {

app/stm32fxxx_app/app/dido_manager.h

@@ -37,9 +37,9 @@ typedef enum
 {
     kDoType_Start = 0,
 	kDoType_Unused = kDoType_Start,
-    kDoType_Chg,
+	kDoType_PreChg,	
-    kDoType_Dis,
+    kDoType_Chg, 
-    kDoType_PreChg,	//3
+    kDoType_Dis,//3
     kDoType_Positive,	//4
     kDoType_Negative,//5
 	kDoType_Cool,
@@ -84,6 +84,8 @@ typedef enum
 	kDiType_Start = 0,
 	kDiType_Unused= kDiType_Start,
     kDiType_FireAlarm1,      //消防1
+	kDiType_FireAlarm2, 
+	kDiType_FireAlarm3, 
 	kDiType_EmergStop1,      //急停
     kDiType_Do1Feedback,
 	kDiType_Do2Feedback,

app/stm32fxxx_app/app/hv_adc_manager.c

@@ -432,10 +432,12 @@ const uint32_t adIc_default_rate[kAdIc_End] = {1, 1, 1, 1, 1};
 //
 void bms_init_cur_hv(void)
 {
+	static uint8_t errcnt = 0;
     uint32_t i = 0, cnt = 30;
 	#ifdef ADS_8688_EN
-	while(drv_ads8688_Init())
+	while(drv_ads8688_Init() && errcnt < 30)
 	{
+		errcnt++;
 		OSTimeDly(20);
 	}
 

app/stm32fxxx_app/app/logic_di.c

@@ -26,6 +26,7 @@ void ord_di_do_feedback_func(uint32_t base_time, DiStatus di_signal, DiType di)
             di_param_item[di].dly += base_time;
             if(di_param_item[di].dly >= 5000)
             {
+				//这里会写进错误--反馈异常，这里的一级代表三级错误
                 bms_set_fault_level(kFaultCode_Feedback, kFaultLevel_First, kFaultHandle_AlarmIdx);
             }
         }
@@ -93,6 +94,7 @@ void ord_di_breaker1_fun(uint32_t base_time, DiStatus di_signal, DiType di)
 {
 	if((di < kDiType_End) && (di_signal == kDiStatus_Trigger))
 	{
+		//这里会写进错误--反馈异常，这里的三级代表一级错误
         di_param_item[di].dly += base_time;
         bms_set_fault_level(kFaultCode_Feedback, kFaultLevel_Third, kFaultHandle_CutNoRelIdx);
 	}

app/stm32fxxx_app/app/task_register.c

@@ -106,28 +106,30 @@ void poll_1ms_task_init(void)
     bms_init_di_do(bmsCircuitCtrl, kDoCtrlStrategy_End, doLogicArray);
     bsp_create_task(&poll_10ms_task, (uint8_t *)"10ms");
       
-    KIT_DEBUG_PRINTF("cur_hv init start \r\n");
+    //KIT_DEBUG_PRINTF("cur_hv init start \r\n");
 	
 	//debug here  is no more run 
     bms_init_cur_hv();
 	
-    KIT_DEBUG_PRINTF("cur_hv init ok \r\n");
+    //KIT_DEBUG_PRINTF("cur_hv init ok \r\n");
 
     while(KIT_GET_BIT_32(is_data_ok, BMU_FINISH_BIT) == 0)
     {
         bsp_task_delay_ms(10);
     }
     //耗时初始化 ≈300ms 确保信号正常    
-    KIT_DEBUG_PRINTF("signal init start \r\n");
+    //KIT_DEBUG_PRINTF("signal init start \r\n");
 
     bms_poll_statistic(0);
 	
     bms_init_signal();
     //刷新信号策略 确保例如常闭等需要立即闭合do输出
     task_dido_ctrl_handle(1000);
-    KIT_DEBUG_PRINTF("signal init ok \r\n");
+    //KIT_DEBUG_PRINTF("signal init ok \r\n");
     KIT_SET_BIT_MASK_32(is_data_ok, SIGNAL_FINISH_BIT);
 	bsp_create_task(&ord_ctrl_task, (uint8_t *)"ctrl");
+	
+
 }
 
 void poll_10ms_task_init(void)

app/stm32fxxx_app/protocol/protocol_modbus_bcu.c

@@ -106,7 +106,7 @@ uint16_t bcu_total_msg_fill(uint16_t start_addr, uint8_t reg_num, uint8_t *buf)
 			
 		//READ_FC03_F04_ITEM(1, test99+=10);
 		//2 动力电池组总电流
-		READ_FC03_F04_ITEM(2, bms_get_show_current() + 211);
+		READ_FC03_F04_ITEM(2, bms_get_show_current());
 		//3 SOC
 		//READ_FC03_F04_ITEM(3,get_eeprom_data(kEep_SOC,kEepromDataType_Full) / 100);
 		READ_FC03_F04_ITEM(3, bms_get_soc() / 100);
@@ -117,7 +117,7 @@ uint16_t bcu_total_msg_fill(uint16_t start_addr, uint8_t reg_num, uint8_t *buf)
 		//6 额定总压
 		READ_FC03_F04_ITEM(6, get_eeprom_data(kEep_RatedTotalVolt,kEepromDataType_Full));
 		//7 额定容量
-		READ_FC03_F04_ITEM(7, get_eeprom_data(kEep_RatedCapacity,kEepromDataType_Full));
+		READ_FC03_F04_ITEM(7, get_eeprom_data(kEep_RatedCapacity,kEepromDataType_Full) );
 		//8 剩余容量
 		READ_FC03_F04_ITEM(8, (uint32_t)bms_get_soc()*get_eeprom_data(kEep_RatedCapacity, kEepromDataType_Full)/10000);
 		//9 额定电量

library/drv_peripheral/drv_adbms1818.c

@@ -611,6 +611,72 @@ int8_t parse_cells(uint8_t current_ic,	 // Current IC
 	return (pec_error);
 }
 
+/* Helper function that parses voltage measurement registers */
+int8_t drv_parse_temp_data(uint8_t current_ic,	 // Current IC
+				   uint8_t cell_reg,	 // Type of register
+				   uint8_t cell_data[],	 // Unparsed data
+				   uint16_t *cell_codes, // Parsed data
+				   uint8_t *ic_pec		 // PEC error
+)
+{
+	uint8_t BYT_IN_REG = 6;
+	uint8_t CELL_IN_REG = 3;
+	int8_t pec_error = 0;
+	uint16_t parsed_cell;
+	uint16_t received_pec;
+	uint16_t data_pec;
+	uint8_t data_counter = current_ic * NUM_RX_BYT; // data counter
+
+	for (uint8_t current_cell = 0; current_cell < CELL_IN_REG; current_cell++) // This loop parses the read back data into the register codes, it
+	{																		   // loops once for each of the 3 codes in the register
+
+		parsed_cell = cell_data[data_counter] + (cell_data[data_counter + 1] << 8); // Each code is received as two bytes and is combined to
+																					//  create the parsed code
+		
+		if(cell_reg == 1)
+		{
+			cell_codes[current_cell + ((cell_reg - 1) * CELL_IN_REG)] = parsed_cell;
+		}
+		else if(cell_reg == 2)
+		{
+			if(current_cell < 2)
+			{
+				cell_codes[current_cell + 3] = parsed_cell;
+			}
+		}
+		else if(cell_reg == 3)
+		{
+			cell_codes[current_cell + 5] = parsed_cell;
+		}
+		else if(cell_reg == 4)
+		{
+			if(current_cell < 1)
+			{
+				cell_codes[current_cell + 8] = parsed_cell;
+			}
+		}
+
+		data_counter = data_counter + 2; // Because the codes are two bytes, the data counter
+										 // must increment by two for each parsed code
+	}
+	received_pec = (cell_data[data_counter] << 8) | cell_data[data_counter + 1]; // The received PEC for the current_ic is transmitted as the 7th and 8th
+																				 // after the 6 cell voltage data bytes
+	data_pec = pec15_calc(BYT_IN_REG, &cell_data[(current_ic)*NUM_RX_BYT]);
+
+	if (received_pec != data_pec)
+	{
+		pec_error = 1; // The pec_error variable is simply set negative if any PEC errors
+		ic_pec[cell_reg - 1] = 1;
+	}
+	else
+	{
+		ic_pec[cell_reg - 1] = 0;
+	}
+	data_counter = data_counter + 2;
+
+	return (pec_error);
+}
+
 /*Reads and parses the ADBMS181x cell voltage registers.
 The function is used to read the parsed Cell voltages codes of the ADBMS181x.
 This function will send the requested read commands parse the data
@@ -767,7 +833,7 @@ int8_t ADBMS1818_rdaux(uint8_t reg,		 // Determines which GPIO voltage register
 				{
 					c_ic = total_ic - current_ic - 1;
 				}
-				pec_error = parse_cells(current_ic, gpio_reg, data,
+				pec_error = drv_parse_temp_data(current_ic, gpio_reg, data,
 										&ic[c_ic].aux.a_codes[0],
 										&ic[c_ic].aux.pec_match[0]);
 			}
@@ -787,7 +853,7 @@ int8_t ADBMS1818_rdaux(uint8_t reg,		 // Determines which GPIO voltage register
 			{
 				c_ic = total_ic - current_ic - 1;
 			}
-			pec_error = parse_cells(current_ic, reg, data,
+			pec_error = drv_parse_temp_data(current_ic, reg, data,
 									&ic[c_ic].aux.a_codes[0],
 									&ic[c_ic].aux.pec_match[0]);
 		}

library/drv_peripheral/drv_ads8688.c

@@ -51,7 +51,7 @@ bool drv_ads8688_Init(void)
     drv_ads8688_write_reg(AUTO_SEQ_EN, 0x3F);
 	
     i = drv_ads8688_read_reg(AUTO_SEQ_EN);
-	
+
     if (i != 0x3F)
     {
         return true;