diff --git a/Power_Pico/power_pico.ioc b/Power_Pico/power_pico.ioc index e8280bf..09134be 100644 --- a/Power_Pico/power_pico.ioc +++ b/Power_Pico/power_pico.ioc @@ -1,15 +1,39 @@ #MicroXplorer Configuration settings - do not modify ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_5 -ADC1.IPParameters=Rank-0\#ChannelRegularConversion,master,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,NbrOfConversionFlag +ADC1.Channel-1\#ChannelRegularConversion=ADC_CHANNEL_6 +ADC1.Channel-2\#ChannelRegularConversion=ADC_CHANNEL_7 +ADC1.Channel-3\#ChannelRegularConversion=ADC_CHANNEL_8 +ADC1.DMAContinuousRequests=ENABLE +ADC1.ExternalTrigConv=ADC_EXTERNALTRIGCONV_T2_TRGO +ADC1.IPParameters=Rank-0\#ChannelRegularConversion,master,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,NbrOfConversionFlag,ExternalTrigConv,DMAContinuousRequests,NbrOfConversion,Rank-1\#ChannelRegularConversion,Channel-1\#ChannelRegularConversion,SamplingTime-1\#ChannelRegularConversion,Rank-2\#ChannelRegularConversion,Channel-2\#ChannelRegularConversion,SamplingTime-2\#ChannelRegularConversion,Rank-3\#ChannelRegularConversion,Channel-3\#ChannelRegularConversion,SamplingTime-3\#ChannelRegularConversion +ADC1.NbrOfConversion=4 ADC1.NbrOfConversionFlag=1 ADC1.Rank-0\#ChannelRegularConversion=1 -ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_3CYCLES +ADC1.Rank-1\#ChannelRegularConversion=2 +ADC1.Rank-2\#ChannelRegularConversion=3 +ADC1.Rank-3\#ChannelRegularConversion=4 +ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_144CYCLES +ADC1.SamplingTime-1\#ChannelRegularConversion=ADC_SAMPLETIME_144CYCLES +ADC1.SamplingTime-2\#ChannelRegularConversion=ADC_SAMPLETIME_144CYCLES +ADC1.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_144CYCLES ADC1.master=1 CAD.formats= CAD.pinconfig= CAD.provider= +Dma.ADC1.2.Direction=DMA_PERIPH_TO_MEMORY +Dma.ADC1.2.FIFOMode=DMA_FIFOMODE_DISABLE +Dma.ADC1.2.Instance=DMA2_Stream0 +Dma.ADC1.2.MemDataAlignment=DMA_MDATAALIGN_HALFWORD +Dma.ADC1.2.MemInc=DMA_MINC_ENABLE +Dma.ADC1.2.Mode=DMA_CIRCULAR +Dma.ADC1.2.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD +Dma.ADC1.2.PeriphInc=DMA_PINC_DISABLE +Dma.ADC1.2.Priority=DMA_PRIORITY_LOW +Dma.ADC1.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode Dma.Request0=SPI2_TX -Dma.RequestsNb=1 +Dma.Request1=USART6_RX +Dma.Request2=ADC1 +Dma.RequestsNb=3 Dma.SPI2_TX.0.Direction=DMA_MEMORY_TO_PERIPH Dma.SPI2_TX.0.FIFOMode=DMA_FIFOMODE_DISABLE Dma.SPI2_TX.0.Instance=DMA1_Stream4 @@ -20,8 +44,19 @@ Dma.SPI2_TX.0.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD Dma.SPI2_TX.0.PeriphInc=DMA_PINC_DISABLE Dma.SPI2_TX.0.Priority=DMA_PRIORITY_LOW Dma.SPI2_TX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode -FREERTOS.IPParameters=Tasks01 +Dma.USART6_RX.1.Direction=DMA_PERIPH_TO_MEMORY +Dma.USART6_RX.1.FIFOMode=DMA_FIFOMODE_DISABLE +Dma.USART6_RX.1.Instance=DMA2_Stream1 +Dma.USART6_RX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE +Dma.USART6_RX.1.MemInc=DMA_MINC_ENABLE +Dma.USART6_RX.1.Mode=DMA_NORMAL +Dma.USART6_RX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE +Dma.USART6_RX.1.PeriphInc=DMA_PINC_DISABLE +Dma.USART6_RX.1.Priority=DMA_PRIORITY_LOW +Dma.USART6_RX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode +FREERTOS.IPParameters=Tasks01,configUSE_TICK_HOOK FREERTOS.Tasks01=defaultTask,24,128,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL +FREERTOS.configUSE_TICK_HOOK=1 File.Version=6 GPIO.groupedBy= KeepUserPlacement=false @@ -29,7 +64,8 @@ Mcu.CPN=STM32F411CEU6 Mcu.Family=STM32F4 Mcu.IP0=ADC1 Mcu.IP1=DMA -Mcu.IP10=USART6 +Mcu.IP10=TIM4 +Mcu.IP11=USART6 Mcu.IP2=FREERTOS Mcu.IP3=I2C1 Mcu.IP4=NVIC @@ -37,27 +73,29 @@ Mcu.IP5=RCC Mcu.IP6=SPI2 Mcu.IP7=SYS Mcu.IP8=TIM1 -Mcu.IP9=TIM4 -Mcu.IPNb=11 +Mcu.IP9=TIM2 +Mcu.IPNb=12 Mcu.Name=STM32F411C(C-E)Ux Mcu.Package=UFQFPN48 Mcu.Pin0=PC13-ANTI_TAMP Mcu.Pin1=PA5 -Mcu.Pin10=PA14 -Mcu.Pin11=PB6 -Mcu.Pin12=PB7 -Mcu.Pin13=PB9 -Mcu.Pin14=VP_FREERTOS_VS_CMSIS_V2 -Mcu.Pin15=VP_SYS_VS_tim11 +Mcu.Pin10=PA13 +Mcu.Pin11=PA14 +Mcu.Pin12=PB6 +Mcu.Pin13=PB7 +Mcu.Pin14=PB9 +Mcu.Pin15=VP_FREERTOS_VS_CMSIS_V2 +Mcu.Pin16=VP_SYS_VS_tim11 +Mcu.Pin17=VP_TIM2_VS_ClockSourceITR Mcu.Pin2=PA6 Mcu.Pin3=PA7 -Mcu.Pin4=PB13 -Mcu.Pin5=PB15 -Mcu.Pin6=PA10 -Mcu.Pin7=PA11 -Mcu.Pin8=PA12 -Mcu.Pin9=PA13 -Mcu.PinsNb=16 +Mcu.Pin4=PB0 +Mcu.Pin5=PB13 +Mcu.Pin6=PB15 +Mcu.Pin7=PA10 +Mcu.Pin8=PA11 +Mcu.Pin9=PA12 +Mcu.PinsNb=18 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F411CEUx @@ -65,6 +103,8 @@ MxCube.Version=6.14.1 MxDb.Version=DB.6.0.141 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false NVIC.DMA1_Stream4_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true +NVIC.DMA2_Stream0_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true +NVIC.DMA2_Stream1_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false NVIC.ForceEnableDMAVector=true NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false @@ -80,6 +120,7 @@ NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:true\:false NVIC.TIM1_TRG_COM_TIM11_IRQn=true\:15\:0\:false\:false\:true\:false\:false\:true\:true NVIC.TimeBase=TIM1_TRG_COM_TIM11_IRQn NVIC.TimeBaseIP=TIM11 +NVIC.USART6_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false PA10.Locked=true PA10.Signal=S_TIM1_CH3 @@ -97,6 +138,8 @@ PA6.Locked=true PA6.Signal=ADCx_IN6 PA7.Locked=true PA7.Signal=ADCx_IN7 +PB0.Locked=true +PB0.Signal=ADCx_IN8 PB13.Locked=true PB13.Mode=TX_Only_Simplex_Unidirect_Master PB13.Signal=SPI2_SCK @@ -145,7 +188,7 @@ 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_DMA_Init-DMA-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_TIM4_Init-TIM4-false-HAL-true,7-MX_USART6_UART_Init-USART6-false-HAL-true,8-MX_SPI2_Init-SPI2-false-HAL-true,9-MX_I2C1_Init-I2C1-false-HAL-true +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_ADC1_Init-ADC1-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_TIM4_Init-TIM4-false-HAL-true,7-MX_USART6_UART_Init-USART6-false-HAL-true,8-MX_SPI2_Init-SPI2-false-HAL-true,9-MX_I2C1_Init-I2C1-false-HAL-true,10-MX_TIM2_Init-TIM2-false-HAL-true RCC.48MHZClocksFreq_Value=50000000 RCC.AHBFreq_Value=100000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 @@ -183,6 +226,8 @@ SH.ADCx_IN6.0=ADC1_IN6,IN6 SH.ADCx_IN6.ConfNb=1 SH.ADCx_IN7.0=ADC1_IN7,IN7 SH.ADCx_IN7.ConfNb=1 +SH.ADCx_IN8.0=ADC1_IN8,IN8 +SH.ADCx_IN8.ConfNb=1 SH.S_TIM1_CH3.0=TIM1_CH3,PWM Generation3 CH3 SH.S_TIM1_CH3.ConfNb=1 SH.S_TIM4_CH4.0=TIM4_CH4,PWM Generation4 CH4 @@ -198,6 +243,11 @@ TIM1.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 TIM1.IPParameters=Prescaler,Period,Channel-PWM Generation3 CH3 TIM1.Period=300 TIM1.Prescaler=99 +TIM2.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE +TIM2.IPParameters=Prescaler,Period,TIM_MasterOutputTrigger,AutoReloadPreload +TIM2.Period=999 +TIM2.Prescaler=9 +TIM2.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE TIM4.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 TIM4.IPParameters=Prescaler,Channel-PWM Generation4 CH4,Period TIM4.Period=250 @@ -208,5 +258,7 @@ VP_FREERTOS_VS_CMSIS_V2.Mode=CMSIS_V2 VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2 VP_SYS_VS_tim11.Mode=TIM11 VP_SYS_VS_tim11.Signal=SYS_VS_tim11 +VP_TIM2_VS_ClockSourceITR.Mode=TriggerSource_ITR0 +VP_TIM2_VS_ClockSourceITR.Signal=TIM2_VS_ClockSourceITR board=custom rtos.0.ip=FREERTOS