Skip to content

Commit 3097b4b

Browse files
committed
[fix] 适配PWM驱动
1 parent e2db9f8 commit 3097b4b

20 files changed

Lines changed: 1136 additions & 2095 deletions

File tree

bsp/stm32/libraries/HAL_Drivers/drivers/drv_pwm.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ static rt_uint64_t tim_clock_get(TIM_HandleTypeDef *htim)
180180
}
181181
#endif
182182

183+
#if defined (SOC_SERIES_STM32N6)
184+
tim_clock = HAL_RCCEx_GetTIMGFreq();
185+
#endif
183186
return tim_clock;
184187
}
185188

@@ -376,7 +379,8 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device)
376379
tim->Init.CounterMode = TIM_COUNTERMODE_UP;
377380
tim->Init.Period = 1;
378381
tim->Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
379-
#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32L4)
382+
tim->Init.RepetitionCounter = 0;
383+
#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32N6)
380384
tim->Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
381385
#endif
382386
if (HAL_TIM_Base_Init(tim) != HAL_OK)

bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ static rt_err_t stm32_spi_init(struct stm32_spi *spi_drv, struct rt_spi_configur
198198
spi_handle->Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256;
199199
}
200200

201-
rt_kprintf("sys freq: %d, pclk freq: %d, SPI limiting freq: %d, SPI usage freq: %d",
201+
LOG_D("sys freq: %d, pclk freq: %d, SPI limiting freq: %d, SPI usage freq: %d",
202202
#if defined(SOC_SERIES_STM32MP1)
203203
HAL_RCC_GetSystemCoreClockFreq(),
204204
#else
@@ -539,7 +539,6 @@ static rt_err_t spi_configure(struct rt_spi_device *device,
539539

540540
struct stm32_spi *spi_drv = rt_container_of(device->bus, struct stm32_spi, spi_bus);
541541
spi_drv->cfg = configuration;
542-
rt_kprintf("@spi_configure\n");
543542

544543
return stm32_spi_init(spi_drv, configuration);
545544
}

bsp/stm32/libraries/HAL_Drivers/drivers/drv_tim.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@ void stm32_tim_pclkx_doubler_get(rt_uint32_t *pclk1_doubler, rt_uint32_t *pclk2_
8787

8888
RT_ASSERT(pclk1_doubler != RT_NULL);
8989
RT_ASSERT(pclk1_doubler != RT_NULL);
90-
90+
#if defined(SOC_SERIES_STM32N6)
91+
HAL_RCC_GetClockConfig(&RCC_ClkInitStruct);
92+
#else
9193
HAL_RCC_GetClockConfig(&RCC_ClkInitStruct, &flatency);
92-
94+
#endif
9395
*pclk1_doubler = 1;
9496
*pclk2_doubler = 1;
9597

bsp/stm32/stm32n657-st-nucleo-app/.config

Lines changed: 12 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ CONFIG_RT_SERIAL_BUF_STRATEGY_OVERWRITE=y
249249
# CONFIG_RT_USING_NULL is not set
250250
# CONFIG_RT_USING_ZERO is not set
251251
# CONFIG_RT_USING_RANDOM is not set
252-
# CONFIG_RT_USING_PWM is not set
252+
CONFIG_RT_USING_PWM=y
253253
# CONFIG_RT_USING_PULSE_ENCODER is not set
254254
# CONFIG_RT_USING_INPUT_CAPTURE is not set
255255
# CONFIG_RT_USING_MTD_NOR is not set
@@ -271,34 +271,7 @@ CONFIG_RT_USING_SPI_ISR=y
271271
# CONFIG_RT_USING_TOUCH is not set
272272
# CONFIG_RT_USING_LCD is not set
273273
# CONFIG_RT_USING_HWCRYPTO is not set
274-
CONFIG_RT_USING_WIFI=y
275-
CONFIG_RT_WLAN_DEVICE_STA_NAME="wlan0"
276-
CONFIG_RT_WLAN_DEVICE_AP_NAME="wlan1"
277-
CONFIG_RT_WLAN_SSID_MAX_LENGTH=32
278-
CONFIG_RT_WLAN_PASSWORD_MAX_LENGTH=32
279-
CONFIG_RT_WLAN_DEV_EVENT_NUM=2
280-
CONFIG_RT_WLAN_MANAGE_ENABLE=y
281-
CONFIG_RT_WLAN_SCAN_WAIT_MS=10000
282-
CONFIG_RT_WLAN_CONNECT_WAIT_MS=10000
283-
CONFIG_RT_WLAN_SCAN_SORT=y
284-
CONFIG_RT_WLAN_MSH_CMD_ENABLE=y
285-
CONFIG_RT_WLAN_JOIN_SCAN_BY_MGNT=y
286-
CONFIG_RT_WLAN_AUTO_CONNECT_ENABLE=y
287-
CONFIG_AUTO_CONNECTION_PERIOD_MS=2000
288-
CONFIG_RT_WLAN_CFG_ENABLE=y
289-
CONFIG_RT_WLAN_CFG_INFO_MAX=3
290-
CONFIG_RT_WLAN_PROT_ENABLE=y
291-
CONFIG_RT_WLAN_PROT_NAME_LEN=8
292-
CONFIG_RT_WLAN_PROT_MAX=2
293-
CONFIG_RT_WLAN_DEFAULT_PROT="lwip"
294-
CONFIG_RT_WLAN_PROT_LWIP_ENABLE=y
295-
CONFIG_RT_WLAN_PROT_LWIP_NAME="lwip"
296-
# CONFIG_RT_WLAN_PROT_LWIP_PBUF_FORCE is not set
297-
CONFIG_RT_WLAN_WORK_THREAD_ENABLE=y
298-
CONFIG_RT_WLAN_WORKQUEUE_THREAD_NAME="wlan"
299-
CONFIG_RT_WLAN_WORKQUEUE_THREAD_SIZE=2048
300-
CONFIG_RT_WLAN_WORKQUEUE_THREAD_PRIO=15
301-
# CONFIG_RT_WLAN_DEBUG is not set
274+
# CONFIG_RT_USING_WIFI is not set
302275
# CONFIG_RT_USING_BLK is not set
303276
# CONFIG_RT_USING_VIRTIO is not set
304277
CONFIG_RT_USING_PIN=y
@@ -355,90 +328,9 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
355328
#
356329
# Network
357330
#
358-
CONFIG_RT_USING_SAL=y
359-
CONFIG_SAL_INTERNET_CHECK=y
360-
CONFIG_SOCKET_TABLE_STEP_LEN=4
361-
362-
#
363-
# Docking with protocol stacks
364-
#
365-
CONFIG_SAL_USING_LWIP=y
366-
# CONFIG_SAL_USING_AT is not set
367-
# CONFIG_SAL_USING_TLS is not set
368-
# end of Docking with protocol stacks
369-
370-
CONFIG_SAL_SOCKETS_NUM=16
371-
CONFIG_RT_USING_NETDEV=y
372-
CONFIG_NETDEV_USING_IFCONFIG=y
373-
CONFIG_NETDEV_USING_PING=y
374-
CONFIG_NETDEV_USING_NETSTAT=y
375-
CONFIG_NETDEV_USING_AUTO_DEFAULT=y
376-
# CONFIG_NETDEV_USING_LINK_STATUS_CALLBACK is not set
377-
# CONFIG_NETDEV_USING_IPV6 is not set
378-
CONFIG_NETDEV_IPV4=1
379-
CONFIG_NETDEV_IPV6=0
380-
CONFIG_RT_USING_LWIP=y
381-
# CONFIG_RT_USING_LWIP_LOCAL_VERSION is not set
382-
# CONFIG_RT_USING_LWIP141 is not set
383-
CONFIG_RT_USING_LWIP203=y
384-
# CONFIG_RT_USING_LWIP212 is not set
385-
# CONFIG_RT_USING_LWIP_LATEST is not set
386-
CONFIG_RT_USING_LWIP_VER_NUM=0x20003
387-
# CONFIG_RT_USING_LWIP_IPV6 is not set
388-
CONFIG_RT_LWIP_MEM_ALIGNMENT=4
389-
CONFIG_RT_LWIP_IGMP=y
390-
CONFIG_RT_LWIP_ICMP=y
391-
# CONFIG_RT_LWIP_SNMP is not set
392-
CONFIG_RT_LWIP_DNS=y
393-
CONFIG_RT_LWIP_DHCP=y
394-
CONFIG_IP_SOF_BROADCAST=1
395-
CONFIG_IP_SOF_BROADCAST_RECV=1
396-
397-
#
398-
# Static IPv4 Address
399-
#
400-
CONFIG_RT_LWIP_IPADDR="192.168.1.30"
401-
CONFIG_RT_LWIP_GWADDR="192.168.1.1"
402-
CONFIG_RT_LWIP_MSKADDR="255.255.255.0"
403-
# end of Static IPv4 Address
404-
405-
CONFIG_RT_LWIP_UDP=y
406-
CONFIG_RT_LWIP_TCP=y
407-
CONFIG_RT_LWIP_RAW=y
408-
# CONFIG_RT_LWIP_PPP is not set
409-
CONFIG_RT_MEMP_NUM_NETCONN=8
410-
CONFIG_RT_LWIP_PBUF_NUM=16
411-
CONFIG_RT_LWIP_RAW_PCB_NUM=4
412-
CONFIG_RT_LWIP_UDP_PCB_NUM=4
413-
CONFIG_RT_LWIP_TCP_PCB_NUM=4
414-
CONFIG_RT_LWIP_TCP_SEG_NUM=40
415-
CONFIG_RT_LWIP_TCP_SND_BUF=8196
416-
CONFIG_RT_LWIP_TCP_WND=8196
417-
CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=10
418-
CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=8
419-
CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=1024
420-
# CONFIG_LWIP_NO_RX_THREAD is not set
421-
# CONFIG_LWIP_NO_TX_THREAD is not set
422-
CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=12
423-
CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=1024
424-
CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=8
425-
# CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set
426-
CONFIG_LWIP_NETIF_STATUS_CALLBACK=1
427-
CONFIG_LWIP_NETIF_LINK_CALLBACK=1
428-
CONFIG_RT_LWIP_NETIF_NAMESIZE=6
429-
CONFIG_SO_REUSE=1
430-
CONFIG_LWIP_SO_RCVTIMEO=1
431-
CONFIG_LWIP_SO_SNDTIMEO=1
432-
CONFIG_LWIP_SO_RCVBUF=1
433-
CONFIG_LWIP_SO_LINGER=0
434-
# CONFIG_RT_LWIP_NETIF_LOOPBACK is not set
435-
CONFIG_LWIP_NETIF_LOOPBACK=0
436-
# CONFIG_RT_LWIP_STATS is not set
437-
# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set
438-
CONFIG_RT_LWIP_USING_PING=y
439-
# CONFIG_LWIP_USING_DHCPD is not set
440-
# CONFIG_RT_LWIP_ENABLE_USER_HOOKS is not set
441-
# CONFIG_RT_LWIP_DEBUG is not set
331+
# CONFIG_RT_USING_SAL is not set
332+
# CONFIG_RT_USING_NETDEV is not set
333+
# CONFIG_RT_USING_LWIP is not set
442334
# CONFIG_RT_USING_AT is not set
443335
# end of Network
444336

@@ -550,28 +442,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
550442
# CONFIG_PKG_USING_WLAN_WICED is not set
551443
# end of Wiced WiFi
552444

553-
CONFIG_PKG_USING_RW007=y
554-
CONFIG_PKG_RW007_PATH="/packages/iot/WiFi/rw007"
555-
CONFIG_PKG_USING_RW007_V210=y
556-
# CONFIG_PKG_USING_RW007_V201 is not set
557-
# CONFIG_PKG_USING_RW007_V200 is not set
558-
# CONFIG_PKG_USING_RW007_V111 is not set
559-
# CONFIG_PKG_USING_RW007_V110 is not set
560-
# CONFIG_PKG_USING_RW007_V100 is not set
561-
# CONFIG_PKG_USING_RW007_LATEST_VERSION is not set
562-
CONFIG_PKG_RW007_VER="v2.1.0"
563-
# CONFIG_RW007_NOT_USE_EXAMPLE_DRIVERS is not set
564-
CONFIG_RW007_USING_STM32_DRIVERS=y
565-
# CONFIG_RW007_USING_BLE is not set
566-
# CONFIG_RW007_USING_POWERSWITCH_EXAMPLE is not set
567-
# CONFIG_RW007_USING_SPI_TEST is not set
568-
CONFIG_RW007_SPI_MAX_HZ=8000000
569-
CONFIG_RW007_SPI_BUS_NAME="spi5"
570-
CONFIG_RW007_CS_PIN=48
571-
CONFIG_RW007_BOOT0_PIN=79
572-
CONFIG_RW007_BOOT1_PIN=48
573-
CONFIG_RW007_INT_BUSY_PIN=64
574-
CONFIG_RW007_RST_PIN=60
445+
# CONFIG_PKG_USING_RW007 is not set
575446

576447
#
577448
# CYW43012 WiFi
@@ -1599,6 +1470,12 @@ CONFIG_BSP_USING_SPI=y
15991470
CONFIG_BSP_USING_SPI5=y
16001471
# CONFIG_BSP_SPI5_TX_USING_DMA is not set
16011472
# CONFIG_BSP_SPI5_RX_USING_DMA is not set
1473+
CONFIG_BSP_USING_PWM=y
1474+
CONFIG_BSP_USING_PWM1=y
1475+
CONFIG_BSP_USING_PWM1_CH1=y
1476+
CONFIG_BSP_USING_PWM1_CH2=y
1477+
CONFIG_BSP_USING_PWM1_CH3=y
1478+
CONFIG_BSP_USING_PWM1_CH4=y
16021479
# CONFIG_BSP_USING_UDID is not set
16031480
# end of On-chip Peripheral Drivers
16041481

0 commit comments

Comments
 (0)