backup0428

Core/Inc/database.h

@@ -23,5 +23,6 @@ extern bool uploaweork;
 extern uint16_t timecountSec;
 extern uint16_t timecount;
 extern uint16_t timecountMin;
+extern uint16_t timemqttHearbeat;
 #endif /*__DATABASE_H*/
 

Core/Src/database.c

@@ -336,6 +336,7 @@ void TestPrintStruct(DatabaseLoc *ptr,uint8_t temppush,uint8_t temppull)
 uint16_t timecountSec=0;
 uint16_t timecountMin=0;
 uint16_t timecount=0;
+uint16_t timemqttHearbeat=0;
 void PushpullWork(void)
 {
 	dblocptr->location.statusFlagL = (0x2<<8)&0xFF00;//¶¨Òå״̬

Core/Src/freertos.c

@@ -341,8 +341,6 @@ void StartloginfoTaskTask(void const * argument)
 		{
 			tt808FsFunc((uint8_t*)&(dblocptr->location.alarmFlagH), 34, MessageID_location);
 			
-			//*向主题a发布(保活心跳30s)
-			MQTT_PUB(0,topica,"1234","+MQTTURC: \"puback\"");
 		}
 	}
 #if timingPush ==1
@@ -352,6 +350,15 @@ void StartloginfoTaskTask(void const * argument)
 		timecountSec=0;//清0
 		timecountMin+=1;//加1min
 		timecount +=1; //记4为20min
+	}	
+	
+	timemqttHearbeat+=1;
+	if(timemqttHearbeat==12)//2min
+	{
+		timemqttHearbeat=0;
+		//*向主题a发布(保活心跳30s)
+		MQTT_PUB(0,topica,"1234","+MQTTURC: \"puback\"");
+		
 	}
 
 #endif

Core/Src/mba32a.c

@@ -199,6 +199,7 @@ void USART_SendString(UART_HandleTypeDef *huart,char *str)
 	HAL_UART_Transmit(huart, (uint8_t*)str, strlen(str), 0xFFFF);		//工作信息串口发送
     HAL_UART_Transmit(&huart1, (uint8_t*)str, strlen(str), 0xFFFF);		//485打印log
     //HAL_UART_Transmit(&huart3, (uint8_t*)str, strlen(str), 0xFFFF);	//TTL打印log
+
 	
 }
 /**

Core/Src/tt808.c

@@ -514,6 +514,7 @@ void Process_str_collections(void) {
         );
     }
 }
+char versionc[20]={0};
 void MqttRe(void)
 {
 	 if(strncmp((const char *)U4_4GrecvBuff, "+MQTTURC: \"publish\"",  strlen("+MQTTURC: \"publish\""))==0)//½ÓÊÕµ½·¢²¼ÐÅÏ¢