From 24bf8050c1c4dd4aac62a7955d08ec763fa55176 Mon Sep 17 00:00:00 2001
From: Krzysztof Matula <km@apnet.pl>
Date: Fri, 12 Apr 2019 22:39:52 +0200
Subject: [PATCH] OSD: combined ON/ARM timer

---
 src/main/osd/osd.c          | 3 ++-
 src/main/osd/osd.h          | 3 ++-
 src/main/osd/osd_elements.c | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/osd/osd.c b/src/main/osd/osd.c
index 97bb7c9796..772093173d 100644
--- a/src/main/osd/osd.c
+++ b/src/main/osd/osd.c
@@ -93,7 +93,8 @@
 const char * const osdTimerSourceNames[] = {
     "ON TIME  ",
     "TOTAL ARM",
-    "LAST ARM "
+    "LAST ARM ",
+    "ON/ARM   "
 };
 
 // Things in both OSD and CMS
diff --git a/src/main/osd/osd.h b/src/main/osd/osd.h
index cef63acbe3..c1f8f761db 100644
--- a/src/main/osd/osd.h
+++ b/src/main/osd/osd.h
@@ -26,7 +26,7 @@
 
 #include "sensors/esc_sensor.h"
 
-#define OSD_NUM_TIMER_TYPES 3
+#define OSD_NUM_TIMER_TYPES 4
 extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES];
 
 #define OSD_ELEMENT_BUFFER_LENGTH 32
@@ -180,6 +180,7 @@ typedef enum {
     OSD_TIMER_SRC_ON,
     OSD_TIMER_SRC_TOTAL_ARMED,
     OSD_TIMER_SRC_LAST_ARMED,
+    OSD_TIMER_SRC_ON_OR_ARMED,
     OSD_TIMER_SRC_COUNT
 } osd_timer_source_e;
 
diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c
index f922c7a2c4..fd99130584 100644
--- a/src/main/osd/osd_elements.c
+++ b/src/main/osd/osd_elements.c
@@ -296,6 +296,8 @@ static char osdGetTimerSymbol(osd_timer_source_e src)
     case OSD_TIMER_SRC_TOTAL_ARMED:
     case OSD_TIMER_SRC_LAST_ARMED:
         return SYM_FLY_M;
+    case OSD_TIMER_SRC_ON_OR_ARMED:
+        return ARMING_FLAG(ARMED) ? SYM_FLY_M : SYM_ON_M;
     default:
         return ' ';
     }
@@ -312,6 +314,8 @@ static timeUs_t osdGetTimerValue(osd_timer_source_e src)
         statistic_t *stats = osdGetStats();
         return stats->armed_time;
     }
+    case OSD_TIMER_SRC_ON_OR_ARMED:
+        return ARMING_FLAG(ARMED) ? osdFlyTime : micros();
     default:
         return 0;
     }