From da661c3b75edd91baeb5422f4dc1cab135b6473f Mon Sep 17 00:00:00 2001 From: Margeaux Spring Date: Tue, 12 Jul 2016 07:55:21 -0400 Subject: [PATCH] Revert "Merge branch 'Margeaux'" This reverts commit 8192348ca498d3d22677e6a19a05a1985d6e300d, reversing changes made to 810ec2cd6f9e6a1b19ce088b828e1532712771f1. undo merge of local branches --- Comanche055/ALARM_AND_ABORT.s | 2 +- Comanche055/CM_BODY_ATTITUDE.s | 2 +- Comanche055/DISPLAY_INTERFACE_ROUTINES.s | 2 +- Comanche055/DOWN-TELEMETRY_PROGRAM.s | 2 +- Comanche055/DOWNLINK_LISTS.s | 2 +- Comanche055/ENTRY_LEXICON.s | 2 +- Comanche055/EXTENDED_VERBS.s | 2 +- Comanche055/FRESH_START_AND_RESTART.s | 2 +- Comanche055/GIMBAL_LOCK_AVOIDANCE.s | 2 +- Comanche055/GROUND_TRACKING_DETERMINATION_PROGRAM.s | 2 +- Comanche055/IMU_CALIBRATION_AND_ALIGNMENT.s | 2 +- Comanche055/INTER-BANK_COMMUNICATION.s | 2 +- Comanche055/INTERRUPT_LEAD_INS.s | 2 +- Comanche055/KALCMANU_STEERING.s | 2 +- Comanche055/KEYRUPT_UPRUPT.s | 2 +- .../LUNAR_AND_SOLAR_EPHEMERIDES_SUBROUTINES.s | 2 +- Comanche055/P34-35_P74-75.s | 2 +- Comanche055/P51-P53.s | 2 +- Comanche055/P61-P67.s | 2 +- Comanche055/PINBALL_NOUN_TABLES.s | 2 +- Comanche055/R31.s | 2 +- Comanche055/RESTARTS_ROUTINE.s | 2 +- Comanche055/RESTART_TABLES.s | 2 +- Comanche055/RT8_OP_CODES.s | 2 +- Comanche055/SERVICER207.s | 2 +- Comanche055/SERVICE_ROUTINES.s | 2 +- Comanche055/SXTMARK.s | 2 +- Comanche055/SYSTEM_TEST_STANDARD_LEAD_INS.s | 2 +- Comanche055/T4RUPT_PROGRAM.s | 2 +- Comanche055/UPDATE_PROGRAM.s | 2 +- Luminary099/LANDING_ANALOG_DISPLAYS.s | 2 +- Luminary099/SERVICER.s | 13 +++++++------ 32 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Comanche055/ALARM_AND_ABORT.s b/Comanche055/ALARM_AND_ABORT.s index de6ba0f4b..bd483b21f 100644 --- a/Comanche055/ALARM_AND_ABORT.s +++ b/Comanche055/ALARM_AND_ABORT.s @@ -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 # diff --git a/Comanche055/CM_BODY_ATTITUDE.s b/Comanche055/CM_BODY_ATTITUDE.s index 9761c8475..048a601bb 100644 --- a/Comanche055/CM_BODY_ATTITUDE.s +++ b/Comanche055/CM_BODY_ATTITUDE.s @@ -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 # diff --git a/Comanche055/DISPLAY_INTERFACE_ROUTINES.s b/Comanche055/DISPLAY_INTERFACE_ROUTINES.s index 0c2e86421..8eb4abada 100644 --- a/Comanche055/DISPLAY_INTERFACE_ROUTINES.s +++ b/Comanche055/DISPLAY_INTERFACE_ROUTINES.s @@ -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 # diff --git a/Comanche055/DOWN-TELEMETRY_PROGRAM.s b/Comanche055/DOWN-TELEMETRY_PROGRAM.s index a21343b5c..f6c60278e 100644 --- a/Comanche055/DOWN-TELEMETRY_PROGRAM.s +++ b/Comanche055/DOWN-TELEMETRY_PROGRAM.s @@ -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 # diff --git a/Comanche055/DOWNLINK_LISTS.s b/Comanche055/DOWNLINK_LISTS.s index 4de2ae17b..e77278658 100644 --- a/Comanche055/DOWNLINK_LISTS.s +++ b/Comanche055/DOWNLINK_LISTS.s @@ -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 # diff --git a/Comanche055/ENTRY_LEXICON.s b/Comanche055/ENTRY_LEXICON.s index 20dfc5cb1..a6920670a 100644 --- a/Comanche055/ENTRY_LEXICON.s +++ b/Comanche055/ENTRY_LEXICON.s @@ -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 # diff --git a/Comanche055/EXTENDED_VERBS.s b/Comanche055/EXTENDED_VERBS.s index a503699cb..aa44901fd 100644 --- a/Comanche055/EXTENDED_VERBS.s +++ b/Comanche055/EXTENDED_VERBS.s @@ -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 # diff --git a/Comanche055/FRESH_START_AND_RESTART.s b/Comanche055/FRESH_START_AND_RESTART.s index b838e34b2..d0be47d6c 100644 --- a/Comanche055/FRESH_START_AND_RESTART.s +++ b/Comanche055/FRESH_START_AND_RESTART.s @@ -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 # diff --git a/Comanche055/GIMBAL_LOCK_AVOIDANCE.s b/Comanche055/GIMBAL_LOCK_AVOIDANCE.s index 9cd871845..779d4c723 100644 --- a/Comanche055/GIMBAL_LOCK_AVOIDANCE.s +++ b/Comanche055/GIMBAL_LOCK_AVOIDANCE.s @@ -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 # diff --git a/Comanche055/GROUND_TRACKING_DETERMINATION_PROGRAM.s b/Comanche055/GROUND_TRACKING_DETERMINATION_PROGRAM.s index de0a10030..bc624d798 100644 --- a/Comanche055/GROUND_TRACKING_DETERMINATION_PROGRAM.s +++ b/Comanche055/GROUND_TRACKING_DETERMINATION_PROGRAM.s @@ -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 # diff --git a/Comanche055/IMU_CALIBRATION_AND_ALIGNMENT.s b/Comanche055/IMU_CALIBRATION_AND_ALIGNMENT.s index 09b179dde..7a49ef34f 100644 --- a/Comanche055/IMU_CALIBRATION_AND_ALIGNMENT.s +++ b/Comanche055/IMU_CALIBRATION_AND_ALIGNMENT.s @@ -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 # diff --git a/Comanche055/INTER-BANK_COMMUNICATION.s b/Comanche055/INTER-BANK_COMMUNICATION.s index 3795b501e..f79019cc6 100644 --- a/Comanche055/INTER-BANK_COMMUNICATION.s +++ b/Comanche055/INTER-BANK_COMMUNICATION.s @@ -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 # diff --git a/Comanche055/INTERRUPT_LEAD_INS.s b/Comanche055/INTERRUPT_LEAD_INS.s index 85fdd14bc..c36ad41d6 100644 --- a/Comanche055/INTERRUPT_LEAD_INS.s +++ b/Comanche055/INTERRUPT_LEAD_INS.s @@ -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 # diff --git a/Comanche055/KALCMANU_STEERING.s b/Comanche055/KALCMANU_STEERING.s index 922f74d09..2156c782b 100644 --- a/Comanche055/KALCMANU_STEERING.s +++ b/Comanche055/KALCMANU_STEERING.s @@ -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 # diff --git a/Comanche055/KEYRUPT_UPRUPT.s b/Comanche055/KEYRUPT_UPRUPT.s index 19493c27f..cfa480dee 100644 --- a/Comanche055/KEYRUPT_UPRUPT.s +++ b/Comanche055/KEYRUPT_UPRUPT.s @@ -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 # diff --git a/Comanche055/LUNAR_AND_SOLAR_EPHEMERIDES_SUBROUTINES.s b/Comanche055/LUNAR_AND_SOLAR_EPHEMERIDES_SUBROUTINES.s index 534fb1ff5..0a072a87e 100644 --- a/Comanche055/LUNAR_AND_SOLAR_EPHEMERIDES_SUBROUTINES.s +++ b/Comanche055/LUNAR_AND_SOLAR_EPHEMERIDES_SUBROUTINES.s @@ -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 # diff --git a/Comanche055/P34-35_P74-75.s b/Comanche055/P34-35_P74-75.s index 0946f97ec..84e6591f6 100644 --- a/Comanche055/P34-35_P74-75.s +++ b/Comanche055/P34-35_P74-75.s @@ -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 # diff --git a/Comanche055/P51-P53.s b/Comanche055/P51-P53.s index 96f4583ef..baf2fbacb 100644 --- a/Comanche055/P51-P53.s +++ b/Comanche055/P51-P53.s @@ -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 # diff --git a/Comanche055/P61-P67.s b/Comanche055/P61-P67.s index 1f308fbae..ced25b3af 100644 --- a/Comanche055/P61-P67.s +++ b/Comanche055/P61-P67.s @@ -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 # diff --git a/Comanche055/PINBALL_NOUN_TABLES.s b/Comanche055/PINBALL_NOUN_TABLES.s index c5d8b7aa5..8fbd97ae8 100644 --- a/Comanche055/PINBALL_NOUN_TABLES.s +++ b/Comanche055/PINBALL_NOUN_TABLES.s @@ -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 # diff --git a/Comanche055/R31.s b/Comanche055/R31.s index 8fef65661..3d11ea5cf 100644 --- a/Comanche055/R31.s +++ b/Comanche055/R31.s @@ -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 # diff --git a/Comanche055/RESTARTS_ROUTINE.s b/Comanche055/RESTARTS_ROUTINE.s index cfe42ea85..fb0de019e 100644 --- a/Comanche055/RESTARTS_ROUTINE.s +++ b/Comanche055/RESTARTS_ROUTINE.s @@ -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 # diff --git a/Comanche055/RESTART_TABLES.s b/Comanche055/RESTART_TABLES.s index 293e119d7..bd25dd2f6 100644 --- a/Comanche055/RESTART_TABLES.s +++ b/Comanche055/RESTART_TABLES.s @@ -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 # diff --git a/Comanche055/RT8_OP_CODES.s b/Comanche055/RT8_OP_CODES.s index 595a0d27d..c823fdb6e 100644 --- a/Comanche055/RT8_OP_CODES.s +++ b/Comanche055/RT8_OP_CODES.s @@ -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 # diff --git a/Comanche055/SERVICER207.s b/Comanche055/SERVICER207.s index 62ccdffa2..f9316be97 100644 --- a/Comanche055/SERVICER207.s +++ b/Comanche055/SERVICER207.s @@ -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 # diff --git a/Comanche055/SERVICE_ROUTINES.s b/Comanche055/SERVICE_ROUTINES.s index 4b89e0937..64479cc54 100644 --- a/Comanche055/SERVICE_ROUTINES.s +++ b/Comanche055/SERVICE_ROUTINES.s @@ -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 # diff --git a/Comanche055/SXTMARK.s b/Comanche055/SXTMARK.s index a3b181ba9..a6ad2178d 100644 --- a/Comanche055/SXTMARK.s +++ b/Comanche055/SXTMARK.s @@ -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 # diff --git a/Comanche055/SYSTEM_TEST_STANDARD_LEAD_INS.s b/Comanche055/SYSTEM_TEST_STANDARD_LEAD_INS.s index fbff01d86..a92f94494 100644 --- a/Comanche055/SYSTEM_TEST_STANDARD_LEAD_INS.s +++ b/Comanche055/SYSTEM_TEST_STANDARD_LEAD_INS.s @@ -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 # diff --git a/Comanche055/T4RUPT_PROGRAM.s b/Comanche055/T4RUPT_PROGRAM.s index a34b5eaa8..e36a18dda 100644 --- a/Comanche055/T4RUPT_PROGRAM.s +++ b/Comanche055/T4RUPT_PROGRAM.s @@ -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 # diff --git a/Comanche055/UPDATE_PROGRAM.s b/Comanche055/UPDATE_PROGRAM.s index 8e70e4195..3b8685708 100644 --- a/Comanche055/UPDATE_PROGRAM.s +++ b/Comanche055/UPDATE_PROGRAM.s @@ -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 # diff --git a/Luminary099/LANDING_ANALOG_DISPLAYS.s b/Luminary099/LANDING_ANALOG_DISPLAYS.s index ede4e48c1..2698ceff3 100644 --- a/Luminary099/LANDING_ANALOG_DISPLAYS.s +++ b/Luminary099/LANDING_ANALOG_DISPLAYS.s @@ -17,7 +17,7 @@ # 2021112-061. July 14, 1969. # # Prepared by -# Massachusetts Institute of Technology +# Massachussets Institute of Technology # 75 Cambridge Parkway # Cambridge, Massachusetts # diff --git a/Luminary099/SERVICER.s b/Luminary099/SERVICER.s index da8a338f5..c3a8f2fe6 100644 --- a/Luminary099/SERVICER.s +++ b/Luminary099/SERVICER.s @@ -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 # @@ -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) @@ -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 @@ -1712,3 +1712,4 @@ SETPOS XCH Q # SAVE INDEX IN Q # Page 897 TC LRADRET +