kaack counter

Author: Ivan Efimov

src/main/cli/settings.c

@@ -1716,6 +1716,7 @@ const clivalue_t valueTable[] = {
 #ifdef USE_PERSISTENT_STATS
     { "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_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) },

src/main/cms/cms_menu_persistent_stats.c

@@ -38,6 +38,7 @@
 uint32_t stats_total_flights;
 uint32_t stats_total_time_s;
 uint32_t stats_total_dist_m;
+uint32_t stats_extra_total_kaacks;
 int8_t stats_min_armed_time_s;
 
 static const void *cmsx_PersistentStats_onEnter(displayPort_t *pDisp)
@@ -48,6 +49,7 @@ static const void *cmsx_PersistentStats_onEnter(displayPort_t *pDisp)
     stats_total_time_s = statsConfig()->stats_total_time_s;
     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;
 
     return NULL;
 }
@@ -61,6 +63,7 @@ static const void *cmsx_PersistentStats_onExit(displayPort_t *pDisp, const OSD_E
     statsConfigMutable()->stats_total_time_s = stats_total_time_s;
     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;
 
     return NULL;
 }
@@ -72,6 +75,7 @@ static const void *cmsx_ResetStats(displayPort_t *pDisplay, const void *ptr)
     stats_total_flights = 0;
     stats_total_time_s = 0;
     stats_total_dist_m = 0;
+    stats_extra_total_kaacks = 0;
 
     displayClearScreen(pDisplay, DISPLAY_CLEAR_WAIT);
     displayRedraw(pDisplay);
@@ -83,6 +87,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}},
     {"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},

src/main/fc/stats.c

@@ -33,6 +33,7 @@
 #include "io/gps.h"
 
 #include "pg/stats.h"
+#include "osd/osd.h"
 
 
 #define STATS_SAVE_DELAY_US 500000 // Let disarming complete and save stats after this time
@@ -91,15 +92,11 @@ void statsOnDisarm(void)
             statsConfigMutable()->stats_total_flights += 1;    // arm / flight counter
             statsConfigMutable()->stats_total_time_s += dtS;
             statsConfigMutable()->stats_total_dist_m += (DISTANCE_FLOWN_CM - arm_distance_cm) / 100;
-
-            saveRequired = true;
         }
 
-        if (saveRequired) {
-            /* signal that stats need to be saved but don't execute time consuming flash operation
-               now - let the disarming process complete and then execute the actual save */
-            dispatchAdd(&writeStatsEntry, STATS_SAVE_DELAY_US);
-        }
+        statsConfigMutable()->stats_extra_total_kaacks += osdGetStats()->extra_kaacks;
+
+        dispatchAdd(&writeStatsEntry, STATS_SAVE_DELAY_US);
     }
 }
 #endif

src/main/osd/osd.c

@@ -188,6 +188,8 @@ const osd_stats_e osdStatsDisplayOrder[OSD_STAT_COUNT] = {
     OSD_STAT_TOTAL_FLIGHTS,
     OSD_STAT_TOTAL_TIME,
     OSD_STAT_TOTAL_DIST,
+    OSD_STAT_EXTRA_KAACK,
+    OSD_STAT_EXTRA_KAACK_TOTAL,
 };
 
 // Group elements in a number of groups to reduce task scheduling overhead
@@ -497,6 +499,7 @@ static void osdResetStats(void)
     stats.max_esc_rpm  = 0;
     stats.min_link_quality = (linkQualitySource == LQ_SOURCE_NONE) ? 99 : 100; // percent
     stats.min_rssi_dbm = CRSF_SNR_MAX;
+    stats.extra_kaacks = 0;
 }
 
 #if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
@@ -873,6 +876,15 @@ static bool osdDisplayStat(int statistic, uint8_t displayRow)
         osdDisplayStatisticLabel(displayRow, "TOTAL DISTANCE", buff);
         return true;
 #endif
+    case OSD_STAT_EXTRA_KAACK:
+        itoa(stats.extra_kaacks, buff, 10);
+        osdDisplayStatisticLabel(displayRow, "KAACKS", buff);
+        return true;
+    case OSD_STAT_EXTRA_KAACK_TOTAL:
+        itoa(statsConfig()->stats_extra_total_kaacks, buff, 10);
+        osdDisplayStatisticLabel(displayRow, "TOTAL KAACKS", buff);
+        return true;
+
     }
     return false;
 }

src/main/osd/osd.h

@@ -200,6 +200,8 @@ typedef enum {
     OSD_STAT_TOTAL_TIME,
     OSD_STAT_TOTAL_DIST,
     OSD_STAT_MIN_RSSI_DBM,
+    OSD_STAT_EXTRA_KAACK,
+    OSD_STAT_EXTRA_KAACK_TOTAL,
     OSD_STAT_COUNT // MUST BE LAST
 } osd_stats_e;
 
@@ -329,6 +331,7 @@ typedef struct statistic_s {
     int32_t max_esc_rpm;
     uint16_t min_link_quality;
     int16_t min_rssi_dbm;
+    uint8_t extra_kaacks;
 } statistic_t;
 
 extern timeUs_t resumeRefreshAt;

src/main/osd/osd_elements.c

@@ -1425,7 +1425,22 @@ static void osdElementStickOverlay(osdElementParms_t *element)
 
 static void osdElementThrottlePosition(osdElementParms_t *element)
 {
+    static bool previousKaack = false;
+
     const uint8_t throttleValue = calculateThrottlePercent();
+
+    if (ARMING_FLAG(ARMED)) {
+        if (100 == throttleValue) {
+            if (!previousKaack) {
+                osdGetStats()->extra_kaacks++;
+            }
+
+            previousKaack = true;
+        } else {
+            previousKaack = false;
+        }
+    }
+
     if (strlen(pilotConfig()->extra100Throttle) == 0 || throttleValue < 100)
     {
         tfp_sprintf(element->buff, "%c%3d", SYM_THR, calculateThrottlePercent());

src/main/pg/stats.c

@@ -34,5 +34,6 @@ PG_RESET_TEMPLATE(statsConfig_t, statsConfig,
     .stats_total_flights = 0,
     .stats_total_time_s = 0,
     .stats_total_dist_m = 0,
+    .stats_extra_total_kaacks = 0,
 );
 #endif

src/main/pg/stats.h

@@ -30,6 +30,7 @@ typedef struct statsConfig_s {
     uint32_t stats_total_time_s;
     uint32_t stats_total_dist_m;
     int8_t stats_min_armed_time_s;
+    uint32_t stats_extra_total_kaacks;
 } statsConfig_t;
 
 PG_DECLARE(statsConfig_t, statsConfig);