Skip to content

feat/ Поддержка датчика и исправлена тактовая частота #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Svvyppy wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat/ Поддержка датчика и исправлена тактовая частота #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9efa81c
добавил 0 в математику и исправлена тактовая частота
klegot Aug 29, 2026
a28bfd3
fix/ Исправлено переполнение и явно задана скорость обмена
Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Inc/pressure_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 11 additions & 4 deletions Core/Src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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<void*>(&depth), 0, sizeof(depth));

const uint32_t now = HAL_GetTick();
if (now - lastTransmitTick >= kTransmitPeriodMs) {
lastTransmitTick = now;
master.Write(static_cast<void*>(&depth), 0, sizeof(depth));
}
}
/* USER CODE END 3 */
}
Expand All @@ -129,7 +136,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;
Expand Down
Loading