Uart 수정 버전

Debug/Src/Uart.su

@@ -1,9 +0,0 @@
-Uart.c:31:6:HAL_UART_RxCpltCallback	8	static
-Uart.c:47:6:QueueCheck	24	static
-Uart.c:57:6:UartDataBufferCheck	8	static
-Uart.c:61:6:UartDataRecvSet	0	static
-Uart.c:64:9:UartDataRecvGet	0	static
-Uart.c:69:6:Uart2_Data_Send	0	static
-Uart.c:72:6:Uart1_Data_Send	0	static
-Uart.c:76:5:_write	8	static
-Uart.c:81:6:Uart_dataCheck	24	static

Debug/Src/main.su

@@ -1,11 +1,18 @@
-main.c:109:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:120:6:RGB_SensorIDAutoSet	0	static
-main.c:123:9:RGB_SensorIDAutoGet	0	static
-main.c:128:6:RGB_Sensor_PowerOnOff	8	static
-main.c:282:6:test_read	24	static
-main.c:301:6:Flash_RGB_Data_Write	16	static
-main.c:314:6:Flash_write	24	static
-main.c:367:6:Flash_InitRead	12	static
-main.c:558:6:SystemClock_Config	72	static
-main.c:404:5:main	112	static
-main.c:832:6:Error_Handler	0	static
+main.c:117:6:HAL_UART_RxCpltCallback	8	static
+main.c:157:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:167:6:UartDataRecvSet	0	static
+main.c:170:9:UartDataRecvGet	0	static
+main.c:173:6:RGB_SensorIDAutoSet	0	static
+main.c:176:9:RGB_SensorIDAutoGet	0	static
+main.c:180:6:Uart2_Data_Send	0	static
+main.c:183:6:Uart1_Data_Send	0	static
+main.c:187:5:_write	8	static
+main.c:192:6:Uart_dataCheck	24	static
+main.c:221:6:RGB_Sensor_PowerOnOff	8	static
+main.c:375:6:test_read	24	static
+main.c:394:6:Flash_RGB_Data_Write	16	static
+main.c:407:6:Flash_write	24	static
+main.c:460:6:Flash_InitRead	12	static
+main.c:652:6:SystemClock_Config	72	static
+main.c:497:5:main	112	static
+main.c:926:6:Error_Handler	0	static

Inc/Uart.h

@@ -1,31 +0,0 @@
-#include "main.h"
-
-
-extern void UartDataRecvSet(uint8_t val);
-extern uint8_t UartDataRecvGet(void);
-extern void Uart3_Data_Send(uint8_t* data,uint8_t size);
-extern void Uart2_Data_Send(uint8_t* data,uint8_t size);
-extern void Uart1_Data_Send(uint8_t* data,uint8_t size);
-extern int _write (int file, uint8_t *ptr, uint16_t len);
-extern void Uart_dataCheck(uint8_t Usart_Num ,uint8_t* cnt);
-extern void UartDataBufferCheck(void);
-extern void QueueCheck(uint8_t Usart_Num,uint8_t* header,uint8_t* tail);
-
-#define USART_CNT 2
-#define buf_size 100
-#define USART1_CNT 0
-#define USART2_CNT 1
-
-extern uint8_t buf[USART_CNT][buf_size];
-extern uint8_t count_in1 , count_out1;
-extern uint8_t count_in2 , count_out2;
-
-extern uint8_t rx1_data[1];
-extern uint8_t rx2_data[1];
-
-extern UART_HandleTypeDef huart1;
-extern UART_HandleTypeDef huart2;
-extern UART_HandleTypeDef huart3;
-
-extern volatile uint32_t UartTimerCnt;
-

Inc/main.h

