-
-
Notifications
You must be signed in to change notification settings - Fork 350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove obsolete language defines and translations, single source for telemetry sensor names #3119
Conversation
@HThuren I found a few additional obsolete defines and const char declarations. Can you please run the your language test again. Thannk you very much. @pfeerick I claimed 280 Bytes of saved flash memory for a TX16s build- To verify I built two version of TX16s firmware. One using the commit this branch is based on (d77389d), the other using the latest commit to this branch. Here's two excerpts of "arm-none-eabi-readelf -a <.elf>". All section sizes are identical apart from the first line (flash memory, virt. address starting at 0x08000000). Check out the difference in MemSiz. Flash Bytes saved 0x1801bc-0x1800a4 = 0x118 (280 decimal). I hope my considerations are correct. Program Headers: TX16s Firmware Base Main without branch
Program Headers: TX16s Firmware Base Main plus Branch
|
Right, I have cloned your branch and started translation, ap. one hour to go :-) |
Awesome! |
All done, not succes with CZ and IT language |
can you post the error messages please |
@HThuren Thanks for running the language build. I found the problem and it is not due to changes made here. @philmoz Commit 475ad1f changed radio/src/gui/colorlcd/fullscreen_dialog.cpp. This section compiles with errors for CZ, FR, IT languages.
C++ doesn't like a const char [] in thie std::string concatenation The fix is to convert the const char [] to a std::string. With your permission I'll change this section of code. This will build ok:
|
@HThuren Would be great if you find time to run the language builds again |
Hi @mha1 , all good LANG in (DA EN DE CZ SE IT CN TW PL JP) all compiled |
Great, thank you very much |
* Updated translations, error fixes etc * Minor changes * Minor updates * Update for PR #2998 * Added strings for PR #2998 * Minor error fix * Two new strings translated * Fixed spelling mistake * Another minor fix * Added translations for PR #3062 * Just a few corrections * Add files via upload New translations added * Changes after PR #3119 translation clean up
- all telemetry sensor name definitions follow the naming convention STR_SENSOR_<sensor> - eliminated one redundant definition - editorial updates to telemetry protocols code to reflect the naming convention changes - re-introduced translations in da.h (STR_SENSOR_THROTTLE and STR_SENSOR_SPEED) - re-introduced translation in it.h (STR_SENSOR_GPSDATETIME) - re-introduced translation for fr.h ( STR_SENSOR_BATT) - saved 160 Bytes of flash
saved 280 byte flash memory in total
adjusted da.h, fr.h, it.h local sensor name definitions to naming conventions STR_SENSOR_<senosr>
removed obsolete #ifdef
fixed problem in /radio/src/gui/colorlcd/fullscreen_dialog.cpp preventing builds for CZ, IT and FR languages
87b4063
to
01e7816
Compare
@pfeerick can we go ahead with this? I think the dam has broken already. #3148 (se.h) got merged two days ago. The changes made to se.h were based on changes made in this PR. Amongst those is the single source and naming change for telemetry sensors. Building main in SE configuration will fail right now because some complementary changes made in this PR are missing (eg untranslated.h). I have rebased this PR to current main. Merging this will sort out the current indefinite state of se.h too. |
Ah, damnit... yes, this was supposed to be merged first. Yup, and thanks for the rebase :) |
@pfeerick No problemo, you got a lot on your plate. I really appreciate your expertise and you putting in lots of hours. |
* main: (30 commits) feat(cpn): Radiomaster Boxer support (EdgeTX#2910) chore: Move __global_locale to FLASH (frees some RAM!) (EdgeTX#3169) chore: Remove obsolete language defines, single source for telemetry sensor names (EdgeTX#3119) feat(lua): Port of NodeMCU Lua53 read-only tables (EdgeTX#2994) chore: New module/serial API (EdgeTX#3055) chore: Updated SE translations 🇸🇪 (EdgeTX#3148) Update README.md fix(color): Duplicate selected theme, update color list (EdgeTX#3122) fix: Regenerate yaml, carryTrim => trimSource cleanup (EdgeTX#3121) chore(color): LVGLify custom mixer scripts page (EdgeTX#3071) fix(translation): String casting for CZ/IT/FR Fixes EdgeTX#3145 fix(cpn): Save "set main view" number for special/global function (EdgeTX#3132) chore(color): LVGLify statistics and debug screens (EdgeTX#3072) chore(color): LVGLify and enhance model -> telemetry page (EdgeTX#3070) chore: Updates to Danish translations 🇩🇰 (EdgeTX#3128) chore: CN/TW translations for theme save and delete strings (EdgeTX#3129) chore: fix STM32 HAL headers fix(color): Overlap in logical switch monitor footer (EdgeTX#3137) fix(doc): LUA doc link to units.md feat(color): Change global variables layout to better match other pages (EdgeTX#3116) ...
This is a work result of the discussion in #3082
Summary of changes:
#undef STR_SENSOR_<name>
followed by new#define STR_SENSOR_<name>
STR_SENSOR_<name>
(plus editorial changes to adapt naming convention)