1
0
Fork 0
Commit graph

1165 commits

Author SHA1 Message Date
fly
fd2c8f88e5 Merge branch '3D' into 3D-canvas 2021-07-30 20:41:36 +00:00
Josh Davidson
4b445879cd FMGC: Bugfix 2021-07-30 12:25:26 -04:00
Josh Davidson
3b428d1e1a FMGC: Fix localizer not capturing if on course too close to beam 2021-07-30 12:24:39 -04:00
legoboyvdlp R
b79078101f Merge branch '3D' into cpdlc 2021-07-30 12:38:35 +01:00
legoboyvdlp R
573702ed63 Merge branch 'dev' into 3D 2021-07-30 12:37:01 +01:00
legoboyvdlp R
36b78c3102 GPS PRIMARY 2021-07-30 12:30:34 +01:00
legoboyvdlp R
5eaad7d98f GPS PRIMARY LOST 2021-07-30 11:04:11 +01:00
legoboyvdlp R
0b44b47a7d Bugfix MCDU scratchpad / message queue 2021-07-29 23:40:38 +01:00
legoboyvdlp R
5e07e24e0f It actually already has a sound ... remove it 2021-07-29 21:00:11 +01:00
legoboyvdlp R
5d779bfe78 Add clicking sounds to FCU pushbuttons 2021-07-29 20:48:10 +01:00
legoboyvdlp R
945c5e1327 Merge branch 'dev' into 3D 2021-07-29 17:55:36 +01:00
legoboyvdlp R
0b6bc649d2 Fix ECAM right memo warnings; and add PAX OXY memo 2021-07-29 14:09:51 +01:00
legoboyvdlp R
639f68ba36 Passenger oxygen system 2021-07-29 13:51:23 +01:00
legoboyvdlp R
737710a629 Merge branch '3D' into cpdlc 2021-07-28 18:37:24 +01:00
legoboyvdlp R
a0b7450ceb Bugfix ALL ENG FAIL 2021-07-28 14:43:47 +01:00
legoboyvdlp R
8d44fe09fe Merge branch 'dev' into 3D 2021-07-28 14:31:02 +01:00
legoboyvdlp R
a5a9999dbb Correct STS page so that it can show on the upper display too 2021-07-28 14:28:26 +01:00
legoboyvdlp R
c2d687f737 Fix z-offset in views 2021-07-28 14:20:00 +01:00
legoboyvdlp R
38d2be1591 Merge branch 'dev' into 3D 2021-07-28 14:11:23 +01:00
Josh Davidson
1e816aa92a Files: ordering 2021-07-27 23:17:44 -04:00
legoboyvdlp R
bb432458eb ECAM: only do the swap if the display failed 2021-07-27 21:19:17 +01:00
legoboyvdlp R
55bd42fe72 Prepare to add DU switching 2021-07-27 17:36:09 +01:00
Josh Davidson
3bf210d1c0 ITAF: Smart LOC capture for shallow intercept 2021-07-27 12:01:59 -04:00
legoboyvdlp R
637e8e2644 Merge branch 'dev' into new-electrical 2021-07-27 14:44:38 +01:00
legoboyvdlp R
bcc3478e87 Merge branch '3D' into cpdlc 2021-07-27 11:18:05 +01:00
legoboyvdlp R
6d9ff1a0eb Merge branch 'dev' into 3D 2021-07-26 14:46:29 +01:00
Matthew Maring
3dce3ef1ea Fix issue #240 2021-07-26 09:17:28 -04:00
Josh Davidson
375a861400 FMGC: Fix the order of things so that they are not bad 2021-07-25 20:14:14 -04:00
Josh Davidson
b8ec096b68 FMGC: Improved FLARE law 2021-07-25 20:12:22 -04:00
legoboyvdlp R
527c60bd4a Merge cleanup 1 2021-07-25 18:20:28 +01:00
legoboyvdlp R
9aeb9e4f3b Merge branch 'dev' into 3D 2021-07-25 17:59:18 +01:00
legoboyvdlp R
3855b4a141 Fix SD 2021-07-25 17:41:07 +01:00
legoboyvdlp R
878ec89e48 Hydraulics page - improve and add quantity indicators 2021-07-24 19:38:49 +01:00
legoboyvdlp R
2385e25008 Start elec 2021-07-24 12:29:58 +01:00
Josh Davidson
017f557792 FMGC: Fix duplicate boxes around modes without changes during takeoff roll and others 2021-07-17 12:41:34 -04:00
legoboyvdlp R
06175c8541 FCTL, misc improvements 2021-07-16 20:49:01 +01:00
legoboyvdlp R
daba88a00e Wheel page 2021-07-16 15:34:17 +01:00
legoboyvdlp R
8f1f93b142 ENG page 2021-07-10 22:33:33 +01:00
legoboyvdlp R
825b002e02 COND / PRESS pages completed; fix bug in system display controller 2021-07-08 17:19:27 +01:00
legoboyvdlp R
593d6be6cf fix nodes 2021-07-06 12:44:11 +01:00
legoboyvdlp R
081c075b79 Bottom part of display 2021-07-06 12:37:18 +01:00
legoboyvdlp R
0b85e3867e Cleanup post merge; add XML 2021-06-28 13:25:06 +01:00
legoboyvdlp R
e028870b51 Merge branch 'dev' into 3D 2021-06-28 13:04:37 +01:00
legoboyvdlp R
9b4a4de1b9 Light Manager: rewrite to use more efficient and faster code 2021-06-22 17:52:24 +01:00
legoboyvdlp R
5bac220c47 Move nodes to a new file ECAM-nodes.nas 2021-06-22 15:39:48 +01:00
legoboyvdlp R
8002a2335c Remove un-needed variables and unused code 2021-06-22 15:33:17 +01:00
legoboyvdlp R
10edd0fd0f ECAM phases: fix interaction of phase 1 / phase 10 and finish the move from Nasal --> jsb 2021-06-22 15:26:56 +01:00
legoboyvdlp R
611cd9c74c More stuff 2021-06-21 17:52:13 +01:00
legoboyvdlp R
1811431d00 First test of a warning triggering a failure page call 2021-06-21 16:51:31 +01:00
legoboyvdlp R
6f4865e542 ECAM controller fix #2 2021-06-21 16:42:36 +01:00
legoboyvdlp R
11c230bdfe Fix ECAM controller 2021-06-21 16:41:29 +01:00
legoboyvdlp R
01018ef743 Rework the system display handler to properly handle failures and manual calling of pages 2021-06-21 16:38:22 +01:00
legoboyvdlp R
0c72d737ff Bugfix 2021-06-20 15:57:17 +01:00
legoboyvdlp R
425083482f Merge branch 'dev' into 3D 2021-06-19 15:14:18 +01:00
legoboyvdlp R
7519519692 Alpha floor requires at least one working FCU channel 2021-06-19 15:02:13 +01:00
legoboyvdlp R
72245558c6 Global speed protection in DES mode 2021-06-19 14:25:21 +01:00
legoboyvdlp R
82bf436084 Code Global Speed Protection mode reversion from THR CLB to SPEED on overspeed 2021-06-19 01:46:57 +01:00
legoboyvdlp R
78a589c50d Fix merge bug 2021-06-16 15:09:35 +01:00
legoboyvdlp R
e3502622ce Merge branch 'dev' into 3D 2021-06-16 15:04:46 +01:00
legoboyvdlp R
559800e05d Move to ITAF loop 2021-06-16 14:59:37 +01:00
legoboyvdlp R
53dcada429 VLS / VMAX --> properties 2021-06-16 14:40:15 +01:00
legoboyvdlp R
768cf4e1a0 FCU: improve display of characters; LVL / CH should always display also. Improve speed control range 2021-06-16 13:36:36 +01:00
legoboyvdlp R
84526a7dfe FCU: vs / fpa -- improve display 2021-06-16 12:39:59 +01:00
legoboyvdlp R
0c8b70403b Add missing variable 2021-06-13 19:41:53 +01:00
legoboyvdlp R
851c06ec3e Style improvements and restore work that was reverted 2021-06-13 19:29:25 +01:00
legoboyvdlp R
2590e73403 Nasal cleanup 2021-06-13 18:57:13 +01:00
legoboyvdlp R
a702a2b4db Merge branch 'rework' of https://github.com/inuyaksa/A320-family into inuyaksa-rework 2021-06-13 18:48:13 +01:00
legoboyvdlp R
b87c404581 Simbrief: explicitly disable the ability whenever FROM / TO is already filled, because the function is not available then 2021-06-13 17:58:01 +01:00
legoboyvdlp R
c87de06eff Simbrief: after a FMGC reset, also reset the Simbrief inhibit for a new flight 2021-06-13 17:55:01 +01:00
legoboyvdlp R
3345d0247f FMGC: bugfix; also more getprop --> props.globals 2021-06-13 00:24:46 +01:00
Inuyaksa
5715d480b7 A better autoland light - first attempt 2021-06-12 21:46:44 +02:00
Inuyaksa
7720e583ba lost changes 2021-06-12 20:57:09 +02:00
Inuyaksa
650eea4f6e typo 2021-06-12 20:49:37 +02:00
Inuyaksa
3f3442d259 MCDU web, qrcode with local-it, fixes on html
- For mobile devices, you have to insert your local ip to generate a qrcode
- Fixed HTML for zoom action and double tap
2021-06-12 18:53:54 +02:00
Inuyaksa
c7743820cd Revert "Merge branch 'dev' into rework"
This reverts commit 0140738582, reversing
changes made to 23369f854b.
2021-06-12 17:36:16 +02:00
Inuyaksa
0140738582 Merge branch 'dev' into rework 2021-06-12 15:46:45 +02:00
Inuyaksa
c4036fc407 autoland light, phase as a nodes optimzed fmgc phase loop 2021-06-12 15:42:41 +02:00
Inuyaksa
e1f4c230cc Merge branch 'dev' into rework 2021-06-12 11:41:36 +02:00
legoboyvdlp R
87f49f28e9 FMGC: improve nasal 2021-06-12 00:29:04 +01:00
Josh Davidson
66c53a91e2 FMGC: Fix listener cancel break some func 2021-06-10 11:49:30 -04:00
Josh Davidson
d33d229f86 FMGC: Fix listener cancel break some func 2021-06-10 11:49:09 -04:00
legoboyvdlp R
f025bb82f9 FMGC: improve Nasal code quality 2021-06-10 16:42:16 +01:00
legoboyvdlp R
6c138c4a10 FMGC: improve Nasal code quality 2021-06-10 16:38:16 +01:00
legoboyvdlp R
1827042f10 Merge branch 'dev' into 3D 2021-06-09 17:33:32 +01:00
legoboyvdlp R
35ddbf0426 Some extra PTS 2021-06-09 17:25:17 +01:00
legoboyvdlp R
51e82aeb09 FCU code: use ITAF nodes rather than own nodes 2021-06-09 17:20:19 +01:00
legoboyvdlp R
49f994bece ADF radio: implement BFO mode such that it will allow the ident to be heard with backup nav 2021-06-09 13:19:52 +01:00
legoboyvdlp R
aa3990d3d9 Misc fixes + improvements to Nasal code; no real changes; only improved code quality 2021-06-08 18:16:19 +01:00
legoboyvdlp R
0dd4f55400 Correct acconfig.nas failures resetting; brake guague --> use lag_filter instead of property rules filter 2021-06-08 16:53:09 +01:00
legoboyvdlp R
113b2264f3 Pneumatics: remove some extra un-needed code 2021-06-08 16:09:21 +01:00
legoboyvdlp R
9798a20850 Hydraulics / brakes: smooth the pressure guague 2021-06-07 15:38:50 +01:00
Inuyaksa
d18b121223 rework fix 2021-06-06 23:21:58 +02:00
Inuyaksa
69a4678e16 Revert "some logic optiomizing"
This reverts commit b4e59e15b8.
2021-06-06 22:25:52 +02:00
Josh Davidson
0515ff4f66 VC: Display shader overhaul 2021-06-06 12:45:04 -04:00
Josh Davidson
fa1ace4da3 Files: Merge dev 2021-06-06 11:18:50 -04:00
Inuyaksa
b4e59e15b8 some logic optiomizing 2021-06-05 14:59:50 +02:00
legoboyvdlp R
bdd2c6c9fe Fix the ARRIVAL page; remove version checks for approach VIAs 2021-05-26 16:06:49 +01:00
legoboyvdlp R
4146260147 Misc improvements to DEPARTURE page to correct edge usecases 2021-05-22 13:50:29 +01:00
legoboyvdlp R
249ea57d29 MCDU DEPARTURE page: fix such that transitions are scrollable. Fix a couple of other bugs. To change the SID you'll have to go back to the runway page and re-select the runway. 2021-05-22 13:41:54 +01:00
Josh Davidson
d5b0099aec Merge branch 'dev' into 3D 2021-05-19 12:48:25 -04:00
Josh Davidson
b771101300 FMGC: fix bug on disarm loc/appr 2021-05-19 12:48:06 -04:00
Josh Davidson
5be6d11265 Control: Begin EPR simulation for IAE 2021-05-18 12:01:52 -04:00
legoboyvdlp R
4b9166605d Leading / with setlistener 2021-05-18 13:02:11 +01:00
Josh Davidson
632c73c3d1 Control: Fix autobrake to work with new FADEC 2021-05-17 12:30:04 -04:00
Josh Davidson
722c89c27b Control: Start V2500 2021-05-16 18:31:08 -04:00
Josh Davidson
ebcab7f21d Control: Make Alpha Floor and Toga Lk work, DU: fix the a floor message on ECAM 2021-05-16 13:18:18 -04:00
fly
d11a5dac47 Merged 3D into 3D-canvas
Signed-off-by: fly <merspieler@airmail.cc>
2021-05-15 18:07:05 +00:00
legoboyvdlp R
53439c3cb6 Merge branch 'dev' into new-electrical 2021-05-12 12:17:12 +01:00
legoboyvdlp R
37802c6354 Fix property reference 2021-05-03 13:29:56 +01:00
fly
0dd88aaf2c Added sidestick priority latching
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-30 16:05:37 +00:00
fly
2443d3a4d0 Fix priority left/right being cut off in some cases
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-30 15:38:58 +00:00
fly
ac599a2319 Fix APDisc warning being cancled instantly
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-30 12:32:41 +00:00
Josh Davidson
8befc0458c Sim: FIx engine pos for differential, Control: Fix really broken lever reminder logic 2021-04-29 17:24:50 -04:00
fly
a2a3403efa Basic sidestick priority
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-29 21:18:20 +00:00
fly
6a15da11b2 Fixed VHF datamode according to real aircraft
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-28 19:09:56 -04:00
Josh Davidson
bfeb003c41 Control: Add and enumerate proper second input sidestick 2021-04-28 19:09:54 -04:00
fly
adecca1091 Fixed VHF datamode according to real aircraft
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-28 20:01:15 +00:00
Josh Davidson
9fa94b6982 Sim: Update view controller 2021-04-27 08:39:42 -04:00
Josh Davidson
694c2ea795 Control: Add thrlock logic 2021-04-27 08:34:07 -04:00
Josh Davidson
89b5590d01 Sim: Cleanup more useless sh*t 2021-04-27 08:07:26 -04:00
Josh Davidson
a376044f5c Control: Simulate thrust reversers properly 2021-04-24 13:05:23 -04:00
Josh Davidson
78bdc2997b Control: Fix slewPitchWheel problem 2021-04-24 10:49:02 -04:00
Josh Davidson
35d3c7f178 Control: Fix FADEC issues, make throttle lever available to systems 2021-04-23 18:01:12 -04:00
Josh Davidson
0f4dd9a4b9 FMGC: Install new speed on pitch system, hook up FADEC properly to engage SRS/RWY, bugfixes 2021-04-23 16:30:35 -04:00
Josh Davidson
5df1032bd1 Control: Refine engine control law farther, fix and add flex logic, add limits indications properly 2021-04-23 13:21:07 -04:00
Josh Davidson
e12fda712b FMGC: Update ITAF controller to 4.0.7 beta 3 2021-04-22 18:03:06 -04:00
Josh Davidson
c154cdc0ee Control: Tie fadec into the plane more and add eng 2 control 2021-04-22 17:44:17 -04:00
Josh Davidson
3532ff11a0 FADEC: Redo and begin new system, Control: add simulated drooping 2021-04-22 15:01:55 -04:00
fly
85eddca06b Added missing RAT doors
Signed-off-by: fly <merspieler@airmail.cc>
2021-04-06 20:48:04 +10:00
legoboyvdlp R
135c438e49 Elec: some improvements to the ELEC page 2021-04-04 20:10:40 +01:00
legoboyvdlp R
9aa7143d21 Electrical: fix bugs 2021-03-28 20:39:46 +01:00
fly
23fb5ba25e Fixed object names
Signed-off-by: fly <merspieler@airmail.cc>
2021-03-20 03:47:37 +11:00
legoboyvdlp R
75b874d2a9 A320 Electrical system: push an entirely new battery logic and connections 2021-03-19 16:46:37 +00:00
fly
089fa1d992 Merged 3D
Signed-off-by: fly <merspieler@airmail.cc>
2021-03-14 04:10:31 +11:00
legoboyvdlp R
3f9852d0f0 Merge branch 'dev' into new-electrical 2021-03-11 12:12:23 +00:00
legoboyvdlp R
3a37a2dc42 Merge branch '3D' into cpdlc 2021-03-11 11:45:07 +00:00
legoboyvdlp R
eb8cafceae Merge branch 'dev' into 3D 2021-03-11 11:44:39 +00:00
legoboyvdlp R
9252af7f80 Fix VHF3 2021-03-06 19:54:29 +00:00
legoboyvdlp
b6c14ccabc
Merge pull request #210 from inuyaksa/terrain
NavDisplay: add Terrain on ND
2021-03-06 12:14:01 +00:00
fly
e1c538299e Fixed broken VHF data mode
Signed-off-by: fly <merspieler@airmail.cc>
2021-03-06 07:30:29 +11:00
legoboyvdlp R
f894183cf7 More ATC pages 2021-03-02 17:53:46 +00:00
legoboyvdlp R
9158416153 MDCU: add ATC pages 2021-03-01 21:12:12 +00:00
legoboyvdlp R
9c7e8350df Merge branch '3D' into cpdlc 2021-03-01 17:46:44 +00:00
legoboyvdlp R
55f81ab7ab Merge branch 'dev' into 3D 2021-03-01 17:46:09 +00:00
Inuyaksa
ec429b8c83 detection for GPWS alert modes 2021-02-24 23:00:46 +01:00
Inuyaksa
15f64c5a23 Merge remote-tracking branch 'upstream/dev' into terrain 2021-02-22 23:59:05 +01:00
legoboyvdlp R
05f5774fd2 Fix that some code was not called with FROM / TO 2021-02-19 20:17:38 +00:00
legoboyvdlp R
06e81b2030 SOP: seatbelt, smoking, emer lts to off 2021-02-19 19:42:56 +00:00
legoboyvdlp R
82521c8e76 Aircraft Config: call resetVarious(). SOP: seatbelts and crew oxy to off 2021-02-19 19:27:51 +00:00
Inuyaksa
cb54074596 Merge remote-tracking branch 'upstream/dev' into terrain 2021-02-19 00:17:43 +01:00