Merge branch 'master' of https://github.com/chrislgarry/Apollo-11 into proposed

This commit is contained in:
Gary Young 2016-07-23 19:29:59 -06:00
commit e1e2b9e6f2
2 changed files with 17 additions and 18 deletions

View File

@ -39,7 +39,7 @@
# EXAMINE CHANNEL 31 FOR TRANSLATION COMMANDS
JETSLECT LXCH BANKRUPT
CAF DELTATT3 # = 60 MS RESET TO EXECUTIVE PHASE1
CAF DELTATT3 # = 60 MS RESET TO EXECUTE PHASE1
AD T5TIME
TS TIME5
TCF +3
@ -143,7 +143,7 @@ TABPCOM INDEX XNDX1
MP BIT7
TS NPJETS # = NO. OF PITCH JETS
# YAW JET COMMANDS TIMING(N X-TRANS, NO QUAD FAILURES) 32MCT
# YAW JET COMMANDS TIMING(NO X-TRANS, NO QUAD FAILURES) 32MCT
YWORD CCS TAU2 # CHECK FOR YAW COMMANDS
CAF ONE
@ -153,7 +153,7 @@ YWORD CCS TAU2 # CHECK FOR YAW COMMANDS
CCS RBDFAIL # FLAG FOR B OR D QUAD FAILURES
TCF BFAILY # 0 = NO BD FAILURE
TCF TABYCOM # + - B QUAD FAILED
TCF TABYCOM # + = B QUAD FAILED
TCF DFAILY # - = D QUAD FAILED
TCF TABYCOM
@ -231,7 +231,7 @@ RCFAIL CAF TWELVE
TCF TABRCOM
XLN1NDX DEC 0
DEC 1 # INDICES FOR TRANSLATION
DEC 1 # INDECES FOR TRANSLATION
DEC 2
DEC 0
@ -454,13 +454,13 @@ ACYJETS OCT 34360
# Page 1050
# CALCULATION OF JET ON-TIMES
#
# THE ROTATION COMMANDS (TAU'S), WHICH WERE DETERMINED FROM THE JET SWITCHING LOGIC ON THE BASIS OF SINGLE JET
# THE ROTATION COMMANDS (TAU:S), WHICH WERE DETERMINED FROM THE JET SWITCHING LOGIC ON THE BASIS OF SINGLE JET
# OPERATION, MUST NOW BE UPDATED BY THE ACTUAL NUMBER OF JETS TO BE USED IN SATISFYING THESE COMMANDS. TAU MUST
# ALSO BE DECREMENTED ACCORDING TO THE EXPECTED TORQUE GENERATED BY THE NEW COMMANDS ACTING OVER THE NEXT T5
# INTERVAL.
#
# IN ORDER TO MAINTAIN ACCURATE KNOWLEDGE OF VEHICLE ANGULAR RATES, WE MUST ALSO PROVIDE EXPECTED FIRING TIMES
# (DFT'S, ALSO IN TERMS OF 1-JET OPERATION) FOR THE RATE FILTER.
# (DFT:S, ALSO IN TERMS OF 1-JET OPERATION) FOR THE RATE FILTER.
#
# NOTE THAT TRANSLATIONS CAN PRODUCE ROTATIONS EVEN THOUGH NO ROTATIONS WERE CALLED FOR. NEVERTHELESS, WE MUST
# UPDATE DFT.
@ -557,7 +557,7 @@ YBLASTOK CA BLAST2 # YAW COMMANDS WILL BE COMPLETED WITHIN
TCF ASMBLWY
# Page 1053
# ROLL ON-TIME CALCULATION:
# ROLL ON-TIME CALCULATION-
ROLLTIME CCS TAU
TCF RBLAST
@ -610,7 +610,7 @@ RBLASTOK CA BLAST
# Page 1054
DEC -.333333 # = -1/3
DEC -.500000 # = -1.2
DEC -.500000 # = -1/2
DEC -.999999 # = -1 (NEGMAX)
NJET DEC 0
DEC .999999 # = +1 (POSMAX)
@ -761,7 +761,7 @@ YBYPASS CA YWORD1
# Page 1059
# SORT THE JET ON-TIMES
#
# AT THIS POINT ALL THE CHANNEL COMMANDS AND JET ON-TIMES HAVE BEEN DETERMINED. IN SUMMARY THESE ARE:
# AT THIS POINT ALL THE CHANNEL COMMANDS AND JET ON-TIMES HAVE BEEN DETERMINED. IN SUMMARY THESE ARE-
#
# RWORD1
# RWORD2 BLAST
@ -787,7 +787,7 @@ T6SETUP CAF ZERO # BRANCH INDEX FOR ROLL
CS BLAST
AD BLAST1
EXTEND
BZMF DXCHT12 # T1 OR T2
BZMF DXCHT12 # T1 GR T2
CHECKT23 CS BLAST1
AD BLAST2
EXTEND
@ -839,7 +839,7 @@ T6START LXCH BANKRUPT
EXTEND
QXCH QRUPT
CCS TIME6 # CHECK TO SEE IF TIME6 WAS RESET
TCF RESUME # AFTER T6RUPT OCCURRED (IN T5RUPT)
TCF RESUME # AFTER T6RUPT OCCURED(IN T5RUPT)
TCF +2 # IF SO WAIT FOR NEXT T6RUPT BEFORE
TCF RESUME # TAKING ACTION
@ -891,8 +891,8 @@ REPLACE2 INDEX BLAST2 +1
TS BLAST2
TCF RESUME
REPLACER CA RWORD2 # INITIALIZE CHANNELS 5,6 WITH WORD2
EXTEND
REPLACER CA RWORD2
EXTEND # INITIALIZE CHANNELS 5,6 WITH WORD2
WRITE CHAN6
TC Q

View File

@ -253,7 +253,6 @@ EXRSTRT INDEX TVCEXPHS # TVCEXECUTIVE RESTARTS....GO TO
INDEX A
TCF 0
# Page 961
# TVC RESTART TABLES.... ORDER IS REQUIRED. HI-ORDER WORDS ONLY, OF 2CADRS, SINCE BBCON IS ALREADY THERE.
TVCADDR = TVCCADR # TABLE OF CADRS, UNUSED LOCS FOR GENADRS