WebSVN – dashGPS – Diff – /trunk/DashGPS.ioc

 #MicroXplorer Configuration settings - do not modify
-CAN.BS1=CAN_BS1_1TQ
-CAN.BS2=CAN_BS2_1TQ
-CAN.CalculateTimeBit=1500
-CAN.CalculateTimeQuantum=500.0
-CAN.IPParameters=CalculateTimeQuantum,CalculateTimeBit,BS1,BS2
 File.Version=6
 GPIO.groupedBy=
 KeepUserPlacement=false
 Mcu.Family=STM32F1
-Mcu.IP0=CAN
+Mcu.IP0=I2C2
-Mcu.IP1=I2C2
+Mcu.IP1=NVIC
+Mcu.IP10=USB_DEVICE
-Mcu.IP2=NVIC
+Mcu.IP2=RCC
-Mcu.IP3=RCC
+Mcu.IP3=RTC
 Mcu.IP4=SPI1
 Mcu.IP5=SYS
 Mcu.IP6=TIM3
 Mcu.IP7=TIM4
 Mcu.IP8=USART1
+Mcu.IP9=USB
-Mcu.IPNb=9
+Mcu.IPNb=11
 Mcu.Name=STM32F103R(8-B)Tx
 Mcu.Package=LQFP64
 Mcu.Pin0=PC14-OSC32_IN
 Mcu.Pin1=PC15-OSC32_OUT
-Mcu.Pin10=PA10
+Mcu.Pin10=PB11
-Mcu.Pin11=PA11
+Mcu.Pin11=PA9
-Mcu.Pin12=PA12
+Mcu.Pin12=PA10
-Mcu.Pin13=PA13
+Mcu.Pin13=PA11
-Mcu.Pin14=PA14
+Mcu.Pin14=PA12
-Mcu.Pin15=PB6
+Mcu.Pin15=PA13
-Mcu.Pin16=PB7
+Mcu.Pin16=PA14
-Mcu.Pin17=VP_SYS_VS_Systick
+Mcu.Pin17=PB6
-Mcu.Pin18=VP_TIM3_VS_no_output1
+Mcu.Pin18=PB7
-Mcu.Pin19=VP_TIM3_VS_OPM
+Mcu.Pin19=VP_RTC_VS_RTC_Activate
 Mcu.Pin2=PD0-OSC_IN
+Mcu.Pin20=VP_RTC_VS_RTC_Calendar
+Mcu.Pin21=VP_SYS_VS_Systick
+Mcu.Pin22=VP_TIM3_VS_no_output1
+Mcu.Pin23=VP_TIM3_VS_OPM
+Mcu.Pin24=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS
 Mcu.Pin3=PD1-OSC_OUT
-Mcu.Pin4=PA5
+Mcu.Pin4=PA3
-Mcu.Pin5=PA6
+Mcu.Pin5=PA4
-Mcu.Pin6=PA7
+Mcu.Pin6=PA5
-Mcu.Pin7=PB10
+Mcu.Pin7=PA6
-Mcu.Pin8=PB11
+Mcu.Pin8=PA7
-Mcu.Pin9=PA9
+Mcu.Pin9=PB10
-Mcu.PinsNb=20
+Mcu.PinsNb=25
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103RBTx
 MxCube.Version=6.0.1
 MxDb.Version=DB.6.0.0
 NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.USART1_IRQn=true\:0\:0\:false\:false\:false\:true\:false
+NVIC.USB_LP_CAN1_RX0_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
-PA11.Mode=Master
+PA11.Mode=Device
-PA11.Signal=CAN_RX
+PA11.Signal=USB_DM
-PA12.Mode=Master
+PA12.Mode=Device
-PA12.Signal=CAN_TX
+PA12.Signal=USB_DP
 PA13.Mode=Serial_Wire
 PA13.Signal=SYS_JTMS-SWDIO
 PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
+PA3.GPIOParameters=GPIO_Label
+PA3.GPIO_Label=SPI_CD
+PA3.Locked=true
+PA3.Signal=GPIO_Output
+PA4.GPIOParameters=GPIO_Label
+PA4.GPIO_Label=SPI_RESET
+PA4.Locked=true
+PA4.Signal=GPIO_Output
 PA5.GPIOParameters=GPIO_Label
 PA5.GPIO_Label=SPI_SCK
 PA5.Mode=Simplex_Bidirectional_Master
 PA5.Signal=SPI1_SCK
 PA6.GPIOParameters=GPIO_Label
 PB10.Signal=I2C2_SCL
 PB11.Mode=I2C
 PB11.Signal=I2C2_SDA
 PB6.Signal=S_TIM4_CH1
 PB7.Signal=S_TIM4_CH2
