SX1276_LNA 추가

Uart DMA 추가
Lora Set 프로토콜 추가

.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="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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Debug/Src/SX1276.su

@@ -11,20 +11,20 @@ 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
+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

Debug/Src/main.su

@@ -1,20 +1,20 @@
-main.c:137:6:HAL_UART_RxCpltCallback	8	static
-main.c:182:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:192:6:LoraDataSendSet	0	static
-main.c:195:9:LoraDataSendGet	0	static
-main.c:199:6:UartDataRecvSet	0	static
-main.c:202:9:UartDataRecvGet	0	static
-main.c:205:6:RGB_SensorIDAutoSet	0	static
-main.c:208:9:RGB_SensorIDAutoGet	0	static
-main.c:212:6:Uart2_Data_Send	0	static
-main.c:215:6:Uart1_Data_Send	0	static
-main.c:219:5:_write	8	static
-main.c:255:6:Uart_dataCheck	24	static
-main.c:287:6:RGB_Sensor_PowerOnOff	8	static
-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:760:6:SystemClock_Config	72	static
-main.c:564:5:main	296	static
-main.c:1034:6:Error_Handler	0	static
+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

Debug/Src/stm32f1xx_hal_msp.su

@@ -1,7 +1,7 @@
-stm32f1xx_hal_msp.c:84:6:HAL_MspInit	8	static
-stm32f1xx_hal_msp.c:110:6:HAL_I2C_MspInit	32	static
-stm32f1xx_hal_msp.c:146:6:HAL_I2C_MspDeInit	0	static
-stm32f1xx_hal_msp.c:176:6:HAL_TIM_Base_MspInit	8	static
-stm32f1xx_hal_msp.c:200:6:HAL_TIM_Base_MspDeInit	0	static
-stm32f1xx_hal_msp.c:226:6:HAL_UART_MspInit	40	static
-stm32f1xx_hal_msp.c:294:6:HAL_UART_MspDeInit	8	static
+stm32f1xx_hal_msp.c:85:6:HAL_MspInit	8	static
+stm32f1xx_hal_msp.c:111:6:HAL_I2C_MspInit	32	static
+stm32f1xx_hal_msp.c:147:6:HAL_I2C_MspDeInit	0	static
+stm32f1xx_hal_msp.c:177:6:HAL_TIM_Base_MspInit	8	static
+stm32f1xx_hal_msp.c:201:6:HAL_TIM_Base_MspDeInit	0	static
+stm32f1xx_hal_msp.c:227:6:HAL_UART_MspInit	48	static
+stm32f1xx_hal_msp.c:312:6:HAL_UART_MspDeInit	8	static

Debug/Src/stm32f1xx_it.su

@@ -1,12 +1,13 @@
-stm32f1xx_it.c:87:6:NMI_Handler	0	static
-stm32f1xx_it.c:100:6:HardFault_Handler	0	static
-stm32f1xx_it.c:115:6:MemManage_Handler	0	static
-stm32f1xx_it.c:130:6:BusFault_Handler	0	static
-stm32f1xx_it.c:145:6:UsageFault_Handler	0	static
-stm32f1xx_it.c:160:6:SVC_Handler	0	static
-stm32f1xx_it.c:173:6:DebugMon_Handler	0	static
-stm32f1xx_it.c:186:6:PendSV_Handler	0	static
-stm32f1xx_it.c:199:6:SysTick_Handler	0	static
-stm32f1xx_it.c:220:6:USART1_IRQHandler	0	static
-stm32f1xx_it.c:234:6:USART2_IRQHandler	0	static
-stm32f1xx_it.c:248:6:TIM6_IRQHandler	0	static
+stm32f1xx_it.c:88:6:NMI_Handler	0	static
+stm32f1xx_it.c:101:6:HardFault_Handler	0	static
+stm32f1xx_it.c:116:6:MemManage_Handler	0	static
+stm32f1xx_it.c:131:6:BusFault_Handler	0	static
+stm32f1xx_it.c:146:6:UsageFault_Handler	0	static
+stm32f1xx_it.c:161:6:SVC_Handler	0	static
+stm32f1xx_it.c:174:6:DebugMon_Handler	0	static
+stm32f1xx_it.c:187:6:PendSV_Handler	0	static
+stm32f1xx_it.c:200:6:SysTick_Handler	0	static
+stm32f1xx_it.c:221:6:DMA1_Channel5_IRQHandler	0	static
+stm32f1xx_it.c:235:6:USART1_IRQHandler	0	static
+stm32f1xx_it.c:249:6:USART2_IRQHandler	0	static
+stm32f1xx_it.c:263:6:TIM6_IRQHandler	0	static

