More stats, avg throttle, kaack time

Ivan Efimov · Ivan Efimov · commit d8c1fbeb79ad · 2022-06-02T14:33:47.000-05:00
diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c
@@ -1717,6 +1717,7 @@ const clivalue_t valueTable[] = {
     { "stats_min_armed_time_s",   VAR_INT8   | MASTER_VALUE, .config.minmax = { STATS_OFF, INT8_MAX }, PG_STATS_CONFIG, offsetof(statsConfig_t, stats_min_armed_time_s) },
     { "stats_total_flights",    VAR_UINT32 | MASTER_VALUE, .config.u32Max = UINT32_MAX, PG_STATS_CONFIG, offsetof(statsConfig_t, stats_total_flights) },
     { "stats_extra_total_kaacks",    VAR_UINT32 | MASTER_VALUE, .config.u32Max = UINT32_MAX, PG_STATS_CONFIG, offsetof(statsConfig_t, stats_extra_total_kaacks) },
+    { "stats_extra_total_kaack_time",    VAR_UINT32 | MASTER_VALUE, .config.u32Max = UINT32_MAX, PG_STATS_CONFIG, offsetof(statsConfig_t, stats_extra_total_kaack_time) },
 
     { "stats_total_time_s",     VAR_UINT32 | MASTER_VALUE, .config.u32Max = UINT32_MAX, PG_STATS_CONFIG, offsetof(statsConfig_t, stats_total_time_s) },
     { "stats_total_dist_m",     VAR_UINT32 | MASTER_VALUE, .config.u32Max = UINT32_MAX, PG_STATS_CONFIG, offsetof(statsConfig_t, stats_total_dist_m) },
diff --git a/src/main/cms/cms_menu_persistent_stats.c b/src/main/cms/cms_menu_persistent_stats.c
@@ -39,6 +39,7 @@ uint32_t stats_total_flights;
 uint32_t stats_total_time_s;
 uint32_t stats_total_dist_m;
 uint32_t stats_extra_total_kaacks;
+uint32_t stats_extra_total_kaack_time;
 int8_t stats_min_armed_time_s;
 
 static const void *cmsx_PersistentStats_onEnter(displayPort_t *pDisp)
@@ -50,6 +51,7 @@ static const void *cmsx_PersistentStats_onEnter(displayPort_t *pDisp)
     stats_total_dist_m = statsConfig()->stats_total_dist_m;
     stats_min_armed_time_s = statsConfig()->stats_min_armed_time_s;
     stats_extra_total_kaacks = statsConfig()->stats_extra_total_kaacks;
+    stats_extra_total_kaack_time = statsConfig()->stats_extra_total_kaack_time;
 
     return NULL;
 }
@@ -64,6 +66,7 @@ static const void *cmsx_PersistentStats_onExit(displayPort_t *pDisp, const OSD_E
     statsConfigMutable()->stats_total_dist_m = stats_total_dist_m;
     statsConfigMutable()->stats_min_armed_time_s = stats_min_armed_time_s;
     statsConfigMutable()->stats_extra_total_kaacks = stats_extra_total_kaacks;
+    statsConfigMutable()->stats_extra_total_kaack_time = stats_extra_total_kaack_time;
 
     return NULL;
 }
@@ -76,6 +79,7 @@ static const void *cmsx_ResetStats(displayPort_t *pDisplay, const void *ptr)
     stats_total_time_s = 0;
     stats_total_dist_m = 0;
     stats_extra_total_kaacks = 0;
+    stats_extra_total_kaack_time = 0;
 
     displayClearScreen(pDisplay, DISPLAY_CLEAR_WAIT);
     displayRedraw(pDisplay);
@@ -88,6 +92,7 @@ static const OSD_Entry cmsx_menuPersistentStatsEntries[] =
     {"-- PERSISTENT STATS --", OME_Label, NULL, NULL},
     {"FLIGHTS", OME_UINT32, NULL, &(OSD_UINT32_t){ &stats_total_flights, 0, UINT32_MAX, 1}},
     {"KAACKS", OME_UINT32, NULL, &(OSD_UINT32_t){ &stats_extra_total_kaacks, 0, UINT32_MAX, 1}},
+    {"KAACK TIME", OME_UINT32, NULL, &(OSD_UINT32_t){ &stats_extra_total_kaack_time, 0, UINT32_MAX, 1}},
     {"TIME(sec)", OME_UINT32, NULL, &(OSD_UINT32_t){ &stats_total_time_s, 0, UINT32_MAX, 1}},
     {"DIST(m)", OME_UINT32, NULL, &(OSD_UINT32_t){ &stats_total_dist_m, 0, UINT32_MAX, 1}},
     {"RESET STATS", OME_Funcall, cmsx_ResetStats, NULL},
diff --git a/src/main/fc/stats.c b/src/main/fc/stats.c
@@ -95,6 +95,7 @@ void statsOnDisarm(void)
         }
 
         statsConfigMutable()->stats_extra_total_kaacks += osdGetStats()->extra_kaacks;
+        statsConfigMutable()->stats_extra_total_kaack_time += (osdGetStats()->extra_kaack_time / 1000000);
 
         dispatchAdd(&writeStatsEntry, STATS_SAVE_DELAY_US);
     }
