fix nasal error, bugs

This commit is contained in:
Joshua Davidson 2016-12-10 09:42:52 -05:00
parent d68c2a29d0
commit b0ebcf8910
5 changed files with 6 additions and 20 deletions

View file

@ -83,9 +83,6 @@
<itaf> <itaf>
<file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file>
</itaf> </itaf>
<hyd>
<file>Aircraft/A320Family/Nasal/hydraulics.nas</file>
</hyd>
<thrust> <thrust>
<file>Aircraft/A320Family/Nasal/thrust.nas</file> <file>Aircraft/A320Family/Nasal/thrust.nas</file>
</thrust> </thrust>

View file

@ -83,9 +83,6 @@
<itaf> <itaf>
<file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file>
</itaf> </itaf>
<hyd>
<file>Aircraft/A320Family/Nasal/hydraulics.nas</file>
</hyd>
<thrust> <thrust>
<file>Aircraft/A320Family/Nasal/thrust.nas</file> <file>Aircraft/A320Family/Nasal/thrust.nas</file>
</thrust> </thrust>

View file

@ -83,9 +83,6 @@
<itaf> <itaf>
<file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file>
</itaf> </itaf>
<hyd>
<file>Aircraft/A320Family/Nasal/hydraulics.nas</file>
</hyd>
<thrust> <thrust>
<file>Aircraft/A320Family/Nasal/thrust.nas</file> <file>Aircraft/A320Family/Nasal/thrust.nas</file>
</thrust> </thrust>

View file

@ -45,7 +45,7 @@
'toggle_cur_ec': {path: '/nd/current-ec', value: 0, type: 'INT'}, # End of Climb dist. along route 'toggle_cur_ec': {path: '/nd/current-ec', value: 0, type: 'INT'}, # End of Climb dist. along route
'toggle_lvl_off_at': {path: '/nd/level-off-at', value: 0, type: 'INT'}, # Level-off point along route 'toggle_lvl_off_at': {path: '/nd/level-off-at', value: 0, type: 'INT'}, # Level-off point along route
'toggle_man_spd': {path: '/nd/managed-spd', value: 0, type: 'INT'}, # Managed Speed Mode 'toggle_man_spd': {path: '/nd/managed-spd', value: 0, type: 'INT'}, # Managed Speed Mode
'toggle_athr': {path: '/nd/athr', value: 0, type: 'INT'}, # Auto-thrust engaged 'toggle_athr': {path: '/it-autoflight/output/athr', value: 0, type: 'INT'}, # Auto-thrust engaged
'toggle_spd_point_100': {path: '/nd/spd-change-raw-100', value: 0, type: 'INT'}, # Speed limit change point FL100 'toggle_spd_point_100': {path: '/nd/spd-change-raw-100', value: 0, type: 'INT'}, # Speed limit change point FL100
'toggle_spd_point_140': {path: '/nd/spd-change-raw-140', value: 0, type: 'INT'}, # Speed limit change point FL140 'toggle_spd_point_140': {path: '/nd/spd-change-raw-140', value: 0, type: 'INT'}, # Speed limit change point FL140
'toggle_spd_point_250': {path: '/nd/spd-change-raw-250', value: 0, type: 'INT'}, # Speed limit change point FL250 'toggle_spd_point_250': {path: '/nd/spd-change-raw-250', value: 0, type: 'INT'}, # Speed limit change point FL250
@ -96,7 +96,7 @@
des_rwy: "/autopilot/route-manager/destination/runway", des_rwy: "/autopilot/route-manager/destination/runway",
dep_rwy: "/autopilot/route-manager/departure/runway", dep_rwy: "/autopilot/route-manager/departure/runway",
fplan_active: 'autopilot/route-manager/active', fplan_active: 'autopilot/route-manager/active',
athr: '/flight-management/control/a-thrust', athr: '/it-autoflight/output/athr',
cur_wp: "/autopilot/route-manager/current-wp", cur_wp: "/autopilot/route-manager/current-wp",
vnav_node: "/autopilot/route-manager/vnav/", vnav_node: "/autopilot/route-manager/vnav/",
spd_node: "/autopilot/route-manager/spd/", spd_node: "/autopilot/route-manager/spd/",
@ -106,8 +106,8 @@
adf2_frq: 'instrumentation/adf[1]/frequencies/selected-khz', adf2_frq: 'instrumentation/adf[1]/frequencies/selected-khz',
nav1_frq: 'instrumentation/nav/frequencies/selected-mhz', nav1_frq: 'instrumentation/nav/frequencies/selected-mhz',
nav2_frq: 'instrumentation/nav[1]/frequencies/selected-mhz', nav2_frq: 'instrumentation/nav[1]/frequencies/selected-mhz',
lat_ctrl: 'flight-management/control/lat-ctrl', lat_ctrl: '/it-autoflight/output/lat',
ver_ctrl: "flight-management/control/ver-ctrl", ver_ctrl: "/it-autoflight/output/lat",
spd_ctrl: "flight-management/control/spd-ctrl", spd_ctrl: "flight-management/control/spd-ctrl",
}; };
@ -144,7 +144,7 @@
setlistener(property_map.athr, func{ setlistener(property_map.athr, func{
var athr = getprop(property_map.athr); var athr = getprop(property_map.athr);
setprop('instrumentation/efis/nd/athr', (athr == 'eng')); setprop('instrumentation/efis/nd/athr', (athr == '1'));
}); });
setlistener(property_map.ver_ctrl, func{ setlistener(property_map.ver_ctrl, func{
@ -159,7 +159,7 @@
setlistener(property_map.lat_ctrl, func{ setlistener(property_map.lat_ctrl, func{
var latctrl = getprop(property_map.lat_ctrl); var latctrl = getprop(property_map.lat_ctrl);
setprop('instrumentation/efis/nd/lnav', (latctrl == 'fmgc')); setprop('instrumentation/efis/nd/lnav', (latctrl == '1'));
}); });
setlistener("/instrumentation/mcdu/f-pln/disp/first", func{ setlistener("/instrumentation/mcdu/f-pln/disp/first", func{

View file

@ -209,8 +209,3 @@ setlistener("/instrumentation/vertical-speed-indicator/indicated-speed-fpm", fun
setprop("/instrumentation/vertical-speed-indicator/indicated-speed-fpm-pfd", getprop("/instrumentation/vertical-speed-indicator/indicated-speed-fpm") / 100); setprop("/instrumentation/vertical-speed-indicator/indicated-speed-fpm-pfd", getprop("/instrumentation/vertical-speed-indicator/indicated-speed-fpm") / 100);
}); });
# Initialize Hydraulics
setlistener("/sim/signals/fdm-initialized", func {
hyd.hyd_init();
});