Lora Data 변할 때만 데이터전송

Debug/Src/RGB_Controller.su

@@ -1,12 +1,13 @@
 RGB_Controller.c:43:10:RGB_Limit_Address_Check	0	static
 RGB_Controller.c:57:10:RGB_Location_Address_Check	0	static
 RGB_Controller.c:17:6:RGB_Data_Init	48	static
-RGB_Controller.c:72:6:RGB_Response_Func	8	static
-RGB_Controller.c:125:6:RGB_Sensor_LED_Alarm_ON	8	static
-RGB_Controller.c:163:6:RGB_Sensor_LED_Alarm_OFF	8	static
-RGB_Controller.c:202:6:RGB_Alarm_Operate	32	static
-RGB_Controller.c:239:9:RGB_DeviceStatusCheck	12	static
-RGB_Controller.c:313:9:RGB_BufCal	0	static
-RGB_Controller.c:286:6:RGB_Data_Stack	24	static
-RGB_Controller.c:218:6:RGB_Alarm_Check	96	static
-RGB_Controller.c:330:6:RGB_Controller_Func	120	static
+RGB_Controller.c:72:6:RGB_Response_Func	128	static
+RGB_Controller.c:131:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:169:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:208:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:251:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:325:9:RGB_BufCal	0	static
+RGB_Controller.c:298:6:RGB_Data_Stack	24	static
+RGB_Controller.c:224:6:RGB_Alarm_Check	104	static
+RGB_Controller.c:339:9:RGB_LimitData_Get	0	static
+RGB_Controller.c:350:6:RGB_Controller_Func	120	static

Debug/Src/main.su

@@ -1,20 +1,20 @@
-main.c:119:6:HAL_UART_RxCpltCallback	8	static
-main.c:159:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:168:6:LoraDataSendSet	0	static
-main.c:171:9:LoraDataSendGet	0	static
-main.c:175:6:UartDataRecvSet	0	static
-main.c:178:9:UartDataRecvGet	0	static
-main.c:181:6:RGB_SensorIDAutoSet	0	static
-main.c:184:9:RGB_SensorIDAutoGet	0	static
-main.c:188:6:Uart2_Data_Send	0	static
-main.c:191:6:Uart1_Data_Send	0	static
-main.c:195:5:_write	8	static
-main.c:200:6:Uart_dataCheck	24	static
-main.c:229:6:RGB_Sensor_PowerOnOff	8	static
-main.c:383:6:test_read	24	static
-main.c:402:6:Flash_RGB_Data_Write	16	static
-main.c:415:6:Flash_write	24	static
-main.c:468:6:Flash_InitRead	12	static
-main.c:729:6:SystemClock_Config	72	static
-main.c:506:5:main	112	static
-main.c:1003:6:Error_Handler	0	static
+main.c:121:6:HAL_UART_RxCpltCallback	8	static
+main.c:161:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:170:6:LoraDataSendSet	0	static
+main.c:173:9:LoraDataSendGet	0	static
+main.c:177:6:UartDataRecvSet	0	static
+main.c:180:9:UartDataRecvGet	0	static
+main.c:183:6:RGB_SensorIDAutoSet	0	static
+main.c:186:9:RGB_SensorIDAutoGet	0	static
+main.c:190:6:Uart2_Data_Send	0	static
+main.c:193:6:Uart1_Data_Send	0	static
+main.c:197:5:_write	8	static
+main.c:202:6:Uart_dataCheck	24	static
+main.c:231:6:RGB_Sensor_PowerOnOff	8	static
+main.c:385:6:test_read	24	static
+main.c:404:6:Flash_RGB_Data_Write	16	static
+main.c:417:6:Flash_write	24	static
+main.c:470:6:Flash_InitRead	12	static
+main.c:668:6:SystemClock_Config	72	static
+main.c:508:5:main	112	static
+main.c:942:6:Error_Handler	0	static

Inc/main.h

