RGB Data Alarm 값 Controller 에서 올릴 수 있도록 프로토콜 변경

Lora Tx/Rx Ver.0.1

Debug/Src/RGB_Controller.su

@@ -6,8 +6,8 @@ RGB_Controller.c:134:6:RGB_Sensor_LED_Alarm_ON	8	static
 RGB_Controller.c:172:6:RGB_Sensor_LED_Alarm_OFF	8	static
 RGB_Controller.c:211:6:RGB_Alarm_Operate	32	static
 RGB_Controller.c:254:9:RGB_DeviceStatusCheck	12	static
-RGB_Controller.c:328:9:RGB_BufCal	0	static
+RGB_Controller.c:327:9:RGB_BufCal	0	static
 RGB_Controller.c:301:6:RGB_Data_Stack	24	static
 RGB_Controller.c:227:6:RGB_Alarm_Check	104	static
-RGB_Controller.c:342:9:RGB_LimitData_Get	0	static
-RGB_Controller.c:353:6:RGB_Controller_Func	120	static
+RGB_Controller.c:341:9:RGB_LimitData_Get	0	static
+RGB_Controller.c:352:6:RGB_Controller_Func	120	static

Debug/Src/main.su

@@ -1,20 +1,20 @@
-main.c:131:6:HAL_UART_RxCpltCallback	8	static
-main.c:176:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:185:6:LoraDataSendSet	0	static
-main.c:188:9:LoraDataSendGet	0	static
-main.c:192:6:UartDataRecvSet	0	static
-main.c:195:9:UartDataRecvGet	0	static
-main.c:198:6:RGB_SensorIDAutoSet	0	static
-main.c:201:9:RGB_SensorIDAutoGet	0	static
-main.c:205:6:Uart2_Data_Send	0	static
-main.c:208:6:Uart1_Data_Send	0	static
-main.c:212:5:_write	8	static
-main.c:248:6:Uart_dataCheck	24	static
-main.c:280:6:RGB_Sensor_PowerOnOff	8	static
-main.c:434:6:test_read	24	static
-main.c:453:6:Flash_RGB_Data_Write	16	static
-main.c:466:6:Flash_write	24	static
-main.c:519:6:Flash_InitRead	12	static
-main.c:751:6:SystemClock_Config	72	static
-main.c:557:5:main	296	static
-main.c:1025:6:Error_Handler	0	static
+main.c:137:6:HAL_UART_RxCpltCallback	8	static
+main.c:182:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:192:6:LoraDataSendSet	0	static
+main.c:195:9:LoraDataSendGet	0	static
+main.c:199:6:UartDataRecvSet	0	static
+main.c:202:9:UartDataRecvGet	0	static
+main.c:205:6:RGB_SensorIDAutoSet	0	static
+main.c:208:9:RGB_SensorIDAutoGet	0	static
+main.c:212:6:Uart2_Data_Send	0	static
+main.c:215:6:Uart1_Data_Send	0	static
+main.c:219:5:_write	8	static
+main.c:255:6:Uart_dataCheck	24	static
+main.c:287:6:RGB_Sensor_PowerOnOff	8	static
+main.c:441:6:test_read	24	static
+main.c:460:6:Flash_RGB_Data_Write	16	static
+main.c:473:6:Flash_write	24	static
+main.c:526:6:Flash_InitRead	12	static
+main.c:757:6:SystemClock_Config	72	static
+main.c:564:5:main	296	static
+main.c:1031:6:Error_Handler	0	static

Inc/main.h

@@ -134,7 +134,12 @@ typedef enum{
     RGB_ControllerID_GET,           //16
     RGB_Controller_Update_Ack,      //17
     RGB_ControllerLimitGet ,        //18    
+    RGB_Lora_Init_Request,
+    RGB_Lora_Init_Response,
+    RGB_Lora_DataRequest,
+    RGB_Lora_DataResponse,
 }RGB_CMD_T;
+
 #define     RGB_ControllerID_SET_Length         10 
 #define     RGB_SensorID_SET_Length             10 
 #define     RGB_SensorDataRequest_Length        7
