add mba32a_txpower

Core/Inc/ConfigMacros.h

@@ -6,9 +6,10 @@
 #include "oled.h"
 
 
-#define open4G			0	
+#define open4G			1	
 #define openBT			1	
 #define updateMenu		1	
+#define debugkeyinfo	0	
 #define open16			11	//开字
 #define open16			11	//开字
 #define close16			12	//关字
@@ -45,7 +46,6 @@
 #define HELLO(message) 					printf("%s\r\n", message)
 #define PRINT_UUID(message) 			printf("#%s符合设置项\n",message)
 #define PRINT_NUUID(message) 			printf("%s不符合\n",message)
-#define PRINT_BTRESP(message) 			printf("%s错误\n",message)
 
 
 /* SYETEM init */
@@ -155,6 +155,7 @@ typedef enum {
     UUIDS = 1,
     UUIDN = 2,
     UUIDW = 3,
+    TxPower = 4
 } BtStep;
 
 

Core/Src/freertos.c

@@ -197,7 +197,7 @@ void StartTestTask(void const * argument)
 	modifyOledBmp();
 	if(reset4Gmodule) { 
 		reset4Gmodule = false; 
-		HAL_Delay(2000);//µÈ´ý4GÆô¶¯
+		HAL_Delay(1500);//µÈ´ý4GÆô¶¯
         ML307A_Init(); 
     }	
 		  

Core/Src/key.c

@@ -120,7 +120,9 @@ uint8_t KEY_1_Scan(void)
 
 								
 					}
+					#if debugkeyinfo == 1
 					PRINT_MENU_STATUS("K1");
+					#endif
 					sent1_key = true;
 				}
 				return 1;
@@ -239,7 +241,9 @@ uint8_t KEY_2_Scan(void)
 							break;
 						}
 					}
+					#if debugkeyinfo == 1
 					PRINT_MENU_STATUS("K2");
+					#endif
 					sent2_key = true;
 				}
 				return 1;
@@ -886,7 +890,9 @@ uint8_t KEY_3_Scan(void)
 						}
 					}
 
+					#if debugkeyinfo == 1
 					PRINT_MENU_STATUS("K3");
+					#endif
 					sent3_key = true;
 				}
 				return 1;
@@ -969,7 +975,9 @@ uint8_t KEY_4_Scan(void)
 							break;
 						}
 					}
+					#if debugkeyinfo == 1
 					PRINT_MENU_STATUS("K4");
+					#endif
 					sent4_key = true;
 				}
 				return 1;

Core/Src/mba32a.c

@@ -64,10 +64,15 @@ void Start_Read_resetFlag16(void)
 			PRINT_NUUID("UUIDW");//UUID项不符合
 			btstep = UUIDW;
 		}
+		if(!sendCmd_BT("AT+TXPOWER?\r\n","+TXPOWER:10",1,1))
+		{
+			PRINT_NUUID("TXPOWER");//TXPOWER项不符合
+			btstep = TxPower;
+		}
 		else
 		{
 			
-			PRINT_UUID("UUID项");//UUID项符合设置项
+			PRINT_UUID("UUID项及发射功率");//符合设置项
 			btstep = BtStepDefault;
 		}
 	}
@@ -140,6 +145,23 @@ void MBA32A_Init(void)
 				break;
 			}
 		}
+		case TxPower:
+		{
+			if(sendCmd_BT("AT+TXPOWER?\r\n","+TXPOWER:0",1,1))//蓝牙芯片默认值，需要修改
+			{
+				if(sendCmd_BT("AT+TXPOWER=10\r\n","OK",1,1))
+				{
+					printf("#04设置发射功率成功\n");
+					btstep++;
+				}
+			}
+			else
+			{	//ERROR 其他值
+				MBA32AReset();
+				break;
+			}
+		}
+			
 	}
 
 	menu.current=0;//回到初始

Core/Src/ml307a.c

@@ -13,11 +13,11 @@ extern UART_HandleTypeDef huart3;
 extern UART_HandleTypeDef huart4;
 
 uint8_t sendCmd_4G(char *pCmd, char *pRes, uint32_t timeOut, uint8_t sendNum);
+void ML307AReset(void);
+	
 
 void ML307A_Init(void)
 {
-	
-	//HAL_Delay(2000);
 	INIT_4G_FRAME();
 	
 	if(!sendCmd_4G("AT\r\n","OK",1,1))
@@ -32,13 +32,27 @@ void ML307A_Init(void)
 	}
 	else
 	{
-		//HAL_Delay(2000);
-		
 		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*)"NO_SIM",12,0);
 		}
+		else
+		{
+			if (sendCmd_4G("AT+CPIN?\r\n", "+CME ERROR: 13", 1, 1))
+			{
+				printf("\tERROR!-->SIM失败\r\n");
+				OLED_ShowString(42,50,(unsigned char*)"SIM_Fail",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");
+			}
+		}
 
 	}
 }

Core/Src/stm32f1xx_it.c

@@ -435,8 +435,10 @@ void UART4_IRQHandler(void)
 		u4RecvFlag = true;
 		u4length = recvLength;
 		
-		memcpy(g_ML307A_8buf, &recvBuff[2], recvLength);	
-		memcpy(g_ML307A_8buf_Down, g_ML307A_8buf, recvLength);	
+//		memcpy(g_ML307A_8buf, &recvBuff[2], recvLength);	
+//		memcpy(g_ML307A_8buf_Down, g_ML307A_8buf, recvLength);	
+
+		memcpy(g_ML307A_8buf_Down,  &recvBuff[2], recvLength);	
 		
 		
 		HAL_UART_Receive_DMA(&huart4, recvBuff, 2048);		//重新打开DMA接收，不然只能接收一次数据

Core/Src/tim.c

@@ -32,7 +32,8 @@ void MX_TIM2_Init(void)
 {
 
   /* USER CODE BEGIN TIM2_Init 0 */
-
+//TIM2 刷新快 看门狗
+//TIM3 刷新慢 运行指示灯
   /* USER CODE END TIM2_Init 0 */
 
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};

MDK-ARM/dtu.uvoptx

@@ -302,7 +302,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>../Core/Src/main.c</PathWithFileName>