Skip to content

Commit 401cc76

Browse files
Fix message displaying the DataPath after saving (#787)
* #751 DSM Enhancements #751 DSM Forward Programming Enhancements (New GUI, etc) * Make both work on EdgeTx and OpenTX * #751 Turn OFF simulation by default Distribution code with RX simulation OFF Simulation should be only for Development * #751 Update Readme Documentation Updated the Readme.txt documentation and removed compiled luac file that was check in by mistake * #751 Fix problems With Reset RX 1. Fix problem when trying to Factory Reset. Enter Bind Mode. Save backup, Restore Backup 2. Found a way to advance on the Gyro initial Setup menus.. a bit of a hack, but works. 3. Handle RX resets properly. It needed after initial setup * #751 Cosmetic and Show Orientation Images #751 1. Fix problems when text contradictions between Menu/Line Headers and List Values 2. Show Images of RX orientations 3. Able to Hack getting into Initial Setup and other menus who was failing before 4. Custumize the way Flight Mode reports the Value on Screen * #751 add check for required libraries Add check that the required files in DSMLIB exist * #751 Write documentation about the protocol so that we don't forget later what we know, and enable others to understand the logs and maybe help solve problems. * #766 Change the way to detect that the files exist. now works on both ETX and OTX * #766 Strange Flickering in OTX Strange Flickering happening on OTX. Refreshing the screen on every cycle fixed the problem * #766 Change way of dectecting EdgeTX Change way of detecting OTX in multiple versions: OTX 2.3.14 and 2.3.15 * #766 make editable Gain Values Gains and other settings should be editable even when they are VALUE_NOCHANGING. Flight Mode is an exception that is handled properly. Right align numbers. * #766 More enhacements Added AR630 Make numbers right justified Cleanup some log messages and line types. Updated DSM FWD prog documentation * #751 more cosmetic things 1. Added AR10360T, 2. Simplify way to configured the hack for more receivers. 3. Change some texts on menus to march spektrum 4. Background color in Spektrum theme to match * #751 A few final changes 1. Update channel names to include channel number. i.e: Ch5 (Gear) 2, Fix flight mode display for Heli Receiver 3. i think the unknown lines are to request info about the TX settings * #751 1. Added Warning Screen 2. Correct handling of Unknown lines in Gyro Settings->Initial Setup * #751 New v0.51 version. - Added new menus to configure Model/Wing type. Without it, the initial setup will not work properly. * #751 More fixes on mixers and servo reverse -- Fix problem reversing servos when using vtail/delta mix -- Properly detect ch order of multimodule * #751 Updated channel naming and docs Updated readme documentation Consistent naming of Ch across the code. * #751 Fix message displaying data path Co-authored-by: pascallanger <pascal_langer@yahoo.fr>
1 parent 6297810 commit 401cc76

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Lua_scripts/DSMLIB/DsmFwPrgLib.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ local function ExtractDisplayAttr(text1, attr)
480480
attr = bit32.bor(attr, DISP_ATTR.BOLD)
481481
end
482482

483-
text, pos = string.gsub(text, "/M", "")
483+
text, pos = string.gsub(text, "/m", "")
484484
if (pos>0) then -- FORCED MENU Button
485485
attr = bit32.bor(attr, DISP_ATTR.FORCED_MENU)
486486
end
@@ -1378,7 +1378,7 @@ local function DSM_Init_Text(rxId)
13781378
-- Text allightment: /c = CENTER, /r = RIGHT
13791379
-- Text effects: /b = BOLD
13801380
-- Text formatting: /p = PERCENT numbers (forced if not in Line Type=PERCENT)
1381-
-- Navigaton: /M = Force to be a Menu button, when a menu navigates to itself,
1381+
-- Navigaton: /m = Force to be a Menu button, when a menu navigates to itself,
13821382
-- is usually a message line.. but sometimes, we want to navigate to the same page to refresh values
13831383

13841384
-- array List_Values:
@@ -1528,7 +1528,8 @@ local function DSM_Init_Text(rxId)
15281528
Text[0x00C7] = "Calibrate Sensor"
15291529
Text[0x00C8] = "Complete" -- FC6250HX calibration complete
15301530
Text[0x00CA] = "SAFE/Panic Mode Setup"
1531-
Text[0x00CD] = "Level model and capture attitude/M"; -- Different from List_Text , and force it to be a menu button
1531+
Text[0x00CD] = "Level model and capture attitude/m"; -- Different from List_Text , and force it to be a menu button
1532+
15321533

15331534
-- RX Orientations for AR631/AR637, Optionally attach an Image + Alt Text to display
15341535
List_Text[0x00CB] = "Position 1"; List_Text_Img[0x00CB] = "rx_pos_1.png|Pilot View: RX Label Up, Pins Back"

Lua_scripts/DSMLIB/DsmSetupLib.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ local function ST_LoadMenu(menuId)
724724

725725

726726
local msg1 = "Data saved to: "
727-
local msg2 = DATA_PATH..hashName(MODEL.modelName)..".txt"
727+
local msg2 = " "..DATA_PATH.."/"..hashName(MODEL.modelName)..".txt"
728728

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

740740
ctx.Menu = { MenuId = 0x1006, Text = "Discart Changes", PrevId = 0, NextId = 0, BackId = 0, TextId=0 }
741741
ctx.MenuLines[2] = { Type = LINE_TYPE.MENU, Text=msg1, TextId = 0, ValId = 0x1006 }

0 commit comments

Comments
 (0)