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

This commit is contained in:
Frankie Arzu 2022-12-01 00:24:40 -06:00 committed by GitHub
commit d225b2d48e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -684,6 +684,7 @@ local function DSM_SelLine_HACK()
-- Tested to work on the RX: AR631, AR637T, AR637TA
local ctx = DSM_Context
-- AR631/AR637 Family: Hack for "First time Setup" or "First Time AS3X Setup", use 0 instead of the ctx.SelLine
if (ctx.Menu.MenuId == 0x104F or ctx.Menu.MenuId==0x1055) and
(FORCED_HACK or DSM_RX_Match(ctx.RX.Id,RX_HACK_TESTED)) then
@ -692,7 +693,6 @@ local function DSM_SelLine_HACK()
ctx.SelLine = 0
end
-- AR631/AR637 Hack for "Relearn Servo Settings", use 1 instead of the ctx.SelLine=0
-- REMOVE THE FIX FOR NOW.. Locks the Servos
--if (ctx.Menu.MenuId == 0x1023 and
@ -1261,6 +1261,7 @@ local function DSM_Init_Text(rxId)
Text[0x00CA] = "SAFE/Panic Mode Setup"
Text[0x00CD] = "Level model and capture attiude/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"
List_Text[0x00CC] = "Position 2"; List_Text_Img[0x00CC] = "rx_pos_2.png|Pilot View: RX Label Left, Pins Back"