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

Merge branch 'master' into frankie-dsm-fwrd-prg-enhancements

Browse Source
This commit is contained in:
Frankie Arzu 2022-12-20 02:52:18 -06:00 committed by GitHub
commit 2a0e9c0357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lua_scripts/DSM FwdPrg_05_BW.lua
View File

@ -1,6 +1,7 @@
local toolName = "TNS|DSM Forward Prog v0.52 (Text B&W) |TNE"
local VERSION = "v0.52"
---- #########################################################################
---- # #
---- # Copyright (C) OpenTX #

1
Lua_scripts/DSMLIB/DsmFwPrgLib.lua
View File

@ -395,7 +395,6 @@ local function channelType2String(byte1, byte2)
if (bit32.band(byte2,CH_TYPE.SLAVE)>0) then s=s.."SLAVE " end
if (bit32.band(byte2,CH_TYPE.REVERSE)>0) then s=s.."REVERSE " end
if (byte1==CH_MIX_TYPE.NORMAL) then s=s.." MIX_NOR"
elseif (byte1==CH_MIX_TYPE.MIX_AIL_B) then s=s.." MIX_AIL_B"
elseif (byte1==CH_MIX_TYPE.MIX_ELE_A) then s=s.." MIX_ELE_A"

7
Lua_scripts/DSMLIB/DsmSetupLib.lua
View File

@ -25,8 +25,8 @@
local DEBUG_ON, SIMULATION_ON = ... -- Get DebugON from parameters
local SETUP_LIB_VERSION = "0.52"
local DATA_PATH = "/SCRIPTS/TOOLS/DSMLIB/data/" -- Path to store model settings files
local dsmLib = assert(loadScript("/SCRIPTS/TOOLS/DSMLIB/DsmFwPrgLib.lua"))(DEBUG_ON)
@ -159,7 +159,6 @@ local function printServoReverseInfo()
end
end
local function ST_PlaneWingInit(wingType)
print("Change Plane WingType:"..wing_type_text[wingType])
@ -373,6 +372,7 @@ local function ST_Default_Data()
ST_AircraftInit(AIRCRAFT_TYPE.PLANE)
print("Initializing Servo Reverse from TX output settings")
MENU_DATA[MEMU_VAR.PORT1_MODE] = CH_MODE_TYPE.NORMAL + MODEL.modelOutputChannel[PORT.PORT1].revert
MENU_DATA[MEMU_VAR.PORT2_MODE] = CH_MODE_TYPE.NORMAL + MODEL.modelOutputChannel[PORT.PORT2].revert
MENU_DATA[MEMU_VAR.PORT3_MODE] = CH_MODE_TYPE.NORMAL + MODEL.modelOutputChannel[PORT.PORT3].revert
@ -385,6 +385,7 @@ local function ST_Default_Data()
MENU_DATA[MEMU_VAR.PORT10_MODE] = CH_MODE_TYPE.NORMAL + MODEL.modelOutputChannel[PORT.PORT10].revert
printServoReverseInfo()
end
----------------------- FILE MANAGEMENT ---------------------------------------------
@ -445,6 +446,7 @@ function ST_LoadFileData()
printChannelSummary()
printServoReverseInfo()
-- No need to save right now
menuDataChanged = false
@ -832,6 +834,7 @@ local function ST_LoadMenu(menuId)
elseif (menuId==0x1030) then
printChannelSummary()
ctx.Menu = { MenuId = 0x1030, Text = "Gyro Channel Reverse (Port 1-5)", PrevId = 0, NextId = 0x1031, BackId = 0x1001, TextId=0 }
ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT1], TextId = 0, ValId = MEMU_VAR.PORT1_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT1_MODE], Format = formatTXRevert(PORT.PORT1) }
ctx.MenuLines[1] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT2], TextId = 0, ValId = MEMU_VAR.PORT2_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT2_MODE], Format = formatTXRevert(PORT.PORT2) }

1
Lua_scripts/DSMLIB/readme.md
View File

@ -130,6 +130,7 @@ If you go to the logs, you can see that the RX was correcting the value:
- Fix Reversing of Servos
- Properly detect Moltimodule Ch settings AETR
---
# Version 0.51
- New Screens to Configure Model (Wing Type/Tail Tail, etc)
- Finally got understanding that the previous unknown 0x05 lines are to send Model/Servo data to RX.