From 2b078b6549d840eb9370a652a2bedef0d1d70a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Betto?= <niccolo.betto@skywarder.eu>
Date: Tue, 26 Nov 2024 12:02:26 +0100
Subject: [PATCH] [Boardcore] Update Mavlink with new RIG valves + fix ConRIG
BSP
---
skyward-boardcore | 2 +-
src/ConRIG/Buttons/Buttons.cpp | 31 ++++---------------------------
2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/skyward-boardcore b/skyward-boardcore
index 30e3e37a4..93254875b 160000
--- a/skyward-boardcore
+++ b/skyward-boardcore
@@ -1 +1 @@
-Subproject commit 30e3e37a4668096c84cf3bf4ee8f9c9af49ce3b8
+Subproject commit 93254875ba79c70c4e1b4fb1b144a8b117337abf
diff --git a/src/ConRIG/Buttons/Buttons.cpp b/src/ConRIG/Buttons/Buttons.cpp
index 461466c7d..dd7314edd 100644
--- a/src/ConRIG/Buttons/Buttons.cpp
+++ b/src/ConRIG/Buttons/Buttons.cpp
@@ -74,7 +74,7 @@ void Buttons::periodicStatusCheck()
guard++;
}
}
- else if (btns::filling::value())
+ else if (btns::n2o_filling::value())
{
if (guard > Config::Buttons::GUARD_THRESHOLD)
{
@@ -86,7 +86,7 @@ void Buttons::periodicStatusCheck()
guard++;
}
}
- else if (btns::venting::value())
+ else if (btns::n2o_venting::value())
{
if (guard > Config::Buttons::GUARD_THRESHOLD)
{
@@ -98,7 +98,7 @@ void Buttons::periodicStatusCheck()
guard++;
}
}
- else if (btns::release::value())
+ else if (btns::n2o_release::value())
{
if (guard > Config::Buttons::GUARD_THRESHOLD)
{
@@ -110,30 +110,7 @@ void Buttons::periodicStatusCheck()
guard++;
}
}
- else if (btns::detach::value())
- {
- if (guard > Config::Buttons::GUARD_THRESHOLD)
- {
- guard = 0;
- state.quick_connector_btn = true;
- }
- else
- {
- guard++;
- }
- }
- else if (btns::tars::value())
- {
- if (guard > Config::Buttons::GUARD_THRESHOLD)
- {
- guard = 0;
- state.start_tars_btn = true;
- }
- else
- {
- guard++;
- }
- }
+ // TODO: implement missing buttons
else
{
// Reset all the states and guard
--
GitLab