Ignore:
Timestamp:
Aug 19, 2025, 11:24:24 AM (8 days ago)
Author:
f.jahn
Message:

Timer16 was substituted with Timer3.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/firmware_v2/firmware_v2.ioc

    r19 r20  
    3737Dma.ADC1.0.SyncSignalID=NONE
    3838Dma.Request0=ADC1
    39 Dma.Request1=TIM16_CH1
     39Dma.Request1=TIM3_CH1
    4040Dma.RequestsNb=2
    41 Dma.TIM16_CH1.1.Direction=DMA_PERIPH_TO_MEMORY
    42 Dma.TIM16_CH1.1.EventEnable=DISABLE
    43 Dma.TIM16_CH1.1.Instance=DMA1_Channel2
    44 Dma.TIM16_CH1.1.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
    45 Dma.TIM16_CH1.1.MemInc=DMA_MINC_ENABLE
    46 Dma.TIM16_CH1.1.Mode=DMA_CIRCULAR
    47 Dma.TIM16_CH1.1.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
    48 Dma.TIM16_CH1.1.PeriphInc=DMA_PINC_DISABLE
    49 Dma.TIM16_CH1.1.Polarity=HAL_DMAMUX_REQ_GEN_RISING
    50 Dma.TIM16_CH1.1.Priority=DMA_PRIORITY_LOW
    51 Dma.TIM16_CH1.1.RequestNumber=1
    52 Dma.TIM16_CH1.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber
    53 Dma.TIM16_CH1.1.SignalID=NONE
    54 Dma.TIM16_CH1.1.SyncEnable=DISABLE
    55 Dma.TIM16_CH1.1.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
    56 Dma.TIM16_CH1.1.SyncRequestNumber=1
    57 Dma.TIM16_CH1.1.SyncSignalID=NONE
     41Dma.TIM3_CH1.1.Direction=DMA_PERIPH_TO_MEMORY
     42Dma.TIM3_CH1.1.EventEnable=DISABLE
     43Dma.TIM3_CH1.1.Instance=DMA1_Channel2
     44Dma.TIM3_CH1.1.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
     45Dma.TIM3_CH1.1.MemInc=DMA_MINC_ENABLE
     46Dma.TIM3_CH1.1.Mode=DMA_CIRCULAR
     47Dma.TIM3_CH1.1.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
     48Dma.TIM3_CH1.1.PeriphInc=DMA_PINC_DISABLE
     49Dma.TIM3_CH1.1.Polarity=HAL_DMAMUX_REQ_GEN_RISING
     50Dma.TIM3_CH1.1.Priority=DMA_PRIORITY_LOW
     51Dma.TIM3_CH1.1.RequestNumber=1
     52Dma.TIM3_CH1.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber
     53Dma.TIM3_CH1.1.SignalID=NONE
     54Dma.TIM3_CH1.1.SyncEnable=DISABLE
     55Dma.TIM3_CH1.1.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
     56Dma.TIM3_CH1.1.SyncRequestNumber=1
     57Dma.TIM3_CH1.1.SyncSignalID=NONE
    5858File.Version=6
    5959GPIO.groupedBy=Group By Peripherals
    … …  
    6868Mcu.IP5=RCC
    6969Mcu.IP6=SYS
    70 Mcu.IP7=TIM16
     70Mcu.IP7=TIM3
    7171Mcu.IP8=TIM17
    7272Mcu.IP9=USART1
    … …  
    9696Mcu.Pin27=VP_ADC1_TempSens_Input
    9797Mcu.Pin28=VP_SYS_VS_Systick
    98 Mcu.Pin29=VP_TIM16_VS_ClockSourceINT
     98Mcu.Pin29=VP_TIM3_VS_ClockSourceINT
    9999Mcu.Pin3=PA0
    100100Mcu.Pin30=VP_TIM17_VS_ClockSourceINT
    … …  
    119119NVIC.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true
    120120NVIC.SysTick_IRQn=true\:3\:0\:false\:false\:true\:false\:true\:false
    121 NVIC.TIM16_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
     121NVIC.TIM3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
    122122PA0.GPIOParameters=GPIO_PuPd,GPIO_Label
    123123PA0.GPIO_Label=GPIO_INPUT_LVP
    … …  
    162162PA6.GPIO_PuPd=GPIO_PULLUP
    163163PA6.Locked=true
    164 PA6.Signal=S_TIM16_CH1
     164PA6.Signal=S_TIM3_CH1
    165165PA7.GPIOParameters=GPIO_Label
    166166PA7.GPIO_Label=FAN_PWM
    … …  
    264264ProjectManager.UAScriptBeforePath=
    265265ProjectManager.UnderRoot=false
    266 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_TIM16_Init-TIM16-false-HAL-true,6-MX_TIM17_Init-TIM17-false-HAL-true,7-MX_USART1_UART_Init-USART1-false-HAL-true,0-MX_CORTEX_M0+_Init-CORTEX_M0+-false-HAL-true
     266ProjectManager.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_TIM17_Init-TIM17-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_TIM3_Init-TIM3-false-HAL-true,0-MX_CORTEX_M0+_Init-CORTEX_M0+-false-HAL-true
    267267RCC.ADCFreq_Value=12000000
    268268RCC.AHBFreq_Value=12000000
    … …  
    287287RCC.SYSCLKFreq_VALUE=12000000
    288288RCC.USART1Freq_Value=12000000
    289 SH.S_TIM16_CH1.0=TIM16_CH1,Input_Capture1_from_TI1
    290 SH.S_TIM16_CH1.ConfNb=1
    291289SH.S_TIM17_CH1.0=TIM17_CH1,PWM Generation1 CH1
    292290SH.S_TIM17_CH1.ConfNb=1
    293 TIM16.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
    294 TIM16.Channel=TIM_CHANNEL_1
    295 TIM16.ICPolarity_CH1=TIM_INPUTCHANNELPOLARITY_FALLING
    296 TIM16.IPParameters=Channel,Prescaler,AutoReloadPreload,ICPolarity_CH1
    297 TIM16.Prescaler=3
     291SH.S_TIM3_CH1.0=TIM3_CH1,Input_Capture1_from_TI1
     292SH.S_TIM3_CH1.ConfNb=1
    298293TIM17.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
    299294TIM17.Channel=TIM_CHANNEL_1
    … …  
    302297TIM17.Period=479
    303298TIM17.Pulse=64
     299TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
     300TIM3.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1
     301TIM3.ICPolarity_CH1=TIM_INPUTCHANNELPOLARITY_FALLING
     302TIM3.IPParameters=Channel-Input_Capture1_from_TI1,Prescaler,AutoReloadPreload,ICPolarity_CH1
     303TIM3.Prescaler=3
    304304USART1.IPParameters=VirtualMode-Asynchronous
    305305USART1.VirtualMode-Asynchronous=VM_ASYNC
    … …  
    308308VP_SYS_VS_Systick.Mode=SysTick
    309309VP_SYS_VS_Systick.Signal=SYS_VS_Systick
    310 VP_TIM16_VS_ClockSourceINT.Mode=Enable_Timer
    311 VP_TIM16_VS_ClockSourceINT.Signal=TIM16_VS_ClockSourceINT
    312310VP_TIM17_VS_ClockSourceINT.Mode=Enable_Timer
    313311VP_TIM17_VS_ClockSourceINT.Signal=TIM17_VS_ClockSourceINT
     312VP_TIM3_VS_ClockSourceINT.Mode=Internal
     313VP_TIM3_VS_ClockSourceINT.Signal=TIM3_VS_ClockSourceINT
    314314board=custom
Note: See TracChangeset for help on using the changeset viewer.