修改通信部分，避免部分数据不回传，修改SOE部分，避免重启

APP/application/Src/start.c

@@ -76,8 +76,10 @@ void start(void)
     //     HAL_Delay(1000);
     // }
     /* 启动事件 */
+    // HAL_Delay(8000);
     insertEventsOrderRecord(startEvent);
 
+    // log_info(" CSR = %x\n", RCC->CSR);
+
     TimeSliceOffset_Start();
 }
-

APP/businessLogic/Inc/task.h

@@ -4,6 +4,10 @@
 
 #include "timeSliceOffset.h"
 
+// extern STR_TimeSliceOffset g_SOE_flag;
+// extern void Task_SOE_flag(void);
+
+
 void task_Init(void);
 
 

APP/businessLogic/Src/SOE.c

@@ -5,9 +5,13 @@
 #include "FM_RTC.h"
 #include "flash.h"
 #include "capture.h"
+#include "task.h"
 
 #define eventsOrderRecordStartAddr 4096
 
+// /* 用于标记SOE擦除 */
+// static uint8_t soeFlag = 0;
+
 typedef struct _soeDataInfo {
     uint16_t mode;	            //故障类型 2byte
     timeInfo time;				//时间 6byte
@@ -28,13 +32,14 @@ typedef struct _soeSaveInfo {
 typedef struct _soeStorageParameters {
     uint16_t len;               //soe下次记录距离0的偏移量
     uint16_t pos;               //下次soe记录的位置
+    uint32_t dataLen;           //soe数据总个数
 } soeStorageParameters;
 
 static soeSaveInfo soeInfo = {0};
 static soeStorageParameters soeParameters = {0};
 
 /**
- * @brief  得到一次时间记录的长度
+ * @brief  得到一次事件记录的长度
  * @param
  */
 uint16_t getSoeDataInfoSize(void)
@@ -53,6 +58,7 @@ void eventsOrderRecordStartInit(void)
     if (soeParameters.len == 0xFFFF && soeParameters.pos == 0xFFFF) {
         soeParameters.len = 0;
         soeParameters.pos = eventsOrderRecordStartAddr + sizeof(soeParameters);
+        soeParameters.dataLen = 0;
         write_Flash((uint8_t *)(&soeParameters), eventsOrderRecordStartAddr, sizeof(soeParameters));
     }
 
@@ -60,6 +66,7 @@ void eventsOrderRecordStartInit(void)
         || soeParameters.pos != eventsOrderRecordStartAddr + sizeof(soeParameters) + soeParameters.len * soeDataInfoSize) {
         soeParameters.len = 0;
         soeParameters.pos = eventsOrderRecordStartAddr + sizeof(soeParameters);
+        soeParameters.dataLen = 0;
         write_Flash((uint8_t *)(&soeParameters), eventsOrderRecordStartAddr, sizeof(soeParameters));
     }
 
@@ -68,6 +75,8 @@ void eventsOrderRecordStartInit(void)
     soeInfo.outPos = 0;
     soeInfo.outData = NULL;
     soeInfo.insertData = &soeInfo.data[soeInfo.insertPos];
+
+    // soeFlag = 1;
 }
 
 /**
@@ -181,9 +190,15 @@ void insertEventsOrderRecord(eventsOrderRecordMode mode)
 void setEventsOrderRecord(void)
 {
     if (soeInfo.outData == NULL || soeInfo.count >= 5) {
+        soeInfo.outData = NULL;
+        soeInfo.count = 5;
         return;
     }
 
+    // if (soeFlag == 0) {
+    //     return;
+    // }
+
     write_Flash((uint8_t *)(soeInfo.outData), soeParameters.pos, soeDataInfoSize);
     // read_Flash((uint8_t *)(soeInfo.outData), eventsOrderRecordStartAddr, sizeof(soeStorageParameters));
         
@@ -198,8 +213,11 @@ void setEventsOrderRecord(void)
     soeParameters.len++;
     if (soeParameters.len >= 100) {
         soeParameters.len = 0;
-    }    
+        soeParameters.pos = eventsOrderRecordStartAddr + sizeof(soeParameters);
+    } else {
         soeParameters.pos += soeDataInfoSize;
+    }
+    soeParameters.dataLen++;
     write_Flash((uint8_t *)(&soeParameters), eventsOrderRecordStartAddr, sizeof(soeStorageParameters));    
 
     soeInfo.outPos++;
@@ -227,8 +245,20 @@ void setEventsOrderRecord(void)
 
 void readEventsOrderRecord(uint16_t offset, uint8_t *data)
 {
+    // if (soeFlag == 0) {
+    //     return;
+    // }
+
     uint16_t addr;
 
+    if (offset > soeParameters.dataLen) {
+        for (size_t i = 0; i < soeDataInfoSize; i++) {
+            data[i] = 0;
+        }
+
+        return;
+    }
+
     if (soeParameters.len - offset < 0) {
         addr = eventsOrderRecordStartAddr + sizeof(soeStorageParameters)
          + (100 + soeParameters.len - offset) * soeDataInfoSize;
@@ -247,8 +277,25 @@ void readEventsOrderRecord(uint16_t offset, uint8_t *data)
  */
 void cleanEventsOrderRecord(void)
 {
-    erase_Sector_Flash((eventsOrderRecordStartAddr / 4096));
+    // soeFlag = 0;
+    // erase_Sector_Flash((eventsOrderRecordStartAddr / 4096));
+
     soeParameters.len = 0;
+    soeParameters.dataLen = 0;
     soeParameters.pos = eventsOrderRecordStartAddr + sizeof(soeParameters);
     write_Flash((uint8_t *)(&soeParameters), eventsOrderRecordStartAddr, sizeof(soeParameters));
+    
+    // TimeSliceOffset_Register(&g_SOE_flag, Task_SOE_flag, uart_reloadVal, uart_offset); 
 }
