Browse Source

【V3.1.0.58】频率改回,观测量修改

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
5d28d3d23f
2 changed files with 7 additions and 12 deletions
  1. 2 2
      inc/AppConfig.h
  2. 5 10
      src/AppTaskTcp.c

+ 2 - 2
inc/AppConfig.h

@@ -2,7 +2,7 @@
  * @Author       : ChenJie
  * @Date         : 2021-10-14 09:27:15
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-11-28 15:10:04
+ * @LastEditTime : 2021-11-29 09:38:05
  * @Description  : App Config H file 配置文件,可以针对不同参数进行更改
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\inc\AppConfig.h
  */
@@ -14,7 +14,7 @@
 #define DATA_MODULE_TYPE (1)           //1表示NB模块,2表示4G cat1
 #define EOLSTATE (0)                   //1表示下线检测跳过,使用默认值,0表示使用下线检测
 #define DEFAULT_SN "RLTEST00000000001" //默认上传的SN编码
-#define APPSWVERSION 0x03010039        //数据模块软件版本号
+#define APPSWVERSION 0x0301003A        //数据模块软件版本号
 #define RELAYCONFIG 1                  //继电器配置
 #define TCP_ADD "iotp.fast-fun.cn"     //数据上传的地址
 #define TCP_PORT 8712                  //数据上传的端口

+ 5 - 10
src/AppTaskTcp.c

@@ -280,8 +280,8 @@ static void TcpDataInfoAssembleSend()
             clrbit(PadInterrupt, 4);
         }
     }
-    //DebugFeq = BattSendFreq;
-    DebugFeq = 1;
+    DebugFeq = BattSendFreq;
+    //DebugFeq = 1;
     if (send_counter % BattSendFreq == 0 && send_counter != 0)
     {
         UINT16 ErrorTemp = 0x00;
@@ -581,15 +581,10 @@ static void TcpDataInfoAssembleSend()
         }
         else
         {
-            INT16 temp = cdmv_ohm_deltR[0];
-            for (UINT8 i = 0; i < cmnc_num_cellUNum; i++)
-            {
-                temp = max(temp, cdmv_ohm_deltR[i]);
-            }
             sprintf((char *)rbuf, "B-%d,%d,%d,%d,%d,%d,%d,%d,%d,,\
-                                %d,%d,%d,%d,%d",
-                    socd_pct_ahSoc, socd_pct_ekfSoc, socd_pct_estSoc, socd_pct_battSoc, socd_pct_vcuSoc, battSOC * 10, socd_pct_cellBattSoc, sohv_Q_packCapArrEo[9], temp,
-                    battI - 10000, maxCellVol, minCellVol, sfmd_I_curr, sfmd_V_cellUAvrg);
+                                %d,%d,%d,%d",
+                    socd_pct_ahSoc, socd_pct_ekfSoc, socd_pct_estSoc, socd_pct_battSoc, socd_pct_vcuSoc, battSOC * 10, socd_pct_cellBattSoc, sohv_Q_packCapArrEo[9], cdmv_ohm_deltR[sfmd_idx_cellUMin],
+                    battI - 10000, maxCellVol, minCellVol, sfmd_V_cellUAvrg);
         }
         Debugcounter++;
         if (Debugcounter > 100)