Merge branch 'gary' into wk

.gitignore

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

app/stm32fxxx_app/app/bmu_adbms1818.c

@@ -418,6 +418,8 @@ void bms_bmu_init()
 	 
 }
 
+
+
 void bms_poll_bmu(uint32_t base_time)
 {
 	//Automatic Recognition

app/stm32fxxx_app/prj/BCU_APP.uvprojx

@@ -10,15 +10,15 @@
       <TargetName>stm32f407</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pArmCC>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pArmCC>
+      <pArmCC>5060750::V5.06 update 6 (build 750)::ARMCC</pArmCC>
-      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pCCUsed>
+      <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F407ZGTx</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
+          <PackID>Keil.STM32F4xx_DFP.2.14.0</PackID>
-          <PackURL>https://www.keil.com/pack/</PackURL>
+          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -186,8 +186,6 @@
             <uocXRam>0</uocXRam>
             <RvdsVP>2</RvdsVP>
             <RvdsMve>0</RvdsMve>
-            <RvdsCdeCp>0</RvdsCdeCp>
-            <nBranchProt>0</nBranchProt>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -354,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>4</ClangAsOpt>
+            <uClangAs>0</uClangAs>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -473,7 +471,7 @@
                 <NoWarn>2</NoWarn>
                 <uSurpInc>2</uSurpInc>
                 <useXO>2</useXO>
-                <ClangAsOpt>0</ClangAsOpt>
+                <uClangAs>2</uClangAs>
                 <VariousControls>
                   <MiscControls></MiscControls>
                   <Define></Define>
@@ -974,7 +972,7 @@
                 <NoWarn>2</NoWarn>
                 <uSurpInc>2</uSurpInc>
                 <useXO>2</useXO>
-                <ClangAsOpt>0</ClangAsOpt>
+                <uClangAs>2</uClangAs>
                 <VariousControls>
                   <MiscControls></MiscControls>
                   <Define></Define>
@@ -1145,8 +1143,8 @@
         <TargetCommonOption>
           <Device>STM32F407VGTx</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
+          <PackID>Keil.STM32F4xx_DFP.2.14.0</PackID>
-          <PackURL>https://www.keil.com/pack/</PackURL>
+          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -1314,8 +1312,6 @@
             <uocXRam>0</uocXRam>
             <RvdsVP>2</RvdsVP>
             <RvdsMve>0</RvdsMve>
-            <RvdsCdeCp>0</RvdsCdeCp>
-            <nBranchProt>0</nBranchProt>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -1482,7 +1478,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>4</ClangAsOpt>
+            <uClangAs>0</uClangAs>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>

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]);
 		}