diff --git a/.cproject b/.cproject index aafece0..dab6717 100644 --- a/.cproject +++ b/.cproject @@ -22,10 +22,10 @@ - + - + @@ -82,6 +82,7 @@ + @@ -111,7 +112,7 @@ - + @@ -128,6 +129,7 @@ + @@ -167,6 +169,7 @@ + diff --git a/NaviKit_stm32 Debug.launch b/NaviKit_stm32 Debug.launch index 9347e57..eadc6f3 100644 --- a/NaviKit_stm32 Debug.launch +++ b/NaviKit_stm32 Debug.launch @@ -2,7 +2,7 @@ - + diff --git a/NaviKit_stm32.ioc b/NaviKit_stm32.ioc index d3a1198..a449058 100644 --- a/NaviKit_stm32.ioc +++ b/NaviKit_stm32.ioc @@ -1,10 +1,32 @@ #MicroXplorer Configuration settings - do not modify +ARM.CMSIS.5.6.0.CMSISJjCORE=true +ARM.CMSIS.5.6.0.CMSISJjDSP=Library +ARM.CMSIS.5.6.0.CMSISJjNNOoLib=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjCANJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjEthernetJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjEthernetOoMACJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjEthernetOoPHYJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjFlashJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjI2CJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjMCIJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjNANDJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjSAIJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjSPIJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjUSARTJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjUSBOoDeviceJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjUSBOoDevice_Checked=false +ARM.CMSIS.5.6.0.CMSISOoDriverJjUSBOoHostJjCustom=true +ARM.CMSIS.5.6.0.CMSISOoDriverJjWiFiJjCustom=true +ARM.CMSIS.5.6.0.DeviceJjIRQOoControllerJjGIC=true +ARM.CMSIS.5.6.0.DeviceJjOSOoTickJjPrivateOoTimer=true +ARM.CMSIS.5.6.0.DeviceJjStartup=COoStartup +ARM.CMSIS.5.6.0.IPParameters=CMSISJjCORE,CMSISJjNNOoLib,DeviceJjIRQOoControllerJjGIC,DeviceJjOSOoTickJjPrivateOoTimer,CMSISOoDriverJjUSARTJjCustom,CMSISOoDriverJjSPIJjCustom,CMSISOoDriverJjSAIJjCustom,CMSISOoDriverJjI2CJjCustom,CMSISOoDriverJjCANJjCustom,CMSISOoDriverJjFlashJjCustom,CMSISOoDriverJjMCIJjCustom,CMSISOoDriverJjNANDJjCustom,CMSISOoDriverJjEthernetJjCustom,CMSISOoDriverJjEthernetOoMACJjCustom,CMSISOoDriverJjEthernetOoPHYJjCustom,CMSISOoDriverJjUSBOoDeviceJjCustom,CMSISOoDriverJjUSBOoHostJjCustom,CMSISOoDriverJjWiFiJjCustom,CMSISJjDSP,DeviceJjStartup +ARM.CMSIS.5.6.0_SwParameter=CMSISOoDriverJjUSARTJjCustom\:true;DeviceJjOSOoTickJjPrivateOoTimer\:true;CMSISOoDriverJjUSBOoDeviceJjCustom\:true;CMSISOoDriverJjCANJjCustom\:true;CMSISJjCORE\:true;CMSISOoDriverJjFlashJjCustom\:true;CMSISOoDriverJjNANDJjCustom\:true;CMSISOoDriverJjEthernetJjCustom\:true;CMSISOoDriverJjEthernetOoMACJjCustom\:true;CMSISOoDriverJjUSBOoHostJjCustom\:true;CMSISOoDriverJjSAIJjCustom\:true;CMSISOoDriverJjWiFiJjCustom\:true;CMSISJjDSP\:Library;CMSISOoDriverJjSPIJjCustom\:true;CMSISOoDriverJjMCIJjCustom\:true;CMSISOoDriverJjEthernetOoPHYJjCustom\:true;DeviceJjIRQOoControllerJjGIC\:true;CMSISJjNNOoLib\:true;DeviceJjStartup\:COoStartup;CMSISOoDriverJjI2CJjCustom\:true; FREERTOS.FootprintOK=true FREERTOS.INCLUDE_xTaskGetCurrentTaskHandle=1 FREERTOS.INCLUDE_xTaskGetHandle=1 -FREERTOS.IPParameters=Tasks01,configMAX_TASK_NAME_LEN,configUSE_TICKLESS_IDLE,INCLUDE_xTaskGetCurrentTaskHandle,INCLUDE_xTaskGetHandle,configUSE_APPLICATION_TASK_TAG,FootprintOK,Queues01 -FREERTOS.Queues01=printfQueue,128,uint8_t,0,Dynamic,NULL,NULL -FREERTOS.Tasks01=defaultTask,24,128,startDefaultTask,Default,NULL,Dynamic,NULL,NULL;LEDBlinkTask,24,128,startLEDBlinkTask,Default,NULL,Dynamic,NULL,NULL;IWDGRefreshTask,24,128,startIWDGRefreshTask,Default,NULL,Dynamic,NULL,NULL;printfTask,8,256,startPrintfTask,Default,NULL,Dynamic,NULL,NULL +FREERTOS.IPParameters=Tasks01,configMAX_TASK_NAME_LEN,configUSE_TICKLESS_IDLE,INCLUDE_xTaskGetCurrentTaskHandle,INCLUDE_xTaskGetHandle,configUSE_APPLICATION_TASK_TAG,FootprintOK +FREERTOS.Tasks01=defaultTask,24,128,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL;LedBlinkTask,8,128,StartLedBlinkTask,Default,NULL,Dynamic,NULL,NULL;IWDGRefreshTask,40,128,StartIWDGRefreshTask,Default,NULL,Dynamic,NULL,NULL FREERTOS.configMAX_TASK_NAME_LEN=32 FREERTOS.configUSE_APPLICATION_TASK_TAG=1 FREERTOS.configUSE_TICKLESS_IDLE=1 @@ -42,25 +64,27 @@ Mcu.Pin19=PD5 Mcu.Pin2=OSC_IN Mcu.Pin20=PD6 Mcu.Pin21=PD7 -Mcu.Pin22=PB6 -Mcu.Pin23=PB7 -Mcu.Pin24=PB8 -Mcu.Pin25=PB9 -Mcu.Pin26=PE0 -Mcu.Pin27=PE1 -Mcu.Pin28=VP_FREERTOS_VS_CMSIS_V2 -Mcu.Pin29=VP_IWDG_VS_IWDG +Mcu.Pin22=PB3 +Mcu.Pin23=PB6 +Mcu.Pin24=PB7 +Mcu.Pin25=PB8 +Mcu.Pin26=PB9 +Mcu.Pin27=PE0 +Mcu.Pin28=PE1 +Mcu.Pin29=VP_FREERTOS_VS_CMSIS_V2 Mcu.Pin3=OSC_OUT -Mcu.Pin30=VP_SYS_VS_tim7 -Mcu.Pin31=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS +Mcu.Pin30=VP_IWDG_VS_IWDG +Mcu.Pin31=VP_SYS_VS_tim1 +Mcu.Pin32=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS Mcu.Pin4=PA0-WKUP Mcu.Pin5=PE12 Mcu.Pin6=PE13 Mcu.Pin7=PE14 Mcu.Pin8=PE15 Mcu.Pin9=PA8 -Mcu.PinsNb=32 -Mcu.ThirdPartyNb=0 +Mcu.PinsNb=33 +Mcu.ThirdParty0=ARM.CMSIS.5.6.0 +Mcu.ThirdPartyNb=1 Mcu.UserConstants= Mcu.UserName=STM32F107VCTx MxCube.Version=5.6.0 @@ -81,15 +105,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.RCC_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:false NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:false -NVIC.TIM7_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true -NVIC.TimeBase=TIM7_IRQn -NVIC.TimeBaseIP=TIM7 +NVIC.TIM1_UP_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true +NVIC.TimeBase=TIM1_UP_IRQn +NVIC.TimeBaseIP=TIM1 NVIC.UART4_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false OSC_IN.Mode=HSE-External-Oscillator OSC_IN.Signal=RCC_OSC_IN OSC_OUT.Mode=HSE-External-Oscillator OSC_OUT.Signal=RCC_OSC_OUT +PA0-WKUP.GPIOParameters=GPIO_Label +PA0-WKUP.GPIO_Label=SYS_WKUP PA0-WKUP.Mode=SYS_WakeUp0 PA0-WKUP.Signal=SYS_WKUP PA11.GPIOParameters=GPIO_Label @@ -102,11 +128,15 @@ PA12.GPIO_Label=USB2_DP_G7 PA12.Locked=true PA12.Mode=Device_Only PA12.Signal=USB_OTG_FS_DP +PA13.GPIOParameters=GPIO_Label +PA13.GPIO_Label=SYS_SWDIO PA13.Locked=true -PA13.Mode=Serial_Wire +PA13.Mode=Trace_Asynchronous_SW PA13.Signal=SYS_JTMS-SWDIO +PA14.GPIOParameters=GPIO_Label +PA14.GPIO_Label=SYS_SWCLK PA14.Locked=true -PA14.Mode=Serial_Wire +PA14.Mode=Trace_Asynchronous_SW PA14.Signal=SYS_JTCK-SWCLK PA8.GPIOParameters=PinState,GPIO_Label,GPIO_ModeDefaultOutputPP PA8.GPIO_Label=ENUM_CTL @@ -114,6 +144,10 @@ PA8.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD PA8.Locked=true PA8.PinState=GPIO_PIN_SET PA8.Signal=GPIO_Output +PB3.GPIOParameters=GPIO_Label +PB3.GPIO_Label=SYS_SWO +PB3.Mode=Trace_Asynchronous_SW +PB3.Signal=SYS_TRACESWO PB6.GPIOParameters=GPIO_Label PB6.GPIO_Label=BUZZ_CTL PB6.Locked=true @@ -253,7 +287,8 @@ RCC.VCOOutput2Freq_Value=8000000 UART4.IPParameters=VirtualMode UART4.VirtualMode=Asynchronous USB_DEVICE.CLASS_NAME_FS=CDC -USB_DEVICE.IPParameters=VirtualMode,VirtualModeFS,CLASS_NAME_FS +USB_DEVICE.IPParameters=VirtualMode,VirtualModeFS,CLASS_NAME_FS,USBD_DEBUG_LEVEL +USB_DEVICE.USBD_DEBUG_LEVEL=3 USB_DEVICE.VirtualMode=Cdc USB_DEVICE.VirtualModeFS=Cdc_FS USB_OTG_FS.IPParameters=VirtualMode @@ -262,8 +297,8 @@ VP_FREERTOS_VS_CMSIS_V2.Mode=CMSIS_V2 VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2 VP_IWDG_VS_IWDG.Mode=IWDG_Activate VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG -VP_SYS_VS_tim7.Mode=TIM7 -VP_SYS_VS_tim7.Signal=SYS_VS_tim7 +VP_SYS_VS_tim1.Mode=TIM1 +VP_SYS_VS_tim1.Signal=SYS_VS_tim1 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