diff --git a/.config b/.config index 7a8b856..68452bf 100644 --- a/.config +++ b/.config @@ -751,7 +751,7 @@ CONFIG_PLATFORM_HAS_OS=y CONFIG_INFRA_STRING=y CONFIG_INFRA_NET=y CONFIG_INFRA_LIST=y -CONFIG_INFRA_LOG_NETWORK_PAYLOAD=y +# CONFIG_INFRA_LOG_NETWORK_PAYLOAD is not set CONFIG_INFRA_LOG=y # @@ -1922,6 +1922,8 @@ CONFIG_BSP_USING_PWM3_CH2=y # CONFIG_BSP_USING_PWM4 is not set CONFIG_BSP_USING_PWM14=y CONFIG_BSP_USING_PWM14_CH1=y +CONFIG_BSP_USING_PWM12=y +CONFIG_BSP_USING_PWM12_CH1=y CONFIG_BSP_USING_ON_CHIP_FLASH=y # CONFIG_BSP_USING_SOFT_SPI is not set CONFIG_BSP_USING_SPI=y diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 0dac63b..824a4ca 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,12 +4,379 @@ "name": "rt-thread", "defines": [ "RT_USING_LIBC", - "RT_USING_NEWLIBC", - "STM32F407xx", "USE_HAL_DRIVER", - "_POSIX_C_SOURCE=1", "__RTTHREAD__", - "__perf_counter_printf__=rt_kprintf" + "__STDC_LIMIT_MACROS", + "__CLK_TCK=RT_TICK_PER_SECOND", + "STM32F407xx", + "RT_USING_ARMLIBC", + "__alignof__(x)=", + "__asm(x)=", + "__asm__(x)=", + "__forceinline=", + "__restrict=", + "__volatile__=", + "__inline=", + "__inline__=", + "__declspec(x)=", + "__attribute__(x)=", + "__nonnull__(x)=", + "__unaligned=", + "__promise(x)=", + "__irq=", + "__swi=", + "__weak=", + "__register=", + "__pure=", + "__value_in_regs=", + "__breakpoint(x)=", + "__current_pc()=0U", + "__current_sp()=0U", + "__disable_fiq()=", + "__disable_irq()=", + "__enable_fiq()=", + "__enable_irq()=", + "__force_stores()=", + "__memory_changed()=", + "__schedule_barrier()=", + "__semihost(x,y)=0", + "__vfp_status(x,y)=0", + "__builtin_arm_nop()=", + "__builtin_arm_wfi()=", + "__builtin_arm_wfe()=", + "__builtin_arm_sev()=", + "__builtin_arm_sevl()=", + "__builtin_arm_yield()=", + "__builtin_arm_isb(x)=", + "__builtin_arm_dsb(x)=", + "__builtin_arm_dmb(x)=", + "__builtin_bswap32(x)=0U", + "__builtin_bswap16(x)=0U", + "__builtin_arm_rbit(x)=0U", + "__builtin_clz(x)=0U", + "__builtin_arm_ldrex(x)=0U", + "__builtin_arm_strex(x,y)=0U", + "__builtin_arm_clrex()=", + "__builtin_arm_ssat(x,y)=0U", + "__builtin_arm_usat(x,y)=0U", + "__builtin_arm_ldaex(x)=0U", + "__builtin_arm_stlex(x,y)=0U", + "_ILP32=1", + "_USE_STATIC_INLINE=1", + "__APCS_32__=1", + "__ARMCC_VERSION=6070001", + "__ARMCOMPILER_VERSION=6070001", + "__ARMEL__=1", + "__ARM_32BIT_STATE=1", + "__ARM_ACLE=200", + "__ARM_ARCH=4", + "__ARM_ARCH_4T__=1", + "__ARM_ARCH_ISA_ARM=1", + "__ARM_ARCH_ISA_THUMB=1", + "__ARM_EABI__=1", + "__ARM_FP16_ARGS=1", + "__ARM_FP16_FORMAT_IEEE=1", + "__ARM_NO_IMAGINARY_TYPE=1", + "__ARM_PCS=1", + "__ARM_PROMISE=__builtin_assume", + "__ARM_SIZEOF_MINIMAL_ENUM=4", + "__ARM_SIZEOF_WCHAR_T=4", + "__ARM_TARGET_COPROC=1", + "__ARM_TARGET_COPROC_V4=1", + "__ATOMIC_ACQUIRE=2", + "__ATOMIC_ACQ_REL=4", + "__ATOMIC_CONSUME=1", + "__ATOMIC_RELAXED=0", + "__ATOMIC_RELEASE=3", + "__ATOMIC_SEQ_CST=5", + "__BIGGEST_ALIGNMENT__=8", + "__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__", + "__CHAR16_TYPE__=unsigned short", + "__CHAR32_TYPE__=unsigned int", + "__CHAR_BIT__=8", + "__CHAR_UNSIGNED__=1", + "__CONSTANT_CFSTRINGS__=1", + "__DBL_DECIMAL_DIG__=17", + "__DBL_DENORM_MIN__=4.9406564584124654e-324", + "__DBL_DIG__=15", + "__DBL_EPSILON__=2.2204460492503131e-16", + "__DBL_HAS_DENORM__=1", + "__DBL_HAS_INFINITY__=1", + "__DBL_HAS_QUIET_NAN__=1", + "__DBL_MANT_DIG__=53", + "__DBL_MAX_10_EXP__=308", + "__DBL_MAX_EXP__=1024", + "__DBL_MAX__=1.7976931348623157e+308", + "__DBL_MIN_10_EXP__=(-307)", + "__DBL_MIN_EXP__=(-1021)", + "__DBL_MIN__=2.2250738585072014e-308", + "__DECIMAL_DIG__=__LDBL_DECIMAL_DIG__", + "__ELF__=1", + "__ESCAPE__=", + "__FINITE_MATH_ONLY__=1", + "__FLT_DECIMAL_DIG__=9", + "__FLT_DENORM_MIN__=1.40129846e-45F", + "__FLT_DIG__=6", + "__FLT_EPSILON__=1.19209290e-7F", + "__FLT_EVAL_METHOD__=0", + "__FLT_HAS_DENORM__=1", + "__FLT_HAS_INFINITY__=1", + "__FLT_HAS_QUIET_NAN__=1", + "__FLT_MANT_DIG__=24", + "__FLT_MAX_10_EXP__=38", + "__FLT_MAX_EXP__=128", + "__FLT_MAX__=3.40282347e+38F", + "__FLT_MIN_10_EXP__=(-37)", + "__FLT_MIN_EXP__=(-125)", + "__FLT_MIN__=1.17549435e-38F", + "__FLT_RADIX__=2", + "__GCC_ATOMIC_BOOL_LOCK_FREE=1", + "__GCC_ATOMIC_CHAR16_T_LOCK_FREE=1", + "__GCC_ATOMIC_CHAR32_T_LOCK_FREE=1", + "__GCC_ATOMIC_CHAR_LOCK_FREE=1", + "__GCC_ATOMIC_INT_LOCK_FREE=1", + "__GCC_ATOMIC_LLONG_LOCK_FREE=1", + "__GCC_ATOMIC_LONG_LOCK_FREE=1", + "__GCC_ATOMIC_POINTER_LOCK_FREE=1", + "__GCC_ATOMIC_SHORT_LOCK_FREE=1", + "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1", + "__GCC_ATOMIC_WCHAR_T_LOCK_FREE=1", + "__GNUC_MINOR__=2", + "__GNUC_PATCHLEVEL__=1", + "__GNUC_STDC_INLINE__=1", + "__GNUC__=4", + "__GXX_ABI_VERSION=1002", + "__ILP32__=1", + "__INT16_C_SUFFIX__=", + "__INT16_FMTd__=\"hd\"", + "__INT16_FMTi__=\"hi\"", + "__INT16_MAX__=32767", + "__INT16_TYPE__=short", + "__INT32_C_SUFFIX__=", + "__INT32_FMTd__=\"d\"", + "__INT32_FMTi__=\"i\"", + "__INT32_MAX__=2147483647", + "__INT32_TYPE__=int", + "__INT64_C_SUFFIX__=LL", + "__INT64_FMTd__=\"lld\"", + "__INT64_FMTi__=\"lli\"", + "__INT64_MAX__=9223372036854775807LL", + "__INT64_TYPE__=long long int", + "__INT8_C_SUFFIX__=", + "__INT8_FMTd__=\"hhd\"", + "__INT8_FMTi__=\"hhi\"", + "__INT8_MAX__=127", + "__INT8_TYPE__=signed char", + "__INTMAX_C_SUFFIX__=LL", + "__INTMAX_FMTd__=\"lld\"", + "__INTMAX_FMTi__=\"lli\"", + "__INTMAX_MAX__=9223372036854775807LL", + "__INTMAX_TYPE__=long long int", + "__INTMAX_WIDTH__=64", + "__INTPTR_FMTd__=\"ld\"", + "__INTPTR_FMTi__=\"li\"", + "__INTPTR_MAX__=2147483647L", + "__INTPTR_TYPE__=long int", + "__INTPTR_WIDTH__=32", + "__INT_FAST16_FMTd__=\"hd\"", + "__INT_FAST16_FMTi__=\"hi\"", + "__INT_FAST16_MAX__=32767", + "__INT_FAST16_TYPE__=short", + "__INT_FAST32_FMTd__=\"d\"", + "__INT_FAST32_FMTi__=\"i\"", + "__INT_FAST32_MAX__=2147483647", + "__INT_FAST32_TYPE__=int", + "__INT_FAST64_FMTd__=\"lld\"", + "__INT_FAST64_FMTi__=\"lli\"", + "__INT_FAST64_MAX__=9223372036854775807LL", + "__INT_FAST64_TYPE__=long long int", + "__INT_FAST8_FMTd__=\"hhd\"", + "__INT_FAST8_FMTi__=\"hhi\"", + "__INT_FAST8_MAX__=127", + "__INT_FAST8_TYPE__=signed char", + "__INT_LEAST16_FMTd__=\"hd\"", + "__INT_LEAST16_FMTi__=\"hi\"", + "__INT_LEAST16_MAX__=32767", + "__INT_LEAST16_TYPE__=short", + "__INT_LEAST32_FMTd__=\"d\"", + "__INT_LEAST32_FMTi__=\"i\"", + "__INT_LEAST32_MAX__=2147483647", + "__INT_LEAST32_TYPE__=int", + "__INT_LEAST64_FMTd__=\"lld\"", + "__INT_LEAST64_FMTi__=\"lli\"", + "__INT_LEAST64_MAX__=9223372036854775807LL", + "__INT_LEAST64_TYPE__=long long int", + "__INT_LEAST8_FMTd__=\"hhd\"", + "__INT_LEAST8_FMTi__=\"hhi\"", + "__INT_LEAST8_MAX__=127", + "__INT_LEAST8_TYPE__=signed char", + "__INT_MAX__=2147483647", + "__I__=1.0if", + "__LDBL_DECIMAL_DIG__=17", + "__LDBL_DENORM_MIN__=4.9406564584124654e-324L", + "__LDBL_DIG__=15", + "__LDBL_EPSILON__=2.2204460492503131e-16L", + "__LDBL_HAS_DENORM__=1", + "__LDBL_HAS_INFINITY__=1", + "__LDBL_HAS_QUIET_NAN__=1", + "__LDBL_MANT_DIG__=53", + "__LDBL_MAX_10_EXP__=308", + "__LDBL_MAX_EXP__=1024", + "__LDBL_MAX__=1.7976931348623157e+308L", + "__LDBL_MIN_10_EXP__=(-307)", + "__LDBL_MIN_EXP__=(-1021)", + "__LDBL_MIN__=2.2250738585072014e-308L", + "__LITTLE_ENDIAN__=1", + "__LONG_LONG_MAX__=9223372036854775807LL", + "__LONG_MAX__=2147483647L", + "__NO_INLINE__=1", + "__OBJC_BOOL_IS_BOOL=0", + "__ORDER_BIG_ENDIAN__=4321", + "__ORDER_LITTLE_ENDIAN__=1234", + "__ORDER_PDP_ENDIAN__=3412", + "__POINTER_WIDTH__=32", + "__PRAGMA_REDEFINE_EXTNAME=1", + "__PTRDIFF_FMTd__=\"d\"", + "__PTRDIFF_FMTi__=\"i\"", + "__PTRDIFF_MAX__=2147483647", + "__PTRDIFF_TYPE__=int", + "__PTRDIFF_WIDTH__=32", + "__REGISTER_PREFIX__=", + "__SCHAR_MAX__=127", + "__SHRT_MAX__=32767", + "__SIG_ATOMIC_MAX__=2147483647", + "__SIG_ATOMIC_WIDTH__=32", + "__SIZEOF_DOUBLE__=8", + "__SIZEOF_FLOAT__=4", + "__SIZEOF_INT__=4", + "__SIZEOF_LONG_DOUBLE__=8", + "__SIZEOF_LONG_LONG__=8", + "__SIZEOF_LONG__=4", + "__SIZEOF_POINTER__=4", + "__SIZEOF_PTRDIFF_T__=4", + "__SIZEOF_SHORT__=2", + "__SIZEOF_SIZE_T__=4", + "__SIZEOF_WCHAR_T__=4", + "__SIZEOF_WINT_T__=4", + "__SIZE_FMTX__=\"X\"", + "__SIZE_FMTo__=\"o\"", + "__SIZE_FMTu__=\"u\"", + "__SIZE_FMTx__=\"x\"", + "__SIZE_MAX__=4294967295U", + "__SIZE_TYPE__=unsigned int", + "__SIZE_WIDTH__=32", + "__STDC_HOSTED__=1", + "__STDC_UTF_16__=1", + "__STDC_UTF_32__=1", + "__STDC_VERSION__=201112L", + "__STDC__=1", + "__UINT16_C_SUFFIX__=", + "__UINT16_FMTX__=\"hX\"", + "__UINT16_FMTo__=\"ho\"", + "__UINT16_FMTu__=\"hu\"", + "__UINT16_FMTx__=\"hx\"", + "__UINT16_MAX__=65535", + "__UINT16_TYPE__=unsigned short", + "__UINT32_C_SUFFIX__=U", + "__UINT32_FMTX__=\"X\"", + "__UINT32_FMTo__=\"o\"", + "__UINT32_FMTu__=\"u\"", + "__UINT32_FMTx__=\"x\"", + "__UINT32_MAX__=4294967295U", + "__UINT32_TYPE__=unsigned int", + "__UINT64_C_SUFFIX__=ULL", + "__UINT64_FMTX__=\"llX\"", + "__UINT64_FMTo__=\"llo\"", + "__UINT64_FMTu__=\"llu\"", + "__UINT64_FMTx__=\"llx\"", + "__UINT64_MAX__=18446744073709551615ULL", + "__UINT64_TYPE__=long long unsigned int", + "__UINT8_C_SUFFIX__=", + "__UINT8_FMTX__=\"hhX\"", + "__UINT8_FMTo__=\"hho\"", + "__UINT8_FMTu__=\"hhu\"", + "__UINT8_FMTx__=\"hhx\"", + "__UINT8_MAX__=255", + "__UINT8_TYPE__=unsigned char", + "__UINTMAX_C_SUFFIX__=ULL", + "__UINTMAX_FMTX__=\"llX\"", + "__UINTMAX_FMTo__=\"llo\"", + "__UINTMAX_FMTu__=\"llu\"", + "__UINTMAX_FMTx__=\"llx\"", + "__UINTMAX_MAX__=18446744073709551615ULL", + "__UINTMAX_TYPE__=long long unsigned int", + "__UINTMAX_WIDTH__=64", + "__UINTPTR_FMTX__=\"lX\"", + "__UINTPTR_FMTo__=\"lo\"", + "__UINTPTR_FMTu__=\"lu\"", + "__UINTPTR_FMTx__=\"lx\"", + "__UINTPTR_MAX__=4294967295UL", + "__UINTPTR_TYPE__=long unsigned int", + "__UINTPTR_WIDTH__=32", + "__UINT_FAST16_FMTX__=\"hX\"", + "__UINT_FAST16_FMTo__=\"ho\"", + "__UINT_FAST16_FMTu__=\"hu\"", + "__UINT_FAST16_FMTx__=\"hx\"", + "__UINT_FAST16_MAX__=65535", + "__UINT_FAST16_TYPE__=unsigned short", + "__UINT_FAST32_FMTX__=\"X\"", + "__UINT_FAST32_FMTo__=\"o\"", + "__UINT_FAST32_FMTu__=\"u\"", + "__UINT_FAST32_FMTx__=\"x\"", + "__UINT_FAST32_MAX__=4294967295U", + "__UINT_FAST32_TYPE__=unsigned int", + "__UINT_FAST64_FMTX__=\"llX\"", + "__UINT_FAST64_FMTo__=\"llo\"", + "__UINT_FAST64_FMTu__=\"llu\"", + "__UINT_FAST64_FMTx__=\"llx\"", + "__UINT_FAST64_MAX__=18446744073709551615ULL", + "__UINT_FAST64_TYPE__=long long unsigned int", + "__UINT_FAST8_FMTX__=\"hhX\"", + "__UINT_FAST8_FMTo__=\"hho\"", + "__UINT_FAST8_FMTu__=\"hhu\"", + "__UINT_FAST8_FMTx__=\"hhx\"", + "__UINT_FAST8_MAX__=255", + "__UINT_FAST8_TYPE__=unsigned char", + "__UINT_LEAST16_FMTX__=\"hX\"", + "__UINT_LEAST16_FMTo__=\"ho\"", + "__UINT_LEAST16_FMTu__=\"hu\"", + "__UINT_LEAST16_FMTx__=\"hx\"", + "__UINT_LEAST16_MAX__=65535", + "__UINT_LEAST16_TYPE__=unsigned short", + "__UINT_LEAST32_FMTX__=\"X\"", + "__UINT_LEAST32_FMTo__=\"o\"", + "__UINT_LEAST32_FMTu__=\"u\"", + "__UINT_LEAST32_FMTx__=\"x\"", + "__UINT_LEAST32_MAX__=4294967295U", + "__UINT_LEAST32_TYPE__=unsigned int", + "__UINT_LEAST64_FMTX__=\"llX\"", + "__UINT_LEAST64_FMTo__=\"llo\"", + "__UINT_LEAST64_FMTu__=\"llu\"", + "__UINT_LEAST64_FMTx__=\"llx\"", + "__UINT_LEAST64_MAX__=18446744073709551615ULL", + "__UINT_LEAST64_TYPE__=long long unsigned int", + "__UINT_LEAST8_FMTX__=\"hhX\"", + "__UINT_LEAST8_FMTo__=\"hho\"", + "__UINT_LEAST8_FMTu__=\"hhu\"", + "__UINT_LEAST8_FMTx__=\"hhx\"", + "__UINT_LEAST8_MAX__=255", + "__UINT_LEAST8_TYPE__=unsigned char", + "__USER_LABEL_PREFIX__=", + "__VERSION__=\"4.2.1 Compatible Clang 5.0.0 \"", + "__WCHAR_MAX__=4294967295U", + "__WCHAR_TYPE__=unsigned int", + "__WCHAR_UNSIGNED__=1", + "__WCHAR_WIDTH__=32", + "__WINT_TYPE__=int", + "__WINT_WIDTH__=32", + "__arm=1", + "__arm__=1", + "__clang__=1", + "__clang_major__=5", + "__clang_minor__=0", + "__clang_patchlevel__=0", + "__clang_version__=\"5.0.0 \"", + "__llvm__=1" ], "intelliSenseMode": "gcc-arm", "compilerPath": "d:/DevTools/env2/tools/gnu_gcc/arm_gcc/mingw/bin/arm-none-eabi-gcc", @@ -19,85 +386,45 @@ "build/compile_commands.json" ], "includePath": [ - "packages\\aht10-latest\\inc", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\client", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\server", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_sign", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\wrappers", - "packages\\ap3216c-latest", - "applications", - "rt-thread\\components\\net\\at\\include", - "packages\\cJSON-v1.7.17", - "rt-thread\\components\\libc\\compilers\\common\\include", - "rt-thread\\components\\libc\\compilers\\newlib", - "rt-thread\\components\\libc\\cplusplus", - "rt-thread\\components\\drivers\\include", - "rt-thread\\components\\drivers\\phy", - "rt-thread\\components\\drivers\\sdio\\sdhci\\include", - "rt-thread\\components\\drivers\\spi", - "rt-thread\\components\\drivers\\spi\\sfud\\inc", - "rt-thread\\components\\drivers\\wlan", - "packages\\dhtxx-latest\\inc", - "board", - "board\\CubeMX_Config\\Inc", - "board\\ports", - "board\\ports\\fal", - "board\\ports\\lcd", - "board\\ports\\led_matrix", - "libraries\\HAL_Drivers\\drivers", - "libraries\\HAL_Drivers\\drivers\\config", - "libraries\\HAL_Drivers\\drivers\\drv_flash", - "libraries\\HAL_Drivers", - "libraries\\HAL_Drivers\\CMSIS\\Include", - "rt-thread\\components\\fal\\inc", - "rt-thread\\components\\dfs\\dfs_v1\\include", - "rt-thread\\components\\dfs\\dfs_v1\\filesystems\\devfs", - "rt-thread\\components\\dfs\\dfs_v1\\filesystems\\elmfat", - "rt-thread\\components\\dfs\\dfs_v1\\filesystems\\romfs", - "rt-thread\\components\\finsh", - "packages\\FlexibleButton-v1.0.0", - "packages\\icm20608-latest", - "packages\\infrared-v0.1.1\\inc", - ".", - "rt-thread\\include", - "packages\\kernel_samples-latest\\en", - "rt-thread\\components\\legacy", - "rt-thread\\components\\legacy\\dfs", - "rt-thread\\libcpu\\arm\\common", - "rt-thread\\libcpu\\arm\\cortex-m4", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Inc", - "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Include", - "rt-thread\\components\\net\\lwip\\lwip-2.0.3\\src\\include", - "rt-thread\\components\\net\\lwip\\lwip-2.0.3\\src\\include\\ipv4", - "rt-thread\\components\\net\\lwip\\lwip-2.0.3\\src\\include\\netif", - "rt-thread\\components\\net\\lwip\\port", - "packages\\netutils-latest\\ntp", - "packages\\perf_counter-v2.2.4.1", - "rt-thread\\components\\libc\\posix\\io\\epoll", - "rt-thread\\components\\libc\\posix\\io\\eventfd", - "rt-thread\\components\\libc\\posix\\io\\poll", - "rt-thread\\components\\libc\\posix\\ipc", - "board\\ports\\rs485", - "rt-thread\\components\\legacy\\usb\\usbdevice", - "packages\\rw007-v2.1.0", - "packages\\rw007-v2.1.0\\inc", - "packages\\RyanJson-latest\\RyanJson", - "rt-thread\\components\\net\\netdev\\include", - "rt-thread\\components\\net\\sal\\include", - "rt-thread\\components\\net\\sal\\include\\socket", - "rt-thread\\components\\net\\sal\\impl", - "rt-thread\\components\\net\\sal\\include\\dfs_net", - "rt-thread\\components\\net\\sal\\include\\socket\\sys_socket", - "rt-thread\\components\\drivers\\smp_call", - "rt-thread\\components\\utilities\\ulog", - "packages\\vconsole-latest", - "packages\\vl53l0x-latest\\inc", - "packages\\vl53l0x-latest\\vl53l0x\\core\\inc", - "packages\\vl53l0x-latest\\vl53l0x\\platform\\inc" + "d:\\components\\drivers\\include", + "d:\\Develop\\libraries\\HAL_Drivers\\drivers\\config", + "d:\\Develop\\libraries\\HAL_Drivers\\drivers", + "d:\\components\\libc\\posix\\io\\eventfd", + "d:\\Develop\\SumProject\\board", + "d:\\Develop\\SumProject\\board\\CubeMX_Config\\Inc", + "d:\\libcpu\\arm\\common", + "d:\\components\\libc\\posix\\ipc", + "d:\\Develop\\libraries\\HAL_Drivers\\CMSIS\\Include", + "d:\\Develop\\SumProject\\board\\ports", + "d:\\Develop\\libraries\\HAL_Drivers", + "d:\\components\\libc\\compilers\\common\\include", + "d:\\libcpu\\arm\\cortex-m4", + "d:\\components\\libc\\posix\\io\\poll", + "d:\\Develop\\SumProject", + "d:\\components\\libc\\posix\\io\\epoll", + "d:\\components\\finsh", + "d:\\Develop\\libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Include", + "d:\\Develop\\libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Inc", + "d:\\components\\libc\\compilers\\common\\extension", + "d:\\components\\libc\\compilers\\common\\extension\\fcntl\\octal", + "d:\\Develop\\SumProject\\applications", + "d:\\include", + "D:\\Keil5\\ARM\\ARMCLANG\\include", + "D:\\Keil5\\ARM\\ARMCLANG\\include\\libcxx", + "d:\\components\\libc\\compilers\\armlibc", + "d:\\components\\libc\\compilers\\common", + "d:\\components\\drivers\\core", + "d:\\components\\drivers\\i2c", + "d:\\components\\drivers\\ipc", + "d:\\components\\drivers\\misc", + "d:\\components\\drivers\\pin", + "d:\\components\\drivers\\serial", + "d:\\Develop\\libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\arm", + "d:\\Develop\\SumProject\\board\\CubeMX_Config\\Src", + "d:\\src", + "d:\\src\\klibc", + "d:\\Develop\\libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src", + "d:\\Develop\\libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates" ] } ], diff --git a/.vscode/keil-assistant.log b/.vscode/keil-assistant.log index 3b13540..78c2e94 100644 --- a/.vscode/keil-assistant.log +++ b/.vscode/keil-assistant.log @@ -60,3 +60,5 @@ [info] Log at : 2025/4/23|21:55:20|GMT+0800 +[info] Log at : 2025/4/25|19:14:26|GMT+0800 + diff --git a/.vscode/project.json b/.vscode/project.json index e1ad02b..5b9f07d 100644 --- a/.vscode/project.json +++ b/.vscode/project.json @@ -13,46 +13,45 @@ "name": "ali-iotkit", "path": "packages\\ali-iotkit-v3.0.2", "files": [ - "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_message_cache.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_timer.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_net.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\\ports\\wrapper.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_msg_process.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTUnsubscribeClient.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_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\\dm_manager.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\\client\\dm_client_adapter.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_sha256.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.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\\iotx_cm.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\\dm_opt.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_cjson.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\\iotx_cm_mqtt.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\\client\\dm_client.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_fota.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\\dm_api.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.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\\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\\infra\\infra_compat.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\\MQTTPacket.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_report.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\\client\\dm_client_adapter.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\\dm_msg_process.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\\infra\\infra_log.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\\MQTTConnectClient.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_defs.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\\iotkit-embedded\\src\\dev_model\\dm_fota.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_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\\mqtt\\impl\\MQTTSubscribeClient.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_UDP_rtthread.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_api.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\\MQTTSerializePublish.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTPacket.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\\impl_linkkit.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_string.c", "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_TCP_rtthread.c", + "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_log.c", "packages\\ali-iotkit-v3.0.2\\SConscript" ] }, @@ -68,22 +67,23 @@ "name": "Applications", "path": "applications", "files": [ + "applications\\init.c", "applications\\sim.c", + "applications\\myinfrared.c", + "applications\\test_drv_example.c", + "applications\\AHT10.c", + "applications\\myproject.c", + "applications\\vl53l0x_sample.c", + "applications\\my_func.c", + "applications\\main.c", + "applications\\app_lcd.c", + "applications\\dht11.c", "applications\\status.c", "applications\\assistant.c", - "applications\\myproject.c", - "applications\\init.c", - "applications\\my_func.c", - "applications\\pin_irq_example.c", - "applications\\test_drv_example.c", - "applications\\dht11.c", "applications\\sensor.c", - "applications\\myinfrared.c", - "applications\\main.c", - "applications\\mysnake.c", - "applications\\app_lcd.c", "applications\\motor.c", - "applications\\AHT10.c", + "applications\\pin_irq_example.c", + "applications\\mysnake.c", "applications\\SConscript" ] }, @@ -92,8 +92,8 @@ "path": "rt-thread\\components\\net\\at", "files": [ "rt-thread\\components\\net\\at\\src\\at_cli.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_utils.c", "rt-thread\\components\\net\\at\\SConscript" ] }, @@ -221,10 +221,10 @@ "path": "rt-thread\\components\\fal", "files": [ "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.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_rtt.c", + "rt-thread\\components\\fal\\src\\fal.c", "rt-thread\\components\\fal\\SConscript" ] }, @@ -248,11 +248,11 @@ "name": "Finsh", "path": "rt-thread\\components\\finsh", "files": [ - "rt-thread\\components\\finsh\\cmd.c", "rt-thread\\components\\finsh\\shell.c", - "rt-thread\\components\\finsh\\msh_file.c", - "rt-thread\\components\\finsh\\msh.c", "rt-thread\\components\\finsh\\msh_parse.c", + "rt-thread\\components\\finsh\\msh.c", + "rt-thread\\components\\finsh\\cmd.c", + "rt-thread\\components\\finsh\\msh_file.c", "rt-thread\\components\\finsh\\SConscript" ] }, @@ -276,9 +276,9 @@ "name": "Infrared_frame", "path": "packages\\infrared-v0.1.1", "files": [ - "packages\\infrared-v0.1.1\\src\\infrared.c", "packages\\infrared-v0.1.1\\src\\drv_infrared.c", "packages\\infrared-v0.1.1\\src\\nec_decoder.c", + "packages\\infrared-v0.1.1\\src\\infrared.c", "packages\\infrared-v0.1.1\\SConscript" ] }, @@ -308,12 +308,12 @@ "name": "kernel-samples", "path": "packages\\kernel_samples-latest\\en", "files": [ - "packages\\kernel_samples-latest\\en\\msgq_sample.c", "packages\\kernel_samples-latest\\en\\mailbox_sample.c", "packages\\kernel_samples-latest\\en\\mutex_sample.c", "packages\\kernel_samples-latest\\en\\thread_sample.c", - "packages\\kernel_samples-latest\\en\\semaphore_sample.c", "packages\\kernel_samples-latest\\en\\event_sample.c", + "packages\\kernel_samples-latest\\en\\semaphore_sample.c", + "packages\\kernel_samples-latest\\en\\msgq_sample.c", "packages\\kernel_samples-latest\\en\\SConscript" ] }, @@ -321,11 +321,11 @@ "name": "klibc", "path": "rt-thread\\src\\klibc", "files": [ - "rt-thread\\src\\klibc\\kstdio.c", "rt-thread\\src\\klibc\\kstring.c", "rt-thread\\src\\klibc\\rt_vsnprintf_std.c", "rt-thread\\src\\klibc\\kerrno.c", "rt-thread\\src\\klibc\\rt_vsscanf.c", + "rt-thread\\src\\klibc\\kstdio.c", "rt-thread\\src\\klibc\\SConscript" ] }, @@ -353,47 +353,47 @@ "name": "Libraries", "path": "libraries\\STM32F4xx_HAL", "files": [ - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc.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_rcc_ex.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_i2c.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_uart.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_spi.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ramfunc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma.c", - "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\system_stm32f4xx.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_hal_lptim.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_gpio.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\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cec.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fsmc.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sram.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.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\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd.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_dma.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_usart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ramfunc.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_sd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_uart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_lptim.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_rtc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cec.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rng.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c.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_gpio.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_crc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.c", "libraries\\STM32F4xx_HAL\\SConscript" ] }, @@ -453,8 +453,8 @@ "name": "perf_counter", "path": "packages\\perf_counter-v2.2.4.1", "files": [ - "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\\os\\perf_os_patch_rt_thread.c", "packages\\perf_counter-v2.2.4.1\\SConscript" ] }, @@ -479,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.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" ] }, @@ -538,12 +538,12 @@ "path": "packages\\vl53l0x-latest", "files": [ "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_calibration.c", - "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_strings.c", - "packages\\vl53l0x-latest\\src\\vl53l0x.c", - "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_core.c", - "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_ranging.c", - "packages\\vl53l0x-latest\\vl53l0x\\platform\\src\\vl53l0x_platform.c", "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api.c", + "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_ranging.c", + "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_strings.c", + "packages\\vl53l0x-latest\\vl53l0x\\core\\src\\vl53l0x_api_core.c", + "packages\\vl53l0x-latest\\vl53l0x\\platform\\src\\vl53l0x_platform.c", + "packages\\vl53l0x-latest\\src\\vl53l0x.c", "packages\\vl53l0x-latest\\SConscript" ] } diff --git a/README.md b/README.md index 6b509e5..c82b7a0 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,12 @@ * SDA:PD7 * XSHUT:PE14 -#### 对射红外 +#### 反射红外 * PE15 +#### 舵机 +* PB14 + # 红外遥控贪吃蛇/显示+上传温度等数据 ![简略教程封面](/my_picture/简略教程封面.jpg) diff --git a/applications/assistant.c b/applications/assistant.c index 95dfd1f..ad156ed 100644 --- a/applications/assistant.c +++ b/applications/assistant.c @@ -71,6 +71,19 @@ void assist_control(char *rx_buffer) light_off(); rt_kprintf("关灯\n"); } + else if (rt_strstr(rx_buffer, "5")!=RT_NULL) + { + servo_turn(1); + } + else if (rt_strstr(rx_buffer, "6")!=RT_NULL) + { + servo_turn(2); + } + else if (rt_strstr(rx_buffer, "7")!=RT_NULL) + { + servo_turn(0); + } + // else if (rt_strstr(rx_buffer, "bb")!=RT_NULL||rt_strstr(rx_buffer, "2")!=RT_NULL) // { // beep_on(); diff --git a/applications/init.c b/applications/init.c index 942ee5a..ec98c85 100644 --- a/applications/init.c +++ b/applications/init.c @@ -9,6 +9,7 @@ #include "my_func.h" #include "status.h" #include "dht11.h" +#include "motor.h" static int board_init(void) { @@ -82,6 +83,8 @@ int main_init(void) mot_init(); + ser_init(); + aiv_init(); sensor_init(); diff --git a/applications/motor.c b/applications/motor.c index 480f613..ee8543c 100644 --- a/applications/motor.c +++ b/applications/motor.c @@ -1,6 +1,7 @@ #include #include #include +#include #define LOG_TAG "app.robot" #define LOG_LVL LOG_LVL_DBG @@ -22,11 +23,18 @@ #define MOTOR2_PWM_DEV_NAME "pwm1" #define MOTOR2_PWM_DEV_CHANNEL 1 +// #define SERVO_PWM_DEV_NAME "pwm12" +#define SERVO_PWM_DEV_NAME "pwm1" +#define SERVO_PWM_DEV_CHANNEL 1 + +extern TIM_HandleTypeDef htim12; struct rt_device_pwm *motor_dev; // pwm设备句柄 rt_uint32_t period = 100000000; // 单位us 向左6位，变毫秒 10s // rt_uint32_t pulse = 1000000; +struct rt_device_pwm *servo_dev; // pwm设备句柄 +rt_uint32_t servo_period = 20000; // 单位us 向左3位，变毫秒 20ms #define PIN_MOTOR2 GET_PIN(B, 2) @@ -45,22 +53,47 @@ void motor_speed(int num) rt_pin_write(PIN_MOTOR2, num>0?PIN_LOW:PIN_HIGH); } - +/** + * @brief 舵机角度控制 + * + * @param num 百分比数字(-90~90). + * + */ +void servo_angle(int num) +{ + // rt_pwm_set(servo_dev, SERVO_PWM_DEV_CHANNEL, servo_period, 1500+num*500/45 ); + __HAL_TIM_SET_COMPARE(&htim12,TIM_CHANNEL_1,1500+num*500/45); +} int mot_init(void) { - rt_pin_mode(PIN_MOTOR2, PIN_MODE_OUTPUT); - rt_pin_write(PIN_MOTOR2, 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(0); - rt_pwm_enable(motor_dev, MOTOR_PWM_DEV_CHANNEL); - LOG1("motor init success!"); + // rt_pin_mode(PIN_MOTOR2, PIN_MODE_OUTPUT); + // rt_pin_write(PIN_MOTOR2, 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(0); + // rt_pwm_enable(motor_dev, MOTOR_PWM_DEV_CHANNEL); + // LOG1("motor init success!"); +} +int ser_init(void) +{ + MX_TIM12_Init(); + HAL_TIM_PWM_Start(&htim12,TIM_CHANNEL_1); + + // servo_dev = (struct rt_device_pwm *)rt_device_find(SERVO_PWM_DEV_NAME); + // if (servo_dev == RT_NULL) + // { + // rt_kprintf("servo_dev run failed! can't find %s device!\n", SERVO_PWM_DEV_NAME); + // return RT_ERROR; + // } + servo_angle(0); + // rt_pwm_enable(servo_dev, SERVO_PWM_DEV_CHANNEL); + LOG1("servo_dev init success!"); } void motor_set(int argc, char **argv) { @@ -71,3 +104,12 @@ void motor_set(int argc, char **argv) LOG5("motor speed:%d",atoi(argv[1])); } MSH_CMD_EXPORT_ALIAS(motor_set,motor, motor_set speed 0~100); +void servo_set(int argc, char **argv) +{ + if (argc == 2) + { + servo_angle(atoi(argv[1])); + } + LOG5("servo angle:%d",atoi(argv[1])); +} +MSH_CMD_EXPORT_ALIAS(servo_set,servo, servo_set angle -90~90); \ No newline at end of file diff --git a/applications/motor.h b/applications/motor.h index d9c3fb5..361549c 100644 --- a/applications/motor.h +++ b/applications/motor.h @@ -1,2 +1,4 @@ void motor_speed(int num); -int mot_init(void); \ No newline at end of file +int mot_init(void); +void servo_angle(int num); +void ser_init(void); \ No newline at end of file diff --git a/applications/sensor.c b/applications/sensor.c index 7fa726e..5a04bc4 100644 --- a/applications/sensor.c +++ b/applications/sensor.c @@ -181,16 +181,23 @@ static void sensor_thread(void *parameter) { rt_pin_mode(PIN_HONGWAI, PIN_MODE_INPUT_PULLDOWN); int pre_cnt_warning = 0; + int HONGWAI_FIRST = 1; while (1) { //约350ms ADC_air = MQ2_GetData_PPM(); // 空气质量传感器数值 0-4095 表示从差到优秀 ADC_PM25 = Get_PM25_Average_Data(); // PM2.5传感器数值0-500 表示从优秀到查差 ADC_pressure = Pressure_Read(); // 压力传感器数值 0-4095 表示从差到优秀 - float HONGWAI = rt_pin_read(PIN_HONGWAI); - if (HONGWAI == PIN_LOW) + int HONGWAI = rt_pin_read(PIN_HONGWAI); + + if (HONGWAI == PIN_LOW&&HONGWAI_FIRST) { - location_danger_status("jj"); + location_danger_status(2); + HONGWAI_FIRST = 0; + } + else if (HONGWAI == PIN_HIGH) + { + HONGWAI_FIRST = 1; } // LOG5("ADC_air:%f,ADC_PM25:%f,ADC_pressure:%f", ADC_air, ADC_PM25, ADC_pressure); cnt_warning = 0; diff --git a/applications/status.c b/applications/status.c index abd8f28..cff6246 100644 --- a/applications/status.c +++ b/applications/status.c @@ -99,16 +99,19 @@ void people_danger_status(void) // LED_BreathMore(0,LED_NUM-1,LED_RED); } MSH_CMD_EXPORT_ALIAS(people_danger_status, rdanger, show people danger_status); -void location_danger_status(char *str) +void location_danger_status(int id) { - if (rt_strcmp("ii", str) == 0||rt_strcmp("jj", str) == 0) - { - serial_send(str); - } - else + if(id==1) { serial_send("ii"); + servo_turn(1); } + else + { + serial_send("jj"); + servo_turn(2); + } + } MSH_CMD_EXPORT_ALIAS(location_danger_status, locadan, show location_danger_status); void normal_status(void) @@ -120,6 +123,22 @@ void normal_status(void) beep_off(); // LED_SetMore(0,LED_NUM-1,LEDI_OFF); } + +void servo_turn(int id) +{ + if(id==1) + { + servo_angle(-45); + } + else if(id==2) + { + servo_angle(45); + } + else + { + servo_angle(0); + } +} void collect_entry(void *parameter) { int cnt_sec = 0; diff --git a/applications/status.h b/applications/status.h index 8f19d70..b3978dc 100644 --- a/applications/status.h +++ b/applications/status.h @@ -8,7 +8,8 @@ void light_off(void); void beep_on(void); void beep_off(void); int status_init(void); -void location_danger_status(char *str); +void location_danger_status(int id); +void servo_turn(int id); extern int light_status; extern int fan_status ; diff --git a/applications/vl53l0x_sample.c b/applications/vl53l0x_sample.c index c303821..124d508 100644 --- a/applications/vl53l0x_sample.c +++ b/applications/vl53l0x_sample.c @@ -35,6 +35,7 @@ static void read_distance_entry(void *parameter) return; } + int push_first=1; while (1) { res = rt_device_read(temp_dev, 0, &temp_data, 1); @@ -55,11 +56,16 @@ static void read_distance_entry(void *parameter) // rt_device_close(temp_dev); // break; // } - if(temp_data.data.proximity<= 60) + if(temp_data.data.proximity<= 60&&push_first==1) { // rt_kprintf("distance[%dmm],timestamp[%d]\r\n",temp_data.data.proximity, // temp_data.timestamp); - location_danger_status("ii"); + location_danger_status(1); + push_first=0; + } + else if(temp_data.data.proximity>60) + { + push_first=1; } rt_thread_mdelay(500); } diff --git a/board/CubeMX_Config/CubeMX_Config.ioc b/board/CubeMX_Config/CubeMX_Config.ioc index cbf0fd8..d2ce902 100644 --- a/board/CubeMX_Config/CubeMX_Config.ioc +++ b/board/CubeMX_Config/CubeMX_Config.ioc @@ -29,13 +29,14 @@ Mcu.IP13=TIM2 Mcu.IP14=TIM3 Mcu.IP15=TIM4 Mcu.IP16=TIM11 -Mcu.IP17=TIM13 -Mcu.IP18=TIM14 -Mcu.IP19=USART1 +Mcu.IP17=TIM12 +Mcu.IP18=TIM13 +Mcu.IP19=TIM14 Mcu.IP2=DAC -Mcu.IP20=USART2 -Mcu.IP21=USART3 -Mcu.IP22=USB_OTG_FS +Mcu.IP20=USART1 +Mcu.IP21=USART2 +Mcu.IP22=USART3 +Mcu.IP23=USB_OTG_FS Mcu.IP3=FSMC Mcu.IP4=I2C1 Mcu.IP5=IWDG @@ -43,7 +44,7 @@ Mcu.IP6=NVIC Mcu.IP7=RCC Mcu.IP8=RTC Mcu.IP9=SDIO -Mcu.IPNb=23 +Mcu.IPNb=24 Mcu.Name=STM32F407Z(E-G)Tx Mcu.Package=LQFP144 Mcu.Pin0=PC14-OSC32_IN @@ -63,54 +64,57 @@ Mcu.Pin20=PE9 Mcu.Pin21=PE10 Mcu.Pin22=PE11 Mcu.Pin23=PE13 -Mcu.Pin24=PB10 -Mcu.Pin25=PB11 -Mcu.Pin26=PB13 -Mcu.Pin27=PD8 -Mcu.Pin28=PD9 -Mcu.Pin29=PD12 +Mcu.Pin24=PE15 +Mcu.Pin25=PB10 +Mcu.Pin26=PB11 +Mcu.Pin27=PB13 +Mcu.Pin28=PB14 +Mcu.Pin29=PD8 Mcu.Pin3=PF5 -Mcu.Pin30=PD13 -Mcu.Pin31=PD14 -Mcu.Pin32=PD15 -Mcu.Pin33=PC8 -Mcu.Pin34=PC9 -Mcu.Pin35=PA9 -Mcu.Pin36=PA10 -Mcu.Pin37=PA11 -Mcu.Pin38=PA12 -Mcu.Pin39=PA13 +Mcu.Pin30=PD9 +Mcu.Pin31=PD12 +Mcu.Pin32=PD13 +Mcu.Pin33=PD14 +Mcu.Pin34=PD15 +Mcu.Pin35=PC8 +Mcu.Pin36=PC9 +Mcu.Pin37=PA9 +Mcu.Pin38=PA10 +Mcu.Pin39=PA11 Mcu.Pin4=PF6 -Mcu.Pin40=PA14 -Mcu.Pin41=PC10 -Mcu.Pin42=PC11 -Mcu.Pin43=PC12 -Mcu.Pin44=PD0 -Mcu.Pin45=PD1 -Mcu.Pin46=PD2 -Mcu.Pin47=PD4 -Mcu.Pin48=PD5 -Mcu.Pin49=PG10 +Mcu.Pin40=PA12 +Mcu.Pin41=PA13 +Mcu.Pin42=PA14 +Mcu.Pin43=PC10 +Mcu.Pin44=PC11 +Mcu.Pin45=PC12 +Mcu.Pin46=PD0 +Mcu.Pin47=PD1 +Mcu.Pin48=PD2 +Mcu.Pin49=PD4 Mcu.Pin5=PF7 -Mcu.Pin50=PG11 -Mcu.Pin51=PG13 -Mcu.Pin52=PG14 -Mcu.Pin53=PB6 -Mcu.Pin54=PB7 -Mcu.Pin55=VP_IWDG_VS_IWDG -Mcu.Pin56=VP_RTC_VS_RTC_Activate -Mcu.Pin57=VP_SYS_VS_Systick -Mcu.Pin58=VP_TIM1_VS_ClockSourceINT -Mcu.Pin59=VP_TIM2_VS_ClockSourceINT +Mcu.Pin50=PD5 +Mcu.Pin51=PG10 +Mcu.Pin52=PG11 +Mcu.Pin53=PG13 +Mcu.Pin54=PG14 +Mcu.Pin55=PB6 +Mcu.Pin56=PB7 +Mcu.Pin57=VP_IWDG_VS_IWDG +Mcu.Pin58=VP_RTC_VS_RTC_Activate +Mcu.Pin59=VP_SYS_VS_Systick Mcu.Pin6=PF9 -Mcu.Pin60=VP_TIM3_VS_ClockSourceINT -Mcu.Pin61=VP_TIM11_VS_ClockSourceINT -Mcu.Pin62=VP_TIM13_VS_ClockSourceINT -Mcu.Pin63=VP_TIM14_VS_ClockSourceINT +Mcu.Pin60=VP_TIM1_VS_ClockSourceINT +Mcu.Pin61=VP_TIM2_VS_ClockSourceINT +Mcu.Pin62=VP_TIM3_VS_ClockSourceINT +Mcu.Pin63=VP_TIM11_VS_ClockSourceINT +Mcu.Pin64=VP_TIM12_VS_ClockSourceINT +Mcu.Pin65=VP_TIM13_VS_ClockSourceINT +Mcu.Pin66=VP_TIM14_VS_ClockSourceINT Mcu.Pin7=PH0-OSC_IN Mcu.Pin8=PH1-OSC_OUT Mcu.Pin9=PC2 -Mcu.PinsNb=64 +Mcu.PinsNb=67 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F407ZGTx @@ -162,6 +166,10 @@ PB10.Signal=S_TIM2_CH3 PB11.Signal=S_TIM2_CH4 PB13.Mode=Full_Duplex_Master PB13.Signal=SPI2_SCK +PB14.GPIOParameters=GPIO_Label +PB14.GPIO_Label=SERVO_SJ +PB14.Locked=true +PB14.Signal=S_TIM12_CH1 PB6.GPIOParameters=GPIO_Label PB6.GPIO_Label=VL53L0X_SCL PB6.Mode=I2C @@ -207,6 +215,10 @@ PE10.Signal=FSMC_D7_DA7 PE11.Locked=true PE11.Signal=S_TIM1_CH2 PE13.Signal=S_TIM1_CH3 +PE15.GPIOParameters=GPIO_Label +PE15.GPIO_Label=HONGWAI +PE15.Locked=true +PE15.Signal=GPIO_Input PE7.Signal=FSMC_D4_DA4 PE8.Signal=FSMC_D5_DA5 PE9.Signal=FSMC_D6_DA6 @@ -266,7 +278,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_IWDG_Init-IWDG-false-HAL-true,6-MX_TIM14_Init-TIM14-false-HAL-true,7-MX_TIM13_Init-TIM13-false-HAL-true,8-MX_TIM11_Init-TIM11-false-HAL-true,9-MX_TIM2_Init-TIM2-false-HAL-true,10-MX_SPI2_Init-SPI2-false-HAL-true,11-MX_TIM4_Init-TIM4-false-HAL-true,12-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true,13-MX_FSMC_Init-FSMC-false-HAL-true,14-MX_DAC_Init-DAC-false-HAL-true,15-MX_TIM3_Init-TIM3-false-HAL-true,16-MX_ADC1_Init-ADC1-false-HAL-true,17-MX_ADC3_Init-ADC3-false-HAL-true,18-MX_TIM1_Init-TIM1-false-HAL-true,19-MX_USART2_UART_Init-USART2-false-HAL-true,20-MX_USART3_UART_Init-USART3-false-HAL-true,21-MX_I2C1_Init-I2C1-false-HAL-true,22-MX_I2C3_Init-I2C3-false-HAL-true +ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_IWDG_Init-IWDG-false-HAL-true,6-MX_TIM14_Init-TIM14-false-HAL-true,7-MX_TIM13_Init-TIM13-false-HAL-true,8-MX_TIM11_Init-TIM11-false-HAL-true,9-MX_TIM2_Init-TIM2-false-HAL-true,10-MX_SPI2_Init-SPI2-false-HAL-true,11-MX_TIM4_Init-TIM4-false-HAL-true,12-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true,13-MX_FSMC_Init-FSMC-false-HAL-true,14-MX_DAC_Init-DAC-false-HAL-true,15-MX_TIM3_Init-TIM3-false-HAL-true,16-MX_ADC1_Init-ADC1-false-HAL-true,17-MX_ADC3_Init-ADC3-false-HAL-true,18-MX_TIM1_Init-TIM1-false-HAL-true,19-MX_USART2_UART_Init-USART2-false-HAL-true,20-MX_USART3_UART_Init-USART3-false-HAL-true,21-MX_I2C1_Init-I2C1-false-HAL-true,22-MX_SDIO_SD_Init-SDIO-false-HAL-true RCC.48MHZClocksFreq_Value=48000000 RCC.AHBFreq_Value=168000000 RCC.APB1CLKDivider=RCC_HCLK_DIV4 @@ -331,6 +343,8 @@ SH.FSMC_NOE.0=FSMC_NOE,Lcd1 SH.FSMC_NOE.ConfNb=1 SH.FSMC_NWE.0=FSMC_NWE,Lcd1 SH.FSMC_NWE.ConfNb=1 +SH.S_TIM12_CH1.0=TIM12_CH1,PWM Generation1 CH1 +SH.S_TIM12_CH1.ConfNb=1 SH.S_TIM14_CH1.0=TIM14_CH1,PWM Generation1 CH1 SH.S_TIM14_CH1.ConfNb=1 SH.S_TIM1_CH2.0=TIM1_CH2,PWM Generation2 CH2 @@ -353,6 +367,10 @@ SPI2.VirtualType=VM_MASTER TIM1.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2 TIM1.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 TIM1.IPParameters=Channel-PWM Generation2 CH2,Channel-PWM Generation3 CH3 +TIM12.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1 +TIM12.IPParameters=Channel-PWM Generation1 CH1,Prescaler,Period +TIM12.Period=20000-1 +TIM12.Prescaler=84-1 TIM14.Channel=TIM_CHANNEL_1 TIM14.IPParameters=Channel TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 @@ -381,6 +399,8 @@ VP_SYS_VS_Systick.Mode=SysTick VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TIM11_VS_ClockSourceINT.Mode=Enable_Timer VP_TIM11_VS_ClockSourceINT.Signal=TIM11_VS_ClockSourceINT +VP_TIM12_VS_ClockSourceINT.Mode=Internal +VP_TIM12_VS_ClockSourceINT.Signal=TIM12_VS_ClockSourceINT VP_TIM13_VS_ClockSourceINT.Mode=Enable_Timer VP_TIM13_VS_ClockSourceINT.Signal=TIM13_VS_ClockSourceINT VP_TIM14_VS_ClockSourceINT.Mode=Enable_Timer diff --git a/board/CubeMX_Config/Inc/main.h b/board/CubeMX_Config/Inc/main.h index b1a6bd7..cecc913 100644 --- a/board/CubeMX_Config/Inc/main.h +++ b/board/CubeMX_Config/Inc/main.h @@ -80,6 +80,10 @@ void Error_Handler(void); /* USER CODE END EFP */ /* Private defines -----------------------------------------------------------*/ +#define HONGWAI_Pin GPIO_PIN_15 +#define HONGWAI_GPIO_Port GPIOE +#define SERVO_SJ_Pin GPIO_PIN_14 +#define SERVO_SJ_GPIO_Port GPIOB #define VL53L0X_SCL_Pin GPIO_PIN_6 #define VL53L0X_SCL_GPIO_Port GPIOB #define VL53L0X_SDA_Pin GPIO_PIN_7 diff --git a/board/CubeMX_Config/Src/main.c b/board/CubeMX_Config/Src/main.c index 1ed68c5..616b91f 100644 --- a/board/CubeMX_Config/Src/main.c +++ b/board/CubeMX_Config/Src/main.c @@ -60,6 +60,7 @@ TIM_HandleTypeDef htim2; TIM_HandleTypeDef htim3; TIM_HandleTypeDef htim4; TIM_HandleTypeDef htim11; +TIM_HandleTypeDef htim12; TIM_HandleTypeDef htim13; TIM_HandleTypeDef htim14; @@ -98,6 +99,7 @@ static void MX_USART2_UART_Init(void); static void MX_USART3_UART_Init(void); static void MX_I2C1_Init(void); static void MX_SDIO_SD_Init(void); +static void MX_TIM12_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -156,6 +158,7 @@ int main(void) MX_USART3_UART_Init(); MX_I2C1_Init(); MX_SDIO_SD_Init(); + MX_TIM12_Init(); /* USER CODE BEGIN 2 */ /* USER CODE END 2 */ @@ -815,6 +818,58 @@ static void MX_TIM11_Init(void) } +/** + * @brief TIM12 Initialization Function + * @param None + * @retval None + */ +static void MX_TIM12_Init(void) +{ + + /* USER CODE BEGIN TIM12_Init 0 */ + + /* USER CODE END TIM12_Init 0 */ + + TIM_ClockConfigTypeDef sClockSourceConfig = {0}; + TIM_OC_InitTypeDef sConfigOC = {0}; + + /* USER CODE BEGIN TIM12_Init 1 */ + + /* USER CODE END TIM12_Init 1 */ + htim12.Instance = TIM12; + htim12.Init.Prescaler = 84-1; + htim12.Init.CounterMode = TIM_COUNTERMODE_UP; + htim12.Init.Period = 20000-1; + htim12.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim12.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + if (HAL_TIM_Base_Init(&htim12) != HAL_OK) + { + Error_Handler(); + } + sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL; + if (HAL_TIM_ConfigClockSource(&htim12, &sClockSourceConfig) != HAL_OK) + { + Error_Handler(); + } + if (HAL_TIM_PWM_Init(&htim12) != HAL_OK) + { + Error_Handler(); + } + sConfigOC.OCMode = TIM_OCMODE_PWM1; + sConfigOC.Pulse = 0; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + if (HAL_TIM_PWM_ConfigChannel(&htim12, &sConfigOC, TIM_CHANNEL_1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN TIM12_Init 2 */ + + /* USER CODE END TIM12_Init 2 */ + HAL_TIM_MspPostInit(&htim12); + +} + /** * @brief TIM13 Initialization Function * @param None @@ -1047,6 +1102,12 @@ static void MX_GPIO_Init(void) __HAL_RCC_GPIOD_CLK_ENABLE(); __HAL_RCC_GPIOG_CLK_ENABLE(); + /*Configure GPIO pin : HONGWAI_Pin */ + GPIO_InitStruct.Pin = HONGWAI_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(HONGWAI_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 e238398..6ff8fed 100644 --- a/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c +++ b/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c @@ -81,7 +81,7 @@ /* USER CODE END 0 */ void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); - /** + /** * Initializes the Global MSP. */ void HAL_MspInit(void) @@ -612,6 +612,17 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) /* USER CODE END TIM11_MspInit 1 */ } + else if(htim_base->Instance==TIM12) + { + /* USER CODE BEGIN TIM12_MspInit 0 */ + + /* USER CODE END TIM12_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_TIM12_CLK_ENABLE(); + /* USER CODE BEGIN TIM12_MspInit 1 */ + + /* USER CODE END TIM12_MspInit 1 */ + } else if(htim_base->Instance==TIM13) { /* USER CODE BEGIN TIM13_MspInit 0 */ @@ -748,6 +759,27 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) /* USER CODE END TIM4_MspPostInit 1 */ } + else if(htim->Instance==TIM12) + { + /* USER CODE BEGIN TIM12_MspPostInit 0 */ + + /* USER CODE END TIM12_MspPostInit 0 */ + + __HAL_RCC_GPIOB_CLK_ENABLE(); + /**TIM12 GPIO Configuration + PB14 ------> TIM12_CH1 + */ + GPIO_InitStruct.Pin = SERVO_SJ_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF9_TIM12; + HAL_GPIO_Init(SERVO_SJ_GPIO_Port, &GPIO_InitStruct); + + /* USER CODE BEGIN TIM12_MspPostInit 1 */ + + /* USER CODE END TIM12_MspPostInit 1 */ + } else if(htim->Instance==TIM14) { /* USER CODE BEGIN TIM14_MspPostInit 0 */ @@ -823,6 +855,17 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END TIM11_MspDeInit 1 */ } + else if(htim_base->Instance==TIM12) + { + /* USER CODE BEGIN TIM12_MspDeInit 0 */ + + /* USER CODE END TIM12_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_TIM12_CLK_DISABLE(); + /* USER CODE BEGIN TIM12_MspDeInit 1 */ + + /* USER CODE END TIM12_MspDeInit 1 */ + } else if(htim_base->Instance==TIM13) { /* USER CODE BEGIN TIM13_MspDeInit 0 */ diff --git a/board/Kconfig b/board/Kconfig index 3f18f62..db1b3f5 100644 --- a/board/Kconfig +++ b/board/Kconfig @@ -523,6 +523,14 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM14 channel1" default n endif + menuconfig BSP_USING_PWM12 + bool "Enable timer12 output PWM" + default n + if BSP_USING_PWM12 + config BSP_USING_PWM12_CH1 + bool "Enable PWM12 channel1" + default n + endif endif config BSP_USING_ON_CHIP_FLASH diff --git a/board/board.c b/board/board.c index d49a591..f13e80d 100644 --- a/board/board.c +++ b/board/board.c @@ -11,6 +11,10 @@ #include "board.h" #include +#define SERVO_SJ_Pin GPIO_PIN_14 +#define SERVO_SJ_GPIO_Port GPIOB + +TIM_HandleTypeDef htim12; void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; @@ -58,3 +62,50 @@ void SystemClock_Config(void) Error_Handler(); } } +extern void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim); +void MX_TIM12_Init(void) +{ + + /* USER CODE BEGIN TIM12_Init 0 */ + + /* USER CODE END TIM12_Init 0 */ + + TIM_ClockConfigTypeDef sClockSourceConfig = {0}; + TIM_OC_InitTypeDef sConfigOC = {0}; + + /* USER CODE BEGIN TIM12_Init 1 */ + + /* USER CODE END TIM12_Init 1 */ + htim12.Instance = TIM12; + htim12.Init.Prescaler = 84-1; + htim12.Init.CounterMode = TIM_COUNTERMODE_UP; + htim12.Init.Period = 20000-1; + htim12.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim12.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + if (HAL_TIM_Base_Init(&htim12) != HAL_OK) + { + Error_Handler(); + } + sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL; + if (HAL_TIM_ConfigClockSource(&htim12, &sClockSourceConfig) != HAL_OK) + { + Error_Handler(); + } + if (HAL_TIM_PWM_Init(&htim12) != HAL_OK) + { + Error_Handler(); + } + sConfigOC.OCMode = TIM_OCMODE_PWM1; + sConfigOC.Pulse = 0; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + if (HAL_TIM_PWM_ConfigChannel(&htim12, &sConfigOC, TIM_CHANNEL_1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN TIM12_Init 2 */ + + /* USER CODE END TIM12_Init 2 */ + HAL_TIM_MspPostInit(&htim12); + +} diff --git a/board/board.h b/board/board.h index 385043a..960ff0f 100644 --- a/board/board.h +++ b/board/board.h @@ -39,6 +39,7 @@ extern int __bss_end; #define HEAP_END STM32_SRAM_END void SystemClock_Config(void); +void MX_TIM12_Init(void); #ifdef __cplusplus } diff --git a/rtconfig.h b/rtconfig.h index d294de3..d7348a3 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -453,7 +453,6 @@ #define INFRA_STRING #define INFRA_NET #define INFRA_LIST -#define INFRA_LOG_NETWORK_PAYLOAD #define INFRA_LOG /* Log Configurations */ @@ -753,6 +752,8 @@ #define BSP_USING_PWM3_CH2 #define BSP_USING_PWM14 #define BSP_USING_PWM14_CH1 +#define BSP_USING_PWM12 +#define BSP_USING_PWM12_CH1 #define BSP_USING_ON_CHIP_FLASH #define BSP_USING_SPI #define BSP_USING_SPI2