Commit graph

1521 commits

Author SHA1 Message Date
5029cdda1c Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-20 19:59:19 +02:00
Joshua Davidson
7bc07c8d5b GIT: Merge master 2018-09-20 13:57:20 -04:00
Joshua Davidson
4b87a65af4 GIT: Formatting 2018-09-20 13:54:43 -04:00
Joshua Davidson
048e5fad4b DU: Add back the refactored ND.nas 2018-09-20 13:50:33 -04:00
d5ab68433c Added first animation to crz page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-20 16:13:10 +02:00
Jonathan Redpath
1115bb90cc Upper ECAM: props.nas 2018-09-19 17:19:54 +01:00
Jonathan Redpath
0a96b4e1f1 PFD: props.nas redo 2018-09-18 20:09:27 +01:00
Joshua Davidson
13609e116b DU: Temporarily roll back problematic code update, IESI: Fix not-initialized variable 2018-09-15 20:11:39 -04:00
67f2b1ace2 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 23:27:34 +02:00
Joshua Davidson
ba48e45b7a Merge branch 'master' into dev 2018-09-14 16:06:17 -04:00
Joshua Davidson
c5f5a484ee IESI: Fix ALT TENS tape 2018-09-14 16:00:16 -04:00
10d786e989 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 14:59:03 +02:00
Joshua Davidson
f80a16382c Merge branch 'dev' of github.com:it0uchpods/IDG-A32X into dev 2018-09-14 08:50:52 -04:00
Joshua Davidson
a57e2c7419 Merge branch 'master' into dev 2018-09-14 08:46:07 -04:00
Joshua Davidson
3fde37d108 DU: Fix numerous PFD bugs after props.nas transition 2018-09-14 08:45:23 -04:00
e53e3c122e Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 13:18:55 +02:00
Jonathan Redpath
e9182d546c ECAM: Adjust fuel page 2018-09-14 11:59:07 +01:00
073b9a194b Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 12:56:05 +02:00
Jonathan Redpath
1efa423e99 ECAM: Adjust cond page 2018-09-14 11:55:08 +01:00
b4629480fc Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 12:43:16 +02:00
Jonathan Redpath
227329ada1 ECAM: Adjust bleed page 2018-09-14 11:39:24 +01:00
Jonathan Redpath
cd96c99a96 Merge branch 'master' into dev 2018-09-14 11:21:28 +01:00
Jonathan Redpath
c5ed493558 Bugfix: catch a potential floating point error as reccomended by Richard, attempt to fix nasal nil error 2018-09-14 11:15:21 +01:00
Jonathan Redpath
1a9771709d PFD: Transition to props.nas 2018-09-14 10:51:05 +01:00
d970754180 Added Manual LECAM page select logic
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-14 11:35:00 +02:00
aea8bb1e52 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 10:31:28 +02:00
Joshua Davidson
bb9f64858c System: Base Core for lower ECAM pages 2018-09-13 18:52:24 -04:00
49a04cf5a4 Added crz page lecam canvas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-13 19:40:17 +02:00
Joshua Davidson
39c141dc82 Merge branch 'master' into dev 2018-09-09 09:47:12 -04:00
Jonathan Redpath
5e3db54d8e IESI: increase update rate slightly 2018-09-08 17:27:47 +01:00
Jonathan Redpath
9c0a45045d IESI: transition to props.nas 2018-09-08 17:27:16 +01:00
Joshua Davidson
c0b991efd1 Merge branch 'ECAM-sys-develop' into dev 2018-09-05 21:08:25 -04:00
Joshua Davidson
9550927d69 Merge branch 'FMGC' into dev 2018-09-05 21:08:19 -04:00
Joshua Davidson
3764d88a88 DU: Add PFD FBW limits 2018-09-05 21:01:40 -04:00
Joshua Davidson
d24c2f1c54 MCDU: Rework and remove duplicate code, cleanup, make RETURN work on MCDU page 2018-08-29 17:34:11 -04:00
Joshua Davidson
a015d8e451 Merge branch 'master' into ECAM-sys-develop 2018-08-24 13:15:59 -04:00
Joshua Davidson
9f759a9e0c DU: Fix APU page bleed bug 2018-08-24 13:15:24 -04:00
Joshua Davidson
9ebdc9fa84 System: Fix Elec Battery logic, finish ELEC ECAM page 2018-08-24 12:23:59 -04:00
Joshua Davidson
b0a6bbd61a Merge branch 'master' into ECAM-sys-develop 2018-08-24 10:52:33 -04:00
Joshua Davidson
3514d5f99a Merge branch 'master' into Lower-ECAM 2018-08-24 10:51:17 -04:00
Joshua Davidson
cc1622c33b Merge branch 'autopush' of github.com:merspieler/IDG-A32X into autopush-chk 2018-08-24 08:45:49 -04:00
50f0d6df29 Updated autopush to v1.0-rc2
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-08-23 16:37:44 +02:00
Joshua Davidson
9c0dfc5dd4 Merge branch 'master' into ECAM-sys-develop 2018-08-17 13:19:06 -04:00
Joshua Davidson
3ac73a263f Merge branch 'master' into Lower-ECAM 2018-08-17 13:06:43 -04:00
Joshua Davidson
f2447bf346 Control: Improvements to Integrator FBW behavior 2018-08-15 11:18:38 -04:00
Joshua Davidson
c793bf5add Merge branch 'master' into Lower-ECAM 2018-08-13 14:03:43 -04:00
9a3ac4e9c9 Fixed missplaced pushback model
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-08-08 23:28:44 +02:00
Jonathan Redpath
0c62d99bec ECAM 2018-08-07 10:30:07 +01:00
merspieler
46b0613da2 Added autopush v1.0-rc
Signed-off-by: merspieler <merspieler@users.noreply.github.com>
2018-08-03 01:40:28 +02:00
Joshua Davidson
6783b52a22 3D: Add animations for master warning and caution lights 2018-08-02 15:58:30 -04:00