corrected gps summary to use a stingized float for the compass bearing.
Also fixed another warning.
This commit is contained in:
parent
c24af62000
commit
46e3900462
|
|
@ -507,12 +507,16 @@ void announceGPSInfo(VoicePromptQueueFlags_T flags)
|
||||||
vpQueuePrompt(PROMPT_SPEED);
|
vpQueuePrompt(PROMPT_SPEED);
|
||||||
snprintf(buffer, 16, "%4.1fkm/h", state.gps_data.speed);
|
snprintf(buffer, 16, "%4.1fkm/h", state.gps_data.speed);
|
||||||
vpQueueString(buffer, vpAnnounceCommonSymbols);
|
vpQueueString(buffer, vpAnnounceCommonSymbols);
|
||||||
|
|
||||||
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);
|
vpQueuePrompt(PROMPT_COMPASS);
|
||||||
vpQueueInteger(state.gps_data.tmg_true);
|
snprintf(buffer, 16, "%3.1f", state.gps_data.tmg_true);
|
||||||
|
vpQueueString(buffer, vpAnnounceCommonSymbols);
|
||||||
vpQueuePrompt(PROMPT_DEGREES);
|
vpQueuePrompt(PROMPT_DEGREES);
|
||||||
|
|
||||||
vpQueuePrompt(PROMPT_SATELLITES);
|
vpQueuePrompt(PROMPT_SATELLITES);
|
||||||
vpQueueInteger(__builtin_popcount(state.gps_data.active_sats));
|
vpQueueInteger(__builtin_popcount(state.gps_data.active_sats));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
/*
|
/*
|
||||||
This string table's order must not be altered as voice prompts will be indexed in the same order as these strings.
|
This string table's order must not be altered as voice prompts will be indexed in the same order as these strings.
|
||||||
*/
|
*/
|
||||||
|
#include <string.h>
|
||||||
#include "ui/UIStrings.h"
|
#include "ui/UIStrings.h"
|
||||||
#include "ui/EnglishStrings.h"
|
#include "ui/EnglishStrings.h"
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue