Commit graph

664 commits

Author SHA1 Message Date
91f8a237f3 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-27 20:30:55 +02:00
Joshua Davidson
886c60903c Merge branch 'master' into dev 2018-09-27 14:29:41 -04:00
Joshua Davidson
8201bc3dc3 System: Integrate radios properly into acconfig, and some fixes 2018-09-27 14:22:02 -04:00
Joshua Davidson
4fd893cb54 Merge rmp, some fixes 2018-09-27 13:47:26 -04:00
8f498b1819 Fixed, RMP2 part beeing on DC-ESS
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-27 16:32:44 +02:00
8f47d3c037 Added VHF3 to the RMPs and fixed a few issues
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-27 16:28:18 +02:00
44cf8a8997 Merge branch 'dev' of https://github.com/it0uchpods/IDG-A32X into dev 2018-09-26 20:54:27 +02:00
be5aee8fef Change to comply with coding conventions
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-26 20:53:06 +02:00
cafa1d6001 Added functionality to the RMP. VHF1 + VHF2 fully working
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-26 20:42:57 +02:00
Joshua Davidson
a703f9d5c1 Merge branch 'master' into dev 2018-09-25 09:55:35 -04:00
Joshua Davidson
20354e95c4 DU: Fix bug in UECAM due to duplicate prop node spec 2018-09-25 09:52:11 -04:00
9e0cbe1a90 Round oil qt on crz page
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 14:55:26 +02:00
7bed492937 Fixed all problems cause by move to props.nas
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 12:41:09 +02:00
18ca7631c6 Cleaning up not needed tabs
Signed-off-by: merspieler <merspieler@airmail.cc>
2018-09-24 01:32:14 +02:00
Joshua Davidson
792c606b98 Merge branch 'master' into dev 2018-09-23 18:56:26 -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
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