+
+// extern STR_TimeSliceOffset g_SOE_flag;
+// void Task_SOE_flag(void)
+// {        
+//     soeParameters.len = 0;
+//     soeParameters.pos = eventsOrderRecordStartAddr + sizeof(soeParameters);
+//     write_Flash((uint8_t *)(&soeParameters), eventsOrderRecordStartAddr, sizeof(soeParameters));
+    
+//     soeFlag = 1;
+
+
+// }

APP/businessLogic/Src/bl_usart.c

@@ -21,7 +21,7 @@
 #define HY_communicationIDStartAddr    (HY_hardWordIDStartAddr + HY_hardWordIDSize)
 #define HY_communicationIDSize         4
 static uint8_t HY_hardWordID[HY_hardWordIDSize] = {0x48, 0x59, 0x30, 0x30, 0x30, 0x31};
-static uint8_t HY_communicationID[HY_communicationIDSize] = {0x00, 0x00, 0x00, 0x02};
+static uint8_t HY_communicationID[HY_communicationIDSize] = {0x00, 0x00, 0x00, 0x01};
 static uint8_t HY_startFlag = 0x68;
 static uint8_t HY_endFlag = 0x16;
 
@@ -1023,6 +1023,9 @@ BOOL analysisCrcCheckBitSL(void)
             return TRUE;
         }
     }
+    else if (gw485RxBufferIndex < frameLength) {
+        return FALSE;
+    }
 
     log_error("analysisCrcCheckBitSL \n");
     state = wait;
@@ -3076,6 +3079,7 @@ BOOL analysisStartFlagHY(void)
         return FALSE;
     }
 
+    log_error("analysisStartFlagHY \n");
     state = wait;
     gw485RxBufferIndex--;
     memcpy(gw485RxBuffer, gw485RxBuffer + 1, gw485RxBufferIndex);    
@@ -3117,6 +3121,7 @@ BOOL analysisHardWordIDHY(void)
         return FALSE;
     }
 
+    log_error("analysisHardWordIDHY \n");
     state = wait;
     gw485RxBufferIndex--;
     memcpy(gw485RxBuffer, gw485RxBuffer + 1, gw485RxBufferIndex);    
@@ -3170,7 +3175,11 @@ BOOL analysisCommunicationIDHY(void)
             return TRUE;
         }
     }
+    if (gw485RxBufferIndex < 12) {
+        return FALSE;
+    }
 
+    log_error("analysisCommunicationIDHY \n");
     state = wait;
     gw485RxBufferIndex--;
     memcpy(gw485RxBuffer, gw485RxBuffer + 1, gw485RxBufferIndex);    
@@ -3202,6 +3211,7 @@ BOOL analysisControlWordHY(void)
         return FALSE;
     }
 
