From 75fc3f966e98cf912c6983be912fc0a5f3cf69bc Mon Sep 17 00:00:00 2001 From: dgjames <1943357252@qq.com> Date: Fri, 14 Mar 2025 17:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B2=E5=8F=A3=E6=8E=A5=E6=94=B6=E5=92=8C?= =?UTF-8?q?=E9=A3=8E=E6=89=87=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config | 21 +- .vscode/c_cpp_properties.json | 491 ++++---------------- .vscode/project.json | 180 +++---- applications/motor.c | 117 +++++ applications/uart_sample.c | 144 ++++++ board/CubeMX_Config/CubeMX_Config.ioc | 76 +-- board/CubeMX_Config/Inc/main.h | 4 +- board/CubeMX_Config/Src/main.c | 32 +- board/CubeMX_Config/Src/stm32f4xx_hal_msp.c | 18 +- board/Kconfig | 79 ++++ my_pro/myinfrared.c | 16 +- my_pro/myproject.c | 33 +- rtconfig.h | 17 +- 13 files changed, 645 insertions(+), 583 deletions(-) create mode 100644 applications/motor.c create mode 100644 applications/uart_sample.c diff --git a/.config b/.config index f870e88..c32df69 100644 --- a/.config +++ b/.config @@ -296,10 +296,9 @@ CONFIG_RT_USING_SYSTEM_WORKQUEUE=y CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=2048 CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23 CONFIG_RT_USING_SERIAL=y -CONFIG_RT_USING_SERIAL_V1=y -# CONFIG_RT_USING_SERIAL_V2 is not set +# CONFIG_RT_USING_SERIAL_V1 is not set +CONFIG_RT_USING_SERIAL_V2=y CONFIG_RT_SERIAL_USING_DMA=y -CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_RT_USING_SERIAL_BYPASS is not set # CONFIG_RT_USING_CAN is not set # CONFIG_RT_USING_CPUTIME is not set @@ -1831,17 +1830,29 @@ CONFIG_BSP_USING_UART=y CONFIG_BSP_USING_UART1=y # CONFIG_BSP_UART1_RX_USING_DMA is not set # CONFIG_BSP_UART1_TX_USING_DMA is not set +CONFIG_BSP_UART1_TX_BUFSIZE=0 +CONFIG_BSP_UART1_RX_BUFSIZE=256 CONFIG_BSP_USING_UART2=y # CONFIG_BSP_UART2_RX_USING_DMA is not set # CONFIG_BSP_UART2_TX_USING_DMA is not set +CONFIG_BSP_UART2_TX_BUFSIZE=0 +CONFIG_BSP_UART2_RX_BUFSIZE=256 CONFIG_BSP_USING_UART3=y -# CONFIG_BSP_UART3_RX_USING_DMA is not set -# CONFIG_BSP_UART3_TX_USING_DMA is not set +CONFIG_BSP_UART3_RX_USING_DMA=y +CONFIG_BSP_UART3_TX_USING_DMA=y +CONFIG_BSP_UART3_TX_BUFSIZE=0 +CONFIG_BSP_UART3_RX_BUFSIZE=256 # CONFIG_BSP_USING_UART4 is not set +CONFIG_BSP_UART4_TX_BUFSIZE=0 +CONFIG_BSP_UART4_RX_BUFSIZE=256 # CONFIG_BSP_USING_UART5 is not set +CONFIG_BSP_UART5_TX_BUFSIZE=0 +CONFIG_BSP_UART5_RX_BUFSIZE=256 CONFIG_BSP_USING_UART6=y # CONFIG_BSP_UART6_RX_USING_DMA is not set # CONFIG_BSP_UART6_TX_USING_DMA is not set +CONFIG_BSP_UART6_TX_BUFSIZE=0 +CONFIG_BSP_UART6_RX_BUFSIZE=256 CONFIG_BSP_USING_TIM=y CONFIG_BSP_USING_TIM11=y CONFIG_BSP_USING_TIM13=y diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 824a4ca..c9c947b 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,379 +4,12 @@ "name": "rt-thread", "defines": [ "RT_USING_LIBC", - "USE_HAL_DRIVER", - "__RTTHREAD__", - "__STDC_LIMIT_MACROS", - "__CLK_TCK=RT_TICK_PER_SECOND", + "RT_USING_NEWLIBC", "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" + "USE_HAL_DRIVER", + "_POSIX_C_SOURCE=1", + "__RTTHREAD__", + "__perf_counter_printf__=rt_kprintf" ], "intelliSenseMode": "gcc-arm", "compilerPath": "d:/DevTools/env2/tools/gnu_gcc/arm_gcc/mingw/bin/arm-none-eabi-gcc", @@ -386,45 +19,81 @@ "build/compile_commands.json" ], "includePath": [ - "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" + "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", + "my_pro", + "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", + "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", + "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" ] } ], diff --git a/.vscode/project.json b/.vscode/project.json index 0d5ac30..9f8bc38 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\\impl\\MQTTSerializePublish.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\\dev_model\\dm_fota.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_log.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_TCP_rtthread.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTDeserializePublish.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_prt_nwk_payload.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.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\client\\dm_client.c", - "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.c", - "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_log_report.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_UDP_rtthread.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\\MQTTPacket.c", - "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.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_message_cache.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_cjson.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_net.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\\iotkit-embedded\\src\\infra\\infra_defs.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_cota.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\\dev_model\\client\\dm_client_adapter.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_message.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\\infra\\infra_timer.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\impl\\MQTTConnectClient.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_OS_rtthread.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_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\\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\\mqtt\\impl\\iotx_mqtt_client.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\\client\\dm_client_adapter.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_model\\dm_ipc.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_model\\dm_log_report.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\\MQTTPacket.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_fota.c", + "packages\\ali-iotkit-v3.0.2\\ports\\wrapper.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_timer.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_defs.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\dev_sign\\dev_sign_mqtt.c", + "packages\\ali-iotkit-v3.0.2\\ports\\rtthread\\HAL_TCP_rtthread.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_prt_nwk_payload.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_utils.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\\mqtt\\impl\\MQTTSerializePublish.c", "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\infra\\infra_sha256.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\\client\\dm_client.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_manager.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_opt.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\\iotx_cm.c", + "packages\\ali-iotkit-v3.0.2\\iotkit-embedded\\src\\mqtt\\mqtt_api.c", "packages\\ali-iotkit-v3.0.2\\SConscript" ] }, @@ -71,7 +71,9 @@ "applications\\app_lcd.c", "applications\\init.c", "applications\\main.c", + "applications\\motor.c", "applications\\sim.c", + "applications\\uart_sample.c", "my_pro\\AHT10.c", "my_pro\\icm_20608_sample.c", "my_pro\\indicator_led.c", @@ -89,9 +91,9 @@ "name": "AT", "path": "rt-thread\\components\\net\\at", "files": [ + "rt-thread\\components\\net\\at\\src\\at_utils.c", "rt-thread\\components\\net\\at\\src\\at_cli.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" ] }, @@ -99,8 +101,8 @@ "name": "cJSON", "path": "packages\\cJSON-v1.7.17", "files": [ - "packages\\cJSON-v1.7.17\\cJSON_Utils.c", "packages\\cJSON-v1.7.17\\cJSON.c", + "packages\\cJSON-v1.7.17\\cJSON_Utils.c", "packages\\cJSON-v1.7.17\\SConscript" ] }, @@ -122,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" ] }, @@ -163,7 +165,7 @@ "rt-thread\\components\\drivers\\sdio\\dev_sdio.c", "rt-thread\\components\\drivers\\sensor\\v1\\sensor.c", "rt-thread\\components\\drivers\\sensor\\v1\\sensor_cmd.c", - "rt-thread\\components\\drivers\\serial\\dev_serial.c", + "rt-thread\\components\\drivers\\serial\\dev_serial_v2.c", "rt-thread\\components\\drivers\\spi\\dev_spi.c", "rt-thread\\components\\drivers\\spi\\dev_spi_core.c", "rt-thread\\components\\drivers\\spi\\dev_spi_flash_sfud.c", @@ -200,7 +202,7 @@ "libraries\\HAL_Drivers\\drivers\\drv_spi.c", "libraries\\HAL_Drivers\\drivers\\drv_test.c", "libraries\\HAL_Drivers\\drivers\\drv_tim.c", - "libraries\\HAL_Drivers\\drivers\\drv_usart.c", + "libraries\\HAL_Drivers\\drivers\\drv_usart_v2.c", "libraries\\HAL_Drivers\\drivers\\drv_usbd.c", "libraries\\HAL_Drivers\\drv_common.c", "board\\SConscript" @@ -212,9 +214,9 @@ "files": [ "rt-thread\\components\\fal\\src\\fal.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_flash.c", "rt-thread\\components\\fal\\src\\fal_rtt.c", + "rt-thread\\components\\fal\\src\\fal_flash.c", + "rt-thread\\components\\fal\\samples\\porting\\fal_flash_sfud_port.c", "rt-thread\\components\\fal\\SConscript" ] }, @@ -238,11 +240,11 @@ "name": "Finsh", "path": "rt-thread\\components\\finsh", "files": [ - "rt-thread\\components\\finsh\\msh_parse.c", "rt-thread\\components\\finsh\\msh.c", - "rt-thread\\components\\finsh\\msh_file.c", - "rt-thread\\components\\finsh\\cmd.c", "rt-thread\\components\\finsh\\shell.c", + "rt-thread\\components\\finsh\\cmd.c", + "rt-thread\\components\\finsh\\msh_file.c", + "rt-thread\\components\\finsh\\msh_parse.c", "rt-thread\\components\\finsh\\SConscript" ] }, @@ -267,8 +269,8 @@ "path": "packages\\infrared-v0.1.1", "files": [ "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\\src\\infrared.c", "packages\\infrared-v0.1.1\\SConscript" ] }, @@ -298,12 +300,12 @@ "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\\semaphore_sample.c", "packages\\kernel_samples-latest\\en\\thread_sample.c", - "packages\\kernel_samples-latest\\en\\event_sample.c", "packages\\kernel_samples-latest\\en\\mutex_sample.c", + "packages\\kernel_samples-latest\\en\\msgq_sample.c", + "packages\\kernel_samples-latest\\en\\event_sample.c", "packages\\kernel_samples-latest\\en\\SConscript" ] }, @@ -311,10 +313,10 @@ "name": "klibc", "path": "rt-thread\\src\\klibc", "files": [ - "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\\kstdio.c", + "rt-thread\\src\\klibc\\rt_vsscanf.c", + "rt-thread\\src\\klibc\\kerrno.c", "rt-thread\\src\\klibc\\kstring.c", "rt-thread\\src\\klibc\\SConscript" ] @@ -343,46 +345,46 @@ "name": "Libraries", "path": "libraries\\STM32F4xx_HAL", "files": [ - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sram.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_sdmmc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_hcd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_usart.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_rtc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ramfunc.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.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_pccard.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_pwr.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ex.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cortex.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_hal_adc_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pcd_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_usb.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_crc.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_uart.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_qspi.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim_ex.c", - "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_spi.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_hcd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sram.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cec.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_lptim.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rng.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_i2c_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pccard.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rtc_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_spi.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_hal.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_flash.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_ll_fmc.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_dma_ex.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr_ex.c", + "libraries\\STM32F4xx_HAL\\CMSIS\\Device\\ST\\STM32F4xx\\Source\\Templates\\system_stm32f4xx.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_adc.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_uart.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_rcc_ex.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\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_sd.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_qspi.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_pwr.c", + "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_tim_ex.c", "libraries\\STM32F4xx_HAL\\STM32F4xx_HAL_Driver\\Src\\stm32f4xx_hal_cryp.c", "libraries\\STM32F4xx_HAL\\SConscript" ] @@ -469,8 +471,8 @@ "name": "rt_usbd", "path": "rt-thread\\components\\legacy\\usb\\usbdevice", "files": [ - "rt-thread\\components\\legacy\\usb\\usbdevice\\core\\usbdevice.c", "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\\SConscript" ] diff --git a/applications/motor.c b/applications/motor.c new file mode 100644 index 0000000..aef439a --- /dev/null +++ b/applications/motor.c @@ -0,0 +1,117 @@ +#include +#include +#include + +#define LOG_TAG "app.robot" +#define LOG_LVL LOG_LVL_DBG +// #define LOG_LVL LOG_LVL_INFO +#define USE_LOG1 +#define USE_LOG2 +#define USE_LOG3 +#define USE_LOG4 +#define USE_LOG5 +#define USE_LOG6 +#define USE_LOG7 +#define USE_LOG12 +#define USE_LOG_D +#include "logn.h" + +#define MOTOR_PWM_DEV_NAME "pwm1" +#define MOTOR_PWM_DEV_CHANNEL 1 + +#define MOTOR2_PWM_DEV_NAME "pwm1" +#define MOTOR2_PWM_DEV_CHANNEL 1 + + +struct rt_device_pwm *motor_dev; // pwm设备句柄 +rt_uint32_t period = 10000000; // 单位us 向左6位，变毫秒 10ms +rt_uint32_t pulse = 1000000; + + +/** + * @brief 电机速度控制(num)% + * + * @param num 百分比数字(0~100). + * + */ +void motor_speed(int num) +{ + rt_pwm_set(motor_dev, MOTOR_PWM_DEV_CHANNEL, period, num * period / 100); +} + +#define PIN_MOTOR1 GET_PIN(B, 2) +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); + 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) + // { + // motor_speed(atoi(argv[1])); + // } + // LOG5("motor speed:%d",atoi(argv[1])); +} +MSH_CMD_EXPORT_ALIAS(motor_set,motor, motor_set speed 0~100); + +// struct rt_device_pwm *motor_dev; // pwm设备句柄 +// rt_uint32_t period2 = 10000000; // 单位us 向左6位，变毫秒 10ms2 + + +// /** +// * @brief 电机速度控制(num)% +// * +// * @param num 百分比数字(0~100). +// * +// */ +// void motor2_speed(int num) +// { +// rt_pwm_set(motor_dev, MOTOR2_PWM_DEV_CHANNEL, period2, num * period2 / 100); +// } +// int mo2_init(void) +// { +// motor_dev = (struct rt_device_pwm *)rt_device_find(MOTOR2_PWM_DEV_NAME); +// if (motor_dev == RT_NULL) +// { +// rt_kprintf("motor2 run failed! can't find %s device!\n", MOTOR2_PWM_DEV_NAME); +// return RT_ERROR; +// } +// /* 设置PWM周期和脉冲宽度默认值 */ +// motor_speed(0); +// } +// void motor2_set(int argc, char **argv) +// { +// if (argc == 2) +// { +// motor2_speed(atoi(argv[1])); +// } +// LOG5("motor2 speed:%d",atoi(argv[1])); +// } +// MSH_CMD_EXPORT_ALIAS(motor2_set,motor2, motor2_set speed 0~100); \ No newline at end of file diff --git a/applications/uart_sample.c b/applications/uart_sample.c new file mode 100644 index 0000000..5fdbff0 --- /dev/null +++ b/applications/uart_sample.c @@ -0,0 +1,144 @@ +/* + * 程序清单：这是一个串口设备 开启 DMA 模式后使用例程 + * 例程导出了 uart_dma_sample 命令到控制终端 + * 命令调用格式：uart_dma_sample uart1 + * 命令解释：命令第二个参数是要使用的串口设备名称，为空则使用默认的串口设备 + * 程序功能：通过串口输出字符串 "hello RT-Thread!"，并通过串口输出接收到的数据，然后打印接收到的数据。 +*/ + +#include +#include + +#define SAMPLE_UART_NAME "uart3" /* 串口设备名称 */ + +#define LOG_TAG "assistant" +#define DBG_LVL DBG_LOG +// #define DBG_LVL DBG_INFO + +#define USE_LOG1 +#define USE_LOG2 +#define USE_LOG3 +// #define USE_LOG4 +#define USE_LOG5 +// #define USE_LOG6 +// #define USE_LOG_D +#include "logn.h" + +/* 串口接收消息结构 */ +struct rx_msg +{ + rt_device_t dev; + rt_size_t size; +}; +/* 串口设备句柄 */ +static rt_device_t serial; +/* 消息队列控制块 */ +static struct rt_messagequeue rx_mq; + +/* 接收数据回调函数 */ +static rt_err_t uart_input(rt_device_t dev, rt_size_t size) +{ + struct rx_msg msg; + rt_err_t result; + msg.dev = dev; + msg.size = size; + + result = rt_mq_send(&rx_mq, &msg, sizeof(msg)); + if (result == -RT_EFULL) + { + /* 消息队列满 */ + rt_kprintf("message queue full！\n"); + } + return result; +} + +static void serial_thread_entry(void *parameter) +{ + struct rx_msg msg; + rt_err_t result; + rt_uint32_t rx_length; + static char rx_buffer[BSP_UART3_RX_BUFSIZE+ 1]; + + while (1) + { + rt_memset(&msg, 0, sizeof(msg)); + /* 从消息队列中读取消息 */ + result = rt_mq_recv(&rx_mq, &msg, sizeof(msg), RT_WAITING_FOREVER); + if (result > 0) + { + /* 从串口读取数据 */ + rx_length = rt_device_read(msg.dev, 0, rx_buffer, msg.size); + rx_buffer[rx_length] = '\0'; + if(!rt_strcasecmp(rx_buffer, "cc")) + { + rt_kprintf("加大抽风\n"); + } + else if(!rt_strcasecmp(rx_buffer, "dd")) + { + rt_kprintf("关闭抽风\n"); + + } + else if(!rt_strcasecmp(rx_buffer, "ee")) + { + rt_kprintf("开灯\n"); + } + else if(!rt_strcasecmp(rx_buffer, "ff")) + { + rt_kprintf("关灯\n"); + } + /* 通过串口设备 serial 输出读取到的消息 */ + // rt_device_write(serial, 0, rx_buffer, rx_length); + /* 打印数据 */ + rt_kprintf("%s\n",rx_buffer); + } + } +} + +int aiv_init(void) +{ + LOG5("VOICE assistant START"); + rt_err_t ret = RT_EOK; + char uart_name[RT_NAME_MAX]; + static char msg_pool[256]; + char str[] = "hello RT-Thread!\r\n"; + + rt_strcpy(uart_name, SAMPLE_UART_NAME); + + /* 查找串口设备 */ + serial = rt_device_find(uart_name); + if (!serial) + { + rt_kprintf("find %s failed!\n", uart_name); + return RT_ERROR; + } + + /* 初始化消息队列 */ + rt_mq_init(&rx_mq, "rx_mq", + msg_pool, /* 存放消息的缓冲区 */ + sizeof(struct rx_msg), /* 一条消息的最大长度 */ + sizeof(msg_pool), /* 存放消息的缓冲区大小 */ + RT_IPC_FLAG_FIFO); /* 如果有多个线程等待，按照先来先得到的方法分配消息 */ + + /* 以 DMA 接收及轮询发送方式打开串口设备 */ + rt_device_open(serial, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING); + /* 设置接收回调函数 */ + rt_device_set_rx_indicate(serial, uart_input); + /* 发送字符串 */ + // rt_device_write(serial, 0, str, (sizeof(str) - 1)); + + /* 创建 serial 线程 */ + rt_thread_t thread = rt_thread_create("serial", serial_thread_entry, RT_NULL, 1024, 25, 10); + /* 创建成功则启动线程 */ + if (thread != RT_NULL) + { + rt_thread_startup(thread); + } + else + { + ret = RT_ERROR; + } + + return ret; +} +/* 导出到 msh 命令列表中 */ +MSH_CMD_EXPORT(aiv_init,siri start); diff --git a/board/CubeMX_Config/CubeMX_Config.ioc b/board/CubeMX_Config/CubeMX_Config.ioc index a74736e..1804a2e 100644 --- a/board/CubeMX_Config/CubeMX_Config.ioc +++ b/board/CubeMX_Config/CubeMX_Config.ioc @@ -53,26 +53,26 @@ Mcu.Pin12=PA2 Mcu.Pin13=PA3 Mcu.Pin14=PA4 Mcu.Pin15=PA7 -Mcu.Pin16=PB1 -Mcu.Pin17=PE7 -Mcu.Pin18=PE8 -Mcu.Pin19=PE9 +Mcu.Pin16=PE7 +Mcu.Pin17=PE8 +Mcu.Pin18=PE9 +Mcu.Pin19=PE10 Mcu.Pin2=PF4 -Mcu.Pin20=PE10 -Mcu.Pin21=PE11 -Mcu.Pin22=PE13 -Mcu.Pin23=PB10 -Mcu.Pin24=PB11 -Mcu.Pin25=PB13 -Mcu.Pin26=PD8 -Mcu.Pin27=PD9 -Mcu.Pin28=PD12 -Mcu.Pin29=PD13 +Mcu.Pin20=PE11 +Mcu.Pin21=PE13 +Mcu.Pin22=PB10 +Mcu.Pin23=PB11 +Mcu.Pin24=PB13 +Mcu.Pin25=PD8 +Mcu.Pin26=PD9 +Mcu.Pin27=PD12 +Mcu.Pin28=PD13 +Mcu.Pin29=PD14 Mcu.Pin3=PF5 -Mcu.Pin30=PD14 -Mcu.Pin31=PD15 -Mcu.Pin32=PC8 -Mcu.Pin33=PC9 +Mcu.Pin30=PD15 +Mcu.Pin31=PC8 +Mcu.Pin32=PC9 +Mcu.Pin33=PA8 Mcu.Pin34=PA9 Mcu.Pin35=PA10 Mcu.Pin36=PA11 @@ -93,20 +93,21 @@ Mcu.Pin49=PG11 Mcu.Pin5=PF7 Mcu.Pin50=PG13 Mcu.Pin51=PG14 -Mcu.Pin52=VP_IWDG_VS_IWDG -Mcu.Pin53=VP_RTC_VS_RTC_Activate -Mcu.Pin54=VP_SYS_VS_Systick -Mcu.Pin55=VP_TIM1_VS_ClockSourceINT -Mcu.Pin56=VP_TIM2_VS_ClockSourceINT -Mcu.Pin57=VP_TIM3_VS_ClockSourceINT -Mcu.Pin58=VP_TIM11_VS_ClockSourceINT -Mcu.Pin59=VP_TIM13_VS_ClockSourceINT +Mcu.Pin52=PB7 +Mcu.Pin53=VP_IWDG_VS_IWDG +Mcu.Pin54=VP_RTC_VS_RTC_Activate +Mcu.Pin55=VP_SYS_VS_Systick +Mcu.Pin56=VP_TIM1_VS_ClockSourceINT +Mcu.Pin57=VP_TIM2_VS_ClockSourceINT +Mcu.Pin58=VP_TIM3_VS_ClockSourceINT +Mcu.Pin59=VP_TIM11_VS_ClockSourceINT Mcu.Pin6=PF9 -Mcu.Pin60=VP_TIM14_VS_ClockSourceINT +Mcu.Pin60=VP_TIM13_VS_ClockSourceINT +Mcu.Pin61=VP_TIM14_VS_ClockSourceINT Mcu.Pin7=PH0-OSC_IN Mcu.Pin8=PH1-OSC_OUT Mcu.Pin9=PC2 -Mcu.PinsNb=61 +Mcu.PinsNb=62 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F407ZGTx @@ -146,15 +147,20 @@ PA3.Mode=Asynchronous PA3.Signal=USART2_RX PA4.Signal=COMP_DAC1_group PA7.Signal=S_TIM3_CH2 +PA8.GPIOParameters=GPIO_Label +PA8.GPIO_Label=FAN1 +PA8.Locked=true +PA8.Signal=GPIO_Output PA9.GPIOParameters=GPIO_PuPd PA9.GPIO_PuPd=GPIO_PULLUP PA9.Mode=Asynchronous PA9.Signal=USART1_TX -PB1.Signal=S_TIM3_CH4 PB10.Signal=S_TIM2_CH3 PB11.Signal=S_TIM2_CH4 PB13.Mode=Full_Duplex_Master PB13.Signal=SPI2_SCK +PB7.Locked=true +PB7.Signal=S_TIM4_CH2 PC10.Mode=SD_4_bits_Wide_bus PC10.Signal=SDIO_D2 PC11.Mode=SD_4_bits_Wide_bus @@ -323,10 +329,10 @@ SH.S_TIM2_CH4.0=TIM2_CH4,PWM Generation4 CH4 SH.S_TIM2_CH4.ConfNb=1 SH.S_TIM3_CH2.0=TIM3_CH2,PWM Generation2 CH2 SH.S_TIM3_CH2.ConfNb=1 -SH.S_TIM3_CH4.0=TIM3_CH4,PWM Generation4 CH4 -SH.S_TIM3_CH4.ConfNb=1 SH.S_TIM4_CH1.0=TIM4_CH1,PWM Generation1 CH1 SH.S_TIM4_CH1.ConfNb=1 +SH.S_TIM4_CH2.0=TIM4_CH2,PWM Generation2 CH2 +SH.S_TIM4_CH2.ConfNb=1 SPI2.CalculateBaudRate=21.0 MBits/s SPI2.Direction=SPI_DIRECTION_2LINES SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate @@ -341,17 +347,17 @@ TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3 TIM2.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 TIM2.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4 TIM3.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2 -TIM3.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 -TIM3.IPParameters=Channel-PWM Generation4 CH4,Channel-PWM Generation2 CH2,Pulse-PWM Generation2 CH2,Period +TIM3.IPParameters=Channel-PWM Generation2 CH2,Pulse-PWM Generation2 CH2,Period TIM3.Period=210 TIM3.Pulse-PWM\ Generation2\ CH2=0 TIM4.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1 -TIM4.IPParameters=Channel-PWM Generation1 CH1 +TIM4.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2 +TIM4.IPParameters=Channel-PWM Generation1 CH1,Channel-PWM Generation2 CH2 USART1.IPParameters=VirtualMode USART1.VirtualMode=VM_ASYNC USART2.IPParameters=VirtualMode USART2.VirtualMode=VM_ASYNC -USART3.BaudRate=9600 +USART3.BaudRate=115200 USART3.IPParameters=VirtualMode,BaudRate USART3.VirtualMode=VM_ASYNC USB_OTG_FS.IPParameters=VirtualMode diff --git a/board/CubeMX_Config/Inc/main.h b/board/CubeMX_Config/Inc/main.h index 0242e30..fd26fd8 100644 --- a/board/CubeMX_Config/Inc/main.h +++ b/board/CubeMX_Config/Inc/main.h @@ -73,13 +73,15 @@ extern "C" { void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); /* Exported functions prototypes ---------------------------------------------*/ -// void Error_Handler(void); +void Error_Handler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ /* Private defines -----------------------------------------------------------*/ +#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 6c1628d..8222e24 100644 --- a/board/CubeMX_Config/Src/main.c +++ b/board/CubeMX_Config/Src/main.c @@ -690,10 +690,6 @@ static void MX_TIM3_Init(void) { Error_Handler(); } - if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_4) != HAL_OK) - { - Error_Handler(); - } /* USER CODE BEGIN TIM3_Init 2 */ /* USER CODE END TIM3_Init 2 */ @@ -743,6 +739,10 @@ static void MX_TIM4_Init(void) { Error_Handler(); } + if (HAL_TIM_PWM_ConfigChannel(&htim4, &sConfigOC, TIM_CHANNEL_2) != HAL_OK) + { + Error_Handler(); + } /* USER CODE BEGIN TIM4_Init 2 */ /* USER CODE END TIM4_Init 2 */ @@ -940,7 +940,7 @@ static void MX_USART3_UART_Init(void) /* USER CODE END USART3_Init 1 */ huart3.Instance = USART3; - huart3.Init.BaudRate = 9600; + huart3.Init.BaudRate = 115200; huart3.Init.WordLength = UART_WORDLENGTH_8B; huart3.Init.StopBits = UART_STOPBITS_1; huart3.Init.Parity = UART_PARITY_NONE; @@ -1008,11 +1008,21 @@ static void MX_GPIO_Init(void) __HAL_RCC_GPIOF_CLK_ENABLE(); __HAL_RCC_GPIOH_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE(); - __HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOE_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); __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; @@ -1086,16 +1096,16 @@ static void MX_FSMC_Init(void) * @brief This function is executed in case of error occurrence. * @retval None */ -// void Error_Handler(void) -// { -// /* USER CODE BEGIN Error_Handler_Debug */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ // // /* User can add his own implementation to report the HAL error return state */ // // __disable_irq(); // // while (1) // // { // // } -// /* USER CODE END Error_Handler_Debug */ -// } + /* USER CODE END Error_Handler_Debug */ +} #ifdef USE_FULL_ASSERT /** diff --git a/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c b/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c index c3fc2ca..9cdd28c 100644 --- a/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c +++ b/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c @@ -641,10 +641,8 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) /* USER CODE END TIM3_MspPostInit 0 */ __HAL_RCC_GPIOA_CLK_ENABLE(); - __HAL_RCC_GPIOB_CLK_ENABLE(); /**TIM3 GPIO Configuration PA7 ------> TIM3_CH2 - PB1 ------> TIM3_CH4 */ GPIO_InitStruct.Pin = GPIO_PIN_7; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -653,13 +651,6 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) GPIO_InitStruct.Alternate = GPIO_AF2_TIM3; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); - GPIO_InitStruct.Pin = GPIO_PIN_1; - GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - GPIO_InitStruct.Alternate = GPIO_AF2_TIM3; - HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - /* USER CODE BEGIN TIM3_MspPostInit 1 */ /* USER CODE END TIM3_MspPostInit 1 */ @@ -671,8 +662,10 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) /* USER CODE END TIM4_MspPostInit 0 */ __HAL_RCC_GPIOD_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); /**TIM4 GPIO Configuration PD12 ------> TIM4_CH1 + PB7 ------> TIM4_CH2 */ GPIO_InitStruct.Pin = GPIO_PIN_12; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -681,6 +674,13 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + GPIO_InitStruct.Pin = GPIO_PIN_7; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + /* USER CODE BEGIN TIM4_MspPostInit 1 */ /* USER CODE END TIM4_MspPostInit 1 */ diff --git a/board/Kconfig b/board/Kconfig index 2f026e5..3f18f62 100644 --- a/board/Kconfig +++ b/board/Kconfig @@ -299,6 +299,20 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA default n + config BSP_UART1_TX_BUFSIZE + int "Set UART1 TX buffer size" + range 0 65535 + depends on RT_USING_SERIAL_V2 + default 0 + + config BSP_UART1_RX_BUFSIZE + int "Set UART1 RX buffer size" + range 64 65535 + depends on RT_USING_SERIAL_V2 + default 256 + + + config BSP_USING_UART2 bool "Enable UART2" default n @@ -313,6 +327,18 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART2 && RT_SERIAL_USING_DMA default n + config BSP_UART2_TX_BUFSIZE + int "Set UART2 TX buffer size" + range 0 65535 + depends on RT_USING_SERIAL_V2 + default 0 + + config BSP_UART2_RX_BUFSIZE + int "Set UART2 RX buffer size" + range 64 65535 + depends on RT_USING_SERIAL_V2 + default 256 + config BSP_USING_UART3 bool "Enable UART3" default n @@ -327,6 +353,18 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART3 && RT_SERIAL_USING_DMA default n + config BSP_UART3_TX_BUFSIZE + int "Set UART3 TX buffer size" + range 0 65535 + depends on RT_USING_SERIAL_V2 + default 0 + + config BSP_UART3_RX_BUFSIZE + int "Set UART3 RX buffer size" + range 64 65535 + depends on RT_USING_SERIAL_V2 + default 256 + config BSP_USING_UART4 bool "Enable UART4" default n @@ -340,6 +378,19 @@ menu "On-chip Peripheral Drivers" bool "Enable UART4 TX DMA" depends on BSP_USING_UART4 && RT_SERIAL_USING_DMA default n + + config BSP_UART4_TX_BUFSIZE + int "Set UART4 TX buffer size" + range 0 65535 + depends on RT_USING_SERIAL_V2 + default 0 + + config BSP_UART4_RX_BUFSIZE + int "Set UART4 RX buffer size" + range 64 65535 + depends on RT_USING_SERIAL_V2 + default 256 + config BSP_USING_UART5 bool "Enable UART5" @@ -355,6 +406,18 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART5 && RT_SERIAL_USING_DMA default n + config BSP_UART5_TX_BUFSIZE + int "Set UART5 TX buffer size" + range 0 65535 + depends on RT_USING_SERIAL_V2 + default 0 + + config BSP_UART5_RX_BUFSIZE + int "Set UART5 RX buffer size" + range 64 65535 + depends on RT_USING_SERIAL_V2 + default 256 + config BSP_USING_UART6 bool "Enable UART6" default n @@ -368,6 +431,19 @@ menu "On-chip Peripheral Drivers" bool "Enable UART6 TX DMA" depends on BSP_USING_UART6 && RT_SERIAL_USING_DMA default n + + config BSP_UART6_TX_BUFSIZE + int "Set UART6 TX buffer size" + range 0 65535 + depends on RT_USING_SERIAL_V2 + default 0 + + config BSP_UART6_RX_BUFSIZE + int "Set UART6 RX buffer size" + range 64 65535 + depends on RT_USING_SERIAL_V2 + default 256 + endif menuconfig BSP_USING_TIM @@ -397,6 +473,9 @@ menu "On-chip Peripheral Drivers" bool "Enable timer1 output PWM" default n if BSP_USING_PWM1 + config BSP_USING_PWM1_CH1 + bool "Enable PWM1 channel1" + default n config BSP_USING_PWM1_CH2 bool "Enable PWM1 channel2" default n diff --git a/my_pro/myinfrared.c b/my_pro/myinfrared.c index 8167aaa..6cd1270 100644 --- a/my_pro/myinfrared.c +++ b/my_pro/myinfrared.c @@ -37,7 +37,7 @@ void snake_compare(rt_uint8_t key, rt_uint8_t repeat) const char *str ="forward\n"; // rt_strncpy(str,"forward\n",10); // *str = ; - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); LOG_I("str=%s",str); } @@ -49,7 +49,7 @@ void snake_compare(rt_uint8_t key, rt_uint8_t repeat) // *str = "left\n"; const char *str = "left\n"; // rt_strncpy(str,"left\n",10); - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); LOG_I("str=%s",str); } @@ -60,7 +60,7 @@ void snake_compare(rt_uint8_t key, rt_uint8_t repeat) rt_atomic_store(&now_direction, 2); const char *str = "back\n"; // rt_strncpy(str,"back\n",10); - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); LOG_I("str=%s",str); } @@ -71,7 +71,7 @@ void snake_compare(rt_uint8_t key, rt_uint8_t repeat) rt_atomic_store(&now_direction, 3); // rt_strncpy(str,"right\n",10); const char *str = "right\n"; - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); LOG_I("str=%s",str); } // 加速 @@ -79,21 +79,21 @@ void snake_compare(rt_uint8_t key, rt_uint8_t repeat) { const char *str = "Speedup"; - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); } // 加速 if (rt_strcmp(tmp, "28") == 0 ) { const char *str = "Speeddown"; - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); } // 加速 if (rt_strcmp(tmp, "A8") == 0 ) { const char *str = "Toggle"; - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); } // 菜单（切换页面） @@ -113,7 +113,7 @@ void snake_compare(rt_uint8_t key, rt_uint8_t repeat) const char *str = "OK\n"; // rt_strncpy(str,"OK\n",10); LOG_I("str=%s",str); - rt_device_write(serial, 0, str, rt_strlen(str)); + //rt_device_write(serial, 0, str, rt_strlen(str)); if (page_chosen == 4&& page_stop == 0) { // rt_event_send(&my_event, EVENT_MQTT_ENABLE); diff --git a/my_pro/myproject.c b/my_pro/myproject.c index 6521571..6224d92 100644 --- a/my_pro/myproject.c +++ b/my_pro/myproject.c @@ -456,20 +456,20 @@ void wlan_connect_thread(void *parameter) static void serial_thread_entry(void *parameter) { - serial = RT_NULL; - char buf[] = "hello rt-thread!\r\n"; - serial = rt_device_find("uart3"); + // serial = RT_NULL; + // char buf[] = "hello rt-thread!\r\n"; + // serial = rt_device_find("uart3"); - if (serial) - rt_device_open(serial, RT_DEVICE_FLAG_RDWR); - else - return; + // if (serial) + // rt_device_open(serial, RT_DEVICE_FLAG_RDWR); + // else + // return; - while (1) - { - rt_device_write(serial, 0, buf, rt_strlen(buf)); - rt_thread_mdelay(500); - } + // while (1) + // { + // rt_device_write(serial, 0, buf, rt_strlen(buf)); + // rt_thread_mdelay(500); + // } // char ch[105]; // while (1) @@ -647,6 +647,8 @@ MSH_CMD_EXPORT_ALIAS(tst_init, no_mqtt, "Infrared"); // rt_kprintf("Create Event Failed!\n"); // } // } +extern int aiv_init(void); +extern int mot_init(void); void my_project(void) { // /* 选择 NEC 解码器 */ @@ -654,6 +656,8 @@ void my_project(void) // evn_init(); + + ath_init(); wla_init(); @@ -673,6 +677,11 @@ void my_project(void) tst_init(); // 不知道为什么不能在mqtt_init()之前，不然报错 serial_init(); + + mot_init(); + + aiv_init(); + led_init(); } diff --git a/rtconfig.h b/rtconfig.h index 1c8756c..4b494bf 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -192,9 +192,8 @@ #define RT_SYSTEM_WORKQUEUE_STACKSIZE 2048 #define RT_SYSTEM_WORKQUEUE_PRIORITY 23 #define RT_USING_SERIAL -#define RT_USING_SERIAL_V1 +#define RT_USING_SERIAL_V2 #define RT_SERIAL_USING_DMA -#define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_I2C #define RT_USING_I2C_BITOPS #define RT_USING_ADC @@ -716,9 +715,23 @@ #define BSP_USING_GPIO #define BSP_USING_UART #define BSP_USING_UART1 +#define BSP_UART1_TX_BUFSIZE 0 +#define BSP_UART1_RX_BUFSIZE 256 #define BSP_USING_UART2 +#define BSP_UART2_TX_BUFSIZE 0 +#define BSP_UART2_RX_BUFSIZE 256 #define BSP_USING_UART3 +#define BSP_UART3_RX_USING_DMA +#define BSP_UART3_TX_USING_DMA +#define BSP_UART3_TX_BUFSIZE 0 +#define BSP_UART3_RX_BUFSIZE 256 +#define BSP_UART4_TX_BUFSIZE 0 +#define BSP_UART4_RX_BUFSIZE 256 +#define BSP_UART5_TX_BUFSIZE 0 +#define BSP_UART5_RX_BUFSIZE 256 #define BSP_USING_UART6 +#define BSP_UART6_TX_BUFSIZE 0 +#define BSP_UART6_RX_BUFSIZE 256 #define BSP_USING_TIM #define BSP_USING_TIM11 #define BSP_USING_TIM13