Lora Controller 갯수 저장 할 수 있도록 프로토콜 변경

printf 문 제거

Debug/Src/RGB_Controller.su

@@ -1,13 +1,13 @@
 RGB_Controller.c:44:10:RGB_Limit_Address_Check	0	static
 RGB_Controller.c:58:10:RGB_Location_Address_Check	0	static
 RGB_Controller.c:17:6:RGB_Data_Init	48	static
-RGB_Controller.c:73:6:RGB_Response_Func	24	static
-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:327:9:RGB_BufCal	0	static
-RGB_Controller.c:301:6:RGB_Data_Stack	24	static
-RGB_Controller.c:227:6:RGB_Alarm_Check	48	static
-RGB_Controller.c:341:9:RGB_LimitData_Get	0	static
-RGB_Controller.c:362:6:RGB_Controller_Func	128	static
+RGB_Controller.c:73:6:RGB_Response_Func	32	static
+RGB_Controller.c:144:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:182:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:221:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:264:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:337:9:RGB_BufCal	0	static
+RGB_Controller.c:311:6:RGB_Data_Stack	24	static
+RGB_Controller.c:237:6:RGB_Alarm_Check	48	static
+RGB_Controller.c:351:9:RGB_LimitData_Get	0	static
+RGB_Controller.c:364:6:RGB_Controller_Func	120	static

Debug/Src/main.su

@@ -15,6 +15,6 @@ 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:760:6:SystemClock_Config	72	static
 main.c:564:5:main	296	static
-main.c:1031:6:Error_Handler	0	static
+main.c:1034:6:Error_Handler	0	static

Inc/main.h

@@ -128,7 +128,7 @@ typedef enum{
     RGB_Reset,                      //10
     RGB_BootStart,                  //11
     RGB_ID_Allocate_Request,        //12
-    RGB_Lora_Data_Report,           //13
+    RGB_Lora_ControllerIDAmount_Report,           //13   /* ??? */
     RGB_Location_Report,           //14
     RGB_Location_Response,           //15
     RGB_ControllerID_GET,           //16
@@ -139,15 +139,21 @@ typedef enum{
     RGB_Lora_DataRequest,
     RGB_Lora_DataResponse,
 }RGB_CMD_T;
+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;
 
 #define     RGB_ControllerID_SET_Length         10 
-#define     RGB_SensorID_SET_Length             10 
 #define     RGB_SensorDataRequest_Length        7
 #define     RGB_SensorIDAutoSetRequest_Length   7
-#define     RGB_SensorIDCheckSetRequest_Length  4
 
 
-#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

@@ -73,6 +73,7 @@ uint16_t RGB_Location_Address_Check(uint8_t id){
 void RGB_Response_Func(uint8_t* data){
 	RGB_CMD_T type = data[bluecell_type];
     uint16_t temp  = 0;
+    LoraDataRequest_t Lora_Tempdata;
 #if 0
 for(uint8_t i = 0; i < 10; i++){
             printf("%02x ",data[i]);
@@ -106,7 +107,7 @@ for(uint8_t i = 0; i < 10; i++){
         case RGB_Reset:
         case RGB_SensorID_SET_Success:
         case RGB_ID_Allocate_Request:
-        case RGB_Lora_Data_Report:
+        case RGB_Lora_ControllerIDAmount_Report:
             break;
         case RGB_Location_Report:
             M24C32_Data_Write(&hi2c2,&data[Location_stx],RGB_Location_Address_Check(data[bluecell_srcid]),data[bluecell_length] + 3); // EEPROM Controller ID Save 
@@ -127,6 +128,13 @@ for(uint8_t i = 0; i < 10; i++){
          case RGB_ControllerLimitGet:
              Uart1_Data_Send(data,data[bluecell_length] + 3);
              break;
+         case RGB_Lora_DataResponse:
+             memcpy(&Lora_Tempdata.Request_stx,&data[bluecell_stx],data[bluecell_length] + 3);
+             if(Lora_Tempdata.Request_dstid == MyControllerID)
+                 LoraDataSendSet(1);
+             else
+                 return;
+             break;
          
          default:break;
     }
@@ -304,7 +312,7 @@ void RGB_Data_Stack(uint8_t* rgb_buf){
     /*********************FIX DATA*************************************/
     Lora_Buf[bluecell_stx]         = 0xbe;
     Lora_Buf[bluecell_srcid + 4]   = 0xeb;
-    Lora_Buf[bluecell_type]        = RGB_Lora_Data_Report;
+    Lora_Buf[bluecell_type]        = RGB_Lora_DataResponse;
     Lora_Buf[bluecell_length]      = Lora_Max_Amount;// RGB Data 5byte
     Lora_Buf[bluecell_srcid]       = MyControllerID;
     /*********************FIX DATA*************************************/
@@ -350,19 +358,11 @@ 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;
@@ -441,9 +441,8 @@ void RGB_Controller_Func(uint8_t* data){
             Result_buf[bluecell_srcid + 7]   = 0xeb;
             break;
         case RGB_Lora_DataRequest:
-            memcpy(&Lora_Tempdata.Request_stx,&data[bluecell_stx],data[bluecell_length] + 3);
-            if(Lora_Tempdata.Request_dstid == MyControllerID)
-                LoraDataSendSet(1);
+            memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
+            Result_buf[bluecell_type] = RGB_Lora_DataResponse;
             break;
         default:
             break;

Src/main.c

@@ -660,6 +660,10 @@ int main(void)
         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 buffer : ");
+//        for(uint8_t i = 0; i < sizeof(LoraDataRequest_t); i++)
+//            printf("%02x ",buffer[i]);
+//        printf("\n");
         LoraDataSendSet(0);
         ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
     }else{