zhunk 1 gadu atpakaļ
vecāks
revīzija
5a30eaa960
34 mainītis faili ar 724 papildinājumiem un 492 dzēšanām
  1. 95 2
      Application_cbd_apm32f1/.config
  2. 95 2
      Application_cbd_apm32f1/.config.old
  3. 254 252
      Application_cbd_apm32f1/.cproject
  4. 22 21
      Application_cbd_apm32f1/.project
  5. BIN
      Application_cbd_apm32f1/.settings/.rtmenus
  6. 1 1
      Application_cbd_apm32f1/.settings/language.settings.xml
  7. 7 4
      Application_cbd_apm32f1/applications/control.c
  8. 3 1
      Application_cbd_apm32f1/applications/control.h
  9. 73 154
      Application_cbd_apm32f1/applications/dtu_uart2.c
  10. 21 4
      Application_cbd_apm32f1/applications/hmi.c
  11. 1 1
      Application_cbd_apm32f1/applications/sht30_collect.c
  12. 2 2
      Application_cbd_apm32f1/cconfig.h
  13. 1 1
      Application_cbd_apm32f1/drivers/drv_clk.c
  14. 1 1
      Application_cbd_apm32f1/drivers/drv_usartX.c
  15. 1 1
      Application_cbd_apm32f1/drivers/include/serialX.h
  16. 32 1
      Application_cbd_apm32f1/packages/freemodbus-latest/port/portserial_m.c
  17. 12 0
      Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c
  18. 6 0
      Application_cbd_apm32f1/readme.md
  19. 33 1
      Application_cbd_apm32f1/rt-thread/components/drivers/Kconfig
  20. 2 2
      Application_cbd_apm32f1/rt-thread/components/drivers/include/drivers/serialX.h
  21. 3 0
      Application_cbd_apm32f1/rt-thread/components/drivers/serial/SConscript
  22. 6 5
      Application_cbd_apm32f1/rt-thread/include/rtdef.h
  23. 1 1
      Application_cbd_apm32f1/rt-thread/include/rtthread.h
  24. 34 34
      Application_cbd_apm32f1/rt-thread/src/device.c
  25. BIN
      Application_cbd_apm32f1/rt-thread/tools/building.pyc
  26. BIN
      Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc
  27. BIN
      Application_cbd_apm32f1/rt-thread/tools/gcc.pyc
  28. BIN
      Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc
  29. BIN
      Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc
  30. BIN
      Application_cbd_apm32f1/rt-thread/tools/options.pyc
  31. BIN
      Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc
  32. BIN
      Application_cbd_apm32f1/rt-thread/tools/utils.pyc
  33. 18 1
      Application_cbd_apm32f1/rtconfig.h
  34. BIN
      Application_cbd_apm32f1/rtconfig.pyc

+ 95 - 2
Application_cbd_apm32f1/.config

@@ -80,7 +80,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
-CONFIG_RT_CONSOLEBUF_SIZE=256
+CONFIG_RT_CONSOLEBUF_SIZE=1024
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 # end of Kernel Device Object
 
@@ -99,7 +99,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y
 CONFIG_RT_USING_USER_MAIN=y
 CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
 CONFIG_RT_MAIN_THREAD_PRIORITY=10
-# CONFIG_RT_USING_LEGACY is not set
+CONFIG_RT_USING_LEGACY=y
 CONFIG_RT_USING_MSH=y
 CONFIG_RT_USING_FINSH=y
 CONFIG_FINSH_USING_MSH=y
@@ -131,6 +131,7 @@ CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_USING_SERIAL=y
 # CONFIG_RT_USING_SERIAL_V1 is not set
 CONFIG_RT_USING_SERIAL_V2=y
+# CONFIG_RT_USING_SERIAL_X is not set
 CONFIG_RT_SERIAL_USING_DMA=y
 # CONFIG_RT_USING_CAN is not set
 CONFIG_RT_USING_HWTIMER=y
@@ -687,12 +688,44 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # STM32 HAL & SDK Drivers
 #
+# CONFIG_PKG_USING_STM32F0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32WB55_SDK is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
+# CONFIG_PKG_USING_STM32WL_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WL_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_CMSIS_DRIVER is not set
 # end of STM32 HAL & SDK Drivers
 
 #
@@ -725,6 +758,59 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 # CONFIG_PKG_USING_MM32 is not set
+
+#
+# WCH HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_CH32V20x_SDK is not set
+# CONFIG_PKG_USING_CH32V307_SDK is not set
+# end of WCH HAL & SDK Drivers
+
+#
+# AT32 HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_AT32A403A_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A403A_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_CMSIS_DRIVER is not set
+# end of AT32 HAL & SDK Drivers
+
+#
+# HC32 DDL Drivers
+#
+# end of HC32 DDL Drivers
+
+#
+# NXP HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_NXP_MCX_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NXP_MCX_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC55S_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6SX_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
+# end of NXP HAL & SDK Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -762,6 +848,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_BMI088 is not set
 # CONFIG_PKG_USING_HMC5883 is not set
 # CONFIG_PKG_USING_MAX6675 is not set
+# CONFIG_PKG_USING_MAX31855 is not set
 # CONFIG_PKG_USING_TMP1075 is not set
 # CONFIG_PKG_USING_SR04 is not set
 # CONFIG_PKG_USING_CCS811 is not set
@@ -797,6 +884,8 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_STHS34PF80 is not set
+# CONFIG_PKG_USING_P3T1755 is not set
+# CONFIG_PKG_USING_QMI8658 is not set
 # end of sensors drivers
 
 #
