Fix binding flags

Core/Inc/ConfigMacros.h

@@ -84,12 +84,6 @@ do {\
 } while(0)
 
 
-/* 4G²ÎÊý³õʼ»¯*/	
-#define INIT_4G_FRAME() \
-do { \
-	printf("\t###02\t4G_init%d...\r\n",resetcount_4g); \
-} while (0)
-
 
 #define SET_MENU_STATUS(current_value, up_value, next_value, enter_value) \
 do { \

Core/Src/freertos.c

@@ -148,11 +148,11 @@ void StartScanKeyTask(void const * argument)
   {
     osDelay(1);
 	updatekeystate(); 
+	modifyOledBmp();
     Jump_interface(menu); 
     OLED_Refresh(); 
 	open_close_lock();
 	workinfo_W();
-	//scanMac();
   }
   /* USER CODE END StartScanKeyTask */
 }
@@ -174,7 +174,6 @@ void StarBT4GTask(void const * argument)
     osDelay(1);
 	  
 	  
-	  
   }
   /* USER CODE END StarBT4GTask */
 }
@@ -194,10 +193,9 @@ void StartTestTask(void const * argument)
   for(;;)
   {
     osDelay(1);
-	modifyOledBmp();
 	if(reset4Gmodule) { 
 		reset4Gmodule = false; 
-		HAL_Delay(1500);//µÈ´ý4GÆô¶¯
+		HAL_Delay(1800);//µÈ´ý4GÆô¶¯
         ML307A_Init(); 
     }	
 		  

Core/Src/interface.c

@@ -877,7 +877,7 @@ void home(uint32_t L_s, bool L1bd, bool L2bd, bool L3bd, bool L4bd)
 		case 0xFF10:
 		case 0xFFF0:
 			OLED_ShowString(98,8,NOSETLOCK,12,1);		 //L4null
-			if(L1bd&&L2bd&&L4bd){
+			if(L1bd&&L2bd&&L3bd){
 				if(L_s == 0x1110){
 					OLED_ShowPicture(10,6,20,20,BMP3,1);			//ÏÔʾͼƬ¿ª
 					OLED_ShowChinese(12,46,open16,16,1);		  //¿ª

Core/Src/main.c

@@ -122,7 +122,7 @@ int main(void)
   MBA32A_Init();
 #endif
 #if open4G==1
-  reset4Gmodule = true;//ML307A_Init();
+  //reset4Gmodule = true;//ML307A_Init();
 #endif
   /* USER CODE END 2 */
 

Core/Src/mba32a.c

@@ -49,6 +49,7 @@ void Start_Read_resetFlag16(void)
 	else if(resetFlag16==0xAAAA)//开机检测（大于1次启动）
 	{
 		printf("###蓝牙模块非首次启动\r\n");
+		HAL_Delay(50);
 		if (!sendCmd_BT("AT+UUIDS?\r\n","+UUIDS:0002",1,1))
 		{
 			PRINT_NUUID("UUIDS");//UUID项不符合

Core/Src/ml307a.c

@@ -18,43 +18,54 @@ void ML307AReset(void);
 
 void ML307A_Init(void)
 {
-	INIT_4G_FRAME();
 	
-	if(!sendCmd_4G("AT\r\n","OK",1,1))
+	printf("\t###02\t4G_init%d...\r\n",resetcount_4g); \
+	if(strstr((const char *)g_ML307A_8buf_Down, "+MATREADY") != NULL)
 	{
-		ml307aFail=true;
-		printf("4G模组异常！\r\n");
-	}	
-	
-	if (ml307aFail)
-	{
-		printf("#4G模块初始化Fail");
-	}
-	else
-	{
-		if (sendCmd_4G("AT+CPIN?\r\n", "+CME ERROR: 10", 1, 1)) // 00检测是否有SIM卡 <+CPIN: READY\r\nOK>
+		printf("#4G模块上电");
+		memset(g_ML307A_8buf_Down,0,15);
+		HAL_Delay(100);
+		if(!sendCmd_4G("AT\r\n","OK",1,1))
+		{
+			ml307aFail=true;
+			printf("4G模组异常！\r\n");
+		}	
+		if (ml307aFail)
 		{
-			printf("\tERROR!-->未检测到SIM卡\r\n");
-			OLED_ShowString(42,50,(unsigned char*)"NO_SIM",12,0);
+			printf("#4G模块初始化Fail");
 		}
 		else
 		{
-			if (sendCmd_4G("AT+CPIN?\r\n", "+CME ERROR: 13", 1, 1))
+			if (sendCmd_4G("AT+CPIN?\r\n", "+CME ERROR: 10", 1, 1)) // 00检测是否有SIM卡 <+CPIN: READY\r\nOK>
 			{
-				printf("\tERROR!-->SIM失败\r\n");
-				OLED_ShowString(42,50,(unsigned char*)"SIM_Fail",12,0);
+				printf("\tERROR!-->未检测到SIM卡\r\n");
+				OLED_ShowString(42,50,(unsigned char*)" NO_SIM ",12,0);
 			}
 			else
 			{
-				if (sendCmd_4G("AT+CSQ\r\n", 		"ERROR", 1, 1))// 01查询信号值(信号强度,误码率) <+CSQ: 26,99\r\nOK>
-				if (sendCmd_4G("AT+CEREG?\r\n", 	"ERROR", 1, 1))// 02查询附着成功（驻网：<*,@> @为1或5表示附着成功） <+CEREG: 0,1\r\nOK>
-				if (sendCmd_4G("AT+MIPCALL?\r\n", 	"ERROR", 1, 1))// 03查询PDP激活状态 <+MIPCALL: 1,1,"10.94.99.162"\r\nOK>
-				if (sendCmd_4G("AT+MQTTCFG=?\r\n",	"ERROR", 1, 1))// 04查询MQTT
-				printf("init_success");
+				HAL_Delay(200);
+				if (sendCmd_4G("AT+CPIN?\r\n", "+CME ERROR: 13", 1, 1))
+				{
+					printf("\tERROR!-->SIM失败\r\n");
+					OLED_ShowString(35,45,(unsigned char*)" SIM_Fail ",12,0);
+				}
+				else
+				{
+					sendCmd_4G("AT+CSQ\r\n", 		"ERROR", 1, 1);// 01查询信号值(信号强度,误码率) <+CSQ: 26,99\r\nOK>
+					sendCmd_4G("AT+CEREG?\r\n", 	"ERROR", 1, 1);// 02查询附着成功（驻网：<*,@> @为1或5表示附着成功） <+CEREG: 0,1\r\nOK>
+					//sendCmd_4G("AT+MIPCALL?\r\n", 	"ERROR", 1, 1);// 03查询PDP激活状态 <+MIPCALL: 1,1,"10.94.99.162"\r\nOK>
+					//sendCmd_4G("AT+MQTTCFG=?\r\n",	"ERROR", 1, 1);// 04查询MQTT
+					printf("init_success");
+				}
 			}
-		}
 
+		}
+	}
+	else
+	{
+		ML307AReset();
 	}
+	
 }
 
 

MDK-ARM/dtu.uvoptx

@@ -155,6 +155,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>btframe</ItemText>
         </Ww>
+        <Ww>
+          <count>1</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>menu</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
@@ -178,7 +183,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>0</periodic>
-        <aLwin>0</aLwin>
+        <aLwin>1</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>