RGB Sensor Power On Off 시간 단축

RGB Sensor Alarm Check Data Receive Data Static 으로 변환

Debug/Src/RGB_Controller.su

@@ -8,6 +8,6 @@ RGB_Controller.c:211:6:RGB_Alarm_Operate	32	static
 RGB_Controller.c:254:9:RGB_DeviceStatusCheck	12	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:227:6:RGB_Alarm_Check	48	static
 RGB_Controller.c:341:9:RGB_LimitData_Get	0	static
-RGB_Controller.c:352:6:RGB_Controller_Func	120	static
+RGB_Controller.c:362:6:RGB_Controller_Func	128	static

Src/RGB_Controller.c

@@ -127,6 +127,8 @@ for(uint8_t i = 0; i < 10; i++){
          case RGB_ControllerLimitGet:
              Uart1_Data_Send(data,data[bluecell_length] + 3);
              break;
+         
+         default:break;
     }
 }
 
@@ -224,11 +226,11 @@ void RGB_Alarm_Operate(void){
     }
 }
 void RGB_Alarm_Check(uint8_t* data){
-    uint16_t Sensor_red[9] = {0,};
-    uint16_t Sensor_green[9] = {0,};
-    uint16_t Sensor_blue[9] = {0,};    
-    uint8_t Alarm_occur = 0;
+    static uint16_t Sensor_red[9] = {0,};
+    static uint16_t Sensor_green[9] = {0,};
+    static uint16_t Sensor_blue[9] = {0,};    
     static uint8_t Prev_Alarm_occur;
+    uint8_t Alarm_occur = 0;
     Sensor_red[data[bluecell_srcid]] = ((data[bluecell_red_H + 2] << 8)| data[bluecell_red_L + 2]);
     Sensor_green[data[bluecell_srcid]] = ((data[bluecell_green_H + 2] << 8)| data[bluecell_green_L + 2]);
     Sensor_blue[data[bluecell_srcid]] = ((data[bluecell_blue_H + 2] << 8)| data[bluecell_blue_L + 2]);  
@@ -348,8 +350,19 @@ uint8_t RGB_LimitData_Get(uint8_t id){
 }
 #endif // PYJ.2019.04.14_END -- 
 uint8_t datalosscnt[9] = {0,};
+typedef struct{
+    uint8_t Request_stx;
+    uint8_t Request_type;
+    uint8_t Request_length;
+    uint8_t Request_srcid;    
+    uint8_t Request_dstid;        
+    uint8_t Request_crc;    
+    uint8_t Request_etx;        
+}LoraDataRequest_t;
+
 void RGB_Controller_Func(uint8_t* data){
 	RGB_CMD_T type = data[bluecell_type];
+    LoraDataRequest_t Lora_Tempdata;
    // static uint8_t temp_sensorid;
     uint8_t Result_buf[100] = {0,};
     uint8_t i = 0;
@@ -428,10 +441,11 @@ void RGB_Controller_Func(uint8_t* data){
             Result_buf[bluecell_srcid + 7]   = 0xeb;
             break;
         case RGB_Lora_DataRequest:
-            LoraDataSendSet(1);
+            memcpy(&Lora_Tempdata.Request_stx,&data[bluecell_stx],data[bluecell_length] + 3);
+            if(Lora_Tempdata.Request_dstid == MyControllerID)
+                LoraDataSendSet(1);
             break;
         default:
-        
             break;
     }
     RGB_Response_Func(&Result_buf[bluecell_stx]);

Src/main.c

@@ -662,16 +662,15 @@ int main(void)
         ret = SX1276_LoRaTxPacket(&SX1276, &buffer[0], message_length, 2000);
         LoraDataSendSet(0);
         ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
-    }else {
+    }else{
            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);
            }
        }
@@ -727,9 +726,9 @@ int main(void)
                     SensorID = 0;
                 }else{
                     RGB_Sensor_PowerOnOff(IDAutoSetRequest_data[4]);
-                    HAL_Delay(500);
+                    HAL_Delay(450);
                     RGB_Controller_Func(&IDAutoSetRequest_data[bluecell_stx]);
-                    HAL_Delay(500);
+                    HAL_Delay(450);
                 }
             }
             else{