feat(radio): optional key lock feature#7383
Open
3djc wants to merge 8 commits into
Open
Conversation
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughAdds an end-to-end per-board key-lock feature: persisted setting, YAML/schema updates, runtime lock detection and event suppression, public APIs, UI wiring in companion and radio, board JSON config and codegen, tests, and translations. ChangesKey Lock Feature Implementation
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
Note
Due to the large number of review comments, Critical, Major severity comments were prioritized as inline comments.
🟡 Minor comments (19)
companion/src/generaledit/generalsetup.ui-1329-1342 (1)
1329-1342:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winFix grid row collision with existing spacer.
Line 1329 places the new label at
row="30" column="0", which is already used byverticalSpacer_2(Line 1088). This can hide or misplace the label/control row.Suggested fix
- <item row="30" column="0"> + <item row="31" column="0"> <widget class="QLabel" name="label_keyLockEnabled"> <property name="text"> <string>Key lock</string> </property> </widget> </item> - <item row="30" column="1"> + <item row="31" column="1"> <widget class="QCheckBox" name="chkKeyLockEnabled"> <property name="text"> <string/> </property> </widget> </item>🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@companion/src/generaledit/generalsetup.ui` around lines 1329 - 1342, The new Key lock widgets (QLabel name="label_keyLockEnabled" and QCheckBox name="chkKeyLockEnabled") are placed at row="30" which collides with the existing verticalSpacer_2; move both widgets to an unused row (for example row="31" or the next free row in the grid) so they don't overlap the spacer, updating the row attributes for label_keyLockEnabled and chkKeyLockEnabled in the UI XML to that free row.radio/src/translations/i18n/cz.h-575-578 (1)
575-578:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize the key-lock strings in the Czech translation file.
All four added macros are still English, which creates mixed-language UI text for Czech users. Please provide Czech translations for these entries.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/cz.h` around lines 575 - 578, Translate the four English macros into Czech while keeping the macro names and placeholder formats intact: replace TR_KEY_LOCK_FMT "Key lock (%s+%s hold)" with a Czech equivalent preserving (%s+%s), replace TR_KEYS_LOCKED "Keys locked" and TR_KEYS_LOCKED_FMT "Keys locked (%s+%s)" with Czech phrases (the formatted one must keep the %s+%s placeholders), and replace TR_KEYS_UNLOCKED "Keys unlocked" with its Czech translation; ensure punctuation and spacing remain consistent and no placeholders are altered.radio/src/translations/i18n/cn.h-572-575 (1)
572-575:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize the new key-lock strings for this locale.
These new macros are English literals, so users in the Chinese locale will see mixed-language lock/unlock prompts. Please translate all four strings in this file’s language.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/cn.h` around lines 572 - 575, The four new English macro strings TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED need Chinese translations so the locale is consistent; replace the English literals with appropriate Chinese text (e.g., translate "Key lock (%s+%s hold)" and "Keys locked/locked (%s+%s)/unlocked" into Chinese) keeping the existing format specifiers intact and preserving the macro names in cn.h.radio/src/translations/i18n/da.h-577-580 (1)
577-580:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTranslate the new key-lock strings for Danish locale consistency.
The added strings are English literals, so the lock/unlock messaging will not match the rest of the Danish UI. Please localize these four macros.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/da.h` around lines 577 - 580, The four new English macros (TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, TR_KEYS_UNLOCKED) must be replaced with Danish translations to match the locale; update each macro value to Danish equivalents (suggestions: TR_KEY_LOCK_FMT -> "Tastelås (%s+%s hold)", TR_KEYS_LOCKED -> "Taster låst", TR_KEYS_LOCKED_FMT -> "Taster låst (%s+%s)", TR_KEYS_UNLOCKED -> "Taster oplåst") by editing their string literals so the UI displays Danish text.radio/src/translations/i18n/de.h-573-576 (1)
573-576:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winProvide German translations for the new key-lock strings.
These four additions are English-only and will surface mixed-language prompts in German UI. Please localize them in this file.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/de.h` around lines 573 - 576, Replace the English-only macro values with German translations for the four keys: update TR_KEY_LOCK_FMT to a German phrase equivalent to "Key lock (%s+%s hold)" (e.g., "Tasten sperren (%s+%s gedrückt halten)"), TR_KEYS_LOCKED to "Tasten gesperrt" (or similar), TR_KEYS_LOCKED_FMT to a formatted German equivalent like "Tasten gesperrt (%s+%s)", and TR_KEYS_UNLOCKED to "Tasten entsperrt"; modify the macro definitions for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT and TR_KEYS_UNLOCKED in de.h accordingly so the German UI shows localized text.radio/src/translations/i18n/fr.h-576-579 (1)
576-579:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winAdd French translations for the new key-lock labels.
These four newly added labels are still English, so the feature appears untranslated in French UI. Please translate them in-line with the rest of the file.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/fr.h` around lines 576 - 579, Replace the four English strings with French translations: update the definitions for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED to their French equivalents (e.g., "Verrouillage de la touche (%s+%s maintenu)", "Touches verrouillées", "Touches verrouillées (%s+%s)", "Touches déverrouillées") so the labels appear translated in the French UI; edit the string literals assigned to those symbols in-place.radio/src/translations/i18n/es.h-571-574 (1)
571-574:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTranslate new key-lock strings for Spanish locale.
These new entries are still in English, so Spanish UI will show mixed-language text for the new feature. Please localize all four macros consistently.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/es.h` around lines 571 - 574, Replace the four English strings in the Spanish locale with proper Spanish translations: update the macros TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in es.h so they are localized (for example use "Bloqueo de tecla (%s+%s mantenida)" or "Bloqueo de tecla (%s+%s pulsadas)" for TR_KEY_LOCK_FMT, "Teclas bloqueadas" for TR_KEYS_LOCKED, "Teclas bloqueadas (%s+%s)" for TR_KEYS_LOCKED_FMT, and "Teclas desbloqueadas" for TR_KEYS_UNLOCKED), ensuring phrasing is consistent and preserves the %s format placeholders.radio/src/translations/i18n/fi.h-572-575 (1)
572-575:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize key-lock strings in Finnish file.
The new key-lock texts are English, which breaks locale consistency in Finnish builds. Please provide Finnish translations for all four macros.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/fi.h` around lines 572 - 575, Replace the four English macro values with Finnish translations: update TR_KEY_LOCK_FMT to "Avainlukko (%s+%s pidetään)", TR_KEYS_LOCKED to "Avimet lukittu", TR_KEYS_LOCKED_FMT to "Avimet lukittu (%s+%s)", and TR_KEYS_UNLOCKED to "Avimet avattu"; change the string literals for the macros TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED accordingly so the Finnish locale file contains Finnish text.radio/src/translations/i18n/jp.h-572-575 (1)
572-575:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winAdd Japanese translations for the new key-lock macros.
Line 572 through Line 575 are English-only in
jp.h. Please localize these strings to Japanese so key-lock prompts match the selected language.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/jp.h` around lines 572 - 575, Replace the English-only macros with Japanese translations in the jp.h header: update TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED to Japanese strings while preserving all format specifiers and punctuation (e.g., keep "%s+%s" in TR_KEY_LOCK_FMT and TR_KEYS_LOCKED_FMT). Ensure the Japanese wording fits UI context for "Key lock (X+Y hold)", "Keys locked", "Keys locked (X+Y)", and "Keys unlocked", and keep the macro names and surrounding formatting unchanged.radio/src/translations/i18n/it.h-573-576 (1)
573-576:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTranslate the new key-lock strings for Italian locale.
Line 573 through Line 576 are currently English text in
it.h. These should be localized to Italian for consistent UX.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/it.h` around lines 573 - 576, The listed translation keys (TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, TR_KEYS_UNLOCKED) are still in English; replace their string values with Italian equivalents for consistent localization: set TR_KEY_LOCK_FMT to an Italian phrase conveying "Key lock (%s+%s hold)" (e.g., "Blocco tasti (%s+%s tieni premuto)"), TR_KEYS_LOCKED to "Tasti bloccati", TR_KEYS_LOCKED_FMT to "Tasti bloccati (%s+%s)", and TR_KEYS_UNLOCKED to "Tasti sbloccati"; update these definitions in it.h where those macros are declared.radio/src/translations/i18n/ko.h-582-585 (1)
582-585:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize key-lock UI strings in Korean.
Line 582 through Line 585 are added as English text in
ko.h. Please translate them to Korean to avoid mixed-language lock/unlock feedback.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/ko.h` around lines 582 - 585, The Korean translation file contains English literals for key-lock UI keys; update the defines TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in ko.h to Korean equivalents to avoid mixed-language feedback — e.g. replace with Korean phrases like: TR_KEY_LOCK_FMT -> 키 잠금 (%s+%s 누르고 유지), TR_KEYS_LOCKED -> 키 잠김, TR_KEYS_LOCKED_FMT -> 키 잠김 (%s+%s), and TR_KEYS_UNLOCKED -> 키 잠금 해제 (adjust wording if you prefer alternative Korean phrasing).radio/src/translations/i18n/he.h-576-579 (1)
576-579:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize the new key-lock labels in Hebrew.
Line 576 through Line 579 add user-facing strings in English inside the Hebrew locale file. Please translate these four macros to Hebrew to keep the UI language consistent.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/he.h` around lines 576 - 579, Replace the English strings with Hebrew translations for the four macros: TR_KEY_LOCK_FMT should be translated to a Hebrew phrase conveying "Key lock (%s+%s hold)" (e.g., "נעילת מקש (החזקו %s+%s)"), TR_KEYS_LOCKED to "מפתחות נעולים", TR_KEYS_LOCKED_FMT to "מפתחות נעולים (%s+%s)", and TR_KEYS_UNLOCKED to "מפתחות לא נעולים". Update the definitions for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in the Hebrew locale file accordingly.radio/src/translations/i18n/nl.h-574-577 (1)
574-577:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize the new key-lock strings in Dutch.
Line 574–Line 577 are still in English, so Dutch users will see mixed-language UI for the new feature.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/nl.h` around lines 574 - 577, The strings TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED are still in English; replace their values with Dutch translations so the UI is consistent (e.g., translate "Key lock (%s+%s hold)" and "Keys locked/unlocked" and the formatted variants into appropriate Dutch phrases), updating the definitions for those macros in the translations file where they are declared.radio/src/translations/i18n/pl.h-572-575 (1)
572-575:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTranslate key-lock labels/messages for Polish locale.
Line 572–Line 575 are English literals, which breaks Polish localization consistency for this new flow.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/pl.h` around lines 572 - 575, Lines define English key-lock strings; replace them with Polish translations: change TR_KEY_LOCK_FMT to a Polish phrase like "Blokada klawisza (%s+%s przytrzymane)", update TR_KEYS_LOCKED to "Klawisze zablokowane", TR_KEYS_LOCKED_FMT to "Klawisze zablokowane (%s+%s)", and TR_KEYS_UNLOCKED to "Klawisze odblokowane" so the Polish locale is consistent with the new key-lock flow.radio/src/translations/i18n/ru.h-575-578 (1)
575-578:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTranslate key-lock status strings for Russian locale.
Line 575–Line 578 are English values in
ru.h, so Russian users get non-localized key-lock messages.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/ru.h` around lines 575 - 578, Replace the English values for the macros TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED with Russian translations, preserving the exact format specifiers and punctuation (e.g., keep "%s+%s" and surrounding parentheses/quotes). For example use Russian phrases like "Блокировка клавиш (%s+%s удерживать)" for TR_KEY_LOCK_FMT, "Клавиши заблокированы" for TR_KEYS_LOCKED, "Клавиши заблокированы (%s+%s)" for TR_KEYS_LOCKED_FMT, and "Клавиши разблокированы" for TR_KEYS_UNLOCKED; ensure you only change the string literals and not the macro names or formatting tokens.radio/src/translations/i18n/pt.h-573-576 (1)
573-576:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winProvide Portuguese translations for new key-lock strings.
Line 573–Line 576 are untranslated English strings, causing mixed-language UI in PT builds.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/pt.h` around lines 573 - 576, Replace the untranslated English defines with Portuguese equivalents for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT and TR_KEYS_UNLOCKED; keep the exact format specifiers (%s+%s) and surrounding punctuation intact. For example, use Portuguese phrases such as "Bloqueio de tecla (%s+%s mantidos)" for TR_KEY_LOCK_FMT, "Teclas bloqueadas" for TR_KEYS_LOCKED, "Teclas bloqueadas (%s+%s)" for TR_KEYS_LOCKED_FMT, and "Teclas desbloqueadas" for TR_KEYS_UNLOCKED so the PT build shows consistent Portuguese UI.radio/src/translations/i18n/se.h-575-578 (1)
575-578:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winLocalize new key-lock strings in Swedish file.
These new entries are still English (
"Key lock","Keys locked","Keys unlocked"), so Swedish users will see mixed-language UI in the new feature path.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/se.h` around lines 575 - 578, The Swedish translation file still contains English literals for the new key-lock strings; update the defines TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED to Swedish equivalents and preserve the formatting placeholders (%s) exactly (e.g., translate "Key lock (%s+%s hold)" and "Keys locked (%s+%s)" while keeping the %s tokens intact) so the UI shows fully localized Swedish text.radio/src/translations/i18n/tw.h-570-573 (1)
570-573:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTranslate key-lock labels for Traditional Chinese locale.
The newly added key-lock strings are English, which causes inconsistent language in a user-visible flow for
tw.h.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/tw.h` around lines 570 - 573, The new key-lock strings (TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, TR_KEYS_UNLOCKED) are still in English in the Traditional Chinese file; replace each English string literal with the proper Traditional Chinese translations (e.g., translate "Key lock (%s+%s hold)", "Keys locked", "Keys locked (%s+%s)", and "Keys unlocked") so the tw.h locale is fully localized and consistent with surrounding strings.radio/src/translations/i18n/ua.h-574-577 (1)
574-577:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winAdd Ukrainian translations for new key-lock strings.
TR_KEY_LOCK_FMT,TR_KEYS_LOCKED,TR_KEYS_LOCKED_FMT, andTR_KEYS_UNLOCKEDare currently English, so the key-lock UX is partially untranslated inua.h.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/translations/i18n/ua.h` around lines 574 - 577, The four macros TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in ua.h are still English; update their string values to Ukrainian translations while preserving formatting/placeholders (e.g., "%s+%s" and surrounding parentheses) and punctuation; locate the definitions for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT and TR_KEYS_UNLOCKED and replace the English text with appropriate Ukrainian equivalents (keeping the exact format specifiers and structure).
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@radio/src/gui/212x64/radio_setup.cpp`:
- Around line 617-630: The 24-byte static buffer lbl used in the
ITEM_RADIO_SETUP_KEY_LOCK case is too small and can truncate localized strings;
increase its size (e.g., static char lbl[80]) to safely hold STR_KEY_LOCK_FMT
plus key names returned by keysGetLabel, keeping the existing snprintf(lbl,
sizeof(lbl), STR_KEY_LOCK_FMT, ...) call and leaving the rest of the case
(ITEM_RADIO_SETUP_KEY_LOCK, keysGetLabel, g_eeGeneral.keyLockEnabled,
editCheckBox) unchanged.
In `@radio/src/gui/colorlcd/setup_menus/key_shortcuts.cpp`:
- Around line 91-101: The keyLockLabel buffer (currently 32 bytes) can be
overflowed by localized STR_KEY_LOCK_FMT plus key names; increase its size
(e.g., change keyLockLabel from 32 to a larger constant such as 128 or 256) to
match the longer buffers used elsewhere, keep using snprintf to format with
sizeof(keyLockLabel) for safety, and leave the surrounding code (keysGetLabel,
STR_KEY_LOCK_FMT, setupLine and the ToggleSwitch lambda) unchanged so the label
no longer gets truncated for long localized strings.
In `@radio/src/main.cpp`:
- Around line 291-331: The fixed-size 40-byte buffer lockedBuf in checkKeysLock
can be too small for localized STR_KEYS_LOCKED_FMT and may truncate text; change
the implementation to allocate a sufficiently large buffer (or use a
std::string) and format into it safely: replace static char lockedBuf[40] with a
larger constant (or dynamically sized buffer) sized to accommodate the longest
possible localized message, then call snprintf (or safer std::string formatting)
into that buffer and keep using lockedMsg = lockedBuf; ensure symbols referenced
are checkKeysLock, lockedBuf, STR_KEYS_LOCKED_FMT, and lockedMsg so the new
allocation is used wherever the message is displayed.
---
Minor comments:
In `@companion/src/generaledit/generalsetup.ui`:
- Around line 1329-1342: The new Key lock widgets (QLabel
name="label_keyLockEnabled" and QCheckBox name="chkKeyLockEnabled") are placed
at row="30" which collides with the existing verticalSpacer_2; move both widgets
to an unused row (for example row="31" or the next free row in the grid) so they
don't overlap the spacer, updating the row attributes for label_keyLockEnabled
and chkKeyLockEnabled in the UI XML to that free row.
In `@radio/src/translations/i18n/cn.h`:
- Around line 572-575: The four new English macro strings TR_KEY_LOCK_FMT,
TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED need Chinese
translations so the locale is consistent; replace the English literals with
appropriate Chinese text (e.g., translate "Key lock (%s+%s hold)" and "Keys
locked/locked (%s+%s)/unlocked" into Chinese) keeping the existing format
specifiers intact and preserving the macro names in cn.h.
In `@radio/src/translations/i18n/cz.h`:
- Around line 575-578: Translate the four English macros into Czech while
keeping the macro names and placeholder formats intact: replace TR_KEY_LOCK_FMT
"Key lock (%s+%s hold)" with a Czech equivalent preserving (%s+%s), replace
TR_KEYS_LOCKED "Keys locked" and TR_KEYS_LOCKED_FMT "Keys locked (%s+%s)" with
Czech phrases (the formatted one must keep the %s+%s placeholders), and replace
TR_KEYS_UNLOCKED "Keys unlocked" with its Czech translation; ensure punctuation
and spacing remain consistent and no placeholders are altered.
In `@radio/src/translations/i18n/da.h`:
- Around line 577-580: The four new English macros (TR_KEY_LOCK_FMT,
TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, TR_KEYS_UNLOCKED) must be replaced with
Danish translations to match the locale; update each macro value to Danish
equivalents (suggestions: TR_KEY_LOCK_FMT -> "Tastelås (%s+%s hold)",
TR_KEYS_LOCKED -> "Taster låst", TR_KEYS_LOCKED_FMT -> "Taster låst (%s+%s)",
TR_KEYS_UNLOCKED -> "Taster oplåst") by editing their string literals so the UI
displays Danish text.
In `@radio/src/translations/i18n/de.h`:
- Around line 573-576: Replace the English-only macro values with German
translations for the four keys: update TR_KEY_LOCK_FMT to a German phrase
equivalent to "Key lock (%s+%s hold)" (e.g., "Tasten sperren (%s+%s gedrückt
halten)"), TR_KEYS_LOCKED to "Tasten gesperrt" (or similar), TR_KEYS_LOCKED_FMT
to a formatted German equivalent like "Tasten gesperrt (%s+%s)", and
TR_KEYS_UNLOCKED to "Tasten entsperrt"; modify the macro definitions for
TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT and TR_KEYS_UNLOCKED in de.h
accordingly so the German UI shows localized text.
In `@radio/src/translations/i18n/es.h`:
- Around line 571-574: Replace the four English strings in the Spanish locale
with proper Spanish translations: update the macros TR_KEY_LOCK_FMT,
TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in es.h so they are
localized (for example use "Bloqueo de tecla (%s+%s mantenida)" or "Bloqueo de
tecla (%s+%s pulsadas)" for TR_KEY_LOCK_FMT, "Teclas bloqueadas" for
TR_KEYS_LOCKED, "Teclas bloqueadas (%s+%s)" for TR_KEYS_LOCKED_FMT, and "Teclas
desbloqueadas" for TR_KEYS_UNLOCKED), ensuring phrasing is consistent and
preserves the %s format placeholders.
In `@radio/src/translations/i18n/fi.h`:
- Around line 572-575: Replace the four English macro values with Finnish
translations: update TR_KEY_LOCK_FMT to "Avainlukko (%s+%s pidetään)",
TR_KEYS_LOCKED to "Avimet lukittu", TR_KEYS_LOCKED_FMT to "Avimet lukittu
(%s+%s)", and TR_KEYS_UNLOCKED to "Avimet avattu"; change the string literals
for the macros TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and
TR_KEYS_UNLOCKED accordingly so the Finnish locale file contains Finnish text.
In `@radio/src/translations/i18n/fr.h`:
- Around line 576-579: Replace the four English strings with French
translations: update the definitions for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED,
TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED to their French equivalents (e.g.,
"Verrouillage de la touche (%s+%s maintenu)", "Touches verrouillées", "Touches
verrouillées (%s+%s)", "Touches déverrouillées") so the labels appear translated
in the French UI; edit the string literals assigned to those symbols in-place.
In `@radio/src/translations/i18n/he.h`:
- Around line 576-579: Replace the English strings with Hebrew translations for
the four macros: TR_KEY_LOCK_FMT should be translated to a Hebrew phrase
conveying "Key lock (%s+%s hold)" (e.g., "נעילת מקש (החזקו %s+%s)"),
TR_KEYS_LOCKED to "מפתחות נעולים", TR_KEYS_LOCKED_FMT to "מפתחות נעולים
(%s+%s)", and TR_KEYS_UNLOCKED to "מפתחות לא נעולים". Update the definitions for
TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in the
Hebrew locale file accordingly.
In `@radio/src/translations/i18n/it.h`:
- Around line 573-576: The listed translation keys (TR_KEY_LOCK_FMT,
TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, TR_KEYS_UNLOCKED) are still in English;
replace their string values with Italian equivalents for consistent
localization: set TR_KEY_LOCK_FMT to an Italian phrase conveying "Key lock
(%s+%s hold)" (e.g., "Blocco tasti (%s+%s tieni premuto)"), TR_KEYS_LOCKED to
"Tasti bloccati", TR_KEYS_LOCKED_FMT to "Tasti bloccati (%s+%s)", and
TR_KEYS_UNLOCKED to "Tasti sbloccati"; update these definitions in it.h where
those macros are declared.
In `@radio/src/translations/i18n/jp.h`:
- Around line 572-575: Replace the English-only macros with Japanese
translations in the jp.h header: update TR_KEY_LOCK_FMT, TR_KEYS_LOCKED,
TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED to Japanese strings while preserving
all format specifiers and punctuation (e.g., keep "%s+%s" in TR_KEY_LOCK_FMT and
TR_KEYS_LOCKED_FMT). Ensure the Japanese wording fits UI context for "Key lock
(X+Y hold)", "Keys locked", "Keys locked (X+Y)", and "Keys unlocked", and keep
the macro names and surrounding formatting unchanged.
In `@radio/src/translations/i18n/ko.h`:
- Around line 582-585: The Korean translation file contains English literals for
key-lock UI keys; update the defines TR_KEY_LOCK_FMT, TR_KEYS_LOCKED,
TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in ko.h to Korean equivalents to avoid
mixed-language feedback — e.g. replace with Korean phrases like: TR_KEY_LOCK_FMT
-> 키 잠금 (%s+%s 누르고 유지), TR_KEYS_LOCKED -> 키 잠김, TR_KEYS_LOCKED_FMT -> 키 잠김
(%s+%s), and TR_KEYS_UNLOCKED -> 키 잠금 해제 (adjust wording if you prefer
alternative Korean phrasing).
In `@radio/src/translations/i18n/nl.h`:
- Around line 574-577: The strings TR_KEY_LOCK_FMT, TR_KEYS_LOCKED,
TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED are still in English; replace their
values with Dutch translations so the UI is consistent (e.g., translate "Key
lock (%s+%s hold)" and "Keys locked/unlocked" and the formatted variants into
appropriate Dutch phrases), updating the definitions for those macros in the
translations file where they are declared.
In `@radio/src/translations/i18n/pl.h`:
- Around line 572-575: Lines define English key-lock strings; replace them with
Polish translations: change TR_KEY_LOCK_FMT to a Polish phrase like "Blokada
klawisza (%s+%s przytrzymane)", update TR_KEYS_LOCKED to "Klawisze zablokowane",
TR_KEYS_LOCKED_FMT to "Klawisze zablokowane (%s+%s)", and TR_KEYS_UNLOCKED to
"Klawisze odblokowane" so the Polish locale is consistent with the new key-lock
flow.
In `@radio/src/translations/i18n/pt.h`:
- Around line 573-576: Replace the untranslated English defines with Portuguese
equivalents for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT and
TR_KEYS_UNLOCKED; keep the exact format specifiers (%s+%s) and surrounding
punctuation intact. For example, use Portuguese phrases such as "Bloqueio de
tecla (%s+%s mantidos)" for TR_KEY_LOCK_FMT, "Teclas bloqueadas" for
TR_KEYS_LOCKED, "Teclas bloqueadas (%s+%s)" for TR_KEYS_LOCKED_FMT, and "Teclas
desbloqueadas" for TR_KEYS_UNLOCKED so the PT build shows consistent Portuguese
UI.
In `@radio/src/translations/i18n/ru.h`:
- Around line 575-578: Replace the English values for the macros
TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED with
Russian translations, preserving the exact format specifiers and punctuation
(e.g., keep "%s+%s" and surrounding parentheses/quotes). For example use Russian
phrases like "Блокировка клавиш (%s+%s удерживать)" for TR_KEY_LOCK_FMT,
"Клавиши заблокированы" for TR_KEYS_LOCKED, "Клавиши заблокированы (%s+%s)" for
TR_KEYS_LOCKED_FMT, and "Клавиши разблокированы" for TR_KEYS_UNLOCKED; ensure
you only change the string literals and not the macro names or formatting
tokens.
In `@radio/src/translations/i18n/se.h`:
- Around line 575-578: The Swedish translation file still contains English
literals for the new key-lock strings; update the defines TR_KEY_LOCK_FMT,
TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED to Swedish equivalents
and preserve the formatting placeholders (%s) exactly (e.g., translate "Key lock
(%s+%s hold)" and "Keys locked (%s+%s)" while keeping the %s tokens intact) so
the UI shows fully localized Swedish text.
In `@radio/src/translations/i18n/tw.h`:
- Around line 570-573: The new key-lock strings (TR_KEY_LOCK_FMT,
TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT, TR_KEYS_UNLOCKED) are still in English in
the Traditional Chinese file; replace each English string literal with the
proper Traditional Chinese translations (e.g., translate "Key lock (%s+%s
hold)", "Keys locked", "Keys locked (%s+%s)", and "Keys unlocked") so the tw.h
locale is fully localized and consistent with surrounding strings.
In `@radio/src/translations/i18n/ua.h`:
- Around line 574-577: The four macros TR_KEY_LOCK_FMT, TR_KEYS_LOCKED,
TR_KEYS_LOCKED_FMT, and TR_KEYS_UNLOCKED in ua.h are still English; update their
string values to Ukrainian translations while preserving formatting/placeholders
(e.g., "%s+%s" and surrounding parentheses) and punctuation; locate the
definitions for TR_KEY_LOCK_FMT, TR_KEYS_LOCKED, TR_KEYS_LOCKED_FMT and
TR_KEYS_UNLOCKED and replace the English text with appropriate Ukrainian
equivalents (keeping the exact format specifiers and structure).
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: 08e118f2-e70c-460b-a569-47d1267e396a
📒 Files selected for processing (63)
companion/src/firmwares/edgetx/yaml_generalsettings.cppcompanion/src/firmwares/generalsettings.hcompanion/src/generaledit/generalsetup.cppcompanion/src/generaledit/generalsetup.hcompanion/src/generaledit/generalsetup.uiradio/src/datastructs.hradio/src/datastructs_private.hradio/src/gui/128x64/radio_setup.cppradio/src/gui/212x64/radio_setup.cppradio/src/gui/colorlcd/setup_menus/key_shortcuts.cppradio/src/gui/common/stdlcd/feature_control.hradio/src/keys.cppradio/src/keys.hradio/src/main.cppradio/src/storage/yaml/yaml_datastructs_128x64.cppradio/src/storage/yaml/yaml_datastructs_f16.cppradio/src/storage/yaml/yaml_datastructs_gx12.cppradio/src/storage/yaml/yaml_datastructs_nb4p.cppradio/src/storage/yaml/yaml_datastructs_nv14.cppradio/src/storage/yaml/yaml_datastructs_pa01.cppradio/src/storage/yaml/yaml_datastructs_pl18.cppradio/src/storage/yaml/yaml_datastructs_pl18u.cppradio/src/storage/yaml/yaml_datastructs_st16.cppradio/src/storage/yaml/yaml_datastructs_t15.cppradio/src/storage/yaml/yaml_datastructs_t15pro.cppradio/src/storage/yaml/yaml_datastructs_t20.cppradio/src/storage/yaml/yaml_datastructs_tpro.cppradio/src/storage/yaml/yaml_datastructs_tx15.cppradio/src/storage/yaml/yaml_datastructs_tx16smk3.cppradio/src/storage/yaml/yaml_datastructs_x10.cppradio/src/storage/yaml/yaml_datastructs_x9d.cppradio/src/storage/yaml/yaml_datastructs_x9dp2019.cppradio/src/storage/yaml/yaml_datastructs_x9e.cppradio/src/storage/yaml/yaml_datastructs_xlite.cppradio/src/storage/yaml/yaml_datastructs_xlites.cppradio/src/targets/horus/hal.hradio/src/targets/stm32h7s78-dk/hal.hradio/src/targets/t15pro/hal.hradio/src/targets/taranis/hal.hradio/src/targets/tx15/hal.hradio/src/targets/tx16smk3/hal.hradio/src/tests/keys_lock.cppradio/src/translations/i18n/cn.hradio/src/translations/i18n/cz.hradio/src/translations/i18n/da.hradio/src/translations/i18n/de.hradio/src/translations/i18n/en.hradio/src/translations/i18n/es.hradio/src/translations/i18n/fi.hradio/src/translations/i18n/fr.hradio/src/translations/i18n/he.hradio/src/translations/i18n/it.hradio/src/translations/i18n/jp.hradio/src/translations/i18n/ko.hradio/src/translations/i18n/nl.hradio/src/translations/i18n/pl.hradio/src/translations/i18n/pt.hradio/src/translations/i18n/ru.hradio/src/translations/i18n/se.hradio/src/translations/i18n/tw.hradio/src/translations/i18n/ua.hradio/src/translations/sim_string_list.hradio/src/translations/string_list.h
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
radio/src/main.cpp (1)
297-297:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winBuffer size increased but may still be insufficient for all languages.
The buffer was increased from 40 to 45 bytes, which improves on the previous implementation. However, localized
STR_KEYS_LOCKED_FMTstrings in verbose languages combined with key names could still exceed 45 bytes. The previous review recommended 80 bytes to ensure no truncation occurs across all supported translations.🌐 Recommended buffer size for robust i18n support
- static char lockedBuf[45]; + static char lockedBuf[80];🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@radio/src/main.cpp` at line 297, The fixed-size buffer lockedBuf (currently declared as "static char lockedBuf[45]") may still overflow for verbose localized STR_KEYS_LOCKED_FMT strings; increase the buffer to a safe size (e.g., 80 bytes) or, better, replace the static C buffer usage with a dynamic/resizable string approach and ensure all formatting uses snprintf/strncpy or std::string to prevent truncation; update references where lockedBuf and STR_KEYS_LOCKED_FMT are used so formatting calls pass the new size or use std::string::sprintf-equivalent to build the final message safely.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@radio/src/gui/colorlcd/setup_menus/key_shortcuts.cpp`:
- Line 92: The fixed-size buffer keyLockLabel (currently declared as static char
keyLockLabel[45]) can still overflow for some localized STR_KEY_LOCK_FMT
strings; change its size to at least 80 bytes (e.g., static char
keyLockLabel[80]) and ensure all uses that write into keyLockLabel (calls that
format STR_KEY_LOCK_FMT with key names) use snprintf or equivalent with the new
buffer size to avoid truncation; alternatively replace keyLockLabel with a
std::string and format into it to fully eliminate fixed-size buffer risks.
---
Duplicate comments:
In `@radio/src/main.cpp`:
- Line 297: The fixed-size buffer lockedBuf (currently declared as "static char
lockedBuf[45]") may still overflow for verbose localized STR_KEYS_LOCKED_FMT
strings; increase the buffer to a safe size (e.g., 80 bytes) or, better, replace
the static C buffer usage with a dynamic/resizable string approach and ensure
all formatting uses snprintf/strncpy or std::string to prevent truncation;
update references where lockedBuf and STR_KEYS_LOCKED_FMT are used so formatting
calls pass the new size or use std::string::sprintf-equivalent to build the
final message safely.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: b4f04ea3-0ec9-4c8a-8e31-92b34943fc68
📒 Files selected for processing (2)
radio/src/gui/colorlcd/setup_menus/key_shortcuts.cppradio/src/main.cpp
3djc
added
enhancement ✨
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@radio/src/keys.h`:
- Around line 28-30: The unconditional include of hal_keys_lock.h in keys.h
breaks non-radio builds; fix by either (A) wrapping the include in a radio-only
feature guard (e.g. `#if` defined(RADIO_FIRMWARE) ... `#endif`) so only radio
firmware builds pull in hal_keys_lock.h, or (B) add a minimal stub
hal_keys_lock.h for simulator/companion builds (e.g.,
radio/src/targets/simu/hal_keys_lock.h with empty declarations) and ensure the
simulator build can find it; also guard or stub any usages of the hal_keys_lock
symbols referenced later in keys.h (the key-lock-related functions/definitions
that depend on hal_keys_lock.h) so non-radio builds compile cleanly.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: db175f10-e736-40b0-b584-c07795dcedb1
📒 Files selected for processing (53)
companion/src/firmwares/boardjson.cppcompanion/src/firmwares/boardjson.hcompanion/src/generaledit/generalsetup.cppradio/src/CMakeLists.txtradio/src/boards/generic_stm32/CMakeLists.txtradio/src/boards/hw_defs/boxer.jsonradio/src/boards/hw_defs/bumblebee.jsonradio/src/boards/hw_defs/commando8.jsonradio/src/boards/hw_defs/f16.jsonradio/src/boards/hw_defs/gx12.jsonradio/src/boards/hw_defs/lr3pro.jsonradio/src/boards/hw_defs/mt12.jsonradio/src/boards/hw_defs/pocket.jsonradio/src/boards/hw_defs/t12.jsonradio/src/boards/hw_defs/t12max.jsonradio/src/boards/hw_defs/t14.jsonradio/src/boards/hw_defs/t15.jsonradio/src/boards/hw_defs/t15pro.jsonradio/src/boards/hw_defs/t16.jsonradio/src/boards/hw_defs/t18.jsonradio/src/boards/hw_defs/t20.jsonradio/src/boards/hw_defs/t20v2.jsonradio/src/boards/hw_defs/t8.jsonradio/src/boards/hw_defs/tlite.jsonradio/src/boards/hw_defs/tpro.jsonradio/src/boards/hw_defs/tpros.jsonradio/src/boards/hw_defs/tprov2.jsonradio/src/boards/hw_defs/tx12.jsonradio/src/boards/hw_defs/tx12mk2.jsonradio/src/boards/hw_defs/tx15.jsonradio/src/boards/hw_defs/tx16s.jsonradio/src/boards/hw_defs/tx16smk3.jsonradio/src/boards/hw_defs/v16.jsonradio/src/boards/hw_defs/x10.jsonradio/src/boards/hw_defs/x10express.jsonradio/src/boards/hw_defs/x12s.jsonradio/src/boards/hw_defs/x7.jsonradio/src/boards/hw_defs/x7access.jsonradio/src/boards/hw_defs/x9d+.jsonradio/src/boards/hw_defs/x9d+2019.jsonradio/src/boards/hw_defs/x9d.jsonradio/src/boards/hw_defs/x9e.jsonradio/src/boards/hw_defs/x9lite.jsonradio/src/boards/hw_defs/x9lites.jsonradio/src/boards/hw_defs/zorro.jsonradio/src/keys.hradio/src/targets/horus/hal.hradio/src/targets/t15pro/hal.hradio/src/targets/taranis/hal.hradio/src/targets/tx15/hal.hradio/src/targets/tx16smk3/hal.hradio/util/hw_defs/generator.pyradio/util/hw_defs/models.py
💤 Files with no reviewable changes (5)
- radio/src/targets/taranis/hal.h
- radio/src/targets/t15pro/hal.h
- radio/src/targets/tx15/hal.h
- radio/src/targets/horus/hal.h
- radio/src/targets/tx16smk3/hal.h
✅ Files skipped from review due to trivial changes (6)
- radio/src/boards/hw_defs/mt12.json
- radio/src/boards/hw_defs/t14.json
- radio/src/boards/hw_defs/gx12.json
- radio/src/boards/hw_defs/x9lite.json
- radio/src/boards/hw_defs/t15pro.json
- radio/src/boards/hw_defs/x12s.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR brings an OPTIONAL ability to lock radio keys while flying, handing radio to a trainee,....
Feature is enabled in Radio setup / Radio settings / Keys shortcuts
Feature is then activated by long pushing both keys part of the combo. Combo will vary based on actual radio model, but the combo is always listed in Keys shortcut.
Any keys press with generate a Keys locked message, with a reminder of the keys combo
Deactivating the lock is done in the same way as activation
gtest are included
This closes #5344 and closes #3524
For back port, 961df15 can be used
Summary by CodeRabbit