diff --git a/src/boards/Parafoil/Sensors/Sensors.cpp b/src/boards/Parafoil/Sensors/Sensors.cpp index ad528cf93d4b9172bd086e9cce30dce2feea0277..45da43398b275d1309bee2603b767658463f18d7 100644 --- a/src/boards/Parafoil/Sensors/Sensors.cpp +++ b/src/boards/Parafoil/Sensors/Sensors.cpp @@ -341,14 +341,10 @@ Sensors::~Sensors() } void Sensors::h3lis33Init() { - SPIBusConfig spiConfig; - spiConfig.clockDivider = SPI::ClockDivider::DIV_32; - LIS3MDL::Config config; - config.odr = MAG_LIS_ODR_ENUM; - config.scale = MAG_LIS_FULLSCALE; - config.temperatureDivider = 1; miosix::GpioPin cs(GPIOB_BASE, 7); + cs.mode(miosix::Mode::OUTPUT); + cs.high(); h3lis33 = new H3LIS331DL(ModuleManager::getInstance().get<Buses>()->spi1, cs, H3LIS331DLDefs::OutputDataRate::ODR_50, diff --git a/src/entrypoints/Parafoil/parafoil-entry.cpp b/src/entrypoints/Parafoil/parafoil-entry.cpp index 792299a1e45f45352d1d85eea1c8cab4949e641c..a9b51a8fe2c3ded63dc00a8f93ed965ab6448c55 100644 --- a/src/entrypoints/Parafoil/parafoil-entry.cpp +++ b/src/entrypoints/Parafoil/parafoil-entry.cpp @@ -219,6 +219,7 @@ int main() // modules.get<WingController>()->addAlgorithm(WingConfig::SELECTED_ALGORITHM); // Logger::getInstance().log(f); // logs the config file // If all is correctly set up i publish the init ok + miosix::Thread::sleep(2000); if (initResult) { EventBroker::getInstance().post(FMM_INIT_OK, TOPIC_FMM); diff --git a/src/scripts/logdecoder/Parafoil/logdecoder b/src/scripts/logdecoder/Parafoil/logdecoder index d8e972ef0ee879cc4b79de5eb101b87020364497..3b7f9df6efd639f0e35b223e60ed28d7d21b6ba6 100755 Binary files a/src/scripts/logdecoder/Parafoil/logdecoder and b/src/scripts/logdecoder/Parafoil/logdecoder differ diff --git a/src/scripts/logdecoder/Parafoil/logdecoder.cpp b/src/scripts/logdecoder/Parafoil/logdecoder.cpp index 0df48331042c2d5b7ebd5802b527e23375e03298..1fbeae4d1aa7574f62f1e6377a9857ab463329bd 100644 --- a/src/scripts/logdecoder/Parafoil/logdecoder.cpp +++ b/src/scripts/logdecoder/Parafoil/logdecoder.cpp @@ -20,10 +20,6 @@ * THE SOFTWARE. */ -#include <Parafoil/Configs/WingConfig.h> -#include <Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h> -#include <Parafoil/StateMachines/NASController/NASControllerData.h> -#include <Parafoil/StateMachines/WingController/WingControllerData.h> #include <logger/Deserializer.h> #include <logger/LogTypes.h> #include <radio/Xbee/APIFramesLog.h> @@ -47,8 +43,6 @@ using namespace tscpp; using namespace Boardcore; -using namespace Parafoil; -using namespace WingConfig; using namespace Xbee; void registerTypes(Deserializer& ds) @@ -57,6 +51,15 @@ void registerTypes(Deserializer& ds) LogTypes::registerTypes(ds); // Custom types + // Custom types + ds.registerType<PitotData>(); + ds.registerType<APIFrameLog>(); + ds.registerType<ATCommandFrameLog>(); + ds.registerType<TXRequestFrameLog>(); + ds.registerType<ATCommandResponseFrameLog>(); + ds.registerType<ModemStatusFrameLog>(); + ds.registerType<TXStatusFrameLog>(); + ds.registerType<RXPacketFrameLog>(); } void showUsage(const string& cmdName)