Skip to content

Commit d79df8c

Browse files
修复ADC异常
1 parent 877921f commit d79df8c

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

bsp/stm32/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ STM32 系列 BSP 目前支持情况如下表所示:
5858
| **MP1 系列** | |
5959
| [stm32mp157a-st-discovery](stm32mp157a-st-discovery) | ST 官方 STM32MP157A-DK1 开发板 |
6060
| [stm32mp157a-st-ev1](stm32mp157a-st-ev1) | ST 官方 STM32MP157A-EV1 开发板 |
61+
| **WB 系列** | |
62+
| [stm32wb55-st-nucleo](stm32wb55-st-nucleo) | ST 官方 STM32WB55-nucleo 开发板 |
6163

6264
可以通过阅读相应 BSP 下的 README 来快速上手,如果想要使用 BSP 更多功能可参考 docs 文件夹下提供的说明文档,如下表所示:
6365

bsp/stm32/libraries/HAL_Drivers/drv_adc.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch
193193
return -RT_ERROR;
194194
}
195195

196-
#if defined(SOC_SERIES_STM32MP1) || defined (SOC_SERIES_STM32H7)
196+
#if defined(SOC_SERIES_STM32MP1) || defined (SOC_SERIES_STM32H7) || defined (SOC_SERIES_STM32WB)
197197
ADC_ChanConf.Rank = ADC_REGULAR_RANK_1;
198198
#else
199199
ADC_ChanConf.Rank = 1;
@@ -205,22 +205,24 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch
205205
ADC_ChanConf.SamplingTime = ADC_SAMPLETIME_55CYCLES_5;
206206
#elif defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7)
207207
ADC_ChanConf.SamplingTime = ADC_SAMPLETIME_112CYCLES;
208-
#elif defined(SOC_SERIES_STM32L4) || defined (SOC_SERIES_STM32WB)
208+
#elif defined(SOC_SERIES_STM32L4)
209209
ADC_ChanConf.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
210210
#elif defined(SOC_SERIES_STM32MP1)
211211
ADC_ChanConf.SamplingTime = ADC_SAMPLETIME_810CYCLES_5;
212212
#elif defined(SOC_SERIES_STM32H7)
213213
ADC_ChanConf.SamplingTime = ADC_SAMPLETIME_64CYCLES_5;
214+
#elif defined (SOC_SERIES_STM32WB)
215+
ADC_ChanConf.SamplingTime = ADC_SAMPLETIME_2CYCLES_5;
214216
#endif
215217

216218
#if defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32L4) || defined (SOC_SERIES_STM32WB)
217219
ADC_ChanConf.Offset = 0;
218220
#endif
219221

220-
#if defined(SOC_SERIES_STM32L4) || defined (SOC_SERIES_STM32WB)
222+
#if defined(SOC_SERIES_STM32L4)
221223
ADC_ChanConf.OffsetNumber = ADC_OFFSET_NONE;
222224
ADC_ChanConf.SingleDiff = LL_ADC_SINGLE_ENDED;
223-
#elif defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7)
225+
#elif defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined (SOC_SERIES_STM32WB)
224226
ADC_ChanConf.OffsetNumber = ADC_OFFSET_NONE; /* ADC channel affected to offset number */
225227
ADC_ChanConf.Offset = 0;
226228
ADC_ChanConf.SingleDiff = ADC_SINGLE_ENDED; /* ADC channel differential mode */

bsp/stm32/stm32wb55-st-nucleo/board/linker_scripts/link.lds

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* Program Entry, set to mark it as "used" and avoid gc */
66
MEMORY
77
{
8-
ROM (rx) : ORIGIN = 0x08000000, LENGTH = 1024 /* 1024KB flash */
8+
ROM (rx) : ORIGIN = 0x08000000, LENGTH = 1024k /* 1024KB flash */
99
RAM (rw) : ORIGIN = 0x20000000, LENGTH = 192k /* 192KB sram */
1010
}
1111
ENTRY(Reset_Handler)
@@ -153,4 +153,10 @@ SECTIONS
153153
.debug_funcnames 0 : { *(.debug_funcnames) }
154154
.debug_typenames 0 : { *(.debug_typenames) }
155155
.debug_varnames 0 : { *(.debug_varnames) }
156+
157+
.ARM.attributes 0 : { *(.ARM.attributes) }
158+
MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
159+
MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED
160+
MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED
161+
156162
}

bsp/stm32/stm32wb55-st-nucleo/rtconfig.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#define RT_USING_DEVICE
4141
#define RT_USING_CONSOLE
4242
#define RT_CONSOLEBUF_SIZE 128
43-
#define RT_CONSOLE_DEVICE_NAME "uart"
43+
#define RT_CONSOLE_DEVICE_NAME "uart1"
4444
#define RT_VER_NUM 0x40003
4545
#define ARCH_ARM
4646
#define RT_USING_CPU_FFS
@@ -74,12 +74,6 @@
7474

7575
/* Device virtual file system */
7676

77-
#define RT_USING_DFS
78-
#define DFS_USING_WORKDIR
79-
#define DFS_FILESYSTEMS_MAX 2
80-
#define DFS_FILESYSTEM_TYPES_MAX 2
81-
#define DFS_FD_MAX 16
82-
#define RT_USING_DFS_DEVFS
8377

8478
/* Device Drivers */
8579

0 commit comments

Comments
 (0)