PA 부스터 프로토콜 추가

Lora Init 함수 추가
상태 요청 받으면 Data 발신 하도록 수정
최초 Power on 시 나오는 printf 문 제거
최초 Power on 시 GUI Data 요청 못하도록 수정

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="252364546433938101" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="157605811251204298" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

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	32	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
+RGB_Controller.c:59:10:RGB_Limit_Address_Check	0	static
+RGB_Controller.c:73:10:RGB_Location_Address_Check	0	static
+RGB_Controller.c:23:6:RGB_Data_Init	48	static
+RGB_Controller.c:88:6:RGB_Response_Func	32	static
+RGB_Controller.c:170:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:208:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:247:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:290:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:363:9:RGB_BufCal	0	static
+RGB_Controller.c:337:6:RGB_Data_Stack	24	static
+RGB_Controller.c:263:6:RGB_Alarm_Check	48	static
+RGB_Controller.c:377:9:RGB_LimitData_Get	0	static
+RGB_Controller.c:391:6:RGB_Controller_Func	120	static

Debug/Src/SX1276.su

@@ -11,20 +11,21 @@ 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:200:6:SX1276_standby	8	static
-SX1276.c:205:6:SX1276_sleep	8	static
-SX1276.c:210:6:SX1276_entryLoRa	0	static
-SX1276.c:147:6:SX1276_config	32	static
-SX1276.c:142:6:SX1276_defaultConfig	24	static
-SX1276.c:214:6:SX1276_clearLoRaIrq	0	static
-SX1276.c:218:5:SX1276_LoRaEntryRx	16	static
-SX1276.c:250:9:SX1276_LoRaRxPacket	16	static
-SX1276.c:273:5:SX1276_LoRaEntryTx	16	static
-SX1276.c:304:5:SX1276_LoRaTxPacket	16	static
-SX1276.c:325:6:SX1276_begin	32	static
-SX1276.c:337:5:SX1276_transmit	24	static
-SX1276.c:345:5:SX1276_receive	0	static
-SX1276.c:349:9:SX1276_available	0	static
-SX1276.c:353:9:SX1276_read	16	static
-SX1276.c:362:9:SX1276_RSSI_LoRa	8	static
-SX1276.c:369:9:SX1276_RSSI	8	static
+SX1276.c:215:6:SX1276_set_power	0	static
+SX1276.c:281:6:SX1276_standby	8	static
+SX1276.c:286:6:SX1276_sleep	8	static
+SX1276.c:291:6:SX1276_entryLoRa	0	static
+SX1276.c:226:6:SX1276_config	32	static
+SX1276.c:221:6:SX1276_defaultConfig	32	static
+SX1276.c:295:6:SX1276_clearLoRaIrq	0	static
+SX1276.c:299:5:SX1276_LoRaEntryRx	16	static
+SX1276.c:331:9:SX1276_LoRaRxPacket	16	static
+SX1276.c:357:5:SX1276_LoRaEntryTx	16	static
+SX1276.c:388:5:SX1276_LoRaTxPacket	16	static
+SX1276.c:409:6:SX1276_begin	40	static
+SX1276.c:422:5:SX1276_transmit	24	static
+SX1276.c:430:5:SX1276_receive	0	static
+SX1276.c:434:9:SX1276_available	0	static
+SX1276.c:438:9:SX1276_read	16	static
+SX1276.c:447:9:SX1276_RSSI_LoRa	8	static
+SX1276.c:454:9:SX1276_RSSI	8	static

Debug/Src/main.su

@@ -1,20 +1,21 @@
-main.c:139:6:HAL_UART_RxCpltCallback	4	static
-main.c:184:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:194:6:LoraDataSendSet	0	static
-main.c:197:9:LoraDataSendGet	0	static
-main.c:201:6:UartDataRecvSet	0	static
-main.c:204:9:UartDataRecvGet	0	static
-main.c:207:6:RGB_SensorIDAutoSet	0	static
-main.c:210:9:RGB_SensorIDAutoGet	0	static
-main.c:214:6:Uart2_Data_Send	0	static
-main.c:217:6:Uart1_Data_Send	0	static
-main.c:221:5:_write	8	static
-main.c:257:6:Uart_dataCheck	24	static
-main.c:289:6:RGB_Sensor_PowerOnOff	8	static
-main.c:443:6:test_read	24	static
-main.c:462:6:Flash_RGB_Data_Write	16	static
-main.c:475:6:Flash_write	24	static
-main.c:528:6:Flash_InitRead	12	static
-main.c:766:6:SystemClock_Config	72	static
-main.c:567:5:main	312	static
-main.c:1053:6:Error_Handler	0	static
+main.c:144:6:HAL_UART_RxCpltCallback	4	static
+main.c:189:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:199:6:LoraDataSendSet	0	static
+main.c:202:9:LoraDataSendGet	0	static
+main.c:206:6:UartDataRecvSet	0	static
+main.c:209:9:UartDataRecvGet	0	static
+main.c:212:6:RGB_SensorIDAutoSet	0	static
+main.c:215:9:RGB_SensorIDAutoGet	0	static
+main.c:219:6:Uart2_Data_Send	0	static
+main.c:222:6:Uart1_Data_Send	0	static
+main.c:226:5:_write	8	static
+main.c:262:6:Uart_dataCheck	24	static
+main.c:294:6:RGB_Sensor_PowerOnOff	40	static
+main.c:452:6:test_read	24	static
+main.c:471:6:Flash_RGB_Data_Write	16	static
+main.c:484:6:Flash_write	24	static
+main.c:537:6:Flash_InitRead	12	static
+main.c:581:6:Lora_Initialize	32	static
+main.c:761:6:SystemClock_Config	72	static
+main.c:613:5:main	304	static
+main.c:1048:6:Error_Handler	0	static

