From e68e5c5df5a7179d4a075ae3098e6b5c9a599310 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 17 Aug 2023 21:12:48 +0800
Subject: [PATCH] v1

---
 .cproject     |  2 ++
 sdk           |  2 +-
 usrc/main.cpp | 27 ++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.cproject b/.cproject
index af9c7bb..92ee012 100644
--- a/.cproject
+++ b/.cproject
@@ -25,6 +25,8 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.417127282" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1449146736" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F407xx ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.2004392039" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="144" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.633804860" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary" value="true" valueType="boolean"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1597102300" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1550094338" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/zapp}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2039995727" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1267404562" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
diff --git a/sdk b/sdk
index 11b2ea8..6bd928e 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 11b2ea877c103523e857108c1a521f2755700dac
+Subproject commit 6bd928e42a0bdb1c6345b5751014d94b09ba8985
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 10d21d0..7a92ba8 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -209,9 +209,34 @@ void Main::run() {
   /*******************************************************************************
    *                                 压力传感器                                  *
    *******************************************************************************/
+
+  // while (true) {
+  //   static ModbusBlockHost modbusBlockHost;
+  //   modbusBlockHost.initialize(&huart3);
+  //   int16_t val[1] = {0};
+  //   bool    suc    = modbusBlockHost.readReg03Muti(1, 0x00, (uint16_t *)val, 1, 50);
+  //   printf("suc:%d val:%d\n", suc, val[0]);
+  //   chip_delay_ms(1000);
+  // }
+
   {
     m_huachengPressureSensor.initialize(&m_canReceiver);
-    m_huachengPressureSensor.regSubmodule(1, &huart3, 1);
+    m_huachengPressureSensor.regSubmodule(1, [this](DP600PressureSensor::sensor_data_t *data) {  //
+      static ModbusBlockHost modbusBlockHost;
+      modbusBlockHost.initialize(&huart3);
+      int16_t val[1] = {0};
+      bool    suc    = modbusBlockHost.readReg03Muti(1, 0x00, (uint16_t *)val, 1, 50);
+      if (!suc) {
+        return false;
+      }
+      data->precision        = 3;
+      data->pressure_unit    = 1;
+      data->value            = val[0];
+      data->zero_point       = 0;
+      data->range_full_point = 0;
+
+      return true;
+    });
     m_huachengPressureSensor.regSubmodule(2, &huart3, 2);
     m_huachengPressureSensor.regSubmodule(3, &huart3, 3);
     m_huachengPressureSensor.regSubmodule(4, &huart3, 4);