Reorganise stats screens

docs/Settings.md

@@ -4892,23 +4892,23 @@ Unit used for the drawn energy in the OSD stats [MAH/WH] (milliAmpere hour/ Watt
 
 ---
 
-### osd_stats_min_voltage_unit
+### osd_stats_page_auto_swap_time
 
-Display minimum voltage of the `BATTERY` or the average per `CELL` in the OSD stats.
+Auto swap display time interval between disarm stats pages (seconds). Reverts to manual control when Roll stick used to change pages. Disabled when set to 0.
 
 | Default | Min | Max |
 | --- | --- | --- |
-| BATTERY |  |  |
+| 3 | 0 | 10 |
 
 ---
 
-### osd_stats_page_auto_swap_time
+### osd_stats_show_metric_efficiency
 
-Auto swap display time interval between disarm stats pages (seconds). Reverts to manual control when Roll stick used to change pages. Disabled when set to 0.
+Enabling this option will show metric efficiency statistics on the post flight stats screen. In addition to the efficiency statistics in your chosen units.
 
 | Default | Min | Max |
 | --- | --- | --- |
-| 3 | 0 | 10 |
+| OFF | OFF | ON |
 
 ---
 

src/main/blackbox/blackbox_io.c

@@ -35,6 +35,10 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
+#ifdef USE_SDCARD
+#include "drivers/sdcard/sdcard.h"
+#endif
+
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/flashfs.h"
 #include "io/serial.h"
@@ -507,6 +511,36 @@ bool isBlackboxDeviceFull(void)
     }
 }
 
+bool isBlackboxDeviceWorking(void)
+{
+    switch (blackboxConfig()->device) {
+        case BLACKBOX_DEVICE_SERIAL:
+            return blackboxPort != NULL;
+#ifdef USE_SDCARD
+        case BLACKBOX_DEVICE_SDCARD:
+            return sdcard_isInserted() && sdcard_isFunctional() && (afatfs_getFilesystemState() == AFATFS_FILESYSTEM_STATE_READY);
+#endif
+#ifdef USE_FLASHFS
+        case BLACKBOX_DEVICE_FLASH:
+            return flashfsIsReady();
+#endif
+    default:
+        return false;
+    }
+}
+
+int32_t blackboxGetLogNumber(void)
+{
+    switch (blackboxConfig()->device) {
+#ifdef USE_SDCARD
+        case BLACKBOX_DEVICE_SDCARD:
+            return blackboxSDCard.largestLogFileNumber;
+#endif
+        default:
+            return -1;
+    }
+}
+
 /**
  * Call once every loop iteration in order to maintain the global blackboxHeaderBudget with the number of bytes we can
  * transmit this iteration.

src/main/blackbox/blackbox_io.h

@@ -67,6 +67,8 @@ bool blackboxDeviceBeginLog(void);
 bool blackboxDeviceEndLog(bool retainLog);
 
 bool isBlackboxDeviceFull(void);
+bool isBlackboxDeviceWorking(void);
+int32_t blackboxGetLogNumber(void);
 
 void blackboxReplenishHeaderBudget(void);
 blackboxBufferReserveStatus_e blackboxDeviceReserveBufferSpace(int32_t bytes);

src/main/common/maths.h

@@ -65,6 +65,8 @@
 #define METERS_TO_MILES(m)              (m / 1609.344f)
 #define METERS_TO_NAUTICALMILES(m)      (m / 1852.00f)
 
+#define MWH_TO_WH(mWh)                  (mWh / 1000.0f)
+
 #define CMSEC_TO_CENTIMPH(cms)          (cms * 2.2369363f)
 #define CMSEC_TO_CENTIKPH(cms)          (cms * 3.6f)
 #define CMSEC_TO_CENTIKNOTS(cms)        (cms * 1.943845f)

src/main/drivers/osd_symbols.h

@@ -178,6 +178,8 @@
 #define SYM_ALERT                   0xDD  // 221 General alert symbol
 #define SYM_TERRAIN_FOLLOWING       0xFB  // 251 Terrain following (also Alt adjust)
 #define SYM_CROSS_TRACK_ERROR       0xFC  // 252 Cross track error
+#define SYM_ADSB                    0xFD  // 253 ADBS
+#define SYM_BLACKBOX                0xFE  // 254 Blackbox
 
 
 #define SYM_ADSB                    0xFD // 253 ADSB

src/main/fc/fc_core.c

@@ -1012,6 +1012,10 @@ float getFlightTime(void)
     return US2S(flightTime);
 }
 
+void resetFlightTime(void) {
+    flightTime = 0;
+}
+
 float getArmTime(void)
 {
     return US2S(armTime);

src/main/fc/fc_core.h

@@ -45,6 +45,7 @@ bool emergencyArmingUpdate(bool armingSwitchIsOn, bool forceArm);
 
 bool areSensorsCalibrating(void);
 float getFlightTime(void);
+void resetFlightTime(void);
 float getArmTime(void);
 
 void fcReboot(bool bootLoader);

src/main/fc/settings.yaml

@@ -68,9 +68,6 @@ tables:
   - name: osd_stats_energy_unit
     values: ["MAH", "WH"]
     enum: osd_stats_energy_unit_e
-  - name: osd_stats_min_voltage_unit
-    values: ["BATTERY", "CELL"]
-    enum: osd_stats_min_voltage_unit_e
   - name: osd_video_system
     values: ["AUTO", "PAL", "NTSC", "HDZERO", "DJIWTF", "AVATAR", "BF43COMPAT", "BFHDCOMPAT"]
     enum: videoSystem_e
@@ -1204,8 +1201,6 @@ groups:
         field: mixer_config.tailsitterOrientationOffset
         type: bool
 
-
-
   - name: PG_REVERSIBLE_MOTORS_CONFIG
     type: reversibleMotorsConfig_t
     members:
@@ -3175,18 +3170,17 @@ groups:
         field: stats_energy_unit
         table: osd_stats_energy_unit
         type: uint8_t
-      - name: osd_stats_min_voltage_unit
-        description: "Display minimum voltage of the `BATTERY` or the average per `CELL` in the OSD stats."
-        default_value: "BATTERY"
-        field: stats_min_voltage_unit
-        table: osd_stats_min_voltage_unit
-        type: uint8_t
       - name: osd_stats_page_auto_swap_time
         description: "Auto swap display time interval between disarm stats pages (seconds). Reverts to manual control when Roll stick used to change pages. Disabled when set to 0."
         default_value: 3
         field: stats_page_auto_swap_time
         min: 0
         max: 10
+      - name: osd_stats_show_metric_efficiency
+        description: "Enabling this option will show metric efficiency statistics on the post flight stats screen. In addition to the efficiency statistics in your chosen units."
+        default_value: OFF
+        type: bool
+        field: stats_show_metric_efficiency
       - name: osd_rssi_alarm
         description: "Value below which to make the OSD RSSI indicator blink"
         default_value: 20