Skip to content

Commit

Permalink
Revert "Merge branch 'Margeaux'"
Browse files Browse the repository at this point in the history
This reverts commit 8192348, reversing
changes made to 810ec2c.

undo merge of local branches
  • Loading branch information
cheapwebmonkey committed Jul 12, 2016
1 parent 592626c commit da661c3
Show file tree
Hide file tree
Showing 32 changed files with 38 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Comanche055/ALARM_AND_ABORT.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/CM_BODY_ATTITUDE.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/DISPLAY_INTERFACE_ROUTINES.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/DOWN-TELEMETRY_PROGRAM.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/DOWNLINK_LISTS.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/ENTRY_LEXICON.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/EXTENDED_VERBS.s
Expand Up @@ -27,7 +27,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/FRESH_START_AND_RESTART.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/GIMBAL_LOCK_AVOIDANCE.s
Expand Up @@ -18,7 +18,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/GROUND_TRACKING_DETERMINATION_PROGRAM.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/IMU_CALIBRATION_AND_ALIGNMENT.s
Expand Up @@ -21,7 +21,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/INTER-BANK_COMMUNICATION.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/INTERRUPT_LEAD_INS.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/KALCMANU_STEERING.s
Expand Up @@ -18,7 +18,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/KEYRUPT_UPRUPT.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/LUNAR_AND_SOLAR_EPHEMERIDES_SUBROUTINES.s
Expand Up @@ -21,7 +21,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/P34-35_P74-75.s
Expand Up @@ -20,7 +20,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/P51-P53.s
Expand Up @@ -28,7 +28,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/P61-P67.s
Expand Up @@ -23,7 +23,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/PINBALL_NOUN_TABLES.s
Expand Up @@ -20,7 +20,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/R31.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/RESTARTS_ROUTINE.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/RESTART_TABLES.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/RT8_OP_CODES.s
Expand Up @@ -20,7 +20,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/SERVICER207.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/SERVICE_ROUTINES.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/SXTMARK.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/SYSTEM_TEST_STANDARD_LEAD_INS.s
Expand Up @@ -18,7 +18,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/T4RUPT_PROGRAM.s
Expand Up @@ -19,7 +19,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Comanche055/UPDATE_PROGRAM.s
Expand Up @@ -22,7 +22,7 @@
# This AGC program shall also be referred to as Colossus 2A
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
2 changes: 1 addition & 1 deletion Luminary099/LANDING_ANALOG_DISPLAYS.s
Expand Up @@ -17,7 +17,7 @@
# 2021112-061. July 14, 1969.
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down
13 changes: 7 additions & 6 deletions Luminary099/SERVICER.s
Expand Up @@ -12,14 +12,14 @@
# 2009-06-05 RSB Fixed a couple of typos, plus a goofy relative
# label reference from the original source.
#
# The contents of the "Luminary099" files, in general, are transcribed
# from scanned documents.
# The contents of the "Luminary099" files, in general, are transcribed
# from scanned documents.
#
# Assemble revision 001 of AGC program Luminary099 by NASA
# 2021112-061. July 14, 1969.
# 2021112-061. July 14, 1969.
#
# Prepared by
# Massachusetts Institute of Technology
# Massachussets Institute of Technology
# 75 Cambridge Parkway
# Cambridge, Massachusetts
#
Expand Down Expand Up @@ -710,7 +710,7 @@ HIGATASK INHINT
2CADR HIGATJOB

TCF CONTSERV # CONTINUE SERVICER

# Page 874
# MUNRETRN IS THE RETURN LOC FROM SPECIAL AVE G ROUTINE (MUNRVG)

Expand Down Expand Up @@ -769,7 +769,7 @@ HIGATCHK CA TTF/8 # IS TTF > CRITERION? (TTF IS NEGATIVE)
POS1CHK CAF BIT6 # HIGATE NOT IN SIGHT -- DO POS1 CHK
EXTEND
RAND 33
EXTEND
EXTEND
BZF UPDATCHK # LR IN POS1 -- CHECK FOR LR UPDATE

LRPOSALM TC ALARM # LR NOT IN PROPER POS-ALARM-BYPASS UPDATE
Expand Down Expand Up @@ -1712,3 +1712,4 @@ SETPOS XCH Q # SAVE INDEX IN Q

# Page 897
TC LRADRET

0 comments on commit da661c3

Please sign in to comment.