Fixes by Richard
This commit is contained in:
parent
434ea38388
commit
218d52d394
2 changed files with 38 additions and 35 deletions
|
@ -1151,7 +1151,7 @@ var canvas_lowerECAM_elec = {
|
||||||
return m;
|
return m;
|
||||||
},
|
},
|
||||||
getKeys: func() {
|
getKeys: func() {
|
||||||
return ["TAT","SAT","GW","BAT1volts","BAT1amps","BAT1v","BAT1a","BAT1off","BAT2volts","BAT2amps","BAT2v","BAT2a","BAT2off"];
|
return ["TAT","SAT","GW","BAT1volts","BAT1amps","BAT1v","BAT1a","BAT1off","BAT2volts","BAT2amps","BAT2v","BAT2a","BAT2off","TR1volts","EMERGENvolts"];
|
||||||
},
|
},
|
||||||
update: func() {
|
update: func() {
|
||||||
if (getprop("/controls/electrical/switches/battery1") == 0) {
|
if (getprop("/controls/electrical/switches/battery1") == 0) {
|
||||||
|
@ -1183,8 +1183,11 @@ var canvas_lowerECAM_elec = {
|
||||||
|
|
||||||
me["BAT1volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery1-volts")));
|
me["BAT1volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery1-volts")));
|
||||||
me["BAT2volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery2-volts")));
|
me["BAT2volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery2-volts")));
|
||||||
me["BAT1amps"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery1-amps")));
|
me["BAT1amps"].setText(sprintf("%3.0f", getprop("/systems/electrical/battery1-amps")));
|
||||||
me["BAT2amps"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery2-amps")));
|
me["BAT2amps"].setText(sprintf("%3.0f", getprop("/systems/electrical/battery2-amps")));
|
||||||
|
|
||||||
|
me["TR1volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery2-volts")));
|
||||||
|
me["EMERGENvolts"].setText(sprintf("%3.0f", "1"));
|
||||||
me.updateBottomStatus();
|
me.updateBottomStatus();
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -41,9 +41,9 @@
|
||||||
inkscape:window-height="706"
|
inkscape:window-height="706"
|
||||||
id="namedview371"
|
id="namedview371"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
inkscape:zoom="0.49"
|
inkscape:zoom="1.3859293"
|
||||||
inkscape:cx="838.86158"
|
inkscape:cx="713.20192"
|
||||||
inkscape:cy="803.35319"
|
inkscape:cy="765.07182"
|
||||||
inkscape:window-x="-8"
|
inkscape:window-x="-8"
|
||||||
inkscape:window-y="-8"
|
inkscape:window-y="-8"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
|
@ -1160,18 +1160,18 @@
|
||||||
sodipodi:linespacing="125%"
|
sodipodi:linespacing="125%"
|
||||||
id="TR1volts"
|
id="TR1volts"
|
||||||
y="357.78845"
|
y="357.78845"
|
||||||
x="112.82855"
|
x="199.05309"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
inkscape:label="#text4348"><tspan
|
inkscape:label="#text4348"><tspan
|
||||||
y="357.78845"
|
y="357.78845"
|
||||||
x="112.82855"
|
x="199.05309"
|
||||||
id="tspan4350"
|
id="tspan4350"
|
||||||
sodipodi:role="line"> 0</tspan></text>
|
sodipodi:role="line">000</tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
||||||
x="112.41708"
|
x="198.64162"
|
||||||
y="394.29761"
|
y="394.29761"
|
||||||
id="TR1amps"
|
id="TR1amps"
|
||||||
sodipodi:linespacing="125%"
|
sodipodi:linespacing="125%"
|
||||||
|
@ -1179,12 +1179,12 @@
|
||||||
inkscape:label="#text4352"><tspan
|
inkscape:label="#text4352"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4354"
|
id="tspan4354"
|
||||||
x="112.41708"
|
x="198.64162"
|
||||||
y="394.29761"> 0</tspan></text>
|
y="394.29761">000</tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
||||||
x="399.95438"
|
x="482.30896"
|
||||||
y="395.12476"
|
y="395.12476"
|
||||||
id="ESSTRvolts"
|
id="ESSTRvolts"
|
||||||
sodipodi:linespacing="125%"
|
sodipodi:linespacing="125%"
|
||||||
|
@ -1192,47 +1192,47 @@
|
||||||
inkscape:label="#text4356"><tspan
|
inkscape:label="#text4356"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4358"
|
id="tspan4358"
|
||||||
x="399.95438"
|
x="482.30896"
|
||||||
y="395.12476"> 0</tspan></text>
|
y="395.12476">000</tspan></text>
|
||||||
<text
|
<text
|
||||||
transform="scale(0.95153898,1.0509291)"
|
transform="scale(0.95153898,1.0509291)"
|
||||||
sodipodi:linespacing="125%"
|
sodipodi:linespacing="125%"
|
||||||
id="ESSTRamps"
|
id="ESSTRamps"
|
||||||
y="431.63391"
|
y="431.63391"
|
||||||
x="399.54291"
|
x="408.97983"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
inkscape:label="#text4360"><tspan
|
inkscape:label="#text4360"><tspan
|
||||||
y="431.63391"
|
y="431.63391"
|
||||||
x="399.54291"
|
x="408.97983"
|
||||||
id="tspan4362"
|
id="tspan4362"
|
||||||
sodipodi:role="line"> 0</tspan></text>
|
sodipodi:role="line">000</tspan></text>
|
||||||
<text
|
<text
|
||||||
transform="scale(0.95153898,1.0509291)"
|
transform="scale(0.95153898,1.0509291)"
|
||||||
sodipodi:linespacing="125%"
|
sodipodi:linespacing="125%"
|
||||||
id="EMERGENvolts"
|
id="EMERGENhz"
|
||||||
y="399.27322"
|
y="435.6593"
|
||||||
x="664.1712"
|
x="733.74005"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
inkscape:label="#text4364"><tspan
|
inkscape:label="#text4364"><tspan
|
||||||
y="399.27322"
|
y="435.6593"
|
||||||
x="664.1712"
|
x="733.74005"
|
||||||
id="tspan4366"
|
id="tspan4366"
|
||||||
sodipodi:role="line"> 0</tspan></text>
|
sodipodi:role="line">000</tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
x="663.75977"
|
x="733.65741"
|
||||||
y="435.78238"
|
y="403.01285"
|
||||||
id="EMERGENhz"
|
id="EMERGENvolts"
|
||||||
sodipodi:linespacing="125%"
|
sodipodi:linespacing="125%"
|
||||||
transform="scale(0.95153898,1.0509291)"
|
transform="scale(0.95153898,1.0509291)"
|
||||||
inkscape:label="#text4368"><tspan
|
inkscape:label="#text4368"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4370"
|
id="tspan4370"
|
||||||
x="663.75977"
|
x="733.65741"
|
||||||
y="435.78238"> 0</tspan></text>
|
y="403.01285">000</tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.94145203px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#11ba50;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
|
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 98 KiB |
Reference in a new issue