Lora 에 Data 보고하는 기능 추가

RGB 각포트별로 Warning 시 LED 불 켜는 기능 추가
Lora Tx 기능 추가
Lora Buffer 에 Data가 쌓일 때마다 Lora Tx

Debug/Src/RGB_Controller.su

@@ -1,6 +1,9 @@
-RGB_Controller.c:8:6:RGB_Response_Func	8	static
-RGB_Controller.c:57:6:RGB_Alarm_Check	32	static
-RGB_Controller.c:85:9:RGB_DeviceStatusCheck	12	static
-RGB_Controller.c:112:9:RGB_BufCal	0	static
-RGB_Controller.c:96:6:RGB_Data_Stack	8	static
-RGB_Controller.c:127:6:RGB_Controller_Func	120	static
+RGB_Controller.c:10:6:RGB_Response_Func	8	static
+RGB_Controller.c:61:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:99:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:138:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:171:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:245:9:RGB_BufCal	0	static
+RGB_Controller.c:218:6:RGB_Data_Stack	24	static
+RGB_Controller.c:154:6:RGB_Alarm_Check	48	static
+RGB_Controller.c:262:6:RGB_Controller_Func	120	static

Debug/Src/SX1276.su

@@ -1,30 +1,30 @@
-SX1276.c:24:13:SX1276_hw_SetNSS	0	static
-SX1276.c:19:13:SX1276_hw_init	8	static
-SX1276.c:48:6:SX1276_hw_SPICommand	8	static
-SX1276.c:127:6:SX1276_SPIBurstWrite.part.1	24	static
-SX1276.c:63:9:SX1276_hw_SPIReadByte	8	static
-SX1276.c:73:13:SX1276_hw_DelayMs	0	static
-SX1276.c:29:13:SX1276_hw_Reset	8	static
-SX1276.c:77:12:SX1276_hw_GetDIO0	8	static
-SX1276.c:92:9:SX1276_SPIIDRead	16	static
-SX1276.c:85:9:SX1276_SPIRead	0	static
-SX1276.c:100:6:SX1276_SPIWrite	16	static
-SX1276.c:109:6:SX1276_SPIBurstRead	24	static
-SX1276.c:127:6:SX1276_SPIBurstWrite	0	static
-SX1276.c:197:6:SX1276_standby	8	static
-SX1276.c:202:6:SX1276_sleep	8	static
-SX1276.c:207:6:SX1276_entryLoRa	0	static
-SX1276.c:146:6:SX1276_config	24	static
-SX1276.c:141:6:SX1276_defaultConfig	16	static
-SX1276.c:211:6:SX1276_clearLoRaIrq	0	static
-SX1276.c:215:5:SX1276_LoRaEntryRx	16	static
-SX1276.c:247:9:SX1276_LoRaRxPacket	16	static
-SX1276.c:270:5:SX1276_LoRaEntryTx	16	static
-SX1276.c:301:5:SX1276_LoRaTxPacket	16	static
-SX1276.c:322:6:SX1276_begin	32	static
-SX1276.c:333:5:SX1276_transmit	24	static
-SX1276.c:341:5:SX1276_receive	0	static
-SX1276.c:345:9:SX1276_available	0	static
-SX1276.c:349:9:SX1276_read	16	static
-SX1276.c:358:9:SX1276_RSSI_LoRa	8	static
-SX1276.c:365:9:SX1276_RSSI	8	static
+SX1276.c:22:13:SX1276_hw_SetNSS	0	static
+SX1276.c:17:13:SX1276_hw_init	8	static
+SX1276.c:46:6:SX1276_hw_SPICommand	8	static
+SX1276.c:125:6:SX1276_SPIBurstWrite.part.1	24	static
+SX1276.c:61:9:SX1276_hw_SPIReadByte	8	static
+SX1276.c:71:13:SX1276_hw_DelayMs	0	static
+SX1276.c:27:13:SX1276_hw_Reset	8	static
+SX1276.c:75:12:SX1276_hw_GetDIO0	8	static
+SX1276.c:90:9:SX1276_SPIIDRead	16	static
+SX1276.c:83:9:SX1276_SPIRead	0	static
+SX1276.c:98:6:SX1276_SPIWrite	16	static
+SX1276.c:107:6:SX1276_SPIBurstRead	24	static
+SX1276.c:125:6:SX1276_SPIBurstWrite	0	static
+SX1276.c:198:6:SX1276_standby	8	static
+SX1276.c:203:6:SX1276_sleep	8	static
+SX1276.c:208:6:SX1276_entryLoRa	0	static
+SX1276.c:147:6:SX1276_config	24	static
+SX1276.c:142:6:SX1276_defaultConfig	16	static
+SX1276.c:212:6:SX1276_clearLoRaIrq	0	static
+SX1276.c:216:5:SX1276_LoRaEntryRx	16	static
+SX1276.c:248:9:SX1276_LoRaRxPacket	16	static
+SX1276.c:271:5:SX1276_LoRaEntryTx	16	static
+SX1276.c:302:5:SX1276_LoRaTxPacket	16	static
+SX1276.c:323:6:SX1276_begin	32	static
+SX1276.c:334:5:SX1276_transmit	24	static
+SX1276.c:342:5:SX1276_receive	0	static
+SX1276.c:346:9:SX1276_available	0	static
+SX1276.c:350:9:SX1276_read	16	static
+SX1276.c:359:9:SX1276_RSSI_LoRa	8	static
+SX1276.c:366:9:SX1276_RSSI	8	static

