kopia lustrzana https://github.com/OpenRTX/OpenRTX
added more to GPS summary and fixed a couple of warnings.
rodzic
4b604e255f
commit
c24af62000
|
|
@ -132,6 +132,9 @@ PROMPT_LATITUDE, // latitude
|
||||||
PROMPT_LONGITUDE, // longitude
|
PROMPT_LONGITUDE, // longitude
|
||||||
PROMPT_SPEED, // speed
|
PROMPT_SPEED, // speed
|
||||||
PROMPT_ALTITUDE, // altitude
|
PROMPT_ALTITUDE, // altitude
|
||||||
|
PROMPT_SATELLITES, // satellites
|
||||||
|
PROMPT_COMPASS, // compass
|
||||||
|
PROMPT_DEGREES, // degrees
|
||||||
PROMPT_CHARACTER, // character
|
PROMPT_CHARACTER, // character
|
||||||
PROMPT_SPACE, // space
|
PROMPT_SPACE, // space
|
||||||
PROMPT_PERCENT, // Percent
|
PROMPT_PERCENT, // Percent
|
||||||
|
|
|
||||||
|
|
@ -510,6 +510,11 @@ void announceGPSInfo(VoicePromptQueueFlags_T flags)
|
||||||
vpQueuePrompt(PROMPT_ALTITUDE);
|
vpQueuePrompt(PROMPT_ALTITUDE);
|
||||||
snprintf(buffer, 16, "%4.1fm", state.gps_data.altitude);
|
snprintf(buffer, 16, "%4.1fm", state.gps_data.altitude);
|
||||||
vpQueueString(buffer, vpAnnounceCommonSymbols);
|
vpQueueString(buffer, vpAnnounceCommonSymbols);
|
||||||
|
vpQueuePrompt(PROMPT_COMPASS);
|
||||||
|
vpQueueInteger(state.gps_data.tmg_true);
|
||||||
|
vpQueuePrompt(PROMPT_DEGREES);
|
||||||
|
vpQueuePrompt(PROMPT_SATELLITES);
|
||||||
|
vpQueueInteger(__builtin_popcount(state.gps_data.active_sats));
|
||||||
|
|
||||||
vpPlayIfNeeded(flags);
|
vpPlayIfNeeded(flags);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -471,7 +471,7 @@ void _ui_drawMenuGPS()
|
||||||
fix_buf = "PPS";
|
fix_buf = "PPS";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
fix_buf = currentLanguage->error;
|
fix_buf = (char*)currentLanguage->error;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -487,7 +487,7 @@ void _ui_drawMenuGPS()
|
||||||
type_buf = "3D";
|
type_buf = "3D";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
type_buf = currentLanguage->error;
|
type_buf = (char*)currentLanguage->error;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT,
|
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT,
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue