USART 921600 적용

STM32F103ZET_JDASMBIC.ioc

@@ -118,61 +118,63 @@ Mcu.Name=STM32F103Z(C-D-E)Tx
 Mcu.Package=LQFP144
 Mcu.Pin0=PE3
 Mcu.Pin1=PE4
-Mcu.Pin10=PA3
-Mcu.Pin11=PA4
-Mcu.Pin12=PA5
-Mcu.Pin13=PA6
-Mcu.Pin14=PG0
-Mcu.Pin15=PG1
-Mcu.Pin16=PE10
-Mcu.Pin17=PE11
-Mcu.Pin18=PE12
-Mcu.Pin19=PE13
+Mcu.Pin10=PC2
+Mcu.Pin11=PA2
+Mcu.Pin12=PA3
+Mcu.Pin13=PA4
+Mcu.Pin14=PA5
+Mcu.Pin15=PA6
+Mcu.Pin16=PG0
+Mcu.Pin17=PG1
+Mcu.Pin18=PE10
+Mcu.Pin19=PE11
 Mcu.Pin2=PC15-OSC32_OUT
-Mcu.Pin20=PE14
-Mcu.Pin21=PE15
-Mcu.Pin22=PB10
-Mcu.Pin23=PB11
-Mcu.Pin24=PB14
-Mcu.Pin25=PB15
-Mcu.Pin26=PD10
-Mcu.Pin27=PD11
-Mcu.Pin28=PD14
-Mcu.Pin29=PD15
+Mcu.Pin20=PE12
+Mcu.Pin21=PE13
+Mcu.Pin22=PE14
+Mcu.Pin23=PE15
+Mcu.Pin24=PB10
+Mcu.Pin25=PB11
+Mcu.Pin26=PB14
+Mcu.Pin27=PB15
+Mcu.Pin28=PD10
+Mcu.Pin29=PD11
 Mcu.Pin3=PF6
-Mcu.Pin30=PG2
-Mcu.Pin31=PG3
-Mcu.Pin32=PG4
-Mcu.Pin33=PG5
-Mcu.Pin34=PG8
-Mcu.Pin35=PC6
-Mcu.Pin36=PA9
-Mcu.Pin37=PA10
-Mcu.Pin38=PA13
-Mcu.Pin39=PA14
+Mcu.Pin30=PD14
+Mcu.Pin31=PD15
+Mcu.Pin32=PG2
+Mcu.Pin33=PG3
+Mcu.Pin34=PG4
+Mcu.Pin35=PG5
+Mcu.Pin36=PG8
+Mcu.Pin37=PC6
+Mcu.Pin38=PA9
+Mcu.Pin39=PA10
 Mcu.Pin4=PF7
-Mcu.Pin40=PD2
-Mcu.Pin41=PD3
-Mcu.Pin42=PD4
-Mcu.Pin43=PD7
-Mcu.Pin44=PG9
-Mcu.Pin45=PG10
-Mcu.Pin46=PG11
-Mcu.Pin47=PG12
-Mcu.Pin48=PG13
-Mcu.Pin49=PG14
+Mcu.Pin40=PA13
+Mcu.Pin41=PA14
+Mcu.Pin42=PD2
+Mcu.Pin43=PD3
+Mcu.Pin44=PD4
+Mcu.Pin45=PD7
+Mcu.Pin46=PG9
+Mcu.Pin47=PG10
+Mcu.Pin48=PG11
+Mcu.Pin49=PG12
 Mcu.Pin5=PF8
-Mcu.Pin50=PG15
-Mcu.Pin51=PB6
-Mcu.Pin52=PB7
-Mcu.Pin53=PB9
-Mcu.Pin54=VP_SYS_VS_tim2
-Mcu.Pin55=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin50=PG13
+Mcu.Pin51=PG14
+Mcu.Pin52=PG15
+Mcu.Pin53=PB6
+Mcu.Pin54=PB7
+Mcu.Pin55=PB9
+Mcu.Pin56=VP_SYS_VS_tim2
+Mcu.Pin57=VP_TIM6_VS_ClockSourceINT
 Mcu.Pin6=PF9
 Mcu.Pin7=PF10
-Mcu.Pin8=PC2
-Mcu.Pin9=PA2
-Mcu.PinsNb=56
+Mcu.Pin8=OSC_IN
+Mcu.Pin9=OSC_OUT
+Mcu.PinsNb=58
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103ZETx
@@ -203,6 +205,10 @@ NVIC.TimeBaseIP=TIM2
 NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:4\:true\:true
 NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+OSC_IN.Mode=HSE-External-Oscillator
+OSC_IN.Signal=RCC_OSC_IN
+OSC_OUT.Mode=HSE-External-Oscillator
+OSC_OUT.Signal=RCC_OSC_OUT
 PA10.GPIOParameters=GPIO_Label
 PA10.GPIO_Label=MBIC_DOWN
 PA10.Mode=Asynchronous