Debug/Src/main.su

@@ -15,6 +15,6 @@ 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:667:6:SystemClock_Config	72	static
-main.c:505:5:main	112	static
-main.c:941:6:Error_Handler	0	static
+main.c:721:6:SystemClock_Config	72	static
+main.c:506:5:main	112	static
+main.c:995:6:Error_Handler	0	static

Inc/RGB_Controller.h

@@ -2,6 +2,8 @@
 
 
 extern void RGB_Controller_Func(uint8_t* data);
+extern void RGB_Alarm_Operate(void);
+extern void RGB_Sensor_LED_Alarm_OFF(uint8_t id );
 
 extern uint8_t SensorID_buf[8];
 extern uint8_t SensorID_Cnt;

Inc/main.h

@@ -93,6 +93,8 @@ extern uint8_t RGB_SensorIDAutoGet(void);
 extern void Flash_write(uint8_t*);
 extern void LoraDataSendSet(uint8_t val);
 extern uint8_t LoraDataSendGet(void);
+extern void Uart2_Data_Send(uint8_t* data,uint8_t size);
+extern void Uart1_Data_Send(uint8_t* data,uint8_t size);
 
 /* USER CODE END EM */
 
@@ -107,28 +109,29 @@ extern uint8_t Lora_Buf[100];
 
 typedef enum{
     RGB_Status_Data_Request = 0x01,
-    RGB_ControllerID_SET ,   //2
-    RGB_SensorID_SET ,          //3
-    RGB_SensorID_SET_Success,   //4
-    RGB_Status_Data_Response ,    //5
-    RGB_ControllerLimitSet ,  //6
-    RGB_Sensor_Start ,    //7
-    RGB_Sensor_Check ,//8
-    RGB_Sensor_Ack,  //9
-    RGB_Reset,//a
-    RGB_ID_Allocate_Request,//b
-    RGB_Lora_Data_Report,//c
+    RGB_ControllerID_SET ,          //2
+    RGB_SensorID_SET ,              //3
+    RGB_SensorID_SET_Success,       //4
+    RGB_Status_Data_Response ,      //5
+    RGB_ControllerLimitSet ,        //6
+    RGB_Sensor_Start ,              //7
+    RGB_Sensor_Check ,              //8
+    RGB_Sensor_Ack,                 //9
+    RGB_Reset,                      //10
+    RGB_ID_Allocate_Request,        //11
+    RGB_Lora_Data_Report,           //12
 }RGB_CMD_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_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_SensorDataResponse_Length 15
-#define     RGB_SensorDataResponseData_Length RGB_SensorDataResponse_Length - 3
-#define     Lora_Max_Amount 60
+#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
 
 /* USER CODE END EFP */
 

Src/RGB_Controller.c

@@ -2,6 +2,8 @@
 
 void RGB_Response_Func(uint8_t* data);
 uint8_t RGB_BufCal(uint8_t srcid);
+void RGB_Alarm_Operate(void);
+void RGB_Data_Stack(uint8_t* rgb_buf);
 
 
 