Inc/RGB_Controller.h

@@ -1,3 +1,6 @@
+#ifndef __RGB_CONTROLLER_H
+#define __RGB_CONTROLLER_H
+
 #include "main.h"
 
 
@@ -18,3 +21,7 @@ uint16_t RGB_SensorBlueLimit_Buf[9];
 
 extern uint8_t Lora_Buf[100];
 
+
+
+#endif
+

Inc/SX1276.h

@@ -228,13 +228,30 @@ static const uint8_t SX1276_Frequency[14][3] = {
 #define SX1276_POWER_14DBM		2
 #define SX1276_POWER_11DBM		3
 
-static const uint8_t SX1276_Power[4] = { 0xFF, //20dbm
-		0xFC, //17dbm
-		0xF9, //14dbm
-		0xF6, //11dbm
-		};
-
-
+static const uint8_t SX1276_Power[4] = { 
+    0xFF, //20dbm
+    0xFC, //17dbm
+    0xF9, //14dbm
+    0xF6, //11dbm
+};
+typedef enum{
+    SX1276_0dBm = 0,
+    SX1276_1dBm,
+    SX1276_2dBm,
+    SX1276_3dBm,
+    SX1276_4dBm,
+    SX1276_5dBm,
+    SX1276_6dBm,
+    SX1276_7dBm,
+    SX1276_8dBm,
+    SX1276_9dBm,
+    SX1276_10dBm,
+    SX1276_11dBm,
+    SX1276_12dBm,
+    SX1276_13dBm,
+    SX1276_14dBm,    
+    SX1276_15dBm,        
+}SX1276_dBm_t;
 typedef enum{
  SX1276_LORA_SF_6		=0,
  SX1276_LORA_SF_7		=1,
@@ -303,10 +320,9 @@ typedef struct {
 	uint8_t LoRa_Rate;
 	uint8_t LoRa_BW;
 	uint8_t LoRa_Lna;    
+	uint8_t LoRa_Pa_boost;        
 	uint8_t packetLength;
-
 	SX1276_Status_t status;
-
 	uint8_t rxBuffer[SX1276_MAX_PACKET];
 	uint8_t readBytes;
 } SX1276_t;
@@ -315,8 +331,8 @@ typedef struct {
 	uint8_t power;
 	uint8_t LoRa_Rate;
 	uint8_t LoRa_BW;
-	uint8_t LoRa_Lna;    
-	uint8_t packetLength;
+	uint8_t LoRa_Lna; 
+    uint8_t LoRa_Pa_boost;       
 } Default_SX1276_t;
 
 
@@ -340,7 +356,7 @@ void SX1276_SPIBurstWrite(SX1276_t * module, uint8_t addr, uint8_t *txBuf,
 void SX1276_DIO0_InterruptHandler(SX1276_t * module);
 
 void SX1276_config(SX1276_t * module, uint8_t frequency, uint8_t power,
-		uint8_t LoRa_Rate, uint8_t LoRa_BW,uint8_t LoRa_Lna);
+		uint8_t LoRa_Rate, uint8_t LoRa_BW,uint8_t LoRa_Lna,uint8_t LoRa_PaBoost);
 void SX1276_defaultConfig(SX1276_t * module);
 
 void SX1276_entryLoRa(SX1276_t * module);
@@ -355,7 +371,7 @@ int SX1276_LoRaTxPacket(SX1276_t * module, uint8_t *txBuf, uint8_t length,
 		uint32_t timeout);
 
 void SX1276_begin(SX1276_t * module, uint8_t frequency, uint8_t power,
-		uint8_t LoRa_Rate, uint8_t LoRa_BW, uint8_t packetLength,uint8_t LoRa_Lna);
+        uint8_t LoRa_Rate, uint8_t LoRa_BW, uint8_t packetLength,uint8_t LoRa_Lna,uint8_t LoRa_PaBoost);
 
 int SX1276_transmit(SX1276_t * module, uint8_t *txBuf, uint8_t length,
 		uint32_t timeout);

Inc/main.h

@@ -52,12 +52,12 @@ extern "C" {
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-#include "sth30_crc.h"
-#include <string.h>
-#include "RGB_Controller.h"
-#include "core_cm3.h"
 #include <stdint.h>
+#include <string.h>
+
+#include "sth30_crc.h"
 #include "SX1276.h"
+#include "RGB_Controller.h"
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
@@ -102,6 +102,7 @@ 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);
+extern void Lora_Initialize(void);
 
 /* USER CODE END EM */
 
@@ -114,7 +115,8 @@ extern uint8_t MyControllerID;
 extern uint8_t  SensorID;
 extern uint8_t Lora_Buf[100];
 extern I2C_HandleTypeDef hi2c2;
-extern Default_SX1276_t Default_SX1276;
+
+
 
 typedef enum{
     RGB_Status_Data_Request = 0x01,
@@ -140,7 +142,9 @@ typedef enum{
     RGB_Lora_DataRequest,           //21
     RGB_Lora_DataResponse,          //22
     RGB_Lora_ConfigSet,             //23
-    RGB_Lora_ConfigGet,             //24    
+    RGB_Lora_ConfigGet,             //24
+    RGB_Controller_Init_Start        ,  // = 25;
+    RGB_Controller_Init_End           ,   //= 26;    
 }RGB_CMD_T;
 typedef struct{
     uint8_t Request_stx;
@@ -233,11 +237,11 @@ typedef struct{
 /* 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_SF_ADDRESS          RGB_LORA_PABOOST_ADDRESS   + 1
+#define RGB_LORA_BANDWIDTH_ADDRESS   RGB_LORA_SF_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
+#define Reserved_ADDRESS             RGB_LORA_LNA_ADDRESS       + 1
 
 
 

Src/RGB_Controller.c

@@ -1,4 +1,9 @@
+
+
 #include "RGB_Controller.h"
+extern Default_SX1276_t Default_SX1276;
+extern SX1276_t SX1276;
+extern SX1276_hw_t SX1276_hw;
 
 void RGB_Response_Func(uint8_t* data);
 uint8_t RGB_BufCal(uint8_t srcid);
@@ -14,6 +19,7 @@ uint16_t RGB_SensorBlueLimit_Buf[9]={0,};
 uint8_t LED_Alarm[9] = {0,};
 uint8_t RGB_Location_Buf[9][50] = {0};
 
+
 void RGB_Data_Init(void){
     MyControllerID = M24C32_Data_Read(&hi2c2,MY_ID_ADDRESS);
   
@@ -39,11 +45,15 @@ void RGB_Data_Init(void){
         printf("RGB_SensorGreenLimit_Buf[%d]  :  %04x\n",i,RGB_SensorGreenLimit_Buf[i]);
         printf("RGB_SensorBlueLimit_Buf[%d]   :  %04x\n",i,RGB_SensorBlueLimit_Buf[i]);    
     }
-        Default_SX1276.frequency = 
-    Default_SX1276.power     = 
-    Default_SX1276.LoRa_Rate = 
-    Default_SX1276.LoRa_BW   = 
-    Default_SX1276.LoRa_Lna  = 
+    if(M24C32_Data_Read(&hi2c2,RGB_LORA_FREQ_ADDRESS) == 0xFF){
+        /*NOP*/
+    }else{
+        Default_SX1276.frequency = M24C32_Data_Read(&hi2c2,RGB_LORA_FREQ_ADDRESS);
+        Default_SX1276.power     = M24C32_Data_Read(&hi2c2,RGB_LORA_PABOOST_ADDRESS);
+        Default_SX1276.LoRa_Rate = M24C32_Data_Read(&hi2c2,RGB_LORA_SF_ADDRESS);
+        Default_SX1276.LoRa_BW   = M24C32_Data_Read(&hi2c2,RGB_LORA_BANDWIDTH_ADDRESS);
+        Default_SX1276.LoRa_Lna  = M24C32_Data_Read(&hi2c2,RGB_LORA_LNA_ADDRESS);
+    }
 
 }
 uint16_t RGB_Limit_Address_Check(uint8_t id){
@@ -141,10 +151,16 @@ for(uint8_t i = 0; i < 10; i++){
                  return;
              break;
         case RGB_Lora_ConfigSet:
+            data[bluecell_type] = RGB_Lora_ConfigGet;
+            Default_SX1276.frequency     = data[3];
+            Default_SX1276.LoRa_Pa_boost = data[4];
+            Default_SX1276.LoRa_Rate     = data[5];
+            Default_SX1276.LoRa_BW       = data[6];    
+            Default_SX1276.LoRa_Lna      = data[7];        
+            Lora_Initialize();
             M24C32_Data_Write(&hi2c2,&data[bluecell_srcid],RGB_LORA_FREQ_ADDRESS,data[bluecell_length] - 2); // EEPROM Controller ID Save 
-            break;
         case RGB_Lora_ConfigGet:
-
+            Uart1_Data_Send(data,data[bluecell_length] + 3);
             break;             
          default:break;
     }
@@ -370,14 +386,18 @@ uint8_t RGB_LimitData_Get(uint8_t id){
 uint8_t datalosscnt[9] = {0,};
 
 
+static uint8_t temp_sensorid;
 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:           
+        case RGB_Status_Data_Request:          
+            data[bluecell_srcid + 1] = SensorID_buf[temp_sensorid++];
+            if(temp_sensorid > (SensorID_Cnt)){
+                temp_sensorid = 0;
+            }    
             datalosscnt[data[bluecell_srcid + 1]]++;
             if(datalosscnt[data[bluecell_srcid + 1]] > 3 && data[bluecell_srcid + 1] != 0){
                 RGB_SensorIDAutoSet(1);
@@ -396,6 +416,7 @@ void RGB_Controller_Func(uint8_t* data){
             Result_buf[5]  = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
             break;
         case RGB_SensorID_SET_Success:
+            printf("Recognize %d Sensor\n",data[bluecell_length + 1]);
             SensorID_Cnt++;
             SensorID_buf[SensorID_Cnt] = data[bluecell_length + 1];
             break;
@@ -455,10 +476,21 @@ void RGB_Controller_Func(uint8_t* data){
             Result_buf[bluecell_type] = RGB_Lora_DataResponse;
             break;
         case RGB_Lora_ConfigSet:
+            SX1276_hw_Reset(&SX1276_hw);
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
+            data[(data[bluecell_length] + 3)]=STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
             break;
         case RGB_Lora_ConfigGet:
-
+            Result_buf[bluecell_stx]         = 0xbe;
+            Result_buf[bluecell_type]        = RGB_ControllerLimitGet;
+            Result_buf[bluecell_length]      = 7;
+            Result_buf[bluecell_srcid + 0]   = SX1276.frequency;
+            Result_buf[bluecell_srcid + 1]   = SX1276.LoRa_Pa_boost;            
+            Result_buf[bluecell_srcid + 2]   = SX1276.LoRa_BW;
+            Result_buf[bluecell_srcid + 3]   = SX1276.LoRa_Rate;
+            Result_buf[bluecell_srcid + 4]   = SX1276.LoRa_Lna;
+            Result_buf[bluecell_srcid + 5]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
+            Result_buf[bluecell_srcid + 6]   = 0xeb;
             break;
         default:
             break;

Src/SX1276.c

@@ -138,14 +138,93 @@ void SX1276_SPIBurstWrite(SX1276_t * module, uint8_t addr, uint8_t* txBuf,
 //        printf("\n");
 		SX1276_hw_SetNSS(module->hw, 1);
 	}
+}
+        /*
+  RegPaConfig - 0x09
+  PaSelect    Mode                                  Power Range     Pout Formula
+  0           PA_HF or PA_LF on RFO_HF or RFO_LF    -4 to +15dBm    Pout=Pmax-(15-OutputPower), Pmax=10.8+0.6*MaxPower [dBm]
+  1           PA_HP on PA_BOOST, any frequency      +2 to +17dBm    Pout=17-(15-OutputPower) [dBm]
+  PA_LF option doesn't seem to transmit anything. Not connected on these boards, perhaps?
+  Use only PA_BOOST mode.
+  
+  PA_LF   Pmax              
+  Pout    0     1     2     3     4     5     6     7
+  0       -4.2  -3.6  -3    -2.4  -1.8  -1.2  -0.6  0
+  1       -3.2  -2.6  -2    -1.4  -0.8  -0.2  0.4   1
+  2       -2.2  -1.6  -1    -0.4  0.2   0.8   1.4   2
+  3       -1.2  -0.6  0     0.6   1.2   1.8   2.4   3
+  4       -0.2  0.4   1     1.6   2.2   2.8   3.4   4
+  5       0.8   1.4   2     2.6   3.2   3.8   4.4   5
+  6       1.8   2.4   3     3.6   4.2   4.8   5.4   6
+  7       2.8   3.4   4     4.6   5.2   5.8   6.4   7
+  8       3.8   4.4   5     5.6   6.2   6.8   7.4   8
+  9       4.8   5.4   6     6.6   7.2   7.8   8.4   9
+  10      5.8   6.4   7     7.6   8.2   8.8   9.4   10
+  11      6.8   7.4   8     8.6   9.2   9.8   10.4  11
+  12      7.8   8.4   9     9.6   10.2  10.8  11.4  12
+  13      8.8   9.4   10    10.6  11.2  11.8  12.4  13
+  14      9.8   10.4  11    11.6  12.2  12.8  13.4  14
+  15      10.8  11.4  12    12.6  13.2  13.8  14.4  15  [dBm]
+  
+  PA_BOOST 
+  Pout  OutputPower
+  0     2 dBm
+  1     3 dBm
+  2     4 dBm
+  3     5 dBm
+  4     6 dBm
+  5     7 dBm
+  6     8 dBm
+  7     9 dBm
+  8     10 dBm
+  9     11 dBm
+  10    12 dBm
+  11    13 dBm
+  12    14 dBm
+  13    15 dBm
+  14    16 dBm
+  15    17 dBm
+  
+  PaSelect
+    0 RFO pin. Maximum power of +14 dBm 
+    1 PA_BOOST pin. Maximum power of +20 dBm
+  MaxPower
+    Select max output power: Pmax=10.8+0.6*MaxPower [dBm]
+  OutputPower
+    Pout=Pmax-(15-OutputPower) if PaSelect = 0 (RFO pins) 
+    Pout=17-(15-OutputPower) if PaSelect = 1 (PA_BOOST pin)
+  PA_HF and PA_LF are high efficiency amplifiers capable of yielding RF power programmable in 1 dB steps
+  from -4 to +14dBm directly into a 50 ohm load with low current consumption. PA_LF covers the lower bands
+  (up to 525 MHz), whilst PA_HF will cover the upper bands (from 860 MHz).
+  PA_HP (High Power), connected to the PA_BOOST pin, covers all frequency bands that the chip addresses.
+  It permits continuous operation at up to +17 dBm and duty cycled operation at up to +20dBm.
+  RegOcp - 0x0B
+  OcpTrim   IMAX            Imax Formula
+  0 to 15   45 to 120 mA    45 + 5*OcpTrim [mA]
+  16 to 27  130 to 240 mA   -30 + 10*OcpTrim [mA]
+  27+       240 mA          240 mA
+  
+  The power amplifiers of RFM95/96/97/98(W) are protected against current over supply in adverse RF load
+  conditions by the over current protection block. The current limiter value is controlled by the OcpTrim 
+  bits in RegOcp.
+  Imax sets a limit on the current drain of the Power Amplifier only, hence the maximum current drain of the 
+  RFM96/77/78 is equal to Imax + IFS.
+  Default 100mA changed to 240mA.
+*/
+
+void SX1276_set_power(SX1276_t * module)
+{
+//    SX1276_SPIWrite(LR_RegPaConfig, (PaSelect << 7) | ((MaxPower & 0x07) << 4) | (OutputPower & 0x0F));
+    SX1276_SPIWrite(module,LR_RegPaConfig, (module->LoRa_Pa_boost << 7) | ((0x07) << 4) | (module->power & 0x0F));
+    //RFO -> 0 ~ 15 / PA_BOOST -> 2 ~ 17
 }
 void SX1276_defaultConfig(SX1276_t * module) {
 	SX1276_config(module, module->frequency, module->power, module->LoRa_Rate,
-			module->LoRa_BW,module->LoRa_Lna);
+			module->LoRa_BW,module->LoRa_Lna,module->LoRa_Pa_boost);
 }
 
 void SX1276_config(SX1276_t * module, uint8_t frequency, uint8_t power,
-		uint8_t LoRa_Rate, uint8_t LoRa_BW,uint8_t LoRa_Lna) {
+		uint8_t LoRa_Rate, uint8_t LoRa_BW,uint8_t LoRa_Lna,uint8_t LoRa_PaBoost) {
 	SX1276_sleep(module); //Change modem mode Must in Sleep mode
 	SX1276_hw_DelayMs(15);
 
@@ -160,6 +239,8 @@ void SX1276_config(SX1276_t * module, uint8_t frequency, uint8_t power,
 
 	SX1276_SPIWrite(module, LR_RegOcp, 0x0B);			//RegOcp,Close Ocp
 //	SX1276_SPIWrite(module, LR_RegLna, 0x20);		//RegLNA,High & LNA Enable
+    SX1276_set_power(module);
+
     SX1276_SPIWrite(module, LR_RegLna, LoRa_Lna);       //RegLNA,High & LNA Enable
 
 	if (SX1276_SpreadFactor[LoRa_Rate] == 6) {	//SFactor=6
@@ -270,6 +351,9 @@ uint8_t SX1276_LoRaRxPacket(SX1276_t * module) {
 	return module->readBytes;
 }
 
+
+
+
 int SX1276_LoRaEntryTx(SX1276_t * module, uint8_t length, uint32_t timeout) {
 	uint8_t addr;
 	uint8_t temp;
@@ -323,7 +407,7 @@ int SX1276_LoRaTxPacket(SX1276_t * module, uint8_t* txBuffer, uint8_t length,
 }
 
 void SX1276_begin(SX1276_t * module, uint8_t frequency, uint8_t power,
-		uint8_t LoRa_Rate, uint8_t LoRa_BW, uint8_t packetLength,uint8_t LoRa_Lna) {
+		uint8_t LoRa_Rate, uint8_t LoRa_BW, uint8_t packetLength,uint8_t LoRa_Lna,uint8_t LoRa_PaBoost) {
 	SX1276_hw_init(module->hw);
 	module->frequency       = frequency;
 	module->power           = power;
@@ -331,6 +415,7 @@ void SX1276_begin(SX1276_t * module, uint8_t frequency, uint8_t power,
 	module->LoRa_BW         = LoRa_BW;
 	module->packetLength    = packetLength;
     module->LoRa_Lna        = LoRa_Lna;
+    module->LoRa_Pa_boost   = LoRa_PaBoost;
 	SX1276_defaultConfig(module);
 }
 

Src/main.c

@@ -97,6 +97,11 @@ uint8_t buf[buf_size] = {0,};
 uint8_t buf1[buf_size] = {0,};
 uint8_t buf2[buf_size] = {0,};
 
+Default_SX1276_t Default_SX1276;
+SX1276_hw_t SX1276_hw;
+SX1276_t SX1276;
+
+
 
 
 uint8_t MyControllerID = 0;
@@ -259,7 +264,7 @@ void Uart_dataCheck(uint8_t* Que_Buf,uint8_t* cnt){
     etError crccheck = 0;
 #if 0
     for(uint8_t i = 0; i < (* cnt); i++){
-        printf("%02x ",buf[i]);
+        printf("%02x ",*Que_Buf[i]);
     }
         printf("\r\n");
 #endif  
@@ -287,7 +292,9 @@ void Uart_dataCheck(uint8_t* Que_Buf,uint8_t* cnt){
 
 #endif // PYJ.2019.04.19_END -- 
 void RGB_Sensor_PowerOnOff(uint8_t id){
-    printf("%d Power ON \r\n",id);
+    uint8_t SensorSerchStart_cmd[5] = {0xbe,RGB_Controller_Init_Start,2,STH30_CreateCrc(&SensorSerchStart_cmd[bluecell_type],SensorSerchStart_cmd[bluecell_length]),0xeb};
+    uint8_t SensorSerchEnd_cmd[5] = {0xbe,RGB_Controller_Init_End,2,STH30_CreateCrc(&SensorSerchEnd_cmd[bluecell_type],SensorSerchEnd_cmd[bluecell_length]),0xeb};
+//    printf("%d Power ON \r\n",id);
 
     switch(id){
         case 0:
@@ -301,6 +308,7 @@ void RGB_Sensor_PowerOnOff(uint8_t id){
             HAL_GPIO_WritePin(SENSOR_EN8_GPIO_Port,SENSOR_EN8_Pin,GPIO_PIN_SET);   
             break;
         case 1:
+            Uart1_Data_Send(&SensorSerchStart_cmd[bluecell_stx], SensorSerchStart_cmd[bluecell_length] + 3);
             HAL_GPIO_WritePin(SENSOR_EN1_GPIO_Port,SENSOR_EN1_Pin,GPIO_PIN_RESET);
             HAL_Delay(50);
             HAL_GPIO_WritePin(SENSOR_EN1_GPIO_Port,SENSOR_EN1_Pin,GPIO_PIN_SET);
@@ -383,6 +391,7 @@ void RGB_Sensor_PowerOnOff(uint8_t id){
 
             break;
         case 8:
+            Uart1_Data_Send(&SensorSerchEnd_cmd[bluecell_stx], SensorSerchEnd_cmd[bluecell_length] + 3);
             HAL_GPIO_WritePin(SENSOR_EN1_GPIO_Port,SENSOR_EN1_Pin,GPIO_PIN_SET);
             HAL_GPIO_WritePin(SENSOR_EN2_GPIO_Port,SENSOR_EN2_Pin,GPIO_PIN_SET);        
             HAL_GPIO_WritePin(SENSOR_EN3_GPIO_Port,SENSOR_EN3_Pin,GPIO_PIN_SET);   
@@ -546,8 +555,8 @@ void Flash_InitRead(void) // ?
 
 #endif // PYJ.2019.03.19_END -- 
 
-SX1276_hw_t SX1276_hw;
-SX1276_t SX1276;
+
+
 Default_SX1276_t Default_SX1276 = 
 {
     SX1276_917MHZ,
@@ -556,6 +565,7 @@ Default_SX1276_t Default_SX1276 =
     SX1276_LORA_BW_20_8KHZ,
     10,
     SX1276_LORA_G1,
+    SX1276_15dBm,
 };
 
 
@@ -568,7 +578,28 @@ int message_length;
 int message;
 
 
-
+void Lora_Initialize(void){
+
+    SX1276_hw.dio0.port = SX1276_DIO0_GPIO_Port;
+    SX1276_hw.dio0.pin = SX1276_DIO0_Pin;
+    SX1276_hw.nss.port = GPIOA;
+    SX1276_hw.nss.pin = GPIO_PIN_15;
+    SX1276_hw.reset.port = SX1276_RESET_GPIO_Port;
+    SX1276_hw.reset.pin = SX1276_RESET_Pin;
+    // SX1276_hw.spi = &hspi3;
+    SX1276.hw = &SX1276_hw;
+//    printf("Configuring LoRa module\r\n");
+    SX1276_begin(&SX1276, Default_SX1276.frequency, Default_SX1276.power,
+    Default_SX1276.LoRa_Rate,Default_SX1276.LoRa_BW, 10,Default_SX1276.LoRa_Lna,Default_SX1276.LoRa_Pa_boost);
+
+//    printf("Done configuring LoRaModule\r\n");
+    master = 0;
+    if (master == 1) {
+        ret = SX1276_LoRaEntryTx(&SX1276, LORA_MAX_DATA_CNT, 2000);
+    } else {
+        ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
+    }
+}
 
 
 
@@ -582,10 +613,12 @@ int message;
 int main(void)
 {
   /* USER CODE BEGIN 1 */
-  uint8_t StatusRequest_data[RGB_SensorDataRequest_Length] = {0xbe,RGB_Status_Data_Request,RGB_SensorDataRequest_Length - 3,MyControllerID,SensorID,STH30_CreateCrc(&StatusRequest_data[bluecell_type],StatusRequest_data[bluecell_length]),0xeb};
-  uint8_t IDAutoSetRequest_data[RGB_SensorIDAutoSetRequest_Length] = {0xbe,RGB_SensorID_SET,RGB_SensorIDAutoSetRequest_Length - 3,MyControllerID,SensorID,STH30_CreateCrc(&IDAutoSetRequest_data[bluecell_type],IDAutoSetRequest_data[bluecell_length]),0xeb};  
-  uint8_t temp_sensorid = 0;
-  uint8_t uartdatarecv= 0;
+    uint8_t SensorSerchStart_cmd[5] = {0xbe,RGB_Controller_Init_Start,2,STH30_CreateCrc(&SensorSerchStart_cmd[bluecell_type],SensorSerchStart_cmd[bluecell_length]),0xeb};
+    uint8_t StatusRequest_data[RGB_SensorDataRequest_Length]         = {0xbe,RGB_Status_Data_Request,RGB_SensorDataRequest_Length - 3,MyControllerID,SensorID,STH30_CreateCrc(&StatusRequest_data[bluecell_type],StatusRequest_data[bluecell_length]),0xeb};
+    uint8_t IDAutoSetRequest_data[RGB_SensorIDAutoSetRequest_Length] = {0xbe,RGB_SensorID_SET,RGB_SensorIDAutoSetRequest_Length - 3,MyControllerID,SensorID,STH30_CreateCrc(&IDAutoSetRequest_data[bluecell_type],IDAutoSetRequest_data[bluecell_length]),0xeb};  
+    uint8_t cnt1 = 0,cnt2=0,uartdatarecv = 0;
+    uint8_t data1[100]= {0,};
+    uint8_t data2[100]= {0,};
   /* USER CODE END 1 */
 
   /* MCU Configuration--------------------------------------------------------*/
@@ -616,59 +649,26 @@ int main(void)
   MX_NVIC_Init();
   /* USER CODE BEGIN 2 */
   HAL_TIM_Base_Start_IT(&htim6);
+  RGB_SensorIDAutoSet(1);
   HAL_UART_Receive_DMA(&huart1, rx1_data, 1);
   HAL_UART_Receive_IT(&huart2, &rx2_data[0],1);
   setbuf(stdout, NULL); // \n ?�„ ? �?�„ ?–„ë§? 
-#if 1 // PYJ.2019.03.04_BEGIN -- 
+   Uart1_Data_Send(&SensorSerchStart_cmd[bluecell_stx], SensorSerchStart_cmd[bluecell_length] + 3);
+#if 0 // PYJ.2019.03.04_BEGIN -- 
       printf("****************************************\r\n");
       printf("RGB Project\r\n");
       printf("Build at %s %s\r\n", __DATE__, __TIME__);
       printf("Copyright (c) 2019. BLUECELL\r\n");
       printf("****************************************\r\n");
 #endif // PYJ.2019.03.04_END -- 
-  RGB_SensorIDAutoSet(1);
   Flash_InitRead();
   RGB_Data_Init();
+  Lora_Initialize();
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
-  //initialize LoRa module
-   SX1276_hw.dio0.port = SX1276_DIO0_GPIO_Port;
-   SX1276_hw.dio0.pin = SX1276_DIO0_Pin;
-   SX1276_hw.nss.port = GPIOA;
-   SX1276_hw.nss.pin = GPIO_PIN_15;
-   SX1276_hw.reset.port = SX1276_RESET_GPIO_Port;
-   SX1276_hw.reset.pin = SX1276_RESET_Pin;
-  // SX1276_hw.spi = &hspi3;
-   SX1276.hw = &SX1276_hw;
-
 
-    
-   printf("Configuring LoRa module\r\n");
-   SX1276_begin(&SX1276, Default_SX1276.frequency, Default_SX1276.power, Default_SX1276.LoRa_Rate,
-           Default_SX1276.LoRa_BW, 10,Default_SX1276.LoRa_Lna);
-   printf("Done configuring LoRaModule\r\n");
-   master = 0;
-   if (master == 1) {
-       ret = SX1276_LoRaEntryTx(&SX1276, LORA_MAX_DATA_CNT, 2000);
-   } else {
-       ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
-   }
-#if 0 // PYJ.2019.04.16_BEGIN -- 
-   for(uint8_t i = 0; i < 100; i++){
-    Test_data[i] = i;
-    M24C32_Data_Write(&hi2c2,&Test_data[i],(uint16_t)i,1);
-   }
-   
-   for(uint8_t i = 0; i < 100; i++){
-    printf("%d \n",M24C32_Data_Read(&hi2c2,(uint16_t)i));
-   }
-#endif // PYJ.2019.04.16_END -- 
-     
-    uint8_t data1[100]= {0,};
-    uint8_t data2[100]= {0,};
-    uint8_t uartrecv1=0,uartrecv2=0,cnt1 = 0,cnt2=0;
   while (1)
   {
      if(LoraTxTimerCnt > LORA_TIMER_CNT){
@@ -692,12 +692,11 @@ int main(void)
            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");
-               
                Uart_dataCheck(&buffer[bluecell_stx],&ret);
+//               printf("Received Data : ");
+//               for(uint8_t i = 0; i < ret; i++)
+//               printf("%02x ",  buffer[i]);
+//               printf("\n");
            }
        }
     
@@ -705,67 +704,48 @@ int main(void)
         data1[cnt1++] = buf1[count_out1++];
         if(count_out1 >= 100){ count_out1 = 0; }
         UartTimerCnt = 0;
-//        uartrecv1 = 1;
         UartDataRecvSet(1);
     }
     if(count_in2 != count_out2){ // <------- 
          data2[cnt2++] = buf2[count_out2++];
          if(count_out2 >= 100){ count_out2 = 0; }
          UartTimerCnt = 0;
-//         uartrecv2 = 1;
          UartDataRecvSet(2);
-
     }
-#if 0 // PYJ.2019.04.19_BEGIN -- 
-    uartdatarecv = UartDataRecvGet(); 
-    if(uartdatarecv != 0){
-        if(uartdatarecv == 1){
-            Uart_dataCheck(data1,&count_in1);
-        }else if(uartdatarecv == 2){
-            Uart_dataCheck(data2,&count_in2);
-        }  
-        UartDataRecvSet(0);
-    }
-#endif // PYJ.2019.04.19_END -- 
-    uartdatarecv = UartDataRecvGet(); 
-
-    if(uartdatarecv == 1 && UartTimerCnt > 100){
-        cnt1 = 0;
-        UartDataRecvSet(0);
-        Uart_dataCheck(&data1[0],&count_in1);
-        memset(&data1[0],0,100);
-    }
-    if(uartdatarecv == 2 && UartTimerCnt > 100){
-        cnt2 = 0;
-        UartDataRecvSet(0);
-        Uart_dataCheck(&data2[0],&count_in2);
-        memset(&data2[0],0,100);
-    }
-    else{
-        if(LedTimerCnt > 500){
-            if(RGB_SensorIDAutoGet() == 1){
-                if(SensorID == 0){memset(&SensorID_buf[0],0x00,8);SensorID_Cnt = 0;}
-                IDAutoSetRequest_data[bluecell_srcid + 1] = ++SensorID;//DST ID
-                if(IDAutoSetRequest_data[bluecell_srcid + 1] > 8){
-                    RGB_SensorIDAutoSet(0);
-                    RGB_Sensor_PowerOnOff(0);
-                    SensorID = 0;
-                }else{
-                    RGB_Sensor_PowerOnOff(IDAutoSetRequest_data[4]);
-                    HAL_Delay(75);
-                    RGB_Controller_Func(&IDAutoSetRequest_data[bluecell_stx]);
-                }
-            }
-            else{
-                StatusRequest_data[bluecell_srcid + 1] = SensorID_buf[temp_sensorid++];
-                if(temp_sensorid > (SensorID_Cnt)){
-                    temp_sensorid = 0;
-                }
-                RGB_Controller_Func(&StatusRequest_data[bluecell_stx]);
+        uartdatarecv = UartDataRecvGet(); 
+        if(uartdatarecv == 1 && UartTimerCnt > 100){
+            cnt1 = 0;
+            UartDataRecvSet(0);
+            Uart_dataCheck(&data1[0],&count_in1);
+            memset(&data1[0],0,100);
+        }
+        if(uartdatarecv == 2 && UartTimerCnt > 100){
+            cnt2 = 0;
+            UartDataRecvSet(0);
+            Uart_dataCheck(&data2[0],&count_in2);
+            memset(&data2[0],0,100);
+        }
+    
+    if(LedTimerCnt > 500){
+        if(RGB_SensorIDAutoGet() == 1){
+            if(SensorID == 0){memset(&SensorID_buf[0],0x00,8);SensorID_Cnt = 0;}
+            IDAutoSetRequest_data[bluecell_srcid + 1] = ++SensorID;//DST ID
+            if(IDAutoSetRequest_data[bluecell_srcid + 1] > 8){
+                RGB_SensorIDAutoSet(0);
+                RGB_Sensor_PowerOnOff(0);
+                SensorID = 0;
+            }else{
+                RGB_Sensor_PowerOnOff(IDAutoSetRequest_data[4]);
+                HAL_Delay(100);
+                RGB_Controller_Func(&IDAutoSetRequest_data[bluecell_stx]);
             }
-            HAL_GPIO_TogglePin(GPIOC,GPIO_PIN_15);
-            LedTimerCnt = 0;
         }
+       /* else{
+
+//            RGB_Controller_Func(&StatusRequest_data[bluecell_stx]);
+        }*/
+        HAL_GPIO_TogglePin(GPIOC,GPIO_PIN_15);
+        LedTimerCnt = 0;
     }
     /* USER CODE END WHILE */