Skip to content

EICAS improvements #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft

EICAS improvements #135

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
36cd697
AUTORELIGHT and Idle N2
boufogre Jan 26, 2021
4989987
EGT gauge modifications
boufogre Jan 27, 2021
5bec0b3
better idle N2 calculation
boufogre Jan 28, 2021
11310b8
Many changes
boufogre Feb 19, 2021
23deba4
NaN init value for assumed temp
boufogre Feb 19, 2021
d5062c7
TMA changes
boufogre Feb 22, 2021
18c0771
Conflict resolution with master
boufogre Feb 22, 2021
20fec8a
Conflict resolution
boufogre Feb 22, 2021
02fb7e2
Merge branch 'master' into eicas-improvements
boufogre Feb 22, 2021
e59e820
Formatting
boufogre Mar 2, 2021
c11c930
Not needed
boufogre Mar 2, 2021
3340317
Formatting
boufogre Mar 2, 2021
b937674
Formatting
boufogre Mar 2, 2021
ad3ddf8
Delete B747_8_LowerEICAS_Engine.css
boufogre Mar 2, 2021
11f5d3a
Formatting
boufogre Mar 2, 2021
e8e6dbc
Formatting
boufogre Mar 2, 2021
8b6b8ec
formatting
boufogre Mar 4, 2021
e3a03b1
Formatting
boufogre Mar 4, 2021
24ad7fc
Formatting
boufogre Mar 4, 2021
56f9417
Formatting
boufogre Mar 4, 2021
836d005
Formatting
boufogre Mar 4, 2021
76424b0
Formatting
boufogre Mar 4, 2021
291449a
Formatting
boufogre Mar 6, 2021
64dafa0
Formatting
boufogre Mar 6, 2021
8074ae3
Formatting
boufogre Mar 6, 2021
816818b
Formatting
boufogre Mar 6, 2021
9026b3b
Formatting
boufogre Mar 6, 2021
4531a74
Formatting
boufogre Mar 8, 2021
e151375
Formatting
boufogre Mar 8, 2021
6301280
Formatting
boufogre Mar 8, 2021
58452a3
Formatting
boufogre Mar 8, 2021
9302cf8
Formatting
boufogre Mar 8, 2021
58985d7
Formatting
boufogre Mar 11, 2021
659244f
Formatting
boufogre Mar 11, 2021
8b59539
Formatting
boufogre Apr 20, 2021
201c8d8
update
boufogre Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/B747_8_EICAS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,15 @@ class B747_8_EICAS extends Airliners.BaseEICAS {
return B747_8_EngineState.IDLE;
}
getN2IdleValue() {
return 60;
let density = SimVar.GetSimVarValue("AMBIENT DENSITY", "kilogram per cubic meter");
var N2 ;
if (density >= 0.905) {
N2 = 4.449815909 * density + 54.58298188 ;
}
else {
N2 = 6.520005112 * density + 52.8189869 ;
}
return N2 ;
}
getN2Value(_engineId) {
return SimVar.GetSimVarValue("ENG N2 RPM:" + _engineId, "percent");
Expand Down Expand Up @@ -162,14 +170,25 @@ class B747_8_EICAS extends Airliners.BaseEICAS {
break;
case B747_8_EngineState.READY:
if (N2Value < this.getN2IdleValue())
this.changeState(i, B747_8_EngineState.DECELERATE);
this.changeState(i, B747_8_EngineState.AUTORELIGHT);
break;
case B747_8_EngineState.DECELERATE:
if (N2Value < 0.05)
if (N2Value < this.getN2IdleValue() && this.getFuelValveOpen())
this.changeState(i, B747_8_EngineState.AUTORELIGHT);
else if (N2Value < 0.05)
this.changeState(i, B747_8_EngineState.IDLE);
else if (N2Value >= this.getN2IdleValue())
this.changeState(i, B747_8_EngineState.RUNNING);
break;
case B747_8_EngineState.AUTORELIGHT:
if (N2Value >= this.getN2IdleValue()) {
this.changeState(i, B747_8_EngineState.RUNNING);
}
else if (N2Value < 0.05)
this.changeState(i, B747_8_EngineState.IDLE);
else if (!this.getFuelValveOpen())
this.changeState(i, B747_8_EngineState.DECELERATE);
break;
}
this.engines[i].timeInState += _deltaTime / 1000;
}
Expand All @@ -188,6 +207,7 @@ var B747_8_EngineState;
B747_8_EngineState[B747_8_EngineState["RUNNING"] = 2] = "RUNNING";
B747_8_EngineState[B747_8_EngineState["READY"] = 3] = "READY";
B747_8_EngineState[B747_8_EngineState["DECELERATE"] = 4] = "DECELERATE";
B747_8_EngineState[B747_8_EngineState["AUTORELIGHT"] = 5] = "AUTORELIGHT";
})(B747_8_EngineState || (B747_8_EngineState = {}));
class B747_8_Engine {
constructor() {
Expand Down
331 changes: 331 additions & 0 deletions html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/EICAS/Pages/B747_8_EICASGauge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,331 @@
var B747_8_EICAS_Common;
(function (B747_8_EICAS_Common) {
class GaugeDefinition {
constructor() {
this.getValue = null;
this.minValue = 0;
this.maxValue = 0;
this.valueBoxWidth = 0;
this.valueTextPrecision = 0;
this.barHeight = 0;
this.linesDefs = new Array();
}
addLineDefinition(_value, _length, _classStr, _getValue = null) {
var lineDef = new GaugeLineDefinition();
lineDef.value = _value;
lineDef.length = _length;
lineDef.classStr = _classStr;
lineDef.getValue = _getValue;
this.linesDefs.push(lineDef);
}
}
GaugeDefinition.VALUE_TEXT_BOX_HEIGHT = 15;
GaugeDefinition.VALUE_TEXT_X_OFFSET_FROM_BOX = 3;
GaugeDefinition.GAUGE_TOP = 20;
GaugeDefinition.GAUGE_WIDTH = 16;
B747_8_EICAS_Common.GaugeDefinition = GaugeDefinition;
class GaugeLineDefinition {
constructor() {
this.value = 0;
this.length = 0;
this.classStr = "";
this.getValue = null;
}
}
class GaugeDynamicLine {
constructor(_line, _getValue) {
this.line = null;
this.getValue = null;
this.currentValue = 0;
this.line = _line;
this.getValue = _getValue;
this.currentValue = 0;
}
}
class Gauge extends HTMLElement {
constructor() {
super(...arguments);
this.rootSVG = null;
this.valueText = null;
this.valuePrecision = 0;
this.gauge = null;
this.bar = null;
this.barHeight = 0;
this.gaugeValueToHeight = 0;
this.minValue = 0;
this.maxValue = 0;
this.currentValue = 0;
this.getValue = null;
this.dynamicLines = new Array();
}
init(_definition) {
if (_definition != null) {
this.getValue = _definition.getValue;
this.minValue = _definition.minValue;
this.maxValue = _definition.maxValue;
this.rootSVG = document.createElementNS(Avionics.SVG.NS, "svg");
this.rootSVG.setAttribute("viewBox", "0 0 100 200");
this.appendChild(this.rootSVG);
if (_definition.valueBoxWidth > 0) {
this.createValueDisplay(_definition.valueBoxWidth, _definition.valueTextPrecision);
}
if (_definition.barHeight > 0) {
this.createGaugeDisplay(_definition.barHeight);
}
if ((_definition.linesDefs != null) && (_definition.linesDefs.length > 0)) {
for (var line = 0; line < _definition.linesDefs.length; ++line) {
this.rootSVG.appendChild(this.createLine(_definition.linesDefs[line]));
}
}
}
}
createValueDisplay(_boxWidth, _valuePrecision) {
this.valuePrecision = _valuePrecision;
if (this.rootSVG != null) {
var boxX = ((100 - _boxWidth) * 0.5);
var textX = 100 - boxX - GaugeDefinition.VALUE_TEXT_X_OFFSET_FROM_BOX;
var textY = GaugeDefinition.VALUE_TEXT_BOX_HEIGHT * 0.5;
this.rootSVG.appendChild(this.createRect(boxX + "%", "0%", _boxWidth + "%", GaugeDefinition.VALUE_TEXT_BOX_HEIGHT + "%", "value"));
this.valueText = document.createElementNS(Avionics.SVG.NS, "text");
this.valueText.setAttribute("x", textX + "%");
this.valueText.setAttribute("y", textY + "%");
this.valueText.setAttribute("class", "value");
this.valueText.textContent = this.currentValue.toFixed(/*this.valuePrecision*/);
this.rootSVG.appendChild(this.valueText);
}
}
createGaugeDisplay(_barHeight) {
if (this.rootSVG != null) {
var width = GaugeDefinition.GAUGE_WIDTH;
var widthStr = width + "%";
var x = 50 - (width * 0.5);
var xStr = x + "%";
this.barHeight = _barHeight;
var heightStr = this.barHeight + "%";
this.bar = this.createRect(xStr, GaugeDefinition.GAUGE_TOP + "%", widthStr, heightStr, "bar");
this.gauge = this.createRect(xStr, (GaugeDefinition.GAUGE_TOP + this.barHeight) + "%", widthStr, "0%", "gauge");
this.rootSVG.appendChild(this.gauge);
this.rootSVG.appendChild(this.bar);
this.gaugeValueToHeight = (1 / (this.maxValue - this.minValue)) * this.barHeight;
}
}
createRect(_x, _y, _width, _height, _class) {
var rect = document.createElementNS(Avionics.SVG.NS, "rect");
rect.setAttribute("x", _x);
rect.setAttribute("y", _y);
rect.setAttribute("width", _width);
rect.setAttribute("height", _height);
rect.setAttribute("class", _class);
return rect;
}
createLine(_lineDef) {
var x1 = 50 - (_lineDef.length * 0.5);
var x2 = x1 + _lineDef.length;
var y = this.valueToGaugePosY(_lineDef.value);
var yStr = y + "%";
var line = document.createElementNS(Avionics.SVG.NS, "line");
line.setAttribute("x1", x1 + "%");
line.setAttribute("x2", x2 + "%");
line.setAttribute("y1", yStr);
line.setAttribute("y2", yStr);
line.setAttribute("class", _lineDef.classStr);
if (_lineDef.getValue != null) {
this.dynamicLines.push(new GaugeDynamicLine(line, _lineDef.getValue));
}
return line;
}
valueToGaugeHeight(_value) {
return ((_value - this.minValue) * this.gaugeValueToHeight);
}
valueToGaugePosY(_value) {
return (GaugeDefinition.GAUGE_TOP + (this.barHeight - this.valueToGaugeHeight(_value)));
}
refresh() {
if (this.getValue != null) {
var value = this.getValue();
if (value != this.currentValue) {
this.currentValue = value; /*Utils.Clamp(value, this.minValue, this.maxValue);*/
if (this.valueText != null) {
this.valueText.textContent = this.currentValue.toFixed(this.valuePrecision);
}
if (this.gauge != null) {
this.gauge.setAttribute("height", Math.max(this.valueToGaugeHeight(Math.min(this.currentValue, this.maxValue)), 0.001) + "%");
this.gauge.setAttribute("y", this.valueToGaugePosY(Math.min(this.currentValue, this.maxValue)) + "%");
}
}
}
if ((this.dynamicLines != null) && (this.dynamicLines.length > 0)) {
for (var line = 0; line < this.dynamicLines.length; ++line) {
if (this.dynamicLines[line].getValue != null) {
value = this.dynamicLines[line].getValue();
if (value != this.dynamicLines[line].currentValue) {
this.dynamicLines[line].currentValue = Utils.Clamp(value, this.minValue, this.maxValue);
;
var yStr = this.valueToGaugePosY(this.dynamicLines[line].currentValue) + "%";
this.dynamicLines[line].line.setAttribute("y1", yStr);
this.dynamicLines[line].line.setAttribute("y2", yStr);
}
}
}
}
}
getDynamicLine(id) {
if (id >= 0 && id < this.dynamicLines.length) {
return this.dynamicLines[id];
}
return null;
}
}
B747_8_EICAS_Common.Gauge = Gauge;
class GaugeDualDefinition {
constructor() {
this.useDoubleDisplay = false;
this.getValueLeft = null;
this.getValueRight = null;
this.valueTextPrecision = 0;
this.minValue = 0;
this.maxValue = 0;
this.barTop = 0;
this.barHeight = 100;
}
}
GaugeDualDefinition.VALUE_TEXT_X_OFFSET = 20;
GaugeDualDefinition.VALUE_INDICATOR_X_OFFSET = 7;
GaugeDualDefinition.VALUE_INDICATOR_LENGTH = 16;
GaugeDualDefinition.VALUE_INDICATOR_HEIGHT = 8;
B747_8_EICAS_Common.GaugeDualDefinition = GaugeDualDefinition;
class GaugeDualValueDisplay {
constructor(_parent, _definition, _isLeft) {
this.text = null;
this.valueTextPrecision = 0;
this.indicator = null;
this.barTop = 0;
this.barHeight = 0;
this.valueToIndicatorHeight = 0;
this.getValue = null;
this.currentValue = 0;
this.minValue = 0;
this.maxValue = 0;
if ((_parent != null) && (_definition != null)) {
var textX = _isLeft ? GaugeDualDefinition.VALUE_TEXT_X_OFFSET : (100 - GaugeDualDefinition.VALUE_TEXT_X_OFFSET);
this.text = document.createElementNS(Avionics.SVG.NS, "text");
this.text.setAttribute("x", textX + "%");
this.text.setAttribute("y", "50%");
this.text.setAttribute("class", "normal");
this.text.style.textAnchor = _isLeft ? "end" : "start";
_parent.appendChild(this.text);
if (_definition.barHeight > 0) {
var x1 = 0;
var x2 = 0;
if (_definition.useDoubleDisplay) {
if (_isLeft) {
x1 = 25 + GaugeDualDefinition.VALUE_INDICATOR_X_OFFSET;
x2 = x1 + GaugeDualDefinition.VALUE_INDICATOR_LENGTH;
}
else {
x1 = 75 - GaugeDualDefinition.VALUE_INDICATOR_X_OFFSET;
x2 = x1 - GaugeDualDefinition.VALUE_INDICATOR_LENGTH;
}
}
else {
if (_isLeft) {
x1 = 50 - GaugeDualDefinition.VALUE_INDICATOR_X_OFFSET;
x2 = x1 - GaugeDualDefinition.VALUE_INDICATOR_LENGTH;
}
else {
x1 = 50 + GaugeDualDefinition.VALUE_INDICATOR_X_OFFSET;
x2 = x1 + GaugeDualDefinition.VALUE_INDICATOR_LENGTH;
}
}
var halfHeight = GaugeDualDefinition.VALUE_INDICATOR_HEIGHT * 0.5;
this.indicator = document.createElementNS(Avionics.SVG.NS, "polygon");
var points = [
x1, 0,
x2, -halfHeight,
x2, halfHeight
].join(" ");
this.indicator.setAttribute("points", points);
this.indicator.setAttribute("class", "indicatorNormal");
_parent.appendChild(this.indicator);
this.barTop = _definition.barTop;
this.barHeight = _definition.barHeight;
this.minValue = _definition.minValue;
this.maxValue = _definition.maxValue;
this.valueToIndicatorHeight = (1 / (this.maxValue - this.minValue)) * this.barHeight;
}
}
this.valueTextPrecision = _definition.valueTextPrecision;
this.getValue = _isLeft ? _definition.getValueLeft : _definition.getValueRight;
this.trySetValue(0, true);
}
refresh() {
if (this.getValue != null) {
this.trySetValue(this.getValue());
}
}
trySetValue(_value, _force = false) {
if ((_value != this.currentValue) || _force) {
this.currentValue = _value;
if (this.text != null) {
this.text.textContent = _value.toFixed(this.valueTextPrecision);
}
if (this.indicator != null) {
var clampValue = Utils.Clamp(this.currentValue, this.minValue, this.maxValue);
var y = (this.barTop + (this.barHeight - ((clampValue - this.minValue) * this.valueToIndicatorHeight)));
this.indicator.setAttribute("transform", "translate(0," + y + ")");
}
}
}
}
class GaugeDual extends HTMLElement {
constructor() {
super(...arguments);
this.rootSVG = null;
this.leftValue = null;
this.rightValue = null;
}
init(_definition) {
this.rootSVG = document.createElementNS(Avionics.SVG.NS, "svg");
this.rootSVG.setAttribute("viewBox", "0 0 100 100");
this.appendChild(this.rootSVG);
if (_definition != null) {
if (_definition.getValueLeft != null) {
this.leftValue = new GaugeDualValueDisplay(this.rootSVG, _definition, true);
}
if (_definition.getValueRight != null) {
this.rightValue = new GaugeDualValueDisplay(this.rootSVG, _definition, false);
}
if (_definition.barHeight > 0) {
if (_definition.useDoubleDisplay) {
this.rootSVG.appendChild(this.createBar(25, _definition.barTop, _definition.barHeight));
this.rootSVG.appendChild(this.createBar(75, _definition.barTop, _definition.barHeight));
}
else {
this.rootSVG.appendChild(this.createBar(50, _definition.barTop, _definition.barHeight));
}
}
}
}
createBar(_x, _top, _height) {
var bar = document.createElementNS(Avionics.SVG.NS, "line");
bar.setAttribute("x1", _x + "%");
bar.setAttribute("x2", _x + "%");
bar.setAttribute("y1", _top + "%");
bar.setAttribute("y2", (_top + _height) + "%");
bar.setAttribute("class", "bar");
return bar;
}
refresh() {
if (this.leftValue != null) {
this.leftValue.refresh();
}
if (this.rightValue != null) {
this.rightValue.refresh();
}
}
}
B747_8_EICAS_Common.GaugeDual = GaugeDual;
})(B747_8_EICAS_Common || (B747_8_EICAS_Common = {}));
customElements.define('b747-8-eicas-gauge', B747_8_EICAS_Common.Gauge);
customElements.define('b747-8-eicas-gauge-dual', B747_8_EICAS_Common.GaugeDual);
//# sourceMappingURL=B747_8_EICASGauge.js.map
Loading