Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Small fixes from #3133

Browse source
This commit is contained in:
Dan Nixon 2017-05-23 17:07:18 +01:00
parent f4e4e45aa2
commit 7b6dc1b005
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/fc_msp.c
View file

@ -2061,7 +2061,7 @@ static mspResult_e mspCommonProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
#if defined(OSD) #if defined(OSD)
const uint16_t value = sbufReadU16(src); const uint16_t value = sbufReadU16(src);
/* Get screen index, 0 is post flight statsitsics, 1 and above are in flight OSD screens */ /* Get screen index, 0 is post flight statistics, 1 and above are in flight OSD screens */
const uint8_t screen = (sbufBytesRemaining(src) >= 1) ? sbufReadU8(src) : 1; const uint8_t screen = (sbufBytesRemaining(src) >= 1) ? sbufReadU8(src) : 1;
if (screen == 0 && addr < OSD_STAT_COUNT) { if (screen == 0 && addr < OSD_STAT_COUNT) {

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

@ -620,6 +620,7 @@ void pgResetFn_osdConfig(osdConfig_t *osdProfile)
osdProfile->item_pos[OSD_GPS_LAT] = OSD_POS(18, 14) | 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; osdProfile->item_pos[OSD_GPS_LON] = OSD_POS(18, 15) | VISIBLE_FLAG;
osdProfile->item_pos[OSD_MAIN_BATT_USAGE] = OSD_POS(15, 10) | VISIBLE_FLAG; osdProfile->item_pos[OSD_MAIN_BATT_USAGE] = OSD_POS(15, 10) | VISIBLE_FLAG;
osdProfile->item_pos[OSD_ARMED_TIME] = OSD_POS(1, 2) | VISIBLE_FLAG;
osdProfile->enabled_stats[OSD_STAT_MAX_SPEED] = true; osdProfile->enabled_stats[OSD_STAT_MAX_SPEED] = true;
osdProfile->enabled_stats[OSD_STAT_MIN_BATTERY] = true; osdProfile->enabled_stats[OSD_STAT_MIN_BATTERY] = true;

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

@ -72,7 +72,7 @@ typedef enum {
OSD_STAT_FLYTIME, OSD_STAT_FLYTIME,
OSD_STAT_ARMEDTIME, OSD_STAT_ARMEDTIME,
OSD_STAT_COUNT // MUST BE LAST OSD_STAT_COUNT // MUST BE LAST
} osd_states_e; } osd_stats_e;
typedef enum { typedef enum {
OSD_UNIT_IMPERIAL, OSD_UNIT_IMPERIAL,