Browse Source

[bsp][stm32][drv_adc.c]: change the bsp name of 100ask to be consistent with other bsp and commit a bug for drv_adc,c (#6068)

* [bsp][stm32][drv_adc.c]: change the bsp name of 100ask to be consistent with other bsp and commit a bug for drv_adc,c (#6068)
100ask-Alen 2 years ago
parent
commit
3d06d96f65
70 changed files with 9 additions and 5 deletions
  1. 2 2
      .github/workflows/action.yml
  2. 2 0
      bsp/stm32/README.md
  3. 5 3
      bsp/stm32/libraries/HAL_Drivers/drv_adc.c
  4. 0 0
      bsp/stm32/stm32f103-100ask-mini/.config
  5. 0 0
      bsp/stm32/stm32f103-100ask-mini/Kconfig
  6. 0 0
      bsp/stm32/stm32f103-100ask-mini/README.md
  7. 0 0
      bsp/stm32/stm32f103-100ask-mini/SConscript
  8. 0 0
      bsp/stm32/stm32f103-100ask-mini/SConstruct
  9. 0 0
      bsp/stm32/stm32f103-100ask-mini/applications/SConscript
  10. 0 0
      bsp/stm32/stm32f103-100ask-mini/applications/main.c
  11. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/.mxproject
  12. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/CubeMX_Config.ioc
  13. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Inc/main.h
  14. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h
  15. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Inc/stm32f1xx_it.h
  16. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c
  17. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Src/stm32f1xx_it.c
  18. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/Kconfig
  19. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/SConscript
  20. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/board.c
  21. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/board.h
  22. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/linker_scripts/link.icf
  23. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/linker_scripts/link.lds
  24. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/linker_scripts/link.sct
  25. 0 0
      bsp/stm32/stm32f103-100ask-mini/board/ports/user_key.c
  26. 0 0
      bsp/stm32/stm32f103-100ask-mini/figures/board.png
  27. 0 0
      bsp/stm32/stm32f103-100ask-mini/project.ewp
  28. 0 0
      bsp/stm32/stm32f103-100ask-mini/project.eww
  29. 0 0
      bsp/stm32/stm32f103-100ask-mini/project.uvoptx
  30. 0 0
      bsp/stm32/stm32f103-100ask-mini/project.uvprojx
  31. 0 0
      bsp/stm32/stm32f103-100ask-mini/rtconfig.h
  32. 0 0
      bsp/stm32/stm32f103-100ask-mini/rtconfig.py
  33. 0 0
      bsp/stm32/stm32f103-100ask-mini/template.ewp
  34. 0 0
      bsp/stm32/stm32f103-100ask-mini/template.eww
  35. 0 0
      bsp/stm32/stm32f103-100ask-mini/template.uvoptx
  36. 0 0
      bsp/stm32/stm32f103-100ask-mini/template.uvprojx
  37. 0 0
      bsp/stm32/stm32f103-100ask-pro/.config
  38. 0 0
      bsp/stm32/stm32f103-100ask-pro/Kconfig
  39. 0 0
      bsp/stm32/stm32f103-100ask-pro/README.md
  40. 0 0
      bsp/stm32/stm32f103-100ask-pro/SConscript
  41. 0 0
      bsp/stm32/stm32f103-100ask-pro/SConstruct
  42. 0 0
      bsp/stm32/stm32f103-100ask-pro/applications/SConscript
  43. 0 0
      bsp/stm32/stm32f103-100ask-pro/applications/main.c
  44. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/.mxproject
  45. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/CubeMX_Config.ioc
  46. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Inc/main.h
  47. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h
  48. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Inc/stm32f1xx_it.h
  49. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c
  50. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Src/stm32f1xx_it.c
  51. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/Kconfig
  52. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/SConscript
  53. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/board.c
  54. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/board.h
  55. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/linker_scripts/link.icf
  56. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/linker_scripts/link.lds
  57. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/linker_scripts/link.sct
  58. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/ports/fal_cfg.h
  59. 0 0
      bsp/stm32/stm32f103-100ask-pro/board/ports/spi_flash_init.c
  60. 0 0
      bsp/stm32/stm32f103-100ask-pro/figures/board.png
  61. 0 0
      bsp/stm32/stm32f103-100ask-pro/project.ewp
  62. 0 0
      bsp/stm32/stm32f103-100ask-pro/project.eww
  63. 0 0
      bsp/stm32/stm32f103-100ask-pro/project.uvoptx
  64. 0 0
      bsp/stm32/stm32f103-100ask-pro/project.uvprojx
  65. 0 0
      bsp/stm32/stm32f103-100ask-pro/rtconfig.h
  66. 0 0
      bsp/stm32/stm32f103-100ask-pro/rtconfig.py
  67. 0 0
      bsp/stm32/stm32f103-100ask-pro/template.ewp
  68. 0 0
      bsp/stm32/stm32f103-100ask-pro/template.eww
  69. 0 0
      bsp/stm32/stm32f103-100ask-pro/template.uvoptx
  70. 0 0
      bsp/stm32/stm32f103-100ask-pro/template.uvprojx

+ 2 - 2
.github/workflows/action.yml

@@ -91,8 +91,8 @@ jobs:
          - {RTT_BSP: "sam7x", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "sam7x", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f072-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f072-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f091-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f091-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
-         - {RTT_BSP: "stm32/stm32f103_100ask_mini", RTT_TOOL_CHAIN: "sourcery-arm"}
-         - {RTT_BSP: "stm32/stm32f103_100ask_pro", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "stm32/stm32f103-100ask-mini", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "stm32/stm32f103-100ask-pro", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f103-atk-nano", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f103-atk-nano", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f103-atk-warshipv3", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f103-atk-warshipv3", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f103-blue-pill", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f103-blue-pill", RTT_TOOL_CHAIN: "sourcery-arm"}

+ 2 - 0
bsp/stm32/README.md

@@ -9,6 +9,8 @@ STM32 系列 BSP 目前支持情况如下表所示:
 | [stm32f072-st-nucleo](stm32f072-st-nucleo) | ST 官方 STM32F072-nucleo 开发板 |
 | [stm32f072-st-nucleo](stm32f072-st-nucleo) | ST 官方 STM32F072-nucleo 开发板 |
 | [stm32f091-st-nucleo](stm32f091-st-nucleo) | ST 官方 STM32F091-nucleo 开发板 |
 | [stm32f091-st-nucleo](stm32f091-st-nucleo) | ST 官方 STM32F091-nucleo 开发板 |
 | **F1 系列** |  |
 | **F1 系列** |  |
+| [stm32f103-100ask-mini](stm32f103-100ask-mini)        | 百问网F103 Mini开发板  |
+| [stm32f103-100ask-pro](stm32f103-100ask-pro)        | 百问网F103 Pro开发板  |
 | [stm32f103-atk-nano](stm32f103-atk-nano)        | 正点原子 F103 NANO 开发板  |
 | [stm32f103-atk-nano](stm32f103-atk-nano)        | 正点原子 F103 NANO 开发板  |
 | [stm32f103-atk-warshipv3](stm32f103-atk-warshipv3)  | 正点原子 F103 战舰V3 开发板  |
 | [stm32f103-atk-warshipv3](stm32f103-atk-warshipv3)  | 正点原子 F103 战舰V3 开发板  |
 | [stm32f103-blue-pill](stm32f103-blue-pill) | STM32F103C8T6蓝色最小系统板 |
 | [stm32f103-blue-pill](stm32f103-blue-pill) | STM32F103C8T6蓝色最小系统板 |

+ 5 - 3
bsp/stm32/libraries/HAL_Drivers/drv_adc.c

@@ -73,12 +73,13 @@ static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chan
 
 
 static rt_uint8_t stm32_adc_get_resolution(struct rt_adc_device *device)
 static rt_uint8_t stm32_adc_get_resolution(struct rt_adc_device *device)
 {
 {
-    ADC_HandleTypeDef *stm32_adc_handler;
+#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F3)
+    return 12;
+#else
+    ADC_HandleTypeDef *stm32_adc_handler = device->parent.user_data;
 
 
     RT_ASSERT(device != RT_NULL);
     RT_ASSERT(device != RT_NULL);
 
 
-    stm32_adc_handler = device->parent.user_data;
-
     switch(stm32_adc_handler->Init.Resolution)
     switch(stm32_adc_handler->Init.Resolution)
     {
     {
         case ADC_RESOLUTION_12B:
         case ADC_RESOLUTION_12B:
@@ -92,6 +93,7 @@ static rt_uint8_t stm32_adc_get_resolution(struct rt_adc_device *device)
         default:
         default:
             return 0;
             return 0;
     }
     }
+#endif /* defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F3) */
 }
 }
 
 
 static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel)
 static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel)

+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/.config → bsp/stm32/stm32f103-100ask-mini/.config


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/Kconfig → bsp/stm32/stm32f103-100ask-mini/Kconfig


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/README.md → bsp/stm32/stm32f103-100ask-mini/README.md


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/SConscript → bsp/stm32/stm32f103-100ask-mini/SConscript


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/SConstruct → bsp/stm32/stm32f103-100ask-mini/SConstruct


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/applications/SConscript → bsp/stm32/stm32f103-100ask-mini/applications/SConscript


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/applications/main.c → bsp/stm32/stm32f103-100ask-mini/applications/main.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/.mxproject → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/.mxproject


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/CubeMX_Config.ioc → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/CubeMX_Config.ioc


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/Inc/main.h → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Inc/main.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/Inc/stm32f1xx_it.h → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Inc/stm32f1xx_it.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/CubeMX_Config/Src/stm32f1xx_it.c → bsp/stm32/stm32f103-100ask-mini/board/CubeMX_Config/Src/stm32f1xx_it.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/Kconfig → bsp/stm32/stm32f103-100ask-mini/board/Kconfig


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/SConscript → bsp/stm32/stm32f103-100ask-mini/board/SConscript


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/board.c → bsp/stm32/stm32f103-100ask-mini/board/board.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/board.h → bsp/stm32/stm32f103-100ask-mini/board/board.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/linker_scripts/link.icf → bsp/stm32/stm32f103-100ask-mini/board/linker_scripts/link.icf


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/linker_scripts/link.lds → bsp/stm32/stm32f103-100ask-mini/board/linker_scripts/link.lds


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/linker_scripts/link.sct → bsp/stm32/stm32f103-100ask-mini/board/linker_scripts/link.sct


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/board/ports/user_key.c → bsp/stm32/stm32f103-100ask-mini/board/ports/user_key.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/figures/board.png → bsp/stm32/stm32f103-100ask-mini/figures/board.png


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/project.ewp → bsp/stm32/stm32f103-100ask-mini/project.ewp


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/project.eww → bsp/stm32/stm32f103-100ask-mini/project.eww


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/project.uvoptx → bsp/stm32/stm32f103-100ask-mini/project.uvoptx


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/project.uvprojx → bsp/stm32/stm32f103-100ask-mini/project.uvprojx


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/rtconfig.h → bsp/stm32/stm32f103-100ask-mini/rtconfig.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/rtconfig.py → bsp/stm32/stm32f103-100ask-mini/rtconfig.py


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/template.ewp → bsp/stm32/stm32f103-100ask-mini/template.ewp


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/template.eww → bsp/stm32/stm32f103-100ask-mini/template.eww


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/template.uvoptx → bsp/stm32/stm32f103-100ask-mini/template.uvoptx


+ 0 - 0
bsp/stm32/stm32f103_100ask_mini/template.uvprojx → bsp/stm32/stm32f103-100ask-mini/template.uvprojx


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/.config → bsp/stm32/stm32f103-100ask-pro/.config


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/Kconfig → bsp/stm32/stm32f103-100ask-pro/Kconfig


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/README.md → bsp/stm32/stm32f103-100ask-pro/README.md


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/SConscript → bsp/stm32/stm32f103-100ask-pro/SConscript


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/SConstruct → bsp/stm32/stm32f103-100ask-pro/SConstruct


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/applications/SConscript → bsp/stm32/stm32f103-100ask-pro/applications/SConscript


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/applications/main.c → bsp/stm32/stm32f103-100ask-pro/applications/main.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/.mxproject → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/.mxproject


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/CubeMX_Config.ioc → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/CubeMX_Config.ioc


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/Inc/main.h → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Inc/main.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Inc/stm32f1xx_hal_conf.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/Inc/stm32f1xx_it.h → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Inc/stm32f1xx_it.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/CubeMX_Config/Src/stm32f1xx_it.c → bsp/stm32/stm32f103-100ask-pro/board/CubeMX_Config/Src/stm32f1xx_it.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/Kconfig → bsp/stm32/stm32f103-100ask-pro/board/Kconfig


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/SConscript → bsp/stm32/stm32f103-100ask-pro/board/SConscript


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/board.c → bsp/stm32/stm32f103-100ask-pro/board/board.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/board.h → bsp/stm32/stm32f103-100ask-pro/board/board.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/linker_scripts/link.icf → bsp/stm32/stm32f103-100ask-pro/board/linker_scripts/link.icf


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/linker_scripts/link.lds → bsp/stm32/stm32f103-100ask-pro/board/linker_scripts/link.lds


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/linker_scripts/link.sct → bsp/stm32/stm32f103-100ask-pro/board/linker_scripts/link.sct


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/ports/fal_cfg.h → bsp/stm32/stm32f103-100ask-pro/board/ports/fal_cfg.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/board/ports/spi_flash_init.c → bsp/stm32/stm32f103-100ask-pro/board/ports/spi_flash_init.c


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/figures/board.png → bsp/stm32/stm32f103-100ask-pro/figures/board.png


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/project.ewp → bsp/stm32/stm32f103-100ask-pro/project.ewp


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/project.eww → bsp/stm32/stm32f103-100ask-pro/project.eww


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/project.uvoptx → bsp/stm32/stm32f103-100ask-pro/project.uvoptx


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/project.uvprojx → bsp/stm32/stm32f103-100ask-pro/project.uvprojx


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/rtconfig.h → bsp/stm32/stm32f103-100ask-pro/rtconfig.h


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/rtconfig.py → bsp/stm32/stm32f103-100ask-pro/rtconfig.py


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/template.ewp → bsp/stm32/stm32f103-100ask-pro/template.ewp


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/template.eww → bsp/stm32/stm32f103-100ask-pro/template.eww


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/template.uvoptx → bsp/stm32/stm32f103-100ask-pro/template.uvoptx


+ 0 - 0
bsp/stm32/stm32f103_100ask_pro/template.uvprojx → bsp/stm32/stm32f103-100ask-pro/template.uvprojx