@@ -891,6 +980,9 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_BT_MX02 is not set
 # CONFIG_PKG_USING_GC9A01 is not set
 # CONFIG_PKG_USING_IK485 is not set
+# CONFIG_PKG_USING_SERVO is not set
+# CONFIG_PKG_USING_SEAN_WS2812B is not set
+# CONFIG_PKG_USING_IC74HC165 is not set
 # end of peripheral libraries and drivers
 
 #
@@ -990,6 +1082,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SOEM is not set
 # CONFIG_PKG_USING_QPARAM is not set
 # CONFIG_PKG_USING_CorevMCU_CLI is not set
+# CONFIG_PKG_USING_DRMP is not set
 # end of miscellaneous packages
 
 #

+ 95 - 2
Application_cbd_apm32f1/.config.old

@@ -99,7 +99,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y
 CONFIG_RT_USING_USER_MAIN=y
 CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
 CONFIG_RT_MAIN_THREAD_PRIORITY=10
-# CONFIG_RT_USING_LEGACY is not set
+CONFIG_RT_USING_LEGACY=y
 CONFIG_RT_USING_MSH=y
 CONFIG_RT_USING_FINSH=y
 CONFIG_FINSH_USING_MSH=y
@@ -131,9 +131,10 @@ CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_USING_SERIAL=y
 # CONFIG_RT_USING_SERIAL_V1 is not set
 CONFIG_RT_USING_SERIAL_V2=y
+# CONFIG_RT_USING_SERIAL_X is not set
 CONFIG_RT_SERIAL_USING_DMA=y
 # CONFIG_RT_USING_CAN is not set
-# CONFIG_RT_USING_HWTIMER is not set
+CONFIG_RT_USING_HWTIMER=y
 # CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set
@@ -687,12 +688,44 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # STM32 HAL & SDK Drivers
 #
+# CONFIG_PKG_USING_STM32F0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32WB55_SDK is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
+# CONFIG_PKG_USING_STM32WL_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WL_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_CMSIS_DRIVER is not set
 # end of STM32 HAL & SDK Drivers
 
 #
@@ -725,6 +758,59 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 # CONFIG_PKG_USING_MM32 is not set
+
+#
+# WCH HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_CH32V20x_SDK is not set
+# CONFIG_PKG_USING_CH32V307_SDK is not set
+# end of WCH HAL & SDK Drivers
+
+#
+# AT32 HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_AT32A403A_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A403A_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_CMSIS_DRIVER is not set
+# end of AT32 HAL & SDK Drivers
+
+#
+# HC32 DDL Drivers
+#
+# end of HC32 DDL Drivers
+
+#
+# NXP HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_NXP_MCX_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NXP_MCX_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC55S_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6SX_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
+# end of NXP HAL & SDK Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -762,6 +848,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_BMI088 is not set
 # CONFIG_PKG_USING_HMC5883 is not set
 # CONFIG_PKG_USING_MAX6675 is not set
+# CONFIG_PKG_USING_MAX31855 is not set
 # CONFIG_PKG_USING_TMP1075 is not set
 # CONFIG_PKG_USING_SR04 is not set
 # CONFIG_PKG_USING_CCS811 is not set
@@ -797,6 +884,8 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_STHS34PF80 is not set
+# CONFIG_PKG_USING_P3T1755 is not set
+# CONFIG_PKG_USING_QMI8658 is not set
 # end of sensors drivers
 
 #
@@ -891,6 +980,9 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_BT_MX02 is not set
 # CONFIG_PKG_USING_GC9A01 is not set
 # CONFIG_PKG_USING_IK485 is not set
+# CONFIG_PKG_USING_SERVO is not set
+# CONFIG_PKG_USING_SEAN_WS2812B is not set
+# CONFIG_PKG_USING_IC74HC165 is not set
 # end of peripheral libraries and drivers
 
 #
@@ -990,6 +1082,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SOEM is not set
 # CONFIG_PKG_USING_QPARAM is not set
 # CONFIG_PKG_USING_CorevMCU_CLI is not set
+# CONFIG_PKG_USING_DRMP is not set
 # end of miscellaneous packages
 
 #

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 254 - 252
Application_cbd_apm32f1/.cproject


+ 22 - 21
Application_cbd_apm32f1/.project

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Application_cbd_apm32f1</name>
-	<comment></comment>
-	<projects>
+  <name>Application_cbd_apm32f1</name>
+  <comment />
+  <projects>
 	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+      <triggers>clean,full,incremental,</triggers>
+      <arguments>
 			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+      <triggers>full,incremental,</triggers>
+      <arguments>
 			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.rt-thread.studio.rttnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.cdt.core.cnature</nature>
+    <nature>org.rt-thread.studio.rttnature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+  </natures>
+  <linkedResources />
 </projectDescription>

BIN
Application_cbd_apm32f1/.settings/.rtmenus


+ 1 - 1
Application_cbd_apm32f1/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-434655907455513827" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-406456977695124745" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 7 - 4
Application_cbd_apm32f1/applications/control.c

