【JM-V3.0.0.14】初始值修改

inc/AppConfig.h

@@ -13,7 +13,7 @@
 #define DATA_MODULE_TYPE (1)           //1表示NB模块，2表示4G cat1
 #define EOLSTATE (0)                   //1表示下线检测跳过，使用默认值，0表示使用下线检测
 #define DEFAULT_SN "JMTEST00000000001" //默认上传的SN编码
-#define APPSWVERSION 0x0300000D        //数据模块软件版本号
+#define APPSWVERSION 0x0300000E        //数据模块软件版本号
 #define TCP_ADD "iotp.fast-fun.cn"     //数据上传的地址
 #define TCP_PORT 8712                  //数据上传的端口
 #define NB_OTHER_TEMP_NUM (4)          //NB采集的温度个数

inc/AppFunc.h

@@ -1,11 +1,12 @@
-/****************************************************************************
- *
- * Copy right:   RL.Chen J and Zhen C
- * File name:    AppFunc.h
- * Description:  应用层函数调用文件
- * History:      2021-07-15
- * Version:      V3.0
- ****************************************************************************/
+/*
+ * @Author       : ChenJie
+ * @Date         : 2021-11-09 12:08:17
+ * @Version      : V3.0
+ * @LastEditors  : ChenJie
+ * @LastEditTime : 2021-11-23 19:08:59
+ * @Description  : file content
+ * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\inc\AppFunc.h
+ */
 #include "hal_module_adapter.h"
 #include "flash_ec616_rt.h"
 #include "commontypedef.h"
@@ -13,45 +14,44 @@
 #include "mem_map.h"
 #include "AppConfig.h"
 #include "ec_tcpip_api.h"
-#include "AppSignal.h"  
+#include "AppSignal.h"
 typedef struct _Fota_Type
 {
-    BOOL    Fota_update_error ;
-    UINT32  Fota_All_Data_Len ;
-    UINT32  Fota_Current_Addres ;
-    UINT8   Fota_Recv_Data_Len ;
-    UINT8   Fota_Recv_Data[100] ;
-    UINT32  Fota_Flash_Addres;
-    UINT8   Fota_CRC ;
+    BOOL Fota_update_error;
+    UINT32 Fota_All_Data_Len;
+    UINT32 Fota_Current_Addres;
+    UINT8 Fota_Recv_Data_Len;
+    UINT8 Fota_Recv_Data[100];
+    UINT32 Fota_Flash_Addres;
+    UINT8 Fota_CRC;
 
-}Fota_Type;
-UINT8 bcc_chk(UINT8* data, UINT16 length);
+} Fota_Type;
+UINT8 bcc_chk(UINT8 *data, UINT16 length);
 void LEDDisplay(void);
-UINT16 GetErrorNum(UINT16 *ErrorArray,UINT8 Errorlen);
-UINT8 PutErrorNum(UINT16 *ErrorArray,UINT8 Errorlen,UINT16 ErrorNum);
+UINT16 GetErrorNum(UINT16 *ErrorArray, UINT8 Errorlen);
+UINT8 PutErrorNum(UINT16 *ErrorArray, UINT8 Errorlen, UINT16 ErrorNum);
 void SaveAppData(void);
 void LoadAppData(void);
 void SaveAppConfig(void);
 void LoadAppConfig(void);
 static void setDefaultAppConfigData(void);
 static void setDefaultAppDataInfo(void);
-void TcpDataAssemble(UINT8 Tcptype,UINT8 *SendBuffer,UTC8TimeType UTC8TimeTcp);
+void TcpDataAssemble(UINT8 Tcptype, UINT8 *SendBuffer, UTC8TimeType UTC8TimeTcp);
 void canRxMsgSetInvalidValue(UINT32 ID);
-void Fota_Func(UINT8 *DataPtr,INT32 connectId);
-static UINT8 bcc_chk_fota(UINT8* data, UINT8 length);
-static UINT8 Fota_crc_chk(UINT8* data,UINT8 length);
-void DecodeFunction(UINT32 ID,UINT8* rawData);
+void Fota_Func(UINT8 *DataPtr, INT32 connectId);
+static UINT8 bcc_chk_fota(UINT8 *data, UINT8 length);
+static UINT8 Fota_crc_chk(UINT8 *data, UINT8 length);
+void DecodeFunction(UINT32 ID, UINT8 *rawData);
 void canRxDiagnose(void);
 UINT8 canCOMInTableIndexFind(UINT32 canID);
 void canRxMsgSetInvalidValue(UINT32 ID);
