Skip to content

Commit d687c5f

Browse files
committed
[bsp][stm32]update project.|更新工程。
1 parent 40d6055 commit d687c5f

File tree

20 files changed

+347
-238
lines changed

20 files changed

+347
-238
lines changed

bsp/stm32/stm32f103-fire-arbitrary/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
| SPI Flash | 支持 | W25Q64 |
4545
| 以太网 | 支持 | W5500 |
4646
| 电位器 | 支持 | 使用 ADC1 |
47-
| SD卡 | 即将支持 | |
47+
| SD卡 | 支持 | |
4848
| CAN | 支持 | |
4949
| SDRAM | 即将支持 | |
5050
| WIFI ESP8266 | 即将支持 | |
@@ -57,9 +57,9 @@
5757
| RTC | 支持 | 支持外部晶振和内部低速时钟 |
5858
| WDT | 支持 | |
5959
| FLASH | 支持 | 已适配 [FAL](https://github.com/RT-Thread-packages/fal) |
60-
| SDIO | 暂不支持 | 即将支持 |
61-
| PWM | 暂不支持 | 即将支持 |
62-
| USB Device | 暂不支持 | 即将支持 |
60+
| SDIO | 支持 | |
61+
| PWM | 支持 | |
62+
| USB Device | 支持 | |
6363
| USB Host | 暂不支持 | 即将支持 |
6464
| **扩展模块** | **支持情况** | **备注** |
6565
| 暂无 | 暂不支持 | 暂不支持 |

bsp/stm32/stm32f103-fire-arbitrary/board/CubeMX_Config/.mxproject

Lines changed: 8 additions & 4 deletions
Large diffs are not rendered by default.

bsp/stm32/stm32f103-fire-arbitrary/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h

Lines changed: 98 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,13 @@
55
******************************************************************************
66
* @attention
77
*
8-
* <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
8+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
9+
* All rights reserved.</center></h2>
910
*
10-
* Redistribution and use in source and binary forms, with or without modification,
11-
* are permitted provided that the following conditions are met:
12-
* 1. Redistributions of source code must retain the above copyright notice,
13-
* this list of conditions and the following disclaimer.
14-
* 2. Redistributions in binary form must reproduce the above copyright notice,
15-
* this list of conditions and the following disclaimer in the documentation
16-
* and/or other materials provided with the distribution.
17-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
18-
* may be used to endorse or promote products derived from this software
19-
* without specific prior written permission.
20-
*
21-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
25-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
27-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
29-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11+
* This software component is licensed by ST under BSD 3-Clause license,
12+
* the "License"; You may not use this file except in compliance with the
13+
* License. You may obtain a copy of the License at:
14+
* opensource.org/licenses/BSD-3-Clause
3115
*
3216
******************************************************************************
3317
*/
@@ -49,9 +33,10 @@
4933
*/
5034

5135
#define HAL_MODULE_ENABLED
52-
#define HAL_ADC_MODULE_ENABLED
36+
#define HAL_ADC_MODULE_ENABLED
5337
/*#define HAL_CRYP_MODULE_ENABLED */
5438
#define HAL_CAN_MODULE_ENABLED
39+
/*#define HAL_CAN_LEGACY_MODULE_ENABLED */
5540
/*#define HAL_CEC_MODULE_ENABLED */
5641
/*#define HAL_CORTEX_MODULE_ENABLED */
5742
/*#define HAL_CRC_MODULE_ENABLED */
@@ -67,7 +52,7 @@
6752
/*#define HAL_NOR_MODULE_ENABLED */
6853
/*#define HAL_NAND_MODULE_ENABLED */
6954
/*#define HAL_PCCARD_MODULE_ENABLED */
70-
/*#define HAL_PCD_MODULE_ENABLED */
55+
#define HAL_PCD_MODULE_ENABLED
7156
/*#define HAL_HCD_MODULE_ENABLED */
7257
/*#define HAL_PWR_MODULE_ENABLED */
7358
/*#define HAL_RCC_MODULE_ENABLED */
@@ -82,11 +67,11 @@
8267
#define HAL_UART_MODULE_ENABLED
8368
/*#define HAL_USART_MODULE_ENABLED */
8469
/*#define HAL_WWDG_MODULE_ENABLED */
85-
/*#define HAL_EXTI_MODULE_ENABLED */
8670

8771
#define HAL_CORTEX_MODULE_ENABLED
8872
#define HAL_DMA_MODULE_ENABLED
8973
#define HAL_FLASH_MODULE_ENABLED
74+
#define HAL_EXTI_MODULE_ENABLED
9075
#define HAL_GPIO_MODULE_ENABLED
9176
#define HAL_PWR_MODULE_ENABLED
9277
#define HAL_RCC_MODULE_ENABLED
@@ -147,6 +132,30 @@
147132
#define USE_RTOS 0
148133
#define PREFETCH_ENABLE 1
149134

135+
#define USE_HAL_ADC_REGISTER_CALLBACKS 0U /* ADC register callback disabled */
136+
#define USE_HAL_CAN_REGISTER_CALLBACKS 0U /* CAN register callback disabled */
137+
#define USE_HAL_CEC_REGISTER_CALLBACKS 0U /* CEC register callback disabled */
138+
#define USE_HAL_DAC_REGISTER_CALLBACKS 0U /* DAC register callback disabled */
139+
#define USE_HAL_ETH_REGISTER_CALLBACKS 0U /* ETH register callback disabled */
140+
#define USE_HAL_HCD_REGISTER_CALLBACKS 0U /* HCD register callback disabled */
141+
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
142+
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
143+
#define USE_HAL_MMC_REGISTER_CALLBACKS 0U /* MMC register callback disabled */
144+
#define USE_HAL_NAND_REGISTER_CALLBACKS 0U /* NAND register callback disabled */
145+
#define USE_HAL_NOR_REGISTER_CALLBACKS 0U /* NOR register callback disabled */
146+
#define USE_HAL_PCCARD_REGISTER_CALLBACKS 0U /* PCCARD register callback disabled */
147+
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
148+
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
149+
#define USE_HAL_SD_REGISTER_CALLBACKS 0U /* SD register callback disabled */
150+
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
151+
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
152+
#define USE_HAL_SRAM_REGISTER_CALLBACKS 0U /* SRAM register callback disabled */
153+
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
154+
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
155+
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
156+
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
157+
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
158+
150159
/* ########################## Assert Selection ############################## */
151160
/**
152161
* @brief Uncomment the line below to expanse the "assert_param" macro in the
@@ -210,155 +219,167 @@
210219
#define PHY_SPEED_STATUS ((uint16_t)0x0002U) /*!< PHY Speed mask */
211220
#define PHY_DUPLEX_STATUS ((uint16_t)0x0004U) /*!< PHY Duplex mask */
212221

222+
/* ################## SPI peripheral configuration ########################## */
223+
224+
/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
225+
* Activated: CRC code is present inside driver
226+
* Deactivated: CRC code cleaned from driver
227+
*/
228+
229+
#define USE_SPI_CRC 0U
230+
213231
/* Includes ------------------------------------------------------------------*/
214232
/**
215-
* @brief Include module's header file
233+
* @brief Include module's header file
216234
*/
217235

218236
#ifdef HAL_RCC_MODULE_ENABLED
219-
#include "stm32f1xx_hal_rcc.h"
237+
#include "stm32f1xx_hal_rcc.h"
220238
#endif /* HAL_RCC_MODULE_ENABLED */
221239

240+
#ifdef HAL_GPIO_MODULE_ENABLED
241+
#include "stm32f1xx_hal_gpio.h"
242+
#endif /* HAL_GPIO_MODULE_ENABLED */
243+
222244
#ifdef HAL_EXTI_MODULE_ENABLED
223-
#include "stm32f1xx_hal_exti.h"
245+
#include "stm32f1xx_hal_exti.h"
224246
#endif /* HAL_EXTI_MODULE_ENABLED */
225247

226-
#ifdef HAL_GPIO_MODULE_ENABLED
227-
#include "stm32f1xx_hal_gpio.h"
228-
#endif /* HAL_GPIO_MODULE_ENABLED */
229-
230248
#ifdef HAL_DMA_MODULE_ENABLED
231-
#include "stm32f1xx_hal_dma.h"
249+
#include "stm32f1xx_hal_dma.h"
232250
#endif /* HAL_DMA_MODULE_ENABLED */
233-
251+
234252
#ifdef HAL_ETH_MODULE_ENABLED
235-
#include "stm32f1xx_hal_eth.h"
236-
#endif /* HAL_ETH_MODULE_ENABLED */
237-
253+
#include "stm32f1xx_hal_eth.h"
254+
#endif /* HAL_ETH_MODULE_ENABLED */
255+
238256
#ifdef HAL_CAN_MODULE_ENABLED
239-
#include "stm32f1xx_hal_can.h"
257+
#include "stm32f1xx_hal_can.h"
240258
#endif /* HAL_CAN_MODULE_ENABLED */
241259

260+
#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
261+
#include "Legacy/stm32f1xx_hal_can_legacy.h"
262+
#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
263+
242264
#ifdef HAL_CEC_MODULE_ENABLED
243-
#include "stm32f1xx_hal_cec.h"
265+
#include "stm32f1xx_hal_cec.h"
244266
#endif /* HAL_CEC_MODULE_ENABLED */
245267

246268
#ifdef HAL_CORTEX_MODULE_ENABLED
247-
#include "stm32f1xx_hal_cortex.h"
269+
#include "stm32f1xx_hal_cortex.h"
248270
#endif /* HAL_CORTEX_MODULE_ENABLED */
249271

250272
#ifdef HAL_ADC_MODULE_ENABLED
251-
#include "stm32f1xx_hal_adc.h"
273+
#include "stm32f1xx_hal_adc.h"
252274
#endif /* HAL_ADC_MODULE_ENABLED */
253275

254276
#ifdef HAL_CRC_MODULE_ENABLED
255-
#include "stm32f1xx_hal_crc.h"
277+
#include "stm32f1xx_hal_crc.h"
256278
#endif /* HAL_CRC_MODULE_ENABLED */
257279

258280
#ifdef HAL_DAC_MODULE_ENABLED
259-
#include "stm32f1xx_hal_dac.h"
281+
#include "stm32f1xx_hal_dac.h"
260282
#endif /* HAL_DAC_MODULE_ENABLED */
261283

262284
#ifdef HAL_FLASH_MODULE_ENABLED
263-
#include "stm32f1xx_hal_flash.h"
285+
#include "stm32f1xx_hal_flash.h"
264286
#endif /* HAL_FLASH_MODULE_ENABLED */
265287

266288
#ifdef HAL_SRAM_MODULE_ENABLED
267-
#include "stm32f1xx_hal_sram.h"
289+
#include "stm32f1xx_hal_sram.h"
268290
#endif /* HAL_SRAM_MODULE_ENABLED */
269291

270292
#ifdef HAL_NOR_MODULE_ENABLED
271-
#include "stm32f1xx_hal_nor.h"
293+
#include "stm32f1xx_hal_nor.h"
272294
#endif /* HAL_NOR_MODULE_ENABLED */
273295

274296
#ifdef HAL_I2C_MODULE_ENABLED
275-
#include "stm32f1xx_hal_i2c.h"
297+
#include "stm32f1xx_hal_i2c.h"
276298
#endif /* HAL_I2C_MODULE_ENABLED */
277299

278300
#ifdef HAL_I2S_MODULE_ENABLED
279-
#include "stm32f1xx_hal_i2s.h"
301+
#include "stm32f1xx_hal_i2s.h"
280302
#endif /* HAL_I2S_MODULE_ENABLED */
281303

282304
#ifdef HAL_IWDG_MODULE_ENABLED
283-
#include "stm32f1xx_hal_iwdg.h"
305+
#include "stm32f1xx_hal_iwdg.h"
284306
#endif /* HAL_IWDG_MODULE_ENABLED */
285307

286308
#ifdef HAL_PWR_MODULE_ENABLED
287-
#include "stm32f1xx_hal_pwr.h"
309+
#include "stm32f1xx_hal_pwr.h"
288310
#endif /* HAL_PWR_MODULE_ENABLED */
289311

290312
#ifdef HAL_RTC_MODULE_ENABLED
291-
#include "stm32f1xx_hal_rtc.h"
313+
#include "stm32f1xx_hal_rtc.h"
292314
#endif /* HAL_RTC_MODULE_ENABLED */
293315

294316
#ifdef HAL_PCCARD_MODULE_ENABLED
295-
#include "stm32f1xx_hal_pccard.h"
296-
#endif /* HAL_PCCARD_MODULE_ENABLED */
317+
#include "stm32f1xx_hal_pccard.h"
318+
#endif /* HAL_PCCARD_MODULE_ENABLED */
297319

298320
#ifdef HAL_SD_MODULE_ENABLED
299-
#include "stm32f1xx_hal_sd.h"
300-
#endif /* HAL_SD_MODULE_ENABLED */
301-
302-
#ifdef HAL_MMC_MODULE_ENABLED
303-
#include "stm32f1xx_hal_mmc.h"
304-
#endif /* HAL_MMC_MODULE_ENABLED */
321+
#include "stm32f1xx_hal_sd.h"
322+
#endif /* HAL_SD_MODULE_ENABLED */
305323

306324
#ifdef HAL_NAND_MODULE_ENABLED
307-
#include "stm32f1xx_hal_nand.h"
308-
#endif /* HAL_NAND_MODULE_ENABLED */
325+
#include "stm32f1xx_hal_nand.h"
326+
#endif /* HAL_NAND_MODULE_ENABLED */
309327

310328
#ifdef HAL_SPI_MODULE_ENABLED
311-
#include "stm32f1xx_hal_spi.h"
329+
#include "stm32f1xx_hal_spi.h"
312330
#endif /* HAL_SPI_MODULE_ENABLED */
313331

314332
#ifdef HAL_TIM_MODULE_ENABLED
315-
#include "stm32f1xx_hal_tim.h"
333+
#include "stm32f1xx_hal_tim.h"
316334
#endif /* HAL_TIM_MODULE_ENABLED */
317335

318336
#ifdef HAL_UART_MODULE_ENABLED
319-
#include "stm32f1xx_hal_uart.h"
337+
#include "stm32f1xx_hal_uart.h"
320338
#endif /* HAL_UART_MODULE_ENABLED */
321339

322340
#ifdef HAL_USART_MODULE_ENABLED
323-
#include "stm32f1xx_hal_usart.h"
341+
#include "stm32f1xx_hal_usart.h"
324342
#endif /* HAL_USART_MODULE_ENABLED */
325343

326344
#ifdef HAL_IRDA_MODULE_ENABLED
327-
#include "stm32f1xx_hal_irda.h"
345+
#include "stm32f1xx_hal_irda.h"
328346
#endif /* HAL_IRDA_MODULE_ENABLED */
329347

330348
#ifdef HAL_SMARTCARD_MODULE_ENABLED
331-
#include "stm32f1xx_hal_smartcard.h"
349+
#include "stm32f1xx_hal_smartcard.h"
332350
#endif /* HAL_SMARTCARD_MODULE_ENABLED */
333351

334352
#ifdef HAL_WWDG_MODULE_ENABLED
335-
#include "stm32f1xx_hal_wwdg.h"
353+
#include "stm32f1xx_hal_wwdg.h"
336354
#endif /* HAL_WWDG_MODULE_ENABLED */
337355

338356
#ifdef HAL_PCD_MODULE_ENABLED
339-
#include "stm32f1xx_hal_pcd.h"
357+
#include "stm32f1xx_hal_pcd.h"
340358
#endif /* HAL_PCD_MODULE_ENABLED */
341359

342360
#ifdef HAL_HCD_MODULE_ENABLED
343-
#include "stm32f1xx_hal_hcd.h"
344-
#endif /* HAL_HCD_MODULE_ENABLED */
345-
361+
#include "stm32f1xx_hal_hcd.h"
362+
#endif /* HAL_HCD_MODULE_ENABLED */
363+
364+
#ifdef HAL_MMC_MODULE_ENABLED
365+
#include "stm32f1xx_hal_mmc.h"
366+
#endif /* HAL_MMC_MODULE_ENABLED */
346367

347368
/* Exported macro ------------------------------------------------------------*/
348369
#ifdef USE_FULL_ASSERT
349370
/**
350371
* @brief The assert_param macro is used for function's parameters check.
351-
* @param expr: If expr is false, it calls assert_failed function
372+
* @param expr If expr is false, it calls assert_failed function
352373
* which reports the name of the source file and the source
353-
* line number of the call that failed.
374+
* line number of the call that failed.
354375
* If expr is true, it returns no value.
355376
* @retval None
356377
*/
357-
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
378+
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
358379
/* Exported functions ------------------------------------------------------- */
359-
void assert_failed(uint8_t* file, uint32_t line);
380+
void assert_failed(uint8_t* file, uint32_t line);
360381
#else
361-
#define assert_param(expr) ((void)0U)
382+
#define assert_param(expr) ((void)0U)
362383
#endif /* USE_FULL_ASSERT */
363384

364385
#ifdef __cplusplus

0 commit comments

Comments
 (0)