gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-02 02:37:52 +00:00
Code Issues Projects Releases Wiki Activity

#751 Fix message displaying data path

Browse Source
This commit is contained in:
Frankie Arzu 2022-12-20 16:30:14 -06:00
parent 600ff5def7
commit a13b01759e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lua_scripts/DSMLIB/DsmFwPrgLib.lua
View File

@ -480,7 +480,7 @@ local function ExtractDisplayAttr(text1, attr)
attr = bit32.bor(attr, DISP_ATTR.BOLD)
end
text, pos = string.gsub(text, "/M", "")
text, pos = string.gsub(text, "/m", "")
if (pos>0) then -- FORCED MENU Button
attr = bit32.bor(attr, DISP_ATTR.FORCED_MENU)
end
@ -1378,7 +1378,7 @@ local function DSM_Init_Text(rxId)
-- Text allightment: /c = CENTER, /r = RIGHT
-- Text effects: /b = BOLD
-- Text formatting: /p = PERCENT numbers (forced if not in Line Type=PERCENT)
-- Navigaton: /M = Force to be a Menu button, when a menu navigates to itself,
-- Navigaton: /m = Force to be a Menu button, when a menu navigates to itself,
-- is usually a message line.. but sometimes, we want to navigate to the same page to refresh values
-- array List_Values:
@ -1528,7 +1528,7 @@ local function DSM_Init_Text(rxId)
Text[0x00C7] = "Calibrate Sensor"
Text[0x00C8] = "Complete" -- FC6250HX calibration complete
Text[0x00CA] = "SAFE/Panic Mode Setup"
Text[0x00CD] = "Level model and capture attitude/M"; -- Different from List_Text , and force it to be a menu button
Text[0x00CD] = "Level model and capture attitude/m"; -- Different from List_Text , and force it to be a menu button
-- RX Orientations for AR631/AR637, Optionally attach an Image + Alt Text to display
List_Text[0x00CB] = "Position 1"; List_Text_Img[0x00CB] = "rx_pos_1.png|Pilot View: RX Label Up, Pins Back"

4
Lua_scripts/DSMLIB/DsmSetupLib.lua
View File

@ -724,7 +724,7 @@ local function ST_LoadMenu(menuId)
local msg1 = "Data saved to: "
local msg2 = DATA_PATH..hashName(MODEL.modelName)..".txt"
local msg2 = " "..DATA_PATH.."/"..hashName(MODEL.modelName)..".txt"
ctx.Menu = { MenuId = 0x1005, Text = "Config Saved", PrevId = 0, NextId = 0, BackId = 0, TextId=0 }
ctx.MenuLines[2] = { Type = LINE_TYPE.MENU, Text=msg1, TextId = 0, ValId = 0x1005 }
@ -735,7 +735,7 @@ local function ST_LoadMenu(menuId)
elseif (menuId==0x1006) then
ST_LoadFileData()
local msg1 = "Data restored from: "
local msg2 = DATA_PATH..hashName(MODEL.modelName)..".txt"
local msg2 = " "..DATA_PATH.."/"..hashName(MODEL.modelName)..".txt"
ctx.Menu = { MenuId = 0x1006, Text = "Discart Changes", PrevId = 0, NextId = 0, BackId = 0, TextId=0 }
ctx.MenuLines[2] = { Type = LINE_TYPE.MENU, Text=msg1, TextId = 0, ValId = 0x1006 }