Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

Merge pull request #7994 from krzysztofmatula/km-on-arm-timer

Browse source 
OSD: combined ON/ARM timer
This commit is contained in:
Michael Keller 2019-04-19 13:38:56 +12:00 • committed by GitHub
commit edcacb9f0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/osd/osd.c
View file

@ -93,7 +93,8 @@
const char * const osdTimerSourceNames[] = { const char * const osdTimerSourceNames[] = {
"ON TIME ", "ON TIME ",
"TOTAL ARM", "TOTAL ARM",
"LAST ARM " "LAST ARM ",
"ON/ARM "
}; };
// Things in both OSD and CMS // Things in both OSD and CMS

3
src/main/osd/osd.h
View file

@ -26,7 +26,7 @@
#include "sensors/esc_sensor.h" #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]; extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES];
#define OSD_ELEMENT_BUFFER_LENGTH 32 #define OSD_ELEMENT_BUFFER_LENGTH 32
@ -180,6 +180,7 @@ typedef enum {
OSD_TIMER_SRC_ON, OSD_TIMER_SRC_ON,
OSD_TIMER_SRC_TOTAL_ARMED, OSD_TIMER_SRC_TOTAL_ARMED,
OSD_TIMER_SRC_LAST_ARMED, OSD_TIMER_SRC_LAST_ARMED,
OSD_TIMER_SRC_ON_OR_ARMED,
OSD_TIMER_SRC_COUNT OSD_TIMER_SRC_COUNT
} osd_timer_source_e; } osd_timer_source_e;

4
src/main/osd/osd_elements.c
View file

@ -296,6 +296,8 @@ static char osdGetTimerSymbol(osd_timer_source_e src)
case OSD_TIMER_SRC_TOTAL_ARMED: case OSD_TIMER_SRC_TOTAL_ARMED:
case OSD_TIMER_SRC_LAST_ARMED: case OSD_TIMER_SRC_LAST_ARMED:
return SYM_FLY_M; return SYM_FLY_M;
case OSD_TIMER_SRC_ON_OR_ARMED:
return ARMING_FLAG(ARMED) ? SYM_FLY_M : SYM_ON_M;
default: default:
return ' '; return ' ';
} }
@ -312,6 +314,8 @@ static timeUs_t osdGetTimerValue(osd_timer_source_e src)
statistic_t *stats = osdGetStats(); statistic_t *stats = osdGetStats();
return stats->armed_time; return stats->armed_time;
} }
case OSD_TIMER_SRC_ON_OR_ARMED:
return ARMING_FLAG(ARMED) ? osdFlyTime : micros();
default: default:
return 0; return 0;
} }