From 9efa81c8cbe73505b165caef044c758dcd747182 Mon Sep 17 00:00:00 2001 From: klegot Date: Sat, 29 Aug 2026 17:22:31 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=200=20=D0=B2=20=D0=BC=D0=B0=D1=82=D0=B5=D0=BC=D0=B0=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D1=83=20=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=8F=20=D1=87=D0=B0=D1=81=D1=82=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Inc/pressure_wrapper.h | 2 +- Core/Src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Inc/pressure_wrapper.h b/Core/Inc/pressure_wrapper.h index ca1de62..05a5c9a 100644 --- a/Core/Inc/pressure_wrapper.h +++ b/Core/Inc/pressure_wrapper.h @@ -20,7 +20,7 @@ namespace PressureConversions { } constexpr uint32_t voltageToPascals(uint32_t voltage_mv) noexcept { - return voltage_mv * 6895u / 4u * 37u / 9u; + return voltage_mv * 68950u / 4u * 37u / 9u; } constexpr uint32_t pascalsToDepthMm(uint32_t pascals) noexcept { diff --git a/Core/Src/main.cpp b/Core/Src/main.cpp index 4347ead..bec04dc 100644 --- a/Core/Src/main.cpp +++ b/Core/Src/main.cpp @@ -129,7 +129,7 @@ void SystemClock_Config(void) { */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; - RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV2; + RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1; RCC_OscInitStruct.HSIState = RCC_HSI_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; From a28bfd33abcbcf29563707aab1ce8f7baa822ed8 Mon Sep 17 00:00:00 2001 From: Nikita Bulatov Date: Sat, 29 Aug 2026 21:42:01 +0300 Subject: [PATCH 2/2] =?UTF-8?q?fix/=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D1=8F=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=BE=D1=81=D1=82=D1=8C=20=D0=BE=D0=B1=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Src/main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Core/Src/main.cpp b/Core/Src/main.cpp index bec04dc..e1824a9 100644 --- a/Core/Src/main.cpp +++ b/Core/Src/main.cpp @@ -15,7 +15,7 @@ extern "C" { #include "hydrolib_bus_application_master.hpp" -#define BUFFER_LENGTH 5 // TODO:make variable +constexpr uint32_t kTransmitPeriodMs = 5; // 200 Hz constinit hydrv::GPIO::GPIOLow rx_pin(hydrv::GPIO::GPIOLow::GPIOA_port, 10, hydrv::GPIO::GPIOLow::GPIO_UART_RX); @@ -105,12 +105,19 @@ int main(void) { /* USER CODE BEGIN 2 */ sensor.init(); RS.Init(); - + + uint32_t lastTransmitTick = HAL_GetTick(); + while (1) { manager.Process(); sensor.poll(); depth = sensor.getDepthMm(); - master.Write(static_cast(&depth), 0, sizeof(depth)); + + const uint32_t now = HAL_GetTick(); + if (now - lastTransmitTick >= kTransmitPeriodMs) { + lastTransmitTick = now; + master.Write(static_cast(&depth), 0, sizeof(depth)); + } } /* USER CODE END 3 */ }