stats improvement

rtlopez · Jan 27, 2024 · 4e24a83 · 4e24a83
1 parent 15b982d
commit 4e24a83
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lib/Espfc/src/Cli.h b/lib/Espfc/src/Cli.h
@@ -1206,6 +1206,7 @@ class Cli
           int time = lrintf(_model.state.stats.getTime(c));
           float load = _model.state.stats.getLoad(c);
           int freq = lrintf(_model.state.stats.getFreq(c));
+          int real = lrintf(_model.state.stats.getReal(c));
 
           s.print(FPSTR(_model.state.stats.getName(c)));
           s.print(": ");
@@ -1214,6 +1215,11 @@ class Cli
           s.print(time);
           s.print("us,  ");
 
+          if(real < 100) s.print(' ');
+          if(real < 10) s.print(' ');
+          s.print(real);
+          s.print("us/i,  ");
+
           if(load < 10) s.print(' ');
           s.print(load, 1);
           s.print("%,  ");

diff --git a/lib/Espfc/src/Stats.h b/lib/Espfc/src/Stats.h
@@ -98,8 +98,9 @@ class Stats
       for(size_t i = 0; i < COUNTER_COUNT; i++)
       {
         _avg[i] = (float)_sum[i] / timer.delta;
-        _sum[i] = 0;
         _freq[i] = (float)_count[i] * 1e6 / timer.delta;
+        _real[i] = _count[i] > 0 ? ((float)_sum[i] / _count[i]) : 0.0f;
+        _sum[i] = 0;
         _count[i] = 0;
       }
     }
@@ -117,6 +118,11 @@ class Stats
       return _avg[c] * timer.interval * 0.001f;
     }
 
+    float getReal(StatCounter c) const
+    {
+      return _real[c];
+    }
+
     float getFreq(StatCounter c) const
     {
       return _freq[c];
@@ -196,6 +202,7 @@ class Stats
     uint32_t _count[COUNTER_COUNT];
     float _avg[COUNTER_COUNT];
     float _freq[COUNTER_COUNT];
+    float _real[COUNTER_COUNT];
     uint32_t _loop_last;
     int32_t _loop_time;
 };

diff --git a/lib/Espfc/src/Target/TargetESP32s2.h b/lib/Espfc/src/Target/TargetESP32s2.h
@@ -44,7 +44,6 @@
 #define SERIAL_TX_FIFO_SIZE 0xFF
 
 #define ESPFC_SPI_0
-#define ESPFC_SPI_0_DEV SPI1
 #define ESPFC_SPI_0_SCK 12
 #define ESPFC_SPI_0_MOSI 11
 #define ESPFC_SPI_0_MISO 13