Inc/SX1276.h

@@ -243,7 +243,15 @@ typedef enum{
  SX1276_LORA_SF_10		=4,
  SX1276_LORA_SF_11		=5,
  SX1276_LORA_SF_12		=6,
-};
+}SX1276_Sf_t;
+ typedef enum{
+     SX1276_LORA_G1	= 1 ,
+     SX1276_LORA_G2	    ,
+     SX1276_LORA_G3     ,
+     SX1276_LORA_G4     ,
+     SX1276_LORA_G5     ,
+     SX1276_LORA_G6     ,
+}SX1276_Lna_t;
 static const uint8_t SX1276_SpreadFactor[7] = { 6, 7, 8, 9, 10, 11, 12 };
 
 
@@ -258,7 +266,7 @@ typedef enum{
 	SX1276_LORA_BW_125KHZ		,
 	SX1276_LORA_BW_250KHZ		,
 	SX1276_LORA_BW_500KHZ		,
-};
+}SX1276_Bw_t;
 static const uint8_t SX1276_LoRaBandwidth[10] = { 0, //   7.8KHz,
 		1, //  10.4KHz,
 		2, //  15.6KHz,
@@ -294,6 +302,7 @@ typedef struct {
 	uint8_t power;
 	uint8_t LoRa_Rate;
 	uint8_t LoRa_BW;
+	uint8_t LoRa_Lna;    
 	uint8_t packetLength;
 
 	SX1276_Status_t status;
@@ -301,6 +310,15 @@ typedef struct {
 	uint8_t rxBuffer[SX1276_MAX_PACKET];
 	uint8_t readBytes;
 } SX1276_t;
+typedef struct {
+	uint8_t frequency;
+	uint8_t power;
+	uint8_t LoRa_Rate;
+	uint8_t LoRa_BW;
+	uint8_t LoRa_Lna;    
+	uint8_t packetLength;
+} Default_SX1276_t;
+
 
 //hardware
 __weak void SX1276_hw_init(SX1276_hw_t * hw);
@@ -322,7 +340,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_Rate, uint8_t LoRa_BW,uint8_t LoRa_Lna);
 void SX1276_defaultConfig(SX1276_t * module);
 
 void SX1276_entryLoRa(SX1276_t * module);
@@ -337,7 +355,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_Rate, uint8_t LoRa_BW, uint8_t packetLength,uint8_t LoRa_Lna);
 
 int SX1276_transmit(SX1276_t * module, uint8_t *txBuf, uint8_t length,
 		uint32_t timeout);

Inc/main.h

