Merge branch 'master' into rename

This commit is contained in:
Alhadis
2016-07-13 18:02:59 +10:00
92 changed files with 234 additions and 235 deletions

View File

@ -45,7 +45,7 @@ CALLQERR CA BIT13 # CALCULATE Q,R ERRORS UNLESS THESE AXES
CS DAPBOOLS # IN MANUAL RATE COMMAND?
MASK OURRCBIT
EXTEND
BZF Q,RORGTS # IF SO BYPASS CALCULATION OF ERROS.
BZF Q,RORGTS # IF SO BYPASS CALCULATION OF ERRORS.
TC QERRCALC
Q,RORGTS CCS COTROLER # CHOOSE CONTROL SYSTEM FOR THIS DAP PASS:
@ -538,7 +538,7 @@ TJLAW CA TJLAWADR
CADR SPSRCS # DETERMINE RCS CONTROL
RELINT
CAF FOUR # ALWAYS CALL FOR 2-JET CONTROL ABOUT U,V.
TS NUMBERT # FALL THROUGH TO JET SLECTION, ETC.
TS NUMBERT # FALL THROUGH TO JET SELECTION, ETC.
# Q,R-JET-SELECTION-LOGIC
#