feat(fm): new flight model #379

boufogre · 2022-01-26T21:13:31Z

No description provided.

…into pr/379

helbertgs · 2023-01-11T13:06:12Z

salty-747/html_ui/Pages/Salty/SaltyADC.js

+    /*calculateAlt(p) {
+        //const alt = ((this.r * sat) / (this.g * this.mm)) * Math.log(this.p0 / p) * this.mToFeet;
+        const altH = this.h1 - ((this.r * this.t1) / (this.g0 * this.mm)) * Math.log(p / this.p1);
+        SimVar.SetSimVarValue ("L:74S_ADC_ALTH", "feet", altH);
+        const altL = this.h0 + ((p / this.p0) ** ((-this.r * this.l0) / (this.g0 * this.mm)) - 1) * (this.t0 / this.l0);
+        SimVar.SetSimVarValue("L:74S_ADC_ALTL", "feet", altL);
+        const alt = 15000;
+        if (!this.altSample) {
+            this.alt0 = alt;
+            this.t0 = performance.now();
+            this.altSample = true;
+        }
+        else {
+            this.alt1 = alt;
+            this.t1 = performance.now();
+            this.altSample = false;
+        }
+        if (alt < -1000 || alt > 50000) {
+            return this.ncd;
+        }
+        if (p >= 22632) {
+            if (!this.altSample) {
+                this.alt0 = altL;
+                this.t0 = performance.now();
+                this.altSample = true;
+            }
+            else {
+                this.alt1 = altL;
+                this.t1 = performance.now();
+                this.altSample = false;
+            }
+            if (altL < -1000 || altL > 50000) {
+                return this.ncd;
+            }
+            //SimVar.SetSimVarValue("L:74S_ADC_ALTL", "feet", altL);
+            const alt = altL;
+            return alt;
+        }
+        else {
+            if (!this.altSample) {
+                this.alt0 = altH;
+                this.t0 = performance.now();
+                this.altSample = true;
+            }
+            else {
+                this.alt1 = altH;
+                this.t1 = performance.now();
+                this.altSample = false;
+            }
+            if (altH < -1000 || altH > 50000) {
+                return this.ncd;
+            }
+            //SimVar.SetSimVarValue("L:74S_ADC_ALTH", "feet", altH);
+            const alt = altH;
+            return alt;
+        }
+    }*/


Suggested change

/*calculateAlt(p) {

//const alt = ((this.r * sat) / (this.g * this.mm)) * Math.log(this.p0 / p) * this.mToFeet;

const altH = this.h1 - ((this.r * this.t1) / (this.g0 * this.mm)) * Math.log(p / this.p1);

SimVar.SetSimVarValue ("L:74S_ADC_ALTH", "feet", altH);

const altL = this.h0 + ((p / this.p0) ** ((-this.r * this.l0) / (this.g0 * this.mm)) - 1) * (this.t0 / this.l0);

SimVar.SetSimVarValue("L:74S_ADC_ALTL", "feet", altL);

const alt = 15000;

if (!this.altSample) {

this.alt0 = alt;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = alt;

this.t1 = performance.now();

this.altSample = false;

}

if (alt < -1000 || alt > 50000) {

return this.ncd;

}

if (p >= 22632) {

if (!this.altSample) {

this.alt0 = altL;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = altL;

this.t1 = performance.now();

this.altSample = false;

}

if (altL < -1000 || altL > 50000) {

return this.ncd;

}

//SimVar.SetSimVarValue("L:74S_ADC_ALTL", "feet", altL);

const alt = altL;

return alt;

}

else {

if (!this.altSample) {

this.alt0 = altH;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = altH;

this.t1 = performance.now();

this.altSample = false;

}

if (altH < -1000 || altH > 50000) {

return this.ncd;

}

//SimVar.SetSimVarValue("L:74S_ADC_ALTH", "feet", altH);

const alt = altH;

return alt;

}

}*/

helbertgs · 2023-01-11T13:06:49Z

salty-747/html_ui/Pages/Salty/SaltyADC.js

