From 4e07eef45767299e8c5e1c3bd01f8fadb53ea99e Mon Sep 17 00:00:00 2001 From: Davide Mor <davide.mor@skywarder.eu> Date: Thu, 7 Mar 2024 18:00:36 +0100 Subject: [PATCH] [RIGv2] Fixed shunt resistances --- src/boards/RIGv2/Configs/SensorsConfig.h | 6 +++--- src/boards/RIGv2/Sensors/Sensors.cpp | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/boards/RIGv2/Configs/SensorsConfig.h b/src/boards/RIGv2/Configs/SensorsConfig.h index 4ea70e19b..03c54eb8a 100644 --- a/src/boards/RIGv2/Configs/SensorsConfig.h +++ b/src/boards/RIGv2/Configs/SensorsConfig.h @@ -37,9 +37,9 @@ static constexpr uint32_t ADC_SAMPLE_PERIOD = 10; static constexpr uint32_t TC_SAMPLE_PERIOD = 100; static constexpr float ADC1_CH1_SHUNT_RESISTANCE = 29.4048; -static constexpr float ADC1_CH2_SHUNT_RESISTANCE = 30.4; -static constexpr float ADC1_CH3_SHUNT_RESISTANCE = 30.5; -static constexpr float ADC1_CH4_SHUNT_RESISTANCE = 30.8; +static constexpr float ADC1_CH2_SHUNT_RESISTANCE = 29.5830; +static constexpr float ADC1_CH3_SHUNT_RESISTANCE = 29.4973; +static constexpr float ADC1_CH4_SHUNT_RESISTANCE = 29.8849; // ADC channels definitions for various sensors static constexpr Boardcore::ADS131M08Defs::Channel ADC1_VESSEL_PT_CHANNEL = diff --git a/src/boards/RIGv2/Sensors/Sensors.cpp b/src/boards/RIGv2/Sensors/Sensors.cpp index 8f1871341..3ffa57dc0 100644 --- a/src/boards/RIGv2/Sensors/Sensors.cpp +++ b/src/boards/RIGv2/Sensors/Sensors.cpp @@ -309,11 +309,6 @@ void Sensors::adc1Callback() sample.voltage[4], sample.voltage[5], sample.voltage[6], sample.voltage[7]}; - /*LOG_INFO(logger, "{:.2f}\t{:.2f}\t{:.2f}\t{:.2f}", - (sample.voltage[0] / Config::Sensors::ADC1_CH1_SHUNT_RESISTANCE) * - 1000.0f, (sample.voltage[1] / 30.4f) * 1000.0f, (sample.voltage[2] - / 30.5f) * 1000.0f, (sample.voltage[3] / 30.8f) * 1000.0f);*/ - sdLogger.log(data); } -- GitLab