Commit graph

2972 commits

Author SHA1 Message Date
Joshua Davidson
792c606b98 Merge branch 'master' into dev 2018-09-23 18:56:26 -04:00
Joshua Davidson
2f4c68389e Sim: Revision 2018-09-23 18:55:46 -04:00
726a373a6d Added missing ';'
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-23 18:55:29 -04:00
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
Joshua Davidson
670ea0c708 VC: Fix backwards rotation on eng mode selector 2018-09-23 18:36:51 -04:00
6227df4654 Merge upstream
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 00:30:04 +02:00
Joshua Davidson
d1a73b3d69 VC: Bugfixes to some lights 2018-09-23 18:27:58 -04:00
Joshua Davidson
52d15a9483 VC: Bugfixes to some lights 2018-09-23 18:26:45 -04:00
Joshua Davidson
ffc0cf8c52 Sim: Revision 4648 2018-09-23 18:15:35 -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
5341364c0c Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-15 15:51:22 +02:00
Joshua Davidson
0d865961af Merge branch 'master' into dev 2018-09-15 09:34:35 -04:00
Joshua Davidson
df8a4bf8e8 System: Fix bugs in CFM engine system 2018-09-15 09:34:18 -04:00
2027cf53c1 Added automatic call of ENG page on ENG start
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-15 00:38:12 +02: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
7648455cf4 Added automatic calling of the apu page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-14 21:56:30 +02:00
1b89e4d6f4 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-14 20:52:01 +02:00
Joshua Davidson
50cecf9aab GIT: Newline 2018-09-14 14:51:25 -04:00
Joshua Davidson
f7a040ad3d GIT: Newline 2018-09-14 14:49:45 -04:00
Joshua Davidson
94f4139c9a GIT: Merge master 2018-09-14 14:43:18 -04:00
Jonathan Redpath
fbfdff0ba7 Bugfix 2018-09-14 16:16:01 +01:00
Jonathan Redpath
38868ede2a Refactor buttons.nas 2018-09-14 16:13:23 +01:00
Jonathan Redpath
02f8a61438 Bugfix: engines.nas broken by props.nas change 2018-09-14 16:08:33 +01:00
Joshua Davidson
eedfb9fda2 Revert "Buttons.nas: refactor"
This reverts commit d6c5338dc5.
2018-09-14 10:25:49 -04:00
Jonathan Redpath
d6c5338dc5 Buttons.nas: refactor 2018-09-14 15:23:09 +01:00
c3399a9954 Added auto call of door, wheel and crz page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-14 15:35:05 +02: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