@@ -82,6 +82,7 @@ typedef enum{ //LIMIT SET enum
     Location_stx = 0,
     Location_type,
     Location_length,
+    Location_srcid,
     Location_Data,
 }RGB_Location_Protocol_t;    
 /* USER CODE END ET */
@@ -131,6 +132,8 @@ typedef enum{
     RGB_Location_Report,           //14
     RGB_Location_Response,           //15
     RGB_ControllerID_GET,           //16
+    RGB_Controller_Update_Ack,      //17
+    RGB_ControllerLimitGet ,        //18    
 }RGB_CMD_T;
 #define     RGB_ControllerID_SET_Length         10 
 #define     RGB_SensorID_SET_Length             10 

Src/RGB_Controller.c

@@ -71,6 +71,7 @@ uint16_t RGB_Location_Address_Check(uint8_t id){
 
 void RGB_Response_Func(uint8_t* data){
 	RGB_CMD_T type = data[bluecell_type];
+    uint8_t temp_data[100] = {0,};
 #if 0
 for(uint8_t i = 0; i < 10; i++){
             printf("%02x ",data[i]);
@@ -107,20 +108,25 @@ for(uint8_t i = 0; i < 10; i++){
             case RGB_Lora_Data_Report:
             break;
         case RGB_Location_Report:
+            M24C32_Data_Write(&hi2c2,&data[Location_stx],RGB_Location_Address_Check(data[data[bluecell_length]]),data[bluecell_length] + 3); // EEPROM Controller ID Save 
+            break;
         case RGB_Location_Response:
-            M24C32_Data_Write(&hi2c2,&data[Location_Data],RGB_Location_Address_Check(data[bluecell_dstid]),data[bluecell_length] - 2); // EEPROM Controller ID Save 
+            temp_data[bluecell_length] = M24C32_Data_Read(&hi2c2,RGB_Location_Address_Check(data[bluecell_dstid]) + 2); // EEPROM Controller ID Save 
+            for(uint8_t i = 0; i < temp_data[bluecell_length] + 3; i++)
+                temp_data[i] = M24C32_Data_Read(&hi2c2,RGB_Location_Address_Check(data[bluecell_dstid]) + i); // EEPROM Controller ID Save 
+            temp_data[bluecell_type] = RGB_Location_Response;
+            temp_data[temp_data[bluecell_length] + 1] = STH30_CreateCrc(&temp_data[bluecell_type],temp_data[bluecell_length]);
+            Uart1_Data_Send(temp_data,temp_data[bluecell_length] + 3);    
             break;
          case RGB_ControllerID_GET:
              Uart1_Data_Send(data,data[bluecell_length] + 3);
              break;
+         case RGB_ControllerLimitGet:
+             Uart1_Data_Send(data,data[bluecell_length] + 3);
+             break;
     }
-
 }
 
-
-
-
-
 void RGB_Sensor_LED_Alarm_ON(uint8_t id ){
     switch(id){
         case 0:// 모든 LED의 전원을 ON
@@ -218,7 +224,8 @@ 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 uint8_t Prev_Alarm_occur;
     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]);  
@@ -228,11 +235,16 @@ void RGB_Alarm_Check(uint8_t* data){
             || RGB_SensorGreenLimit_Buf[SensorID_buf[i]]  >= Sensor_green[SensorID_buf[i]]
             || RGB_SensorBlueLimit_Buf[SensorID_buf[i]]  >= Sensor_blue[SensorID_buf[i]]) {
             LED_Alarm[SensorID_buf[i]] = 1;
+            Alarm_occur = 1;
         }else{
             LED_Alarm[SensorID_buf[i]] = 0;
         }
     }
     RGB_Data_Stack(&LED_Alarm[1]);
+    if(Prev_Alarm_occur != Alarm_occur){
+         LoraDataSendSet(1);
+         Prev_Alarm_occur = Alarm_occur;
+    }
 }
 
 uint8_t RGB_DeviceStatusCheck(void){
@@ -303,7 +315,7 @@ void RGB_Data_Stack(uint8_t* rgb_buf){
         Lora_Buf[bluecell_srcid + 2] |= rgb_buf[i] << i ;
     }
     Lora_Buf[bluecell_srcid + 3]= STH30_CreateCrc(&Lora_Buf[bluecell_type],Lora_Buf[bluecell_length]);
-    LoraDataSendSet(1);
+   
 }
 /*
     RGB_Data_Stack에 Lora에 Data를 보내기 위해 Buffer에 Data를 쌓을 때 
@@ -323,13 +335,22 @@ uint8_t RGB_BufCal(uint8_t srcid){
     }
     return ret;
 }
+uint8_t RGB_LimitData_Get(uint8_t id){
+
+    switch(id){
 
+
+    }
+
+
+}
 #endif // PYJ.2019.04.14_END -- 
 uint8_t datalosscnt[9] = {0,};
 void RGB_Controller_Func(uint8_t* data){
 	RGB_CMD_T type = data[bluecell_type];
    // static uint8_t temp_sensorid;
     uint8_t Result_buf[100] = {0,};
+    uint8_t i = 0;
     switch(type){
         case RGB_Status_Data_Request:           
             datalosscnt[data[bluecell_srcid + 1]]++;
@@ -343,7 +364,6 @@ void RGB_Controller_Func(uint8_t* data){
         case RGB_ControllerID_SET:        
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
             MyControllerID = data[bluecell_srcid]; // �긽��諛⑹쓽 SRC ID�뒗 �굹�쓽 DST ID�씠�떎.
-            
             break;
         case RGB_SensorID_SET:        
             RGB_SensorIDAutoSet(1);
@@ -376,7 +396,7 @@ void RGB_Controller_Func(uint8_t* data){
         case RGB_ID_Allocate_Request:
             break;
         case RGB_Location_Report:
-            break;
+            memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
         case RGB_Location_Response:
             break;
         case RGB_ControllerID_GET:
@@ -387,10 +407,23 @@ void RGB_Controller_Func(uint8_t* data){
             Result_buf[bluecell_srcid + 1]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
             Result_buf[bluecell_srcid + 2]   = 0xeb;
             break;
+            
+        case RGB_ControllerLimitGet:
+            Result_buf[bluecell_stx]         = 0xbe;
+            Result_buf[bluecell_type]        = RGB_ControllerLimitGet;
+            Result_buf[bluecell_length]      = 8;
+            Result_buf[bluecell_srcid + 0]   = (RGB_SensorRedLimit_Buf[data[bluecell_srcid]]   & 0xFF00) >> 8;      
+            Result_buf[bluecell_srcid + 1]   = RGB_SensorRedLimit_Buf[data[bluecell_srcid]]   & 0x00FF;  
+            Result_buf[bluecell_srcid + 2]   = (RGB_SensorGreenLimit_Buf[data[bluecell_srcid]] & 0xFF00) >> 8;      
+            Result_buf[bluecell_srcid + 3]   = RGB_SensorGreenLimit_Buf[data[bluecell_srcid]] & 0x00FF;
+            Result_buf[bluecell_srcid + 4]   = (RGB_SensorBlueLimit_Buf[data[bluecell_srcid]]  & 0xFF00) >> 8;      
+            Result_buf[bluecell_srcid + 5]   = RGB_SensorBlueLimit_Buf[data[bluecell_srcid]]  & 0x00FF;
+            Result_buf[bluecell_srcid + 6]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
+            Result_buf[bluecell_srcid + 7]   = 0xeb;
+            break;
         default:
-        break;
+            break;
     }
-  
     RGB_Response_Func(&Result_buf[bluecell_stx]);
     return;
 }

Src/main.c

@@ -53,7 +53,7 @@
 
 /* Private define ------------------------------------------------------------*/
 /* USER CODE BEGIN PD */
