diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 2ae159515ee83c9ae31157d17da269cc426044dc..4b020343a7afcbcdf7f2ad77dadb3ca22c89088c 100755 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -261,7 +261,6 @@ "_MIOSIX", "__cplusplus=201103L", "HILSimulation", - "USE_XBEE_TRANSCEIVER", "EUROC" ], "includePath": [ @@ -325,7 +324,6 @@ "_MIOSIX", "__cplusplus=201103L", "HILSimulation", - "USE_XBEE_TRANSCEIVER", "ROCCARASO" ], "includePath": [ @@ -685,4 +683,4 @@ } ], "version": 4 -} +} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 363e06779b8e934a326de0fe2be3e228c088028b..169071de35284a97d93f5960495b217a93bf231b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ sbs_target(auxiliary-entry stm32f429zi_skyward_pyxis_auxiliary) add_executable(main-entry-euroc src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER}) target_include_directories(main-entry-euroc PRIVATE ${OBSW_INCLUDE_DIRS}) -target_compile_definitions(main-entry-euroc PRIVATE EUROC BUZZER_LOW) +target_compile_definitions(main-entry-euroc PRIVATE EUROC) sbs_target(main-entry-euroc stm32f429zi_skyward_death_stack_v3) add_executable(main-entry-roccaraso src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER}) diff --git a/src/boards/Ciuti/Algorithm/UprightDetector.cpp b/src/boards/Ciuti/Algorithm/UprightDetector.cpp index ab1649ea8f33e2e995bf1e50cf713d2f0279058f..731d3633111327610db7a14d0baa8c4c4b1f0471 100644 --- a/src/boards/Ciuti/Algorithm/UprightDetector.cpp +++ b/src/boards/Ciuti/Algorithm/UprightDetector.cpp @@ -91,11 +91,13 @@ void UprightDetectorController::update() { auto sample = Sensors::getInstance().getLIS331HHLastSample(); - if(!fired) { + if (!fired) + { algo.update(sample.accelerationZ - - Ciuti::SensorsConfig::Z_AXIS_OFFSET_LIS331HH); + Ciuti::SensorsConfig::Z_AXIS_OFFSET_LIS331HH); - if(algo.isUpright()) { + if (algo.isUpright()) + { trigger(); fired = true; } diff --git a/src/boards/Ciuti/Serial/SerialWatcher.h b/src/boards/Ciuti/Serial/SerialWatcher.h index dbb3d2961a5845c1a6f354f093891111e7a0363a..8fd6089f47da3649168466b89b7d49a3cbef3acf 100644 --- a/src/boards/Ciuti/Serial/SerialWatcher.h +++ b/src/boards/Ciuti/Serial/SerialWatcher.h @@ -24,8 +24,8 @@ #include <ActiveObject.h> #include <Singleton.h> -#include <drivers/usart/USART.h> #include <diagnostic/PrintLogger.h> +#include <drivers/usart/USART.h> #include "SerialWatcherStats.h" diff --git a/src/boards/Ciuti/Serial/SerialWatcherStats.h b/src/boards/Ciuti/Serial/SerialWatcherStats.h index 9f083fd2d30eeb2ecc5c1b1f6c87e4bdde51e6e0..2c792e43d1dcc2a028f70069068e5a35684741cd 100644 --- a/src/boards/Ciuti/Serial/SerialWatcherStats.h +++ b/src/boards/Ciuti/Serial/SerialWatcherStats.h @@ -24,14 +24,14 @@ #include <cstdint> -namespace Ciuti +namespace Ciuti { struct SerialWatcherStats { - uint64_t last_timestamp = 0; + uint64_t last_timestamp = 0; unsigned int error_count = 0; - unsigned int usart_id = 0; + unsigned int usart_id = 0; }; -} \ No newline at end of file +} // namespace Ciuti \ No newline at end of file diff --git a/src/boards/Main/Radio/Radio.cpp b/src/boards/Main/Radio/Radio.cpp index 0597b93d5b84731a158510aecc4ef21ca19b43ea..e1a542bf49b0eaa10b6804bcee1164527bec8e21 100644 --- a/src/boards/Main/Radio/Radio.cpp +++ b/src/boards/Main/Radio/Radio.cpp @@ -122,7 +122,7 @@ Radio::Radio() new SX1278(Buses::getInstance().spi5, sensors::sx127x::cs::getPin()); SX1278::Config config = {}; - config.freq_rf = 412000000; + config.freq_rf = 412000000; // Use default configuration transceiver->init(config); diff --git a/src/boards/Payload/Configs/CanHandlerConfig.h b/src/boards/Payload/Configs/CanHandlerConfig.h index 5e1917ff76cb2f155f9e1e467b4eed9231cbc8a7..b3829aabd674d8252e291a33895958714cddff98 100644 --- a/src/boards/Payload/Configs/CanHandlerConfig.h +++ b/src/boards/Payload/Configs/CanHandlerConfig.h @@ -34,6 +34,7 @@ namespace Payload namespace CanHandlerConfig { + // Important to use only TMTC events because the Can sends on that topic static const std::map<Common::CanConfig::EventId, Common::Events> eventToEvent{ {Common::CanConfig::EventId::ARM, Common::TMTC_ARM}, diff --git a/src/boards/Payload/Wing/AltitudeTrigger.cpp b/src/boards/Payload/Wing/AltitudeTrigger.cpp index 9900ea3f84d6a7c2b610362224540775ec27e5fb..bbef54be689c0f60fa82cb0539894bebde7237e6 100644 --- a/src/boards/Payload/Wing/AltitudeTrigger.cpp +++ b/src/boards/Payload/Wing/AltitudeTrigger.cpp @@ -38,6 +38,7 @@ using namespace Common; namespace Payload { + AltitudeTrigger::AltitudeTrigger() { BoardScheduler::getInstance().getScheduler().addTask( @@ -75,4 +76,5 @@ void AltitudeTrigger::update() } } } + } // namespace Payload diff --git a/src/boards/Payload/Wing/AltitudeTrigger.h b/src/boards/Payload/Wing/AltitudeTrigger.h index bd14a3f3a67cad40d8a21ff676d71d518ae0aa37..dd8c499fc43c0eb40ffcbe9e131aaa8fd1367c3f 100644 --- a/src/boards/Payload/Wing/AltitudeTrigger.h +++ b/src/boards/Payload/Wing/AltitudeTrigger.h @@ -27,6 +27,7 @@ namespace Payload { + class AltitudeTrigger : public Boardcore::Singleton<AltitudeTrigger> { friend class Boardcore::Singleton<AltitudeTrigger>; @@ -49,4 +50,5 @@ private: // altitude int confidence; }; + } // namespace Payload diff --git a/src/entrypoints/Ciuti/ciuti-entry.cpp b/src/entrypoints/Ciuti/ciuti-entry.cpp index 9b75822c5956614f64ee786d33bcdf099aa981c5..a5f40d4b6dc108b438732a67674fdc69d5c36a17 100644 --- a/src/entrypoints/Ciuti/ciuti-entry.cpp +++ b/src/entrypoints/Ciuti/ciuti-entry.cpp @@ -20,11 +20,11 @@ * THE SOFTWARE. */ +#include <Ciuti/Algorithm/UprightDetector.h> #include <Ciuti/BoardScheduler.h> #include <Ciuti/Sensors/Sensors.h> -#include <diagnostic/CpuMeter/CpuMeter.h> -#include <Ciuti/Algorithm/UprightDetector.h> #include <Ciuti/Serial/SerialWatcher.h> +#include <diagnostic/CpuMeter/CpuMeter.h> #include <thread> @@ -34,6 +34,7 @@ using namespace Ciuti; void printCiutiBanner() { + // clang-format off printf( R"( Booting ... )""\n" R"( ________ ___ ___ ___ _________ ___ )""\n" @@ -45,14 +46,14 @@ void printCiutiBanner() R"( \|_______|\|__|\|_______| \|__| \|__|)""\n" R"( On Board Software )""\n" ); + // clang-format on } int main() { printCiutiBanner(); - Boardcore::PrintLogger logger = - Boardcore::Logging::getLogger("ciuti.main"); + Boardcore::PrintLogger logger = Boardcore::Logging::getLogger("ciuti.main"); Sensors::getInstance().start(); UprightDetectorController::getInstance().start(); diff --git a/src/entrypoints/Groundstation/groundstation-entry.cpp b/src/entrypoints/Groundstation/groundstation-entry.cpp index bf2eeaba6cee1231117b7b75226cc6f8381d3d34..3d81da4809be5fd2f297227874a0920d9c24ddcb 100644 --- a/src/entrypoints/Groundstation/groundstation-entry.cpp +++ b/src/entrypoints/Groundstation/groundstation-entry.cpp @@ -74,9 +74,9 @@ void recvLoop() while (true) { - int len = sx1278->receive(msg, sizeof(msg)); + int len = sx1278->receive(msg, sizeof(msg)); stats.rssi = sx1278->getLastRxRssi(); - stats.fei = sx1278->getLastRxFei(); + stats.fei = sx1278->getLastRxFei(); stats.recv_count++; stats.cur_rx += len; @@ -96,7 +96,7 @@ void sendLoop() sx1278->send(msg, len); stats.sent_count++; stats.cur_tx += len; - ledOff(); + ledOff(); } } @@ -182,9 +182,12 @@ int main() stats.cur_rx = 0; stats.cur_tx = 0; - StatsScreen::Data data = {stats.txBitrate() * 8, stats.rxBitrate() * 8, - stats.sent_count, stats.recv_count, - stats.rssi, stats.fei}; + StatsScreen::Data data = {stats.txBitrate() * 8, + stats.rxBitrate() * 8, + stats.sent_count, + stats.recv_count, + stats.rssi, + stats.fei}; gui->stats_screen.updateStats(data); Thread::sleep(DELTA_T);