-PC14-OSC32_IN.GPIOParameters=GPIO_Label
+PC14-OSC32_IN.Mode=LSE-External-Oscillator
-PC14-OSC32_IN.GPIO_Label=SPI_CD
-PC14-OSC32_IN.Locked=true
-PC14-OSC32_IN.Signal=GPIO_Output
+PC14-OSC32_IN.Signal=RCC_OSC32_IN
-PC15-OSC32_OUT.GPIOParameters=GPIO_Label
+PC15-OSC32_OUT.Mode=LSE-External-Oscillator
-PC15-OSC32_OUT.GPIO_Label=SPI_RESET
-PC15-OSC32_OUT.Locked=true
-PC15-OSC32_OUT.Signal=GPIO_Output
+PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
 PD0-OSC_IN.Mode=HSE-External-Oscillator
 PD0-OSC_IN.Signal=RCC_OSC_IN
 PD1-OSC_OUT.Mode=HSE-External-Oscillator
 PD1-OSC_OUT.Signal=RCC_OSC_OUT
 PinOutPanel.RotationAngle=0
 ProjectManager.RegisterCallBack=
 ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=Makefile
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_CAN_Init-CAN-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true,5-MX_TIM4_Init-TIM4-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_TIM3_Init-TIM3-false-HAL-true,8-MX_I2C2_Init-I2C2-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_SPI1_Init-SPI1-false-HAL-true,4-MX_TIM4_Init-TIM4-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_TIM3_Init-TIM3-false-HAL-true,7-MX_I2C2_Init-I2C2-false-HAL-true,8-MX_RTC_Init-RTC-false-HAL-true,9-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false
-RCC.ADCFreqValue=32000000
+RCC.ADCFreqValue=36000000
-RCC.AHBFreq_Value=64000000
+RCC.AHBFreq_Value=72000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2
-RCC.APB1Freq_Value=32000000
+RCC.APB1Freq_Value=36000000
-RCC.APB1TimFreq_Value=64000000
+RCC.APB1TimFreq_Value=72000000
-RCC.APB2Freq_Value=64000000
+RCC.APB2Freq_Value=72000000
-RCC.APB2TimFreq_Value=64000000
+RCC.APB2TimFreq_Value=72000000
-RCC.FCLKCortexFreq_Value=64000000
+RCC.FCLKCortexFreq_Value=72000000
 RCC.FamilyName=M
-RCC.HCLKFreq_Value=64000000
+RCC.HCLKFreq_Value=72000000
-RCC.IPParameters=ADCFreqValue,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,PLLSourceVirtual,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,VCOOutput2Freq_Value
+RCC.IPParameters=ADCFreqValue,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,PLLSourceVirtual,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,USBPrescaler,VCOOutput2Freq_Value
-RCC.MCOFreq_Value=64000000
+RCC.MCOFreq_Value=72000000
-RCC.PLLCLKFreq_Value=64000000
+RCC.PLLCLKFreq_Value=72000000
-RCC.PLLMCOFreq_Value=32000000
+RCC.PLLMCOFreq_Value=36000000
-RCC.PLLMUL=RCC_PLL_MUL8
+RCC.PLLMUL=RCC_PLL_MUL9
 RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
+RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
+RCC.RTCFreq_Value=32768
-RCC.SYSCLKFreq_VALUE=64000000
+RCC.SYSCLKFreq_VALUE=72000000
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
-RCC.TimSysFreq_Value=64000000
+RCC.TimSysFreq_Value=72000000
-RCC.USBFreq_Value=64000000
+RCC.USBFreq_Value=48000000
+RCC.USBPrescaler=RCC_USBCLKSOURCE_PLL_DIV1_5
 RCC.VCOOutput2Freq_Value=8000000
+RTC.AutoPrediv=RTC_AUTO_1_SECOND
+RTC.IPParameters=AutoPrediv
 SH.S_TIM4_CH1.0=TIM4_CH1,Encoder_Interface
 SH.S_TIM4_CH1.ConfNb=1
 SH.S_TIM4_CH2.0=TIM4_CH2,Encoder_Interface
 SH.S_TIM4_CH2.ConfNb=1
 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_8
 SPI1.CLKPhase=SPI_PHASE_2EDGE
 SPI1.CLKPolarity=SPI_POLARITY_HIGH
-SPI1.CalculateBaudRate=8.0 MBits/s
+SPI1.CalculateBaudRate=9.0 MBits/s
 SPI1.Direction=SPI_DIRECTION_1LINE
 SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler,CLKPolarity,CLKPhase
 SPI1.Mode=SPI_MODE_MASTER
 SPI1.VirtualType=VM_MASTER
 TIM3.Channel-Output\ Compare1\ No\ Output=TIM_CHANNEL_1
 TIM4.IC2Filter=8
 TIM4.IPParameters=EncoderMode,IC1Filter,IC2Filter
 USART1.BaudRate=115200
 USART1.IPParameters=VirtualMode,BaudRate
 USART1.VirtualMode=VM_ASYNC
+USB_DEVICE.APP_RX_DATA_SIZE=80
+USB_DEVICE.APP_TX_DATA_SIZE=500
+USB_DEVICE.CLASS_NAME_FS=CDC
+USB_DEVICE.IPParameters=VirtualMode,VirtualModeFS,CLASS_NAME_FS,USBD_SELF_POWERED,APP_RX_DATA_SIZE,APP_TX_DATA_SIZE
+USB_DEVICE.USBD_SELF_POWERED=0
+USB_DEVICE.VirtualMode=Cdc
+USB_DEVICE.VirtualModeFS=Cdc_FS
+VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled
+VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
+VP_RTC_VS_RTC_Calendar.Mode=RTC_Calendar
+VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM3_VS_OPM.Mode=OPM_bit
 VP_TIM3_VS_OPM.Signal=TIM3_VS_OPM
 VP_TIM3_VS_no_output1.Mode=Output Compare1 No Output
 VP_TIM3_VS_no_output1.Signal=TIM3_VS_no_output1
+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=custom

Subversion Repositories dashGPS

(root)/trunk/DashGPS.ioc – Rev 11 → 13