+    calculateAlt(p) {
+        //const alt = ((this.r * sat) / (this.g * this.mm)) * Math.log(this.p0 / p) * this.mToFeet;
+        const altH = (this.h1 - ((this.r * this.temp1) / (this.g * this.mm)) * Math.log(p / this.p1)) * this.mToFeet;
+        const altL = (this.h0 + ((p / this.p0) ** ((-this.r * this.l0) / (this.g * this.mm)) - 1) * (this.temp0 / this.l0)) * this.mToFeet;
+        /*if (!this.altSample) {
+            this.alt0 = alt;
+            this.t0 = performance.now();
+            this.altSample = true;
+        }
+        else {
+            this.alt1 = alt;
+            this.t1 = performance.now();
+            this.altSample = false;
+        }
+        if (alt < -1000 || alt > 50000) {
+            return this.ncd;
+        }*/
+        if (p >= 22632) {
+            if (!this.altSample) {
+                this.alt0 = altL;
+                this.t0 = performance.now();
+                this.altSample = true;
+            }
+            else {
+                this.alt1 = altL;
+                this.t1 = performance.now();
+                this.altSample = false;
+            }
+            if (altL < -1000 || altL > 50000) {
+                return this.ncd;
+            }
+            const alt = altL;
+            return alt;
+        }
+        else {
+            if (!this.altSample) {
+                this.alt0 = altH;
+                this.t0 = performance.now();
+                this.altSample = true;
+            }
+            else {
+                this.alt1 = altH;
+                this.t1 = performance.now();
+                this.altSample = false;
+            }
+            if (altH < -1000 || altH > 50000) {
+                return this.ncd;
+            }
+            const alt = altH;
+            return alt;
+        }
+    }


Suggested change

calculateAlt(p) {

//const alt = ((this.r * sat) / (this.g * this.mm)) * Math.log(this.p0 / p) * this.mToFeet;

const altH = (this.h1 - ((this.r * this.temp1) / (this.g * this.mm)) * Math.log(p / this.p1)) * this.mToFeet;

const altL = (this.h0 + ((p / this.p0) ** ((-this.r * this.l0) / (this.g * this.mm)) - 1) * (this.temp0 / this.l0)) * this.mToFeet;

/*if (!this.altSample) {

this.alt0 = alt;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = alt;

this.t1 = performance.now();

this.altSample = false;

}

if (alt < -1000 || alt > 50000) {

return this.ncd;

}*/

if (p >= 22632) {

if (!this.altSample) {

this.alt0 = altL;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = altL;

this.t1 = performance.now();

this.altSample = false;

}

if (altL < -1000 || altL > 50000) {

return this.ncd;

}

const alt = altL;

return alt;

}

else {

if (!this.altSample) {

this.alt0 = altH;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = altH;

this.t1 = performance.now();

this.altSample = false;

}

if (altH < -1000 || altH > 50000) {

return this.ncd;

}

const alt = altH;

return alt;

}

}

calculateAlt(p) {

const altH = (this.h1 - ((this.r * this.temp1) / (this.g * this.mm)) * Math.log(p / this.p1)) * this.mToFeet;

const altL = (this.h0 + ((p / this.p0) ** ((-this.r * this.l0) / (this.g * this.mm)) - 1) * (this.temp0 / this.l0)) * this.mToFeet;

if (p >= 22632) {

if (!this.altSample) {

this.alt0 = altL;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = altL;

this.t1 = performance.now();

this.altSample = false;

}

if (altL < -1000 || altL > 50000) {

return this.ncd;

}

const alt = altL;

return alt;

}

else {

if (!this.altSample) {

this.alt0 = altH;

this.t0 = performance.now();

this.altSample = true;

}

else {

this.alt1 = altH;

this.t1 = performance.now();

this.altSample = false;

}

if (altH < -1000 || altH > 50000) {

return this.ncd;

}

const alt = altH;

return alt;

}

}

helbertgs · 2023-01-11T13:07:30Z

salty-747/html_ui/Pages/Salty/SaltyADC.js

+    /*calculateBaroCorrAlt(sat, p, baroSetting) {
+        const alt = ((this.r * sat) / (this.g * this.mm)) * Math.log(baroSetting / p) * this.mToFeet;
+        if (alt < -1000 || alt > 50000) {
+            return this.ncd;
+        }
+        return alt;
+    }*/


Suggested change

/*calculateBaroCorrAlt(sat, p, baroSetting) {

const alt = ((this.r * sat) / (this.g * this.mm)) * Math.log(baroSetting / p) * this.mToFeet;

if (alt < -1000 || alt > 50000) {

return this.ncd;

}

return alt;

}*/

helbertgs · 2023-01-11T13:07:46Z

salty-747/html_ui/Pages/Salty/SaltyBase.js

        this.pilots = new SaltyPilots();
        this.jettison = new SaltyJettison();
+        this.airground = new SaltyAirGroundLogic();
+        //this.flightphase = new SaltyFlightPhaseLogic();


Suggested change

//this.flightphase = new SaltyFlightPhaseLogic();

helbertgs · 2023-01-11T13:07:54Z

salty-747/html_ui/Pages/Salty/SaltyBase.js

+        this.airground = new SaltyAirGroundLogic();
+        //this.flightphase = new SaltyFlightPhaseLogic();
+        this.adc = new SaltyADC();
+        //this.fadec = new SaltyFADEC();


Suggested change

//this.fadec = new SaltyFADEC();

helbertgs · 2023-01-11T13:10:45Z

salty-747/html_ui/Pages/Salty/SaltyFADEC.js

