From 9715508c7b90c7e31d4c3b8e9748396b114960ba Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Fri, 31 Mar 2017 07:48:44 +0100 Subject: [PATCH] Added debug fields to OSD --- src/main/cms/cms_menu_osd.c | 1 + src/main/fc/cli.c | 1 + src/main/io/osd.c | 14 +++++++++++--- src/main/io/osd.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c index 2de93f9b56..5aa42ee282 100644 --- a/src/main/cms/cms_menu_osd.c +++ b/src/main/cms/cms_menu_osd.c @@ -127,6 +127,7 @@ OSD_Entry menuOsdActiveElemsEntries[] = {"ROLL PID", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_ROLL_PIDS], 0}, {"PITCH PID", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_PITCH_PIDS], 0}, {"YAW PID", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_YAW_PIDS], 0}, + {"DEBUG", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_DEBUG], 0}, {"BACK", OME_Back, NULL, NULL, 0}, {NULL, OME_END, NULL, NULL, 0} }; diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index 292a0d551e..faad17487c 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -847,6 +847,7 @@ static const clivalue_t valueTable[] = { { "osd_pid_roll_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_ROLL_PIDS]) }, { "osd_pid_pitch_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_PITCH_PIDS]) }, { "osd_pid_yaw_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_YAW_PIDS]) }, + { "osd_debug_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_DEBUG]) }, { "osd_power_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_POWER]) }, { "osd_pidrate_profile_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_PIDRATE_PROFILE]) }, { "osd_battery_warning_pos", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, OSD_POSCFG_MAX }, PG_OSD_CONFIG, offsetof(osdConfig_t, item_pos[OSD_MAIN_BATT_WARNING]) }, diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 995fea8c3f..4132aa5a85 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -459,7 +459,7 @@ static void osdDrawSingleElement(uint8_t item) break; } - case OSD_AVG_CELL_VOLTAGE: + case OSD_AVG_CELL_VOLTAGE: { uint16_t cellV = getBatteryVoltage() * 10 / getBatteryCellCount(); buff[0] = SYM_BATT_5; @@ -467,8 +467,14 @@ static void osdDrawSingleElement(uint8_t item) break; } - default: - return; + case OSD_DEBUG: + { + sprintf(buff, "DBG %5d %5d %5d %5d", debug[0], debug[1], debug[2], debug[3]); + break; + } + + default: + return; } displayWrite(osdDisplayPort, elemPosX + elemOffsetX, elemPosY, buff); @@ -517,6 +523,7 @@ void osdDrawElements(void) osdDrawSingleElement(OSD_PIDRATE_PROFILE); osdDrawSingleElement(OSD_MAIN_BATT_WARNING); osdDrawSingleElement(OSD_AVG_CELL_VOLTAGE); + osdDrawSingleElement(OSD_DEBUG); #ifdef GPS #ifdef CMS @@ -557,6 +564,7 @@ void pgResetFn_osdConfig(osdConfig_t *osdProfile) osdProfile->item_pos[OSD_PIDRATE_PROFILE] = OSD_POS(25, 10) | VISIBLE_FLAG; osdProfile->item_pos[OSD_MAIN_BATT_WARNING] = OSD_POS(9, 10) | VISIBLE_FLAG; osdProfile->item_pos[OSD_AVG_CELL_VOLTAGE] = OSD_POS(12, 2) | VISIBLE_FLAG; + osdProfile->item_pos[OSD_DEBUG] = OSD_POS(7, 12) | VISIBLE_FLAG; osdProfile->item_pos[OSD_GPS_LAT] = OSD_POS(18, 14) | VISIBLE_FLAG; osdProfile->item_pos[OSD_GPS_LON] = OSD_POS(18, 15) | VISIBLE_FLAG; diff --git a/src/main/io/osd.h b/src/main/io/osd.h index ee26fb898a..b6338dfcf9 100755 --- a/src/main/io/osd.h +++ b/src/main/io/osd.h @@ -51,6 +51,7 @@ typedef enum { OSD_AVG_CELL_VOLTAGE, OSD_GPS_LON, OSD_GPS_LAT, + OSD_DEBUG, OSD_ITEM_COUNT // MUST BE LAST } osd_items_e;