fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

A32X: Canvas PFD WIP Improvements

Browse source
This commit is contained in:
Joshua Davidson 2017-10-26 21:14:20 -04:00
parent dba2e0d09c
commit 0df4a792e7
5 changed files with 314 additions and 287 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Models/Instruments/PFD-WIP/PFD1.nas
View file

@ -8,13 +8,13 @@
var PFD_1 = nil;
var PFD_display = nil;
setprop("/instrumentation/pfd/vs-needle", 0);
setprop("/instrumentation/pfd/vs-needle2", 1);
setprop("/it-autoflight/output/ap1", 0);
setprop("/it-autoflight/output/ap2", 0);
setprop("/it-autoflight/output/fd1", 0);
setprop("/it-autoflight/output/fd2", 0);
setprop("/it-autoflight/output/athr", 0);
var alt = 0;
var altTens = 0;
var state1 = getprop("/systems/thrust/state1");
var state2 = getprop("/systems/thrust/state2");
var ap1 = getprop("/it-autoflight/output/ap1");
@ -34,6 +34,8 @@ var pitch = getprop("/orientation/pitch-deg");
var roll = getprop("/orientation/roll-deg");
var wow1 = getprop("/gear/gear[1]/wow");
var wow2 = getprop("/gear/gear[2]/wow");
setprop("/instrumentation/altimeter/indicated-altitude-ft1", 0);
setprop("/fuck", 1.38);
var canvas_PFD_base = {
init: func(canvas_group, file) {
@ -95,7 +97,7 @@ var canvas_PFD_1 = {
getKeys: func() {
return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd","FMA_athr",
"FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box","FMA_Middle1",
"FMA_Middle2","AI_center","AI_bank","AI_slipskid","FD_roll","FD_pitch","ALT_digits","ALT_tens","VS_pointer_g","VS_pointer","VS_pos_mask","VS_neg_mask","QNH_setting","LOC_pointer","LOC_scale","GS_scale","GS_pointer"];
"FMA_Middle2","AI_center","AI_bank","AI_slipskid","FD_roll","FD_pitch","ALT_digits","ALT_tens","VS_pointer","QNH_setting","LOC_pointer","LOC_scale","GS_scale","GS_pointer"];
},
update: func() {
state1 = getprop("/systems/thrust/state1");
@ -317,7 +319,8 @@ var canvas_PFD_1 = {
# Altitude
me["ALT_digits"].setText(sprintf("%s", getprop("/instrumentation/altimeter/indicated-altitude-ft-pfd")));
# me["ALT_tens"].setTranslation(0,getprop("/instrumentation/altimeter/indicated-altitude-ft1") * 1.38); # Needs alot of work
altTens = num(right(sprintf("%02d", getprop("/instrumentation/altimeter/indicated-altitude-ft1")), 2));
me["ALT_tens"].setTranslation(0, altTens * 1.392);
# QNH
if (getprop("/modes/altimeter/std") == 1) {
@ -329,16 +332,7 @@ var canvas_PFD_1 = {
}
# Vertical Speed
me["VS_pointer"].setScale(getprop("/instrumentation/pfd/vs-needle2"), 1);
me["VS_pointer_g"].setRotation(getprop("/instrumentation/pfd/vs-needle") * D2R);
if (getprop("/it-autoflight/internal/vert-speed-fpm-filtered") > 0) {
me["VS_pos_mask"].hide();
me["VS_neg_mask"].show();
} else {
me["VS_neg_mask"].hide();
me["VS_pos_mask"].show();
}
me["VS_pointer"].setRotation(getprop("/instrumentation/pfd/vs-needle") * D2R);
# ILS
if (getprop("/modes/pfd/ILS1") == 1) {

459
Models/Instruments/PFD-WIP/res/pfd.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 KiB

After

Width:  |  Height:  |  Size: 260 KiB

71
Models/Tablet/res/screen.svg Normal file
View file

@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1920"
height="1280"
viewBox="0 0 1536 1024"
version="1.1"
id="svg2"
inkscape:version="0.91 r13725"
sodipodi:docname="screen.svg">
<metadata
id="metadata375">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs373" />
<sodipodi:namedview
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1"
objecttolerance="20"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1030"
id="namedview371"
showgrid="true"
inkscape:zoom="0.70710678"
inkscape:cx="1130.6956"
inkscape:cy="-93.71028"
inkscape:window-x="1592"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
showguides="false"
inkscape:snap-global="false"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
type="xygrid"
id="grid5153"
originx="0"
originy="0" />
</sodipodi:namedview>
<rect
style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
id="rect4312"
width="1536"
height="81.439186"
x="0"
y="942.56073" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
Models/Tablet/res/screen1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

51
Systems/pfd.xml
View file

@ -364,46 +364,27 @@
<expression>
<table>
<property>/it-autoflight/internal/vert-speed-fpm-filtered</property>
<entry><ind>-6000</ind><dep>-84.2</dep></entry>
<entry><ind>-2000</ind><dep>-82.3</dep></entry>
<entry><ind>-1000</ind><dep>-79.0</dep></entry>
<entry><ind> -750</ind><dep>-75.5</dep></entry>
<entry><ind> -500</ind><dep>-68.0</dep></entry>
<entry><ind> -250</ind><dep>-50.6</dep></entry>
<entry><ind>-6000</ind><dep>-76.6</dep></entry>
<entry><ind>-4000</ind><dep>-74.8</dep></entry>
<entry><ind>-2000</ind><dep>-73.0</dep></entry>
<entry><ind>-1500</ind><dep>-70.2</dep></entry>
<entry><ind>-1000</ind><dep>-66.5</dep></entry>
<entry><ind> -750</ind><dep>-59.8</dep></entry>
<entry><ind> -500</ind><dep>-49.0</dep></entry>
<entry><ind> -250</ind><dep>-30.1</dep></entry>
<entry><ind> 0</ind><dep> 0.0</dep></entry>
<entry><ind> 250</ind><dep> 50.6</dep></entry>
<entry><ind> 500</ind><dep> 68.0</dep></entry>
<entry><ind> 750</ind><dep> 75.5</dep></entry>
<entry><ind> 1000</ind><dep> 79.0</dep></entry>
<entry><ind> 2000</ind><dep> 82.3</dep></entry>
<entry><ind> 6000</ind><dep> 84.2</dep></entry>
<entry><ind> 250</ind><dep> 30.1</dep></entry>
<entry><ind> 500</ind><dep> 49.0</dep></entry>
<entry><ind> 750</ind><dep> 59.8</dep></entry>
<entry><ind> 1000</ind><dep> 66.5</dep></entry>
<entry><ind> 1500</ind><dep> 70.2</dep></entry>
<entry><ind> 2000</ind><dep> 73.0</dep></entry>
<entry><ind> 4000</ind><dep> 74.8</dep></entry>
<entry><ind> 6000</ind><dep> 76.6</dep></entry>
</table>
</expression>
</input>
<output>/instrumentation/pfd/vs-needle</output>
</filter>
<filter>
<name>Vertical Speed Needle Scale</name>
<type>gain</type>
<gain>1</gain>
<input>
<expression>
<table>
<property>/it-autoflight/internal/vert-speed-fpm-filtered</property>
<entry><ind>-6000</ind><dep>0.712</dep></entry>
<entry><ind>-2000</ind><dep>0.785</dep></entry>
<entry><ind>-1000</ind><dep>0.857</dep></entry>
<entry><ind> -500</ind><dep>0.942</dep></entry>
<entry><ind> 0</ind><dep>1.000</dep></entry>
<entry><ind> 500</ind><dep>0.942</dep></entry>
<entry><ind> 1000</ind><dep>0.857</dep></entry>
<entry><ind> 2000</ind><dep>0.785</dep></entry>
<entry><ind> 6000</ind><dep>0.712</dep></entry>
</table>
</expression>
</input>
<output>/instrumentation/pfd/vs-needle2</output>
</filter>
</PropertyList>