esp8266 Data Send 기능 추가

.gitignore

@@ -0,0 +1 @@
+/Debug/

Debug/Src/esp8266.su

@@ -1 +1,2 @@
-esp8266.c:12:9:ESP8266_Strindex	0	static
+esp8266.c:12:6:ESP8266_Initialize	8	static
+esp8266.c:57:9:ESP8266_Strindex	8	static

Debug/Src/main.su

@@ -1,5 +1,5 @@
 main.c:83:6:HAL_TIM_PeriodElapsedCallback	0	static
 main.c:92:5:_write	8	static
-main.c:179:6:SystemClock_Config	96	static
+main.c:183:6:SystemClock_Config	96	static
 main.c:104:5:main	56	static
-main.c:612:6:Error_Handler	0	static
+main.c:614:6:Error_Handler	0	static

Debug/Src/uart.su

@@ -1,6 +1,6 @@
-uart.c:12:6:InitUartQueue	0	static
-uart.c:46:6:GetDataFromUartQueue	16	static
-uart.c:23:6:HAL_UART_RxCpltCallback	8	static
-uart.c:36:6:PutDataToUartQueue	16	static
-uart.c:61:6:Uart1_Data_Send	0	static
-uart.c:64:6:Uart2_Data_Send	0	static
+uart.c:12:6:InitUartQueue	8	static
+uart.c:47:6:GetDataFromUartQueue	8	static
+uart.c:24:6:HAL_UART_RxCpltCallback	16	static
+uart.c:37:6:PutDataToUartQueue	16	static
+uart.c:64:6:Uart1_Data_Send	0	static
+uart.c:67:6:Uart2_Data_Send	0	static

Inc/esp8266.h

@@ -11,4 +11,5 @@
 #include "main.h"
 
 uint8_t ESP8266_Strindex(uint8_t* str);
+void ESP8266_Initialize(void);
 #endif /* ESP8266_H_ */

Inc/main.h

@@ -34,6 +34,7 @@ extern "C" {
 /* USER CODE BEGIN Includes */
 #include <stdio.h>
 #include <stdbool.h>
+#include <string.h>
 #include "uart.h"
 #include "CRC16.h"
 #include "flash.h"

Inc/uart.h

@@ -29,7 +29,7 @@ extern UART_HandleTypeDef huart3;
 extern UARTQUEUE TerminalQueue;
 extern UARTQUEUE WifiQueue;
 void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data);
-void InitUartQueue(pUARTQUEUE pQueue);
+void InitUartQueue(UART_HandleTypeDef *huart,pUARTQUEUE pQueue);
 void GetDataFromUartQueue(UART_HandleTypeDef *huart);
 bool Get_UartRcv(void);
 void Set_UartRcv(bool);

STM32F103_WifiAttenCtrlTest.ioc

@@ -108,13 +108,13 @@ Mcu.UserConstants=
 Mcu.UserName=STM32F103RCTx
 MxCube.Version=5.3.0
 MxDb.Version=DB.5.0.30
-NVIC.ADC1_2_IRQn=true\:0\:0\:false\:true\:true\:4\:true\:true
-NVIC.ADC3_IRQn=true\:0\:0\:false\:true\:true\:1\:true\:true
+NVIC.ADC1_2_IRQn=true\:0\:0\:false\:true\:true\:8\:true\:true
+NVIC.ADC3_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:9\:false\:true
-NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:8\:false\:true
-NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:true\:true\:7\:false\:true
-NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:3\:false\:true
+NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:2\:false\:true
+NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:true\:true\:1\:false\:true
+NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:true\:true\:4\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -123,10 +123,10 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:3\:true\:true
-NVIC.UART4_IRQn=true\:0\:0\:false\:true\:true\:2\:true\:true
-NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
-NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:6\:true\:true
+NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:7\:true\:true
+NVIC.UART4_IRQn=true\:0\:0\:false\:true\:true\:6\:true\:true
+NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:9\:true\:true
+NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:10\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=LED_UL_G_B

Src/esp8266.c

@@ -9,9 +9,51 @@
 #include "esp8266.h"
 
 
