From 76b2ac39f2569b994a8995f9ef7d7b3436ff3cb1 Mon Sep 17 00:00:00 2001 From: wangxujie Date: Fri, 7 Mar 2025 09:53:53 +0800 Subject: [PATCH] =?UTF-8?q?SPI=E5=BC=95=E8=84=9A=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=B8=8A=E6=8B=89=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E8=B7=AFDAC=E6=97=A0=E6=B3=95=E8=BE=93=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Src/main.c | 62 +++++----- Core/Src/spi.c | 2 +- Core/Src/stm32f4xx_it.c | 116 +++++++++--------- .../Inc/stm32f4xx_hal_flash.h | 2 +- LWIP/App/lwip.c | 57 ++++----- MDK-ARM/semi-finished_product_testing.uvoptx | 48 ++++---- MDK-ARM/semi-finished_product_testing.uvprojx | 115 +++++++++-------- semi-finished_product_testing.ioc | 6 + 8 files changed, 205 insertions(+), 203 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index da3ca13..21cc235 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -87,9 +87,9 @@ extern ip4_addr_t ipaddr; /* USER CODE END 0 */ /** - * @brief The application entry point. - * @retval int - */ + * @brief The application entry point. + * @retval int + */ int main(void) { /* USER CODE BEGIN 1 */ @@ -137,7 +137,7 @@ int main(void) // end hart_ht1200m_reset(); // 初始化HT1200M模块 HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // PWM输出，用于驱动HT1200M模块 - HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 旋转编码器输入 + HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 旋转编码器输? /* USER CODE END 2 */ /* Call init function for freertos objects (in freertos.c) */ @@ -158,22 +158,22 @@ int main(void) } /** - * @brief System Clock Configuration - * @retval None - */ + * @brief System Clock Configuration + * @retval None + */ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; /** Configure the main internal regulator output voltage - */ + */ __HAL_RCC_PWR_CLK_ENABLE(); __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters - * in the RCC_OscInitTypeDef structure. - */ + * in the RCC_OscInitTypeDef structure. + */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; @@ -188,8 +188,9 @@ void SystemClock_Config(void) } /** Initializes the CPU, AHB and APB buses clocks - */ - RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK + |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4; @@ -293,20 +294,19 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) /* USER CODE END 4 */ /** - * @brief Period elapsed callback in non blocking mode - * @note This function is called when TIM4 interrupt took place, inside - * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment - * a global variable "uwTick" used as application time base. - * @param htim : TIM handle - * @retval None - */ + * @brief Period elapsed callback in non blocking mode + * @note This function is called when TIM4 interrupt took place, inside + * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment + * a global variable "uwTick" used as application time base. + * @param htim : TIM handle + * @retval None + */ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { /* USER CODE BEGIN Callback 0 */ /* USER CODE END Callback 0 */ - if (htim->Instance == TIM4) - { + if (htim->Instance == TIM4) { HAL_IncTick(); } /* USER CODE BEGIN Callback 1 */ @@ -315,9 +315,9 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) } /** - * @brief This function is executed in case of error occurrence. - * @retval None - */ + * @brief This function is executed in case of error occurrence. + * @retval None + */ void Error_Handler(void) { /* USER CODE BEGIN Error_Handler_Debug */ @@ -329,14 +329,14 @@ void Error_Handler(void) /* USER CODE END Error_Handler_Debug */ } -#ifdef USE_FULL_ASSERT +#ifdef USE_FULL_ASSERT /** - * @brief Reports the name of the source file and the source line number - * where the assert_param error has occurred. - * @param file: pointer to the source file name - * @param line: assert_param error line source number - * @retval None - */ + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ void assert_failed(uint8_t *file, uint32_t line) { /* USER CODE BEGIN 6 */ diff --git a/Core/Src/spi.c b/Core/Src/spi.c index f1fc8b4..bccf76a 100644 --- a/Core/Src/spi.c +++ b/Core/Src/spi.c @@ -78,7 +78,7 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* spiHandle) */ GPIO_InitStruct.Pin = GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Pull = GPIO_PULLUP; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; GPIO_InitStruct.Alternate = GPIO_AF5_SPI1; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); diff --git a/Core/Src/stm32f4xx_it.c b/Core/Src/stm32f4xx_it.c index 18295f0..902f97c 100644 --- a/Core/Src/stm32f4xx_it.c +++ b/Core/Src/stm32f4xx_it.c @@ -91,8 +91,8 @@ extern TIM_HandleTypeDef htim4; /* Cortex-M4 Processor Interruption and Exception Handlers */ /******************************************************************************/ /** - * @brief This function handles Non maskable interrupt. - */ + * @brief This function handles Non maskable interrupt. + */ void NMI_Handler(void) { /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ @@ -106,8 +106,8 @@ void NMI_Handler(void) } /** - * @brief This function handles Hard fault interrupt. - */ + * @brief This function handles Hard fault interrupt. + */ void HardFault_Handler(void) { /* USER CODE BEGIN HardFault_IRQn 0 */ @@ -121,8 +121,8 @@ void HardFault_Handler(void) } /** - * @brief This function handles Memory management fault. - */ + * @brief This function handles Memory management fault. + */ void MemManage_Handler(void) { /* USER CODE BEGIN MemoryManagement_IRQn 0 */ @@ -136,8 +136,8 @@ void MemManage_Handler(void) } /** - * @brief This function handles Pre-fetch fault, memory access fault. - */ + * @brief This function handles Pre-fetch fault, memory access fault. + */ void BusFault_Handler(void) { /* USER CODE BEGIN BusFault_IRQn 0 */ @@ -151,8 +151,8 @@ void BusFault_Handler(void) } /** - * @brief This function handles Undefined instruction or illegal state. - */ + * @brief This function handles Undefined instruction or illegal state. + */ void UsageFault_Handler(void) { /* USER CODE BEGIN UsageFault_IRQn 0 */ @@ -166,8 +166,8 @@ void UsageFault_Handler(void) } /** - * @brief This function handles Debug monitor. - */ + * @brief This function handles Debug monitor. + */ void DebugMon_Handler(void) { /* USER CODE BEGIN DebugMonitor_IRQn 0 */ @@ -186,8 +186,8 @@ void DebugMon_Handler(void) /******************************************************************************/ /** - * @brief This function handles EXTI line1 interrupt. - */ + * @brief This function handles EXTI line1 interrupt. + */ void EXTI1_IRQHandler(void) { /* USER CODE BEGIN EXTI1_IRQn 0 */ @@ -200,8 +200,8 @@ void EXTI1_IRQHandler(void) } /** - * @brief This function handles EXTI line3 interrupt. - */ + * @brief This function handles EXTI line3 interrupt. + */ void EXTI3_IRQHandler(void) { /* USER CODE BEGIN EXTI3_IRQn 0 */ @@ -214,8 +214,8 @@ void EXTI3_IRQHandler(void) } /** - * @brief This function handles DMA1 stream0 global interrupt. - */ + * @brief This function handles DMA1 stream0 global interrupt. + */ void DMA1_Stream0_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream0_IRQn 0 */ @@ -228,8 +228,8 @@ void DMA1_Stream0_IRQHandler(void) } /** - * @brief This function handles DMA1 stream1 global interrupt. - */ + * @brief This function handles DMA1 stream1 global interrupt. + */ void DMA1_Stream1_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream1_IRQn 0 */ @@ -242,8 +242,8 @@ void DMA1_Stream1_IRQHandler(void) } /** - * @brief This function handles DMA1 stream2 global interrupt. - */ + * @brief This function handles DMA1 stream2 global interrupt. + */ void DMA1_Stream2_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream2_IRQn 0 */ @@ -256,8 +256,8 @@ void DMA1_Stream2_IRQHandler(void) } /** - * @brief This function handles DMA1 stream3 global interrupt. - */ + * @brief This function handles DMA1 stream3 global interrupt. + */ void DMA1_Stream3_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream3_IRQn 0 */ @@ -270,8 +270,8 @@ void DMA1_Stream3_IRQHandler(void) } /** - * @brief This function handles DMA1 stream4 global interrupt. - */ + * @brief This function handles DMA1 stream4 global interrupt. + */ void DMA1_Stream4_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream4_IRQn 0 */ @@ -284,8 +284,8 @@ void DMA1_Stream4_IRQHandler(void) } /** - * @brief This function handles DMA1 stream5 global interrupt. - */ + * @brief This function handles DMA1 stream5 global interrupt. + */ void DMA1_Stream5_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream5_IRQn 0 */ @@ -298,8 +298,8 @@ void DMA1_Stream5_IRQHandler(void) } /** - * @brief This function handles DMA1 stream6 global interrupt. - */ + * @brief This function handles DMA1 stream6 global interrupt. + */ void DMA1_Stream6_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream6_IRQn 0 */ @@ -312,8 +312,8 @@ void DMA1_Stream6_IRQHandler(void) } /** - * @brief This function handles EXTI line[9:5] interrupts. - */ + * @brief This function handles EXTI line[9:5] interrupts. + */ void EXTI9_5_IRQHandler(void) { /* USER CODE BEGIN EXTI9_5_IRQn 0 */ @@ -335,8 +335,8 @@ void EXTI9_5_IRQHandler(void) } /** - * @brief This function handles TIM4 global interrupt. - */ + * @brief This function handles TIM4 global interrupt. + */ void TIM4_IRQHandler(void) { /* USER CODE BEGIN TIM4_IRQn 0 */ @@ -349,8 +349,8 @@ void TIM4_IRQHandler(void) } /** - * @brief This function handles USART1 global interrupt. - */ + * @brief This function handles USART1 global interrupt. + */ void USART1_IRQHandler(void) { /* USER CODE BEGIN USART1_IRQn 0 */ @@ -363,8 +363,8 @@ void USART1_IRQHandler(void) } /** - * @brief This function handles USART2 global interrupt. - */ + * @brief This function handles USART2 global interrupt. + */ void USART2_IRQHandler(void) { /* USER CODE BEGIN USART2_IRQn 0 */ @@ -376,8 +376,8 @@ void USART2_IRQHandler(void) } /** - * @brief This function handles USART3 global interrupt. - */ + * @brief This function handles USART3 global interrupt. + */ void USART3_IRQHandler(void) { /* USER CODE BEGIN USART3_IRQn 0 */ @@ -390,8 +390,8 @@ void USART3_IRQHandler(void) } /** - * @brief This function handles DMA1 stream7 global interrupt. - */ + * @brief This function handles DMA1 stream7 global interrupt. + */ void DMA1_Stream7_IRQHandler(void) { /* USER CODE BEGIN DMA1_Stream7_IRQn 0 */ @@ -404,8 +404,8 @@ void DMA1_Stream7_IRQHandler(void) } /** - * @brief This function handles UART4 global interrupt. - */ + * @brief This function handles UART4 global interrupt. + */ void UART4_IRQHandler(void) { /* USER CODE BEGIN UART4_IRQn 0 */ @@ -417,8 +417,8 @@ void UART4_IRQHandler(void) } /** - * @brief This function handles UART5 global interrupt. - */ + * @brief This function handles UART5 global interrupt. + */ void UART5_IRQHandler(void) { /* USER CODE BEGIN UART5_IRQn 0 */ @@ -429,8 +429,8 @@ void UART5_IRQHandler(void) } /** - * @brief This function handles DMA2 stream1 global interrupt. - */ + * @brief This function handles DMA2 stream1 global interrupt. + */ void DMA2_Stream1_IRQHandler(void) { /* USER CODE BEGIN DMA2_Stream1_IRQn 0 */ @@ -443,8 +443,8 @@ void DMA2_Stream1_IRQHandler(void) } /** - * @brief This function handles DMA2 stream2 global interrupt. - */ + * @brief This function handles DMA2 stream2 global interrupt. + */ void DMA2_Stream2_IRQHandler(void) { /* USER CODE BEGIN DMA2_Stream2_IRQn 0 */ @@ -457,8 +457,8 @@ void DMA2_Stream2_IRQHandler(void) } /** - * @brief This function handles Ethernet global interrupt. - */ + * @brief This function handles Ethernet global interrupt. + */ void ETH_IRQHandler(void) { /* USER CODE BEGIN ETH_IRQn 0 */ @@ -471,8 +471,8 @@ void ETH_IRQHandler(void) } /** - * @brief This function handles DMA2 stream6 global interrupt. - */ + * @brief This function handles DMA2 stream6 global interrupt. + */ void DMA2_Stream6_IRQHandler(void) { /* USER CODE BEGIN DMA2_Stream6_IRQn 0 */ @@ -485,8 +485,8 @@ void DMA2_Stream6_IRQHandler(void) } /** - * @brief This function handles DMA2 stream7 global interrupt. - */ + * @brief This function handles DMA2 stream7 global interrupt. + */ void DMA2_Stream7_IRQHandler(void) { /* USER CODE BEGIN DMA2_Stream7_IRQn 0 */ @@ -499,8 +499,8 @@ void DMA2_Stream7_IRQHandler(void) } /** - * @brief This function handles USART6 global interrupt. - */ + * @brief This function handles USART6 global interrupt. + */ void USART6_IRQHandler(void) { /* USER CODE BEGIN USART6_IRQn 0 */ diff --git a/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h b/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h index 19cf5b6..26d789e 100644 --- a/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h +++ b/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_flash.h @@ -100,8 +100,8 @@ typedef struct * @{ */ #define FLASH_TYPEPROGRAM_BYTE 0x00000000U /*!< Program byte (8-bit) at a specified address */ -#define FLASH_TYPEPROGRAM_WORD 0x00000002U /*!< Program a word (32-bit) at a specified address */ #define FLASH_TYPEPROGRAM_HALFWORD 0x00000001U /*!< Program a half-word (16-bit) at a specified address */ +#define FLASH_TYPEPROGRAM_WORD 0x00000002U /*!< Program a word (32-bit) at a specified address */ #define FLASH_TYPEPROGRAM_DOUBLEWORD 0x00000003U /*!< Program a double word (64-bit) at a specified address */ /** * @} diff --git a/LWIP/App/lwip.c b/LWIP/App/lwip.c index 522991c..ccddfa5 100644 --- a/LWIP/App/lwip.c +++ b/LWIP/App/lwip.c @@ -22,7 +22,7 @@ #include "lwip.h" #include "lwip/init.h" #include "lwip/netif.h" -#if defined(__CC_ARM) /* MDK ARM Compiler */ +#if defined ( __CC_ARM ) /* MDK ARM Compiler */ #include "lwip/sio.h" #endif /* MDK ARM Compiler */ #include "ethernetif.h" @@ -53,8 +53,8 @@ uint8_t GATEWAY_ADDRESS[4]; /* USER CODE END 2 */ /** - * LwIP initialization function - */ + * LwIP initialization function + */ void MX_LWIP_Init(void) { /* IP addresses initialization */ @@ -71,15 +71,15 @@ void MX_LWIP_Init(void) GATEWAY_ADDRESS[2] = 1; GATEWAY_ADDRESS[3] = 29; - /* USER CODE BEGIN IP_ADDRESSES */ - /* USER CODE END IP_ADDRESSES */ +/* USER CODE BEGIN IP_ADDRESSES */ +/* USER CODE END IP_ADDRESSES */ /* Initilialize the LwIP stack with RTOS */ - tcpip_init(NULL, NULL); + tcpip_init( NULL, NULL ); /* IP addresses initialization without DHCP (IPv4) */ IP4_ADDR(&ipaddr, IP_ADDRESS[0], IP_ADDRESS[1], IP_ADDRESS[2], IP_ADDRESS[3]); - IP4_ADDR(&netmask, NETMASK_ADDRESS[0], NETMASK_ADDRESS[1], NETMASK_ADDRESS[2], NETMASK_ADDRESS[3]); + IP4_ADDR(&netmask, NETMASK_ADDRESS[0], NETMASK_ADDRESS[1] , NETMASK_ADDRESS[2], NETMASK_ADDRESS[3]); IP4_ADDR(&gw, GATEWAY_ADDRESS[0], GATEWAY_ADDRESS[1], GATEWAY_ADDRESS[2], GATEWAY_ADDRESS[3]); /* add the network interface (IPv4/IPv6) with RTOS */ @@ -103,19 +103,19 @@ void MX_LWIP_Init(void) netif_set_link_callback(&gnetif, ethernet_link_status_updated); /* Create the Ethernet link handler thread */ - /* USER CODE BEGIN H7_OS_THREAD_DEF_CREATE_CMSIS_RTOS_V1 */ +/* USER CODE BEGIN H7_OS_THREAD_DEF_CREATE_CMSIS_RTOS_V1 */ osThreadDef(EthLink, ethernet_link_thread, osPriorityBelowNormal, 0, configMINIMAL_STACK_SIZE * 2); osThreadCreate(osThread(EthLink), &gnetif); - /* USER CODE END H7_OS_THREAD_DEF_CREATE_CMSIS_RTOS_V1 */ +/* USER CODE END H7_OS_THREAD_DEF_CREATE_CMSIS_RTOS_V1 */ - /* USER CODE BEGIN 3 */ +/* USER CODE BEGIN 3 */ flash_read_data(FLASH_USER_START_ADDR, IP_ADDRESS, 4); if (IP_ADDRESS[0] == 192) { IP4_ADDR(&ipaddr, IP_ADDRESS[0], IP_ADDRESS[1], IP_ADDRESS[2], IP_ADDRESS[3]); gnetif.ip_addr = ipaddr; } - /* USER CODE END 3 */ +/* USER CODE END 3 */ } #ifdef USE_OBSOLETE_USER_CODE_SECTION_4 @@ -126,25 +126,25 @@ void MX_LWIP_Init(void) #endif /** - * @brief Notify the User about the network interface config status - * @param netif: the network interface - * @retval None - */ + * @brief Notify the User about the network interface config status + * @param netif: the network interface + * @retval None + */ static void ethernet_link_status_updated(struct netif *netif) { if (netif_is_up(netif)) { - /* USER CODE BEGIN 5 */ - /* USER CODE END 5 */ +/* USER CODE BEGIN 5 */ +/* USER CODE END 5 */ } else /* netif is down */ { - /* USER CODE BEGIN 6 */ - /* USER CODE END 6 */ +/* USER CODE BEGIN 6 */ +/* USER CODE END 6 */ } } -#if defined(__CC_ARM) /* MDK ARM Compiler */ +#if defined ( __CC_ARM ) /* MDK ARM Compiler */ /** * Opens a serial device for communication. * @@ -155,9 +155,9 @@ sio_fd_t sio_open(u8_t devnum) { sio_fd_t sd; - /* USER CODE BEGIN 7 */ +/* USER CODE BEGIN 7 */ sd = 0; // dummy code - /* USER CODE END 7 */ +/* USER CODE END 7 */ return sd; } @@ -172,8 +172,8 @@ sio_fd_t sio_open(u8_t devnum) */ void sio_send(u8_t c, sio_fd_t fd) { - /* USER CODE BEGIN 8 */ - /* USER CODE END 8 */ +/* USER CODE BEGIN 8 */ +/* USER CODE END 8 */ } /** @@ -191,9 +191,9 @@ u32_t sio_read(sio_fd_t fd, u8_t *data, u32_t len) { u32_t recved_bytes; - /* USER CODE BEGIN 9 */ +/* USER CODE BEGIN 9 */ recved_bytes = 0; // dummy code - /* USER CODE END 9 */ +/* USER CODE END 9 */ return recved_bytes; } @@ -210,9 +210,10 @@ u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len) { u32_t recved_bytes; - /* USER CODE BEGIN 10 */ +/* USER CODE BEGIN 10 */ recved_bytes = 0; // dummy code - /* USER CODE END 10 */ +/* USER CODE END 10 */ return recved_bytes; } #endif /* MDK ARM Compiler */ + diff --git a/MDK-ARM/semi-finished_product_testing.uvoptx b/MDK-ARM/semi-finished_product_testing.uvoptx index a41bed1..a153d80 100644 --- a/MDK-ARM/semi-finished_product_testing.uvoptx +++ b/MDK-ARM/semi-finished_product_testing.uvoptx @@ -1,4 +1,4 @@ - + 1.0 @@ -45,7 +45,7 @@ 79 66 8 - + 1 @@ -104,16 +104,16 @@ 0 0 6 - - - - - - - - - - + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll @@ -130,7 +130,7 @@ 0 ARMDBGFLAGS - + 0 @@ -148,7 +148,7 @@ -U090F00028316303030303032 -O2254 -SF1000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) - + 0 @@ -328,19 +328,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + 0 0 diff --git a/MDK-ARM/semi-finished_product_testing.uvprojx b/MDK-ARM/semi-finished_product_testing.uvprojx index 0416912..0f3605d 100644 --- a/MDK-ARM/semi-finished_product_testing.uvprojx +++ b/MDK-ARM/semi-finished_product_testing.uvprojx @@ -1,10 +1,7 @@ - - - + + 2.1 -
### uVision Project, (C) Keil Software
- semi-finished_product_testing @@ -19,28 +16,28 @@ Keil.STM32F4xx_DFP.2.17.1 https://www.keil.com/pack/ IRAM(0x20000000-0x2001BFFF) IRAM2(0x2001C000-0x2001FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") TZ - - - + + + 0 - - - - - - - - - - + + + + + + + + + + $$Device:STM32F407VGTx$CMSIS\SVD\STM32F40x.svd 0 0 - - - - - + + + + + 0 0 @@ -55,15 +52,15 @@ 1 1 0 - + 1 0 0 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -82,15 +79,15 @@ 0 0 - - + + 0 0 0 0 1 - + 0 @@ -104,8 +101,8 @@ 0 0 3 - - + + 0 @@ -139,10 +136,10 @@ 1 BIN\UL2V8M.DLL "" () - - - - + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -309,7 +306,7 @@ 0x4000 - + 1 @@ -336,9 +333,9 @@ 0 0 - + USE_HAL_DRIVER,STM32F407xx - + ../Core/Inc;../LWIP/App;../LWIP/Target;../Middlewares/Third_Party/LwIP/src/include;../Middlewares/Third_Party/LwIP/system;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Drivers/BSP/Components/lan8742;../Middlewares/Third_Party/LwIP/src/include/netif/ppp;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Middlewares/Third_Party/LwIP/src/include/lwip;../Middlewares/Third_Party/LwIP/src/include/lwip/apps;../Middlewares/Third_Party/LwIP/src/include/lwip/priv;../Middlewares/Third_Party/LwIP/src/include/lwip/prot;../Middlewares/Third_Party/LwIP/src/include/netif;../Middlewares/Third_Party/LwIP/src/include/compat/posix;../Middlewares/Third_Party/LwIP/src/include/compat/posix/arpa;../Middlewares/Third_Party/LwIP/src/include/compat/posix/net;../Middlewares/Third_Party/LwIP/src/include/compat/posix/sys;../Middlewares/Third_Party/LwIP/src/include/compat/stdc;../Middlewares/Third_Party/LwIP/system/arch;../Drivers/CMSIS/Include;../User/application/inc;../User/board/inc;../User/driver;../User/system @@ -354,9 +351,9 @@ 0 1 - - - + + + ../Core/Inc @@ -367,15 +364,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -1136,20 +1133,18 @@ - - + - + - + - + - @@ -1158,5 +1153,5 @@ - + diff --git a/semi-finished_product_testing.ioc b/semi-finished_product_testing.ioc index 1877839..212b94d 100644 --- a/semi-finished_product_testing.ioc +++ b/semi-finished_product_testing.ioc @@ -364,12 +364,18 @@ PB2.GPIO_Speed=GPIO_SPEED_FREQ_MEDIUM PB2.Locked=true PB2.PinState=GPIO_PIN_SET PB2.Signal=GPIO_Output +PB3.GPIOParameters=GPIO_PuPd +PB3.GPIO_PuPd=GPIO_PULLUP PB3.Locked=true PB3.Mode=Full_Duplex_Master PB3.Signal=SPI1_SCK +PB4.GPIOParameters=GPIO_PuPd +PB4.GPIO_PuPd=GPIO_PULLUP PB4.Locked=true PB4.Mode=Full_Duplex_Master PB4.Signal=SPI1_MISO +PB5.GPIOParameters=GPIO_PuPd +PB5.GPIO_PuPd=GPIO_PULLUP PB5.Locked=true PB5.Mode=Full_Duplex_Master PB5.Signal=SPI1_MOSI