-
+#define LORA_TIMER_CNT 600000 / 2
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -87,6 +87,8 @@ uint8_t RGB_SensorIDAutoset = 0;
 
 volatile uint32_t UartTimerCnt = 0;
 volatile uint32_t LedTimerCnt = 0;
+volatile uint32_t LoraTxTimerCnt = 0;
+
 
 uint8_t buf[buf_size] = {0,};
 
@@ -162,7 +164,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
     if(htim->Instance == TIM6){
         UartTimerCnt++;
         LedTimerCnt++;
-        
+        LoraTxTimerCnt++;
     }
 }
 void LoraDataSendSet(uint8_t val){
@@ -589,10 +591,11 @@ int main(void)
 
   while (1)
   {
-#if 1 // PYJ.2019.04.11_BEGIN -- 
+     if(LoraTxTimerCnt > LORA_TIMER_CNT){
+        LoraTxTimerCnt = 0;
+        LoraDataSendSet(1);
+    }
     RGB_Alarm_Operate();//LED ALARM CHECK
-
-#if 1 // PYJ.2019.04.14_BEGIN -- 
     if(LoraDataSendGet() == 1){
         LoraDataSendSet(0);
         memcpy(&buffer[0],&Lora_Buf[0],LORA_MAX_DATA_CNT);
@@ -615,40 +618,6 @@ int main(void)
            }
        
        }
-#else
-    if (master == 1) {
-        printf("Master ...\r\n");
-        HAL_Delay(2500);
-        printf("Sending package...\r\n");
-    
-        message_length = sprintf(buffer, "Hello %d", message);
-        ret = SX1276_LoRaEntryTx(&SX1276, message_length, 2000);
-        printf("Entry: %d\r\n", ret);
-    
-        printf("Sending %s\r\n", buffer);
-        ret = SX1276_LoRaTxPacket(&SX1276, (uint8_t *) buffer, message_length,
-                2000);
-        message += 1;
-    
-        printf("Transmission: %d\r\n", ret);
-        printf("Package sent...\r\n");
-    
-    } else {
-        printf("Slave ...\r\n");
-        HAL_Delay(1000);
-        printf("Receiving package...\r\n");
-    
-        ret = SX1276_LoRaRxPacket(&SX1276);
-        printf("Received: %d\r\n", ret);
-        if (ret > 0) {
-            SX1276_read(&SX1276, (uint8_t *) buffer, ret);
-            printf("Content (%d): %s\r\n", ret, buffer);
-        }
-        printf("Package received ...\r\n");
-    
-    }
-
-#endif // PYJ.2019.04.14_END -- 
     uartdatarecv = UartDataRecvGet(); 
     if(uartdatarecv != 0){
         if(uartdatarecv == 1){
@@ -658,36 +627,6 @@ int main(void)
         }  
         UartDataRecvSet(0);
     }
-#else
-
-#if 0 // PYJ.2019.04.13_BEGIN -- 
-    if (master == 1) {
-        message_length = sprintf(buffer, "Hello %d", message);
-        ret = SX1276_LoRaEntryTx(&SX1276, message_length, 2000);
-        ret = SX1276_LoRaTxPacket(&SX1276, (uint8_t *) buffer, message_length,
-                2000);
-        message += 1;
-        printf("Transmission: %d\r\n", ret);
-    
-    } else {
-        ret = SX1276_LoRaRxPacket(&SX1276);
-        printf("Received: %d\r\n", ret);
-        if (ret > 0) {
-            SX1276_read(&SX1276, (uint8_t *) buffer, ret);
-            printf("Content (%d): %s\r\n", ret, buffer);
-        }
-    }
-#endif // PYJ.2019.04.13_END -- 
-
-    
-
-    UartDataBufferCheck();
-    if(UartDataRecvGet() >= 1 && UartTimerCnt > 100){
-        Uart_dataCheck(USART1_CNT,&count_in1);
-    }
-
-
-#endif // PYJ.2019.04.11_END -- 
     else{
         if(LedTimerCnt > 500){
             if(RGB_SensorIDAutoGet() == 1){