@@ -114,6 +114,7 @@ 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,
@@ -139,6 +140,7 @@ typedef enum{
     RGB_Lora_DataRequest,           //21
     RGB_Lora_DataResponse,          //22
     RGB_Lora_ConfigSet,             //23
+    RGB_Lora_ConfigGet,             //24    
 }RGB_CMD_T;
 typedef struct{
     uint8_t Request_stx;
@@ -158,11 +160,11 @@ typedef struct{
 #define     Lora_Max_Amount                     5
 #define     LORA_MAX_DATA_CNT                   Lora_Max_Amount + 3
 
-/*ID ì •ë³´  */
+/*ID ? •ë³?  */
 
 #define MY_ID_ADDRESS               0x0000
 
-/*색깔 제한 정보 */
+/*?ƒ‰ê¹? ? œ?•œ ? •ë³? */
 /*SENSOR 1  ADDRESS*/
 #define RGB1_LIMIT_RED_H_ADDRESS     0x0001
 #define RGB1_LIMIT_RED_L_ADDRESS     0x0002
@@ -219,7 +221,7 @@ typedef struct{
 #define RGB8_LIMIT_GREEN_L_ADDRESS   0x002E
 #define RGB8_LIMIT_BLUE_H_ADDRESS    0x002F
 #define RGB8_LIMIT_BLUE_L_ADDRESS    0x0031
-/*위치 정보 */
+/*?œ„ì¹? ? •ë³? */
 #define RGB1_LOCATION_ADDRESS        0x0032
 #define RGB2_LOCATION_ADDRESS        RGB1_LOCATION_ADDRESS + 50
 #define RGB3_LOCATION_ADDRESS        RGB2_LOCATION_ADDRESS + 50

Inc/stm32f1xx_hal_conf.h

@@ -56,7 +56,7 @@
 /*#define HAL_CORTEX_MODULE_ENABLED   */
 /*#define HAL_CRC_MODULE_ENABLED   */
 /*#define HAL_DAC_MODULE_ENABLED   */
-/*#define HAL_DMA_MODULE_ENABLED   */
+#define HAL_DMA_MODULE_ENABLED
 /*#define HAL_ETH_MODULE_ENABLED   */
 /*#define HAL_FLASH_MODULE_ENABLED   */
 #define HAL_GPIO_MODULE_ENABLED

Inc/stm32f1xx_it.h

@@ -71,6 +71,7 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void DMA1_Channel5_IRQHandler(void);
 void USART1_IRQHandler(void);
 void USART2_IRQHandler(void);
 void TIM6_IRQHandler(void);

STM32F103_RGBController.ioc

@@ -1,15 +1,27 @@
 #MicroXplorer Configuration settings - do not modify
+Dma.Request0=USART1_RX
+Dma.RequestsNb=1
+Dma.USART1_RX.0.Direction=DMA_PERIPH_TO_MEMORY
+Dma.USART1_RX.0.Instance=DMA1_Channel5
+Dma.USART1_RX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART1_RX.0.MemInc=DMA_MINC_ENABLE
+Dma.USART1_RX.0.Mode=DMA_CIRCULAR
+Dma.USART1_RX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART1_RX.0.PeriphInc=DMA_PINC_DISABLE
+Dma.USART1_RX.0.Priority=DMA_PRIORITY_LOW
+Dma.USART1_RX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 File.Version=6
 KeepUserPlacement=false
 Mcu.Family=STM32F1
-Mcu.IP0=I2C2
-Mcu.IP1=NVIC
-Mcu.IP2=RCC
-Mcu.IP3=SYS
-Mcu.IP4=TIM6
-Mcu.IP5=USART1
-Mcu.IP6=USART2
-Mcu.IPNb=7
+Mcu.IP0=DMA
+Mcu.IP1=I2C2
+Mcu.IP2=NVIC
+Mcu.IP3=RCC
+Mcu.IP4=SYS
+Mcu.IP5=TIM6
+Mcu.IP6=USART1
+Mcu.IP7=USART2
+Mcu.IPNb=8
 Mcu.Name=STM32F103R(C-D-E)Tx
 Mcu.Package=LQFP64
 Mcu.Pin0=PC15-OSC32_OUT
@@ -61,6 +73,7 @@ Mcu.UserName=STM32F103RCTx
 MxCube.Version=5.0.1
 MxDb.Version=DB.5.0.1
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false
+NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:1\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false
@@ -69,9 +82,9 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false
-NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:3\:true
+NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:4\:true
 NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:2\:true
-NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:1\:true
+NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:3\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
@@ -245,7 +258,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=TrueSTUDIO
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_TIM6_Init-TIM6-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_USART2_UART_Init-USART2-false-HAL-true,6-MX_I2C2_Init-I2C2-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_TIM6_Init-TIM6-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_USART2_UART_Init-USART2-false-HAL-true,7-MX_I2C2_Init-I2C2-false-HAL-true
 RCC.ADCFreqValue=8000000
 RCC.AHBFreq_Value=16000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2

Src/RGB_Controller.c

@@ -39,6 +39,11 @@ 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  = 
 
 }
 uint16_t RGB_Limit_Address_Check(uint8_t id){
@@ -135,6 +140,12 @@ for(uint8_t i = 0; i < 10; i++){
              else
                  return;
              break;
+        case RGB_Lora_ConfigSet:
+            M24C32_Data_Write(&hi2c2,&data[bluecell_srcid],RGB_LORA_FREQ_ADDRESS,data[bluecell_length] - 2); // EEPROM Controller ID Save 
+            break;
+        case RGB_Lora_ConfigGet:
+
+            break;             
          default:break;
     }
 }
@@ -442,6 +453,12 @@ void RGB_Controller_Func(uint8_t* data){
         case RGB_Lora_DataRequest:
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
             Result_buf[bluecell_type] = RGB_Lora_DataResponse;
+            break;
+        case RGB_Lora_ConfigSet:
+            memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
+            break;
+        case RGB_Lora_ConfigGet:
+
             break;
         default:
             break;

Src/SX1276.c

@@ -141,11 +141,11 @@ void SX1276_SPIBurstWrite(SX1276_t * module, uint8_t addr, uint8_t* txBuf,
 }
 void SX1276_defaultConfig(SX1276_t * module) {
 	SX1276_config(module, module->frequency, module->power, module->LoRa_Rate,
-			module->LoRa_BW);
+			module->LoRa_BW,module->LoRa_Lna);
 }
 
 void SX1276_config(SX1276_t * module, uint8_t frequency, uint8_t power,
-		uint8_t LoRa_Rate, uint8_t LoRa_BW) {
+		uint8_t LoRa_Rate, uint8_t LoRa_BW,uint8_t LoRa_Lna) {
 	SX1276_sleep(module); //Change modem mode Must in Sleep mode
 	SX1276_hw_DelayMs(15);
 
@@ -159,7 +159,9 @@ void SX1276_config(SX1276_t * module, uint8_t frequency, uint8_t power,
 	SX1276_SPIWrite(module, LR_RegPaConfig, SX1276_Power[power]); //Setting output power parameter
 
 	SX1276_SPIWrite(module, LR_RegOcp, 0x0B);			//RegOcp,Close Ocp
-	SX1276_SPIWrite(module, LR_RegLna, 0x23);		//RegLNA,High & LNA Enable
+//	SX1276_SPIWrite(module, LR_RegLna, 0x20);		//RegLNA,High & LNA Enable
+    SX1276_SPIWrite(module, LR_RegLna, LoRa_Lna);       //RegLNA,High & LNA Enable
+
 	if (SX1276_SpreadFactor[LoRa_Rate] == 6) {	//SFactor=6
 		uint8_t tmp;
 		SX1276_SPIWrite(module,
@@ -321,13 +323,14 @@ 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_Rate, uint8_t LoRa_BW, uint8_t packetLength,uint8_t LoRa_Lna) {
 	SX1276_hw_init(module->hw);
-	module->frequency = frequency;
-	module->power = power;
-	module->LoRa_Rate = LoRa_Rate;
-	module->LoRa_BW = LoRa_BW;
-	module->packetLength = packetLength;
+	module->frequency       = frequency;
+	module->power           = power;
+	module->LoRa_Rate       = LoRa_Rate;
+	module->LoRa_BW         = LoRa_BW;
+	module->packetLength    = packetLength;
+    module->LoRa_Lna        = LoRa_Lna;
 	SX1276_defaultConfig(module);
 }
 

Src/main.c

@@ -68,10 +68,11 @@ TIM_HandleTypeDef htim6;
 
 UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
+DMA_HandleTypeDef hdma_usart1_rx;
 
 /* USER CODE BEGIN PV */
-uint8_t rx1_data[1];
-uint8_t rx2_data[1];
+uint8_t rx1_data[buf_size];
+uint8_t rx2_data[buf_size];
 
 
 uint8_t ring_buf[buf_size];
@@ -110,6 +111,7 @@ typedef enum{
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
+static void MX_DMA_Init(void);
 static void MX_TIM6_Init(void);
 static void MX_USART1_UART_Init(void);
 static void MX_USART2_UART_Init(void);
@@ -149,9 +151,9 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
                 count_in1 = 0;
         }
 #endif // PYJ.2019.04.19_END -- 
-        HAL_UART_Receive_IT(&huart1,&rx1_data[0],1);
+//        HAL_UART_Receive_IT(&huart1,&rx1_data[0],1);
     }
-    if(huart->Instance == USART2) // Lora?? ?†µ?‹ ?•˜?Š� ?�¬?Š¸
+    if(huart->Instance == USART2) // Lora?? ?? Â???¹Â???¢Ë??Å ?? ?Â�¬?Š¸
     {
         buf2[count_in2] = rx2_data[0];//(uint8_t)USART2->DR;
         if(++count_in2>=buf_size){ count_in2 = 0; }
@@ -168,7 +170,7 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
         HAL_UART_Receive_IT(&huart2,&rx2_data[0],1);
     }
 #if 0 // PYJ.2019.04.13_BEGIN -- 
-    if(huart->Instance == USART3) //GUI ?? ?†µ?‹ ?•˜?Š� Port
+    if(huart->Instance == USART3) //GUI ?? ?? Â???¹Â???¢Ë??Å ?? Port
     {
         buf[count_in3] = rx3_data[0];//(uint8_t)USART2->DR;
         if(buf[count_in3++] == 0xEB)UartDataRecvSet(3);
@@ -402,10 +404,10 @@ void RGB_Sensor_PowerOnOff(uint8_t id){
 #define END_ADDR    FLASH_USER + 262144 // 256K
 //----------------------------------------------------
 #if 0 // PYJ.2019.03.20_BEGIN -- 
-void test_write() // 쓰기함수
+void test_write() // ?“°ê¸°í•¨?ˆ˜
 {
 
-    __HAL_RCC_TIM7_CLK_DISABLE(); // 매�타�머를 정지합니다
+    __HAL_RCC_TIM7_CLK_DISABLE(); // 매ì�¸???�´ë¨¸ë?? ? •ì§??•©?‹ˆ?‹¤
     uint32_t  Address = 0;
     Address = StartAddr;
 //    printf("================First============ \r\n");
@@ -416,10 +418,10 @@ void test_write() // 쓰기함수
 //        Address += 4;
 //    }  
 
-//    HAL_FLASH_Unlock(); // lock 풀기
+//    HAL_FLASH_Unlock(); // lock ??�
 //    HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, START_ADDR, (uint32_t)0x12345678); //test
-//    HAL_FLASH_Lock(); // lock 잠그기
-//    __HAL_RCC_TIM7_CLK_ENABLE(); // 매�타�머를 재시작합니다
+//    HAL_FLASH_Lock(); // lock ?ž ê·¸ê¸°
+//    __HAL_RCC_TIM7_CLK_ENABLE(); // 매ì�¸???�´ë¨¸ë?? ?ž¬?‹œ?ž‘?•©?‹ˆ?‹¤
     Address = StartAddr;
     printf("================Second============ \r\n");
 
@@ -438,7 +440,7 @@ void test_write() // 쓰기함수
 
 
 #if 1 // PYJ.2019.03.20_BEGIN -- 
-void test_read(void) // 쓰기함수
+void test_read(void) // ?“°ê¸°í•¨?ˆ˜
 {
     uint32_t Address = 0x08000000;
     uint8_t aa = 0;
@@ -470,7 +472,7 @@ void Flash_RGB_Data_Write(uint32_t Addr,uint8_t* data){
     HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Addr + 4 ,   (uint16_t)temp_Blue);
 
 }
-void Flash_write(uint8_t* data) // 쓰기함수
+void Flash_write(uint8_t* data) // ?“°ê¸°í•¨?ˆ˜
 {
    
     /*Variable used for Erase procedure*/
@@ -483,8 +485,8 @@ void Flash_write(uint8_t* data) // 쓰기함수
 //    EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
      Address = START_ADDR;
 
-    __HAL_RCC_TIM7_CLK_DISABLE(); // 매�타�머를 정지합니다
-    HAL_FLASH_Unlock(); // lock 풀기
+    __HAL_RCC_TIM7_CLK_DISABLE(); // 매ì�¸???�´ë¨¸ë?? ? •ì§??•©?‹ˆ?‹¤
+    HAL_FLASH_Unlock(); // lock ??�
 //    if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK){
 //        printf("Erase Failed \r\n");
 //    }else{
@@ -519,11 +521,11 @@ void Flash_write(uint8_t* data) // 쓰기함수
 
     }
     Flash_RGB_Data_Write(Address,&data[bluecell_stx]);
-    HAL_FLASH_Lock(); // lock 잠그기
-    __HAL_RCC_TIM7_CLK_ENABLE(); // 매�타�머를 재시작합니다
+    HAL_FLASH_Lock(); // lock ?ž ê·¸ê¸°
+    __HAL_RCC_TIM7_CLK_ENABLE(); // 매ì�¸???�´ë¨¸ë?? ?ž¬?‹œ?ž‘?•©?‹ˆ?‹¤
 
 }
-void Flash_InitRead(void) // 쓰기함수
+void Flash_InitRead(void) // ?“°ê¸°í•¨?ˆ˜
 {
     uint32_t  Address = 0;
     Address = StartAddr;
@@ -546,6 +548,16 @@ void Flash_InitRead(void) // 쓰기함수
 
 SX1276_hw_t SX1276_hw;
 SX1276_t SX1276;
+Default_SX1276_t Default_SX1276 = 
+{
+    SX1276_917MHZ,
+    SX1276_POWER_17DBM,
+    SX1276_LORA_SF_8,
+    SX1276_LORA_BW_20_8KHZ,
+    10,
+    SX1276_LORA_G1,
+};
+
 
 int master;
 int ret;
@@ -555,6 +567,12 @@ char buffer[100];
 int message_length;
 int message;
 
+
+
+
+
+
+
 /* USER CODE END 0 */
 
 /**
@@ -588,6 +606,7 @@ int main(void)
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
+  MX_DMA_Init();
   MX_TIM6_Init();
   MX_USART1_UART_Init();
   MX_USART2_UART_Init();
@@ -597,9 +616,9 @@ int main(void)
   MX_NVIC_Init();
   /* USER CODE BEGIN 2 */
   HAL_TIM_Base_Start_IT(&htim6);
-  HAL_UART_Receive_IT(&huart1, &rx1_data[0],1);
+  HAL_UART_Receive_DMA(&huart1, rx1_data, 1);
   HAL_UART_Receive_IT(&huart2, &rx2_data[0],1);
-  setbuf(stdout, NULL); // \n � �� 떄만 
+  setbuf(stdout, NULL); // \n ?�„ ? �?�„ ?–„ë§? 
 #if 1 // PYJ.2019.03.04_BEGIN -- 
       printf("****************************************\r\n");
       printf("RGB Project\r\n");
@@ -623,9 +642,12 @@ int main(void)
    SX1276_hw.reset.pin = SX1276_RESET_Pin;
   // SX1276_hw.spi = &hspi3;
    SX1276.hw = &SX1276_hw;
+
+
+    
    printf("Configuring LoRa module\r\n");
-   SX1276_begin(&SX1276, SX1276_917MHZ, SX1276_POWER_17DBM, SX1276_LORA_SF_8,
-           SX1276_LORA_BW_20_8KHZ, 10);
+   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) {
@@ -730,9 +752,8 @@ int main(void)
                     SensorID = 0;
                 }else{
                     RGB_Sensor_PowerOnOff(IDAutoSetRequest_data[4]);
-                    HAL_Delay(450);
+                    HAL_Delay(75);
                     RGB_Controller_Func(&IDAutoSetRequest_data[bluecell_stx]);
-                    HAL_Delay(450);
                 }
             }
             else{
@@ -796,12 +817,15 @@ void SystemClock_Config(void)
   */
 static void MX_NVIC_Init(void)
 {
-  /* USART2_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(USART2_IRQn);
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
   /* USART1_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(USART1_IRQn);
+  /* USART2_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(USART2_IRQn);
   /* TIM6_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(TIM6_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(TIM6_IRQn);
@@ -945,6 +969,16 @@ static void MX_USART2_UART_Init(void)
 
 }
 
+/** 
+  * Enable DMA controller clock
+  */
+static void MX_DMA_Init(void) 
+{
+  /* DMA controller clock enable */
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+}
+
 /**
   * @brief GPIO Initialization Function
   * @param None

Src/stm32f1xx_hal_msp.c

@@ -44,6 +44,7 @@
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
+extern DMA_HandleTypeDef hdma_usart1_rx;
 
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN TD */
@@ -250,6 +251,23 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    /* USART1 DMA Init */
+    /* USART1_RX Init */
+    hdma_usart1_rx.Instance = DMA1_Channel5;
+    hdma_usart1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_usart1_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart1_rx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart1_rx.Init.Mode = DMA_CIRCULAR;
+    hdma_usart1_rx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_usart1_rx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(huart,hdmarx,hdma_usart1_rx);
+
   /* USER CODE BEGIN USART1_MspInit 1 */
 
   /* USER CODE END USART1_MspInit 1 */
@@ -308,6 +326,9 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
 
+    /* USART1 DMA DeInit */
+    HAL_DMA_DeInit(huart->hdmarx);
+
     /* USART1 interrupt DeInit */
     HAL_NVIC_DisableIRQ(USART1_IRQn);
   /* USER CODE BEGIN USART1_MspDeInit 1 */

Src/stm32f1xx_it.c

@@ -72,6 +72,7 @@
 
 /* External variables --------------------------------------------------------*/
 extern TIM_HandleTypeDef htim6;
+extern DMA_HandleTypeDef hdma_usart1_rx;
 extern UART_HandleTypeDef huart1;
 extern UART_HandleTypeDef huart2;
 /* USER CODE BEGIN EV */
@@ -214,6 +215,20 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f1xx.s).                    */
 /******************************************************************************/
 
+/**
+  * @brief This function handles DMA1 channel5 global interrupt.
+  */
+void DMA1_Channel5_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart1_rx);
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 1 */
+}
+
 /**
   * @brief This function handles USART1 global interrupt.
   */