sx1276 tyepdef enum 추가

Debug/STM32F103_RGB_Controller.list

@@ -4697,9 +4697,9 @@ void RGB_Response_Func(uint8_t* data){
             Uart1_Data_Send(data,data[bluecell_length] + 3);
             M24C32_Data_Write(&hi2c2,&data[bluecell_red_H],RGB_Limit_Address_Check(data[bluecell_dstid]),6); // EEPROM Controller ID Save 
  8005e04:	4835      	ldr	r0, [pc, #212]	; (8005edc <RGB_Response_Func+0x10c>)
+             else
                  return;
              break;
-         
          default:break;
     }
 }
@@ -5042,7 +5042,7 @@ void RGB_Alarm_Operate(void){
             RGB_Sensor_LED_Alarm_OFF(SensorID_buf[i]);
         }
     }
-    if(temp_warning == 0){ // 8개의 Sensor가 전부 정상일 때 만 동작
+    if(temp_warning == 0){          // 8개의 Sensor가 전부 정상일 때 만 동작
  800606a:	bb05      	cbnz	r5, 80060ae <RGB_Alarm_Operate+0x5e>
         HAL_GPIO_WritePin(LED_ALARM_GPIO_Port, LED_ALARM_Pin, GPIO_PIN_RESET); //표지 LED
  800606c:	462a      	mov	r2, r5
@@ -5086,7 +5086,7 @@ void RGB_Alarm_Operate(void){
  80060c0:	2000008c 	.word	0x2000008c
 
 080060c4 <RGB_DeviceStatusCheck>:
-//         LoraDataSendSet(1);
+//         LoraDataSendSet(LoraTx_mode);
          Prev_Alarm_occur = Alarm_occur;
     }
 }

Debug/Src/RGB_Controller.su

@@ -2,12 +2,12 @@ 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	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
+RGB_Controller.c:143:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:181:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:220:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:263:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:336:9:RGB_BufCal	0	static
+RGB_Controller.c:310:6:RGB_Data_Stack	24	static
+RGB_Controller.c:236:6:RGB_Alarm_Check	48	static
+RGB_Controller.c:350:9:RGB_LimitData_Get	0	static
+RGB_Controller.c:363:6:RGB_Controller_Func	120	static

Inc/SX1276.h

@@ -170,11 +170,59 @@
 /**********************************************************
  **Parameter table define
  **********************************************************/
-#define SX1276_917MHZ			0
+typedef enum{
+     SX1276_917MHZ			=0,
+     SX1276_917_5MHZ		,	
+     SX1276_918MHZ			,
+     SX1276_918_5MHZ		,	
+     SX1276_919MHZ			,
+     SX1276_919_5MHZ		,	
+     SX1276_920MHZ			,
+     SX1276_920_5MHZ		,	
+     SX1276_921MHZ			,
+     SX1276_921_5MHZ		,	
+     SX1276_922MHZ			,
+     SX1276_922_5MHZ		,
+     SX1276_923MHZ			,
+     SX1276_923_5MHZ		,	
+};
 
-static const uint8_t SX1276_Frequency[1][3] = { { 0xE5, 0x40, 0x26 }, //916.9MHz
-		};/*°ø½Ä  :  61.035 * 0xE5 40 26    = 916.9Mhz
-                            (ÀÌ°ªÀÌ º¯¼ö)  */
+
+
+
+/*
+    917.000000 : e5 40 26
+    917.500000 : e5 60 26
+    918.000000 : e5 80 26
+    918.500000 : e5 a0 26
+    919.000000 : e5 c0 26
+    919.500000 : e5 e0 26
+    920.000000 : e6 00 26
+    920.500000 : e6 20 26
+    921.000000 : e6 40 26
+    921.500000 : e6 60 26
+    922.000000 : e6 80 26
+    922.500000 : e6 a0 26
+    923.000000 : e6 c0 26
+    923.500000 : e6 e0 26
+*/
+static const uint8_t SX1276_Frequency[14][3] = { 
+    { 0xE5, 0x40, 0x26 }, //About 917
+    { 0xE5, 0x60, 0x26 }, //917.5
+    { 0xE5, 0x80, 0x26 }, //918
+    { 0xE5, 0xa0, 0x26 }, //918.5
+    { 0xE5, 0xc0, 0x26 }, //919
+    { 0xE5, 0xe0, 0x26 }, //919.5
+    { 0xE6, 0x00, 0x26 }, //920
+    { 0xE6, 0x20, 0x26 }, //920.5
+    { 0xE6, 0x40, 0x26 }, //921
+    { 0xE6, 0x60, 0x26 }, //921.5
+    { 0xE6, 0x80, 0x26 }, //922
+    { 0xE6, 0xa0, 0x26 }, //922.5
+    { 0xE6, 0xc0, 0x26 }, //923
+    { 0xE6, 0xe0, 0x26 }, //923.5    
+};/*°ø½Ä  :  61.035 * 0xE5 40 26    = 916.9Mhz// ê³µì‹�  = ì›�하는 주파수 /61.035(recommad Freq/61.035)
+(ÀÌ°ªÀÌ º¯¼ö)  */
 #define SX1276_POWER_20DBM		0
 #define SX1276_POWER_17DBM		1
 #define SX1276_POWER_14DBM		2
@@ -186,27 +234,31 @@ static const uint8_t SX1276_Power[4] = { 0xFF, //20dbm
 		0xF6, //11dbm
 		};
 
-#define SX1276_LORA_SF_6		0
-#define SX1276_LORA_SF_7		1
-#define SX1276_LORA_SF_8		2
-#define SX1276_LORA_SF_9		3
-#define SX1276_LORA_SF_10		4
-#define SX1276_LORA_SF_11		5
-#define SX1276_LORA_SF_12		6
 
+typedef enum{
+ SX1276_LORA_SF_6		=0,
+ SX1276_LORA_SF_7		=1,
+ SX1276_LORA_SF_8		=2,
+ SX1276_LORA_SF_9		=3,
+ SX1276_LORA_SF_10		=4,
+ SX1276_LORA_SF_11		=5,
+ SX1276_LORA_SF_12		=6,
+};
 static const uint8_t SX1276_SpreadFactor[7] = { 6, 7, 8, 9, 10, 11, 12 };
 
-#define	SX1276_LORA_BW_7_8KHZ		0
-#define	SX1276_LORA_BW_10_4KHZ		1
-#define	SX1276_LORA_BW_15_6KHZ		2
-#define	SX1276_LORA_BW_20_8KHZ		3
-#define	SX1276_LORA_BW_31_2KHZ		4
-#define	SX1276_LORA_BW_41_7KHZ		5
-#define	SX1276_LORA_BW_62_5KHZ		6
-#define	SX1276_LORA_BW_125KHZ		7
-#define	SX1276_LORA_BW_250KHZ		8
-#define	SX1276_LORA_BW_500KHZ		9
 
+typedef enum{
+	SX1276_LORA_BW_7_8KHZ		= 0,
+	SX1276_LORA_BW_10_4KHZ		,
+	SX1276_LORA_BW_15_6KHZ		,
+	SX1276_LORA_BW_20_8KHZ		,
+	SX1276_LORA_BW_31_2KHZ		,
+	SX1276_LORA_BW_41_7KHZ		,
+	SX1276_LORA_BW_62_5KHZ		,
+	SX1276_LORA_BW_125KHZ		,
+	SX1276_LORA_BW_250KHZ		,
+	SX1276_LORA_BW_500KHZ		,
+};
 static const uint8_t SX1276_LoRaBandwidth[10] = { 0, //   7.8KHz,
 		1, //  10.4KHz,
 		2, //  15.6KHz,

Inc/main.h

@@ -134,10 +134,11 @@ 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_Lora_Init_Request,          //19
+    RGB_Lora_Init_Response,         //20
+    RGB_Lora_DataRequest,           //21
+    RGB_Lora_DataResponse,          //22
+    RGB_Lora_ConfigSet,             //23
 }RGB_CMD_T;
 typedef struct{
     uint8_t Request_stx;
@@ -227,8 +228,20 @@ typedef struct{
 #define RGB6_LOCATION_ADDRESS        RGB5_LOCATION_ADDRESS + 50
 #define RGB7_LOCATION_ADDRESS        RGB6_LOCATION_ADDRESS + 50
 #define RGB8_LOCATION_ADDRESS        RGB7_LOCATION_ADDRESS + 50
-/*reserved*/
-#define RESERVED_ADDRESS             RGB8_LOCATION_ADDRESS + 50
+/* Lora */
+#define RGB_LORA_FREQ_ADDRESS        RGB8_LOCATION_ADDRESS      + 50
+#define RGB_LORA_PABOOST_ADDRESS     RGB_LORA_FREQ_ADDRESS      + 1
+#define RGB_LORA_BANDWIDTH_ADDRESS   RGB_LORA_PABOOST_ADDRESS   + 1
+#define RGB_LORA_LNA_ADDRESS         RGB_LORA_BANDWIDTH_ADDRESS + 1
+#define RGB_LORA_SF_ADDRESS          RGB_LORA_SF_ADDRESS        + 1
+
+#define Reserved_ADDRESS             RGB_LORA_SF_ADDRESS        + 1
+
+
+
+
+
+
 
 
 

Src/RGB_Controller.c

@@ -135,7 +135,6 @@ for(uint8_t i = 0; i < 10; i++){
              else
                  return;
              break;
-         
          default:break;
     }
 }
@@ -228,7 +227,7 @@ void RGB_Alarm_Operate(void){
             RGB_Sensor_LED_Alarm_OFF(SensorID_buf[i]);
         }
     }
-    if(temp_warning == 0){ // 8개의 Sensor가 전부 정상일 때 만 동작
+    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 가 켜지지 않는다.
     }
@@ -255,7 +254,7 @@ void RGB_Alarm_Check(uint8_t* data){
     }
     RGB_Data_Stack(&LED_Alarm[1]);
     if(Prev_Alarm_occur != Alarm_occur){
-//         LoraDataSendSet(1);
+//         LoraDataSendSet(LoraTx_mode);//경고 발생 시 바로 Data 전송 하는 Option
          Prev_Alarm_occur = Alarm_occur;
     }
 }

Src/main.c

@@ -655,7 +655,7 @@ int main(void)
     }
     RGB_Alarm_Operate();//LED ALARM CHECK
     if(LoraDataSendGet() == LoraTx_mode){
-//        LoraDataSendSet(0);
+//        LoraDataSendSet(LoraRx_mode);
         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);
@@ -664,7 +664,7 @@ int main(void)
 //        for(uint8_t i = 0; i < sizeof(LoraDataRequest_t); i++)
 //            printf("%02x ",buffer[i]);
 //        printf("\n");
-        LoraDataSendSet(0);
+        LoraDataSendSet(LoraRx_mode);
         ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
     }else{
            ret = SX1276_LoRaRxPacket(&SX1276);