@@ -446,31 +452,33 @@ ProjectManager.TargetToolchain=TrueSTUDIO
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=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_USART1_UART_Init-USART1-false-HAL-true,5-MX_ADC1_Init-ADC1-false-HAL-true,6-MX_ADC3_Init-ADC3-false-HAL-true,7-MX_USART2_UART_Init-USART2-false-HAL-true,8-MX_TIM6_Init-TIM6-false-HAL-true,9-MX_I2C2_Init-I2C2-false-HAL-true
-RCC.ADCFreqValue=14000000
-RCC.ADCPresc=RCC_ADCPCLK2_DIV4
-RCC.AHBFreq_Value=56000000
+RCC.ADCFreqValue=12000000
+RCC.ADCPresc=RCC_ADCPCLK2_DIV6
+RCC.AHBFreq_Value=72000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2
-RCC.APB1Freq_Value=28000000
-RCC.APB1TimFreq_Value=56000000
-RCC.APB2Freq_Value=56000000
-RCC.APB2TimFreq_Value=56000000
-RCC.FCLKCortexFreq_Value=56000000
-RCC.FSMCFreq_Value=56000000
+RCC.APB1Freq_Value=36000000
+RCC.APB1TimFreq_Value=72000000
+RCC.APB2Freq_Value=72000000
+RCC.APB2TimFreq_Value=72000000
+RCC.FCLKCortexFreq_Value=72000000
+RCC.FSMCFreq_Value=72000000
 RCC.FamilyName=M
-RCC.HCLKFreq_Value=56000000
-RCC.I2S2Freq_Value=56000000
-RCC.I2S3Freq_Value=56000000
-RCC.IPParameters=ADCFreqValue,ADCPresc,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FSMCFreq_Value,FamilyName,HCLKFreq_Value,I2S2Freq_Value,I2S3Freq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,SDIOFreq_Value,SDIOHCLKDiv2FreqValue,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value
-RCC.MCOFreq_Value=56000000
-RCC.PLLCLKFreq_Value=56000000
-RCC.PLLMCOFreq_Value=28000000
-RCC.PLLMUL=RCC_PLL_MUL14
-RCC.SDIOFreq_Value=56000000
-RCC.SDIOHCLKDiv2FreqValue=28000000
-RCC.SYSCLKFreq_VALUE=56000000
+RCC.HCLKFreq_Value=72000000
+RCC.I2S2Freq_Value=72000000
+RCC.I2S3Freq_Value=72000000
+RCC.IPParameters=ADCFreqValue,ADCPresc,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FSMCFreq_Value,FamilyName,HCLKFreq_Value,I2S2Freq_Value,I2S3Freq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,PLLSourceVirtual,SDIOFreq_Value,SDIOHCLKDiv2FreqValue,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,VCOOutput2Freq_Value
+RCC.MCOFreq_Value=72000000
+RCC.PLLCLKFreq_Value=72000000
+RCC.PLLMCOFreq_Value=36000000
+RCC.PLLMUL=RCC_PLL_MUL9
+RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
+RCC.SDIOFreq_Value=72000000
+RCC.SDIOHCLKDiv2FreqValue=36000000
+RCC.SYSCLKFreq_VALUE=72000000
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
-RCC.TimSysFreq_Value=56000000
-RCC.USBFreq_Value=56000000
+RCC.TimSysFreq_Value=72000000
+RCC.USBFreq_Value=72000000
+RCC.VCOOutput2Freq_Value=8000000
 SH.ADCx_IN12.0=ADC1_IN12,IN12
 SH.ADCx_IN12.ConfNb=1
 SH.ADCx_IN4.0=ADC1_IN4,IN4

Src/main.c

@@ -118,7 +118,7 @@ uint16_t adc3cnt = 0 ;
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 {
 //?��?��?�� 코드 ?��?��
-//만약 ?��?�� adc?���??????? �????????��?�� ?�� ?��?���??????? ?��?���??????? ?��?��?? 같이 조건�??????? ?��?��
+//諤嵸烄 ?嚙踝蕭?嚙踝蕭 adc?嚙踝蕭嚙???????? 嚙?????????嚙踝蕭?嚙踝蕭 ?嚙踝蕭 ?嚙踝蕭?嚙踝蕭嚙???????? ?嚙踝蕭?嚙踝蕭嚙???????? ?嚙踝蕭?嚙踝蕭?? 穈軤𦚯 魽國探嚙???????? ?嚙踝蕭?嚙踝蕭
 
     if(hadc->Instance == hadc1.Instance)
     {
@@ -377,12 +377,13 @@ void SystemClock_Config(void)
 
   /** Initializes the CPU, AHB and APB busses clocks 
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI_DIV2;
-  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL14;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
   {
     Error_Handler();
@@ -401,7 +402,7 @@ void SystemClock_Config(void)
     Error_Handler();
   }
   PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
-  PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV4;
+  PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
   {
     Error_Handler();
@@ -713,7 +714,7 @@ static void MX_USART2_UART_Init(void)
 
   /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
-  huart2.Init.BaudRate = 115200;
+  huart2.Init.BaudRate = 921600;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;