diff --git a/CMakeLists.txt b/CMakeLists.txt index d3794486184324c51fc6103b212337fcb26101c7..493177f4e7bbaa9b23c421ab3830e3e01217cca2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,4 +37,3 @@ add_executable(main-entry src/entrypoints/MockupMain/main-entry.cpp ${MOCKUP_MAI target_include_directories(main-entry PRIVATE ${OBSW_INCLUDE_DIRS}) target_compile_definitions(main-entry PRIVATE) sbs_target(main-entry stm32f429zi_skyward_death_stack_x) - diff --git a/src/boards/MockupMain/Configs/SensorsConfig.h b/src/boards/MockupMain/Configs/SensorsConfig.h index d6dafcf9de868e406b80892a82c7c4c9cd2f8433..21973a625de7e7adc5fbd7a823073a827484210e 100644 --- a/src/boards/MockupMain/Configs/SensorsConfig.h +++ b/src/boards/MockupMain/Configs/SensorsConfig.h @@ -126,7 +126,7 @@ constexpr unsigned int INTERNAL_TEMP_SAMPLE_PERIOD = 2000; // [ms] // LoadCell constexpr unsigned int LOAD_CELL_SAMPLE_PERIOD = 1; // [ms] constexpr Boardcore::ADS131M08Defs::Channel LOAD_CELL_ADC_CHANNEL = - Boardcore::ADS131M08Defs::Channel::CHANNEL_0; + Boardcore::ADS131M08Defs::Channel::CHANNEL_0; // TODO set calibration static constexpr float LOAD_CELL_P0_VOLTAGE = 1; static constexpr float LOAD_CELL_P0_MASS = 1; diff --git a/src/boards/MockupMain/Radio/Radio.cpp b/src/boards/MockupMain/Radio/Radio.cpp index e86c725b5003d72bedd1c41dc68950c90bf191b8..9936a143e7e5da800f261be8928832b29f038118 100644 --- a/src/boards/MockupMain/Radio/Radio.cpp +++ b/src/boards/MockupMain/Radio/Radio.cpp @@ -93,8 +93,7 @@ bool Radio::start() // Config mavDriver mavDriver = new MavDriver( - transceiver, - [=](MavDriver*, const mavlink_message_t& msg) + transceiver, [=](MavDriver*, const mavlink_message_t& msg) { this->handleMavlinkMessage(msg); }, RadioConfig::RADIO_SLEEP_AFTER_SEND, RadioConfig::RADIO_OUT_BUFFER_MAX_AGE); diff --git a/src/boards/MockupMain/Sensors/Sensors.cpp b/src/boards/MockupMain/Sensors/Sensors.cpp index c00ea87c18df9b4f5dd83f77da13197bd4ac3807..afbb412ecf05a9dde42be8959ebc9436499b79b0 100644 --- a/src/boards/MockupMain/Sensors/Sensors.cpp +++ b/src/boards/MockupMain/Sensors/Sensors.cpp @@ -508,7 +508,8 @@ void Sensors::ubxGpsCallback() Logger::getInstance().log(lastSample); } -void Sensors::ads131Callback() { +void Sensors::ads131Callback() +{ // We don't log the adc in this test } diff --git a/src/boards/common/Mavlink.h b/src/boards/common/Mavlink.h index 97ea89d8fa0fcfcf1cc13b0aec56956f283a4d4b..2f07834181c44581540d6cab802e1053041d9bc0 100644 --- a/src/boards/common/Mavlink.h +++ b/src/boards/common/Mavlink.h @@ -26,4 +26,4 @@ #pragma GCC diagnostic ignored "-Waddress-of-packed-member" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #include <mavlink_lib/gemini/mavlink.h> -#pragma GCC diagnostic pop \ No newline at end of file +#pragma GCC diagnostic pop diff --git a/src/boards/common/Radio.h b/src/boards/common/Radio.h index 61595d7f358cf3259302c6d11aae6e53a5545b05..aaa5b3eac853d20fd0d3ac97f4de7771be547ae6 100644 --- a/src/boards/common/Radio.h +++ b/src/boards/common/Radio.h @@ -25,4 +25,4 @@ namespace Common { -} // namespace Common \ No newline at end of file +} // namespace Common diff --git a/src/entrypoints/MockupMain/main-entry.cpp b/src/entrypoints/MockupMain/main-entry.cpp index 0667b4e39a5570fca6fc935d1d12a05d1a0031e0..841240e1ac3e645ed60d8d0968342e58fe6efbc3 100644 --- a/src/entrypoints/MockupMain/main-entry.cpp +++ b/src/entrypoints/MockupMain/main-entry.cpp @@ -178,13 +178,13 @@ int main() } // Log all the events - EventSniffer sniffer( - EventBroker::getInstance(), TOPICS_LIST, - [](uint8_t event, uint8_t topic) - { - EventData ev{TimestampTimer::getTimestamp(), event, topic}; - Logger::getInstance().log(ev); - }); + EventSniffer sniffer(EventBroker::getInstance(), TOPICS_LIST, + [](uint8_t event, uint8_t topic) + { + EventData ev{TimestampTimer::getTimestamp(), event, + topic}; + Logger::getInstance().log(ev); + }); // Check the init result and launch an event if (initResult) diff --git a/src/entrypoints/MockupMain/test-stackv2-shield.cpp b/src/entrypoints/MockupMain/test-stackv2-shield.cpp index 16a35efc43a80a99a65d537dcb1054e7001ceaf5..6f1c0300dade852911d1f6e7ceccdc623a777de5 100644 --- a/src/entrypoints/MockupMain/test-stackv2-shield.cpp +++ b/src/entrypoints/MockupMain/test-stackv2-shield.cpp @@ -267,11 +267,11 @@ int testADS(GpioPin cs) ADS131M08Data data = ads131.getLastSample(); - printf( - "% 2.8f\n", - // \t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\n", - data.voltage[0]/*, data.voltage[1], data.voltage[2], data.voltage[3], - data.voltage[4], data.voltage[5], data.voltage[6], data.voltage[7]);*/ + printf("% 2.8f\n", + // \t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\t% 2.8f\n", + data.voltage[0] /*, data.voltage[1], data.voltage[2], + data.voltage[3], data.voltage[4], data.voltage[5], + data.voltage[6], data.voltage[7]);*/ ); delayMs(200); }