RGB Controller 최종 소스 코드

수정 사항
SX1276.c  :  define 정의 선언
디버거 핀 추가
로라 환경 설정 값 제대로 안 주는 문제 수정
불필요한 Timer 제거

.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="1421905487508415165" 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/main.su

@@ -1,25 +1,25 @@
-main.c:161:6:HAL_UART_RxCpltCallback	8	static
-main.c:174:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:185:6:LoraDataSendSet	0	static
-main.c:188:9:LoraDataSendGet	0	static
-main.c:192:6:UartDataRecvSet	0	static
-main.c:195:9:UartDataRecvGet	0	static
-main.c:198:6:RGB_SensorIDAutoSet	0	static
-main.c:201:9:RGB_SensorIDAutoGet	0	static
-main.c:205:6:Uart2_Data_Send	0	static
-main.c:208:6:Uart1_Data_Send	0	static
-main.c:212:5:_write	8	static
-main.c:248:6:Uart_dataCheck	24	static
-main.c:280:6:RGB_Sensor_PowerOnOff	16	static
-main.c:437:6:test_read	24	static
-main.c:456:6:Flash_RGB_Data_Write	16	static
-main.c:469:6:Flash_write	24	static
-main.c:522:6:Flash_InitRead	12	static
-main.c:556:6:Lora_Initialize	32	static
-main.c:581:6:Lora_Operate	24	static
-main.c:611:6:Usart_Data_RecvCheck	16	static
-main.c:643:6:RGB_Sensor_DataRequest	48	static
-main.c:669:6:WDOG_Check_Flag	0	static
-main.c:767:6:SystemClock_Config	72	static
-main.c:683:5:main	64	static
-main.c:1095:6:Error_Handler	0	static
+main.c:160:6:HAL_UART_RxCpltCallback	8	static
+main.c:173:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:184:6:LoraDataSendSet	0	static
+main.c:187:9:LoraDataSendGet	0	static
+main.c:191:6:UartDataRecvSet	0	static
+main.c:194:9:UartDataRecvGet	0	static
+main.c:197:6:RGB_SensorIDAutoSet	0	static
+main.c:200:9:RGB_SensorIDAutoGet	0	static
+main.c:204:6:Uart2_Data_Send	0	static
+main.c:207:6:Uart1_Data_Send	0	static
+main.c:211:5:_write	8	static
+main.c:247:6:Uart_dataCheck	24	static
+main.c:279:6:RGB_Sensor_PowerOnOff	16	static
+main.c:436:6:test_read	24	static
+main.c:455:6:Flash_RGB_Data_Write	16	static
+main.c:468:6:Flash_write	24	static
+main.c:521:6:Flash_InitRead	12	static
+main.c:555:6:Lora_Initialize	32	static
+main.c:580:6:Lora_Operate	24	static
+main.c:613:6:Usart_Data_RecvCheck	16	static
+main.c:645:6:RGB_Sensor_DataRequest	48	static
+main.c:671:6:WDOG_Check_Flag	0	static
+main.c:770:6:SystemClock_Config	72	static
+main.c:685:5:main	64	static
+main.c:1098:6:Error_Handler	0	static

STM32F103_RGBController.ioc

@@ -73,15 +73,14 @@ Mcu.Pin38=PB8
 Mcu.Pin39=PB9
 Mcu.Pin4=PA2
 Mcu.Pin40=VP_IWDG_VS_IWDG
-Mcu.Pin41=VP_SYS_VS_ND
-Mcu.Pin42=VP_SYS_VS_Systick
-Mcu.Pin43=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin41=VP_SYS_VS_Systick
+Mcu.Pin42=VP_TIM6_VS_ClockSourceINT
 Mcu.Pin5=PA3
 Mcu.Pin6=PA4
 Mcu.Pin7=PA5
 Mcu.Pin8=PA6
 Mcu.Pin9=PA7
-Mcu.PinsNb=44
+Mcu.PinsNb=43
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103RCTx
@@ -105,9 +104,9 @@ 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
-PA13.Locked=true
+PA13.Mode=Serial_Wire
 PA13.Signal=SYS_JTMS-SWDIO
-PA14.Locked=true
+PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
 PA15.GPIOParameters=GPIO_Label
 PA15.GPIO_Label=SX1276_NSS
@@ -315,8 +314,6 @@ USART2.IPParameters=VirtualMode
 USART2.VirtualMode=VM_ASYNC
 VP_IWDG_VS_IWDG.Mode=IWDG_Activate
 VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
-VP_SYS_VS_ND.Mode=No_Debug
-VP_SYS_VS_ND.Signal=SYS_VS_ND
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM6_VS_ClockSourceINT.Mode=Enable_Timer

