From a40cba2430787ffccfc618a2a00c81b7bdee4185 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Fri, 26 Aug 2022 09:37:14 +0200 Subject: [PATCH] Added missing entry in VP table and fixed off-by-one for string table lookups. --- openrtx/include/core/voicePrompts.h | 1 + openrtx/src/core/voicePrompts.c | 4 +--- openrtx/src/ui/ui_strings.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openrtx/include/core/voicePrompts.h b/openrtx/include/core/voicePrompts.h index cdad2920..d58797e5 100644 --- a/openrtx/include/core/voicePrompts.h +++ b/openrtx/include/core/voicePrompts.h @@ -165,6 +165,7 @@ typedef enum PROMPT_UNDERLINE, // underline PROMPT_CARET, // caret PROMPT_LEFT_BRACE, // left brace + PROMPT_RIGHT_BRACE, // right brace PROMPT_CUSTOM1, // Hotspot PROMPT_CUSTOM2, // ClearNode PROMPT_CUSTOM3, // ShariNode diff --git a/openrtx/src/core/voicePrompts.c b/openrtx/src/core/voicePrompts.c index 8d976de7..19efef64 100644 --- a/openrtx/src/core/voicePrompts.c +++ b/openrtx/src/core/voicePrompts.c @@ -420,9 +420,7 @@ void vp_queueStringTableEntry(const char* const* stringTableStringPtr) return; uint16_t pos = NUM_VOICE_PROMPTS - + 1 - + (stringTableStringPtr - ¤tLanguage->languageName) / - sizeof(const char *); + + (stringTableStringPtr - ¤tLanguage->languageName); vp_queuePrompt(pos); } diff --git a/openrtx/src/ui/ui_strings.c b/openrtx/src/ui/ui_strings.c index 60dedd2c..103deb12 100644 --- a/openrtx/src/ui/ui_strings.c +++ b/openrtx/src/ui/ui_strings.c @@ -39,7 +39,7 @@ int GetEnglishStringTableOffset(const char* text) if (strcmp(text, strPtr) == 0) { - return (i * sizeof(char *)); + return i; } }