-BOOL snCodeCompare(UINT8* savedSN, UINT8* receivedSN);
-void UDS_Service(CAN_Msg_Type* CanRxMsg);
-UINT8 UDSPositiveAnswer(UINT8 answerLen,UINT8 messageIndex,UINT32 posCode);
-UINT8 UDSNegtiveAnswer(UINT8 answerLen,UINT8 messageIndex, UINT32 negCode);
+BOOL snCodeCompare(UINT8 *savedSN, UINT8 *receivedSN);
+void UDS_Service(CAN_Msg_Type *CanRxMsg);
+UINT8 UDSPositiveAnswer(UINT8 answerLen, UINT8 messageIndex, UINT32 posCode);
+UINT8 UDSNegtiveAnswer(UINT8 answerLen, UINT8 messageIndex, UINT32 negCode);
 BOOL UDSAskforDownLoadData();
 BOOL UDSClearFotaDownloadRegion();
-void CANEncodeFunction(UINT32 ID,UINT8* msgData);
-BOOL VINCodeCompare(UINT8* saveVIN, UINT8* receivedVIN);
+void CANEncodeFunction(UINT32 ID, UINT8 *msgData);
+BOOL VINCodeCompare(UINT8 *saveVIN, UINT8 *receivedVIN);
 void canTxTest(void);
-
-
+void canRxMsgSetInitValue(void);

src/AppFunc.c

@@ -1,15 +1,153 @@
-/****************************************************************************
- *
- * Copy right:   RL.Chen J and Zhen C
- * File name:    AppFunc.c
- * Description:  应用层函数调用文�?
- * History:      2021-03-15
- *
- ****************************************************************************/
+/*
+ * @Author       : ChenJie
+ * @Date         : 2021-11-09 12:08:17
+ * @Version      : V3.0
+ * @LastEditors  : ChenJie
+ * @LastEditTime : 2021-11-23 19:08:15
+ * @Description  : file content
+ * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppFunc.c
+ */
 #include "AppFunc.h"
 #include "numeric.h"
 #include "hal_module_adapter.h"