STM32F103_RGB_Controller.elf.launch

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.atollic.hardwaredebug.launch.launchConfigurationType">
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.cpu_core" value="Cortex-M"/>
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.device" value="STM32F103RC"/>
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.endian" value="little"/>
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.init_speed" value="4000"/>
+<booleanAttribute key="com.atollic.hardwaredebug.jlink_common.jlink_check_serial_number" value="false"/>
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.jlink_script_path" value=""/>
+<booleanAttribute key="com.atollic.hardwaredebug.jlink_common.jlink_script_used" value="false"/>
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.jlink_txt_serial_number" value=""/>
+<booleanAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_auto" value="true"/>
+<intAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_irpre" value="0"/>
+<intAttribute key="com.atollic.hardwaredebug.jlink_common.scan_chain_pos" value="0"/>
+<stringAttribute key="com.atollic.hardwaredebug.jlink_common.selected_rtos" value="No RTOS"/>
 <intAttribute key="com.atollic.hardwaredebug.launch.formatVersion" value="2"/>
 <stringAttribute key="com.atollic.hardwaredebug.launch.hwinitCommands" value="# Initialize your hardware here&#10;"/>
 <stringAttribute key="com.atollic.hardwaredebug.launch.initCommands" value=""/>
@@ -37,5 +49,6 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

Src/RGB_Controller.c

@@ -518,7 +518,7 @@ void RGB_Controller_Func(uint8_t* data){
             break;
         case RGB_Lora_ConfigGet:
             Result_buf[bluecell_stx]         = 0xbe;
-            Result_buf[bluecell_type]        = RGB_ControllerLimitGet;
+            Result_buf[bluecell_type]        = RGB_Lora_ConfigGet;
             Result_buf[bluecell_length]      = 7;
             Result_buf[bluecell_srcid + 0]   = SX1276.frequency;
             Result_buf[bluecell_srcid + 1]   = SX1276.LoRa_Pa_boost;            

Src/SX1276.c

@@ -463,7 +463,7 @@ uint8_t SX1276_RSSI_LoRa(SX1276_t * module) {
 
 uint8_t SX1276_RSSI(SX1276_t * module) {
 	uint8_t temp = 0xff;
-	temp = SX1276_SPIRead(module, 0x11);
+	temp = SX1276_SPIRead(module, RegRssiValue);
 	temp = 127 - (temp >> 1);	//127:Max RSSI
 	return temp;
 }

Src/main.c

@@ -93,7 +93,7 @@ volatile uint32_t Uart1TimerCnt = 0;
 volatile uint32_t Uart2TimerCnt = 0;
 
 volatile uint32_t LedTimerCnt = 0;
-volatile uint32_t LoraTxTimerCnt = 0;
+//volatile uint32_t LoraTxTimerCnt = 0;
 volatile uint32_t LoraAckTimerCnt = 0;
 
 
@@ -102,7 +102,6 @@ uint8_t buf[buf_size] = {0,};
 uint8_t buf1[buf_size] = {0,};
 uint8_t buf2[buf_size] = {0,};
 
-//Default_SX1276_t Default_SX1276;
 Default_SX1276_t Default_SX1276 = 
 {
     SX1276_917MHZ,
@@ -178,7 +177,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
         Uart1TimerCnt++;
         Uart2TimerCnt++;
         LedTimerCnt++;
-        LoraTxTimerCnt++;
+//        LoraTxTimerCnt++;
         LoraAckTimerCnt++;
     }
 }
@@ -579,6 +578,7 @@ void Lora_Initialize(void){
     }
 }
 void Lora_Operate(void){
+    uint8_t temp_rssi = 0;
     if(RGB_SensorIDAutoGet() == 0){/*ID allocate if sentence Condition */
         if(LoraDataSendGet() == LoraTx_mode && Lora_Buf[0] == 0xbe){
             //        LoraDataSendSet(LoraRx_mode);
@@ -596,6 +596,8 @@ void Lora_Operate(void){
             ret = SX1276_LoRaRxPacket(&SX1276);
             if (ret > 0) {
                 SX1276_read(&SX1276, &buffer[0], ret);
+                temp_rssi = SX1276_RSSI_LoRa(&SX1276);
+                printf("Rssi : %d \n",temp_rssi);
 //                printf("Received Data : ");
 //                for(uint8_t i = 0; i < ret; i++)
 //                printf("%02x ",  buffer[i]);
@@ -741,14 +743,15 @@ int main(void)
   RGB_Data_Init();
   Lora_Initialize();
   /* USER CODE END 2 */
+
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
   {
-     if(LoraTxTimerCnt > LORA_TIMER_CNT){
-        LoraTxTimerCnt = 0;
-//        LoraDataSendSet(1);
-    }
+//     if(LoraTxTimerCnt > LORA_TIMER_CNT){
+//        LoraTxTimerCnt = 0;
+////        LoraDataSendSet(1);
+//    }
     RGB_Alarm_Operate();//LED ALARM CHECK
     Lora_Operate();
     Usart_Data_RecvCheck();

Src/stm32f1xx_hal_msp.c

@@ -95,9 +95,9 @@ void HAL_MspInit(void)
 
   /* System interrupt init*/
 
-  /**DISABLE: JTAG-DP Disabled and SW-DP Disabled 
+  /**NOJTAG: JTAG-DP Disabled and SW-DP Enabled 
   */
-  __HAL_AFIO_REMAP_SWJ_DISABLE();
+  __HAL_AFIO_REMAP_SWJ_NOJTAG();
 
   /* USER CODE BEGIN MspInit 1 */