+    update() {
+
+        for (let i = 1; i < 5; i++){
+            let index = i;
+            /*RegisterViewListener("JS_LISTENER_KEYEVENT");
+            this.keyListener = RegisterViewListener('JS_LISTENER_KEYEVENT', () => {
+                Coherent.call('INTERCEPT_KEY_EVENT', 'INCREASE_THROTTLE', 0);
+                Coherent.call('INTERCEPT_KEY_EVENT', 'DECREASE_THROTTLE', 0);
+                Coherent.call('INTERCEPT_KEY_EVENT', 'THROTTLE_CUT', 0);
+                this.keyListener.on('keyIntercepted', keyEventName => {
+                    if (keyEventName === 'THROTTLE_CUT')  {
+                        if (SimVar.GetSimVarValue("GPS OBS ACTIVE", "boolean")) {
+                            SimVar.SetSimVarValue("K:GPS_OBS_SET", "degrees", SimVar.GetSimVarValue("NAV OBS:1", "degree"));
+                        }
+                        console.log('THROTTLE CUT INTERCEPTED');
+                        SimVar.SetSimVarValue("K:AXIS_THROTTLE_SET", "position 16K", 5995);
+                    }
+                    if (keyEventName === 'VOR1_OBI_DEC')  {
+                        if (SimVar.GetSimVarValue("GPS OBS ACTIVE", "boolean")) {
+                            SimVar.SetSimVarValue("K:GPS_OBS_SET", "degrees", SimVar.GetSimVarValue("NAV OBS:1", "degree"));
+                        }
+                    }
+                });
+    
+            });*/
+            //this.getEAI(index);
+            //this.getBleed(index);
+            //this.getAlternate(index);
+            //this.getTLA(index);
+            //this.getIdleN1(index);
+            //this.getMaxN1(index);
+            this.setCommandedN1(index);
+        }
+    return;
+    }


Suggested change

update() {

for (let i = 1; i < 5; i++){

let index = i;

/*RegisterViewListener("JS_LISTENER_KEYEVENT");

this.keyListener = RegisterViewListener('JS_LISTENER_KEYEVENT', () => {

Coherent.call('INTERCEPT_KEY_EVENT', 'INCREASE_THROTTLE', 0);

Coherent.call('INTERCEPT_KEY_EVENT', 'DECREASE_THROTTLE', 0);

Coherent.call('INTERCEPT_KEY_EVENT', 'THROTTLE_CUT', 0);

this.keyListener.on('keyIntercepted', keyEventName => {

if (keyEventName === 'THROTTLE_CUT') {

if (SimVar.GetSimVarValue("GPS OBS ACTIVE", "boolean")) {

SimVar.SetSimVarValue("K:GPS_OBS_SET", "degrees", SimVar.GetSimVarValue("NAV OBS:1", "degree"));

}

console.log('THROTTLE CUT INTERCEPTED');

SimVar.SetSimVarValue("K:AXIS_THROTTLE_SET", "position 16K", 5995);

}

if (keyEventName === 'VOR1_OBI_DEC') {

if (SimVar.GetSimVarValue("GPS OBS ACTIVE", "boolean")) {

SimVar.SetSimVarValue("K:GPS_OBS_SET", "degrees", SimVar.GetSimVarValue("NAV OBS:1", "degree"));

}

}

});

});*/

//this.getEAI(index);

//this.getBleed(index);

//this.getAlternate(index);

//this.getTLA(index);

//this.getIdleN1(index);

//this.getMaxN1(index);

this.setCommandedN1(index);

}

return;

}

update() {

for (let i = 1; i < 5; i++){

let index = i;

this.setCommandedN1(index);

}

return;

}

helbertgs · 2023-01-11T13:10:56Z

salty-747/html_ui/Pages/Salty/WT/Autopilot/SaltyNavModeSelector.js

      }
      this.currentAutoThrottleStatus = AutoThrottleModeState.THR;
-      SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 80);
+      //SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 80);


Suggested change

//SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 80);

helbertgs · 2023-01-11T13:11:03Z

salty-747/html_ui/Pages/Salty/WT/Autopilot/SaltyNavModeSelector.js

     this.currentAutoThrottleStatus = AutoThrottleModeState.THRREF;
     Coherent.call("GENERAL_ENG_THROTTLE_MANAGED_MODE_SET", ThrottleMode.CLIMB);
-     SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 90);
+     //SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 90);


Suggested change

//SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 90);

helbertgs · 2023-01-11T13:11:12Z

salty-747/html_ui/Pages/Salty/WT/Autopilot/SaltyNavModeSelector.js

+     //SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 23.2);
+     //SimVar.SetSimVarValue("K:AP_N1_HOLD", "bool", 1);


Suggested change

//SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 23.2);

