diff --git a/.config b/.config index e3a4ebd..0b8c51c 100644 --- a/.config +++ b/.config @@ -1135,13 +1135,41 @@ CONFIG_FAL_DEBUG_CONFIG=y # # STM32 HAL & SDK Drivers # +# CONFIG_PKG_USING_STM32F0_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F0_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32F1_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F1_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32F2_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F2_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32F3_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F3_CMSIS_DRIVER is not set # CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set # CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32F7_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F7_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32G0_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32G0_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32G4_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32G4_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32H5_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32H5_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32H7_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32H7_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32H7RS_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32H7RS_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32L0_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32L0_CMSIS_DRIVER is not set # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32L5_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32L5_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32U5_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32U5_CMSIS_DRIVER is not set # CONFIG_PKG_USING_STM32WB55_SDK is not set # CONFIG_PKG_USING_STM32_SDIO is not set CONFIG_SDIO_MAX_FREQ=1000000 +# CONFIG_PKG_USING_STM32WL_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32WL_CMSIS_DRIVER is not set # end of STM32 HAL & SDK Drivers # @@ -1251,7 +1279,20 @@ CONFIG_PKG_AP3216C_VER="latest" # CONFIG_PKG_USING_TSL4531 is not set # CONFIG_PKG_USING_DS18B20 is not set # CONFIG_PKG_USING_DHT11 is not set -# CONFIG_PKG_USING_DHTXX is not set +CONFIG_PKG_USING_DHTXX=y +CONFIG_PKG_DHTXX_PATH="/packages/peripherals/sensors/dhtxx" +CONFIG_PKG_USING_DHTXX_TYPE_DHT11=y +# CONFIG_PKG_USING_DHTXX_TYPE_DHT12 is not set +# CONFIG_PKG_USING_DHTXX_TYPE_DHT21 is not set +# CONFIG_PKG_USING_DHTXX_TYPE_DHT22 is not set +# CONFIG_PKG_DHTXX_USING_SENSOR_V1 is not set +CONFIG_PKG_USING_DHTXX_DEBUG=y +# CONFIG_PKG_USING_DHTXX_SAMPLE is not set +# CONFIG_PKG_USING_DHTXX_V090 is not set +# CONFIG_PKG_USING_DHTXX_V08X is not set +CONFIG_PKG_USING_DHTXX_LATEST_VERSION=y +CONFIG_PKG_DHTXX_VER="latest" +CONFIG_PKG_DHTXX_VER_NUM=0x99999 # CONFIG_PKG_USING_GY271 is not set # CONFIG_PKG_USING_GP2Y10 is not set # CONFIG_PKG_USING_SGP30 is not set @@ -1262,6 +1303,7 @@ CONFIG_PKG_AP3216C_VER="latest" # CONFIG_PKG_USING_BMI088 is not set # CONFIG_PKG_USING_HMC5883 is not set # CONFIG_PKG_USING_MAX6675 is not set +# CONFIG_PKG_USING_MAX31855 is not set # CONFIG_PKG_USING_TMP1075 is not set # CONFIG_PKG_USING_SR04 is not set # CONFIG_PKG_USING_CCS811 is not set diff --git a/.vscode/keil-assistant.log b/.vscode/keil-assistant.log index 5c7dd2f..1258527 100644 --- a/.vscode/keil-assistant.log +++ b/.vscode/keil-assistant.log @@ -42,3 +42,15 @@ [info] Log at : 2025/3/18|21:14:31|GMT+0800 +[info] Log at : 2025/3/26|21:52:08|GMT+0800 + +[info] Log at : 2025/4/1|10:23:10|GMT+0800 + +[info] Log at : 2025/4/1|10:43:07|GMT+0800 + +[info] Log at : 2025/4/7|22:29:59|GMT+0800 + +[info] Log at : 2025/4/7|22:33:51|GMT+0800 + +[info] Log at : 2025/4/7|22:36:29|GMT+0800 + diff --git a/.vscode/project.json b/.vscode/project.json index ea7e9b2..d76d3d0 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\\infra\\infra_compat.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\\mqtt\\impl\\MQTTPacket.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_fota.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\\mqtt\\impl\\MQTTConnectClient.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\\iotx_cm_mqtt.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_ipc.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_msg_process.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_ota.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTUnsubscribeClient.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_message.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\\infra\\infra_net.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_cota.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_ota.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTConnectClient.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\\mqtt\\impl\\MQTTUnsubscribeClient.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\iotx_cm.c", "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_UDP_rtthread.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_ipc.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\iotx_mqtt_client.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_report.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\mqtt_api.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\\dev_model\\dm_log_report.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_manager.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\\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\\dev_model\\dm_utils.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\\MQTTDeserializePublish.c", - "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.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\\MQTTSerializePublish.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_cjson.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_cota.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\\client\\dm_client_adapter.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_manager.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_log_report.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.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_net.c", + "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.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_message_cache.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTPacket.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_TCP_rtthread.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\iotx_mqtt_client.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_utils.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.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_log.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\\mqtt\\impl\\MQTTSerializePublish.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_report.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\impl_linkkit.c", "packages\\ali-iotkit-v3.0.2\\SConscript" ] }, @@ -68,21 +68,22 @@ "name": "Applications", "path": "applications", "files": [ - "applications\\myinfrared.c", - "applications\\init.c", - "applications\\mysnake.c", - "applications\\test_drv_example.c", - "applications\\status.c", - "applications\\AHT10.c", - "applications\\myproject.c", "applications\\pin_irq_example.c", - "applications\\app_lcd.c", - "applications\\sensor.c", - "applications\\main.c", - "applications\\motor.c", - "applications\\sim.c", - "applications\\assistant.c", "applications\\my_func.c", + "applications\\myinfrared.c", + "applications\\motor.c", + "applications\\app_lcd.c", + "applications\\test_drv_example.c", + "applications\\AHT10.c", + "applications\\main.c", + "applications\\assistant.c", + "applications\\status.c", + "applications\\sensor.c", + "applications\\myproject.c", + "applications\\sim.c", + "applications\\dht11.c", + "applications\\mysnake.c", + "applications\\init.c", "applications\\SConscript" ] }, @@ -123,8 +124,8 @@ "name": "CPP", "path": "rt-thread\\components\\libc\\cplusplus", "files": [ - "rt-thread\\components\\libc\\cplusplus\\cxx_crt_init.c", "rt-thread\\components\\libc\\cplusplus\\cxx_crt.cpp", + "rt-thread\\components\\libc\\cplusplus\\cxx_crt_init.c", "rt-thread\\components\\libc\\cplusplus\\SConscript" ] }, @@ -180,6 +181,14 @@ "rt-thread\\components\\drivers\\block\\SConscript" ] }, + { + "name": "dhtxx", + "path": "packages\\dhtxx-latest", + "files": [ + "packages\\dhtxx-latest\\src\\dhtxx.c", + "packages\\dhtxx-latest\\SConscript" + ] + }, { "name": "Drivers", "path": "board", @@ -211,11 +220,11 @@ "name": "Fal", "path": "rt-thread\\components\\fal", "files": [ - "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\\src\\fal_rtt.c", "rt-thread\\components\\fal\\src\\fal_partition.c", + "rt-thread\\components\\fal\\samples\\porting\\fal_flash_sfud_port.c", + "rt-thread\\components\\fal\\src\\fal.c", + "rt-thread\\components\\fal\\src\\fal_flash.c", + "rt-thread\\components\\fal\\src\\fal_rtt.c", "rt-thread\\components\\fal\\SConscript" ] }, @@ -239,10 +248,10 @@ "name": "Finsh", "path": "rt-thread\\components\\finsh", "files": [ - "rt-thread\\components\\finsh\\msh_parse.c", - "rt-thread\\components\\finsh\\shell.c", "rt-thread\\components\\finsh\\cmd.c", + "rt-thread\\components\\finsh\\msh_parse.c", "rt-thread\\components\\finsh\\msh_file.c", + "rt-thread\\components\\finsh\\shell.c", "rt-thread\\components\\finsh\\msh.c", "rt-thread\\components\\finsh\\SConscript" ] @@ -268,8 +277,8 @@ "path": "packages\\infrared-v0.1.1", "files": [ "packages\\infrared-v0.1.1\\src\\infrared.c", - "packages\\infrared-v0.1.1\\src\\nec_decoder.c", "packages\\infrared-v0.1.1\\src\\drv_infrared.c", + "packages\\infrared-v0.1.1\\src\\nec_decoder.c", "packages\\infrared-v0.1.1\\SConscript" ] }, @@ -299,10 +308,10 @@ "name": "kernel-samples", "path": "packages\\kernel_samples-latest\\en", "files": [ - "packages\\kernel_samples-latest\\en\\semaphore_sample.c", "packages\\kernel_samples-latest\\en\\mailbox_sample.c", - "packages\\kernel_samples-latest\\en\\msgq_sample.c", "packages\\kernel_samples-latest\\en\\thread_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\\event_sample.c", "packages\\kernel_samples-latest\\en\\SConscript" @@ -312,11 +321,11 @@ "name": "klibc", "path": "rt-thread\\src\\klibc", "files": [ - "rt-thread\\src\\klibc\\kerrno.c", - "rt-thread\\src\\klibc\\kstring.c", "rt-thread\\src\\klibc\\kstdio.c", + "rt-thread\\src\\klibc\\kstring.c", "rt-thread\\src\\klibc\\rt_vsscanf.c", "rt-thread\\src\\klibc\\rt_vsnprintf_std.c", + "rt-thread\\src\\klibc\\kerrno.c", "rt-thread\\src\\klibc\\SConscript" ] }, @@ -344,47 +353,47 @@ "name": "Libraries", "path": "libraries\\STM32F4xx_HAL", "files": [ - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_usart.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fsmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_crc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ramfunc.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_tim_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim.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_pwr.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", - "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\system_stm32f4xx.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc.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_hal_pcd.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_sram.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cec.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_crc.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rng.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_spi.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_lptim.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim.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_flash_ramfunc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_uart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fsmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rng.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_ll_fmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_gpio.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_usart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc.c", + "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\system_stm32f4xx.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_lptim.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_qspi.c", "libraries\\STM32F4xx_HAL\\SConscript" ] }, @@ -444,8 +453,8 @@ "name": "perf_counter", "path": "packages\\perf_counter-v2.2.4.1", "files": [ - "packages\\perf_counter-v2.2.4.1\\perf_counter.c", "packages\\perf_counter-v2.2.4.1\\os\\perf_os_patch_rt_thread.c", + "packages\\perf_counter-v2.2.4.1\\perf_counter.c", "packages\\perf_counter-v2.2.4.1\\SConscript" ] }, @@ -470,9 +479,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" ] }, diff --git a/.vscode/settings.json b/.vscode/settings.json index 25877c1..abb19b2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -45,7 +45,8 @@ "type_traits": "c", "utility": "c", "random": "c", - "logn.h": "c" + "logn.h": "c", + "ulog.h": "c" }, // "cortex-debug.openocdPath": "d:/Develop/" } \ No newline at end of file diff --git a/applications/dht11.c b/applications/dht11.c new file mode 100644 index 0000000..95efb06 --- /dev/null +++ b/applications/dht11.c @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2020, RudyLo + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2020-01-20 luhuadong the first version + * 2020-10-05 luhuadong v0.9.0 + */ + +#include +#include +#include +#include "dhtxx.h" +#include "ulog.h" + +#define DATA_PIN 100//PG4 +float temp_dth = 0; +float humi_dht = 0; + +dht_device_t sensor_dht; +/* cat_dhtxx sensor data by dynamic */ +static void cat_dhtxx(void) +{ + dht_device_t sensor = dht_create(DATA_PIN); + + if(dht_read(sensor)) { + + rt_int32_t temp = dht_get_temperature(sensor); + rt_int32_t humi = dht_get_humidity(sensor); + + rt_kprintf("Temp: %d, Humi: %d\n", temp, humi); + } + else { + rt_kprintf("Read dht sensor failed.\n"); + } + + dht_delete(sensor); +} + +#ifdef FINSH_USING_MSH +MSH_CMD_EXPORT(cat_dhtxx, read dhtxx humidity and temperature); +#endif + +void dht11_get_data(void) +{ + // dht_device_t sensor = dht_create(DATA_PIN); + + if(dht_read(sensor_dht)) { + + rt_int32_t temp = dht_get_temperature(sensor_dht); + rt_int32_t humi = dht_get_humidity(sensor_dht); + temp_dth = temp/10.0; + humi_dht = humi/10.0; + // LOG_I("Temp: %d, Humi: %d\n", temp, humi); + } + else { + // LOG_W("Read dht sensor failed.\n"); + } + + // dht_delete(sensor); +} +void dht11_init(void) +{ + sensor_dht = dht_create(DATA_PIN); + + // if(dht_read(sensor)) { + + // rt_int32_t temp = dht_get_temperature(sensor); + // rt_int32_t humi = dht_get_humidity(sensor); + // temp_dth = temp/10.0; + // humi_dht = humi/10.0; + // // LOG_I("Temp: %d, Humi: %d\n", temp, humi); + // } + // else { + // LOG_W("Read dht sensor failed.\n"); + // } + + // dht_delete(sensor); +} + diff --git a/applications/dht11.h b/applications/dht11.h new file mode 100644 index 0000000..1f52747 --- /dev/null +++ b/applications/dht11.h @@ -0,0 +1,4 @@ +extern float temp_dth ; +extern float humi_dht ; +void dht11_get_data(); +void dht11_init(void); \ No newline at end of file diff --git a/applications/init.c b/applications/init.c index b74f86b..d01b9d5 100644 --- a/applications/init.c +++ b/applications/init.c @@ -8,6 +8,7 @@ #include #include "my_func.h" #include "status.h" +#include "dht11.h" static int board_init(void) { @@ -61,7 +62,7 @@ int main_init(void) ath_init(); - wla_init(); + // wla_init(); // if (wlan_connected == RT_EOK) // { @@ -86,6 +87,8 @@ int main_init(void) sensor_init(); status_init(); + + dht11_init(); // led_init(); } MSH_CMD_EXPORT_ALIAS(main_init, myproject, run my project); \ No newline at end of file diff --git a/applications/main.c b/applications/main.c index 099abee..6eca019 100644 --- a/applications/main.c +++ b/applications/main.c @@ -40,7 +40,7 @@ int main(void) // rt_wlan_config_autoreconnect(RT_TRUE); // rt_wlan_connect("Dong", "abcd07691234"); // rt_wlan_connect("as", "07691234"); - // wlan_connected=rt_wlan_connect("as", "07691234"); + // rt_wlan_connect("as", "07691234"); // system("myproject"); // system("mqtt"); mytime(); diff --git a/applications/myproject.c b/applications/myproject.c index 454b23b..eeed150 100644 --- a/applications/myproject.c +++ b/applications/myproject.c @@ -19,6 +19,7 @@ #include "assistant.h" #include "cJSON.h" #include "RyanJson.h" +#include "dht11.h" #define THREAD_PRIORITY 25 #define THREAD_STACK_SIZE 4096 #define THREAD_TIMESLICE 5 @@ -181,7 +182,7 @@ void easy_show_lcd(char *title, float Temp) void show_lcd() { lcd_y = 10; - easy_show_lcd("Temperature:", Temp); + easy_show_lcd("Temperature:", temp_dth); easy_show_lcd("Air quality:", ADC_air); easy_show_lcd("PM2.5:", ADC_PM25); easy_show_lcd("Pressure:",ADC_pressure); @@ -231,6 +232,7 @@ void tmp_payload(void) Temp = aht10_read_temperature(Dev); brightness = ap3216c_read_ambient_light(dev); ps_data = ap3216c_read_ps_data(dev); + dht11_get_data(); // if (infrared_read("nec", &infrared_data) == RT_EOK) // { // /* 读取到红外数据，红灯亮起 */ @@ -323,7 +325,7 @@ void tmp_payload(void) page_chosen = (page_chosen % PAGE_MAX) + 1; page_first = 1; } - rt_sprintf(tmp, "{\"params\":{\"temperature\":%.2f,\"humidity\":%.2f,\"LightLux\":%.2f,\"Psdata\":%d,\"Snakelen\":%d,\"Air\":%.2f,\"Pressure\":%.2f,\"PM25\":%.2f}}", Temp, Humi, brightness, ps_data, snake_len,ADC_air,ADC_pressure,ADC_PM25); + rt_sprintf(tmp, "{\"params\":{\"temperature\":%.2f,\"humidity\":%.2f,\"temp_board\":%.2f,\"humi_board\":%.2f,\"LightLux\":%.2f,\"Psdata\":%d,\"Snakelen\":%d,\"Air\":%.2f,\"Pressure\":%.2f,\"PM25\":%.2f,}}",temp_dth,humi_dht, Temp, Humi, brightness, ps_data, snake_len,ADC_air,ADC_pressure,ADC_PM25); return; } void test_lcd() diff --git a/applications/sensor.c b/applications/sensor.c index 1d67a2d..c5c1d67 100644 --- a/applications/sensor.c +++ b/applications/sensor.c @@ -113,7 +113,7 @@ float PM25_GetData(void) rt_pin_write(GPIO_PIN, PIN_LOW); // 置0 关闭内部LED rt_hw_us_delay(9680); // 需要脉宽比0.32ms/10ms的PWM信号驱动传感器中的LED - Voltage = 3.3f * ADCVal / 4096.f * 2; // 获得AO输出口的电压值 + Voltage = 3.3f * ADCVal / 4096.f ; // 获得AO输出口的电压值 dustVal = (0.17 * Voltage - 0.1) * 1000; // 乘以1000单位换成ug/m3// @@ -150,13 +150,27 @@ int warning_range(char *str, float value, float min, float max) if (value < min) { LOG5("%s's value:%f is too low\n", str, value); - danger_status(); + if(rt_strcmp(str,"pressure")==0) + { + people_danger_status(); + } + else + { + danger_status(); + } return 1; } else if (value > max) { LOG5("%s's value:%f is too high\n", str, value); - danger_status(); + if(rt_strcmp(str,"pressure")==0) + { + people_danger_status(); + } + else + { + danger_status(); + } return 1; } return 0; diff --git a/applications/sim.c b/applications/sim.c index 942af67..1fa9d6d 100644 --- a/applications/sim.c +++ b/applications/sim.c @@ -158,7 +158,7 @@ int cmd_sim_message(int argc, char**argv) char testtmp[129]; format_phone_number(argv[1],testtmp); LOG5("phone:%s",testtmp); - // str_to_unicode(argv[2], testtmp); + // format_phone_number("你好", testtmp); // LOG5("msg:%04X → %04X",argv[2],testtmp); // format_phone_number(argv[2],testtmp); // LOG5("msg(by phone):%s",testtmp); diff --git a/applications/status.c b/applications/status.c index 643817b..242a853 100644 --- a/applications/status.c +++ b/applications/status.c @@ -79,15 +79,21 @@ void beep_off(void) } MSH_CMD_EXPORT_ALIAS(beep_off, P2, show beep_off); void danger_status(void) +{ + fan_on(); + light_on(); +} +MSH_CMD_EXPORT_ALIAS(danger_status, danger, show danger_status); +void people_danger_status(void) { rt_event_send(&robot_event, EVENT_DELAY); char *str = "aa"; serial_send(str); - fan_on(); + // fan_on(); light_on(); // LED_BreathMore(0,LED_NUM-1,LED_RED); } -MSH_CMD_EXPORT_ALIAS(danger_status, danger, show danger_status); +MSH_CMD_EXPORT_ALIAS(people_danger_status, rdanger, show people danger_status); void normal_status(void) { if (fan_status == 0) @@ -99,11 +105,12 @@ void normal_status(void) } void collect_entry(void *parameter) { + int cnt_sec=0; while (1) { if (rt_event_recv(&robot_event, EVENT_DELAY, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, - RT_WAITING_FOREVER, NULL) == RT_EOK) + 0, NULL) == RT_EOK) { rt_thread_mdelay(10000); if(cnt_warning>0) diff --git a/applications/status.h b/applications/status.h index 861c0b9..9331b97 100644 --- a/applications/status.h +++ b/applications/status.h @@ -1,4 +1,5 @@ void danger_status(void); +void people_danger_status(void); void normal_status(void); void fan_on(void); void fan_off(void); diff --git a/rtconfig.h b/rtconfig.h index 11d631c..8edc247 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -583,6 +583,11 @@ #define PKG_USING_AHT10_LATEST_VERSION #define PKG_USING_AP3216C #define PKG_USING_AP3216C_LATEST_VERSION +#define PKG_USING_DHTXX +#define PKG_USING_DHTXX_TYPE_DHT11 +#define PKG_USING_DHTXX_DEBUG +#define PKG_USING_DHTXX_LATEST_VERSION +#define PKG_DHTXX_VER_NUM 0x99999 #define PKG_USING_ICM20608 #define PKG_USING_ICM20608_LATEST_VERSION /* end of sensors drivers */