From b36b76fc7ba7098b9c326a3a08469c6d5575fcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Betto?= <niccolo.betto@skywarder.eu>
Date: Thu, 13 Mar 2025 16:49:40 +0100
Subject: [PATCH] [RIGv2][Actuators] Fix servo getter array indexes
---
src/RIGv2/Actuators/Actuators.cpp | 14 +++++++-------
src/RIGv2/Actuators/Actuators.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/RIGv2/Actuators/Actuators.cpp b/src/RIGv2/Actuators/Actuators.cpp
index 6f2f570b5..e511cdb17 100644
--- a/src/RIGv2/Actuators/Actuators.cpp
+++ b/src/RIGv2/Actuators/Actuators.cpp
@@ -371,19 +371,19 @@ Actuators::ServoInfo* Actuators::getServo(ServosList servo)
case OX_DETACH_SERVO: // OX_DET
return &infos[2];
case N2_FILLING_VALVE: // N2_FIL
- return &infos[4];
+ return &infos[3];
case N2_RELEASE_VALVE: // N2_REL
- return &infos[5];
+ return &infos[4];
case N2_DETACH_SERVO: // N2_DET
- return &infos[6];
+ return &infos[5];
case NITROGEN_VALVE: // NITR
- return &infos[7];
+ return &infos[6];
case OX_VENTING_VALVE: // OX_VEN
- return &infos[8];
+ return &infos[7];
case N2_QUENCHING_VALVE: // N2_QUE
- return &infos[9];
+ return &infos[8];
case MAIN_VALVE: // MAIN
- return &infos[10];
+ return &infos[9];
default:
// Oh FUCK
diff --git a/src/RIGv2/Actuators/Actuators.h b/src/RIGv2/Actuators/Actuators.h
index 0289b1a78..2877fa68e 100644
--- a/src/RIGv2/Actuators/Actuators.h
+++ b/src/RIGv2/Actuators/Actuators.h
@@ -132,7 +132,7 @@ private:
std::atomic<bool> started{false};
miosix::FastMutex infosMutex;
- ServoInfo infos[10];
+ std::array<ServoInfo, 10> infos;
ServoInfo n2_3wayValveInfo;
long long chamberCloseTs =
--
GitLab