diff --git a/src/main/osd/osd.c b/src/main/osd/osd.c
@@ -190,6 +190,9 @@ const osd_stats_e osdStatsDisplayOrder[OSD_STAT_COUNT] = {
     OSD_STAT_TOTAL_DIST,
     OSD_STAT_EXTRA_KAACK,
     OSD_STAT_EXTRA_KAACK_TOTAL,
+    OSD_STAT_EXTRA_KAACK_TIME,
+    OSD_STAT_EXTRA_KAACK_TIME_TOTAL,
+    OSD_STAT_EXTRA_AVG_THROTTLE
 };
 
 // Group elements in a number of groups to reduce task scheduling overhead
@@ -500,6 +503,9 @@ static void osdResetStats(void)
     stats.min_link_quality = (linkQualitySource == LQ_SOURCE_NONE) ? 99 : 100; // percent
     stats.min_rssi_dbm = CRSF_SNR_MAX;
     stats.extra_kaacks = 0;
+    stats.extra_kaack_time = 0;
+    stats.extra_throttle_sum = 0;
+    stats.extra_throttle_count = 0;
 }
 
 #if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
@@ -885,6 +891,30 @@ static bool osdDisplayStat(int statistic, uint8_t displayRow)
         osdDisplayStatisticLabel(displayRow, "TOTAL KAACKS", buff);
         return true;
 
+    case OSD_STAT_EXTRA_KAACK_TIME:
+        {
+            int seconds = stats.extra_kaack_time / 1000000;
+            const int minutes = seconds / 60;
+            seconds = seconds % 60;
+            tfp_sprintf(buff, "%02d:%02d", minutes, seconds);
+        }
+
+        osdDisplayStatisticLabel(displayRow, "KAACK TIME", buff);
+        return true;
+    case OSD_STAT_EXTRA_KAACK_TIME_TOTAL:
+        {
+            int seconds = statsConfig()->stats_extra_total_kaack_time;
+            const int minutes = seconds / 60;
+            seconds = seconds % 60;
+            tfp_sprintf(buff, "%02d:%02d", minutes, seconds);
+        }
+
+        osdDisplayStatisticLabel(displayRow, "TOTAL KAACK TIME", buff);
+        return true;
+    case OSD_STAT_EXTRA_AVG_THROTTLE:
+        itoa(stats.extra_throttle_sum / stats.extra_throttle_count, buff, 10);
+        osdDisplayStatisticLabel(displayRow, "AVG THROTTLE", buff);
+        return true;
     }
     return false;
 }
@@ -1077,6 +1107,16 @@ STATIC_UNIT_TESTED bool osdProcessStats1(timeUs_t currentTimeUs)
         timeUs_t deltaT = currentTimeUs - lastTimeUs;
         osdFlyTime += deltaT;
         stats.armed_time += deltaT;
+
+        const uint8_t throttleValue = calculateThrottlePercent();
+
+        stats.extra_throttle_count ++;
+        stats.extra_throttle_sum += throttleValue;
+
+        if (100 == throttleValue) {
+            stats.extra_kaack_time += deltaT;
+        }
+
     } else if (osdStatsEnabled) {  // handle showing/hiding stats based on OSD disable switch position
         if (displayIsGrabbed(osdDisplayPort)) {
             osdStatsEnabled = false;
diff --git a/src/main/osd/osd.h b/src/main/osd/osd.h
@@ -202,6 +202,9 @@ typedef enum {
     OSD_STAT_MIN_RSSI_DBM,
     OSD_STAT_EXTRA_KAACK,
     OSD_STAT_EXTRA_KAACK_TOTAL,
+    OSD_STAT_EXTRA_KAACK_TIME,
+    OSD_STAT_EXTRA_KAACK_TIME_TOTAL,
+    OSD_STAT_EXTRA_AVG_THROTTLE,
     OSD_STAT_COUNT // MUST BE LAST
 } osd_stats_e;
 
@@ -332,6 +335,9 @@ typedef struct statistic_s {
     uint16_t min_link_quality;
     int16_t min_rssi_dbm;
     uint8_t extra_kaacks;
+    uint32_t extra_kaack_time;
+    uint32_t extra_throttle_sum;
+    uint32_t extra_throttle_count;
 } statistic_t;
 
 extern timeUs_t resumeRefreshAt;
diff --git a/src/main/pg/stats.c b/src/main/pg/stats.c
@@ -35,5 +35,6 @@ PG_RESET_TEMPLATE(statsConfig_t, statsConfig,
     .stats_total_time_s = 0,
     .stats_total_dist_m = 0,
     .stats_extra_total_kaacks = 0,
+    .stats_extra_total_kaack_time = 0,
 );
 #endif
diff --git a/src/main/pg/stats.h b/src/main/pg/stats.h
@@ -31,6 +31,7 @@ typedef struct statsConfig_s {
     uint32_t stats_total_dist_m;
     int8_t stats_min_armed_time_s;
     uint32_t stats_extra_total_kaacks;
+    uint32_t stats_extra_total_kaack_time;
 } statsConfig_t;
 
 PG_DECLARE(statsConfig_t, statsConfig);

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ void statsOnDisarm(void)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`statsConfigMutable()->stats_extra_total_kaacks += osdGetStats()->extra_kaacks;`
	`98`	`+ statsConfigMutable()->stats_extra_total_kaack_time += (osdGetStats()->extra_kaack_time / 1000000);`
`98`	`99`
`99`	`100`	`dispatchAdd(&writeStatsEntry, STATS_SAVE_DELAY_US);`
`100`	`101`	`}`