From 0bc2a81c0aab3c89b534415d6f07d07e392260ce Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sat, 3 Jun 2017 20:47:37 +0200 Subject: o Adding support for reading IR codes. --- bsp/radio-controller-1/radio-controller-1.ioc | 67 ++++++++++++++++++--------- 1 file changed, 45 insertions(+), 22 deletions(-) (limited to 'bsp/radio-controller-1/radio-controller-1.ioc') diff --git a/bsp/radio-controller-1/radio-controller-1.ioc b/bsp/radio-controller-1/radio-controller-1.ioc index 11a988f..33865c7 100644 --- a/bsp/radio-controller-1/radio-controller-1.ioc +++ b/bsp/radio-controller-1/radio-controller-1.ioc @@ -7,28 +7,32 @@ Mcu.IP1=NVIC Mcu.IP2=RCC Mcu.IP3=SYS Mcu.IP4=TIM1 -Mcu.IP5=USART2 -Mcu.IP6=USB -Mcu.IP7=USB_DEVICE -Mcu.IPNb=8 +Mcu.IP5=TIM2 +Mcu.IP6=USART2 +Mcu.IP7=USB +Mcu.IP8=USB_DEVICE +Mcu.IPNb=9 Mcu.Name=STM32F103C(4-6)Tx Mcu.Package=LQFP48 Mcu.Pin0=PC14-OSC32_IN Mcu.Pin1=PC15-OSC32_OUT -Mcu.Pin10=PA14 -Mcu.Pin11=VP_IWDG_VS_IWDG -Mcu.Pin12=VP_SYS_VS_Systick -Mcu.Pin13=VP_TIM1_VS_ControllerModeReset -Mcu.Pin14=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS +Mcu.Pin10=PA12 +Mcu.Pin11=PA13 +Mcu.Pin12=PA14 +Mcu.Pin13=VP_IWDG_VS_IWDG +Mcu.Pin14=VP_SYS_VS_Systick +Mcu.Pin15=VP_TIM1_VS_ControllerModeReset +Mcu.Pin16=VP_TIM2_VS_ControllerModeReset +Mcu.Pin17=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS Mcu.Pin2=PD0-OSC_IN Mcu.Pin3=PD1-OSC_OUT -Mcu.Pin4=PA2 -Mcu.Pin5=PA3 -Mcu.Pin6=PA8 -Mcu.Pin7=PA11 -Mcu.Pin8=PA12 -Mcu.Pin9=PA13 -Mcu.PinsNb=15 +Mcu.Pin4=PA0-WKUP +Mcu.Pin5=PA2 +Mcu.Pin6=PA3 +Mcu.Pin7=PA8 +Mcu.Pin8=PA10 +Mcu.Pin9=PA11 +Mcu.PinsNb=18 Mcu.UserConstants=RADIO_RX_TIMER_PRESCALER,(72000000/200000 - 1) Mcu.UserName=STM32F103C6Tx MxCube.Version=4.20.1 @@ -41,12 +45,19 @@ NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true -NVIC.SysTick_IRQn=true\:0\:0\:true\:false\:true -NVIC.TIM1_CC_IRQn=true\:1\:0\:true\:false\:true -NVIC.TIM1_TRG_COM_IRQn=true\:1\:0\:true\:false\:true -NVIC.USB_HP_CAN1_TX_IRQn=true\:0\:0\:false\:false\:true -NVIC.USB_LP_CAN1_RX0_IRQn=true\:0\:0\:false\:false\:true +NVIC.SysTick_IRQn=true\:1\:0\:true\:false\:true +NVIC.TIM1_CC_IRQn=true\:10\:0\:true\:false\:true +NVIC.TIM1_TRG_COM_IRQn=true\:10\:0\:true\:false\:true +NVIC.TIM2_IRQn=true\:10\:0\:true\:false\:true +NVIC.USB_HP_CAN1_TX_IRQn=true\:2\:0\:true\:false\:true +NVIC.USB_LP_CAN1_RX0_IRQn=true\:2\:0\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true +PA0-WKUP.GPIOParameters=GPIO_Label +PA0-WKUP.GPIO_Label=IR_RX +PA0-WKUP.Signal=S_TIM2_CH1_ETR +PA10.GPIOParameters=GPIO_Label +PA10.GPIO_Label=DEBUG_PIN +PA10.Signal=GPIO_Output PA11.Mode=Device PA11.Signal=USB_DM PA12.Mode=Device @@ -102,7 +113,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=Other Toolchains (GPDSC) ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-SystemClock_Config-RCC-false-HAL,3-MX_IWDG_Init-IWDG-false-HAL,4-MX_TIM1_Init-TIM1-false-HAL,5-MX_USART2_UART_Init-USART2-false-HAL,6-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL +ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-SystemClock_Config-RCC-false-HAL,3-MX_IWDG_Init-IWDG-false-HAL,4-MX_TIM1_Init-TIM1-false-HAL,5-MX_TIM2_Init-TIM2-false-HAL,6-MX_USART2_UART_Init-USART2-false-HAL,7-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL RCC.ADCFreqValue=36000000 RCC.AHBFreq_Value=72000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 @@ -128,12 +139,22 @@ RCC.VCOOutput2Freq_Value=8000000 SH.S_TIM1_CH1.0=TIM1_CH1,Input_Capture1_from_TI1 SH.S_TIM1_CH1.1=TIM1_CH1,TriggerSource_TI1FP1 SH.S_TIM1_CH1.ConfNb=2 +SH.S_TIM2_CH1_ETR.0=TIM2_CH1,TriggerSource_TI1FP1 +SH.S_TIM2_CH1_ETR.1=TIM2_CH1,Input_Capture1_from_TI1 +SH.S_TIM2_CH1_ETR.2=TIM2_CH1,Input_Capture2_from_TI1 +SH.S_TIM2_CH1_ETR.ConfNb=3 TIM1.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 TIM1.ICFilter_CH1=0 TIM1.ICPolarity_CH1=TIM_INPUTCHANNELPOLARITY_RISING TIM1.IPParameters=Prescaler,Period,Channel-Input_Capture1_from_TI1,ICFilter_CH1,ICPolarity_CH1 TIM1.Period=0xffff TIM1.Prescaler=RADIO_RX_TIMER_PRESCALER +TIM2.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 +TIM2.Channel-Input_Capture2_from_TI1=TIM_CHANNEL_2 +TIM2.ICPolarity_CH1=TIM_INPUTCHANNELPOLARITY_FALLING +TIM2.IPParameters=Channel-Input_Capture1_from_TI1,ICPolarity_CH1,Channel-Input_Capture2_from_TI1,Prescaler,Period +TIM2.Period=0xffff +TIM2.Prescaler=RADIO_RX_TIMER_PRESCALER USART2.IPParameters=VirtualMode USART2.VirtualMode=VM_ASYNC USB_DEVICE.CLASS_NAME_FS=CDC @@ -146,6 +167,8 @@ VP_SYS_VS_Systick.Mode=SysTick VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TIM1_VS_ControllerModeReset.Mode=Reset Mode VP_TIM1_VS_ControllerModeReset.Signal=TIM1_VS_ControllerModeReset +VP_TIM2_VS_ControllerModeReset.Mode=Reset Mode +VP_TIM2_VS_ControllerModeReset.Signal=TIM2_VS_ControllerModeReset VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS.Mode=CDC_FS VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS.Signal=USB_DEVICE_VS_USB_DEVICE_CDC_FS board=radio-controller-1 -- cgit v1.2.3