@@ -53,32 +55,116 @@ uint16_t RGB_SensorBlueLimit_Buf[9]={0,};
 uint16_t Sensor_red[9] = {0,};
 uint16_t Sensor_green[9] = {0,};
 uint16_t Sensor_blue[9] = {0,};    
+
+uint8_t LED_Alarm[9] = {0,};
+void RGB_Sensor_LED_Alarm_ON(uint8_t id ){
+    switch(id){
+        case 0:// 모든 LED의 전원을 ON
+            HAL_GPIO_WritePin(LED_CH1_GPIO_Port,LED_CH1_Pin,GPIO_PIN_RESET);
+            HAL_GPIO_WritePin(LED_CH2_GPIO_Port,LED_CH2_Pin,GPIO_PIN_RESET);            
+            HAL_GPIO_WritePin(LED_CH3_GPIO_Port,LED_CH3_Pin,GPIO_PIN_RESET);            
+            HAL_GPIO_WritePin(LED_CH4_GPIO_Port,LED_CH4_Pin,GPIO_PIN_RESET);
+            HAL_GPIO_WritePin(LED_CH5_GPIO_Port,LED_CH5_Pin,GPIO_PIN_RESET);
+            HAL_GPIO_WritePin(LED_CH6_GPIO_Port,LED_CH6_Pin,GPIO_PIN_RESET);
+            HAL_GPIO_WritePin(LED_CH7_GPIO_Port,LED_CH7_Pin,GPIO_PIN_RESET);
+            HAL_GPIO_WritePin(LED_CH8_GPIO_Port,LED_CH8_Pin,GPIO_PIN_RESET);               
+            break;
+        case 1:
+            HAL_GPIO_WritePin(LED_CH1_GPIO_Port,LED_CH1_Pin,GPIO_PIN_RESET);
+            break;
+        case 2:
+            HAL_GPIO_WritePin(LED_CH2_GPIO_Port,LED_CH2_Pin,GPIO_PIN_RESET);
+            break;
+        case 3:
+            HAL_GPIO_WritePin(LED_CH3_GPIO_Port,LED_CH3_Pin,GPIO_PIN_RESET);
+            break;
+        case 4:
+            HAL_GPIO_WritePin(LED_CH4_GPIO_Port,LED_CH4_Pin,GPIO_PIN_RESET);
+            break;
+        case 5:
+            HAL_GPIO_WritePin(LED_CH5_GPIO_Port,LED_CH5_Pin,GPIO_PIN_RESET);
+            break;
+        case 6:
+            HAL_GPIO_WritePin(LED_CH6_GPIO_Port,LED_CH6_Pin,GPIO_PIN_RESET);
+            break;
+        case 7:
+            HAL_GPIO_WritePin(LED_CH7_GPIO_Port,LED_CH7_Pin,GPIO_PIN_RESET);
+            break;
+        case 8:
+            HAL_GPIO_WritePin(LED_CH8_GPIO_Port,LED_CH8_Pin,GPIO_PIN_RESET);
+            break;
+    }
+}
+void RGB_Sensor_LED_Alarm_OFF(uint8_t id ){
+    switch(id){
+        case 0:// 모든 LED의 전원을 OFF
+            HAL_GPIO_WritePin(LED_CH1_GPIO_Port,LED_CH1_Pin,GPIO_PIN_SET);
+            HAL_GPIO_WritePin(LED_CH2_GPIO_Port,LED_CH2_Pin,GPIO_PIN_SET);            
+            HAL_GPIO_WritePin(LED_CH3_GPIO_Port,LED_CH3_Pin,GPIO_PIN_SET);            
+            HAL_GPIO_WritePin(LED_CH4_GPIO_Port,LED_CH4_Pin,GPIO_PIN_SET);
+            HAL_GPIO_WritePin(LED_CH5_GPIO_Port,LED_CH5_Pin,GPIO_PIN_SET);
+            HAL_GPIO_WritePin(LED_CH6_GPIO_Port,LED_CH6_Pin,GPIO_PIN_SET);
+            HAL_GPIO_WritePin(LED_CH7_GPIO_Port,LED_CH7_Pin,GPIO_PIN_SET);
+            HAL_GPIO_WritePin(LED_CH8_GPIO_Port,LED_CH8_Pin,GPIO_PIN_SET);               
+            break;
+        case 1:
+            HAL_GPIO_WritePin(LED_CH1_GPIO_Port,LED_CH1_Pin,GPIO_PIN_SET);
+            break;
+        case 2:
+            HAL_GPIO_WritePin(LED_CH2_GPIO_Port,LED_CH2_Pin,GPIO_PIN_SET);
+            break;
+        case 3:
+            HAL_GPIO_WritePin(LED_CH3_GPIO_Port,LED_CH3_Pin,GPIO_PIN_SET);
+            break;
+        case 4:
+            HAL_GPIO_WritePin(LED_CH4_GPIO_Port,LED_CH4_Pin,GPIO_PIN_SET);
+            break;
+        case 5:
+            HAL_GPIO_WritePin(LED_CH5_GPIO_Port,LED_CH5_Pin,GPIO_PIN_SET);
+            break;
+        case 6:
+            HAL_GPIO_WritePin(LED_CH6_GPIO_Port,LED_CH6_Pin,GPIO_PIN_SET);
+            break;
+        case 7:
+            HAL_GPIO_WritePin(LED_CH7_GPIO_Port,LED_CH7_Pin,GPIO_PIN_SET);
+            break;
+        case 8:
+            HAL_GPIO_WritePin(LED_CH8_GPIO_Port,LED_CH8_Pin,GPIO_PIN_SET);
+            break;
+    }
+}
+
+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  
+            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 
+        RGB_Sensor_LED_Alarm_OFF(0); //모든 Sensor가 정상일 때는 LED 가 켜지지 않는다.
+    }
+}
 void RGB_Alarm_Check(uint8_t* data){
-   
     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]);  
 
