diff --git a/skyward-boardcore b/skyward-boardcore index b6387642f610fcb42c73780448130c319103f87f..9973d441dcbf2e88a7ba52b2d35a923da9f5b55a 160000 --- a/skyward-boardcore +++ b/skyward-boardcore @@ -1 +1 @@ -Subproject commit b6387642f610fcb42c73780448130c319103f87f +Subproject commit 9973d441dcbf2e88a7ba52b2d35a923da9f5b55a diff --git a/src/boards/Payload/Configs/NASConfig.h b/src/boards/Payload/Configs/NASConfig.h index 59b1b427e98d276cdf6950e685d57dd4ab8eaac8..c99dde138646802d2e55355e44f9e2fa946338c4 100644 --- a/src/boards/Payload/Configs/NASConfig.h +++ b/src/boards/Payload/Configs/NASConfig.h @@ -26,8 +26,6 @@ #include <algorithms/ReferenceValues.h> #include <common/ReferenceConfig.h> -using namespace Common::ReferenceConfig; - namespace Payload { diff --git a/src/boards/common/events/Topics.h b/src/boards/common/events/Topics.h index b3a745eeb589310e71558ade453847f893e5afcd..f55dbdac3fa0cdca31f84d5aa27d00b0c5dc6c20 100644 --- a/src/boards/common/events/Topics.h +++ b/src/boards/common/events/Topics.h @@ -41,4 +41,9 @@ enum Topics : uint8_t TOPIC_TMTC, }; +const std::vector<uint8_t> TOPICS_LIST{ + TOPIC_ABK, TOPIC_ADA, TOPIC_DPL, TOPIC_FLIGHT, + TOPIC_FMM, TOPIC_FSR, TOPIC_NAS, TOPIC_TMTC, +}; + } // namespace Common diff --git a/src/entrypoints/Groundstation/GUI/GUI.h b/src/entrypoints/Groundstation/GUI/GUI.h index 94d1b0dd5c0eac269aef47c1f8dd295c66d68336..78829456052ad3610f426f0c6da73d4f2ade9207 100644 --- a/src/entrypoints/Groundstation/GUI/GUI.h +++ b/src/entrypoints/Groundstation/GUI/GUI.h @@ -97,7 +97,8 @@ public: status.setText("READY"); } - void updateStats(const Data &data) { + void updateStats(const Data &data) + { tx_bitrate.setText(format_link_speed(data.tx_bitrate)); sent_count.setText(fmt::format("{}", data.sent_count)); @@ -137,4 +138,4 @@ public: Boardcore::ScreenManager screen_manager; StatsScreen stats_screen; -}; \ No newline at end of file +}; diff --git a/src/entrypoints/Main/main-entry.cpp b/src/entrypoints/Main/main-entry.cpp index ca2f923663832c2be823e90cae457d75f91f5e03..a99ca6b43847568a8a92d2b5fc75f9bb54bbe2b1 100644 --- a/src/entrypoints/Main/main-entry.cpp +++ b/src/entrypoints/Main/main-entry.cpp @@ -35,6 +35,8 @@ #include <common/events/Events.h> #include <diagnostic/CpuMeter/CpuMeter.h> #include <events/EventBroker.h> +#include <events/EventData.h> +#include <events/utils/EventSniffer.h> #include <miosix.h> #include <utils/PinObserver/PinObserver.h> @@ -163,6 +165,15 @@ int main() else EventBroker::getInstance().post(FMM_INIT_ERROR, TOPIC_FMM); + // Log all events + EventSniffer sniffer( + EventBroker::getInstance(), TOPICS_LIST, + [](uint8_t event, uint8_t topic) + { + EventData ev{TimestampTimer::getTimestamp(), event, topic}; + Logger::getInstance().log(ev); + }); + // Periodical statistics while (true) { diff --git a/src/entrypoints/Payload/payload-entry.cpp b/src/entrypoints/Payload/payload-entry.cpp index b495757db180235188607cb57ffb592d740f2436..8c0eff177d712d3d2fc85cb1e5e77f1d181c5190 100644 --- a/src/entrypoints/Payload/payload-entry.cpp +++ b/src/entrypoints/Payload/payload-entry.cpp @@ -38,6 +38,8 @@ #include <diagnostic/CpuMeter/CpuMeter.h> #include <diagnostic/PrintLogger.h> #include <events/EventBroker.h> +#include <events/EventData.h> +#include <events/utils/EventSniffer.h> #include <miosix.h> using namespace miosix; @@ -146,6 +148,15 @@ int main() else EventBroker::getInstance().post(FMM_INIT_ERROR, TOPIC_FMM); + // Log all events + EventSniffer sniffer( + EventBroker::getInstance(), TOPICS_LIST, + [](uint8_t event, uint8_t topic) + { + EventData ev{TimestampTimer::getTimestamp(), event, topic}; + Logger::getInstance().log(ev); + }); + // Periodically statistics while (true) {