+    log_error("analysisControlWordHY \n");
     state = wait;
     gw485RxBufferIndex--;
     memcpy(gw485RxBuffer, gw485RxBuffer + 1, gw485RxBufferIndex);    
@@ -3215,6 +3225,10 @@ BOOL analysisControlWordHY(void)
  */
 BOOL analysisDataLengthHY(void)
 {
+    if (gw485RxBufferIndex < 15) {
+        return FALSE;
+    }
+
     if (gw485RxBuffer[11] == HY_batteryStatus) {        
         state = batteryStatusHY;
     }
@@ -4831,7 +4845,7 @@ BOOL analysisModifyCommunicationIDHY(void)
 {
     /* 解析帧 */
     if (gw485RxBufferIndex >= frameLength) {
-        // log_info("analysisSensorNumberConfigurationHY \n");
+        log_info("analysisSensorNumberConfigurationHY \n");
 
         /* 比较校验位和结束标志 */
         if (gw485RxBuffer[frameLength - 2] != HY_CheckFunc(gw485RxBuffer, frameLength - 2)

APP/businessLogic/Src/inFlash.c

@@ -314,8 +314,6 @@ void config_info_start(void)
 //    setLastTime(time);
 }
 
-
-
 /**
  * @brief  保存回路阻抗在flash中
  * @param

APP/businessLogic/Src/task.c

@@ -144,6 +144,9 @@ void Task_uart(void);
 STR_TimeSliceOffset m_SOE;
 void Task_SOE(void);
 
+// /* 将flag中的soe记录擦除延时 */
+// STR_TimeSliceOffset g_SOE_flag;
+// void Task_SOE_flag(void);
 
 
 /**

APP/hardwareDriver/Src/w25qxx.c

@@ -161,6 +161,8 @@ void W25QXX_ReadUniqueID(uint8_t UID[8])
 //NumByteToRead:要读取的字节数(最大65535)
 void W25QXX_Read(uint8_t *pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead)
 {
+    // volatile static int timeReadTemp1, timeReadTemp2, timeReadTemp3, timeReadTemp4, timeReadTemp5;
+    // timeReadTemp1 = HAL_GetTick();
     volatile static int timeReadTemp1, timeReadTemp2, timeReadTemp3, timeReadTemp4, timeReadTemp5;
     timeReadTemp1 = HAL_GetTick();
 

Core/Src/main.c

@@ -137,38 +137,6 @@ int main(void)
   */
 void SystemClock_Config(void)
 {
-//   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-//   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
-//   /** Configure the main internal regulator output voltage
-//   */
-//   HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
-
-//   /** Initializes the RCC Oscillators according to the specified parameters
-//   * in the RCC_OscInitTypeDef structure.
-//   */
-//   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
-//   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-//   RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-//   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-//   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-//   {
-//     Error_Handler();
-//   }
-
-//   /** Initializes the CPU, AHB and APB buses clocks
-//   */
-//   RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-//                               |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-//   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
-//   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-//   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-//   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-//   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
-//   {
-//     Error_Handler();
-//   }
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
 

Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal.c

@@ -147,43 +147,6 @@ uint32_t uwTickFreq = HAL_TICK_FREQ_DEFAULT;  /* 1KHz */
   */
 HAL_StatusTypeDef HAL_Init(void)
 {
-
-//   HAL_StatusTypeDef  status = HAL_OK;
-//   /* Configure Flash prefetch, Instruction cache, Data cache */
-//   /* Default configuration at reset is:                      */
-//   /* - Prefetch disabled                                     */
-//   /* - Instruction cache enabled                             */
-//   /* - Data cache enabled                                    */
-// #if (INSTRUCTION_CACHE_ENABLE == 0U)
-//   __HAL_FLASH_INSTRUCTION_CACHE_DISABLE();
-// #endif /* INSTRUCTION_CACHE_ENABLE */
-
-// #if (DATA_CACHE_ENABLE == 0U)
-//   __HAL_FLASH_DATA_CACHE_DISABLE();
-// #endif /* DATA_CACHE_ENABLE */
-
-// #if (PREFETCH_ENABLE != 0U)
-//   __HAL_FLASH_PREFETCH_BUFFER_ENABLE();
-// #endif /* PREFETCH_ENABLE */
-
-//   /* Set Interrupt Group Priority */
-//   HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
-
-//   /* Use SysTick as time base source and configure 1ms tick (default clock after Reset is HSI) */
-//   if (HAL_InitTick(TICK_INT_PRIORITY) != HAL_OK)
-//   {
-//     status = HAL_ERROR;
-//   }
-//   else
-//   {
-//     /* Init the low level hardware */
-//     HAL_MspInit();
-//   }
-
-//   /* Return function status */
-//   return status;
-
-
   HAL_StatusTypeDef  status = HAL_OK;
   /* Configure Flash prefetch, Instruction cache, Data cache */
   /* Default configuration at reset is:                      */

EWARM/chargeController.ewd

@@ -36,7 +36,7 @@
                 </option>
                 <option>
                     <name>MacFile</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>MemOverride</name>
@@ -60,7 +60,7 @@
                 </option>
                 <option>
                     <name>CExtraOptions</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CFpuProcessor</name>
@@ -68,7 +68,7 @@
                 </option>
                 <option>
                     <name>OCDDFArgumentProducer</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCDownloadSuppressDownload</name>
@@ -104,7 +104,7 @@
                 </option>
                 <option>
                     <name>MacFile2</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CDevice</name>
@@ -120,7 +120,7 @@
                 </option>
                 <option>
                     <name>OCImagesPath1</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck2</name>
@@ -128,7 +128,7 @@
                 </option>
                 <option>
                     <name>OCImagesPath2</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck3</name>
@@ -136,7 +136,7 @@
                 </option>
                 <option>
                     <name>OCImagesPath3</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OverrideDefFlashBoard</name>
@@ -148,11 +148,11 @@
                 </option>
                 <option>
                     <name>OCImagesOffset2</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesOffset3</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesUse1</name>
@@ -184,15 +184,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -216,7 +216,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreSessionFile</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCTpiuBaseOption</name>
@@ -228,7 +228,7 @@
                 </option>
                 <option>
                     <name>OCOverrideSlavePath</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>C_32_64Device</name>
@@ -244,11 +244,11 @@
                 </option>
                 <option>
                     <name>AuthSdmManifest</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>AuthSdmExplicitLib</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>AuthEnforce</name>
@@ -277,7 +277,7 @@
                 </option>
                 <option>
                     <name>OCSimPspConfigFile</name>
-                    <state></state>
+                    <state />
                 </option>
             </data>
         </settings>
@@ -294,7 +294,7 @@
                 </option>
                 <option>
                     <name>Fast Model</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCADILogFileCheck</name>
@@ -461,7 +461,7 @@
                 </option>
                 <option>
                     <name>OCProbeConfig</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CMSISDAPProbeConfigRadio</name>
@@ -469,11 +469,11 @@
                 </option>
                 <option>
                     <name>CMSISDAPSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>ICpuName</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCJetEmuParams</name>
@@ -481,7 +481,7 @@
                 </option>
                 <option>
                     <name>CCCMSISDAPUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCCMSISDAPUsbSerialNoSelect</name>
@@ -502,7 +502,7 @@
                 </option>
                 <option>
                     <name>CE2UsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CE2IdCodeEditB</name>
@@ -642,7 +642,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -735,7 +735,7 @@
                 </option>
                 <option>
                     <name>OCProbeConfig</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>IjetProbeConfigRadio</name>
@@ -755,7 +755,7 @@
                 </option>
                 <option>
                     <name>ICpuName</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCJetEmuParams</name>
@@ -781,7 +781,7 @@
                 </option>
                 <option>
                     <name>CCIjetUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCIjetUsbSerialNoSelect</name>
@@ -1004,7 +1004,7 @@
                 </option>
                 <option>
                     <name>CCJLinkUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCTcpIpAlt</name>
@@ -1013,11 +1013,11 @@
                 </option>
                 <option>
                     <name>CCJLinkTcpIpSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1074,7 +1074,7 @@
                 </option>
                 <option>
                     <name>CCLmiftdiUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCLmiftdiUsbSerialNoSelect</name>
@@ -1227,7 +1227,7 @@
                 </option>
                 <option>
                     <name>CCSTLinkUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCSTLinkUsbSerialNoSelect</name>
@@ -1240,7 +1240,7 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
@@ -1378,11 +1378,11 @@
                 </option>
                 <option>
                     <name>TIPackage</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>BoardFile</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>DoLogfile</name>
@@ -1474,7 +1474,7 @@
                 </option>
                 <option>
                     <name>CCXds100CpuClockEdit</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCXds100SwoClockAuto</name>
@@ -1495,7 +1495,7 @@
                 </option>
                 <option>
                     <name>CCXds100UsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCXds100UsbSerialNoSelect</name>
@@ -1647,7 +1647,7 @@
                 </option>
                 <option>
                     <name>MacFile</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>MemOverride</name>
@@ -1671,7 +1671,7 @@
                 </option>
                 <option>
                     <name>CExtraOptions</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CFpuProcessor</name>
@@ -1679,7 +1679,7 @@
                 </option>
                 <option>
                     <name>OCDDFArgumentProducer</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCDownloadSuppressDownload</name>
@@ -1715,7 +1715,7 @@
                 </option>
                 <option>
                     <name>MacFile2</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CDevice</name>
@@ -1731,7 +1731,7 @@
                 </option>
                 <option>
                     <name>OCImagesPath1</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck2</name>
@@ -1739,7 +1739,7 @@
                 </option>
                 <option>
                     <name>OCImagesPath2</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck3</name>
@@ -1747,7 +1747,7 @@
                 </option>
                 <option>
                     <name>OCImagesPath3</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OverrideDefFlashBoard</name>
@@ -1759,11 +1759,11 @@
                 </option>
                 <option>
                     <name>OCImagesOffset2</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesOffset3</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCImagesUse1</name>
@@ -1795,15 +1795,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -1827,7 +1827,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreSessionFile</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCTpiuBaseOption</name>
@@ -1839,7 +1839,7 @@
                 </option>
                 <option>
                     <name>OCOverrideSlavePath</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>C_32_64Device</name>
@@ -1855,11 +1855,11 @@
                 </option>
                 <option>
                     <name>AuthSdmManifest</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>AuthSdmExplicitLib</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>AuthEnforce</name>
@@ -1888,7 +1888,7 @@
                 </option>
                 <option>
                     <name>OCSimPspConfigFile</name>
-                    <state></state>
+                    <state />
                 </option>
             </data>
         </settings>
@@ -1905,7 +1905,7 @@
                 </option>
                 <option>
                     <name>Fast Model</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCADILogFileCheck</name>
@@ -2072,7 +2072,7 @@
                 </option>
                 <option>
                     <name>OCProbeConfig</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CMSISDAPProbeConfigRadio</name>
@@ -2080,11 +2080,11 @@
                 </option>
                 <option>
                     <name>CMSISDAPSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>ICpuName</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCJetEmuParams</name>
@@ -2092,7 +2092,7 @@
                 </option>
                 <option>
                     <name>CCCMSISDAPUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCCMSISDAPUsbSerialNoSelect</name>
@@ -2113,7 +2113,7 @@
                 </option>
                 <option>
                     <name>CE2UsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CE2IdCodeEditB</name>
@@ -2253,7 +2253,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -2346,7 +2346,7 @@
                 </option>
                 <option>
                     <name>OCProbeConfig</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>IjetProbeConfigRadio</name>
@@ -2366,7 +2366,7 @@
                 </option>
                 <option>
                     <name>ICpuName</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>OCJetEmuParams</name>
@@ -2392,7 +2392,7 @@
                 </option>
                 <option>
                     <name>CCIjetUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCIjetUsbSerialNoSelect</name>
@@ -2615,7 +2615,7 @@
                 </option>
                 <option>
                     <name>CCJLinkUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCTcpIpAlt</name>
@@ -2624,11 +2624,11 @@
                 </option>
                 <option>
                     <name>CCJLinkTcpIpSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -2685,7 +2685,7 @@
                 </option>
                 <option>
                     <name>CCLmiftdiUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCLmiftdiUsbSerialNoSelect</name>
@@ -2838,7 +2838,7 @@
                 </option>
                 <option>
                     <name>CCSTLinkUsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCSTLinkUsbSerialNoSelect</name>
@@ -2851,7 +2851,7 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
@@ -2989,11 +2989,11 @@
                 </option>
                 <option>
                     <name>TIPackage</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>BoardFile</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>DoLogfile</name>
@@ -3085,7 +3085,7 @@
                 </option>
                 <option>
                     <name>CCXds100CpuClockEdit</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCXds100SwoClockAuto</name>
@@ -3106,7 +3106,7 @@
                 </option>
                 <option>
                     <name>CCXds100UsbSerialNo</name>
-                    <state></state>
+                    <state />
                 </option>
                 <option>
                     <name>CCXds100UsbSerialNoSelect</name>

EWARM/chargeController.ewp

@@ -189,7 +189,7 @@
         <option>
           <name>TrustZoneModes</name>
           <version>0</version>
-                    <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OGAarch64Abi</name>
@@ -1096,12 +1096,12 @@
     <settings>
       <name>BUILDACTION</name>
       <archiveVersion>2</archiveVersion>
-            <data />
+      <data></data>
     </settings>
     <settings>
       <name>Coder</name>
       <archiveVersion>0</archiveVersion>
-            <data />
+      <data></data>
     </settings>
   </configuration>
   <configuration>
@@ -1292,7 +1292,7 @@
         <option>
           <name>TrustZoneModes</name>
           <version>0</version>
-                    <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OGAarch64Abi</name>
@@ -2201,12 +2201,12 @@
     <settings>
       <name>BUILDACTION</name>
       <archiveVersion>2</archiveVersion>
-            <data />
+      <data></data>
     </settings>
     <settings>
       <name>Coder</name>
       <archiveVersion>0</archiveVersion>
-            <data />
+      <data></data>
     </settings>
   </configuration>
   <group>
@@ -2315,16 +2315,16 @@
       <group>
         <name>Core</name>
         <file>
-                    <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+          <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
         </file>
         <file>
           <name>$PROJ_DIR$\..\Core\Src\gpio.c</name>
         </file>
         <file>
-                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+          <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
         </file>
         <file>
           <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
@@ -2333,16 +2333,16 @@
           <name>$PROJ_DIR$\..\Core\Src\spi.c</name>
         </file>
         <file>
-                    <name>$PROJ_DIR$\..\Core\Src\stm32g4xx_hal_msp.c</name>
+          <name>$PROJ_DIR$\..\Core\Src\tim.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
         </file>
         <file>
           <name>$PROJ_DIR$\..\Core\Src\stm32g4xx_it.c</name>
         </file>
         <file>
-                    <name>$PROJ_DIR$\..\Core\Src\tim.c</name>
+          <name>$PROJ_DIR$\..\Core\Src\stm32g4xx_hal_msp.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
         </file>
       </group>
     </group>
@@ -2357,9 +2357,6 @@
     </group>
     <group>
       <name>STM32G4xx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal.c</name>
-            </file>
       <file>
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_adc.c</name>
       </file>
@@ -2367,16 +2364,16 @@
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_adc_ex.c</name>
       </file>
       <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_cortex.c</name>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_ll_adc.c</name>
       </file>
       <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma.c</name>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal.c</name>
       </file>
       <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma_ex.c</name>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc.c</name>
       </file>
       <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_exti.c</name>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc_ex.c</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash.c</name>
@@ -2390,6 +2387,15 @@
       <file>
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_gpio.c</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma_ex.c</name>
+      </file>
       <file>
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_pwr.c</name>
       </file>
@@ -2397,10 +2403,7 @@
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_pwr_ex.c</name>
       </file>
       <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc.c</name>
+        <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc_ex.c</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rtc.c</name>
@@ -2426,21 +2429,6 @@
       <file>
         <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_uart_ex.c</name>
       </file>
-            <file>
-                <name>$PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_ll_adc.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Middlewares</name>
-        <group>
-            <name>Library</name>
-            <group>
-                <name>DSP Library/DSP Library</name>
-                <file>
-                    <name>$PROJ_DIR$\..\Middlewares\ST\ARM\DSP\Lib\iar_cortexM4lf_math.a</name>
-                </file>
-            </group>
     </group>
   </group>
   <group>
@@ -2452,4 +2440,17 @@
       <name>$PROJ_DIR$\..\tools\TimeSliceOffset\timeSliceOffset.c</name>
     </file>
   </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>Library</name>
+      <group>
+        <name>DSP Library/DSP Library</name>
+        <file>
+          <name>$PROJ_DIR$/../Middlewares/ST/ARM/DSP/Lib/iar_cortexM4lf_math.a</name>
+        </file>
+      </group>
+    </group>
+  </group>
 </project>
+