Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

G3000 annunciator fixes #1411

Closed
wants to merge 5 commits into from
Closed

G3000 annunciator fixes #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16f8139
Fix annunciator buttons on the Longitude
Nezz Oct 24, 2021
fd85fe8
Don't show annunciations on the TBM 930 PFD
Nezz Oct 25, 2021
aea7229
Add CSS for blinking annunciations on G5000 PFD
Nezz Oct 25, 2021
ccc27cc
Symmetrical padding around PFD annunciators
Nezz Oct 25, 2021
bdaa1b7
Fix borders around empty annunciator panel
Nezz Oct 26, 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
6 changes: 3 additions & 3 deletions ...ckpits-instruments-navsystems-g3000/html_ui/WTg3000/Avionics/G3000/PFD/Main/G3000_PFD.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ as3000-pfd-element wt-pfd-trafficalert {
background-color: #1a1d21;
font-size: calc( 1.8 * 1vh * var(--bodyHeightScale));
line-height: calc( 1.5 * 1vh * var(--bodyHeightScale));
padding: 0.5%;
padding-bottom: 0%;
padding-top: 0.8%; }
padding: 0.5%; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations:empty {
display: none; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations[state=Hidden] {
display: none; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations #newAnnunciations[state=Bordered] {
Expand Down
22 changes: 14 additions & 8 deletions ...ckpits-instruments-navsystems-g3000/html_ui/WTg3000/Avionics/G5000/PFD/Main/G5000_PFD.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,18 +231,24 @@ as3000-pfd-element wt-pfd-trafficalert {
background-color: #1a1d21;
font-size: calc( 1.8 * 1vh * var(--bodyHeightScale));
line-height: calc( 1.5 * 1vh * var(--bodyHeightScale));
padding: 0.5%;
padding-bottom: 0%;
padding-top: 0.8%; }
padding: 0.5%; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations:empty {
display: none; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations[state=Hidden] {
display: none; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations #newAnnunciations[state=Bordered] {
border-bottom: solid 0.3vh white;
margin-bottom: calc( 1 * 1vh * var(--bodyHeightScale)); }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations .Warning {
color: red; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations .Caution {
color: yellow; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations .Warning, as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations .Warning_Blink {
color: red; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations .Caution, as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations .Caution_Blink {
color: yellow; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations[state=Blink] .Warning_Blink {
color: white;
background-color: red; }
as3000-pfd-element #Mainframe #InstrumentsContainer #Annunciations[state=Blink] .Caution_Blink {
color: black;
background-color: yellow; }
as3000-pfd-element #Mainframe #InstrumentsContainer #XPDRTimeBox {
transform: rotateX(0);
position: absolute;
Expand Down Expand Up @@ -549,4 +555,4 @@ as3000-pfd-element wt-pfd-bottominfo {
background-color: black; }
as3000-pfd-element #Mainframe #InstrumentsContainer #SoftKeys .end {
border: none;
width: 8.7%; }
width: 8.7%; }
13 changes: 10 additions & 3 deletions ...ockpits-instruments-navsystems-g3000/html_ui/WTg3000/Avionics/Shared/PFD/Main/G3x5_PFD.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,11 @@ class WT_G3x5_PFDMainPage extends NavSystemPage {
}

_createElements() {
return [
var elements = [
this._autopilotDisplay = this._createAutopilotDisplay(),
this._attitude = new AS3000_PFD_Attitude("PFD", this._instrument),
this._airspeed = this._createAirspeedIndicator(),
this._altimeter = this._createAltimeter(),
this._annunciations = new PFD_Annunciations(),
this._compass = new WT_G3x5_PFDCompass(),
this._aoaIndicator = this._createAoAIndicator(),
this._minimums = this._createMinimums(),
Expand All @@ -520,6 +519,14 @@ class WT_G3x5_PFDMainPage extends NavSystemPage {
this._radarAltimeter = this._createRadarAltimeter(),
new PFD_MarkerBeacon()
];

// The Longitude does not have annunciations on the MFD, it needs to have them on the PFD instead
if (WT_PlayerAirplane.getAircraftType() == WT_PlayerAirplane.Type.CITATION_LONGITUDE)
{
elements.push(this._annunciations = new Cabin_Annunciations());
}

return elements;
}

/**
Expand Down Expand Up @@ -692,4 +699,4 @@ class AS3000_PFD_ActiveCom extends NavSystemElement {
}
}

WT_G3x5_PFD.selectAvionics();
WT_G3x5_PFD.selectAvionics();