From f599624b6f05f0006543f08c865a72061b1f998a Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 14 Apr 2018 13:37:42 +1000 Subject: I2C into nicer wrapper for FreeRToS --- Development Resources/TS100/TS100.ioc | 53 +++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 24 deletions(-) (limited to 'Development Resources') diff --git a/Development Resources/TS100/TS100.ioc b/Development Resources/TS100/TS100.ioc index e2eeaf5f..837f5914 100644 --- a/Development Resources/TS100/TS100.ioc +++ b/Development Resources/TS100/TS100.ioc @@ -50,7 +50,7 @@ Dma.I2C1_RX.0.MemInc=DMA_MINC_ENABLE Dma.I2C1_RX.0.Mode=DMA_NORMAL Dma.I2C1_RX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE Dma.I2C1_RX.0.PeriphInc=DMA_PINC_DISABLE -Dma.I2C1_RX.0.Priority=DMA_PRIORITY_LOW +Dma.I2C1_RX.0.Priority=DMA_PRIORITY_MEDIUM Dma.I2C1_RX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority Dma.I2C1_TX.1.Direction=DMA_MEMORY_TO_PERIPH Dma.I2C1_TX.1.Instance=DMA1_Channel6 @@ -59,7 +59,7 @@ Dma.I2C1_TX.1.MemInc=DMA_MINC_ENABLE Dma.I2C1_TX.1.Mode=DMA_NORMAL Dma.I2C1_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE Dma.I2C1_TX.1.PeriphInc=DMA_PINC_DISABLE -Dma.I2C1_TX.1.Priority=DMA_PRIORITY_LOW +Dma.I2C1_TX.1.Priority=DMA_PRIORITY_MEDIUM Dma.I2C1_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority Dma.Request0=I2C1_RX Dma.Request1=I2C1_TX @@ -74,8 +74,9 @@ FREERTOS.configMINIMAL_STACK_SIZE=256 FREERTOS.configTICK_RATE_HZ=100 FREERTOS.configTOTAL_HEAP_SIZE=10240 File.Version=6 +I2C1.DutyCycle=I2C_DUTYCYCLE_2 I2C1.I2C_Mode=I2C_Fast -I2C1.IPParameters=I2C_Mode +I2C1.IPParameters=I2C_Mode,DutyCycle IWDG.IPParameters=Prescaler IWDG.Prescaler=IWDG_PRESCALER_256 KeepUserPlacement=false @@ -111,27 +112,30 @@ Mcu.Pin7=PA14 Mcu.Pin8=PB3 Mcu.Pin9=PB4 Mcu.PinsNb=18 +Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F103T8Ux -MxCube.Version=4.22.0 -MxDb.Version=DB.4.0.220 -NVIC.ADC1_2_IRQn=true\:5\:0\:false\:false\:true\:true -NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false -NVIC.DMA1_Channel1_IRQn=true\:5\:0\:false\:false\:true\:true -NVIC.DMA1_Channel6_IRQn=true\:5\:0\:false\:false\:true\:true -NVIC.DMA1_Channel7_IRQn=true\:5\:0\:false\:false\:true\:true -NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false -NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false -NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false -NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false -NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true +MxCube.Version=4.25.0 +MxDb.Version=DB.4.0.250 +NVIC.ADC1_2_IRQn=true\:5\:0\:false\:false\:true\:true\:true +NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.DMA1_Channel1_IRQn=true\:5\:0\:false\:false\:true\:true\:true +NVIC.DMA1_Channel6_IRQn=true\:5\:0\:false\:false\:true\:true\:true +NVIC.DMA1_Channel7_IRQn=true\:5\:0\:false\:false\:true\:true\:true +NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.I2C1_ER_IRQn=true\:5\:0\:false\:false\:true\:true\:true +NVIC.I2C1_EV_IRQn=true\:5\:0\:false\:false\:true\:true\:true +NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true\:true NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 -NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false -NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true -NVIC.TIM1_UP_IRQn=true\:0\:0\:false\:false\:true\:false +NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:true +NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true\:true +NVIC.TIM1_UP_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.TimeBase=TIM1_UP_IRQn NVIC.TimeBaseIP=TIM1 -NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false +NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:true PA13.Locked=true PA13.Mode=Serial_Wire PA13.Signal=SYS_JTMS-SWDIO @@ -193,29 +197,30 @@ PCC.Vdd=3.3 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false -ProjectManager.CompilerOptimize=2 +ProjectManager.CompilerOptimize=3 ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false -ProjectManager.CustomerFirmwarePackage=C\:/Users/Ben V. Brown/STM32Cube/Repository/STM32Cube_FW_F1_V1.6.0 +ProjectManager.CustomerFirmwarePackage=C\:/Users/Ralim/STM32Cube/Repository/STM32Cube_FW_F1_V1.6.1 ProjectManager.DefaultFWLocation=true ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32F103T8Ux -ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.6.0 +ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.6.1 ProjectManager.FreePins=true ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x200 ProjectManager.KeepUserCode=true ProjectManager.LastFirmware=true ProjectManager.LibraryCopy=1 +ProjectManager.MainLocation=Src ProjectManager.PreviousToolchain=SW4STM32 ProjectManager.ProjectBuild=false ProjectManager.ProjectFileName=TS100.ioc ProjectManager.ProjectName=TS100 ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=SW4STM32 -ProjectManager.ToolChainLocation=C\:\\Users\\Ralim\\Repo\\ts100\\TS100 +ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-MX_DMA_Init-DMA-false-HAL,3-MX_I2C1_Init-I2C1-false-HAL,4-MX_ADC1_Init-ADC1-false-HAL,5-SystemClock_Config-RCC-false-HAL,6-MX_TIM3_Init-TIM3-false-HAL,7-MX_IWDG_Init-IWDG-false-HAL +ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-MX_I2C1_Init-I2C1-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-SystemClock_Config-RCC-false-HAL-true,6-MX_TIM3_Init-TIM3-false-HAL-true,7-MX_IWDG_Init-IWDG-false-HAL-true RCC.ADCFreqValue=8000000 RCC.ADCPresc=RCC_ADCPCLK2_DIV8 RCC.AHBFreq_Value=64000000 -- cgit v1.2.3