@@ -1603,17 +1603,20 @@ void WorkCheck(void)
         if(device_status.timeSwitch == 1) // 时控模式
         {
             LOG_I("***********时控*****************");
+            time_t now;
+            time(&now);
+            struct tm now_tm = *localtime(&now);
             if(device_status.startBar == device_status.stopBar)
             {
                 // 开始结束时间相同则24小时模式
                 device_status.work_status = 1;
                 rt_thread_delay(10000);
+                LOG_I("时控模式:状态[%s] 当前时间:%02d:%02d:%02d 设置:%02d:00-%02d:00",
+                      device_status.work_status ? "工作" : "待机",
+                      now_tm.tm_hour, now_tm.tm_min, now_tm.tm_sec,
+                      device_status.startBar, device_status.stopBar);
                 continue;
             }
-
-            time_t now;
-            time(&now);
-            struct tm now_tm = *localtime(&now);
             rt_uint32_t curr_sec = now_tm.tm_hour*3600 + now_tm.tm_min*60 + now_tm.tm_sec;
             rt_uint32_t start_sec = device_status.startBar * 3600;
             rt_uint32_t end_sec = device_status.stopBar * 3600;

+ 3 - 1
Application_cbd_apm32f1/applications/control.h

@@ -21,6 +21,8 @@
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
 #define MATCH_DEVICE     0             //比赛设备
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
+#define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
+
 
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    800
@@ -33,7 +35,7 @@
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "2.19.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.20.4(2000W)"         //4.0水稻
 #endif
 
 #define VERSION_ZP          "1.45.1(ZP)"            //1.0转盘

+ 73 - 154
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -54,15 +54,23 @@ rt_thread_t dtu_send_data = RT_NULL;
 
 
 rt_device_t dtuserial;   /*串口设备句柄*/
-struct  serial_configure dtuconfig = RT_SERIAL_CONFIG_DEFAULT;  /*初始化配置参数*/
 
 static uint8_t makejson_sta = 0;
 
 extern eMBMasterReqErrCode _485_play(USHORT *Buffer,USHORT NREGS);
 
+
 static int DTU_uart2_init(void)
 {
+        struct serial_configure dtuconfig = RT_SERIAL_CONFIG_DEFAULT;
         dtuserial  = rt_device_find(DTU_UART_NAME);
+        if(dtuserial==RT_NULL)
+        {
+            LOG_E("Find Device:%s Failed!",DTU_UART_NAME);
+            return -1;
+        }
+        rt_device_close(dtuserial);
+#ifdef  RT_USING_SERIAL_V2
         /*修改串口配置参数*/
         dtuconfig.baud_rate = BAUD_RATE_115200;  //修改波特率9600
         dtuconfig.data_bits = DATA_BITS_8;     //数据位8c
@@ -73,21 +81,45 @@ static int DTU_uart2_init(void)
         #else
         dtuconfig.bufsz = 1024;                 //缓冲区1k
         #endif
+
         dtuconfig.parity = PARITY_NONE;        //奇校验
+#endif
+        #ifdef RT_USING_SERIAL_X
+        rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
+        #else
         /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
         rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
+        #endif
+
         /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
+        #ifdef RT_USING_SERIAL_X
+        if (rt_device_open(dtuserial, RT_DEVICE_OFLAG_RDWR
+    #ifdef RT_SERIAL_USING_DMA
+                               | RT_DEVICE_FLAG_DMA_RX
+                               | RT_DEVICE_FLAG_DMA_TX
+    #else
+                               | RT_DEVICE_FLAG_INT_RX
+                               | RT_DEVICE_FLAG_INT_TX
+    #endif
+                            ) != RT_EOK)
+        {
+            LOG_E("Open device: %s failed\n", DTU_UART_NAME);
+            return -1;
+        }
+#endif
         #ifdef RT_USING_SERIAL_V2
         rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_NON_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
-        #else
-        rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);  //RT_DEVICE_FLAG_DMA_RX
-        #endif
         if(uart_res!=RT_EOK)
         {
             LOG_E("%s打开失败!",DTU_UART_NAME);
         }else{
             LOG_I("%s Open Success!",DTU_UART_NAME);
         }
+        #endif
+        #ifdef RT_USING_SERIAL_V1
+        rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);  //RT_DEVICE_FLAG_DMA_RX
+        #endif
+
         return RT_EOK;
 }
 
@@ -128,151 +160,30 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
         if ( result == -RT_EFULL)
         {
             /* 消息队列满 */
-            rt_kprintf("message queue full!\n");
+            LOG_E("message queue full!\n");
             rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
         }
         return result;
 }
 