@@ -142,7 +147,6 @@ typedef enum{
 #define     RGB_SensorIDCheckSetRequest_Length  4
 
 
-#define     RGB_SensorDataResponse_Length       15
 #define     RGB_SensorDataResponseData_Length   RGB_SensorDataResponse_Length - 3
 #define     Lora_Max_Amount                     5
 #define     LORA_MAX_DATA_CNT                   Lora_Max_Amount + 3

Src/RGB_Controller.c

@@ -90,7 +90,7 @@ for(uint8_t i = 0; i < 10; i++){
             Uart2_Data_Send(data,RGB_SensorIDAutoSetRequest_Length);
             break;        
         case RGB_Status_Data_Response:
-            Uart1_Data_Send(data,RGB_SensorDataResponse_Length);
+            Uart1_Data_Send(data,data[bluecell_length] + 3);
             break;
         case RGB_ControllerLimitSet:
             Uart1_Data_Send(data,data[bluecell_length] + 3);
@@ -211,15 +211,15 @@ void RGB_Alarm_Operate(void){
     uint8_t temp_warning = 0;
     for(uint8_t i = 1; i <= (SensorID_Cnt); i++){
         if(LED_Alarm[SensorID_buf[i]] == 1){
-            HAL_GPIO_WritePin(LED_ALARM_GPIO_Port, LED_ALARM_Pin, GPIO_PIN_SET); //표지 LED  
+            HAL_GPIO_WritePin(LED_ALARM_GPIO_Port, LED_ALARM_Pin, GPIO_PIN_SET); //표지 LED
             RGB_Sensor_LED_Alarm_ON(SensorID_buf[i]);
             temp_warning = 1; 
         }else{
             RGB_Sensor_LED_Alarm_OFF(SensorID_buf[i]);
         }
     }
-    if(temp_warning == 0){ // 8개의 Sensor가 전부 정상일 때 만 동작 
-        HAL_GPIO_WritePin(LED_ALARM_GPIO_Port, LED_ALARM_Pin, GPIO_PIN_RESET); //표지 LED 
+    if(temp_warning == 0){ // 8개의 Sensor가 전부 정상일 때 만 동작
+        HAL_GPIO_WritePin(LED_ALARM_GPIO_Port, LED_ALARM_Pin, GPIO_PIN_RESET); //표지 LED
         RGB_Sensor_LED_Alarm_OFF(0); //모든 Sensor가 정상일 때는 LED 가 켜지지 않는다.
     }
 }
@@ -245,7 +245,7 @@ void RGB_Alarm_Check(uint8_t* data){
     }
     RGB_Data_Stack(&LED_Alarm[1]);
     if(Prev_Alarm_occur != Alarm_occur){
-         LoraDataSendSet(1);
+//         LoraDataSendSet(1);
          Prev_Alarm_occur = Alarm_occur;
     }
 }
@@ -295,19 +295,18 @@ uint8_t RGB_BufCal(uint8_t srcid){
 #else //Uart Flag Data
 /*
     현재 Controller 가지고 있는 RGB Sensor ID Check
-    현재 비정상적인 동작을 하는 Sensor 에대한 Flag 정보 
+    현재 비정상적인 동작을 하는 Sensor 에대한 Flag 정보
 */
 void RGB_Data_Stack(uint8_t* rgb_buf){
     memset(&Lora_Buf[0],0x00,8);
     /*********************FIX DATA*************************************/
     Lora_Buf[bluecell_stx]         = 0xbe;
     Lora_Buf[bluecell_srcid + 4]   = 0xeb;
-    
     Lora_Buf[bluecell_type]        = RGB_Lora_Data_Report;
     Lora_Buf[bluecell_length]      = Lora_Max_Amount;// RGB Data 5byte
     Lora_Buf[bluecell_srcid]       = MyControllerID;
     /*********************FIX DATA*************************************/
-    if(RGB_BufCal(SensorID_buf[1]) == 0){//아무런 Device가 존재 하지않을 때 
+    if(RGB_BufCal(SensorID_buf[1]) == 0){//아무런 Device가 존재 하지않을 때
         printf("Not Exist Device \n");
         return;
     }
@@ -321,8 +320,8 @@ void RGB_Data_Stack(uint8_t* rgb_buf){
    
 }
 /*
-    RGB_Data_Stack에 Lora에 Data를 보내기 위해 Buffer에 Data를 쌓을 때 
-    ID 마다 Location Cnt 
+    RGB_Data_Stack에 Lora에 Data를 보내기 위해 Buffer에 Data를 쌓을 때
+    ID 마다 Location Cnt
 */
 uint8_t RGB_BufCal(uint8_t srcid){
     uint8_t ret = 0;
@@ -379,12 +378,13 @@ void RGB_Controller_Func(uint8_t* data){
             break;
         case RGB_Status_Data_Response:
             datalosscnt[data[bluecell_srcid]] = 0;
-            data[bluecell_length] += 1;// Device On OFF status  Send byte
-            data[bluecell_srcid + 9]  = RGB_DeviceStatusCheck();// Device On OFF status  Send byte
-            memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
-            Result_buf[5]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
+            data[bluecell_length] += 1;
             RGB_Alarm_Check(&data[bluecell_stx]);
-           
+            memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
+            Result_buf[Result_buf[bluecell_length] - 1]   = RGB_DeviceStatusCheck();// Device On OFF status  Send byte
+            Result_buf[Result_buf[bluecell_length] + 0]   = Lora_Buf[bluecell_srcid + 2];
+            Result_buf[Result_buf[bluecell_length] + 1]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
+            Result_buf[Result_buf[bluecell_length] + 2]   = 0xeb;
             break;
         case RGB_ControllerLimitSet:
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
@@ -427,7 +427,11 @@ void RGB_Controller_Func(uint8_t* data){
             Result_buf[bluecell_srcid + 6]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
             Result_buf[bluecell_srcid + 7]   = 0xeb;
             break;
+        case RGB_Lora_DataRequest:
+            LoraDataSendSet(1);
+            break;
         default:
+        
             break;
     }
     RGB_Response_Func(&Result_buf[bluecell_stx]);

Src/main.c

@@ -88,6 +88,8 @@ uint8_t RGB_SensorIDAutoset = 0;
 volatile uint32_t UartTimerCnt = 0;
 volatile uint32_t LedTimerCnt = 0;
 volatile uint32_t LoraTxTimerCnt = 0;
+volatile uint32_t LoraAckTimerCnt = 0;
+
 
 
 uint8_t buf[buf_size] = {0,};
@@ -98,6 +100,10 @@ uint8_t buf2[buf_size] = {0,};
 
 uint8_t MyControllerID = 0;
 uint8_t  SensorID = 0;
+typedef enum{
+    LoraRx_mode = 0,
+    LoraTx_mode ,
+};
 
 /* USER CODE END PV */
 
@@ -180,6 +186,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
         UartTimerCnt++;
         LedTimerCnt++;
         LoraTxTimerCnt++;
+        LoraAckTimerCnt++;
     }
 }
 void LoraDataSendSet(uint8_t val){
@@ -644,30 +651,29 @@ int main(void)
   {
      if(LoraTxTimerCnt > LORA_TIMER_CNT){
         LoraTxTimerCnt = 0;
-        LoraDataSendSet(1);
+//        LoraDataSendSet(1);
     }
     RGB_Alarm_Operate();//LED ALARM CHECK
-    if(LoraDataSendGet() == 1){
-        LoraDataSendSet(0);
+    if(LoraDataSendGet() == LoraTx_mode){
+//        LoraDataSendSet(0);
         memcpy(&buffer[0],&Lora_Buf[0],LORA_MAX_DATA_CNT);
         message_length = Lora_Max_Amount + 3;////RGB Data 60byte + stx + etx + crc
         ret = SX1276_LoRaEntryTx(&SX1276, message_length, 2000);
         ret = SX1276_LoRaTxPacket(&SX1276, &buffer[0], message_length, 2000);
-//        printf("Tx data  :");
-//        for(uint8_t i = 0; i < message_length;i++ )
-//        printf("%02x ",buffer[i]);
-//        printf("\n");
+        LoraDataSendSet(0);
+        ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
     }else {
-//            HAL_Delay(1);
            ret = SX1276_LoRaRxPacket(&SX1276);
            if (ret > 0) {
                SX1276_read(&SX1276, &buffer[0], ret);
+#if 1 // PYJ.2019.04.22_BEGIN -- 
                printf("Received Data : ");
                for(uint8_t i = 0; i < ret; i++)
                printf("%02x ",  buffer[i]);
                printf("\n");
+#endif // PYJ.2019.04.22_END -- 
+               Uart_dataCheck(&buffer[bluecell_stx],&ret);
            }
-       
        }
     
      if(count_in1 != count_out1){ // <-------