From 6ee8dd057f1fa8f3b6eab0e45a6facba3ca26f14 Mon Sep 17 00:00:00 2001 From: Alberto Nidasio <alberto.nidasio@skywarder.eu> Date: Tue, 19 Jul 2022 17:26:47 +0200 Subject: [PATCH] [logdecoder] Fixed logs --- .vscode/settings.json | 39 +++++-------------- scripts/logdecoder/logdecoder.cpp | 17 +++++++- skyward-boardcore | 2 +- .../AirBrakesController.cpp | 2 +- .../FlightModeManager/FlightModeManager.cpp | 2 +- .../NASController/NASController.cpp | 2 +- .../FlightModeManager/FlightModeManager.cpp | 2 +- 7 files changed, 29 insertions(+), 37 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7158096d8..4eb801d7f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -102,6 +102,7 @@ "Alain", "Alessandro", "Axisf", + "baro", "Baro", "Benedetti", "Benini", @@ -161,6 +162,7 @@ "Kalman", "KBPS", "leds", + "logdecoder", "LSBFIRST", "Luca", "magbx", @@ -174,6 +176,7 @@ "miosix", "MODER", "mosi", + "MOSI", "Mozzarelli", "MPXH", "MPXHZ", @@ -189,6 +192,7 @@ "PCLK", "Piazzolla", "pinhandler", + "pinouts", "PITOT", "prescaler", "PUPDR", @@ -236,6 +240,7 @@ "TRAS", "trasfer", "TRCD", + "tscpp", "TSCPP", "tsens", "Tweakable", @@ -255,38 +260,12 @@ "VREF", "vsupply", "Waddress", + "wingalgo", + "wingctrl", "withcorrection", "Wmaybe", "Xbee", - "XRAM", - "Aeroutils", - "baro", - "Boardcore", - "Eigen", - "Erbetta", - "Gpio", - "GPIOA", - "GPIOB", - "GPIOC", - "GPIOD", - "GPIOF", - "GPIOG", - "leds", - "Luca", - "Matteo", - "Mavlink", - "miosix", - "MOSI", - "Nidasio", - "pinouts", - "Terraneo", - "tmrepo", - "tscpp", - "Ublox", - "UBXGPS", - "usart", - "wingalgo", - "wingctrl" + "XRAM" ], "C_Cpp.errorSquiggles": "Enabled" -} \ No newline at end of file +} diff --git a/scripts/logdecoder/logdecoder.cpp b/scripts/logdecoder/logdecoder.cpp index 1edf5fe55..373986039 100644 --- a/scripts/logdecoder/logdecoder.cpp +++ b/scripts/logdecoder/logdecoder.cpp @@ -20,7 +20,12 @@ * THE SOFTWARE. */ -#include <Main/Sensors/Pitot/PitotData.h> +#include <Main/StateMachines/ADAController/ADAControllerData.h> +#include <Main/StateMachines/AirBrakesController/AirBrakesControllerData.h> +#include <Main/StateMachines/Deployment/DeploymentData.h> +#include <Main/StateMachines/FlightModeManager/FlightModeManagerData.h> +#include <Main/StateMachines/FlightStatsRecorder/FlightStatsRecorderData.h> +#include <Main/StateMachines/NASController/NASControllerData.h> #include <logger/Deserializer.h> #include <logger/LogTypes.h> #include <tscpp/stream.h> @@ -42,6 +47,7 @@ using namespace tscpp; using namespace Boardcore; +using namespace Main; void registerTypes(Deserializer& ds) { @@ -49,7 +55,14 @@ void registerTypes(Deserializer& ds) LogTypes::registerTypes(ds); // Custom types - ds.registerType<PitotData>(); + ds.registerType<ADAControllerStatus>(); + ds.registerType<ApogeeEvent>(); + ds.registerType<DeploymentEvent>(); + ds.registerType<AirBrakesControllerStatus>(); + ds.registerType<DeploymentStatus>(); + ds.registerType<FlightModeManagerStatus>(); + ds.registerType<FlightStatsRecorderStatus>(); + ds.registerType<NASControllerStatus>(); } void showUsage(const string& cmdName) diff --git a/skyward-boardcore b/skyward-boardcore index 742c33a82..35aa033c7 160000 --- a/skyward-boardcore +++ b/skyward-boardcore @@ -1 +1 @@ -Subproject commit 742c33a82257e5732115d5c3b9b35fb326fcc2af +Subproject commit 35aa033c7459c19c5cde4a0bd02a6130c924d446 diff --git a/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp b/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp index 60523af3f..8e02fb85a 100644 --- a/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp +++ b/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp @@ -183,7 +183,7 @@ void AirBrakesController::logStatus(AirBrakesControllerState state) status.timestamp = TimestampTimer::getTimestamp(); status.state = state; - Logger::getInstance().log(state); + Logger::getInstance().log(status); } void AirBrakesController::wiggleServo() diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp b/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp index 95d3f1ad1..0930276b5 100644 --- a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp +++ b/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp @@ -387,7 +387,7 @@ void FlightModeManager::logStatus(FlightModeManagerState state) status.timestamp = TimestampTimer::getTimestamp(); status.state = state; - Logger::getInstance().log(state); + Logger::getInstance().log(status); } } // namespace Main diff --git a/src/boards/Main/StateMachines/NASController/NASController.cpp b/src/boards/Main/StateMachines/NASController/NASController.cpp index 2fab4b3dc..c77273ccd 100644 --- a/src/boards/Main/StateMachines/NASController/NASController.cpp +++ b/src/boards/Main/StateMachines/NASController/NASController.cpp @@ -159,7 +159,7 @@ void NASController::logStatus(NASControllerState state) status.timestamp = TimestampTimer::getTimestamp(); status.state = state; - Logger::getInstance().log(state); + Logger::getInstance().log(status); } NASController::NASController() diff --git a/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp b/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp index 4805fd38e..8cb1511a4 100644 --- a/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp +++ b/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp @@ -94,7 +94,7 @@ void FlightModeManager::logStatus(FlightModeManagerState state) status.timestamp = TimestampTimer::getTimestamp(); status.state = state; - Logger::getInstance().log(state); + Logger::getInstance().log(status); } } // namespace Parafoil -- GitLab