@@ -57,7 +57,6 @@ extern "C" {
 #include "RGB_Controller.h"
 #include "core_cm3.h"
 #include <stdint.h>
-#include "Uart.h"
 #include "SX1276.h"
 /* USER CODE END Includes */
 
@@ -92,9 +91,6 @@ extern void Uart3_Data_Send(uint8_t* data,uint8_t size);
 extern void RGB_SensorIDAutoSet(uint8_t set);
 extern uint8_t RGB_SensorIDAutoGet(void);
 extern void Flash_write(uint8_t*);
-extern void UartDataRecvSet(uint8_t val);
-extern void Uart_dataCheck(uint8_t Usart_Num ,uint8_t* cnt);
-extern void Uart1_Data_Send(uint8_t* data,uint8_t size);
 
 /* USER CODE END EM */
 
@@ -117,6 +113,7 @@ typedef enum{
     RGB_Sensor_Check ,
     RGB_Sensor_Ack,  
     RGB_Reset,
+    RGB_ID_Allocate_Request,
 }RGB_CMD_T;
 #define     RGB_ControllerID_SET_Length 10 
 #define     RGB_SensorID_SET_Length     10 
@@ -127,17 +124,6 @@ typedef enum{
 
 #define     RGB_SensorDataResponse_Length 15
 #define     RGB_SensorDataResponseData_Length RGB_SensorDataResponse_Length - 3
-
-
-
-extern uint8_t buf[USART_CNT][buf_size];
-extern uint8_t count_in1 ;//, count_out ;
-extern uint8_t count_in2 ;//, count_out ;
-extern uint8_t count_in3 , count_out ;
-extern uint8_t rx1_data[1];
-extern uint8_t rx2_data[1];
-extern uint8_t rx3_data[1];
-
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/
@@ -200,7 +186,7 @@ extern uint8_t rx3_data[1];
 #define LED_CH8_Pin GPIO_PIN_9
 #define LED_CH8_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
-
+#define buf_size 100
 
 /* USER CODE END Private defines */
 

Src/RGB_Controller.c

@@ -135,6 +135,9 @@ void RGB_Controller_Func(uint8_t* data){
             break;
         case RGB_Reset:
             NVIC_SystemReset();
+            break;
+        case RGB_ID_Allocate_Request:
+            
             break;
         default:
         break;

Src/Uart.c

@@ -1,112 +0,0 @@
-#include "Uart.h"
-
-void UartDataRecvSet(uint8_t val);
-uint8_t UartDataRecvGet(void);
-void Uart2_Data_Send(uint8_t* data,uint8_t size);
-void Uart1_Data_Send(uint8_t* data,uint8_t size);
-int _write (int file, uint8_t *ptr, uint16_t len);
-void Uart_dataCheck(uint8_t Usart_Num ,uint8_t* cnt);
-void QueueCheck(uint8_t Usart_Num,uint8_t* header,uint8_t* tail);
-void UartDataBufferCheck(void);
-
-
-
-
-uint8_t UartDataisReved;
-uint8_t rx1_data[1];
-uint8_t rx2_data[1];
-
-uint8_t count_in1 = 0, count_out1 = 0;
-uint8_t count_in2 = 0, count_out2 = 0;
-
-uint8_t buf[USART_CNT][buf_size] = {0,};
-uint8_t Uart_RxData[USART_CNT][buf_size] = {0,};
-uint8_t Uart_Rxcnt = 0;
-typedef struct{
-    uint8_t Rx_Header;
-    uint8_t Rx_Tail;
-    uint8_t buf[USART_CNT][buf_size];
-}BlueUsart_t;
-    
-void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
-{
-    if(huart->Instance == USART1)
-    {
-        buf[USART1_CNT][count_in1] = rx1_data[0];
-        if(++count_in1>=100){ count_in1 = 0; }
-        HAL_UART_Receive_IT(&huart1,&rx1_data[0],1);
-    }
-    if(huart->Instance == USART2) 
-    {
-        buf[USART2_CNT][count_in2] = rx2_data[0];
-        if(++count_in2>=100){ count_in2 = 0; }
-        HAL_UART_Receive_IT(&huart2,&rx2_data[0],1);
-    }
-    
-}
-void QueueCheck(uint8_t Usart_Num,uint8_t* header,uint8_t* tail){
-
-     if(*tail != *header){ 
-        Uart_RxData[Usart_Num][Uart_Rxcnt++] = buf[Usart_Num][(*tail)++];
-        printf("%02x ",Uart_RxData[Usart_Num][Uart_Rxcnt - 1]);
-        if(*tail>= 100){ *tail = 0; }
-        UartTimerCnt = 0;
-        UartDataRecvSet(Usart_Num + 1);
-    }
-}
-void UartDataBufferCheck(void){
-    QueueCheck(USART1_CNT,&count_in1,&count_out1);
-    QueueCheck(USART2_CNT,&count_in2,&count_out2);
-}
-void UartDataRecvSet(uint8_t val){
-    UartDataisReved = val;
-}
-uint8_t UartDataRecvGet(void){
-    return UartDataisReved;
-}
-
-
-void Uart2_Data_Send(uint8_t* data,uint8_t size){
-    HAL_UART_Transmit(&huart2, data,size, 10); 
-}
-void Uart1_Data_Send(uint8_t* data,uint8_t size){
-    HAL_UART_Transmit(&huart1, data,size, 10); 
-}
-
-int _write (int file, uint8_t *ptr, uint16_t len) 
-{
-    HAL_UART_Transmit (&huart1, ptr, len, 10); 
-    return len;
-}
-void Uart_dataCheck(uint8_t Usart_Num ,uint8_t* cnt){
-
-    etError crccheck = 0;
-#if 0
-    for(uint8_t i = 0; i < (* cnt); i++){
-        printf("%02x ",buf[i]);
-    }
-        printf("\r\n");
-#endif  
-
-    crccheck = STH30_CheckCrc(&Uart_RxData[Usart_Num][blucell_type],Uart_RxData[Usart_Num][blucell_length],Uart_RxData[Usart_Num][Uart_RxData[Usart_Num][blucell_length] + 1]);
-    if(crccheck == CHECKSUM_ERROR){
-        for(uint8_t i = 0; i < (*cnt); i++){
-            printf("%02x ",Uart_RxData[Usart_Num][i]);
-        }
-     //   printf("Original CRC : %02x RecvCRC : %02x \r\n",crccheck,Uart_RxData[Usart_Num][Uart_RxData[Usart_Num][blucell_length] + 1]);
-    }
-    else if(crccheck == NO_ERROR){
-        RGB_Controller_Func(&Uart_RxData[Usart_Num][blucell_stx]);\
-        UartDataRecvSet(0);
-    }
-    else{
-         printf("What Happen?\r\n");
-        /*NOP*/
-    }
-
-    *cnt = 0;
-    
-    memset(Uart_RxData[Usart_Num],0x00,buf_size);
-}
-
-

Src/main.c

@@ -70,16 +70,23 @@ UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
 
 /* USER CODE BEGIN PV */
+uint8_t rx1_data[1];
+uint8_t rx2_data[1];
 
 
+uint8_t ring_buf[buf_size];
+uint8_t count_in1 = 0;//, count_out = 0;
+uint8_t count_in2 = 0;//, count_out = 0;
+uint8_t count_in3 = 0, count_out = 0;
 
 
+uint8_t UartDataisReved;
 uint8_t RGB_SensorIDAutoset = 0;
 
 volatile uint32_t UartTimerCnt = 0;
 volatile uint32_t LedTimerCnt = 0;
 
-
+uint8_t buf[buf_size] = {0,};
 
 uint8_t MyControllerID = 0;
 uint8_t  SensorID = 0;
@@ -97,7 +104,9 @@ static void MX_NVIC_Init(void);
 /* USER CODE BEGIN PFP */
 void RGB_SensorIDAutoSet(uint8_t set);
 uint8_t RGB_SensorIDAutoGet(void);
-
+void UartDataRecvSet(uint8_t val);
+void Uart_dataCheck(uint8_t* cnt);
+void Uart1_Data_Send(uint8_t* data,uint8_t size);
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/
@@ -105,7 +114,46 @@ uint8_t RGB_SensorIDAutoGet(void);
 
 
 
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
+{
+    if(huart->Instance == USART1)//RGB Comunication 
+    {
+        buf[count_in1] = rx1_data[0];//(uint8_t)USART2->DR;
+//        printf("data %02x \r\n",rx1_data[0]);
+        if(buf[count_in1++] == 0xEB){
+            if(buf[blucell_length] == (count_in1 - 3))
+                UartDataRecvSet(1);
+            else
+                count_in1 = 0;
+        }
+        HAL_UART_Receive_IT(&huart1,&rx1_data[0],1);
+    }
+    if(huart->Instance == USART2) // Lora?? ?†µ?‹ ?•˜?Š� ?�¬?Š¸
+    {
+        buf[count_in2] = rx2_data[0];//(uint8_t)USART2->DR;
+//        if(buf[count_in++] == 0xEB)UartDataRecvSet(1);
+        if(buf[count_in2++] == 0xEB){
+            if(buf[blucell_length] == (count_in2 - 3))
+                UartDataRecvSet(2);
+            else
+                count_in1 = 0;
+//                printf("UART 2 %d",((count_in2 -1) - 3));
+        }
 
+        HAL_UART_Receive_IT(&huart2,&rx2_data[0],1);
+    }
+#if 0 // PYJ.2019.04.13_BEGIN -- 
+    if(huart->Instance == USART3) //GUI ?? ?†µ?‹ ?•˜?Š� Port
+    {
+        buf[count_in3] = rx3_data[0];//(uint8_t)USART2->DR;
+        if(buf[count_in3++] == 0xEB)UartDataRecvSet(3);
+        /*ring_buf[count_in] = rx2_data[0];//(uint8_t)USART2->DR;
+        if(++count_in>=buf_size) count_in=0;*/
+        HAL_UART_Receive_IT(&huart3,&rx3_data[0],1);
+    }
+#endif // PYJ.2019.04.13_END -- 
+    
+}
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 {
 
@@ -116,7 +164,12 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
     }
 }
 
-
+void UartDataRecvSet(uint8_t val){
+    UartDataisReved = val;
+}
+uint8_t UartDataRecvGet(void){
+    return UartDataisReved;
+}
 void RGB_SensorIDAutoSet(uint8_t set){
     RGB_SensorIDAutoset = set;
 }
@@ -124,7 +177,47 @@ uint8_t RGB_SensorIDAutoGet(void){
     return RGB_SensorIDAutoset;
 }
 
+void Uart2_Data_Send(uint8_t* data,uint8_t size){
+    HAL_UART_Transmit(&huart2, data,size, 10); 
+}
+void Uart1_Data_Send(uint8_t* data,uint8_t size){
+    HAL_UART_Transmit(&huart1, data,size, 10); 
+}
 
+int _write (int file, uint8_t *ptr, uint16_t len) 
+{
+    HAL_UART_Transmit (&huart1, ptr, len, 10); 
+    return len;
+}
+void Uart_dataCheck(uint8_t* cnt){
+
+    etError crccheck = 0;
+#if 0
+    for(uint8_t i = 0; i < (* cnt); i++){
+        printf("%02x ",buf[i]);
+    }
+        printf("\r\n");
+#endif  
+
+    crccheck = STH30_CheckCrc(&buf[blucell_type],buf[blucell_length],buf[buf[blucell_length] + 1]);
+    if(crccheck == CHECKSUM_ERROR){
+        for(uint8_t i = 0; i < (*cnt); i++){
+            printf("%02x ",buf[i]);
+        }
+        printf("Original CRC : %02x RecvCRC : %02x \r\n",crccheck,buf[buf[blucell_length] + 1]);
+    }
+    else if(crccheck == NO_ERROR){
+        RGB_Controller_Func(&buf[blucell_stx]);
+    }
+    else{
+         printf("What Happen?\r\n");
+        /*NOP*/
+    }
+
+    *cnt = 0;
+    
+    memset(buf,0x00,buf_size);
+}
 void RGB_Sensor_PowerOnOff(uint8_t id){
     printf("%d Power ON \r\n",id);
 
@@ -243,10 +336,10 @@ void RGB_Sensor_PowerOnOff(uint8_t id){
 #define END_ADDR    FLASH_USER + 262144 // 256K
 //----------------------------------------------------
 #if 0 // PYJ.2019.03.20_BEGIN -- 
-void test_write() // ?“°ê¸°í•¨?ˆ˜
+void test_write() // 쓰기함수
 {
 
-    __HAL_RCC_TIM7_CLK_DISABLE(); // 매ì�¸???�´ë¨¸ë?? ? •ì§??•©?‹ˆ?‹¤
+    __HAL_RCC_TIM7_CLK_DISABLE(); // 매�타�머를 정지합니다
     uint32_t  Address = 0;
     Address = StartAddr;
 //    printf("================First============ \r\n");
@@ -257,10 +350,10 @@ void test_write() // ?
 //        Address += 4;
 //    }  
 
-//    HAL_FLASH_Unlock(); // lock ??�
+//    HAL_FLASH_Unlock(); // lock 풀기
 //    HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, START_ADDR, (uint32_t)0x12345678); //test
-//    HAL_FLASH_Lock(); // lock ?ž ê·¸ê¸°
-//    __HAL_RCC_TIM7_CLK_ENABLE(); // 매ì�¸???�´ë¨¸ë?? ?ž¬?‹œ?ž‘?•©?‹ˆ?‹¤
+//    HAL_FLASH_Lock(); // lock 잠그기
+//    __HAL_RCC_TIM7_CLK_ENABLE(); // 매�타�머를 재시작합니다
     Address = StartAddr;
     printf("================Second============ \r\n");
 
@@ -279,7 +372,7 @@ void test_write() // ?
 
 
 #if 1 // PYJ.2019.03.20_BEGIN -- 
-void test_read(void) // ?“°ê¸°í•¨?ˆ˜
+void test_read(void) // 쓰기함수
 {
     uint32_t Address = 0x08000000;
     uint8_t aa = 0;
@@ -311,7 +404,7 @@ void Flash_RGB_Data_Write(uint32_t Addr,uint8_t* data){
     HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Addr + 4 ,   (uint16_t)temp_Blue);
 
 }
-void Flash_write(uint8_t* data) // ?“°ê¸°í•¨?ˆ˜
+void Flash_write(uint8_t* data) // 쓰기함수
 {
    
     /*Variable used for Erase procedure*/
@@ -324,8 +417,8 @@ void Flash_write(uint8_t* data) // ?
 //    EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
      Address = START_ADDR;
 
-    __HAL_RCC_TIM7_CLK_DISABLE(); // 매ì�¸???�´ë¨¸ë?? ? •ì§??•©?‹ˆ?‹¤
-    HAL_FLASH_Unlock(); // lock ??�
+    __HAL_RCC_TIM7_CLK_DISABLE(); // 매�타�머를 정지합니다
+    HAL_FLASH_Unlock(); // lock 풀기
 //    if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK){
 //        printf("Erase Failed \r\n");
 //    }else{
@@ -360,11 +453,11 @@ void Flash_write(uint8_t* data) // ?
 
     }
     Flash_RGB_Data_Write(Address,&data[blucell_stx]);
-    HAL_FLASH_Lock(); // lock ?ž ê·¸ê¸°
-    __HAL_RCC_TIM7_CLK_ENABLE(); // 매ì�¸???�´ë¨¸ë?? ?ž¬?‹œ?ž‘?•©?‹ˆ?‹¤
+    HAL_FLASH_Lock(); // lock 잠그기
+    __HAL_RCC_TIM7_CLK_ENABLE(); // 매�타�머를 재시작합니다
 
 }
-void Flash_InitRead(void) // ?“°ê¸°í•¨?ˆ˜
+void Flash_InitRead(void) // 쓰기함수
 {
     uint32_t  Address = 0;
     Address = StartAddr;
@@ -439,7 +532,7 @@ int main(void)
   HAL_TIM_Base_Start_IT(&htim6);
   HAL_UART_Receive_IT(&huart1, &rx1_data[0],1);
   HAL_UART_Receive_IT(&huart2, &rx2_data[0],1);
-  setbuf(stdout, NULL); // \n ?�„ ? �?�„ ?–„ë§? 
+  setbuf(stdout, NULL); // \n � �� 떄만 
 #if 1 // PYJ.2019.03.04_BEGIN -- 
       printf("****************************************\r\n");
       printf("RGB Project\r\n");
@@ -482,10 +575,10 @@ int main(void)
     uartdatarecv = UartDataRecvGet(); 
     if(uartdatarecv != 0){
         if(uartdatarecv == 1){
-            Uart_dataCheck(USART1_CNT,&count_in1);
+            Uart_dataCheck(&count_in1);
         }else if(uartdatarecv == 2){
-            Uart_dataCheck(USART2_CNT,&count_in2);
-        }
+            Uart_dataCheck(&count_in2);
+        }  
         UartDataRecvSet(0);
     }
 #else
@@ -529,7 +622,7 @@ int main(void)
                     SensorID = 0;
                 }else{
                     RGB_Sensor_PowerOnOff(IDAutoSetRequest_data[4]);
-                    HAL_Delay(5000);
+                    HAL_Delay(1500);
                     RGB_Controller_Func(&IDAutoSetRequest_data[blucell_stx]);
                     HAL_Delay(500);
                 }