Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 09:16:01 +03:00
Code Issues Wiki Activity

Merge pull request #2887 from shellixyz/osd_trip_distance

Browse source 
Add trip distance to OSD
This commit is contained in:
Konstantin Sharlaimov 2018-03-07 17:12:04 +10:00 • committed by GitHub
commit ebd89a977e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/drivers/max7456_symbols.h
View file

@ -109,6 +109,7 @@
#define SYM_GLAND 0xB7
#define SYM_GLAND1 0xB8
#define SYM_HOME_DIST 0xA0
#define SYM_TRIP_DIST 0x22
// Gimbal active Mode
#define SYM_GIMBAL 0x16

14
src/main/io/osd.c
View file

@ -923,6 +923,11 @@ static bool osdDrawSingleElement(uint8_t item)
}
break;
case OSD_TRIP_DIST:
buff[0] = SYM_TRIP_DIST;
osdFormatDistanceSymbol(buff + 1, getTotalTravelDistance());
break;
case OSD_HEADING:
{
int16_t h = DECIDEGREES_TO_DEGREES(attitude.values.yaw);
@ -1538,8 +1543,8 @@ static uint8_t osdIncElementIndex(uint8_t elementIndex)
if (elementIndex == OSD_CURRENT_DRAW) {
elementIndex = OSD_GPS_SPEED;
}
if (elementIndex == OSD_EFFICIENCY_WH_PER_KM) {
STATIC_ASSERT(OSD_EFFICIENCY_WH_PER_KM == OSD_ITEM_COUNT - 1, OSD_EFFICIENCY_MWH_PER_KM_not_last_element);
if (elementIndex == OSD_TRIP_DIST) {
STATIC_ASSERT(OSD_TRIP_DIST == OSD_ITEM_COUNT - 1, OSD_TRIP_DIST_not_last_element);
elementIndex = OSD_ITEM_COUNT;
}
}
@ -1553,8 +1558,8 @@ static uint8_t osdIncElementIndex(uint8_t elementIndex)
if (elementIndex == OSD_GPS_HDOP) {
elementIndex = OSD_MAIN_BATT_CELL_VOLTAGE;
}
if (elementIndex == OSD_EFFICIENCY_WH_PER_KM) {
STATIC_ASSERT(OSD_EFFICIENCY_WH_PER_KM == OSD_ITEM_COUNT - 1, OSD_EFFICIENCY_MWH_PER_KM_not_last_element);
if (elementIndex == OSD_TRIP_DIST) {
STATIC_ASSERT(OSD_TRIP_DIST == OSD_ITEM_COUNT - 1, OSD_TRIP_DIST_not_last_element);
elementIndex = OSD_ITEM_COUNT;
}
}
@ -1580,6 +1585,7 @@ void pgResetFn_osdConfig(osdConfig_t *osdConfig)
osdConfig->item_pos[OSD_RSSI_VALUE] = OSD_POS(23, 0) | VISIBLE_FLAG;
//line 2
osdConfig->item_pos[OSD_HOME_DIST] = OSD_POS(1, 1);
osdConfig->item_pos[OSD_TRIP_DIST] = OSD_POS(1, 2);
osdConfig->item_pos[OSD_MAIN_BATT_CELL_VOLTAGE] = OSD_POS(12, 1);
osdConfig->item_pos[OSD_GPS_SPEED] = OSD_POS(23, 1);

1
src/main/io/osd.h
View file

@ -66,6 +66,7 @@ typedef enum {
OSD_BATTERY_REMAINING_CAPACITY,
OSD_BATTERY_REMAINING_PERCENT,
OSD_EFFICIENCY_WH_PER_KM,
OSD_TRIP_DIST,
OSD_ITEM_COUNT // MUST BE LAST
} osd_items_e;