【V3.0.0.20】-观测信息CAN发送，电池上传1s一次

inc/AppConfig.h

@@ -2,7 +2,7 @@
  * @Author       : ChenJie
  * @Date         : 2021-10-14 09:27:15
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-10-20 15:11:11
+ * @LastEditTime : 2021-10-20 18:05:45
  * @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 0x03000013        //数据模块软件版本号
+#define APPSWVERSION 0x03000014        //数据模块软件版本号
 #define RELAYCONFIG 0                  //继电器配置
 #define TCP_ADD "iotp.fast-fun.cn"     //数据上传的地址
 #define TCP_PORT 8712                  //数据上传的端口

src/AppFunc.c

@@ -3,7 +3,7 @@
  * @Date         : 2021-10-14 09:27:15
  * @Version      : V3.0
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-10-19 11:54:15
+ * @LastEditTime : 2021-10-20 18:04:17
  * @Description  : 应用层函数定义区，UTF-8
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppFunc.c
  */
@@ -2032,6 +2032,62 @@ void CANEncodeFunction(UINT32 ID, UINT8 *msgData)
 		*(UINT8 *)(msgData + 6) = reservedSignal7 & 0xFF;
 		*(UINT8 *)(msgData + 7) = reservedSignal8 & 0xFF;
 		break;
+	case 0x7CE:
+		reservedSignal1 = socd_pct_ahSoc & 0xFF;
+		reservedSignal2 = (socd_pct_ahSoc >> 8) & 0xFF;
+		reservedSignal3 = socd_pct_ekfSoc & 0xFF;
+		reservedSignal4 = (socd_pct_ekfSoc >> 8) & 0xFF;
+		reservedSignal5 = socd_pct_estSoc & 0xFF;
+		reservedSignal6 = (socd_pct_estSoc >> 8) & 0xFF;
+		reservedSignal7 = socd_pct_battSoc & 0xFF;
+		reservedSignal8 = (socd_pct_battSoc >> 8) & 0xFF;
+		*(UINT8 *)(msgData + 0) = reservedSignal1 & 0xFF;
+		*(UINT8 *)(msgData + 1) = reservedSignal2 & 0xFF;
+		*(UINT8 *)(msgData + 2) = reservedSignal3 & 0xFF;
+		*(UINT8 *)(msgData + 3) = reservedSignal4 & 0xFF;
+		*(UINT8 *)(msgData + 4) = reservedSignal5 & 0xFF;
+		*(UINT8 *)(msgData + 5) = reservedSignal6 & 0xFF;
+		*(UINT8 *)(msgData + 6) = reservedSignal7 & 0xFF;
+		*(UINT8 *)(msgData + 7) = reservedSignal8 & 0xFF;
+		break;
+	case 0x7CF:
+		reservedSignal1 = socd_pct_bcuSoc & 0xFF;
+		reservedSignal2 = (socd_pct_bcuSoc >> 8) & 0xFF;
+		reservedSignal3 = test_efkSocMin & 0xFF;
+		reservedSignal4 = (test_efkSocMin >> 8) & 0xFF;
+		reservedSignal5 = test_efkSocMax & 0xFF;
+		reservedSignal6 = (test_efkSocMax >> 8) & 0xFF;
+		reservedSignal7 = 0 & 0xFF;
+		reservedSignal8 = (0 >> 8) & 0xFF;
+		*(UINT8 *)(msgData + 0) = reservedSignal1 & 0xFF;
+		*(UINT8 *)(msgData + 1) = reservedSignal2 & 0xFF;
+		*(UINT8 *)(msgData + 2) = reservedSignal3 & 0xFF;
+		*(UINT8 *)(msgData + 3) = reservedSignal4 & 0xFF;
+		*(UINT8 *)(msgData + 4) = reservedSignal5 & 0xFF;
+		*(UINT8 *)(msgData + 5) = reservedSignal6 & 0xFF;
+		*(UINT8 *)(msgData + 6) = reservedSignal7 & 0xFF;
+		*(UINT8 *)(msgData + 7) = reservedSignal8 & 0xFF;
+		break;
+	case 0x7D0:
+		UINT32 temp1 = (UINT32)(test_UpMin * 100000);
+		UINT32 temp2 = (UINT32)(test_UpMax * 100000);
+		reservedSignal1 = temp1 & 0xFF;
+		reservedSignal2 = (temp1 >> 8) & 0xFF;
+		reservedSignal3 = (temp1 >> 16) & 0xFF;
+		reservedSignal4 = (temp1 >> 24) & 0xFF;
+		reservedSignal5 = temp2 & 0xFF;
+		reservedSignal6 = (temp2 >> 8) & 0xFF;
+		reservedSignal7 = (temp2 >> 16) & 0xFF;
+		reservedSignal8 = (temp2 >> 24) & 0xFF;
+		*(UINT8 *)(msgData + 0) = reservedSignal1 & 0xFF;
+		*(UINT8 *)(msgData + 1) = reservedSignal2 & 0xFF;
+		*(UINT8 *)(msgData + 2) = reservedSignal3 & 0xFF;
+		*(UINT8 *)(msgData + 3) = reservedSignal4 & 0xFF;
+		*(UINT8 *)(msgData + 4) = reservedSignal5 & 0xFF;
+		*(UINT8 *)(msgData + 5) = reservedSignal6 & 0xFF;
+		*(UINT8 *)(msgData + 6) = reservedSignal7 & 0xFF;
+		*(UINT8 *)(msgData + 7) = reservedSignal8 & 0xFF;
+		break;
 	case 0x7B0:
 		*(UINT8 *)(msgData + 0) = (AppNVMData.battSN[0]) & 0xFF;
 		*(UINT8 *)(msgData + 1) = (AppNVMData.battSN[1]) & 0xFF;

src/AppTaskTcp.c

@@ -278,6 +278,7 @@ static void TcpDataInfoAssembleSend()
             clrbit(PadInterrupt, 4);
         }
     }
+    BattSendFreq = 1;
     if (send_counter % BattSendFreq == 0 && send_counter != 0)
     {
         UINT16 ErrorTemp = 0x00;