-uint8_t ESP8266_Strindex(uint8_t* str){
-    uint8_t val = 0;
-    val = sizeof(str) - 1;
+void ESP8266_Initialize(void){
+	  volatile static bool init = false;
+	  volatile static uint8_t seq = 0;
+	  if(init == false ||  seq < 4){
+		  init = true;
+	  }else{
+	  /* * * * *DATA SEND COMMADN * * * * * */
+#if 0 // PYJ.2019.08.06_BEGIN -- 
+          Uart2_Data_Send("AT+CIPSEND=0,1\r\n",ESP8266_Strindex("AT+CIPSEND=0,1\r\n"));
+          HAL_Delay(5); 
+          Uart2_Data_Send("1\r\n",ESP8266_Strindex("1\r\n"));    	  
+#endif // PYJ.2019.08.06_END -- 
+//          Uart2_Data_Send("AT+CIPSEND=1,1\r\n",ESP8266_Strindex("AT+CIPSEND=1,1\r\n"));
+//          HAL_Delay(5); 
+//          Uart2_Data_Send("1\r\n",ESP8266_Strindex("1\r\n"));              
+        return;
+	  }
+	  switch(seq){
+	  case 0:
+          Uart2_Data_Send("AT+CWMODE=3\r\n",ESP8266_Strindex("AT+CWMODE=3\r\n"));
+		  seq++;
+		  break;
+	  case 1:
+          Uart2_Data_Send("AT+CIPMUX=1\r\n",ESP8266_Strindex("AT+CIPMUX=1\r\n"));
+		  seq++;
+		  break;
+	  case 2:
+          Uart2_Data_Send("AT+CWSAP=\"BLUE_TEST\",\"\",5,0\r\n",ESP8266_Strindex("AT+CWSAP=\"BLUE_TEST\",\"\",5,0\r\n"));
+		  seq++;
+		  break;
+	  case 3:
+          Uart2_Data_Send("AT+CIPSERVER=1,4000\r\n",ESP8266_Strindex("AT+CIPSERVER=1,4000\r\n"));
+          HAL_Delay(5);
+          Uart2_Data_Send("AT+CIFSR\r\n",ESP8266_Strindex("AT+CIFSR\r\n"));
+      
+          
+
+		  printf("ESP Setting Complete \r\n");
+		  seq++;
+		  break;
+	  default:
+		  break;
+	  }
 
-    return val;
+}
+uint8_t ESP8266_Strindex(uint8_t* str){
+    return strlen(str);
 }

Src/main.c

@@ -59,7 +59,7 @@ DMA_HandleTypeDef hdma_usart2_tx;
 /* USER CODE BEGIN PV */
 volatile uint32_t UartTimerCnt = 0;
 volatile uint32_t LedTimerCnt = 0;
-volatile uint32_t FirmwareTimerCnt = 0;
+volatile uint32_t InitTimerCnt = 0;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -86,7 +86,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
     if(htim->Instance == TIM6){
         UartTimerCnt++;
         LedTimerCnt++;
-        FirmwareTimerCnt++;
+        InitTimerCnt++;
     }
 }
 int _write (int file, uint8_t *ptr, uint16_t len)
@@ -142,17 +142,17 @@ int main(void)
   setbuf(stdout, NULL);
   printf("Uart Start \r\n");
   printf("Crc generate %x \r\n",CRC16_Generate(tempdata,11));
-  InitUartQueue(&TerminalQueue);
-  InitUartQueue(&WifiQueue);
-  HAL_UART_Transmit_DMA(&huart2, "AT+CWMODE=3\r\n", ESP8266_Strindex("AT+CWMODE=3\r\n"));
+  InitUartQueue(&hTerminal,&TerminalQueue);
+  InitUartQueue(&hWifi,&WifiQueue);
+  /*HAL_UART_Transmit_DMA(&huart2, "AT+CWMODE=3\r\n", ESP8266_Strindex("AT+CWMODE=3\r\n"));
   HAL_Delay(5);
   HAL_UART_Transmit_DMA(&huart2, "AT+CIPMUX=1\r\n", ESP8266_Strindex("AT+CIPMUX=1\r\n"));
   HAL_Delay(5);
   HAL_UART_Transmit_DMA(&huart2, "AT+CWSAP=\"YJ_TEST\",\"\",5,0\r\n", ESP8266_Strindex("AT+CWSAP=\"YJ_TEST\",\"\",5,0\r\n"));
   HAL_Delay(5);
-  HAL_UART_Transmit_DMA(&huart2, "AT+CIPSERVER=1,4000\r\n", ESP8266_Strindex("AT+CIPSERVER=1,4000\r\n"));
+  HAL_UART_Transmit_DMA(&huart2, "AT+CIPSERVER=1,4000\r\n", ESP8266_Strindex("AT+CIPSERVER=1,4000\r\n"));*/
+
 
