From 665a42e295f7dae8e7bf41a502a2896bd3bee809 Mon Sep 17 00:00:00 2001 From: Steve Evans Date: Mon, 5 Aug 2024 14:48:41 +0100 Subject: [PATCH] Add OSD display of 2nd block of debug values (#13800) Add OSD display of 2nd blocks of debug values --- src/main/cli/settings.c | 1 + src/main/cms/cms_menu_osd.c | 1 + src/main/osd/osd.h | 1 + src/main/osd/osd_elements.c | 7 +++++++ 4 files changed, 10 insertions(+) diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index 15b004c9a2..cd4f0e941b 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -1463,6 +1463,7 @@ const clivalue_t valueTable[] = { { "osd_pid_pitch_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_PITCH_PIDS]) }, { "osd_pid_yaw_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_YAW_PIDS]) }, { "osd_debug_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_DEBUG]) }, + { "osd_debug2_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_DEBUG2]) }, { "osd_power_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_POWER]) }, { "osd_pidrate_profile_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_PIDRATE_PROFILE]) }, { "osd_warnings_pos", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, OSD_POSCFG_MAX }, PG_OSD_ELEMENT_CONFIG, offsetof(osdElementConfig_t, item_pos[OSD_WARNINGS]) }, diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c index c92e3241b7..1756ba3d80 100644 --- a/src/main/cms/cms_menu_osd.c +++ b/src/main/cms/cms_menu_osd.c @@ -143,6 +143,7 @@ const OSD_Entry menuOsdActiveElemsEntries[] = {"OSD PROFILE NAME", OME_VISIBLE | DYNAMIC, NULL, &osdConfig_item_pos[OSD_PROFILE_NAME]}, #endif {"DEBUG", OME_VISIBLE | DYNAMIC, NULL, &osdConfig_item_pos[OSD_DEBUG]}, + {"DEBUG2", OME_VISIBLE | DYNAMIC, NULL, &osdConfig_item_pos[OSD_DEBUG2]}, {"WARNINGS", OME_VISIBLE | DYNAMIC, NULL, &osdConfig_item_pos[OSD_WARNINGS]}, {"DISARMED", OME_VISIBLE | DYNAMIC, NULL, &osdConfig_item_pos[OSD_DISARMED]}, {"PIT ANG", OME_VISIBLE | DYNAMIC, NULL, &osdConfig_item_pos[OSD_PITCH_ANGLE]}, diff --git a/src/main/osd/osd.h b/src/main/osd/osd.h index 96e3e57a15..e89bbf8835 100644 --- a/src/main/osd/osd.h +++ b/src/main/osd/osd.h @@ -189,6 +189,7 @@ typedef enum { OSD_GPS_LAP_TIME_CURRENT, OSD_GPS_LAP_TIME_PREVIOUS, OSD_GPS_LAP_TIME_BEST3, + OSD_DEBUG2, OSD_ITEM_COUNT // MUST BE LAST } osd_items_e; diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c index fc3df7bc27..fef1f63c53 100644 --- a/src/main/osd/osd_elements.c +++ b/src/main/osd/osd_elements.c @@ -936,6 +936,11 @@ static void osdElementDebug(osdElementParms_t *element) tfp_sprintf(element->buff, "DBG %5d %5d %5d %5d", debug[0], debug[1], debug[2], debug[3]); } +static void osdElementDebug2(osdElementParms_t *element) +{ + tfp_sprintf(element->buff, "D2 %5d %5d %5d %5d", debug[4], debug[5], debug[6], debug[7]); +} + static void osdElementDisarmed(osdElementParms_t *element) { if (!ARMING_FLAG(ARMED)) { @@ -1806,6 +1811,7 @@ static const uint8_t osdElementDisplayOrder[] = { OSD_WARNINGS, OSD_AVG_CELL_VOLTAGE, OSD_DEBUG, + OSD_DEBUG2, OSD_PITCH_ANGLE, OSD_ROLL_ANGLE, OSD_MAIN_BATT_USAGE, @@ -1919,6 +1925,7 @@ const osdElementDrawFn osdElementDrawFunction[OSD_ITEM_COUNT] = { [OSD_GPS_LAT] = osdElementGpsCoordinate, #endif [OSD_DEBUG] = osdElementDebug, + [OSD_DEBUG2] = osdElementDebug2, #ifdef USE_ACC [OSD_PITCH_ANGLE] = osdElementAngleRollPitch, [OSD_ROLL_ANGLE] = osdElementAngleRollPitch,