move stats to utils namespace

rtlopez · Nov 3, 2024 · 54adccf · 54adccf
1 parent a87f8a9
commit 54adccf
Show file tree

Hide file tree

Showing 19 changed files with 284 additions and 247 deletions.
diff --git a/lib/Espfc/src/Blackbox/Blackbox.cpp b/lib/Espfc/src/Blackbox/Blackbox.cpp
@@ -208,7 +208,7 @@ int FAST_CODE_ATTR Blackbox::update()
   if(!_model.blackboxEnabled()) return 0;
   if(_model.config.blackbox.dev == BLACKBOX_DEV_SERIAL && !_serial) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_BLACKBOX);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_BLACKBOX);
 
   uint32_t startTime = micros();
   updateArmed();

diff --git a/lib/Espfc/src/Control/Actuator.cpp b/lib/Espfc/src/Control/Actuator.cpp
@@ -28,7 +28,7 @@ int Actuator::begin()
 int Actuator::update()
 {
   uint32_t startTime = micros();
-  Stats::Measure(_model.state.stats, COUNTER_ACTUATOR);
+  Utils::Stats::Measure(_model.state.stats, COUNTER_ACTUATOR);
   updateArmingDisabled();
   updateModeMask();
   updateArmed();

diff --git a/lib/Espfc/src/Control/Controller.cpp b/lib/Espfc/src/Control/Controller.cpp
@@ -24,7 +24,7 @@ int FAST_CODE_ATTR Controller::update()
   }
 
   {
-    Stats::Measure(_model.state.stats, COUNTER_OUTER_PID);
+    Utils::Stats::Measure(_model.state.stats, COUNTER_OUTER_PID);
     resetIterm();
     if(_model.config.mixer.type == FC_MIXER_GIMBAL)
     {
@@ -37,7 +37,7 @@ int FAST_CODE_ATTR Controller::update()
   }
 
   {
-    Stats::Measure(_model.state.stats, COUNTER_INNER_PID);
+    Utils::Stats::Measure(_model.state.stats, COUNTER_INNER_PID);
     if(_model.config.mixer.type == FC_MIXER_GIMBAL)
     {
       innerLoopRobot();

diff --git a/lib/Espfc/src/Control/Fusion.cpp b/lib/Espfc/src/Control/Fusion.cpp
@@ -32,7 +32,7 @@ void Fusion::restoreGain()
 
 int FAST_CODE_ATTR Fusion::update()
 {
-  Stats::Measure measure(_model.state.stats, COUNTER_IMU_FUSION);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_IMU_FUSION);
 
   if(_model.accelActive())
   {

diff --git a/lib/Espfc/src/Espfc.cpp b/lib/Espfc/src/Espfc.cpp
@@ -44,7 +44,7 @@ int FAST_CODE_ATTR Espfc::update(bool externalTrigger)
   {
     if(!_model.state.gyro.timer.check()) return 0;
   }
-  Stats::Measure measure(_model.state.stats, COUNTER_CPU_0);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_CPU_0);
 
 #if defined(ESPFC_MULTI_CORE)
 
@@ -102,7 +102,7 @@ int FAST_CODE_ATTR Espfc::updateOther()
   }
   Event e = _model.state.appQueue.receive();
 
-  Stats::Measure measure(_model.state.stats, COUNTER_CPU_1);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_CPU_1);
 
   switch(e.type)
   {

diff --git a/lib/Espfc/src/Input.cpp b/lib/Espfc/src/Input.cpp
@@ -98,7 +98,7 @@ int FAST_CODE_ATTR Input::update()
 
 InputStatus FAST_CODE_ATTR Input::readInputs()
 {
-  Stats::Measure readMeasure(_model.state.stats, COUNTER_INPUT_READ);
+  Utils::Stats::Measure readMeasure(_model.state.stats, COUNTER_INPUT_READ);
   uint32_t startTime = micros();
 
   InputStatus status = _device->update();
@@ -183,7 +183,7 @@ void FAST_CODE_ATTR Input::processInputs()
 
 bool FAST_CODE_ATTR Input::failsafe(InputStatus status)
 {
-  Stats::Measure readMeasure(_model.state.stats, COUNTER_FAILSAFE);
+  Utils::Stats::Measure readMeasure(_model.state.stats, COUNTER_FAILSAFE);
 
   if(_model.isSwitchActive(MODE_FAILSAFE))
   {
@@ -251,7 +251,7 @@ void FAST_CODE_ATTR Input::failsafeStage2()
 
 void FAST_CODE_ATTR Input::filterInputs(InputStatus status)
 {
-  Stats::Measure filterMeasure(_model.state.stats, COUNTER_INPUT_FILTER);
+  Utils::Stats::Measure filterMeasure(_model.state.stats, COUNTER_INPUT_FILTER);
   uint32_t startTime = micros();
 
   const bool newFrame = status != INPUT_IDLE;

diff --git a/lib/Espfc/src/ModelState.h b/lib/Espfc/src/ModelState.h
@@ -13,7 +13,7 @@
 #include "Kalman.h"
 #include "Utils/Filter.h"
 #include "Utils/Timer.h"
-#include "Stats.h"
+#include "Utils/Stats.h"
 #include "Device/SerialDevice.h"
 #include "Math/FreqAnalyzer.h"
 #include "Msp/Msp.h"
@@ -351,7 +351,7 @@ struct ModelState
   Utils::Timer telemetryTimer;
 
   ModeState mode;
-  Stats stats;
+  Utils::Stats stats;
 
   int16_t debug[DEBUG_VALUE_COUNT];
 

diff --git a/lib/Espfc/src/Output/Mixer.cpp b/lib/Espfc/src/Output/Mixer.cpp
@@ -108,7 +108,7 @@ int FAST_CODE_ATTR Mixer::update()
 
 void FAST_CODE_ATTR Mixer::updateMixer(const MixerConfig& mixer, float * outputs)
 {
-  Stats::Measure mixerMeasure(_model.state.stats, COUNTER_MIXER);
+  Utils::Stats::Measure mixerMeasure(_model.state.stats, COUNTER_MIXER);
 
   float sources[MIXER_SOURCE_MAX];
   sources[MIXER_SOURCE_NULL]   = 0;
@@ -236,7 +236,7 @@ float FAST_CODE_ATTR Mixer::limitOutput(float output, const OutputChannelConfig&
 
 void FAST_CODE_ATTR Mixer::writeOutput(const MixerConfig& mixer, float * out)
 {
-  Stats::Measure mixerMeasure(_model.state.stats, COUNTER_MIXER_WRITE);
+  Utils::Stats::Measure mixerMeasure(_model.state.stats, COUNTER_MIXER_WRITE);
 
   bool stop = _stop();
   for(size_t i = 0; i < OUTPUT_CHANNELS; i++)
@@ -280,7 +280,7 @@ void FAST_CODE_ATTR Mixer::writeOutput(const MixerConfig& mixer, float * out)
 
 void FAST_CODE_ATTR Mixer::readTelemetry()
 {
-  Stats::Measure mixerMeasure(_model.state.stats, COUNTER_MIXER_READ);
+  Utils::Stats::Measure mixerMeasure(_model.state.stats, COUNTER_MIXER_READ);
   if(!_model.config.output.dshotTelemetry || !_motor) return;
 
   for(size_t i = 0; i < OUTPUT_CHANNELS; i++)

diff --git a/lib/Espfc/src/Sensor/AccelSensor.cpp b/lib/Espfc/src/Sensor/AccelSensor.cpp
@@ -44,7 +44,7 @@ int FAST_CODE_ATTR AccelSensor::read()
 
   //if(!_model.state.accel.timer.check()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_ACCEL_READ);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_ACCEL_READ);
   _gyro->readAccel(_model.state.accel.raw);
 
   return 1;
@@ -54,7 +54,7 @@ int FAST_CODE_ATTR AccelSensor::filter()
 {
   if(!_model.accelActive()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_ACCEL_FILTER);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_ACCEL_FILTER);
 
   _model.state.accel.adc = (VectorFloat)_model.state.accel.raw * _model.state.accel.scale;
 

diff --git a/lib/Espfc/src/Sensor/BaroSensor.cpp b/lib/Espfc/src/Sensor/BaroSensor.cpp
@@ -44,7 +44,7 @@ int BaroSensor::read()
 
   if(_wait > micros()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_BARO);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_BARO);
 
   if(_model.config.debug.mode == DEBUG_BARO)
   {

diff --git a/lib/Espfc/src/Sensor/GyroSensor.cpp b/lib/Espfc/src/Sensor/GyroSensor.cpp
@@ -63,7 +63,7 @@ int FAST_CODE_ATTR GyroSensor::read()
 {
   if (!_model.gyroActive()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_GYRO_READ);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_GYRO_READ);
 
   _gyro->readGyro(_model.state.gyro.raw);
 
@@ -88,7 +88,7 @@ int FAST_CODE_ATTR GyroSensor::filter()
 {
   if (!_model.gyroActive()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_GYRO_FILTER);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_GYRO_FILTER);
 
   _model.state.gyro.adc = _model.state.gyro.sampled;
 
@@ -163,7 +163,7 @@ void FAST_CODE_ATTR GyroSensor::rpmFilterUpdate()
 {
   if (!_rpm_enabled) return;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_RPM_UPDATE);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_RPM_UPDATE);
 
   const float motorFreq = _model.state.output.telemetry.freq[_rpm_motor_index];
   for (size_t n = 0; n < _model.config.gyro.rpmFilter.harmonics; n++)
@@ -199,7 +199,7 @@ void FAST_CODE_ATTR GyroSensor::dynNotchFilterUpdate()
 
   if (_dyn_notch_enabled || _dyn_notch_debug)
   {
-    Stats::Measure measure(_model.state.stats, COUNTER_GYRO_FFT);
+    Utils::Stats::Measure measure(_model.state.stats, COUNTER_GYRO_FFT);
 
     const float q = _model.config.gyro.dynamicFilter.q * 0.01;
     bool feed = _model.state.loopTimer.iteration % _dyn_notch_denom == 0;

diff --git a/lib/Espfc/src/Sensor/MagSensor.cpp b/lib/Espfc/src/Sensor/MagSensor.cpp
@@ -42,7 +42,7 @@ int MagSensor::read()
 {
   if(!_mag || !_model.magActive() || !_model.state.mag.timer.check()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_MAG_READ);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_MAG_READ);
   _mag->readMag(_model.state.mag.raw);
 
   return 1;
@@ -52,7 +52,7 @@ int MagSensor::filter()
 {
   if(!_mag || !_model.magActive()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_MAG_FILTER);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_MAG_FILTER);
 
   _model.state.mag.adc = _mag->convert(_model.state.mag.raw);
 

diff --git a/lib/Espfc/src/Sensor/VoltageSensor.cpp b/lib/Espfc/src/Sensor/VoltageSensor.cpp
@@ -28,7 +28,7 @@ int VoltageSensor::update()
 {
   if (!_model.state.battery.timer.check()) return 0;
 
-  Stats::Measure measure(_model.state.stats, COUNTER_BATTERY);
+  Utils::Stats::Measure measure(_model.state.stats, COUNTER_BATTERY);
 
   switch (_state)
   {

diff --git a/lib/Espfc/src/SerialManager.cpp b/lib/Espfc/src/SerialManager.cpp
@@ -147,7 +147,7 @@ int FAST_CODE_ATTR SerialManager::update()
   {
     if(!serialRx)
     {
-      Stats::Measure measure(_model.state.stats, COUNTER_SERIAL);
+      Utils::Stats::Measure measure(_model.state.stats, COUNTER_SERIAL);
       size_t len = stream->available();
       if(len > 0)
       {