Commit graph

648 commits

Author SHA1 Message Date
b1e06af352 Added missing ';'
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 00:51:59 +02:00
4bf8d0e3d3 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-24 00:38:03 +02:00
Joshua Davidson
150bef4e11 Merge branch 'master' into dev 2018-09-23 18:37:03 -04:00
6227df4654 Merge upstream
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 00:30:04 +02:00
Joshua Davidson
52d15a9483 VC: Bugfixes to some lights 2018-09-23 18:26:45 -04:00
9c90363e59 Removed lines I accidently left over
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-23 23:57:19 +02:00
Thorsten
9b6e63179e VC: Upper Pedestal completely renewed 2018-09-23 23:46:37 +02:00
Joshua Davidson
430ce1fa9b Merge branch 'master' into dev 2018-09-23 11:52:54 -04:00
Joshua Davidson
3aa56a8627 DU: Bugfix UECAM 2018-09-23 11:52:19 -04:00
Joshua Davidson
48f81cfd3a DU: Inhibit power up self test in flight 2018-09-23 11:41:32 -04:00
7b64feaa1e Moved Lower-ECAM.nas to props.nas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-23 17:02:47 +02:00
016a9ba03d Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-23 12:22:29 +02:00
Joshua Davidson
411a1f216b Merge branch 'master' into dev 2018-09-20 14:21:43 -04:00
Joshua Davidson
95d999f6cb DU: Fix serious DU6 bug, fix ND position 2018-09-20 14:18:42 -04:00
638e3e91ea Fix CRZ page oil beeing in wrong function
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-20 20:16:17 +02:00
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
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