diff --git a/src/Groundstation/Automated/Hub.cpp b/src/Groundstation/Automated/Hub.cpp index d9a62adbe7ebeac5446da620daf2d25c1629436f..21d366c1eae2141fa73d6e08713d774584385d94 100644 --- a/src/Groundstation/Automated/Hub.cpp +++ b/src/Groundstation/Automated/Hub.cpp @@ -31,6 +31,7 @@ #include <algorithms/NAS/NASState.h> #include <common/Events.h> #include <common/MavlinkLyra.h> +#include <diagnostic/CpuMeter/CpuMeter.h> #include <logger/Logger.h> #include <sensors/SensorData.h> @@ -46,6 +47,8 @@ void Hub::dispatchOutgoingMsg(const mavlink_message_t& msg) { logHubData.timestamp = TimestampTimer::getTimestamp(); logHubData.groundRx = logHubData.groundRx + 1; + logHubData.cpuMean = CpuMeter::getCpuStats().mean; + Logger::getInstance().log(logHubData); TRACE("[info] Hub: Packet arrived from outgoing messages!!!\n"); @@ -263,6 +266,8 @@ void Hub::dispatchOutgoingMsg(const mavlink_message_t& msg) logHubData.timestamp = TimestampTimer::getTimestamp(); logHubData.sniffedRx = logHubData.sniffedRx + 1; + logHubData.cpuMean = CpuMeter::getCpuStats().mean; + Logger::getInstance().log(logHubData); } } @@ -278,6 +283,8 @@ void Hub::dispatchIncomingMsg(const mavlink_message_t& msg) logHubData.timestamp = TimestampTimer::getTimestamp(); logHubData.rocketRx = logHubData.rocketRx + 1; + logHubData.cpuMean = CpuMeter::getCpuStats().mean; + Logger::getInstance().log(logHubData); // Extracting NAS rocket state diff --git a/src/Groundstation/Automated/HubData.h b/src/Groundstation/Automated/HubData.h index ca56c5e4e91da3893645d6055c9b31b48ff5b4e2..375b112c973c9ab9d3421abbe1aca438f2ab23ca 100644 --- a/src/Groundstation/Automated/HubData.h +++ b/src/Groundstation/Automated/HubData.h @@ -38,16 +38,17 @@ struct HubData uint16_t groundRx = 0; uint16_t rocketRx = 0; uint16_t sniffedRx = 0; + float cpuMean = 0; static std::string header() { - return "timestamp,groundRx,rocketRx,sniffedRx\n"; + return "timestamp,groundRx,rocketRx,sniffedRx,cpuMean\n"; } void print(std::ostream& os) const { os << timestamp << "," << groundRx << "," << rocketRx << "," - << sniffedRx << "\n"; + << sniffedRx << "," << cpuMean << "\n"; } }; } // namespace Antennas