-  printf("ESP Setting Complete \r\n");
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -162,6 +162,10 @@ int main(void)
 	  if(LedTimerCnt > 100){
 		  HAL_GPIO_TogglePin(LED_UL_G_B_GPIO_Port,LED_UL_G_B_Pin);
 		  LedTimerCnt = 0;
+	  }
+	  if(InitTimerCnt >1000){
+		  ESP8266_Initialize();
+		  InitTimerCnt = 0;
 	  }
 	   while (TerminalQueue.data > 0) GetDataFromUartQueue(&hTerminal);
 	   while (WifiQueue.data > 0) GetDataFromUartQueue(&hWifi);
@@ -221,6 +225,18 @@ void SystemClock_Config(void)
   */
 static void MX_NVIC_Init(void)
 {
+  /* DMA1_Channel6_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+  /* DMA1_Channel4_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
+  /* DMA1_Channel7_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
   /* ADC3_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(ADC3_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(ADC3_IRQn);
@@ -239,15 +255,6 @@ static void MX_NVIC_Init(void)
   /* USART2_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(USART2_IRQn);
-  /* DMA1_Channel6_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
-  /* DMA1_Channel5_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
-  /* DMA1_Channel4_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
 }
 
 /**
@@ -531,11 +538,6 @@ static void MX_DMA_Init(void)
   /* DMA controller clock enable */
   __HAL_RCC_DMA1_CLK_ENABLE();
 
-  /* DMA interrupt init */
-  /* DMA1_Channel7_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
-
 }
 
 /**

Src/uart.c

@@ -9,11 +9,12 @@
 
 UARTQUEUE TerminalQueue;
 UARTQUEUE WifiQueue;
-void InitUartQueue(pUARTQUEUE pQueue)
+void InitUartQueue(UART_HandleTypeDef *huart,pUARTQUEUE pQueue)
 {
+    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hWifi:&hTerminal);
     pQueue->data = pQueue->head = pQueue->tail = 0;
 
-    if (HAL_UART_Receive_DMA(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
+    if (HAL_UART_Receive_DMA(dst, pQueue->Buffer, 1) != HAL_OK)
     {
 //      _Error_Handler(__FILE__, __LINE__);
     }
@@ -22,15 +23,15 @@ void InitUartQueue(pUARTQUEUE pQueue)
 }
 void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
 {
-    pUARTQUEUE pQueue;
-    pQueue = (huart->Instance == USART2 ? &WifiQueue:&TerminalQueue);
+    pUARTQUEUE pQueue = (huart->Instance == USART2 ? &WifiQueue:&TerminalQueue);
+    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hWifi:&hTerminal);
 
     pQueue->head++;
     if (pQueue->head >= QUEUE_BUFFER_LENGTH) pQueue->head = 0;
     pQueue->data++;
     if (pQueue->data >= QUEUE_BUFFER_LENGTH)
         GetDataFromUartQueue(huart);
-    HAL_UART_Receive_DMA(&hTerminal, pQueue->Buffer + pQueue->head, 1);
+    HAL_UART_Receive_DMA(dst, pQueue->Buffer + pQueue->head, 1);
    // Set_UartRcv(true);
 }
 void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data)
@@ -46,12 +47,14 @@ void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data)
 void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 {
     UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hWifi:&hTerminal);
-    pUARTQUEUE pQueue = &TerminalQueue;
+    pUARTQUEUE pQueue = (huart->Instance == USART2 ? &WifiQueue:&TerminalQueue);
 //    printf("Function : %s : ",__func__);
-    if (HAL_UART_Transmit_DMA(dst, pQueue->Buffer + pQueue->tail, 1) != HAL_OK)
-    {
+//    if (HAL_UART_Transmit_DMA(dst, pQueue->Buffer + pQueue->tail, 1) != HAL_OK)
+    printf("%c",*(pQueue->Buffer + pQueue->tail));
+    //if (HAL_UART_Transmit_DMA(&hTerminal, pQueue->Buffer + pQueue->tail, 1) != HAL_OK)
+    //{
 //       _Error_Handler(__FILE__, __LINE__);
-    }
+    //}
 //    printf("\r\n");
     pQueue->tail++;
     if (pQueue->tail >= QUEUE_BUFFER_LENGTH) pQueue->tail = 0;