2 Commity f75a6cc45d ... 469f9237e9

Autor SHA1 Wiadomość Data
  CHENJIE-PC\QiXiang_CHENJIE 469f9237e9 【V3.1.0.65】65正式版本发布,增加了租期上传,优化了BCU计算,降低了放电电池频率上传 2 lat temu
  CHENJIE-PC\QiXiang_CHENJIE 0fcd643677 【V3.1.240.65】BCU修改 2 lat temu
4 zmienionych plików z 10 dodań i 10 usunięć
  1. 3 3
      inc/AppConfig.h
  2. 3 3
      src/AppTaskMain.c
  3. 3 3
      src/AppTaskTcp.c
  4. 1 1
      src/EmbeddedCoder_src/BCUCal.c

+ 3 - 3
inc/AppConfig.h

@@ -2,7 +2,7 @@
  * @Author       : ChenJie
  * @Date         : 2021-10-14 09:27:15
  * @LastEditors  : ChenJie
- * @LastEditTime : 2022-01-10 12:04:52
+ * @LastEditTime : 2022-01-12 10:01:20
  * @Description  : App Config H file 配置文件,可以针对不同参数进行更改
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\inc\AppConfig.h
  */
@@ -15,8 +15,8 @@
 #define EOLSTATE (0)                   // 1表示下线检测跳过,使用默认值,0表示使用下线检测
 #define DEFAULT_SN "RLTEST00000000001" //默认上传的SN编码
 
-#define APPSWRELEASE 0          //软件测试版本标志位,0-测试,1-发布
-#define APPSWVERSION 0x0301F141 //数据模块软件版本号
+#define APPSWRELEASE 1          //软件测试版本标志位,0-测试,1-发布
+#define APPSWVERSION 0x03010041 //数据模块软件版本号
 
 #define RELAYCONFIG 1              //继电器配置
 #define TCP_ADD "iotp.fast-fun.cn" //数据上传的地址

+ 3 - 3
src/AppTaskMain.c

@@ -3,7 +3,7 @@
  * @Date         : 2021-10-14 09:27:15
  * @Version      : V3.0
  * @LastEditors  : ChenJie
- * @LastEditTime : 2022-01-07 14:44:38
+ * @LastEditTime : 2022-01-12 10:03:14
  * @Description  : 主要负责:1.工作模式转换2.定时器定时3.定时保存运行数据4.异常状态重启
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppTaskMain.c
  */
@@ -91,11 +91,11 @@ static void MainTask(void *arg)
             if (TimeCounter % 10 == 0)
             {
                 UINT8 battWorkStateI = 0;
-                if (battI > 10005)
+                if (battI > 10010)
                 {
                     battWorkStateI = BATT_DISCHARGE_SYM;
                 }
-                else if (battI < 9995 && battI != 0)
+                else if (battI < 9990 && battI != 0)
                 {
                     battWorkStateI = BATT_CHARGE_SYM;
                 }

+ 3 - 3
src/AppTaskTcp.c

@@ -255,7 +255,7 @@ static void TcpDataInfoAssembleSend()
     }
     case BATT_DISCHARGE_SYM:
     {
-        BattSendFreq = AppDataInfo.BattInfoSendFreqNomal;
+        BattSendFreq = AppDataInfo.BattInfoSendFreqLow;
         GpsSendFreq = AppDataInfo.PosInfoSendFreqHigh;
 #if APPSWRELEASE == 1
         DebugFeq = BattSendFreq;
@@ -267,8 +267,8 @@ static void TcpDataInfoAssembleSend()
     }
     default:
     {
-        BattSendFreq = AppDataInfo.BattInfoSendFreqNomal;
-        GpsSendFreq = AppDataInfo.PosInfoSendFreqNormal;
+        BattSendFreq = AppDataInfo.BattInfoSendFreqLow;
+        GpsSendFreq = AppDataInfo.PosInfoSendFreqLow;
         DebugFeq = BattSendFreq;
         break;
     }

+ 1 - 1
src/EmbeddedCoder_src/BCUCal.c

@@ -99,7 +99,7 @@ const int16_T sopc_I_currUp = 500;
 const int16_T sopc_I_currLow = -500;
 
 const uint16_T socc_pct_battSocLow = 0U;                     /* SOC下限值; */
-const uint16_T socc_pct_battSocUp = 930U;                    /* SOC上限值; */
+const uint16_T socc_pct_battSocUp = 940U;                    /* SOC上限值; */
 const int16_T socm_I_chrgCor[3] = {50, 100, 150};            /* 充电CCV对应的电流数据; */
 const int16_T socm_I_disChrgCor[3] = {-240, -160, -100};     /* 放电CCV对应的电流数据; */
 const uint16_T socm_V_chrgCor[3] = {4160U, 4175U, 4188U};    /* 充电CCV对应的电压; */