测试暂存

inc/AppConfig.h

@@ -2,7 +2,7 @@
  * @Author       : ChenJie
  * @Date         : 2021-10-14 09:27:15
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-11-02 18:14:52
+ * @LastEditTime : 2021-11-03 10:40:34
  * @Description  : App Config H file 配置文件，可以针对不同参数进行更改
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\inc\AppConfig.h
  */

src/AppFunc.c

@@ -3,7 +3,7 @@
  * @Date         : 2021-10-14 09:27:15
  * @Version      : V3.0
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-10-29 18:17:47
+ * @LastEditTime : 2021-11-03 11:59:55
  * @Description  : 应用层函数定义区，UTF-8
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppFunc.c
  */

src/AppSignal.c

@@ -3,7 +3,7 @@
  * @Date         : 2021-10-14 09:27:15
  * @Version      : V3.0
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-10-26 16:07:27
+ * @LastEditTime : 2021-11-04 14:13:04
  * @Description  : Global variable definition c file,此文件存放App使用到的全局变量
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppSignal.c
  */

src/AppTaskControl.c

@@ -18,13 +18,6 @@ static void ControlTask(void *arg)
 {
     /*AD采样初始化*/
     UINT32 param;
-    AdcSendReq(ADC_REQ_BITMAP_VBAT_CALI, &param, 1, ADC_GET_RESULT_TIMOUT);
-    AdcSendReq(ADC_REQ_BITMAP_INRES_CALI, &param, 1, ADC_GET_RESULT_TIMOUT);
-    NetSocDisplay(LED_SOC_0, LED_TURN_OFF);
-    NetSocDisplay(LED_SOC_1, LED_TURN_OFF);
-    NetSocDisplay(LED_SOC_2, LED_TURN_OFF);
-    NetSocDisplay(LED_SOC_3, LED_TURN_OFF);
-    FaultDisplay(LED_TURN_OFF);
     PROC_CONTROL_STATE_SWITCH(PROCESS_CONTROL_STATE_IDLE);
     UINT32 CurrentTime = 0;
     UINT8 AdcOrder = 1;
@@ -35,6 +28,13 @@ static void ControlTask(void *arg)
         {
         case PROCESS_CONTROL_STATE_IDLE:
         {
+            AdcSendReq(ADC_REQ_BITMAP_VBAT_CALI, &param, 1, ADC_GET_RESULT_TIMOUT);
+            AdcSendReq(ADC_REQ_BITMAP_INRES_CALI, &param, 1, ADC_GET_RESULT_TIMOUT);
+            NetSocDisplay(LED_SOC_0, LED_TURN_OFF);
+            NetSocDisplay(LED_SOC_1, LED_TURN_OFF);
+            NetSocDisplay(LED_SOC_2, LED_TURN_OFF);
+            NetSocDisplay(LED_SOC_3, LED_TURN_OFF);
+            FaultDisplay(LED_TURN_OFF);
             osDelay(100);
             PROC_CONTROL_STATE_SWITCH(PROCESS_CONTROL_STATE_WORK);
             break;

src/AppTaskMain.c

@@ -3,7 +3,7 @@
  * @Date         : 2021-10-14 09:27:15
  * @Version      : V3.0
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-11-02 10:13:00
+ * @LastEditTime : 2021-11-04 14:14:26
  * @Description  : 主要负责：1.工作模式转换2.定时器定时3.定时保存运行数据4.异常状态重启
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppTaskMain.c
  */

src/EmbeddedCoder_src/SPM.c

@@ -1,3 +1,12 @@
+/*
+ * @Author       : ChenJie
+ * @Date         : 2021-11-02 16:49:35
+ * @Version      : V3.0
+ * @LastEditors  : ChenJie
+ * @LastEditTime : 2021-11-03 12:22:44
+ * @Description  : file content
+ * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\EmbeddedCoder_src\SPM.c
+ */
 #include "SPM.h"
 
 boolean_T FirstRun_SPM;
@@ -23,7 +32,7 @@ void SPM(void)
   spmd_Nr_cellNr = spmd_Nr_cellNr + 1;
   if (spmd_Nr_cellNr % (10 * Feq) == 0)
   {
-    cand_Nr_cellNr ++;
+    cand_Nr_cellNr++;
   }
   else if (spmd_Nr_cellNr > 60000)
   {
@@ -36,17 +45,15 @@ void SPM(void)
   //调用SOX算法
   SOH();
   BLC();
-  if (!ihd_flg_urtRecFlt || sfmd_V_cellUMax == 0)
+  if ((!ihd_flg_urtRecFlt) && (sfmd_V_cellUMax != 0))
   {
-      SOC();
-	  CDM();
+    SOC();
+    CDM();
   }
   // 循环发送数组
-  cand_Q_cellCap = sohv_Q_cellCapArrEo[cand_Nr_cellNr-1];
-  cand_V_chrgStartStat = sohv_V_chrgStartStatEo[cand_Nr_cellNr-1];
-  cand_Q_reqCp   = blcv_Q_reqCpEo[cand_Nr_cellNr-1];
-  cand_Q_totalCp = blcv_Q_totalCpEo[cand_Nr_cellNr-1];
+  cand_Q_cellCap = sohv_Q_cellCapArrEo[cand_Nr_cellNr - 1];
+  cand_V_chrgStartStat = sohv_V_chrgStartStatEo[cand_Nr_cellNr - 1];
+  cand_Q_reqCp = blcv_Q_reqCpEo[cand_Nr_cellNr - 1];
+  cand_Q_totalCp = blcv_Q_totalCpEo[cand_Nr_cellNr - 1];
   FirstRun_SPM = false;
 }
-
-

src/bsp_custom.c

@@ -226,7 +226,7 @@ void BSP_CustomInit(void)
     NVIC_EnableIRQ(PadWakeup2_IRQn);  //lock
     NVIC_DisableIRQ(PadWakeup3_IRQn); //gsensor
     NVIC_DisableIRQ(PadWakeup4_IRQn); //gsensor
-    NVIC_EnableIRQ(PadWakeup5_IRQn);  //wakeup2
+    NVIC_DisableIRQ(PadWakeup5_IRQn); //wakeup2
     CheckLockOutState();
     slpManStartWaitATTimer();