From 000d9e9e4ea25a6580c68d0e7d1bbd2e078a04ff Mon Sep 17 00:00:00 2001 From: EN Date: Fri, 19 Jul 2024 08:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9NVIC=E4=B8=AD=E6=96=AD?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CAR.ioc | 11 ++- Core/Inc/stm32f1xx_hal_conf.h | 2 +- Core/Inc/stm32f1xx_it.h | 1 - Core/Src/dma.c | 2 +- Core/Src/gpio.c | 2 +- Core/Src/stm32f1xx_it.c | 15 ---- Core/Src/tim.c | 9 +- MDK-ARM/CAR.uvoptx | 154 ++++++++++++++++++---------------- MDK-ARM/CAR.uvprojx | 119 +++++++++++++------------- 9 files changed, 149 insertions(+), 166 deletions(-) diff --git a/CAR.ioc b/CAR.ioc index cf23223..193dc86 100644 --- a/CAR.ioc +++ b/CAR.ioc @@ -71,9 +71,9 @@ Mcu.UserName=STM32F103C8Tx MxCube.Version=6.12.0 MxDb.Version=DB.6.0.120 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -NVIC.DMA1_Channel6_IRQn=true\:0\:0\:true\:false\:true\:true\:true\:true +NVIC.DMA1_Channel6_IRQn=true\:3\:0\:true\:false\:true\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -NVIC.EXTI15_10_IRQn=true\:1\:0\:true\:false\:true\:true\:true\:true +NVIC.EXTI15_10_IRQn=true\:2\:0\:true\:false\:true\:true\:true\:true NVIC.ForceEnableDMAVector=false NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false @@ -81,10 +81,9 @@ NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.PriorityGroup=NVIC_PRIORITYGROUP_2 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -NVIC.SysTick_IRQn=true\:2\:0\:true\:false\:true\:false\:true\:false +NVIC.SysTick_IRQn=true\:3\:3\:true\:false\:true\:false\:true\:false NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true -NVIC.TIM3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true -NVIC.TIM4_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true +NVIC.TIM4_IRQn=true\:1\:0\:true\:false\:true\:true\:true\:true NVIC.USART1_IRQn=true\:3\:1\:true\:false\:true\:true\:true\:true NVIC.USART2_IRQn=true\:3\:0\:true\:false\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false @@ -223,7 +222,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_I2C2_Init-I2C2-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_TIM3_Init-TIM3-false-HAL-true,8-MX_TIM4_Init-TIM4-false-HAL-true,9-MX_USART1_UART_Init-USART1-false-HAL-true,10-MX_USART2_UART_Init-USART2-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_TIM1_Init-TIM1-false-HAL-true,5-MX_TIM2_Init-TIM2-false-HAL-true,6-MX_TIM3_Init-TIM3-false-HAL-true,7-MX_TIM4_Init-TIM4-false-HAL-true,8-MX_USART1_UART_Init-USART1-false-HAL-true,9-MX_USART2_UART_Init-USART2-false-HAL-true RCC.ADCFreqValue=36000000 RCC.AHBFreq_Value=72000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 diff --git a/Core/Inc/stm32f1xx_hal_conf.h b/Core/Inc/stm32f1xx_hal_conf.h index e321b46..b0beaa6 100644 --- a/Core/Inc/stm32f1xx_hal_conf.h +++ b/Core/Inc/stm32f1xx_hal_conf.h @@ -129,7 +129,7 @@ * @brief This is the HAL system configuration section */ #define VDD_VALUE 3300U /*!< Value of VDD in mv */ -#define TICK_INT_PRIORITY 2U /*!< tick interrupt priority (lowest by default) */ +#define TICK_INT_PRIORITY 3U /*!< tick interrupt priority (lowest by default) */ #define USE_RTOS 0U #define PREFETCH_ENABLE 1U diff --git a/Core/Inc/stm32f1xx_it.h b/Core/Inc/stm32f1xx_it.h index 64ba1a0..bd67008 100644 --- a/Core/Inc/stm32f1xx_it.h +++ b/Core/Inc/stm32f1xx_it.h @@ -57,7 +57,6 @@ void PendSV_Handler(void); void SysTick_Handler(void); void DMA1_Channel6_IRQHandler(void); void TIM2_IRQHandler(void); -void TIM3_IRQHandler(void); void TIM4_IRQHandler(void); void USART1_IRQHandler(void); void USART2_IRQHandler(void); diff --git a/Core/Src/dma.c b/Core/Src/dma.c index 68f9784..f3db5b2 100644 --- a/Core/Src/dma.c +++ b/Core/Src/dma.c @@ -44,7 +44,7 @@ void MX_DMA_Init(void) /* DMA interrupt init */ /* DMA1_Channel6_IRQn interrupt configuration */ - HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0); + HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 3, 0); HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn); } diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index be247f2..8348ff5 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -105,7 +105,7 @@ void MX_GPIO_Init(void) HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); /* EXTI interrupt init*/ - HAL_NVIC_SetPriority(EXTI15_10_IRQn, 1, 0); + HAL_NVIC_SetPriority(EXTI15_10_IRQn, 2, 0); HAL_NVIC_EnableIRQ(EXTI15_10_IRQn); } diff --git a/Core/Src/stm32f1xx_it.c b/Core/Src/stm32f1xx_it.c index fb7ced6..1c3f5e6 100644 --- a/Core/Src/stm32f1xx_it.c +++ b/Core/Src/stm32f1xx_it.c @@ -56,7 +56,6 @@ /* External variables --------------------------------------------------------*/ extern TIM_HandleTypeDef htim2; -extern TIM_HandleTypeDef htim3; extern TIM_HandleTypeDef htim4; extern DMA_HandleTypeDef hdma_usart2_rx; extern UART_HandleTypeDef huart1; @@ -231,20 +230,6 @@ void TIM2_IRQHandler(void) /* USER CODE END TIM2_IRQn 1 */ } -/** - * @brief This function handles TIM3 global interrupt. - */ -void TIM3_IRQHandler(void) -{ - /* USER CODE BEGIN TIM3_IRQn 0 */ - - /* USER CODE END TIM3_IRQn 0 */ - HAL_TIM_IRQHandler(&htim3); - /* USER CODE BEGIN TIM3_IRQn 1 */ - - /* USER CODE END TIM3_IRQn 1 */ -} - /** * @brief This function handles TIM4 global interrupt. */ diff --git a/Core/Src/tim.c b/Core/Src/tim.c index db48462..59aef84 100644 --- a/Core/Src/tim.c +++ b/Core/Src/tim.c @@ -295,10 +295,6 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) /* USER CODE END TIM3_MspInit 0 */ /* TIM3 clock enable */ __HAL_RCC_TIM3_CLK_ENABLE(); - - /* TIM3 interrupt Init */ - HAL_NVIC_SetPriority(TIM3_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(TIM3_IRQn); /* USER CODE BEGIN TIM3_MspInit 1 */ /* USER CODE END TIM3_MspInit 1 */ @@ -312,7 +308,7 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) __HAL_RCC_TIM4_CLK_ENABLE(); /* TIM4 interrupt Init */ - HAL_NVIC_SetPriority(TIM4_IRQn, 0, 0); + HAL_NVIC_SetPriority(TIM4_IRQn, 1, 0); HAL_NVIC_EnableIRQ(TIM4_IRQn); /* USER CODE BEGIN TIM4_MspInit 1 */ @@ -426,9 +422,6 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) /* USER CODE END TIM3_MspDeInit 0 */ /* Peripheral clock disable */ __HAL_RCC_TIM3_CLK_DISABLE(); - - /* TIM3 interrupt Deinit */ - HAL_NVIC_DisableIRQ(TIM3_IRQn); /* USER CODE BEGIN TIM3_MspDeInit 1 */ /* USER CODE END TIM3_MspDeInit 1 */ diff --git a/MDK-ARM/CAR.uvoptx b/MDK-ARM/CAR.uvoptx index 8b9c252..30ebff0 100644 --- a/MDK-ARM/CAR.uvoptx +++ b/MDK-ARM/CAR.uvoptx @@ -1,4 +1,4 @@ - + 1.0 @@ -45,7 +45,7 @@ 79 66 8 - + 1 @@ -73,11 +73,11 @@ 0 - 0 + 1 0 1 - 0 + 18 0 1 @@ -104,16 +104,16 @@ 0 0 3 - - - - - - - - - - + + + + + + + + + + BIN\CMSIS_AGDI.dll @@ -130,17 +130,17 @@ 0 ARMDBGFLAGS - + 0 CMSIS_AGDI - -X"CMSIS-DAP_LU" -ULU_2022_8888 -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) + -X"CMSIS-DAP_LU" -ULU_2022_8888 -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) 0 DLGUARM - + 0 @@ -154,7 +154,7 @@ 0 34 1 -
134226582
+
134226736
0 0 0 @@ -162,7 +162,7 @@ 0 1 ..\Peripheral\Src\bluetooth.c - + \\CAR\../Peripheral/Src/bluetooth.c\34 @@ -170,7 +170,7 @@ 0 32 1 -
134221102
+
134221058
0 0 0 @@ -178,7 +178,7 @@ 0 1 ..\Peripheral\Src\control.c - + \\CAR\../Peripheral/Src/control.c\32 @@ -193,29 +193,13 @@ 0 0 0 - ..\Peripheral\Src\bluetooth.c - - + startup_stm32f103xb.s + + 3 0 - 99 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ../Core/Src/main.c - - - - - 4 - 0 97 1
0
@@ -225,9 +209,25 @@ 0 0 0 - ../Core/Src/main.c - - + startup_stm32f103xb.s + + + + + 4 + 0 + 99 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + startup_stm32f103xb.s + + @@ -259,12 +259,12 @@ 0 0 - 0 + 1 0 0 0 0 - 0 + 1 0 0 0 @@ -282,19 +282,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + 1 1 @@ -463,7 +463,7 @@ Application/User/Service - 1 + 0 0 0 0 @@ -602,6 +602,18 @@ 0 0 0 + ..\Peripheral\Src\servo.c + servo.c + 0 + 0 + + + 5 + 23 + 1 + 0 + 0 + 0 ..\Peripheral\Src\syn6288.c syn6288.c 0 @@ -617,7 +629,7 @@ 0 6 - 23 + 24 1 0 0 @@ -629,7 +641,7 @@ 6 - 24 + 25 1 0 0 @@ -641,7 +653,7 @@ 6 - 25 + 26 1 0 0 @@ -653,7 +665,7 @@ 6 - 26 + 27 1 0 0 @@ -665,7 +677,7 @@ 6 - 27 + 28 1 0 0 @@ -677,7 +689,7 @@ 6 - 28 + 29 1 0 0 @@ -689,7 +701,7 @@ 6 - 29 + 30 1 0 0 @@ -701,7 +713,7 @@ 6 - 30 + 31 1 0 0 @@ -713,7 +725,7 @@ 6 - 31 + 32 1 0 0 @@ -725,7 +737,7 @@ 6 - 32 + 33 1 0 0 @@ -737,7 +749,7 @@ 6 - 33 + 34 1 0 0 @@ -749,7 +761,7 @@ 6 - 34 + 35 1 0 0 @@ -761,7 +773,7 @@ 6 - 35 + 36 1 0 0 @@ -773,7 +785,7 @@ 6 - 36 + 37 1 0 0 @@ -793,7 +805,7 @@ 0 7 - 37 + 38 1 0 0 diff --git a/MDK-ARM/CAR.uvprojx b/MDK-ARM/CAR.uvprojx index 3424e78..7664ff0 100644 --- a/MDK-ARM/CAR.uvprojx +++ b/MDK-ARM/CAR.uvprojx @@ -1,10 +1,7 @@ - - - + + 2.1 -
### uVision Project, (C) Keil Software
- CAR @@ -19,28 +16,28 @@ Keil.STM32F1xx_DFP.2.4.1 https://www.keil.com/pack/ IRAM(0x20000000-0x20004FFF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ - - - + + + 0 - - - - - - - - - - + + + + + + + + + + $$Device:STM32F103C8$SVD\STM32F103xx.svd 0 0 - - - - - + + + + + 0 0 @@ -55,15 +52,15 @@ 1 1 1 - + 1 0 0 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -82,15 +79,15 @@ 0 1 - - + + 0 0 0 0 1 - + 0 @@ -104,8 +101,8 @@ 0 0 3 - - + + 0 @@ -114,7 +111,7 @@ DCM.DLL -pCM3 SARMCM3.DLL - + TCM.DLL -pCM3 @@ -139,10 +136,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M3" - + 0 0 0 @@ -309,7 +306,7 @@ 0x0 - + 1 @@ -336,9 +333,9 @@ 0 0 - + USE_HAL_DRIVER,STM32F103xB - + ../App/Inc;../Core/Inc;../Service/Inc;../Peripheral/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include @@ -354,10 +351,10 @@ 0 1 - - - - + + + + @@ -367,15 +364,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -611,20 +608,18 @@ - - + - + - + - + - @@ -633,5 +628,5 @@ - +