-    uint8_t LED_Alarm = 0;
     for(uint8_t i = 1; i <= (SensorID_Cnt); i++){
         if(RGB_SensorRedLimit_Buf[SensorID_buf[i]]  >= Sensor_red[SensorID_buf[i]]
             || RGB_SensorGreenLimit_Buf[SensorID_buf[i]]  >= Sensor_green[SensorID_buf[i]]
             || RGB_SensorBlueLimit_Buf[SensorID_buf[i]]  >= Sensor_blue[SensorID_buf[i]]) {
-            LED_Alarm = 1;
-            break;
+            LED_Alarm[SensorID_buf[i]] = 1;
         }else{
-            LED_Alarm = 0;
+            LED_Alarm[SensorID_buf[i]] = 0;
         }
     }
-    if(LED_Alarm == 1){
-        HAL_GPIO_WritePin(GPIOB, GPIO_PIN_12, GPIO_PIN_SET);
-        HAL_GPIO_WritePin(GPIOA, GPIO_PIN_13, GPIO_PIN_RESET);       
-        HAL_GPIO_WritePin(GPIOC, GPIO_PIN_10, GPIO_PIN_SET);       
-    }else{
-        HAL_GPIO_WritePin(GPIOB, GPIO_PIN_12, GPIO_PIN_RESET);
-        HAL_GPIO_WritePin(GPIOA, GPIO_PIN_13, GPIO_PIN_SET);   
-        HAL_GPIO_WritePin(GPIOC, GPIO_PIN_10, GPIO_PIN_RESET);       
-    }
+    RGB_Data_Stack(&LED_Alarm[1]);
 }
 
 uint8_t RGB_DeviceStatusCheck(void){
@@ -92,6 +178,7 @@ uint8_t RGB_DeviceStatusCheck(void){
 }
 uint8_t Lora_Buf[100] = {0,};
 
+#if 0 // PYJ.2019.04.14_BEGIN --  //Uart Value Data 
 void RGB_Data_Stack(uint8_t* rgb_buf){
     uint8_t mynumcnt = RGB_BufCal(rgb_buf[bluecell_srcid]);
     Lora_Buf[bluecell_stx]         = 0xbe;
@@ -122,6 +209,54 @@ uint8_t RGB_BufCal(uint8_t srcid){
     }
     return ret;
 }
+#else //Uart Flag Data
+/*
+    현재 Controller 가지고 있는 RGB Sensor ID Check
+    현재 비정상적인 동작을 하는 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가 존재 하지않을 때 
+        printf("Not Exist Device \n");
+        return;
+    }
+    for(uint8_t i = 1; i <= (SensorID_Cnt); i++){
+        Lora_Buf[bluecell_srcid + 1] |= 0x01  << (SensorID_buf[i] - 1);
+    }
+    for(uint8_t i = 0; i < 8; i++){
+        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를 쌓을 때 
+    ID 마다 Location Cnt 
+*/
+uint8_t RGB_BufCal(uint8_t srcid){
+    uint8_t ret = 0;
+    switch(srcid){
+        case 1:ret = 4;break;
+        case 2:ret = 7;break;
+        case 3:ret = 10;break;
+        case 4:ret = 13;break;
+        case 5:ret = 16;break;
+        case 6:ret = 29;break;
+        case 7:ret = 32;break;
+        case 8:ret = 35;break;      
+    }
+    return ret;
+}
+
+#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];
@@ -153,12 +288,12 @@ void RGB_Controller_Func(uint8_t* data){
             break;
         case RGB_Status_Data_Response:
             datalosscnt[data[bluecell_srcid]] = 0;
-            RGB_Data_Stack(&data[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]);
             RGB_Alarm_Check(&data[bluecell_stx]);
+           
             break;
         case RGB_ControllerLimitSet:
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);

Src/SX1276.c

@@ -9,8 +9,6 @@
 #include "SX1276.h"
 #include <string.h>
 
-//#include "gpio.h"
-//#include "spi.h"
 
 //////////////////////////////////
 // logic
@@ -132,9 +130,12 @@ void SX1276_SPIBurstWrite(SX1276_t * module, uint8_t addr, uint8_t* txBuf,
 	} else {
 		SX1276_hw_SetNSS(module->hw, 0);
 		SX1276_hw_SPICommand(module->hw, addr | 0x80);
+//        printf("Test Data:");
 		for (i = 0; i < length; i++) {
 			SX1276_hw_SPICommand(module->hw, txBuf[i]);
+//            printf("%02x ",txBuf[i]);
 		}
+//        printf("\n");
 		SX1276_hw_SetNSS(module->hw, 1);
 	}
 }