//SimVar.SetSimVarValue("K:AP_N1_HOLD", "bool", 1);

helbertgs · 2023-01-11T13:11:31Z

salty-747/html_ui/Pages/VCockpit/Instruments/Airliners/B747_8/FMC/B747_8_FMC.html

+<!-- <script type="text/html" import-script="/Pages/Salty/SaltyFlightPhaseLogic.js"></script> -->
+<script type="text/html" import-script="/Pages/Salty/SaltyADC.js"></script>
+<!-- <script type="text/html" import-script="/Pages/Salty/SaltyFADEC.js"></script> -->


Suggested change



<script type="text/html" import-script="/Pages/Salty/SaltyADC.js"></script>



<script type="text/html" import-script="/Pages/Salty/SaltyADC.js"></script>

boufogre and others added 30 commits May 11, 2021 16:57

some changes

bebf91d

Merge remote-tracking branch 'upstream/master' into flight-model

4587c01

Merge remote-tracking branch 'upstream/master' into pr/222

1e81543

Merge remote-tracking branch 'upstream/master' into flight-model

b39da61

Some changes

e426987

Merge remote-tracking branch 'upstream/master' into flight-model

11ec0a7

Merge remote-tracking branch 'upstream/master' into flight-model

143125b

Merge remote-tracking branch 'upstream/master' into flight-model

df2cff4

Merge remote-tracking branch 'upstream/master' into flight-model

0d1d955

updates

52aeac3

Merge remote-tracking branch 'upstream/master' into flight-model

23cc827

update

816014c

Merge remote-tracking branch 'upstream/master' into flight-model

8b8bee3

Merge remote-tracking branch 'upstream/master' into flight-model

2e7b89e

Merge remote-tracking branch 'upstream/master' into flight-model

f868d4f

Merge remote-tracking branch 'upstream/master' into flight-model

4efbd0e

changes

4f08f49

Merge remote-tracking branch 'upstream/master' into flight-model

ca9810d

Merge remote-tracking branch 'upstream/master' into flight-model

e22cb7b

Merge remote-tracking branch 'upstream/master' into flight-model

bb73c4b

update

f7e3cff

Merge remote-tracking branch 'upstream/master' into flight-model

6fdcab0

Merge remote-tracking branch 'upstream/master' into flight-model

8265e47

Merge remote-tracking branch 'upstream/master' into flight-model

3556ffb

update

faedef3

update

5de9711

fix lower EICAS fuel to match upper EICAS unit

41ed726

Update flight_model.cfg

fa1d79c

Delete CJ4_MapSymbols.js

097fb8c

Delete CJ4_MapSymbols.js.map

ed19fc1

boufogre and others added 29 commits January 26, 2022 22:44

Delete WaypointBuilder.d.ts

c81abf7

Delete WorldMagneticModel.d.ts

538f7f1

Delete LzUtf8.d.ts

761af91

Delete SimVarCache.d.ts

3b6bde1

Delete wtsdk.d.ts

a9d8f48

Delete CJ4_SpeedObserver.js

9ea81c3

Delete CJ4_FMC_PilotWaypointParser.js

c527bf2

Delete DirectTo.js

6a72236

Delete wtsdk.js

4a5c89a

Delete SimVarCache.js

4e0582c

Delete LzUtf8.js

89f041b

Delete WorldMagneticModel.js

df57748

Delete WaypointBuilder.js

d6f6226

Delete RawDataMapper.js

b45f5da

Delete ProcedureDetails.js

1b88ec4

Delete ManagedFlightPlan.js

9da7c95

Delete LegsProcedure.js

a06b8c3

Delete LegType.js

b1da8ac

Delete HoldDetails.js

852c9cd

Delete GeoMath.js

d6d1cc8

Delete GPS.js

143e1a2

Delete FlightPlanSegment.js

789c4f0

Delete FlightPlanManager.js

7fa8c57

Delete FlightPlanAsoboSync.js

6f3ac9e

Delete FixNamingScheme.js

31fff6a

Update B747_8_FMC_MainDisplay.js

b77b0c5

Update SaltyBase.js

c4b4067

Merge remote-tracking branch 'upstream/master' into pr/379

674c91e

Merge branch 'flight-model' of https://github.com/boufogre/salty-747 …

06d7114

…into pr/379

helbertgs reviewed Jan 11, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(fm): new flight model #379

feat(fm): new flight model #379

Uh oh!

boufogre commented Jan 26, 2022

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

helbertgs Jan 11, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		//SimVar.SetSimVarValue("K:AP_N1_REF_SET", "number", 23.2);
		//SimVar.SetSimVarValue("K:AP_N1_HOLD", "bool", 1);

feat(fm): new flight model #379

Are you sure you want to change the base?

feat(fm): new flight model #379

Uh oh!

Conversation

boufogre commented Jan 26, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants