fly/fgdata
1
0
Fork 0
Code Activity

FG1000: Improve Interface loading

Browse source 
Previously it was difficult to create custom EIS as paths
needed to be defined in multiple places.

This change creates a hash of id and paths to make this easier
in the future.
This commit is contained in:
Stuart Buchanan 2020-12-17 22:44:08 +00:00
parent f8e1bb2e6e
commit b46f5a90da
1 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Aircraft/Instruments-3d/FG1000/Nasal/Interfaces/GenericInterfaceController.nas
View file

@ -19,33 +19,23 @@
var nasal_dir = getprop("/sim/fg-root") ~ "/Aircraft/Instruments-3d/FG1000/Nasal/"; var nasal_dir = getprop("/sim/fg-root") ~ "/Aircraft/Instruments-3d/FG1000/Nasal/";
io.load_nasal(nasal_dir ~ 'Interfaces/PropertyPublisher.nas', "fg1000"); io.load_nasal(nasal_dir ~ 'Interfaces/PropertyPublisher.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/PropertyUpdater.nas', "fg1000"); io.load_nasal(nasal_dir ~ 'Interfaces/PropertyUpdater.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/NavDataInterface.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericEISPublisher.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericNavComPublisher.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericNavComUpdater.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericFMSPublisher.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericFMSUpdater.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericADCPublisher.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericFuelInterface.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GenericFuelPublisher.nas', "fg1000");
io.load_nasal(nasal_dir ~ 'Interfaces/GFC700Interface.nas', "fg1000");
var GenericInterfaceController = { var GenericInterfaceController = {
_instance : nil, _instance : nil,
INTERFACE_LIST : [ INTERFACE_LIST : [
"NavDataInterface", { id:"NavDataInterface", path: nasal_dir ~ 'Interfaces/NavDataInterface.nas' },
"GenericEISPublisher", { id:"GenericEISPublisher", path: nasal_dir ~ 'Interfaces/GenericEISPublisher.nas' },
"GenericNavComPublisher", { id:"GenericNavComPublisher", path: nasal_dir ~ 'Interfaces/GenericNavComPublisher.nas' },
"GenericNavComUpdater", { id:"GenericNavComUpdater", path: nasal_dir ~ 'Interfaces/GenericNavComUpdater.nas' },
"GenericFMSPublisher", { id:"GenericFMSPublisher", path: nasal_dir ~ 'Interfaces/GenericFMSPublisher.nas' },
"GenericFMSUpdater", { id:"GenericFMSUpdater", path: nasal_dir ~ 'Interfaces/GenericFMSUpdater.nas' },
"GenericADCPublisher", { id:"GenericADCPublisher", path: nasal_dir ~ 'Interfaces/GenericADCPublisher.nas' },
"GenericFuelInterface", { id:"GenericFuelInterface", path: nasal_dir ~ 'Interfaces/GenericFuelInterface.nas' },
"GenericFuelPublisher", { id:"GenericFuelPublisher", path: nasal_dir ~ 'Interfaces/GenericFuelPublisher.nas' },
"GFC700Publisher", { id:"GFC700Interface", path: nasal_dir ~ 'Interfaces/GFC700Interface.nas' },
"GFC700Interface", { id:"GFC700Publisher", path: nasal_dir ~ 'Interfaces/GFC700Publisher.nas' }
], ],
# Factory method # Factory method
@ -69,18 +59,15 @@ var GenericInterfaceController = {
start : func() { start : func() {
if (me.running) return; if (me.running) return;
# Reload the interfaces afresh to make development easier. In normal
# usage this interface will only be started once anyway.
foreach (var interface; GenericInterfaceController.INTERFACE_LIST) { foreach (var interface; GenericInterfaceController.INTERFACE_LIST) {
io.load_nasal(nasal_dir ~ 'Interfaces/' ~ interface ~ '.nas', "fg1000"); io.load_nasal(interface.path, "fg1000");
var code = sprintf("me.%sInstance = fg1000.%s.new();", interface, interface); var code = sprintf("me.%sInstance = fg1000.%s.new();", interface.id, interface.id);
var instantiate = compile(code); var instantiate = compile(code);
instantiate(); instantiate();
} }
foreach (var interface; GenericInterfaceController.INTERFACE_LIST) { foreach (var interface; GenericInterfaceController.INTERFACE_LIST) {
io.load_nasal(nasal_dir ~ 'Interfaces/' ~ interface ~ '.nas', "fg1000"); var code = 'me.' ~ interface.id ~ 'Instance.start();';
var code = 'me.' ~ interface ~ 'Instance.start();';
var start_interface = compile(code); var start_interface = compile(code);
start_interface(); start_interface();
} }
@ -92,11 +79,13 @@ var GenericInterfaceController = {
if (me.running == 0) return; if (me.running == 0) return;
foreach (var interface; GenericInterfaceController.INTERFACE_LIST) { foreach (var interface; GenericInterfaceController.INTERFACE_LIST) {
io.load_nasal(nasal_dir ~ 'Interfaces/' ~ interface ~ '.nas', "fg1000"); io.load_nasal(interface.path, "fg1000");
var code = 'me.' ~ interface ~ 'Instance.stop();'; var code = 'me.' ~ interface.id ~ 'Instance.stop();';
var stop_interface = compile(code); var stop_interface = compile(code);
stop_interface(); stop_interface();
} }
me.running = 0;
}, },
restart : func() { restart : func() {