Src/main.c

@@ -485,6 +485,7 @@ void Flash_InitRead(void) // 쓰기함수
 
 
 #endif // PYJ.2019.03.19_END -- 
+
 SX1276_hw_t SX1276_hw;
 SX1276_t SX1276;
 
@@ -493,8 +494,8 @@ int ret;
 
 char buffer[100];
 
-int message;
 int message_length;
+int message;
 
 /* USER CODE END 0 */
 
@@ -570,24 +571,76 @@ int main(void)
    SX1276_begin(&SX1276, SX1276_917MHZ, SX1276_POWER_17DBM, SX1276_LORA_SF_8,
            SX1276_LORA_BW_20_8KHZ, 10);
    printf("Done configuring LoRaModule\r\n");
+   master = 0;
    if (master == 1) {
-       ret = SX1276_LoRaEntryTx(&SX1276, 65, 2000);
+       ret = SX1276_LoRaEntryTx(&SX1276, LORA_MAX_DATA_CNT, 2000);
    } else {
-       ret = SX1276_LoRaEntryRx(&SX1276, 65, 2000);
+       ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
    }
    
 
   while (1)
   {
 #if 1 // PYJ.2019.04.11_BEGIN -- 
+    RGB_Alarm_Operate();//LED ALARM CHECK
+
+#if 1 // PYJ.2019.04.14_BEGIN -- 
     if(LoraDataSendGet() == 1){
         LoraDataSendSet(0);
-        memcpy(,&Lora_Buf[0]);
-        message_length = Lora_Max_Amount + 2 + 3;////length 1byte + type 1byte + RGB Data 60byte + stx + etx + crc
+        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, (uint8_t *) buffer, 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");
+    }else {
+            HAL_Delay(1);
+           ret = SX1276_LoRaRxPacket(&SX1276);
+           if (ret > 0) {
+               SX1276_read(&SX1276, &buffer[0], ret);
+               printf("Received Data : ");
+               for(uint8_t i = 0; i < ret; i++)
+               printf("%02x ",  buffer[i]);
+               printf("\n");
+           }
+       
+       }
+#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){
@@ -638,7 +691,7 @@ int main(void)
                     SensorID = 0;
                 }else{
                     RGB_Sensor_PowerOnOff(IDAutoSetRequest_data[4]);
-                    HAL_Delay(1500);
+                    HAL_Delay(500);
                     RGB_Controller_Func(&IDAutoSetRequest_data[bluecell_stx]);
                     HAL_Delay(500);
                 }