V3.0.0.7

1、修改了接收屏蔽模式，buffer0接收xxxx30F3和xxxxFBF3；buffer1接收xxxxxxF3的报文；
2、修改丢帧诊断为13帧
3、tcp 0x91报文上传频率提升至10s周期

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 0x03000006        //数据模块软件版本号
+#define APPSWVERSION 0x03000007        //数据模块软件版本号
 
 #define TCP_ADD "iotp.fast-fun.cn" //数据上传的地址
 #define TCP_PORT 8712              //数据上传的端口

src/AppFunc.c

@@ -2443,12 +2443,12 @@ void canRxDiagnose(void)
 			canRxShortError[i] = 0;
 			canRxLongError[i] = 0;
 		}
-		else if (canRxErrorCounter[i] >= 3 && canRxErrorCounter[i] < 60)
+		else if (canRxErrorCounter[i] >= 3 && canRxErrorCounter[i] < 13)
 		{
 			canRxShortError[i] = 1;
 			canRxLongError[i] = 0;
 		}
-		else if (canRxErrorCounter[i] >= 60)
+		else if (canRxErrorCounter[i] >= 13)
 		{
 			canRxShortError[i] = 0;
 			canRxLongError[i] = 1;

src/AppTaskCan.c

@@ -66,33 +66,33 @@ static void CanTask()
 			
 			param.RxStdIDH[0] = 0xFF;
 			param.RxStdIDL[0] = 0xFF;
-			param.RxExtIDH[0] = 0xFF;
-			param.RxExtIDL[0] = 0xFF;
+			param.RxExtIDH[0] = 0x30;
+			param.RxExtIDL[0] = 0xF3;
 
 			param.RxStdIDH[1] = 0xFF;
 			param.RxStdIDL[1] = 0xFF;
-			param.RxExtIDH[1] = 0xFF;
-			param.RxExtIDL[1] = 0xFF;
+			param.RxExtIDH[1] = 0xFB;
+			param.RxExtIDL[1] = 0xF3;
 
 			param.RxStdIDH[2] = 0xFF;
 			param.RxStdIDL[2] = 0xFF;
 			param.RxExtIDH[2] = 0xFF;
-			param.RxExtIDL[2] = 0xFF;
+			param.RxExtIDL[2] = 0xF3;
 
 			param.RxStdIDH[3] = 0xFF;
 			param.RxStdIDL[3] = 0xFF;
 			param.RxExtIDH[3] = 0xFF;
-			param.RxExtIDL[3] = 0xFF;
+			param.RxExtIDL[3] = 0xF3;
 
 			param.RxStdIDH[4] = 0xFF;
 			param.RxStdIDL[4] = 0xFF;
 			param.RxExtIDH[4] = 0xFF;
-			param.RxExtIDL[4] = 0xFF;
+			param.RxExtIDL[4] = 0xF3;
 
 			param.RxStdIDH[5] = 0xFF;
 			param.RxStdIDL[5] = 0xFF;
 			param.RxExtIDH[5] = 0xFF;
-			param.RxExtIDL[5] = 0xFF;
+			param.RxExtIDL[5] = 0xF3;
 			
 			
 			

src/AppTaskTcp.c

@@ -545,7 +545,7 @@ static void TcpDataInfoAssembleSend()
         }
         SendBuffer = NULL;
     }
-    if ((send_counter + 1) % 30 == 0) //91发送
+    if ((send_counter + 1) % 10 == 0) //91发送
     {
         appGetSystemTimeUtcSync(&TimeStracture);
         year = (TimeStracture.UTCtimer1 & 0xffff0000) >> 16;

src/hal_module_adapter.c

@@ -867,14 +867,14 @@ void HAL_Can_Init(Can_InitType param)
 		/*?����???2��??��??��*/
 		CAN_WriteReg(RXM0SIDH, 0x00); //FF->00 zhengchao
 		CAN_WriteReg(RXM0SIDL, 0x00); //E3->00 zhengchao
-		CAN_WriteReg(RXM0EID8, 0x30); //FF->00 zhengchao
-		CAN_WriteReg(RXM0EID0, 0xF3); //FF->00 zhengchao
+		CAN_WriteReg(RXM0EID8, 0x3F); //FF->00 zhengchao
+		CAN_WriteReg(RXM0EID0, 0xFF); //FF->00 zhengchao
 
 		/*?����???2��??��??��*/
 		CAN_WriteReg(RXM1SIDH, 0x00); //FF->00 zhengchao
 		CAN_WriteReg(RXM1SIDL, 0x00); //E3->00 zhengchao
-		CAN_WriteReg(RXM1EID8, 0x30); //FF->00 zhengchao
-		CAN_WriteReg(RXM1EID0, 0xF3); //FF->00 zhengchao
+		CAN_WriteReg(RXM1EID8, 0x00); //FF->00 zhengchao
+		CAN_WriteReg(RXM1EID0, 0xFF); //FF->00 zhengchao
 
 		/*?����???2��??��??��*/
 		CAN_WriteReg(RXF0SIDH, 0xFF & (param.RxStdIDH[0]));