-
+/**
+ * @brief : 初始化
+ * @param {*}
+ * @return {*}
+ */
+void canRxMsgSetInitValue(void)
+{
+	bmsStatus = 0xFF;
+	bmsErrClass = 0xFF;
+	chrgConctStatus = 0xFF;
+	highVolPwrDwnReq = 0xFF;
+	chrgStatus = 0xFF;
+	bmsErrNum = 0xFF;
+	bmsLife = 0xFF;
+	maxChrgCurrAllowed = 0xFFFF;
+	maxDischrgCurrAllowed = 0xFFFF;
+	battSoc = 0xFF;
+	packTotalVol = 0xFFFF;
+	packTotalCurr = 0xFFFF;
+	insulationR = 0xFFFF;
+	maxCellVol = 0xFFFF;
+	minCellVol = 0xFFFF;
+	maxCellTemp = 0xFF;
+	minCellTemp = 0xFF;
+	avgCellTemp = 0xFF;
+	maxVolSubsysCode = 0xFF;
+	maxVolCellCode = 0xFFFF;
+	minVolSubsysCode = 0xFF;
+	minVoCelllCode = 0xFFFF;
+	maxTempSubsysCode = 0xFF;
+	maxTempCellCode = 0xFF;
+	minTempSubsysCode = 0xFF;
+	minTempCellCode = 0xFF;
+	numOfChrgableSubsys = 0xFF;
+	lengthOfChrgableSysCode = 0xFF;
+	chrgableSysCode = 0xFF;
+	chrgableSubsysCode = 0xFF;
+	//numOfCells =0xFFFF;
+	//numOfCellTemp =0xFF;
+	numOfBattErr = 0xFF;
+	for (UINT16 i = 0; i < CELL_NUM; i++)
+	{
+		battCellU[i] = 0xFFFF;
+	}
+	for (UINT8 i = 0; i < CELL_TEMP_NUM; i++)
+	{
+		battCellTemp[i] = 0xFF;
+	}
+	mainPosRlyStatus = 0xFF;
+	preRlyStatus = 0xFF;
+	mainNegRlyStatus = 0xFF;
+	thrRlyStatus = 0xFF;
+	ptc1RlyStatus = 0xFF;
+	airCondRlyStatus = 0xFF;
+	dcChrg1PosRlyStatus = 0xFF;
+	dcChrg1NegRlyStatus = 0xFF;
+	dcChrg2PosRlyStatus = 0xFF;
+	dcChrg2NegRlyStatus = 0xFF;
+	heatPosRlyStatus = 0xFF;
+	heatNegRlyStatus = 0xFF;
+	coolRlyStatus = 0xFF;
+	ptc2RlyStatus = 0xFF;
+	mainPosRlyErrStatus = 0xFF;
+	preRlyErrStatus = 0xFF;
+	mainNegRlyErrStatus = 0xFF;
+	thrRlyErrStatus = 0xFF;
+	ptc1RlyErrStatus = 0xFF;
+	airCondRlyErrStatus = 0xFF;
+	dcChrg1PosRlyErrStatus = 0xFF;
+	dcChrg1NegRlyErrStatus = 0xFF;
+	dcChrg2PosRlyErrStatus = 0xFF;
+	dcChrg2NegRlyErrStatus = 0xFF;
+	heatPosRlyErrStatus = 0xFF;
+	heatNegRlyErrStatus = 0xFF;
+	coolRlyErrStatus = 0xFF;
+	ptc2RlyErrStatus = 0xFF;
+	accChrgAh = 0xFFFFFFFF;
+	accDischrgAh = 0xFFFFFFFF;
+	accChrgkWh = 0xFFFFFFFF;
+	accDischrgkWh = 0xFFFFFFFF;
+	battSOH = 0xFF;
+	for (UINT8 i = 0; i < 24; i++)
+	{
+		SN[i] = 0xFF;
+	}
+	accRecvryChrgAh = 0xFFFFFFFF;
+	accRecvryChrgkWh = 0xFFFFFFFF;
+	accStationChrgAh = 0xFFFFFFFF;
+	accStationChrgkWh = 0xFFFFFFFF;
+	accGunChrgAh = 0xFFFFFFFF;
+	accGunChrgkWh = 0xFFFFFFFF;
+	sglChrgAh = 0xFFFFFFFF;
+	sglChrgkWh = 0xFFFFFFFF;
+	bmsHVOn = 0xFF;
+	vcuDCVol = 0xFFFF;
+	acRelayStatus = 0xFF;
+	ptcRelayStatus = 0xFF;
+	mainRelayStatus = 0xFF;
+	preRelayStatus = 0xFF;
+	ptc2RelayStatus = 0xFF;
+	acRelayErrorStatus = 0xFF;
+	ptcRelayErrorStatus = 0xFF;
+	mainRelayErrorStatus = 0xFF;
+	preRelayErrorStatus = 0xFF;
+	hvLockErrorStatus = 0xFF;
+	ptc2RelayErrorStatus = 0xFF;
+	ebcStatus = 0xFF;
+	ebcAskHVOn = 0xFF;
+	ebcAskHVOff = 0xFF;
+	retainLockSignal = 0xFF;
+	dischargeLockSignal = 0xFF;
+	chargeLockSignal = 0xFF;
+	errorClass = 0xFF;
+	errorCode1 = 0xFF;
+	errorCode2 = 0xFF;
+	chargeFlag = 0xFF;
+	exchangeBattAirPressure = 0xFF;
+	lifeSignal = 0xFF;
+	vehicleStatus = 0xFF;
+	currentGearPosition = 0xFF;
+	parkingBreakStatus = 0xFF;
+	breakingStatus = 0xFF;
+	for (UINT8 i = 0; i < sizeof(VIN); i++)
+	{
+		VIN[i] = 0xFF;
+	}
+	frontBreakingPressure = 0xFF;
+	backBreakingPressure = 0xFF;
+	frontBreakingPressureErrorStatus = 0xFF;
+	backBreakingPressureErrorStatus = 0xFF;
+	ODO = 0xFFFFFFFF;
+	dcdcErrorClass = 0xFF;
+	dcdcWorkStatus = 0xFF;
+	mainElectricityErrorClass = 0xFF;
+	pumpWorkStatus = 0xFF;
+	elecAirCompressorErrorStatus = 0xFF;
+	elecAirCompressorWrokStatus = 0xFF;
+}
 UINT8 bcc_chk(UINT8 *data, UINT16 length)
 {
 	UINT8 bcc_chk_return = 0x00;