From 6a572b6e05c470c9a5ec60d31665a815523bdab0 Mon Sep 17 00:00:00 2001 From: dgjames <1943357252@qq.com> Date: Sat, 15 Mar 2025 08:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=B0=94=E8=B4=A8=E9=87=8F=E5=87=BD?= =?UTF-8?q?=E6=95=B0,wifi=E8=BF=9E=E6=8E=A510s=E5=BB=B6=E6=97=B6=EF=BC=88?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=B8=8D=E8=A1=8C=EF=BC=89,=E5=87=A0?= =?UTF-8?q?=E4=B8=AA=E5=BC=80=E5=85=B3=EF=BC=8C=E9=A3=8E=E6=89=87=E7=94=A8?= =?UTF-8?q?PWM=E8=BF=98=E6=98=AF=E4=B8=8D=E8=A1=8C2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config | 5 +- .vscode/project.json | 196 ++++++++++---------- applications/motor.c | 52 +++--- applications/motor.h | 2 + applications/myproject.c | 11 +- applications/sim.h | 3 +- applications/status.c | 33 +++- board/CubeMX_Config/CubeMX_Config.ioc | 9 +- board/CubeMX_Config/Inc/main.h | 2 - board/CubeMX_Config/Src/main.c | 14 +- board/CubeMX_Config/Src/stm32f4xx_hal_msp.c | 9 + rtconfig.h | 2 + 12 files changed, 193 insertions(+), 145 deletions(-) create mode 100644 applications/motor.h diff --git a/.config b/.config index c32df69..831be06 100644 --- a/.config +++ b/.config @@ -1858,7 +1858,10 @@ CONFIG_BSP_USING_TIM11=y CONFIG_BSP_USING_TIM13=y CONFIG_BSP_USING_TIM14=y CONFIG_BSP_USING_PWM=y -# CONFIG_BSP_USING_PWM1 is not set +CONFIG_BSP_USING_PWM1=y +CONFIG_BSP_USING_PWM1_CH1=y +# CONFIG_BSP_USING_PWM1_CH2 is not set +# CONFIG_BSP_USING_PWM1_CH3 is not set # CONFIG_BSP_USING_PWM2 is not set CONFIG_BSP_USING_PWM3=y CONFIG_BSP_USING_PWM3_CH2=y diff --git a/.vscode/project.json b/.vscode/project.json index 4f6cb08..1e9efee 100644 --- a/.vscode/project.json +++ b/.vscode/project.json @@ -13,46 +13,46 @@ "name": "ali-iotkit", "path": "packages\\ali-iotkit-v3.0.2", "files": [ - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\mqtt_api.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_UDP_rtthread.c", - "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTDeserializePublish.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_timer.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTUnsubscribeClient.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_UDP_rtthread.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_net.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTPacket.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_fota.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_msg_process.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_prt_nwk_payload.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_message.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTDeserializePublish.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_log_report.c", + "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_compat.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\client\\dm_client_adapter.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\iotx_mqtt_client.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_TCP_rtthread.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTSerializePublish.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_prt_nwk_payload.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_ota.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_TCP_rtthread.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_defs.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_cota.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_string.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\impl_linkkit.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_log.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_message_cache.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_utils.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_api.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\iotx_cm.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTSubscribeClient.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\iotx_cm_mqtt.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\mqtt_api.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_sha256.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\iotx_cm.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_sign\\dev_sign_mqtt.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\client\\dm_client.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_opt.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTConnectClient.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_manager.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_cjson.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_cota.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_api.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_report.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\impl_linkkit.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\client\\dm_client.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_compat.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_string.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_ota.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_sign\\dev_sign_mqtt.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_net.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_opt.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_fota.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_defs.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_ipc.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_timer.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_msg_process.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTConnectClient.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_message_cache.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_message.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTSubscribeClient.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_sha256.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTPacket.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_log.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_log_report.c", "packages\\ali-iotkit-v3.0.2\\SConscript" ] }, @@ -69,21 +69,23 @@ "path": "applications", "files": [ "applications\\app_lcd.c", - "applications\\init.c", - "applications\\main.c", + "applications\\icm_20608_sample.c", "applications\\motor.c", + "applications\\sensor.c", + "applications\\main.c", "applications\\sim.c", - "applications\\uart_sample.c", - "my_pro\\AHT10.c", - "my_pro\\icm_20608_sample.c", - "my_pro\\indicator_led.c", - "my_pro\\my_func.c", - "my_pro\\myinfrared.c", - "my_pro\\myproject.c", - "my_pro\\mysnake.c", - "my_pro\\mytest.c", - "my_pro\\pin_irq_example.c", - "my_pro\\test_drv_example.c", + "applications\\AHT10.c", + "applications\\assistant.c", + "applications\\test_drv_example.c", + "applications\\init.c", + "applications\\indicator_led.c", + "applications\\pin_irq_example.c", + "applications\\myinfrared.c", + "applications\\mysnake.c", + "applications\\my_func.c", + "applications\\mytest.c", + "applications\\myproject.c", + "applications\\status.c", "applications\\SConscript" ] }, @@ -91,8 +93,8 @@ "name": "AT", "path": "rt-thread\\components\\net\\at", "files": [ - "rt-thread\\components\\net\\at\\src\\at_client.c", "rt-thread\\components\\net\\at\\src\\at_utils.c", + "rt-thread\\components\\net\\at\\src\\at_client.c", "rt-thread\\components\\net\\at\\src\\at_cli.c", "rt-thread\\components\\net\\at\\SConscript" ] @@ -212,11 +214,11 @@ "name": "Fal", "path": "rt-thread\\components\\fal", "files": [ - "rt-thread\\components\\fal\\src\\fal.c", - "rt-thread\\components\\fal\\src\\fal_flash.c", - "rt-thread\\components\\fal\\samples\\porting\\fal_flash_sfud_port.c", "rt-thread\\components\\fal\\src\\fal_partition.c", "rt-thread\\components\\fal\\src\\fal_rtt.c", + "rt-thread\\components\\fal\\src\\fal_flash.c", + "rt-thread\\components\\fal\\src\\fal.c", + "rt-thread\\components\\fal\\samples\\porting\\fal_flash_sfud_port.c", "rt-thread\\components\\fal\\SConscript" ] }, @@ -240,11 +242,11 @@ "name": "Finsh", "path": "rt-thread\\components\\finsh", "files": [ - "rt-thread\\components\\finsh\\msh_file.c", - "rt-thread\\components\\finsh\\shell.c", - "rt-thread\\components\\finsh\\msh.c", "rt-thread\\components\\finsh\\msh_parse.c", "rt-thread\\components\\finsh\\cmd.c", + "rt-thread\\components\\finsh\\msh.c", + "rt-thread\\components\\finsh\\shell.c", + "rt-thread\\components\\finsh\\msh_file.c", "rt-thread\\components\\finsh\\SConscript" ] }, @@ -268,9 +270,9 @@ "name": "Infrared_frame", "path": "packages\\infrared-v0.1.1", "files": [ - "packages\\infrared-v0.1.1\\src\\nec_decoder.c", - "packages\\infrared-v0.1.1\\src\\infrared.c", "packages\\infrared-v0.1.1\\src\\drv_infrared.c", + "packages\\infrared-v0.1.1\\src\\infrared.c", + "packages\\infrared-v0.1.1\\src\\nec_decoder.c", "packages\\infrared-v0.1.1\\SConscript" ] }, @@ -300,11 +302,11 @@ "name": "kernel-samples", "path": "packages\\kernel_samples-latest\\en", "files": [ + "packages\\kernel_samples-latest\\en\\mailbox_sample.c", + "packages\\kernel_samples-latest\\en\\semaphore_sample.c", + "packages\\kernel_samples-latest\\en\\msgq_sample.c", "packages\\kernel_samples-latest\\en\\thread_sample.c", "packages\\kernel_samples-latest\\en\\event_sample.c", - "packages\\kernel_samples-latest\\en\\mailbox_sample.c", - "packages\\kernel_samples-latest\\en\\msgq_sample.c", - "packages\\kernel_samples-latest\\en\\semaphore_sample.c", "packages\\kernel_samples-latest\\en\\mutex_sample.c", "packages\\kernel_samples-latest\\en\\SConscript" ] @@ -314,8 +316,8 @@ "path": "rt-thread\\src\\klibc", "files": [ "rt-thread\\src\\klibc\\kstdio.c", - "rt-thread\\src\\klibc\\kstring.c", "rt-thread\\src\\klibc\\rt_vsscanf.c", + "rt-thread\\src\\klibc\\kstring.c", "rt-thread\\src\\klibc\\kerrno.c", "rt-thread\\src\\klibc\\rt_vsnprintf_std.c", "rt-thread\\src\\klibc\\SConscript" @@ -345,47 +347,47 @@ "name": "Libraries", "path": "libraries\\STM32F4xx_HAL", "files": [ - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc_ex.c", - "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\system_stm32f4xx.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_gpio.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_spi.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_crc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rng.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_qspi.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cec.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_lptim.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_uart.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sram.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fsmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_usart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ramfunc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_crc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fsmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_uart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_spi.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_qspi.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_lptim.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cec.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal.c", + "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\system_stm32f4xx.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sram.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_gpio.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rng.c", "libraries\\STM32F4xx_HAL\\SConscript" ] }, @@ -471,9 +473,9 @@ "name": "rt_usbd", "path": "rt-thread\\components\\legacy\\usb\\usbdevice", "files": [ - "rt-thread\\components\\legacy\\usb\\usbdevice\\class\\cdc_vcom.c", - "rt-thread\\components\\legacy\\usb\\usbdevice\\core\\usbdevice_core.c", "rt-thread\\components\\legacy\\usb\\usbdevice\\core\\usbdevice.c", + "rt-thread\\components\\legacy\\usb\\usbdevice\\core\\usbdevice_core.c", + "rt-thread\\components\\legacy\\usb\\usbdevice\\class\\cdc_vcom.c", "rt-thread\\components\\legacy\\usb\\usbdevice\\SConscript" ] }, @@ -481,8 +483,8 @@ "name": "rw007", "path": "packages\\rw007-v2.1.0", "files": [ - "packages\\rw007-v2.1.0\\example\\rw007_stm32_port.c", "packages\\rw007-v2.1.0\\src\\spi_wifi_rw007.c", + "packages\\rw007-v2.1.0\\example\\rw007_stm32_port.c", "packages\\rw007-v2.1.0\\SConscript" ] }, diff --git a/applications/motor.c b/applications/motor.c index aef439a..ee8fef4 100644 --- a/applications/motor.c +++ b/applications/motor.c @@ -24,7 +24,7 @@ struct rt_device_pwm *motor_dev; // pwm设备句柄 -rt_uint32_t period = 10000000; // 单位us 向左6位，变毫秒 10ms +rt_uint32_t period = 1000000000; // 单位us 向左6位，变毫秒 1s rt_uint32_t pulse = 1000000; @@ -36,7 +36,7 @@ rt_uint32_t pulse = 1000000; */ void motor_speed(int num) { - rt_pwm_set(motor_dev, MOTOR_PWM_DEV_CHANNEL, period, num * period / 100); + rt_pwm_set(motor_dev, MOTOR_PWM_DEV_CHANNEL, period, 100-(num * period / 100)); } #define PIN_MOTOR1 GET_PIN(B, 2) @@ -48,36 +48,36 @@ int motor1=PIN_HIGH; int mot_init(void) { - rt_pin_mode(PIN_MOTOR1, PIN_MODE_OUTPUT); - rt_pin_write(PIN_MOTOR1, PIN_HIGH); - // motor_dev = (struct rt_device_pwm *)rt_device_find(MOTOR_PWM_DEV_NAME); - // if (motor_dev == RT_NULL) - // { - // rt_kprintf("motor run failed! can't find %s device!\n", MOTOR_PWM_DEV_NAME); - // return RT_ERROR; - // } - // /* 设置PWM周期和脉冲宽度默认值 */ - // motor_speed(100); + // rt_pin_mode(PIN_MOTOR1, PIN_MODE_OUTPUT); + // rt_pin_write(PIN_MOTOR1, PIN_HIGH); + motor_dev = (struct rt_device_pwm *)rt_device_find(MOTOR_PWM_DEV_NAME); + if (motor_dev == RT_NULL) + { + rt_kprintf("motor run failed! can't find %s device!\n", MOTOR_PWM_DEV_NAME); + return RT_ERROR; + } + /* 设置PWM周期和脉冲宽度默认值 */ + motor_speed(100); LOG1("motor init success!"); } void motor_set(int argc, char **argv) { - if(motor1== PIN_HIGH) - { - rt_pin_write(PIN_MOTOR1, PIN_LOW); - motor1=PIN_LOW; - } - else - { - rt_pin_write(PIN_MOTOR1, PIN_HIGH); - motor1=PIN_HIGH; - } - - // if (argc == 2) + // if(motor1== PIN_HIGH) // { - // motor_speed(atoi(argv[1])); + // rt_pin_write(PIN_MOTOR1, PIN_LOW); + // motor1=PIN_LOW; // } - // LOG5("motor speed:%d",atoi(argv[1])); + // else + // { + // rt_pin_write(PIN_MOTOR1, PIN_HIGH); + // motor1=PIN_HIGH; + // } + + if (argc == 2) + { + motor_speed(atoi(argv[1])); + } + LOG5("motor speed:%d",atoi(argv[1])); } MSH_CMD_EXPORT_ALIAS(motor_set,motor, motor_set speed 0~100); diff --git a/applications/motor.h b/applications/motor.h new file mode 100644 index 0000000..d9c3fb5 --- /dev/null +++ b/applications/motor.h @@ -0,0 +1,2 @@ +void motor_speed(int num); +int mot_init(void); \ No newline at end of file diff --git a/applications/myproject.c b/applications/myproject.c index 81a051e..dd9ee61 100644 --- a/applications/myproject.c +++ b/applications/myproject.c @@ -394,6 +394,7 @@ static void mqtt_example_main(void *parameter) res = example_subscribe(pclient); if (res < 0) { + wlan_connected = RT_FALSE; IOT_MQTT_Destroy(&pclient); return; } @@ -434,9 +435,13 @@ void cdc_entry(void *parameter) void wlan_connect_thread(void *parameter) { (void *)parameter; - rt_wlan_connect(WLAN_NAME,WLAN_PASSWORD); - rt_wlan_config_autoreconnect(RT_TRUE); wlan_connected=RT_FALSE; + // rt_wlan_connect(WLAN_NAME,WLAN_PASSWORD); + while(rt_wlan_connect(WLAN_NAME,WLAN_PASSWORD)!= RT_EOK) + { + rt_thread_mdelay(2000); + } + rt_wlan_config_autoreconnect(RT_TRUE); while (1) { if (rt_wlan_is_connected() == RT_TRUE) @@ -444,7 +449,7 @@ void wlan_connect_thread(void *parameter) if(!wlan_connected) { wlan_connected = RT_TRUE; - rt_thread_mdelay(2000); + rt_thread_mdelay(10000); mqt_init(); } } diff --git a/applications/sim.h b/applications/sim.h index 54fdbee..0a6ff76 100644 --- a/applications/sim.h +++ b/applications/sim.h @@ -1,2 +1,3 @@ #include "rtthread.h" -rt_err_t sim_dev_init(); \ No newline at end of file +rt_err_t sim_dev_init(); +rt_err_t sim_call(char *phonenum); \ No newline at end of file diff --git a/applications/status.c b/applications/status.c index 09eae5f..0b87009 100644 --- a/applications/status.c +++ b/applications/status.c @@ -4,6 +4,7 @@ #include #include #include +#include #define THREAD_PRIORITY 25 @@ -23,10 +24,40 @@ // #define USE_LOG_D #include "logn.h" +/* 配置 LED 灯引脚 */ +#define PIN_LED_B GET_PIN(F, 11) // PF11 : LED_B --> LED +#define PIN_LED_R GET_PIN(F, 12) // PF12 : LED_R --> LED + void danger_status(void) { char *str = "aa"; serial_send(str); sim_call("17318112360"); } -MSH_CMD_EXPORT_ALIAS(danger_status, danger, show danger_status); \ No newline at end of file +MSH_CMD_EXPORT_ALIAS(danger_status, danger, show danger_status); + +void fan_on(void) +{ + LOG3("fan on!"); + motor_speed(100); +} + +void fan_off(void) +{ + LOG3("fan off!"); + motor_speed(20); +} + +void light_on(void) +{ + LOG3("light on!"); + rt_pin_mode(PIN_LED_B, PIN_MODE_OUTPUT); + rt_pin_write(PIN_LED_B, PIN_LOW); +} + +void light_off(void) +{ + LOG3("light off!"); + rt_pin_mode(PIN_LED_B, PIN_MODE_OUTPUT); + rt_pin_write(PIN_LED_B, PIN_LOW); +} \ No newline at end of file diff --git a/board/CubeMX_Config/CubeMX_Config.ioc b/board/CubeMX_Config/CubeMX_Config.ioc index 3e6a24b..6102227 100644 --- a/board/CubeMX_Config/CubeMX_Config.ioc +++ b/board/CubeMX_Config/CubeMX_Config.ioc @@ -154,10 +154,8 @@ PA5.Signal=ADCx_IN5 PA6.Locked=true PA6.Signal=ADCx_IN6 PA7.Signal=S_TIM3_CH2 -PA8.GPIOParameters=GPIO_Label -PA8.GPIO_Label=FAN1 PA8.Locked=true -PA8.Signal=GPIO_Output +PA8.Signal=S_TIM1_CH1 PA9.GPIOParameters=GPIO_PuPd PA9.GPIO_PuPd=GPIO_PULLUP PA9.Mode=Asynchronous @@ -334,6 +332,8 @@ SH.FSMC_NWE.0=FSMC_NWE,Lcd1 SH.FSMC_NWE.ConfNb=1 SH.S_TIM14_CH1.0=TIM14_CH1,PWM Generation1 CH1 SH.S_TIM14_CH1.ConfNb=1 +SH.S_TIM1_CH1.0=TIM1_CH1,PWM Generation1 CH1 +SH.S_TIM1_CH1.ConfNb=1 SH.S_TIM1_CH2.0=TIM1_CH2,PWM Generation2 CH2 SH.S_TIM1_CH2.ConfNb=1 SH.S_TIM1_CH3.0=TIM1_CH3,PWM Generation3 CH3 @@ -355,10 +355,11 @@ SPI2.Direction=SPI_DIRECTION_2LINES SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate SPI2.Mode=SPI_MODE_MASTER SPI2.VirtualType=VM_MASTER +TIM1.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1 TIM1.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2 TIM1.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 TIM1.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 -TIM1.IPParameters=Channel-PWM Generation2 CH2,Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4 +TIM1.IPParameters=Channel-PWM Generation2 CH2,Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4,Channel-PWM Generation1 CH1 TIM14.Channel=TIM_CHANNEL_1 TIM14.IPParameters=Channel TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 diff --git a/board/CubeMX_Config/Inc/main.h b/board/CubeMX_Config/Inc/main.h index 56f6aaf..3a7925a 100644 --- a/board/CubeMX_Config/Inc/main.h +++ b/board/CubeMX_Config/Inc/main.h @@ -82,8 +82,6 @@ void Error_Handler(void); /* Private defines -----------------------------------------------------------*/ #define PM25LED_Pin GPIO_PIN_14 #define PM25LED_GPIO_Port GPIOE -#define FAN1_Pin GPIO_PIN_8 -#define FAN1_GPIO_Port GPIOA /* USER CODE BEGIN Private defines */ diff --git a/board/CubeMX_Config/Src/main.c b/board/CubeMX_Config/Src/main.c index 6291c7b..68bef93 100644 --- a/board/CubeMX_Config/Src/main.c +++ b/board/CubeMX_Config/Src/main.c @@ -549,6 +549,10 @@ static void MX_TIM1_Init(void) sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET; sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET; + if (HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1) != HAL_OK) + { + Error_Handler(); + } if (HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_2) != HAL_OK) { Error_Handler(); @@ -1017,16 +1021,6 @@ static void MX_GPIO_Init(void) __HAL_RCC_GPIOD_CLK_ENABLE(); __HAL_RCC_GPIOG_CLK_ENABLE(); - /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(FAN1_GPIO_Port, FAN1_Pin, GPIO_PIN_RESET); - - /*Configure GPIO pin : FAN1_Pin */ - GPIO_InitStruct.Pin = FAN1_Pin; - GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - HAL_GPIO_Init(FAN1_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pins : PG11 PG13 PG14 */ GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_13|GPIO_PIN_14; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; diff --git a/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c b/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c index 819a38f..c57be9f 100644 --- a/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c +++ b/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c @@ -601,10 +601,12 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) /* USER CODE END TIM1_MspPostInit 0 */ __HAL_RCC_GPIOE_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); /**TIM1 GPIO Configuration PE11 ------> TIM1_CH2 PE13 ------> TIM1_CH3 PE14 ------> TIM1_CH4 + PA8 ------> TIM1_CH1 */ GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_13|PM25LED_Pin; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -613,6 +615,13 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) GPIO_InitStruct.Alternate = GPIO_AF1_TIM1; HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); + GPIO_InitStruct.Pin = GPIO_PIN_8; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /* USER CODE BEGIN TIM1_MspPostInit 1 */ /* USER CODE END TIM1_MspPostInit 1 */ diff --git a/rtconfig.h b/rtconfig.h index 4b494bf..46c9e05 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -737,6 +737,8 @@ #define BSP_USING_TIM13 #define BSP_USING_TIM14 #define BSP_USING_PWM +#define BSP_USING_PWM1 +#define BSP_USING_PWM1_CH1 #define BSP_USING_PWM3 #define BSP_USING_PWM3_CH2 #define BSP_USING_PWM14