Browse Source

V3.0.0.6 增加了内网通讯故障上报,电池信息持续上报

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
a63dbf7ee9
3 changed files with 7 additions and 1 deletions
  1. 1 1
      inc/AppConfig.h
  2. 0 0
      src/AppTaskTcp.c
  3. 6 0
      src/AppTaskUart.c

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

File diff suppressed because it is too large
+ 0 - 0
src/AppTaskTcp.c


+ 6 - 0
src/AppTaskUart.c

@@ -155,6 +155,12 @@ static void UartTask(void* arg)
 				}
 				if(UartRecvFlagCounter>=3)
 				{
+					if(osOK==osMutexAcquire(Error_Mutex, 100))
+					{
+						UINT8 ErrorNumTemp = 33;
+						PutErrorNum((UINT16 *)ErrorNum,sizeof(ErrorNum),ErrorNumTemp);
+					}
+					osMutexRelease(Error_Mutex);
 					UartRecvFlag = 0;
 					UartRecvFlagCounter = 0;
 					PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_INTI);

Some files were not shown because too many files changed in this diff