From 1c7545bffa27d753b462b55988ddf97b94e4b812 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 26 Oct 2023 19:59:16 +0200 Subject: [PATCH] fix --- mission/acs/str/StarTrackerHandler.cpp | 26 +++++++++++++++++++++++++- mission/acs/str/strHelpers.h | 8 +++++++- tmtc | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp index 94a29f01..1bf35ca2 100644 --- a/mission/acs/str/StarTrackerHandler.cpp +++ b/mission/acs/str/StarTrackerHandler.cpp @@ -1792,8 +1792,32 @@ ReturnValue_t StarTrackerHandler::scanForTmReply(uint8_t replyId, DeviceCommandI *foundId = startracker::REQ_SOLUTION; break; } + case(startracker::ID::BLOB): { + *foundId = startracker::REQ_BLOB; + break; + } + case(startracker::ID::BLOBS): { + *foundId = startracker::REQ_BLOBS; + break; + } + case(startracker::ID::CENTROID): { + *foundId = startracker::REQ_CENTROID; + break; + } + case(startracker::ID::CENTROIDS): { + *foundId = startracker::REQ_CENTROIDS; + break; + } + case(startracker::ID::AUTO_BLOB): { + *foundId = startracker::REQ_AUTO_BLOB; + break; + } + case(startracker::ID::MATCHED_CENTROIDS): { + *foundId = startracker::REQ_MATCHED_CENTROIDS; + break; + } default: { - sif::debug << "StarTrackerHandler::scanForTmReply: Reply contains invalid reply id: " + sif::debug << "StarTrackerHandler::scanForTmReply: Reply contains invalid reply ID: " << static_cast(replyId) << std::endl; return returnvalue::FAILED; break; diff --git a/mission/acs/str/strHelpers.h b/mission/acs/str/strHelpers.h index fe8755f2..dff29f95 100644 --- a/mission/acs/str/strHelpers.h +++ b/mission/acs/str/strHelpers.h @@ -461,6 +461,12 @@ static const uint8_t LOG_LEVEL = 3; static const uint8_t LOG_SUBSCRIPTION = 19; static const uint8_t DEBUG_CAMERA = 20; static const uint8_t AUTO_THRESHOLD = 23; +static constexpr uint8_t BLOB = 25; +static constexpr uint8_t BLOBS = 36; +static constexpr uint8_t CENTROID = 26; +static constexpr uint8_t CENTROIDS = 37; +static constexpr uint8_t AUTO_BLOB = 39; +static constexpr uint8_t MATCHED_CENTROIDS = 40; } // namespace ID namespace Program { @@ -1430,7 +1436,7 @@ class ValidationSet : public StaticLocalDataSet { } }; -class AutoBlobSet : public StaticLocalDataSet<1> { +class AutoBlobSet : public StaticLocalDataSet<3> { public: AutoBlobSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, AUTO_BLOB_SET_ID) {} // Ticks timestamp diff --git a/tmtc b/tmtc index f52f4b1c..c4598ff0 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit f52f4b1ce2f8932cb567a69e4972e562fd124134 +Subproject commit c4598ff05858952d0107d4f6f61cbef8ff2de691