From ccedd4252f1c67d9a2be1e44f7c2d85c5930209a Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Tue, 13 Oct 2020 19:30:29 +0100 Subject: [PATCH] FG1000: CHECKLIST MFD Softkey --- .../FG1000/Nasal/MFDPages/Checklist/Checklist.nas | 6 +++--- .../FG1000/Nasal/MFDPages/Checklist/ChecklistController.nas | 2 +- .../FG1000/Nasal/MFDPages/NavigationMap/NavigationMap.nas | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/Checklist.nas b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/Checklist.nas index a52290885..9d1190b94 100644 --- a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/Checklist.nas +++ b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/Checklist.nas @@ -175,8 +175,8 @@ var Checklist = topMenu : func(device, pg, menuitem) { pg.clearMenu(); pg.resetMenuColors(); - pg.addMenuItem(0, "ENGINE", pg, pg.mfd.EIS.engineMenu); - pg.addMenuItem(2, "MAP", pg, pg.mfd.NavigationMap.mapMenu); + # Manual is inconsistent. Checklist page has SYSTEM, menu structure shows ENGINE + pg.addMenuItem(0, "SYSTEM", pg, pg.mfd.EIS.systemMenu); pg.addMenuItem(5, "CHECK", pg, func(dev, pg, mi) { pg.getController().toggleCurrentItem(); dev.updateMenus(); }, # callback func(svg, mi) { pg.displayCheckUncheck(svg); } # Display function @@ -186,7 +186,7 @@ var Checklist = func(dev, pg, mi) { dev.selectPage(pg.getMFD().getPage("NavigationMap")); }, ); - pg.addMenuItem(11, "EMERGENCY", pg, + pg.addMenuItem(11, "EMERGCY", pg, func(dev, pg, mi) { pg.getController().selectEmergencyChecklist(); }, # callback ); diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/ChecklistController.nas b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/ChecklistController.nas index 31b02a8b5..9efe8d899 100644 --- a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/ChecklistController.nas +++ b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/Checklist/ChecklistController.nas @@ -90,7 +90,7 @@ var ChecklistController = }, selectEmergencyChecklist : func() { - if (me._checklist == nil) return; + if (me._checklists == nil) return; # Select the EMERGENCY checklist group, if available. var emergency_labels = ["EMERGENCY", "Emergency", "emergency"]; var group = nil; diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/NavigationMap/NavigationMap.nas b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/NavigationMap/NavigationMap.nas index 0efecc155..ccd003683 100644 --- a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/NavigationMap/NavigationMap.nas +++ b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/NavigationMap/NavigationMap.nas @@ -112,7 +112,7 @@ var NavigationMap = pg.addMenuItem(2, "MAP", pg, pg.mfd.NavigationMap.mapMenu); pg.addMenuItem(8, "DCLTR", pg, func(dev, pg, mi) { pg.mfd.NavigationMap.MFDMap.incrDCLTR(dev, mi); } ); #pg.addMenuItem(9, "SHW CHRT", pg); # Optional - #pg.addMenuItem(10, "CHKLIST", pg); # Optional + pg.addMenuItem(10, "CHKLIST", pg, func(dev, pg, mi) { pg.mfd.Surround.goToPage("LstPageGroup", "Checklist"); }); # Optional device.updateMenus(); },