From 880920da96fb8bd5471d2ae5fc67f4a9adeb3acb Mon Sep 17 00:00:00 2001 From: Alvin Wong Date: Fri, 9 Apr 2021 22:17:46 +0800 Subject: [PATCH] Change TranslationStrings to pointer --- Translations/make_translation.py | 7 ++++--- source/Core/Inc/Translation.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Translations/make_translation.py b/Translations/make_translation.py index dcb8f7b1..6e0b9366 100755 --- a/Translations/make_translation.py +++ b/Translations/make_translation.py @@ -528,7 +528,7 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None: str_offsets = [] offset = 0 write_null = False - f.write("const char TranslationStrings[] = {\n") + f.write("const char TranslationStringsData[] = {\n") for i, source_str in enumerate(str_table): if write_null: f.write(' "\\0"\n') @@ -567,7 +567,7 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None: assert str_offsets[idx] >= 0 return str_offsets[idx] - f.write("static const TranslationIndexTable TranslationIndices = {\n") + f.write("const TranslationIndexTable TranslationIndices = {\n") # ----- Write the messages string indices: for group in [str_group_messages, str_group_messageswarn, str_group_characters]: @@ -593,7 +593,8 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None: f.write(f" }}, // {name}\n\n") f.write("}; // TranslationIndices\n\n") - f.write("const TranslationIndexTable *const Tr = &TranslationIndices;\n\n") + f.write("const TranslationIndexTable *const Tr = &TranslationIndices;\n") + f.write("const char *const TranslationStrings = TranslationStringsData;\n\n") f.write( f"const bool HasFahrenheit = {('true' if lang.get('tempUnitFahrenheit', True) else 'false')};\n" diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index feada0fb..67277906 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -61,8 +61,6 @@ enum class SettingsItemIndex : uint8_t { NUM_ITEMS, }; -extern const char TranslationStrings[]; - struct TranslationIndexTable { uint16_t SettingsCalibrationWarning; uint16_t SettingsResetWarning; @@ -114,6 +112,7 @@ struct TranslationIndexTable { }; extern const TranslationIndexTable *const Tr; +extern const char *const TranslationStrings; constexpr uint8_t settings_item_index(const SettingsItemIndex i) { return static_cast(i); } // Use a constexpr function for type-checking.