-// 最大JSON缓冲区长度(建议根据设备内存调整)
-#define MAX_JSON_BUFFER 1024
-// 最大超时时间(单位:RT_TICK_PER_SECOND)
-#define JSON_PARSE_TIMEOUT 2
-
-// 全局缓冲区结构体
-static struct {
-    char buffer[MAX_JSON_BUFFER]; // 数据存储区
-    int index;                   // 当前写入位置
-    rt_tick_t last_received;     // 最后接收时间戳
-    int nested_level;            // 当前嵌套层数
-} json_ctx = {.index = 0, .last_received = 0, .nested_level = 0};
-
-
-// 自定义异常类型
-typedef enum {
-    JSON_OK,
-    JSON_INCOMPLETE,
-    JSON_INVALID_CHAR,
-    JSON_TOO_DEEP,
-    JSON_TOO_LONG
-} json_status_t;
-
-// 查找完整JSON边界(支持嵌套)
-static json_status_t find_json_boundary(int *start, int *end)
-{
-    *start = -1;
-    *end = -1;
-    int level = 0;
-
-    for (int i = 0; i < json_ctx.index; i++) {
-        if (json_ctx.buffer[i] == '{') {
-            if (level == 0) *start = i;
-            level++;
-            if (level > 32) return JSON_TOO_DEEP;
-        } else if (json_ctx.buffer[i] == '}') {
-            level--;
-            if (level < 0) return JSON_INVALID_CHAR;
-            if (level == 0 && *start != -1) {
-                *end = i;
-                return JSON_OK;
-            }
-        }
-    }
-
-    if (*start != -1) return JSON_INCOMPLETE;
-    return JSON_OK;
-}
-// 处理缓冲区超时
-static void check_timeout_reset(void)
-{
-    if (rt_tick_get() - json_ctx.last_received > JSON_PARSE_TIMEOUT * RT_TICK_PER_SECOND) {
-        rt_memset(json_ctx.buffer, 0, MAX_JSON_BUFFER);
-        json_ctx.index = 0;
-        json_ctx.nested_level = 0;
-        rt_kprintf("[JSON] Timeout reset\n");
-    }
-}
-#define RT_MIN(a, b) ((a) < (b) ? (a) : (b))
-// 核心处理函数
-void process_uart_data(const char *data, int length)
-{
-    // 有效性检查
-    if (data == NULL || length <= 0) return;
-    json_ctx.last_received = rt_tick_get();
-
-    // 缓冲区溢出保护
-    int remain_space = MAX_JSON_BUFFER - json_ctx.index - 1;
-    if (remain_space < length) {
-        rt_kprintf("[JSON] Buffer overflow (%d/%d)\n",
-                  json_ctx.index + length, MAX_JSON_BUFFER);
-        json_ctx.index = 0; // 清空缓冲区重新开始
-        return;
-    }
-
-    // 追加新数据
-    rt_memcpy(json_ctx.buffer + json_ctx.index, data, length);
-    json_ctx.index += length;
-    json_ctx.buffer[json_ctx.index] = '\0';
-
-    // 循环处理所有完整报文
-    while (1) {
-        int start_pos, end_pos;
-        json_status_t status = find_json_boundary(&start_pos, &end_pos);
-
-        switch (status) {
-        case JSON_OK:
-            if (start_pos != -1 && end_pos != -1) {
-                // 提取有效JSON内容
-                char json_str[512] = {0};
-                int json_len = end_pos - start_pos + 1;
-                rt_strncpy(json_str, json_ctx.buffer + start_pos,
-                          RT_MIN(sizeof(json_str)-1, json_len));
-
-                // 调用解析函数
-                if (parseDtu(json_str) == RT_EOK) {
-                    rt_kprintf("[JSON] Parsed: %.*s\n", json_len, json_str);
-                }
-
-                // 移动缓冲区剩余内容
-                int remain_data = json_ctx.index - (end_pos + 1);
-                if (remain_data > 0) {
-                    rt_memmove(json_ctx.buffer,
-                              json_ctx.buffer + end_pos + 1,
-                              remain_data);
-                }
-                json_ctx.index = remain_data;
-                json_ctx.buffer[json_ctx.index] = '\0';
-            } else {
-                return; // 无更多完整报文
-            }
-            break;
-
-        case JSON_INCOMPLETE:
-            return; // 等待更多数据
-
-        default:
-            rt_kprintf("[JSON] Error %d at pos %d\n", status, start_pos);
-            // 错误恢复:跳过错误数据
-            json_ctx.index = 0;
-            return;
-        }
-    }
-}
-
-
-
-
 /* 入口函数-指令接收*/
 static void dtu_thread_entry_recv(void *parameter)
 {
     struct rx_msg msg;
     rt_memset(&msg, 0, sizeof(msg));
-    static int rx_err = 0;
+
+    rt_err_t result;
+    rt_uint32_t rx_length;
+    rt_uint32_t rx_err = 0;
+    static char str_check[2]={'{','}'};
+    static char rx_buffer[512];
+    static char rx_buffer_tmp[512];
+    static char rx_buffer_tmp2[512];
     while(1)
     {
-        //
+        result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 50);
+        #if 0
         // 从消息队列中获取被回调函数放入消息队列中的内容
-        int result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 50);
         if (result != RT_EOK){
             rx_err ++;
             if(rx_err==15){
@@ -322,7 +233,8 @@ static void dtu_thread_entry_recv(void *parameter)
         }
         process_uart_data(rx_buffer, rx_length);
         rt_free(rx_buffer);
-        #if 0
+        #endif
+        #if 1
         if(result == RT_EOK)
         {
 
@@ -334,17 +246,11 @@ static void dtu_thread_entry_recv(void *parameter)
             LOG_D("recv data:%s",rx_buffer);
             if(strstr(rx_buffer,"{")==RT_NULL||strstr(rx_buffer,"}")==RT_NULL)
             {
-                if(device_status.dtype==7)
-                {
-                    HMI_WRITE("sysTest.result.txt=\"%s\"",rx_buffer);
-                }
-
                 if(device_status.dtype==3)
                 {
                     HMI_WRITE("sysSet.va0.txt=\"%s\"",rx_buffer);
                     rt_timer_stop(timer_uart2);
                 }
-
             }
 
             //过滤异常数据
@@ -372,16 +278,26 @@ static void dtu_thread_entry_recv(void *parameter)
                        rt_memset(rx_buffer_tmp,0,sizeof(rx_buffer_tmp));
                        rt_memset(rx_buffer_tmp2,0,sizeof(rx_buffer_tmp2));
                    }
-
                  }
-            #endif
+
          }
