Skip to content

Commit 10d5bfb

Browse files
committed
improve copy on model mismatch
1 parent 1e74e66 commit 10d5bfb

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

src/SCRIPTS/ELRS/crsf.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
local CRSF = {}
1818

1919
-- ============================================================================
20-
-- Named protocol constants (no magic numbers anywhere)
20+
-- Named protocol constants
2121
-- ============================================================================
2222

2323
CRSF.CONST = {

src/SCRIPTS/TOOLS/ExpressLRS/ui/lcd.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ function UI.render(event, _touchState)
159159
UI.drawAlert("Model Mismatch", {
160160
"RX connected but",
161161
"Model ID doesn't match.",
162-
"To use this receiver:",
163-
"Disable Model Match",
162+
"Toggle Model Match",
163+
"to re-sync",
164164
}, { left = "[OK]", right = "[RTN] Change model" })
165165
return
166166
end

src/SCRIPTS/TOOLS/ExpressLRS/ui/lvgl.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ function ModelMismatchDialog.show(onContinue, onExit)
7171
flexPad = lvgl.PAD_SMALL,
7272
children = {
7373
{ type = lvgl.LABEL, text = "Receiver connected but Model ID doesn't match." },
74-
{ type = lvgl.LABEL, text = "This prevents controlling the wrong model." },
75-
{ type = lvgl.LABEL, text = "To use this receiver:" },
76-
{ type = lvgl.LABEL, text = "Set Model Match to OFF" },
74+
{ type = lvgl.LABEL, text = "RC commands are blocked until resolved." },
75+
{ type = lvgl.LABEL, text = "Toggle the Model Match setting to" },
76+
{ type = lvgl.LABEL, text = "re-sync, or change the EdgeTX model." },
7777
},
7878
},
7979
{

src/WIDGETS/ELRSVTXAdmin/loadable.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,6 +1176,8 @@ end
11761176
-- Widget lifecycle
11771177
-- ============================================================================
11781178

1179+
local lastBuilt6pos = -1
1180+
11791181
local wgt = {
11801182
zone = zone,
11811183
options = options,
@@ -1190,6 +1192,10 @@ end
11901192

11911193
function wgt.refresh(_event, _touchState)
11921194
wgt.background()
1195+
if lvgl.isFullScreen() and Presets.lastPos ~= lastBuilt6pos then
1196+
lastBuilt6pos = Presets.lastPos
1197+
buildFullScreen()
1198+
end
11931199
end
11941200

11951201
function wgt.update(newOptions)
@@ -1199,7 +1205,9 @@ function wgt.update(newOptions)
11991205
VTX.syncDesiredFromState()
12001206
end
12011207
buildFullScreen()
1208+
lastBuilt6pos = Presets.lastPos
12021209
else
1210+
lastBuilt6pos = -1
12031211
WidgetUI.build(wgt.zone, wgt.options)
12041212
end
12051213
end

0 commit comments

Comments
 (0)