Skip to content

Commit

Permalink
merged the latest PRs with _MODE_ addition.
Browse files Browse the repository at this point in the history
  • Loading branch information
@joeherwig
joeherwig committed Feb 13, 2022
2 parents bb39382 + 6d1f700 commit 4e58415
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 67 deletions.
12 changes: 6 additions & 6 deletions A32nx/LINDA-CFG/aircrafts/FBW A320/config-mcp.default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ MCP1 = {
["TOGA"] = empty ,
["TOGN"] = empty ,
["N1"] = empty ,
["SPD"] = A32nx_GLSD_FCU_SPD_managed ,
["SPD"] = A32nx_GLSD_FCU_SPD_MODE_manged ,
["FLCH"] = empty ,
["HDGSEL"] = empty ,
["HDGHLD"] = empty ,
["ALTHLD"] = empty ,
["V/S FPA"] = empty ,
["APP"] = A32nx_GLSD_FCU_APPR_toggle ,
["VNAV"] = A32nx_GLSD_FCU_ALT_managed ,
["LNAV"] = A32nx_GLSD_FCU_HDG_managed ,
["VNAV"] = A32nx_GLSD_FCU_ALT_MODE_managed ,
["LNAV"] = A32nx_GLSD_FCU_HDG_MODE_manged ,
["CMDA"] = A32nx_GLSD_FCU_AP_1_toggle ,
["CMDB"] = A32nx_GLSD_FCU_AP_2_toggle ,
["CMDC"] = A32nx_GLSD_FCU_AP_Disconnect ,
Expand Down Expand Up @@ -240,7 +240,7 @@ SPD1 = {
["A ++"] = A32nx_GLSD_FCU_SPD_incfast ,
["A -"] = A32nx_GLSD_FCU_SPD_dec ,
["A --"] = A32nx_GLSD_FCU_SPD_decfast ,
["PRESS"] = A32nx_GLSD_FCU_SPD_selected ,
["PRESS"] = A32nx_GLSD_FCU_SPD_MODE_selected ,
}

-- MCP HDG knob
Expand All @@ -250,7 +250,7 @@ HDG1 = {
["A ++"] = A32nx_GLSD_FCU_HDG_incfast ,
["A -"] = A32nx_GLSD_FCU_HDG_dec ,
["A --"] = A32nx_GLSD_FCU_HDG_decfast ,
["PRESS"] = A32nx_GLSD_FCU_HDG_selected ,
["PRESS"] = A32nx_GLSD_FCU_HDG_MODE_selected ,
}

-- MCP ALT knob
Expand All @@ -270,7 +270,7 @@ VVS1 = {
["A ++"] = A32nx_GLSD_FCU_VS_inc ,
["A -"] = A32nx_GLSD_FCU_VS_dec ,
["A --"] = A32nx_GLSD_FCU_VS_dec ,
["PRESS"] = A32nx_GLSD_FCU_VS_leveloff ,
["PRESS"] = A32nx_GLSD_FCU_VS_MODE_leveloff ,
}

-- ############################################### --
Expand Down
12 changes: 6 additions & 6 deletions A32nx/LINDA-CFG/aircrafts/FBW A320/config-mcp2.default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ MCP1 = {
["TO ."] = empty ,
["GA ."] = empty ,
["N1 ."] = empty ,
["SPD ."] = A32nx_GLSD_FCU_SPD_managed ,
["SPD ."] = A32nx_GLSD_FCU_SPD_MODE_manged ,
["FLCH."] = empty ,
["SEL ."] = empty ,
["HHLD."] = empty ,
["AHLD."] = empty ,
["VHLD."] = empty ,
["APP ."] = A32nx_GLSD_FCU_APPR_toggle ,
["VNAV."] = A32nx_GLSD_FCU_ALT_managed ,
["LNAV."] = A32nx_GLSD_FCU_HDG_managed ,
["VNAV."] = A32nx_GLSD_FCU_ALT_MODE_managed ,
["LNAV."] = A32nx_GLSD_FCU_HDG_MODE_manged ,
["CMDA."] = A32nx_GLSD_FCU_AP_1_toggle ,
["CMDB."] = A32nx_GLSD_FCU_AP_2_toggle ,
["CMDC."] = A32nx_GLSD_FCU_AP_Disconnect ,
Expand All @@ -233,7 +233,7 @@ SPD1 = {
["A ++"] = A32nx_GLSD_FCU_SPD_incfast ,
["A -"] = A32nx_GLSD_FCU_SPD_dec ,
["A --"] = A32nx_GLSD_FCU_SPD_decfast ,
["PRESS"] = A32nx_GLSD_FCU_SPD_selected ,
["PRESS"] = A32nx_GLSD_FCU_SPD_MODE_selected ,
}

-- MCP HDG knob
Expand All @@ -243,7 +243,7 @@ HDG1 = {
["A ++"] = A32nx_GLSD_FCU_HDG_incfast ,
["A -"] = A32nx_GLSD_FCU_HDG_dec ,
["A --"] = A32nx_GLSD_FCU_HDG_decfast ,
["PRESS"] = A32nx_GLSD_FCU_HDG_selected ,
["PRESS"] = A32nx_GLSD_FCU_HDG_MODE_selected ,
}

-- MCP ALT knob
Expand All @@ -263,7 +263,7 @@ VVS1 = {
["A ++"] = A32nx_GLSD_FCU_VS_inc ,
["A -"] = A32nx_GLSD_FCU_VS_dec ,
["A --"] = A32nx_GLSD_FCU_VS_dec ,
["PRESS"] = A32nx_GLSD_FCU_VS_leveloff ,
["PRESS"] = A32nx_GLSD_FCU_VS_MODE_leveloff ,
}

-- ############################################### --
Expand Down
22 changes: 11 additions & 11 deletions A32nx/LINDA-CFG/aircrafts/FBW A320/config-mcp2a.default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,19 @@ SPD1 = {
["A ++"] = A32nx_GLSD_FCU_SPD_incfast ,
["A -"] = A32nx_GLSD_FCU_SPD_dec ,
["A --"] = A32nx_GLSD_FCU_SPD_decfast ,
["PRESS"] = A32nx_GLSD_FCU_SPD_managed ,
["PULL"] = A32nx_GLSD_FCU_SPD_selected ,
["PRESS"] = A32nx_GLSD_FCU_SPD_MODE_manged ,
["PULL"] = A32nx_GLSD_FCU_SPD_MODE_selected ,
}

-- AFCU HDG knob
HDG1 = {
["A SHOW"] = empty ,
["A +"] = A32nx_GLSD_FCU_HDG_inc ,
["A ++"] = A32nx_GLSD_FCU_SPD_incfast ,
["A -"] = A32nx_GLSD_FCU_SPD_dec ,
["A --"] = A32nx_GLSD_FCU_SPD_decfast ,
["PRESS"] = A32nx_GLSD_FCU_SPD_managed ,
["PULL"] = A32nx_GLSD_FCU_HDG_selected ,
["A ++"] = A32nx_GLSD_FCU_HDG_incfast ,
["A -"] = A32nx_GLSD_FCU_HDG_dec ,
["A --"] = A32nx_GLSD_FCU_HDG_decfast ,
["PRESS"] = A32nx_GLSD_FCU_HDG_MODE_manged ,
["PULL"] = A32nx_GLSD_FCU_HDG_MODE_selected ,
}

-- AFCU ALT knob
Expand All @@ -219,8 +219,8 @@ ALT1 = {
["A ++"] = A32nx_GLSD_FCU_ALT_inc ,
["A -"] = A32nx_GLSD_FCU_ALT_dec ,
["A --"] = A32nx_GLSD_FCU_ALT_dec ,
["PRESS"] = A32nx_GLSD_FCU_ALT_managed ,
["PULL"] = A32nx_GLSD_FCU_HDG_selected ,
["PRESS"] = A32nx_GLSD_FCU_ALT_MODE_managed ,
["PULL"] = A32nx_GLSD_FCU_HDG_MODE_selected ,
}

-- AFCU VVS knob
Expand All @@ -230,8 +230,8 @@ VVS1 = {
["A ++"] = A32nx_GLSD_FCU_VS_inc ,
["A -"] = A32nx_GLSD_FCU_VS_dec ,
["A --"] = A32nx_GLSD_FCU_VS_dec ,
["PRESS"] = A32nx_GLSD_FCU_VS_leveloff ,
["PULL"] = A32nx_GLSD_FCU_VS_selected ,
["PRESS"] = A32nx_GLSD_FCU_VS_MODE_leveloff ,
["PULL"] = A32nx_GLSD_FCU_VS_MODE_selected ,
}


Expand Down
84 changes: 40 additions & 44 deletions A32nx/LINDA/aircrafts/FBW A320/actions.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ function A32nx_GLSD_FCU_SPD_decfast()
end
end

function A32nx_GLSD_FCU_SPD_selected ()
function A32nx_GLSD_FCU_SPD_MODE_selected ()
ipc.control(EvtPtr + 9)
DspShow ("SPD", "set")
A32NX_DspSPD()
end

function A32nx_GLSD_FCU_SPD_managed ()
function A32nx_GLSD_FCU_SPD_MODE_managed ()
ipc.control(EvtPtr + 8)
DspShow ("SPD", "mngd")
A32NX_DspSPD()
Expand Down Expand Up @@ -121,15 +121,15 @@ function A32nx_GLSD_FCU_HDG_decfast()
end
end

function A32nx_GLSD_FCU_HDG_selected ()
function A32nx_GLSD_FCU_HDG_MODE_selected ()
--ipc.control(65815, 0)
ipc.control(EvtPtr + 15)
DspShow ("HDG", "set")
ipc.sleep(200)
A32NX_DspSPD()
end

function A32nx_GLSD_FCU_HDG_managed ()
function A32nx_GLSD_FCU_HDG_MODE_managed ()
--ipc.control(65807,0)
ipc.control(EvtPtr + 14)
DspShow ("HDG", "mngd")
Expand Down Expand Up @@ -159,14 +159,14 @@ function A32nx_GLSD_FCU_ALT_dec()
A32NX_DspALT()
end

function A32nx_GLSD_FCU_ALT_selected ()
function A32nx_GLSD_FCU_ALT_MODE_selected ()
--ipc.control(65816)
ipc.control(EvtPtr + 21)
DspShow ("ALT", "set")
A32NX_DspALT()
end

function A32nx_GLSD_FCU_ALT_managed ()
function A32nx_GLSD_FCU_ALT_MODE_managed ()
--ipc.control(65808)
ipc.control(EvtPtr + 20)
DspShow ("ALT", "mngd")
Expand Down Expand Up @@ -218,21 +218,21 @@ function A32nx_GLSD_FCU_VS_MODE_pull ()
A32NX_DspVVS ()
end

function A32nx_GLSD_FCU_VS_selected ()
function A32nx_GLSD_FCU_VS_MODE_selected ()
--ipc.control(66101)
ipc.control(EvtPtr + 28)
DspShow ("VS", "set")
A32NX_DspVVS ()
end

function A32nx_GLSD_FCU_VS_managed ()
function A32nx_GLSD_FCU_VS_MODE_managed ()
--ipc.control(66100)
ipc.control(EvtPtr + 27)
DspShow ("VS", "mngd")
A32NX_DspVVS ()
end

function A32nx_GLSD_FCU_VS_leveloff ()
function A32nx_GLSD_FCU_VS_MODE_level_off ()
ipc.control(EvtPtr + 26,0) -- zero rate of climb
DspShow ("VS", "mngd")
A32NX_DspVVS ()
Expand Down Expand Up @@ -1458,77 +1458,76 @@ end

-- $$ Anti Skid

function A32nx_MPNL_LDG_ANTISKID_on()
function A32nx_MPNL_ABRK_ANTISKID_on()
ipc.writeUD(0x0BFD, 1)
DspShow('SKID','on')
end

function A32nx_MPNL_LDG_ANTISKID_off()
function A32nx_MPNL_ABRK_ANTISKID_off()
ipc.writeUD(0x0BFD, 0)
DspShow('SKID','off')
end

function A32nx_MPNL_LDG_ANTISKID_toggle()
function A32nx_MPNL_ABRK_ANTISKID_toggle()
if ipc.readUD(0x0BFD) > 0 then
A32nx_MPNL_LDG_ANTISKID_off()
A32nx_MPNL_ABRK_ANTISKID_off()
else
A32nx_MPNL_LDG_ANTISKID_on()
A32nx_MPNL_ABRK_ANTISKID_on()
end
end

-- $$ Autobrake ---------------------------------

function A32nx_MPNL_LDG_AUTOBRK_off()
A32nx_MPNL_LDG_AUTOBRK_set(0)
function A32nx_MPNL_ABRK_AUTOBRAKE_off()
A32nx_MPNL_ABRK_AUTOBRAKE_set(0)
end

function A32nx_MPNL_LDG_AUTOBRK_low()
A32nx_MPNL_LDG_AUTOBRK_set(1)
function A32nx_MPNL_ABRK_AUTOBRAKE_low()
A32nx_MPNL_ABRK_AUTOBRAKE_set(1)
end

function A32nx_MPNL_LDG_AUTOBRK_mid()
A32nx_MPNL_LDG_AUTOBRK_set(2)
function A32nx_MPNL_ABRK_AUTOBRAKE_mid()
A32nx_MPNL_ABRK_AUTOBRAKE_set(2)
end

function A32nx_MPNL_LDG_AUTOBRK_max()
A32nx_MPNL_LDG_AUTOBRK_set(3)
function A32nx_MPNL_ABRK_AUTOBRAKE_max()
A32nx_MPNL_ABRK_AUTOBRAKE_set(3)
end

function A32nx_MPNL_LDG_AUTOBRK_LOW_toggle()
if ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE") ~= 1 then
A32nx_MPNL_LDG_AUTOBRK_AUTOBRK_set(1) else A32nx_MPNL_LDG_AUTOBRK_set(0) end
function A32nx_MPNL_ABRK_AUTOBRAKE_LOW_toggle()
if ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE") ~= 1 then A32nx_AUTOBRAKE_set(1) else A32nx_AUTOBRAKE_set(0) end
end

function A32nx_MPNL_LDG_AUTOBRK_MID_toggle()
if ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE") ~= 2 then A32nx_MPNL_LDG_AUTOBRK_set(2) else A32nx_MPNL_LDG_AUTOBRK_set(0) end
function A32nx_MPNL_ABRK_AUTOBRAKE_MID_toggle()
if ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE") ~= 2 then A32nx_AUTOBRAKE_set(2) else A32nx_AUTOBRAKE_set(0) end
end

function A32nx_MPNL_LDG_AUTOBRK_MAX_toggle()
if ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE") ~= 3 then A32nx_MPNL_LDG_AUTOBRK_set(3) else A32nx_MPNL_LDG_AUTOBRK_set(0) end
function A32nx_MPNL_ABRK_AUTOBRAKE_MAX_toggle()
if ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE") ~= 3 then A32nx_AUTOBRAKE_set(3) else A32nx_AUTOBRAKE_set(0) end
end

function A32nx_MPNL_LDG_AUTOBRK_set(autoBrakeLevel)
function A32nx_MPNL_ABRK_AUTOBRAKE_set(autoBrakeLevel)
ipc.writeLvar("L:A32NX_AUTOBRAKES_ARMED_MODE", autoBrakeLevel)
local autoBrakeLevelText = {"off","low","mid","max"}
DspShow ("A-BRK", autoBrakeLevelText[autoBrakeLevel+1])
end

function A32nx_MPNL_LDG_AUTOBRK_inc()
function A32nx_MPNL_ABRK_AUTOBRAKE_inc()
autoBrakeLevel = ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE")
if autoBrakeLevel >= 3 then autoBrakeLevel = 3 else autoBrakeLevel = autoBrakeLevel + 1 end
A32nx_MPNL_LDG_AUTOBRK_set(autoBrakeLevel)
A32nx_MPNL_ABRK_AUTOBRAKE_set(autoBrakeLevel)
end

function A32nx_MPNL_LDG_AUTOBRK_dec()
function A32nx_MPNL_ABRK_AUTOBRAKE_dec()
autoBrakeLevel = ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE")
if autoBrakeLevel <= 0 then autoBrakeLevel = 0 else autoBrakeLevel = autoBrakeLevel - 1 end
A32nx_MPNL_LDG_AUTOBRK_set(autoBrakeLevel)
A32nx_MPNL_ABRK_AUTOBRAKE_set(autoBrakeLevel)
end

function A32nx_MPNL_LDG_AUTOBRK_cycle()
function A32nx_MPNL_ABRK_AUTOBRAKE_cycle()
autoBrakeLevel = ipc.readLvar("L:A32NX_AUTOBRAKES_ARMED_MODE")
if autoBrakeLevel >= 3 then autoBrakeLevel = 0 else autoBrakeLevel = autoBrakeLevel + 1 end
A32nx_MPNL_LDG_AUTOBRK_set(autoBrakeLevel)
A32nx_MPNL_ABRK_AUTOBRAKE_set(autoBrakeLevel)
end

-- $$ Landing Gear Handle
Expand Down Expand Up @@ -2128,22 +2127,22 @@ end

-- $$ TCAS / ATC #####################################

function A32nx_PED_TCAS_PWR_on()
function A32nx_PED_TCAS_on()
ipc.writeUB(0x0B46, 4)
DspShow('TCAS','on')
end

function A32nx_PED_TCAS_PWR_stby()
function A32nx_PED_TCAS_stby()
ipc.writeUB(0x0B46, 1)
DspShow('TCAS','stby')
end

function A32nx_PED_TCAS_PWR_toggle()
function A32nx_PED_TCAS_toggle()
local val = ipc.readUB(0x0B46)
if val > 1 then
A32nx_PED_TCAS_PWR_stby()
A32nx_PED_TCAS_stby()
else
A32nx_PED_TCAS_PWR_on()
A32nx_PED_TCAS_on()
end
end

Expand Down Expand Up @@ -3438,6 +3437,3 @@ function setDimmer(offset, value)
end
end
end



0 comments on commit 4e58415

Please sign in to comment.