diff --git a/CubeMX/BuzzerSystem_Buzzer/BuzzerSystem_Buzzer.ioc b/CubeMX/BuzzerSystem_Buzzer/BuzzerSystem_Buzzer.ioc index 58c7a5f..60513f8 100644 --- a/CubeMX/BuzzerSystem_Buzzer/BuzzerSystem_Buzzer.ioc +++ b/CubeMX/BuzzerSystem_Buzzer/BuzzerSystem_Buzzer.ioc @@ -3,58 +3,69 @@ CAD.formats= CAD.pinconfig= CAD.provider= CAN.ABOM=DISABLE -CAN.CalculateBaudRate=111111 -CAN.CalculateTimeBit=9000 -CAN.CalculateTimeQuantum=3000.0 -CAN.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,ABOM -CAN.Prescaler=24 +CAN.BS1=CAN_BS1_13TQ +CAN.BS2=CAN_BS2_2TQ +CAN.CalculateBaudRate=250000 +CAN.CalculateTimeBit=4000 +CAN.CalculateTimeQuantum=250.0 +CAN.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,ABOM,BS1,BS2 +CAN.Prescaler=4 +Dma.Request0=TIM1_CH1 +Dma.RequestsNb=1 +Dma.TIM1_CH1.0.Direction=DMA_MEMORY_TO_PERIPH +Dma.TIM1_CH1.0.Instance=DMA1_Channel2 +Dma.TIM1_CH1.0.MemDataAlignment=DMA_MDATAALIGN_HALFWORD +Dma.TIM1_CH1.0.MemInc=DMA_MINC_ENABLE +Dma.TIM1_CH1.0.Mode=DMA_NORMAL +Dma.TIM1_CH1.0.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD +Dma.TIM1_CH1.0.PeriphInc=DMA_PINC_DISABLE +Dma.TIM1_CH1.0.Priority=DMA_PRIORITY_MEDIUM +Dma.TIM1_CH1.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority File.Version=6 -GPIO.groupedBy= +GPIO.groupedBy=Group By Peripherals KeepUserPlacement=false Mcu.CPN=STM32F103C8T6 Mcu.Family=STM32F1 Mcu.IP0=CAN -Mcu.IP1=NVIC -Mcu.IP2=RCC -Mcu.IP3=SPI1 +Mcu.IP1=DMA +Mcu.IP2=NVIC +Mcu.IP3=RCC Mcu.IP4=SYS Mcu.IP5=TIM1 Mcu.IP6=TIM2 -Mcu.IP7=USART1 +Mcu.IP7=TIM3 Mcu.IPNb=8 Mcu.Name=STM32F103C(8-B)Tx Mcu.Package=LQFP48 Mcu.Pin0=PD0-OSC_IN Mcu.Pin1=PD1-OSC_OUT -Mcu.Pin10=PA13 -Mcu.Pin11=PA14 -Mcu.Pin12=PB3 -Mcu.Pin13=PB6 -Mcu.Pin14=PB7 -Mcu.Pin15=VP_SYS_VS_Systick -Mcu.Pin16=VP_TIM1_VS_ClockSourceINT -Mcu.Pin17=VP_TIM2_VS_ControllerModeClock -Mcu.Pin18=VP_TIM2_VS_ClockSourceITR +Mcu.Pin10=PA14 +Mcu.Pin11=VP_SYS_VS_Systick +Mcu.Pin12=VP_TIM1_VS_ClockSourceINT +Mcu.Pin13=VP_TIM2_VS_ClockSourceINT +Mcu.Pin14=VP_TIM3_VS_ControllerModeClock +Mcu.Pin15=VP_TIM3_VS_ClockSourceITR Mcu.Pin2=PA0-WKUP Mcu.Pin3=PA1 -Mcu.Pin4=PA5 +Mcu.Pin4=PA6 Mcu.Pin5=PA7 Mcu.Pin6=PA8 -Mcu.Pin7=PA9 -Mcu.Pin8=PA11 -Mcu.Pin9=PA12 -Mcu.PinsNb=19 +Mcu.Pin7=PA11 +Mcu.Pin8=PA12 +Mcu.Pin9=PA13 +Mcu.PinsNb=16 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F103C8Tx -MxCube.Version=6.12.0 -MxDb.Version=DB.6.0.120 +MxCube.Version=6.13.0 +MxDb.Version=DB.6.0.130 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:false NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false @@ -66,22 +77,13 @@ PA11.Mode=CAN_Activate PA11.Signal=CAN_RX PA12.Mode=CAN_Activate PA12.Signal=CAN_TX -PA13.Mode=Trace_Asynchronous_SW +PA13.Mode=Serial_Wire PA13.Signal=SYS_JTMS-SWDIO -PA14.Mode=Trace_Asynchronous_SW +PA14.Mode=Serial_Wire PA14.Signal=SYS_JTCK-SWCLK -PA5.Mode=TX_Only_Simplex_Unidirect_Master -PA5.Signal=SPI1_SCK -PA7.Mode=TX_Only_Simplex_Unidirect_Master -PA7.Signal=SPI1_MOSI +PA6.Signal=S_TIM3_CH1 +PA7.Signal=S_TIM3_CH2 PA8.Signal=S_TIM1_CH1 -PA9.Signal=S_TIM1_CH2 -PB3.Mode=Trace_Asynchronous_SW -PB3.Signal=SYS_JTDO-TRACESWO -PB6.Mode=Asynchronous -PB6.Signal=USART1_TX -PB7.Mode=Asynchronous -PB7.Signal=USART1_RX PD0-OSC_IN.Mode=HSE-External-Oscillator PD0-OSC_IN.Signal=RCC_OSC_IN PD1-OSC_OUT.Mode=HSE-External-Oscillator @@ -96,7 +98,7 @@ ProjectManager.CustomerFirmwarePackage= ProjectManager.DefaultFWLocation=true ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32F103C8Tx -ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.8.5 +ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.8.6 ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x200 @@ -117,49 +119,63 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_CAN_Init-CAN-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true -RCC.APB1Freq_Value=8000000 -RCC.APB2Freq_Value=8000000 +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_CAN_Init-CAN-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_TIM3_Init-TIM3-false-HAL-true +RCC.ADCFreqValue=8000000 +RCC.AHBFreq_Value=32000000 +RCC.APB1CLKDivider=RCC_HCLK_DIV2 +RCC.APB1Freq_Value=16000000 +RCC.APB1TimFreq_Value=32000000 +RCC.APB2CLKDivider=RCC_HCLK_DIV2 +RCC.APB2Freq_Value=16000000 +RCC.APB2TimFreq_Value=32000000 +RCC.EnbaleCSS=true +RCC.FCLKCortexFreq_Value=32000000 RCC.FamilyName=M -RCC.IPParameters=APB1Freq_Value,APB2Freq_Value,FamilyName,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLSourceVirtual,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,VCOOutput2Freq_Value -RCC.PLLCLKFreq_Value=16000000 -RCC.PLLMCOFreq_Value=8000000 +RCC.HCLKFreq_Value=32000000 +RCC.HSE_VALUE=16000000 +RCC.IPParameters=ADCFreqValue,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,EnbaleCSS,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLSourceVirtual,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,VCOOutput2Freq_Value +RCC.MCOFreq_Value=32000000 +RCC.PLLCLKFreq_Value=32000000 +RCC.PLLMCOFreq_Value=16000000 RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE -RCC.SYSCLKSource=RCC_SYSCLKSOURCE_HSE -RCC.TimSysFreq_Value=8000000 -RCC.USBFreq_Value=16000000 -RCC.VCOOutput2Freq_Value=8000000 -SH.S_TIM1_CH1.0=TIM1_CH1,Input_Capture1_from_TI1 +RCC.SYSCLKFreq_VALUE=32000000 +RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK +RCC.TimSysFreq_Value=32000000 +RCC.USBFreq_Value=32000000 +RCC.VCOOutput2Freq_Value=16000000 +SH.S_TIM1_CH1.0=TIM1_CH1,PWM Generation1 CH1 SH.S_TIM1_CH1.ConfNb=1 -SH.S_TIM1_CH2.0=TIM1_CH2,Input_Capture2_from_TI2 -SH.S_TIM1_CH2.ConfNb=1 SH.S_TIM2_CH1_ETR.0=TIM2_CH1,Input_Capture1_from_TI1 SH.S_TIM2_CH1_ETR.ConfNb=1 SH.S_TIM2_CH2.0=TIM2_CH2,Input_Capture2_from_TI2 SH.S_TIM2_CH2.ConfNb=1 -SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_16 -SPI1.CalculateBaudRate=500.0 KBits/s -SPI1.DataSize=SPI_DATASIZE_8BIT -SPI1.Direction=SPI_DIRECTION_2LINES -SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler,DataSize -SPI1.Mode=SPI_MODE_MASTER -SPI1.VirtualType=VM_MASTER -TIM1.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 -TIM1.Channel-Input_Capture2_from_TI2=TIM_CHANNEL_2 -TIM1.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI2,TIM_MasterSlaveMode,TIM_MasterOutputTrigger +SH.S_TIM3_CH1.0=TIM3_CH1,Input_Capture1_from_TI1 +SH.S_TIM3_CH1.ConfNb=1 +SH.S_TIM3_CH2.0=TIM3_CH2,Input_Capture2_from_TI2 +SH.S_TIM3_CH2.ConfNb=1 +TIM1.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1 +TIM1.IPParameters=TIM_MasterSlaveMode,TIM_MasterOutputTrigger,Channel-PWM Generation1 CH1,Prescaler,Pulse-PWM Generation1 CH1 +TIM1.Prescaler=1638 +TIM1.Pulse-PWM\ Generation1\ CH1=546 TIM1.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE -TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_ENABLE +TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE TIM2.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 TIM2.Channel-Input_Capture2_from_TI2=TIM_CHANNEL_2 -TIM2.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI2 -USART1.IPParameters=VirtualMode -USART1.VirtualMode=VM_ASYNC +TIM2.ClockDivision=TIM_CLOCKDIVISION_DIV4 +TIM2.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI2,TIM_MasterSlaveMode,ClockDivision,TIM_MasterOutputTrigger +TIM2.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE +TIM2.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_ENABLE +TIM3.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 +TIM3.Channel-Input_Capture2_from_TI2=TIM_CHANNEL_2 +TIM3.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI2 VP_SYS_VS_Systick.Mode=SysTick VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TIM1_VS_ClockSourceINT.Mode=Internal VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT -VP_TIM2_VS_ClockSourceITR.Mode=TriggerSource_ITR0 -VP_TIM2_VS_ClockSourceITR.Signal=TIM2_VS_ClockSourceITR -VP_TIM2_VS_ControllerModeClock.Mode=Clock Mode -VP_TIM2_VS_ControllerModeClock.Signal=TIM2_VS_ControllerModeClock +VP_TIM2_VS_ClockSourceINT.Mode=Internal +VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT +VP_TIM3_VS_ClockSourceITR.Mode=TriggerSource_ITR1 +VP_TIM3_VS_ClockSourceITR.Signal=TIM3_VS_ClockSourceITR +VP_TIM3_VS_ControllerModeClock.Mode=Clock Mode +VP_TIM3_VS_ControllerModeClock.Signal=TIM3_VS_ControllerModeClock board=custom