-//         else {
-//
-//
-//    }
+        else {
+               rx_err ++;
+               if(rx_err==54000)//90分钟未接收到数据
+               {
+                    ctr_RTU_DTU(OFF);
+               }
+               else if (rx_err>54100&&device_status.bat_status==0)
+               {
+                   LOG_W("通信中断,RTU重新上电");
+                   rx_err = 0;
+                   ctr_RTU_DTU(ON);
+                   ctr_photo(ON);
+               }
+         }
+   }
+        #endif
 }
-
 // 解析时间戳并返回一个tm结构体
 struct tm* parseTimestamp(const char *timestamp) {
     if (strlen(timestamp) != 14) {
@@ -459,7 +375,7 @@ static void dtu_thread_entry_send(void *parameter)
         static struct tm now_tm;   //现在
         //获取当前时间戳
         now_tm =*localtime(&now_t);
-        if(atoi(device_status.net)==0||atoi(device_status.gps)==1||(now_tm.tm_year+1900 >=2024))    //当前时间大于2024
+        if(atoi(device_status.net)==0||atoi(device_status.gps)==1||(now_tm.tm_year+1900 >=2025))    //当前时间大于2024
         {
             if(device_status.rain_status==1||device_status.temp_status==1)
             {
@@ -1361,17 +1277,20 @@ int parseDtu(char *json_string)
     cJSON* link_sta = NULL;
     cJSON* link_ip = NULL;
     cJSON* value_commn= NULL;
-    rt_kprintf("%s\n",json_string);
+
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
     {
         cJSON_Delete(root);
-        rt_kprintf("parse json err:%s",json_string);
+        LOG_E("parse json err:%s",json_string);
         return -1;
     }
     else
     {
-
+          LOG_W("parseData:%s\n",json_string);
+          #if UART_TEST_EN == 1
+          DTU_Write(json_string);
+          #endif
           item_cmd = cJSON_GetObjectItem(root,"cmd");
           cJSON* item_aplay = cJSON_GetObjectItem(root,"aplay");
           item_checkself = cJSON_GetObjectItem(root,"selfcheck");

+ 21 - 4
Application_cbd_apm32f1/applications/hmi.c

@@ -76,6 +76,9 @@ rt_timer_t timer_uart2 = RT_NULL;
 static struct rt_messagequeue rx_mq;//接收数据消息队列
 static void HMI_Decode(void);
 static rt_err_t uart_input(rt_device_t dev, rt_size_t size);
+
+
+#ifdef RT_USING_SERIAL_V2
 static int HMI_uart4_init(void)
 {
     serial  = rt_device_find(UART_NAME);
@@ -109,6 +112,9 @@ static int HMI_uart4_init(void)
 
     return RT_EOK;
 }
+#endif
+
+
 /*串口屏写数据*/
 void HMI_WRITE(char *fmt, ...)
 {
@@ -127,7 +133,7 @@ void HMI_WRITE(char *fmt, ...)
     // 追加三个 0xff
     memcpy(str + str_length, hmi_hex, sizeof(hmi_hex));
     rt_device_write(serial, 0, str, str_length + sizeof(hmi_hex));
-    rt_thread_mdelay(5);    //2025-0308
+    rt_thread_mdelay(50);    //2025-0308
 }
 /* 接收数据回调函数 */
 static rt_err_t uart_input(rt_device_t dev, rt_size_t size)
@@ -162,7 +168,6 @@ static void Hmi_thread_entry(void *parameter)
     device_status.camsta = 1;
     while(1)
     {
-
         rt_memset(&msg, 0, sizeof(msg));
         /* 从消息队列中读取消息*/
         result = rt_mq_recv(&rx_mq, &msg, sizeof(msg), 50);
@@ -2043,6 +2048,18 @@ void Check_ParamConfig(void)
             connect_num++;
             LOG_I("联网中......%d",connect_num);
             //超时时间为3分钟
+            #ifdef MATCH_DEVICE == 1
+            if(connect_num==30) //180
+            {
+                device_status.timeSwitch = 1;
+                LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
+                #if 0
+                set_date(2020, 1, 1);
+                set_time(0, 0, 0);
+                #endif
+                break;
+            }
+            #else
             if(connect_num==180) //180
             {
                 device_status.timeSwitch = 0;
@@ -2053,8 +2070,7 @@ void Check_ParamConfig(void)
                 #endif
                 break;
             }
-            if(tm.tm_year>=2021)
-            break;
+            #endif
         }
         connect_num = 0;
         while(atoi(device_status.net)==0)
@@ -2067,6 +2083,7 @@ void Check_ParamConfig(void)
             if(connect_num>5) break;
         }
         if(device_status.version_type==6) device_status.timeSwitch = 1;
+
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);
         if(device_status.dtype!=7&&device_status.version_type!=30)

+ 1 - 1
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -131,7 +131,7 @@ int UART_485_INIT(void)
     #ifdef RT_USING_SERIAL_V2
     rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
     #else
-    rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_FLAG_INT_RX);;  //RT_DEVICE_FLAG_DMA_RX
+    rt_err_t uart_res = rt_device_open(serial_485, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX);;  //RT_DEVICE_FLAG_DMA_RX
     #endif
     if(uart_res!=RT_EOK)
     {

+ 2 - 2
Application_cbd_apm32f1/cconfig.h

@@ -4,7 +4,7 @@
 /* compiler configure file for RT-Thread in GCC*/
 
 #define HAVE_NEWLIB_H 1
-#define LIBC_VERSION "newlib 2.4.0"
+#define LIBC_VERSION "newlib 2.5.0"
 
 #define HAVE_SYS_SIGNAL_H 1
 #define HAVE_SYS_SELECT_H 1
@@ -12,7 +12,7 @@
 
 #define HAVE_FDSET 1
 #define HAVE_SIGACTION 1
-#define GCC_VERSION_STR "5.4.1 20160919 (release) [ARM/embedded-5-branch revision 240496]"
+#define GCC_VERSION_STR "6.3.1 20170620 (release) [ARM/embedded-6-branch revision 249437]"
 #define STDC "2011"
 
 #endif

+ 1 - 1
Application_cbd_apm32f1/drivers/drv_clk.c

@@ -74,7 +74,7 @@ int clock_information(void)
 
     return RT_EOK;
 }
-INIT_BOARD_EXPORT(clock_information);
+//INIT_BOARD_EXPORT(clock_information);
 
 void clk_init(char *clk_source, int source_freq, int target_freq)
 {

+ 1 - 1
Application_cbd_apm32f1/drivers/drv_usartX.c

@@ -14,7 +14,7 @@
 
 #ifdef RT_USING_SERIAL_X
 
-//#define DRV_DEBUG
+#define DRV_DEBUG
 #define LOG_TAG             "drv.usart"
 #include <drv_log.h>
 

+ 1 - 1
Application_cbd_apm32f1/drivers/include/serialX.h

@@ -55,7 +55,7 @@
 #define NRZ_INVERTED                    1       /* Non Return to Zero : inverted mode */
 
 #ifndef RT_SERIAL_FIFO_BUFSZ
-#define RT_SERIAL_FIFO_BUFSZ            128
+#define RT_SERIAL_FIFO_BUFSZ            512
 #endif
 
 #ifndef RT_SERIAL_DMA_BUFSZ

+ 32 - 1
Application_cbd_apm32f1/packages/freemodbus-latest/port/portserial_m.c

@@ -103,15 +103,46 @@ BOOL xMBMasterPortSerialInit(UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits,
     }
     /* set serial configure */
     serial->ops->configure(serial, &(serial->config));
+#ifdef RT_USING_SERIAL_V2
     serial->config.rx_bufsz = 128;
     serial->config.tx_bufsz = 128;
+
     /* open serial device */
     if (!rt_device_open(&serial->parent, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING)) {
         rt_device_set_rx_indicate(&serial->parent, serial_rx_ind);
     } else {
         return FALSE;
     }
-
+#endif
+#ifdef RT_USING_SERIAL_X
+    if (rt_device_open(serial, RT_DEVICE_OFLAG_RDWR
+#ifdef RT_USING_SERIAL_X
+    #ifdef RT_SERIAL_USING_DMA
+                               | RT_DEVICE_FLAG_DMA_RX
+                               | RT_DEVICE_FLAG_DMA_TX
+    #else
+                               | RT_DEVICE_FLAG_INT_RX
+                               | RT_DEVICE_FLAG_INT_TX
+    #endif
+#elif defined(RT_USING_SERIAL_V2)
+                               | RT_DEVICE_FLAG_RX_BLOCKING
+                               | RT_DEVICE_FLAG_TX_BLOCKING
+#else
+    #ifdef RT_SERIAL_USING_DMA
+                               | RT_DEVICE_FLAG_DMA_RX
+                               | RT_DEVICE_FLAG_DMA_TX
+    #else
+                               | RT_DEVICE_FLAG_INT_RX
+                               | RT_DEVICE_FLAG_INT_TX
+    #endif
+#endif
+                        ) == RT_EOK)
+    {
+        rt_device_set_rx_indicate(&serial->parent, serial_rx_ind);
+    }else {
+        return RT_FALSE;
+    }
+#endif
     /* software initialize */
     rt_event_init(&event_serial, "master event", RT_IPC_FLAG_PRIO);
     rt_thread_init(&thread_serial_soft_trans_irq,

+ 12 - 0
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -374,6 +374,7 @@ static void syswatch_fsm(void)
 
 static void syswatch_thread_entry(void *parameter)
 {
+    static struct tm alarm_new;
     if (syswatch_wdt_startup() != RT_EOK)
     {
         LOG_E("watch dog startup fail");
@@ -387,6 +388,17 @@ static void syswatch_thread_entry(void *parameter)
     
     while(1)
     {
+        #if 1
+        time_t now;
+        time(&now);
+        alarm_new =*localtime(&now);
+        if((alarm_new.tm_hour)==8&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==0))
+        {
+            #if ROBOT_EN == 0
+            rt_hw_cpu_reset();
+            #endif
+        }
+        #endif
         rt_thread_delay(RT_TICK_PER_SECOND);
         syswatch_wdt_feed();
         syswatch_fsm();

+ 6 - 0
Application_cbd_apm32f1/readme.md

@@ -1,4 +1,10 @@
 # 2025-06-05 更新说明
+#define VERSION_HK_2000W    "2.20.4(2000W)"         //4.0水稻
+1. 针对比赛设备的更新:
+	取消断网状态下切换光控定时
+	启用主板定时重启,8:30
+	dtu串口通信改为旧版
+# 2025-06-05 更新说明
 #define VERSION_HK_2000W    "2.19.4(2000W)"         //4.0水稻
 1. DTU_Write 延时由20ms改为100ms;
 2. RT_DEVICE_FLAG_TX_NON_BLOCKING,串口发送改为非阻塞方式

+ 33 - 1
Application_cbd_apm32f1/rt-thread/components/drivers/Kconfig

@@ -25,7 +25,6 @@ menuconfig RT_USING_SERIAL
     select RT_USING_DEVICE_IPC
     select RT_USING_DEVICE
     default y
-
     if RT_USING_SERIAL
         choice
             prompt "Choice Serial version"
@@ -34,6 +33,10 @@ menuconfig RT_USING_SERIAL
                 bool "RT_USING_SERIAL_V1"
             config RT_USING_SERIAL_V2
                 bool "RT_USING_SERIAL_V2"
+            config RT_USING_SERIAL_X
+                bool "RT_USING_SERIAL_X"
+                help
+                    A serial driver that supporting True NonBlock.
         endchoice
         config RT_SERIAL_USING_DMA
             bool "Enable serial DMA mode"
@@ -42,7 +45,36 @@ menuconfig RT_USING_SERIAL
         config RT_SERIAL_RB_BUFSZ
             int "Set RX buffer size"
             depends on !RT_USING_SERIAL_V2
+            depends on RT_USING_SERIAL_V1
             default 64
+
+        if RT_USING_SERIAL_X
+            config RT_SERIAL_FIFO_BUFSZ
+                int "Set SerialX FIFO buffer size"
+                default 128
+                help
+                    suggestion: RT_SERIAL_FIFO_BUFSZ == 2^N
+                    and RT_SERIAL_FIFO_BUFSZ >= 2*RT_SERIAL_DMA_BUFSZ
+
+            config RT_SERIAL_DMA_BUFSZ
+                int "Set SerialX DMA buffer size"
+                depends on RT_SERIAL_USING_DMA
+                default 64
+                help
+                    suggestion: RT_SERIAL_DMA_BUFSZ == 2^N
+                    and RT_SERIAL_FIFO_BUFSZ >= 2*RT_SERIAL_DMA_BUFSZ
+
+            config RT_SERIAL_HARD_FIFO
+                bool "Set Hard FIFO buffer size"
+                default n
+                help
+                    Useful only if the chip supported
+                    eg: NUC970 N9H30 serial chips
+                        The UART1/2/4/6/8/10 is built-in with a 64-byte transmitter FIFO (TX_FIFO)
+                        and a 64-byte receiver FIFO (RX_FIFO),
+                        and the UART0/3/5/7/9 are equipped 16-byte transmitter FIFO (TX_FIFO)
+                        and 16-byte receiver FIFO (RX_FIFO).
+        endif
     endif
 
 config RT_USING_CAN

+ 2 - 2
Application_cbd_apm32f1/rt-thread/components/drivers/include/drivers/serialX.h

@@ -167,8 +167,8 @@ struct rt_serial_device
     cb_serial_rx _cb_rx;
     cb_serial_tx _cb_tx;
 #ifndef RT_SERIAL_USE_EVENT
-    struct rt_completion completion_rx;
-    struct rt_completion completion_tx;
+    struct rt_completion completion_rx; //发送完成
+    struct rt_completion completion_tx; //接收到新数据
 #else
     rt_event_t rx_done;
     rt_event_t tx_done;

+ 3 - 0
Application_cbd_apm32f1/rt-thread/components/drivers/serial/SConscript

@@ -7,6 +7,9 @@ if GetDepend(['RT_USING_SERIAL']):
     if GetDepend(['RT_USING_SERIAL_V2']):
         src = Glob('serial_v2.c')
         group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SERIAL_V2'], CPPPATH = CPPPATH)
+    elif  GetDepend(['RT_USING_SERIAL_X']):
+        src = Glob('serialX.c')
+        group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SERIAL_X'], CPPPATH = CPPPATH)
     else:
         src = Glob('serial.c')
         group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SERIAL'], CPPPATH = CPPPATH)

+ 6 - 5
Application_cbd_apm32f1/rt-thread/include/rtdef.h

@@ -83,7 +83,7 @@ extern "C" {
 
 #define RT_DEVICE_OFLAG_BLOCKING        0x000           /**< blocking io mode */
 #define RT_DEVICE_OFLAG_NONBLOCKING     0x004           /**< non-blocking io mode */
-#define RT_DEVICE_CTRL_BLOCKING         0x05            /**< blocking io */
+
 ///
 
 /* RT-Thread basic data type definitions */
@@ -1036,10 +1036,11 @@ enum rt_device_class_type
  * general device commands
  */
 #define RT_DEVICE_CTRL_OPEN             0x01            /**< open device */
-#define RT_DEVICE_CTRL_RESUME           0x01            /**< resume device */
-#define RT_DEVICE_CTRL_SUSPEND          0x02            /**< suspend device */
-#define RT_DEVICE_CTRL_CONFIG           0x03            /**< configure device */
-#define RT_DEVICE_CTRL_CLOSE            0x04            /**< close device */
+#define RT_DEVICE_CTRL_RESUME           0x02            /**< resume device */
+#define RT_DEVICE_CTRL_SUSPEND          0x03            /**< suspend device */
+#define RT_DEVICE_CTRL_CONFIG           0x04            /**< configure device */
+#define RT_DEVICE_CTRL_CLOSE            0x05            /**< close device */
+#define RT_DEVICE_CTRL_BLOCKING         0x06            /**< blocking io */
 
 #define RT_DEVICE_CTRL_SET_INT          0x10            /**< set interrupt */
 #define RT_DEVICE_CTRL_CLR_INT          0x11            /**< clear interrupt */

+ 1 - 1
Application_cbd_apm32f1/rt-thread/include/rtthread.h

@@ -519,7 +519,7 @@ rt_size_t rt_device_write(rt_device_t dev,
                           const void *buffer,
                           rt_size_t   size);
 rt_err_t  rt_device_control(rt_device_t dev, int cmd, void *arg);
-
+rt_err_t rt_device_flush(rt_device_t dev);
 /**@}*/
 #endif
 

+ 34 - 34
Application_cbd_apm32f1/rt-thread/src/device.c

@@ -13,6 +13,7 @@
  * 2013-07-09     Grissiom     add ref_count support
  * 2016-04-02     Bernard      fix the open_flag initialization issue.
  * 2021-03-19     Meco Man     remove rt_device_init_all()
+ * 2022-04-10     THEWON       add flush for device
  */
 
 #include <rtthread.h>
@@ -291,7 +292,6 @@ rt_err_t rt_device_close(rt_device_t dev)
     }
 
     /* set open flag */
-    /* set open flag */
     if (result == RT_EOK || result == -RT_ENOSYS)
     {
         dev->open_flag = RT_DEVICE_OFLAG_CLOSE;
@@ -314,7 +314,7 @@ RTM_EXPORT(rt_device_close);
  *
  * @param size is the size of buffer.
  *
- * @return the actually read size on successful, otherwise 0 will be returned.
+ * @return the actually read size on successful, otherwise negative returned.
  *
  * @note the unit of size/pos is a block for block device.
  */
@@ -357,7 +357,7 @@ RTM_EXPORT(rt_device_read);
  *
  * @param size is the size of buffer.
  *
- * @return the actually written size on successful, otherwise 0 will be returned.
+ * @return the actually written size on successful, otherwise negative returned.
  *
  * @note the unit of size/pos is a block for block device.
  */
@@ -390,6 +390,37 @@ rt_size_t rt_device_write(rt_device_t dev,
 RTM_EXPORT(rt_device_write);
 
 /**
+ * @brief This function will flush a device's buffers.
+ *
+ * @param dev is the pointer of device driver structure.
+ *
+ * @return the result, RT_EOK on successfully.
+ */
+rt_err_t rt_device_flush(rt_device_t dev)
+{
+    RT_ASSERT(dev != RT_NULL);
+    RT_ASSERT(rt_object_get_type(&dev->parent) == RT_Object_Class_Device);
+
+    if (dev->ref_count == 0)
+    {
+        rt_set_errno(-RT_ERROR);
+        return 0;
+    }
+
+    /* call device_write interface */
+    if (device_flush != RT_NULL)
+    {
+        return device_flush(dev);
+    }
+
+    /* set error code */
+    rt_set_errno(-RT_ENOSYS);
+
+    return 0;
+}
+RTM_EXPORT(rt_device_flush);
+
+/**
  * @brief This function will perform a variety of control functions on devices.
  *
  * @param dev is the pointer of device driver structure.
@@ -464,35 +495,4 @@ rt_err_t rt_device_set_tx_complete(rt_device_t dev,
 }
 RTM_EXPORT(rt_device_set_tx_complete);
 
-/**
- * @brief This function will flush a device's buffers.
- *
- * @param dev is the pointer of device driver structure.
- *
- * @return the result, RT_EOK on successfully.
- */
-rt_err_t rt_device_flush(rt_device_t dev)
-{
-    RT_ASSERT(dev != RT_NULL);
-    RT_ASSERT(rt_object_get_type(&dev->parent) == RT_Object_Class_Device);
-
-    if (dev->ref_count == 0)
-    {
-        rt_set_errno(-RT_ERROR);
-        return 0;
-    }
-
-    /* call device_write interface */
-    if (device_flush != RT_NULL)
-    {
-        return device_flush(dev);
-    }
-
-    /* set error code */
-    rt_set_errno(-RT_ENOSYS);
-
-    return 0;
-}
-RTM_EXPORT(rt_device_flush);
-
 #endif /* RT_USING_DEVICE */

BIN
Application_cbd_apm32f1/rt-thread/tools/building.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/gcc.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/options.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/utils.pyc


+ 18 - 1
Application_cbd_apm32f1/rtconfig.h

@@ -52,7 +52,7 @@
 
 #define RT_USING_DEVICE
 #define RT_USING_CONSOLE
-#define RT_CONSOLEBUF_SIZE 256
+#define RT_CONSOLEBUF_SIZE 1024
 #define RT_CONSOLE_DEVICE_NAME "uart1"
 /* end of Kernel Device Object */
 #define RT_VER_NUM 0x40101
@@ -68,6 +68,7 @@
 #define RT_USING_USER_MAIN
 #define RT_MAIN_THREAD_STACK_SIZE 2048
 #define RT_MAIN_THREAD_PRIORITY 10
+#define RT_USING_LEGACY
 #define RT_USING_MSH
 #define RT_USING_FINSH
 #define FINSH_USING_MSH
@@ -286,6 +287,22 @@
 /* Kendryte SDK */
 
 /* end of Kendryte SDK */
+
+/* WCH HAL & SDK Drivers */
+
+/* end of WCH HAL & SDK Drivers */
+
+/* AT32 HAL & SDK Drivers */
+
+/* end of AT32 HAL & SDK Drivers */
+
+/* HC32 DDL Drivers */
+
+/* end of HC32 DDL Drivers */
+
+/* NXP HAL & SDK Drivers */
+
+/* end of NXP HAL & SDK Drivers */
 /* end of HAL & SDK Drivers */
 
 /* sensors drivers */

BIN
Application_cbd_apm32f1/rtconfig.pyc