From 58b19dd35ccea89b3c63cc8dcb282a4385eb6305 Mon Sep 17 00:00:00 2001 From: Matteo Pignataro <matteo.pignataro@skywarder.eu> Date: Tue, 21 Nov 2023 14:36:36 +0100 Subject: [PATCH] [LoadCell] Calibrated loadcell [Servo] Calibrated realease servo --- src/boards/RIG/Configs/ActuatorsConfig.h | 2 +- src/boards/RIG/Configs/SensorsConfig.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boards/RIG/Configs/ActuatorsConfig.h b/src/boards/RIG/Configs/ActuatorsConfig.h index 52f1f0d69..1236761a0 100644 --- a/src/boards/RIG/Configs/ActuatorsConfig.h +++ b/src/boards/RIG/Configs/ActuatorsConfig.h @@ -62,7 +62,7 @@ constexpr uint32_t DEFAULT_DISCONNECT_OPENING_TIME = 10000; // 10s constexpr float DEFAULT_FILLING_MAXIMUM_APERTURE = 0.97f; constexpr float DEFAULT_VENTING_MAXIMUM_APERTURE = 0.80f; constexpr float DEFAULT_MAIN_MAXIMUM_APERTURE = 0.87f; -constexpr float DEFAULT_RELEASE_MAXIMUM_APERTURE = 0.97f; +constexpr float DEFAULT_RELEASE_MAXIMUM_APERTURE = 0.80f; constexpr float DEFAULT_DISCONNECT_MAXIMUM_APERTURE = 0.110f; } // namespace Servos } // namespace Config diff --git a/src/boards/RIG/Configs/SensorsConfig.h b/src/boards/RIG/Configs/SensorsConfig.h index 1747a3409..be5a3907b 100644 --- a/src/boards/RIG/Configs/SensorsConfig.h +++ b/src/boards/RIG/Configs/SensorsConfig.h @@ -47,10 +47,10 @@ constexpr float VESSEL_MAX_PRESSURE = 400; // bar constexpr float SENSOR_MIN_CURRENT = 4; // mA constexpr float SENSOR_MAX_CURRENT = 20; // mA -constexpr float LOAD_CELL2_OFFSET = -38150; +constexpr float LOAD_CELL2_OFFSET = -71250; constexpr float LOAD_CELL1_OFFSET = -93539.8f; -constexpr float LOAD_CELL2_SCALE = -5.6188e-5f; +constexpr float LOAD_CELL2_SCALE = 6.884422e-6f; constexpr float LOAD_CELL1_SCALE = -2.251307e-5f; constexpr float VOLTAGE_CONVERSION_FACTOR = 13.58f; -- GitLab