From 0c25123e9c7ae33e45640baa8c58f9ec57e9c0f6 Mon Sep 17 00:00:00 2001
From: Emilio Corigliano <emilio.corigliano@skywarder.eu>
Date: Fri, 4 Oct 2024 10:31:08 +0200
Subject: [PATCH] [Logdecoder] Fixed main logdecoder and created a general one
for all boards
---
src/scripts/logdecoder/General/Makefile | 16 ++
src/scripts/logdecoder/General/logdecoder.cpp | 193 ++++++++++++++++++
src/scripts/logdecoder/Main/logdecoder.cpp | 1 -
3 files changed, 209 insertions(+), 1 deletion(-)
create mode 100644 src/scripts/logdecoder/General/Makefile
create mode 100644 src/scripts/logdecoder/General/logdecoder.cpp
diff --git a/src/scripts/logdecoder/General/Makefile b/src/scripts/logdecoder/General/Makefile
new file mode 100644
index 000000000..6bbaf34fc
--- /dev/null
+++ b/src/scripts/logdecoder/General/Makefile
@@ -0,0 +1,16 @@
+BOARDCORE := ../../../../skyward-boardcore/
+OBSW := ../../../../src/boards/
+
+all:
+ g++ -std=c++17 -O2 -o logdecoder logdecoder.cpp \
+ -DCOMPILE_FOR_X86 \
+ -DCOMPILE_FOR_HOST \
+ $(BOARDCORE)libs/tscpp/tscpp/stream.cpp \
+ -I$(BOARDCORE)libs/miosix-host \
+ -I$(BOARDCORE)libs/mavlink-skyward-lib \
+ -I$(BOARDCORE)libs/eigen \
+ -I$(BOARDCORE)libs/tscpp \
+ -I$(BOARDCORE)src/shared \
+ -I$(OBSW)
+clean:
+ rm logdecoder
diff --git a/src/scripts/logdecoder/General/logdecoder.cpp b/src/scripts/logdecoder/General/logdecoder.cpp
new file mode 100644
index 000000000..73451409c
--- /dev/null
+++ b/src/scripts/logdecoder/General/logdecoder.cpp
@@ -0,0 +1,193 @@
+/* Copyright (c) 2018-2022 Skyward Experimental Rocketry
+ * Author: Terrane Federico
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <Groundstation/Automated/Actuators/ActuatorsData.h>
+#include <Groundstation/Automated/PinHandler/PinData.h>
+#include <Groundstation/Automated/SMA/SMAData.h>
+#include <Main/PinHandler/PinData.h>
+#include <Main/Sensors/SensorsData.h>
+#include <Main/StateMachines/ABKController/ABKControllerData.h>
+#include <Main/StateMachines/ADAController/ADAControllerData.h>
+#include <Main/StateMachines/FlightModeManager/FlightModeManagerData.h>
+#include <Main/StateMachines/MEAController/MEAControllerData.h>
+#include <Main/StateMachines/NASController/NASControllerData.h>
+#include <Motor/Actuators/ActuatorsData.h>
+#include <Motor/Sensors/SensorsData.h>
+#include <Payload/PinHandler/PinData.h>
+#include <Payload/Sensors/SensorData.h>
+#include <Payload/StateMachines/FlightModeManager/FlightModeManagerData.h>
+#include <Payload/StateMachines/NASController/NASControllerData.h>
+#include <Payload/StateMachines/WingController/WingControllerData.h>
+#include <Payload/Wing/WingAlgorithmData.h>
+#include <Payload/Wing/WingTargetPositionData.h>
+#include <RIGv2/Actuators/ActuatorsData.h>
+#include <RIGv2/Sensors/SensorsData.h>
+#include <RIGv2/StateMachines/GroundModeManager/GroundModeManagerData.h>
+#include <RIGv2/StateMachines/TARS1/TARS1Data.h>
+#include <algorithms/MEA/MEAData.h>
+#include <logger/Deserializer.h>
+#include <logger/LogTypes.h>
+#include <tscpp/stream.h>
+
+#include <fstream>
+#include <iostream>
+#include <stdexcept>
+#include <string>
+
+/**
+ * @brief Binary log files decoder.
+ *
+ * This program is to compile for you computer and decodes binary log files
+ * through the tscpp library.
+ *
+ * In LogTypes.h there should be included all the classes you want to
+ * deserialize.
+ */
+
+using namespace tscpp;
+using namespace Boardcore;
+
+void registerTypes(Deserializer& ds)
+{
+ // Register all Boardcore types
+ LogTypes::registerTypes(ds);
+
+ // Custom types
+ // Main
+ ds.registerType<Main::FlightModeManagerStatus>();
+ ds.registerType<Main::NASControllerStatus>();
+ ds.registerType<Main::MEAControllerStatus>();
+ ds.registerType<Main::ADAControllerSampleData>();
+ ds.registerType<Main::ADAControllerStatus>();
+ ds.registerType<Main::ABKControllerStatus>();
+ ds.registerType<Main::PinChangeData>();
+ ds.registerType<Main::StaticPressureData1>();
+ ds.registerType<Main::StaticPressureData2>();
+ ds.registerType<Main::DplBayPressureData>();
+ ds.registerType<Main::CalibrationData>();
+
+ // Motor
+ ds.registerType<Motor::TopTankPressureData>();
+ ds.registerType<Motor::BottomTankPressureData>();
+ ds.registerType<Motor::CCPressureData>();
+ ds.registerType<Motor::ActuatorsData>();
+
+ // Payload
+ ds.registerType<Payload::FlightModeManagerStatus>();
+ ds.registerType<Payload::NASControllerStatus>();
+ ds.registerType<Payload::WingControllerStatus>();
+ ds.registerType<Payload::StaticPressureData>();
+ ds.registerType<Payload::DynamicPressureData>();
+ ds.registerType<Payload::SensorCalibrationData>();
+ ds.registerType<Payload::PinChangeData>();
+ ds.registerType<Payload::WingControllerAlgorithmData>();
+ ds.registerType<Payload::WingAlgorithmData>();
+ ds.registerType<Payload::WingTargetPositionData>();
+ ds.registerType<Payload::EarlyManeuversActiveTargetData>();
+
+ // RIGv2
+ ds.registerType<RIGv2::ADC1Data>();
+ ds.registerType<RIGv2::TC1Data>();
+ ds.registerType<RIGv2::VesselWeightData>();
+ ds.registerType<RIGv2::TankWeightData>();
+ ds.registerType<RIGv2::VesselPressureData>();
+ ds.registerType<RIGv2::FillingPressureData>();
+ ds.registerType<RIGv2::TopTankPressureData>();
+ ds.registerType<RIGv2::BottomTankPressureData>();
+ ds.registerType<RIGv2::ActuatorsData>();
+ ds.registerType<RIGv2::GroundModeManagerData>();
+ ds.registerType<RIGv2::TarsActionData>();
+ ds.registerType<RIGv2::TarsSampleData>();
+
+ // Groundstation (ARP)
+ ds.registerType<Antennas::StepperXData>();
+ ds.registerType<Antennas::StepperYData>();
+ ds.registerType<Antennas::SMAStatus>();
+ ds.registerType<Antennas::PinChangeData>();
+}
+
+void showUsage(const string& cmdName)
+{
+ std::cerr << "Usage: " << cmdName << " {-a | <log_file_name> | -h}"
+ << "Options:\n"
+ << "\t-h,--help\t\tShow help message\n"
+ << "\t-a,--all Deserialize all logs in the current directory\n"
+ << std::endl;
+}
+
+bool deserialize(string logName)
+{
+ std::cout << "Deserializing " << logName << "...\n";
+ Deserializer d(logName);
+ LogTypes::registerTypes(d);
+ registerTypes(d);
+
+ return d.deserialize();
+}
+
+bool deserializeAll()
+{
+ for (int i = 0; i < 100; i++)
+ {
+ char nextName[11];
+ sprintf(nextName, "log%02d.dat", i);
+ struct stat st;
+ if (stat(nextName, &st) != 0)
+ continue; // File not found
+ // File found
+ if (!deserialize(string(nextName)))
+ return false;
+ }
+ return true;
+}
+
+int main(int argc, char* argv[])
+{
+ if (argc < 2)
+ {
+ showUsage(string(argv[0]));
+ return 1; // Error
+ }
+
+ bool success = false;
+ string arg1 = string(argv[1]);
+
+ // Help message
+ if (arg1 == "-h" || arg1 == "--help")
+ {
+ showUsage(string(argv[0]));
+ return 0;
+ }
+
+ // File deserialization
+ if (arg1 == "-a" || arg1 == "--all")
+ success = deserializeAll();
+ else
+ success = deserialize(arg1);
+
+ // End
+ if (success)
+ std::cout << "Deserialization completed successfully\n";
+ else
+ std::cout << "Deserialization ended with errors\n";
+ return 0;
+}
diff --git a/src/scripts/logdecoder/Main/logdecoder.cpp b/src/scripts/logdecoder/Main/logdecoder.cpp
index b0a0bf0a5..f87f57760 100644
--- a/src/scripts/logdecoder/Main/logdecoder.cpp
+++ b/src/scripts/logdecoder/Main/logdecoder.cpp
@@ -60,7 +60,6 @@ void registerTypes(Deserializer& ds)
ds.registerType<FlightModeManagerStatus>();
ds.registerType<NASControllerStatus>();
ds.registerType<MEAControllerStatus>();
- ds.registerType<MEAState>();
ds.registerType<ADAControllerSampleData>();
ds.registerType<ADAControllerStatus>();
ds.registerType<ABKControllerStatus>();
--
GitLab