From af467aa931b8110fd1094a74dfbf6c355265bb83 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 23 Sep 2022 00:14:43 -0400 Subject: [PATCH 01/51] impliment normal bias drift for IMU --- Orbitersdk/samples/ProjectApollo/src_sys/IMU.h | 2 ++ Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index ac05ea151d..62b654dbf8 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -38,6 +38,8 @@ class IMU { IMU(ApolloGuidance &comp, PanelSDK &p, InertialData &inertialData); ~IMU(); + const double MERU = 7.292115E-8; //rad/sec + void Init(); void ChannelOutput(int address, ChannelValue value); void Timestep(double simdt); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 2682c46f85..1f7891c9ca 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -413,11 +413,14 @@ void IMU::Timestep(double simdt) // calculate the new gimbal angles VECTOR3 newAngles = getRotationAnglesXZY(t); + //Drift rates + double NBD = 0.3 * MERU * simdt; //normal bias drift + // drive gimbals to new angles // CAUTION: gimbal angles are left-handed - DriveGimbalX(-newAngles.x - Gimbal.X); - DriveGimbalY(-newAngles.y - Gimbal.Y); - DriveGimbalZ(-newAngles.z - Gimbal.Z); + DriveGimbalX(-newAngles.x - Gimbal.X + NBD); + DriveGimbalY(-newAngles.y - Gimbal.Y + NBD); + DriveGimbalZ(-newAngles.z - Gimbal.Z + NBD); // PIPAs VECTOR3 accel; From 150a84b164efe0af55861c297b0c223a11505f2a Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 24 Sep 2022 01:36:39 -0400 Subject: [PATCH 02/51] compute and drive gimbals from drift --- .../samples/ProjectApollo/src_sys/IMU.h | 12 ++++++++ .../samples/ProjectApollo/src_sys/imu.cpp | 28 +++++++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index 62b654dbf8..c0790abdbb 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -132,6 +132,18 @@ class IMU { double Z; } RemainingPIPA; + struct { + double NBD_X; + double NBD_Y; + double NBD_Z; + double ADSRA_X; + double ADSRA_Y; + double ADSRA_Z; + double ADIA_X; + double ADIA_Y; + double ADIA_Z; + } IMU_DriftRates; + struct { MATRIX3 Attitude_v2g; MATRIX3 Attitude_g2v; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 1f7891c9ca..a2811fda0f 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -75,6 +75,16 @@ void IMU::Init() Gimbal.Y = 0; Gimbal.Z = 0; + IMU_DriftRates.NBD_X = 0.0; + IMU_DriftRates.NBD_Y = 0.0; + IMU_DriftRates.NBD_Z = 0.0; + IMU_DriftRates.ADSRA_X = 0.0; + IMU_DriftRates.ADSRA_Y = 0.0; + IMU_DriftRates.ADSRA_Z = 0.0; + IMU_DriftRates.ADIA_X = 0.0; + IMU_DriftRates.ADIA_Y = 0.0; + IMU_DriftRates.ADIA_Z = 0.0; + Orbiter.Attitude_v2g = _M(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); Orbiter.Attitude_g2v = _M(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); Orbiter.AttitudeReference = _M(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); @@ -413,14 +423,11 @@ void IMU::Timestep(double simdt) // calculate the new gimbal angles VECTOR3 newAngles = getRotationAnglesXZY(t); - //Drift rates - double NBD = 0.3 * MERU * simdt; //normal bias drift - // drive gimbals to new angles // CAUTION: gimbal angles are left-handed - DriveGimbalX(-newAngles.x - Gimbal.X + NBD); - DriveGimbalY(-newAngles.y - Gimbal.Y + NBD); - DriveGimbalZ(-newAngles.z - Gimbal.Z + NBD); + DriveGimbalX(-newAngles.x - Gimbal.X); + DriveGimbalY(-newAngles.y - Gimbal.Y); + DriveGimbalZ(-newAngles.z - Gimbal.Z); // PIPAs VECTOR3 accel; @@ -440,6 +447,15 @@ void IMU::Timestep(double simdt) pulses = RemainingPIPA.Z + (accel.z * LastSimDT / pipaRate); PulsePIPA(RegPIPAZ, (int) pulses); RemainingPIPA.Z = pulses - (int) pulses; + + //IMU Drift calculation + double X_drift = (IMU_DriftRates.NBD_X - (IMU_DriftRates.ADSRA_X * accel.y / 9.80665) + (IMU_DriftRates.ADIA_X * accel.x / 9.80665)) * simdt; + double Y_drift = (IMU_DriftRates.NBD_Y - (IMU_DriftRates.ADSRA_Y * accel.z / 9.80665) + (IMU_DriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; + double Z_drift = (IMU_DriftRates.NBD_Z + (IMU_DriftRates.ADSRA_Z * accel.y / 9.80665) + (IMU_DriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; + + DriveGimbalX(-X_drift - Gimbal.X); + DriveGimbalY(-Y_drift - Gimbal.Y); + DriveGimbalZ(-Z_drift - Gimbal.Z); } LastSimDT = simdt; } From a949ffbf4154a0e1962abc7e87456164cf11ae03 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 25 Sep 2022 00:21:44 -0400 Subject: [PATCH 03/51] add data structures and loading for drift rates and biases --- .../samples/ProjectApollo/src_aux/Mission.cpp | 48 +++++++++++++++++++ .../samples/ProjectApollo/src_aux/Mission.h | 10 ++++ .../samples/ProjectApollo/src_sys/IMU.h | 35 +++++++++----- .../samples/ProjectApollo/src_sys/imu.cpp | 40 ++++++++++------ 4 files changed, 107 insertions(+), 26 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 6d6c9edacb..7403cfa977 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -111,6 +111,15 @@ namespace mission { iCMtoLMPowerConnectionVersion = 0; EmptySMCG = _V(914.5916, -6.6712, 12.2940); //Includes: empty SM and SLA ring, but no SM RCS bHasRateAidedOptics = false; + + CM_IMUDriftRates = _M(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + CM_PIPABias = _V(0.0, 0.0, 0.0); + CM_PIPAScale = _V(0.0, 0.0, 0.0); + + LM_IMUDriftRates = _M(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + LM_PIPABias = _V(0.0, 0.0, 0.0);; + LM_PIPAScale = _V(0.0, 0.0, 0.0); + iLMCWEAVersion = 0; bCrossPointerReversePolarity = false; bCrossPointerShades = false; iLMNumber = 5; //LM-5 @@ -309,11 +318,50 @@ namespace mission { ReadCueCardLine(line + 10, 1); } } + LoadIMU_AndPIPA_RatesAndBiases(hFile); hFile.close(); return true; } + void Mission::LoadIMU_AndPIPA_RatesAndBiases(FILEHANDLE hFile) { + oapiReadItem_float(hFile, "CMNBDX", CM_IMUDriftRates.m11); + oapiReadItem_float(hFile, "CMNBDY", CM_IMUDriftRates.m12); + oapiReadItem_float(hFile, "CMNBDZ", CM_IMUDriftRates.m13); + oapiReadItem_float(hFile, "CMADSRAX", CM_IMUDriftRates.m21); + oapiReadItem_float(hFile, "CMADSRAY", CM_IMUDriftRates.m22); + oapiReadItem_float(hFile, "CMADSRAZ", CM_IMUDriftRates.m23); + oapiReadItem_float(hFile, "CMADIAX", CM_IMUDriftRates.m31); + oapiReadItem_float(hFile, "CMADIAY", CM_IMUDriftRates.m32); + oapiReadItem_float(hFile, "CMADIAZ", CM_IMUDriftRates.m33); + + oapiReadItem_float(hFile, "CMPIPABIASX", CM_PIPABias.x); + oapiReadItem_float(hFile, "CMPIPABIASY", CM_PIPABias.y); + oapiReadItem_float(hFile, "CMPIPABIASZ", CM_PIPABias.z); + + oapiReadItem_float(hFile, "CMPIPASCALEX", CM_PIPAScale.x); + oapiReadItem_float(hFile, "CMPIPASCALEY", CM_PIPAScale.y); + oapiReadItem_float(hFile, "CMPIPASCALEZ", CM_PIPAScale.z); + + oapiReadItem_float(hFile, "LMNBDX", LM_IMUDriftRates.m11); + oapiReadItem_float(hFile, "LMNBDY", LM_IMUDriftRates.m12); + oapiReadItem_float(hFile, "LMNBDZ", LM_IMUDriftRates.m13); + oapiReadItem_float(hFile, "LMADSRAX", LM_IMUDriftRates.m21); + oapiReadItem_float(hFile, "LMADSRAY", LM_IMUDriftRates.m22); + oapiReadItem_float(hFile, "LMADSRAZ", LM_IMUDriftRates.m23); + oapiReadItem_float(hFile, "LMADIAX", LM_IMUDriftRates.m31); + oapiReadItem_float(hFile, "LMADIAY", LM_IMUDriftRates.m32); + oapiReadItem_float(hFile, "LMADIAZ", LM_IMUDriftRates.m33); + + oapiReadItem_float(hFile, "LMPIPABIASX", LM_PIPABias.x); + oapiReadItem_float(hFile, "LMPIPABIASY", LM_PIPABias.y); + oapiReadItem_float(hFile, "LMPIPABIASZ", LM_PIPABias.z); + + oapiReadItem_float(hFile, "LMPIPASCALEX", LM_PIPAScale.x); + oapiReadItem_float(hFile, "LMPIPASCALEY", LM_PIPAScale.y); + oapiReadItem_float(hFile, "LMPIPASCALEZ", LM_PIPAScale.z); + } + const std::string& Mission::GetMissionName(void) const { return strFileName; diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h index 92cd17bafe..75fdc4c4fb 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h @@ -161,6 +161,16 @@ namespace mission double dTEPHEM0; int iLMNumber; + MATRIX3 CM_IMUDriftRates; + VECTOR3 CM_PIPABias; + VECTOR3 CM_PIPAScale; + + MATRIX3 LM_IMUDriftRates; + VECTOR3 LM_PIPABias; + VECTOR3 LM_PIPAScale; + + void Mission::LoadIMU_AndPIPA_RatesAndBiases(FILEHANDLE hFile); + void SetDefaultValues(); }; } diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index c0790abdbb..bac14487b5 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -64,6 +64,28 @@ class IMU { void LoadState(FILEHANDLE scn); void SaveState(FILEHANDLE scn); + + typedef struct { + double NBD_X; + double NBD_Y; + double NBD_Z; + double ADSRA; + double ADSRA_Y; + double ADSRA_Z; + double ADIA_X; + double ADIA_Y; + double ADIA_Z; + } IMU_DriftRates; + + typedef struct { + double PIPA_BiasX; + double PIPA_BiasY; + double PIPA_BiasZ; + double PIPA_ScalePPM_X; + double PIPA_ScalePPM_Y; + double PIPA_ScalePPM_Z; + } PIPA_BiasScale; + protected: void DriveCDUX(int cducmd); @@ -132,17 +154,8 @@ class IMU { double Z; } RemainingPIPA; - struct { - double NBD_X; - double NBD_Y; - double NBD_Z; - double ADSRA_X; - double ADSRA_Y; - double ADSRA_Z; - double ADIA_X; - double ADIA_Y; - double ADIA_Z; - } IMU_DriftRates; + IMU_DriftRates imuDriftRates; + PIPA_BiasScale pipaBiasScale; struct { MATRIX3 Attitude_v2g; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index a2811fda0f..5a499e867b 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -75,15 +75,24 @@ void IMU::Init() Gimbal.Y = 0; Gimbal.Z = 0; - IMU_DriftRates.NBD_X = 0.0; - IMU_DriftRates.NBD_Y = 0.0; - IMU_DriftRates.NBD_Z = 0.0; - IMU_DriftRates.ADSRA_X = 0.0; - IMU_DriftRates.ADSRA_Y = 0.0; - IMU_DriftRates.ADSRA_Z = 0.0; - IMU_DriftRates.ADIA_X = 0.0; - IMU_DriftRates.ADIA_Y = 0.0; - IMU_DriftRates.ADIA_Z = 0.0; + imuDriftRates.NBD_X = 0.0; + imuDriftRates.NBD_Y = 0.0; + imuDriftRates.NBD_Z = 0.0; + imuDriftRates.ADSRA_X = 0.0; + imuDriftRates.ADSRA_Y = 0.0; + imuDriftRates.ADSRA_Z = 0.0; + imuDriftRates.ADIA_X = 0.0; + imuDriftRates.ADIA_Y = 0.0; + imuDriftRates.ADIA_Z = 0.0; + + + pipaBiasScale.PIPA_BiasX = 0.0;; + pipaBiasScale.PIPA_BiasY = 0.0;; + pipaBiasScale.PIPA_BiasZ = 0.0;; + pipaBiasScale.PIPA_ScalePPM_X = 0.0;; + pipaBiasScale.PIPA_ScalePPM_Y = 0.0;; + pipaBiasScale.PIPA_ScalePPM_Z = 0.0;; + Orbiter.Attitude_v2g = _M(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); Orbiter.Attitude_g2v = _M(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); @@ -435,6 +444,10 @@ void IMU::Timestep(double simdt) accel = mul(Orbiter.Attitude_v2g, -accel); accel = tmul(Orbiter.AttitudeReference, accel); + accel.x += pipaBiasScale.PIPA_BiasX + accel.x * pipaBiasScale.PIPA_ScalePPM_X; + accel.y += pipaBiasScale.PIPA_BiasY + accel.y * pipaBiasScale.PIPA_ScalePPM_Y; + accel.z += pipaBiasScale.PIPA_BiasZ + accel.z * pipaBiasScale.PIPA_ScalePPM_Z; + // pulse PIPAs pulses = RemainingPIPA.X + (accel.x * LastSimDT / pipaRate); PulsePIPA(RegPIPAX, (int) pulses); @@ -449,13 +462,10 @@ void IMU::Timestep(double simdt) RemainingPIPA.Z = pulses - (int) pulses; //IMU Drift calculation - double X_drift = (IMU_DriftRates.NBD_X - (IMU_DriftRates.ADSRA_X * accel.y / 9.80665) + (IMU_DriftRates.ADIA_X * accel.x / 9.80665)) * simdt; - double Y_drift = (IMU_DriftRates.NBD_Y - (IMU_DriftRates.ADSRA_Y * accel.z / 9.80665) + (IMU_DriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; - double Z_drift = (IMU_DriftRates.NBD_Z + (IMU_DriftRates.ADSRA_Z * accel.y / 9.80665) + (IMU_DriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; + Gimbal.X -= (imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; + Gimbal.Y -= (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; + Gimbal.Z -= (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; - DriveGimbalX(-X_drift - Gimbal.X); - DriveGimbalY(-Y_drift - Gimbal.Y); - DriveGimbalZ(-Z_drift - Gimbal.Z); } LastSimDT = simdt; } From bcde589d2ac107fcf53ef4715519a0aed425c797 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 25 Sep 2022 00:29:59 -0400 Subject: [PATCH 04/51] add get functions --- .../samples/ProjectApollo/src_aux/Mission.cpp | 24 +++++++++++++++++++ .../samples/ProjectApollo/src_aux/Mission.h | 14 +++++++++++ 2 files changed, 38 insertions(+) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 7403cfa977..3efbfc7c35 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -362,6 +362,30 @@ namespace mission { oapiReadItem_float(hFile, "LMPIPASCALEZ", LM_PIPAScale.z); } + MATRIX3 Mission::GetCM_IMU_Drift() const { + return CM_IMUDriftRates; + } + + MATRIX3 Mission::GetLM_IMU_Drift() const { + return LM_IMUDriftRates; + } + + VECTOR3 Mission::GetCM_PIPA_Bias() const { + return CM_PIPABias; + } + + VECTOR3 Mission::GetLM_PIPA_Bias() const { + return LM_PIPABias; + } + + VECTOR3 Mission::GetCM_PIPA_Scale() const { + return CM_PIPAScale; + } + + VECTOR3 Mission::GetLM_PIPA_Scale() const { + return LM_PIPAScale; + } + const std::string& Mission::GetMissionName(void) const { return strFileName; diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h index 75fdc4c4fb..eb553aef6a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h @@ -89,6 +89,20 @@ namespace mission VECTOR3 GetCGOfEmptySM() const; //false = Optics mode switch is not bypassed for CMC to optics commands, true = optics mode switch is bypassed for CMC to optics commands (ECP 792) bool HasRateAidedOptics() const; + // + MATRIX3 GetCM_IMU_Drift() const; + // + MATRIX3 GetLM_IMU_Drift() const; + // + VECTOR3 GetCM_PIPA_Bias() const; + // + VECTOR3 GetLM_PIPA_Bias() const; + // + VECTOR3 GetCM_PIPA_Scale() const; + // + VECTOR3 GetLM_PIPA_Scale() const; + //0 = LM-7 and before (ASC PRESS LOW before staging, RCS for HEATER FAILURE CAUTION), 1 = LM-8 and after (both cut and capped) + int GetLMCWEAVersion() const; //false = Normal polarity (Apollo 14 and earlier), Lateral axis for PGNS and LR input has switched polarity (Apollo 15 and later) bool GetCrossPointerReversePolarity() const; //false = No shades (Apollo 15 and earlier), Shades (Apollo 16 & 17) From 2471ace16e094cbc2429aaea986becb6b07b4b60 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 23 Apr 2023 01:37:01 -0400 Subject: [PATCH 05/51] fix loading and drift, compensation not working correctly --- Missions/ProjectApollo/Apollo 11.cfg | 9 ++++++ .../samples/ProjectApollo/src_csm/saturn.cpp | 7 +++-- .../samples/ProjectApollo/src_sys/IMU.h | 5 +++- .../samples/ProjectApollo/src_sys/imu.cpp | 30 +++++++++++++++---- .../Apollo 11 - Launch.scn | 6 ++-- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 11.cfg b/Missions/ProjectApollo/Apollo 11.cfg index 6b8cae4d94..99099f4e2d 100644 --- a/Missions/ProjectApollo/Apollo 11.cfg +++ b/Missions/ProjectApollo/Apollo 11.cfg @@ -9,4 +9,13 @@ LMPVesselName=Buzz Aldrin CDRSuitName=N. ARMSTRONG CMPSuitName=M. COLLINS LMPSuitName=E. ALDRIN +CMNBDX=-1.8 +CMNBDY=-0.6 +CMNBDZ=-0.2 +CMADSRAX=0.0 +CMADSRAY=0.0 +CMADSRAZ=0.0 +CMADIAX=0.0 +CMADIAY=0.0 +CMADIAZ=0.0 CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 3a0452b746..05930484e1 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -1542,8 +1542,11 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) // // Subclass specific handling // - + VECTOR3 ATTITUDEFORTESTING = imu.GetTotalAttitude(); + VECTOR3 DRIFTRATEFORTESTING = imu.GetNBDriftRates(); + sprintf(oapiDebugString(), "%0.10f, %0.10f, %0.10f, %0.10f, %0.10f, %0.10f", ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z); Timestep(simt, simdt, mjd); + sprintf(buffer, "End time(0) %lld", time(0)); TRACE(buffer); @@ -2772,7 +2775,7 @@ void Saturn::GetScenarioState (FILEHANDLE scn, void *vstatus) // agc.SetMissionInfo(pMission->GetCMCVersion(), PayloadName); - + imu.SetDriftRates(pMission->GetCM_IMU_Drift()); secs.SetSaturnType(SaturnType); // diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index bac14487b5..dadce01544 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -49,6 +49,9 @@ class IMU { void DriveGimbals(double x, double y, double z); void SetVessel(VESSEL *v, bool LEMFlag); void SetVesselFlag(bool LEMFlag); + void SetDriftRates(const MATRIX3 DriftRateMatrix); + VECTOR3 GetNBDriftRates(); + VECTOR3 GetTotalAttitude(); virtual VECTOR3 GetTotalAttitude(); void WireToBuses(e_object *a, e_object *b, GuardedToggleSwitch *s); @@ -69,7 +72,7 @@ class IMU { double NBD_X; double NBD_Y; double NBD_Z; - double ADSRA; + double ADSRA_X; double ADSRA_Y; double ADSRA_Z; double ADIA_X; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 5a499e867b..5af0d332ea 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -129,6 +129,26 @@ void IMU::SetVesselFlag(bool LEMFlag) LEM = LEMFlag; } +void IMU::SetDriftRates(const MATRIX3 DriftRateMatrix) +{ + imuDriftRates.NBD_X = DriftRateMatrix.m11 * MERU; + imuDriftRates.NBD_Y = DriftRateMatrix.m12 * MERU; + imuDriftRates.NBD_Z = DriftRateMatrix.m13 * MERU; + + imuDriftRates.ADSRA_X = DriftRateMatrix.m21; + imuDriftRates.ADSRA_Y = DriftRateMatrix.m22; + imuDriftRates.ADSRA_Z = DriftRateMatrix.m23; + + imuDriftRates.ADIA_X = DriftRateMatrix.m31; + imuDriftRates.ADIA_Y = DriftRateMatrix.m32; + imuDriftRates.ADIA_Z = DriftRateMatrix.m33; +} + +VECTOR3 IMU::GetNBDriftRates() +{ + return _V(imuDriftRates.NBD_X, imuDriftRates.NBD_Y, imuDriftRates.NBD_Z); +} + bool IMU::IsCaged() { @@ -407,7 +427,7 @@ void IMU::Timestep(double simdt) // orbiter earth rotation //imuState->Orbiter.Y = imuState->Orbiter.Y + (deltaTime * TwoPI / 86164.09); - + // Process channel bits val12 = agc.GetOutputChannel(012); if (val12[ZeroIMUCDUs]) { @@ -462,10 +482,10 @@ void IMU::Timestep(double simdt) RemainingPIPA.Z = pulses - (int) pulses; //IMU Drift calculation - Gimbal.X -= (imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; - Gimbal.Y -= (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; - Gimbal.Z -= (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; - + DriveGimbalX((imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt); + DriveGimbalY((imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt); + DriveGimbalZ((imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt); + SetOrbiterAttitudeReference(); } LastSimDT = simdt; } diff --git a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn index 2252c17eb6..fde6f7a431 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn @@ -671,9 +671,9 @@ Columbia:ProjectApollo\Saturn5 CMPAD1455 0 CMPAD1456 0 CMPAD1457 0 - CMPAD1460 0 - CMPAD1461 0 - CMPAD1462 0 + CMPAD1460 77432 + CMPAD1461 77663 + CMPAD1462 77746 CMPAD1463 0 CMPAD1464 0 CMPAD1465 0 From 84a7fa111d2c4b16a1a1f02fda61fe0e0380583e Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 23 Apr 2023 21:51:00 -0400 Subject: [PATCH 06/51] add resolver phase angle to CSM telemetry --- .../ProjectApollo/src_csm/csm_telecom.cpp | 6 ++-- .../samples/ProjectApollo/src_csm/saturn.cpp | 7 +++- .../samples/ProjectApollo/src_sys/IMU.h | 13 +++++-- .../samples/ProjectApollo/src_sys/imu.cpp | 35 +++++++++++++++++++ .../samples/ProjectApollo/src_sys/imumath.cpp | 9 +++++ 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp index c3001a6627..8e7cabe670 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp @@ -2888,11 +2888,11 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 12: // S12A switch(ccode){ case 1: // MGA SERVO ERR IN PHASE - return(scale_data(0,-2.5,2.5)); + return(scale_data(sat->imu.getResolverPhaseError().x,-2.5,2.5)); case 2: // IGA SERVO ERR IN PHASE - return(scale_data(0,-2.5,2.5)); + return(scale_data(sat->imu.getResolverPhaseError().y,-2.5,2.5)); case 3: // OGA SERVO ERR IN PHASE - return(scale_data(0,-2.5,2.5)); + return(scale_data(sat->imu.getResolverPhaseError().z,-2.5,2.5)); case 4: // ROLL ATT ERR return(scale_data(sat->eda.GetConditionedRollAttErr(), 0.0, 5.0)); case 5: // SCS PITCH BODY RATE diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 05930484e1..e5c70a5fd0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -1544,7 +1544,12 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) // VECTOR3 ATTITUDEFORTESTING = imu.GetTotalAttitude(); VECTOR3 DRIFTRATEFORTESTING = imu.GetNBDriftRates(); - sprintf(oapiDebugString(), "%0.10f, %0.10f, %0.10f, %0.10f, %0.10f, %0.10f", ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z); + VECTOR3 IMURESOLVERPHASEERROR = imu.getResolverPhaseError(); + sprintf(oapiDebugString(), "<%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>", + ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, + DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z, + IMURESOLVERPHASEERROR.x, IMURESOLVERPHASEERROR.y, IMURESOLVERPHASEERROR.z); + Timestep(simt, simdt, mjd); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index dadce01544..810c6ac758 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -35,7 +35,7 @@ class IMU { public: - IMU(ApolloGuidance &comp, PanelSDK &p, InertialData &inertialData); + IMU(ApolloGuidance& comp, PanelSDK& p, InertialData& inertialData); ~IMU(); const double MERU = 7.292115E-8; //rad/sec @@ -43,15 +43,16 @@ class IMU { void Init(); void ChannelOutput(int address, ChannelValue value); void Timestep(double simdt); - void SystemTimestep(double simdt); + void SystemTimestep(double simdt); void TurnOn(); void TurnOff(); void DriveGimbals(double x, double y, double z); - void SetVessel(VESSEL *v, bool LEMFlag); + void SetVessel(VESSEL* v, bool LEMFlag); void SetVesselFlag(bool LEMFlag); void SetDriftRates(const MATRIX3 DriftRateMatrix); VECTOR3 GetNBDriftRates(); VECTOR3 GetTotalAttitude(); + inline VECTOR3 getResolverPhaseError() { return ResolverPhaseError; }; virtual VECTOR3 GetTotalAttitude(); void WireToBuses(e_object *a, e_object *b, GuardedToggleSwitch *s); @@ -103,6 +104,7 @@ class IMU { void SetOrbiterAttitudeReference(); void DoZeroIMUCDUs(); void DoZeroIMUGimbals(); + void calculatePhase(const VECTOR3 NewAngles); // // Logging. @@ -128,6 +130,7 @@ class IMU { double radToDeg(double angle); double gyroPulsesToRad(int pulses); int radToGyroPulses(double angle); + void clampTo2pi(double angle); MATRIX3 getNavigationBaseToOrbiterLocalTransformation(); MATRIX3 getOrbiterLocalToNavigationBaseTransformation(); @@ -151,6 +154,10 @@ class IMU { double Gimbals[3]; }; + VECTOR3 SineGimbal; + VECTOR3 CosineGimbal; + VECTOR3 ResolverPhaseError; + struct { double X; double Y; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 5af0d332ea..2b12eed566 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -452,6 +452,8 @@ void IMU::Timestep(double simdt) // calculate the new gimbal angles VECTOR3 newAngles = getRotationAnglesXZY(t); + calculatePhase(newAngles); + // drive gimbals to new angles // CAUTION: gimbal angles are left-handed DriveGimbalX(-newAngles.x - Gimbal.X); @@ -660,6 +662,39 @@ void IMU::DoZeroIMUGimbals() SetOrbiterAttitudeReference(); } +void IMU::calculatePhase(const VECTOR3 NewAngles) +{ + SineGimbal.x = Gimbal.X - degToRad(50.0); + clampTo2pi(SineGimbal.x); + + SineGimbal.y = Gimbal.Y - degToRad(50.0); + clampTo2pi(SineGimbal.y); + + SineGimbal.z = Gimbal.Z - degToRad(50.0); + clampTo2pi(SineGimbal.z); + + CosineGimbal.x = Gimbal.X + degToRad(130.0); + clampTo2pi(CosineGimbal.x); + + CosineGimbal.y = Gimbal.Y + degToRad(130.0); + clampTo2pi(CosineGimbal.y); + + CosineGimbal.z = Gimbal.Z + degToRad(130.0); + clampTo2pi(CosineGimbal.z); + + ResolverPhaseError.x = (-NewAngles.x - Gimbal.X); + ResolverPhaseError.y = (-NewAngles.y - Gimbal.Y); + ResolverPhaseError.z = (-NewAngles.z - Gimbal.Z); + + if (ResolverPhaseError.x < -PI) { ResolverPhaseError.x = - (TWO_PI + ResolverPhaseError.x); } + if (ResolverPhaseError.y < -PI) { ResolverPhaseError.y = - (TWO_PI + ResolverPhaseError.y); } + if (ResolverPhaseError.z < -PI) { ResolverPhaseError.z = - (TWO_PI + ResolverPhaseError.z); } + + ResolverPhaseError.x *= 1000.0; + ResolverPhaseError.y *= 1000.0; + ResolverPhaseError.z *= 1000.0; +} + VECTOR3 IMU::GetTotalAttitude() { diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imumath.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imumath.cpp index a91111630e..696891a708 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imumath.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imumath.cpp @@ -59,6 +59,15 @@ int IMU::radToGyroPulses(double angle) { return (int)((angle * 2097152.0) / TWO_PI); } +void IMU::clampTo2pi(double angle) { + if (angle >= TWO_PI) { + angle -= TWO_PI; + } + if (angle < 0.0) { + angle += TWO_PI; + } +} + MATRIX3 IMU::getRotationMatrixX(double angle) { // Returns the rotation matrix for a rotation of a given angle around the X axis (Pitch) From fd6bee4a9098e7442d734a0b1fff75a83e6cb172 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Thu, 27 Apr 2023 00:41:48 -0400 Subject: [PATCH 07/51] fix drift rate coordinate system (about vessel ax) may need fix --- .../ProjectApollo/src_csm/satsystems.cpp | 3 ++ .../samples/ProjectApollo/src_csm/saturn.cpp | 4 +- .../samples/ProjectApollo/src_sys/IMU.h | 2 +- .../samples/ProjectApollo/src_sys/imu.cpp | 42 +++++++++++-------- ...llo 11 - 20 - Before MCC-6 T+171h54min.scn | 3 ++ 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp index 9f46304972..7ff758cd03 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp @@ -44,6 +44,8 @@ //FILE *PanelsdkLogFile; +FILE *IMUDriftLogger; + void Saturn::SystemsInit() { @@ -57,6 +59,7 @@ void Saturn::SystemsInit() { Panelsdk.InitFromFile("ProjectApollo\\SaturnSystems"); //PanelsdkLogFile = fopen("ProjectApollo Saturn Systems.log", "w"); + IMUDriftLogger = fopen("IMUDriftLogger.log", "w"); // // Electrical systems. diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index e5c70a5fd0..0dc78c12ac 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -72,6 +72,7 @@ extern "C" { using namespace nassp; //extern FILE *PanelsdkLogFile; +extern FILE* IMUDriftLogger; #define CSM_AXIS_INPUT_CNT 53 VesimInputDefinition vesim_csm_inputs[CSM_AXIS_INPUT_CNT] = { @@ -1549,7 +1550,8 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z, IMURESOLVERPHASEERROR.x, IMURESOLVERPHASEERROR.y, IMURESOLVERPHASEERROR.z); - + fprintf(IMUDriftLogger, "%0.10f, %0.10f, %0.10f, %0.10f\n", simt, ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z); + fflush(IMUDriftLogger); Timestep(simt, simdt, mjd); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index 810c6ac758..7f967d5f5d 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -38,7 +38,7 @@ class IMU { IMU(ApolloGuidance& comp, PanelSDK& p, InertialData& inertialData); ~IMU(); - const double MERU = 7.292115E-8; //rad/sec + const double MERU = 7.29211586E-8; //rad/sec void Init(); void ChannelOutput(int address, ChannelValue value); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 2b12eed566..d2a0383c90 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -444,14 +444,31 @@ void IMU::Timestep(double simdt) TRACE("CHANNEL 12 NORMAL"); + // PIPAs + VECTOR3 accel; + inertialData.getAcceleration(accel); + accel = mul(Orbiter.Attitude_v2g, -accel); + accel = tmul(Orbiter.AttitudeReference, accel); + + //IMU Drift calculation + double DriftX = (imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; + double DriftY = (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; + double DriftZ = (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; + + MATRIX3 DriftXRot, DriftYRot, DriftZRot; + GetRotMatrixX(-DriftX, DriftXRot); + GetRotMatrixY(-DriftY, DriftYRot); + GetRotMatrixZ(DriftZ, DriftZRot); + // Gimbals - MATRIX3 t = Orbiter.AttitudeReference; - t = mul(Orbiter.Attitude_g2v, t); - t = mul(getOrbiterLocalToNavigationBaseTransformation(), t); - + MATRIX3 vesselTransform = mul(Orbiter.Attitude_g2v, Orbiter.AttitudeReference); + MATRIX3 DriftTransform = mul(DriftXRot,mul(DriftYRot, DriftZRot)); + MATRIX3 StableMemberTransform = mul(getOrbiterLocalToNavigationBaseTransformation(), mul(vesselTransform, DriftTransform)); // calculate the new gimbal angles - VECTOR3 newAngles = getRotationAnglesXZY(t); - + VECTOR3 newAngles = getRotationAnglesXZY(StableMemberTransform); + VECTOR3 DriftAngles = getRotationAnglesXZY(DriftTransform); + + //Calculate resolver outputs before the gimbals get moved to their new position calculatePhase(newAngles); // drive gimbals to new angles @@ -459,12 +476,7 @@ void IMU::Timestep(double simdt) DriveGimbalX(-newAngles.x - Gimbal.X); DriveGimbalY(-newAngles.y - Gimbal.Y); DriveGimbalZ(-newAngles.z - Gimbal.Z); - - // PIPAs - VECTOR3 accel; - inertialData.getAcceleration(accel); - accel = mul(Orbiter.Attitude_v2g, -accel); - accel = tmul(Orbiter.AttitudeReference, accel); + SetOrbiterAttitudeReference(); accel.x += pipaBiasScale.PIPA_BiasX + accel.x * pipaBiasScale.PIPA_ScalePPM_X; accel.y += pipaBiasScale.PIPA_BiasY + accel.y * pipaBiasScale.PIPA_ScalePPM_Y; @@ -482,12 +494,6 @@ void IMU::Timestep(double simdt) pulses = RemainingPIPA.Z + (accel.z * LastSimDT / pipaRate); PulsePIPA(RegPIPAZ, (int) pulses); RemainingPIPA.Z = pulses - (int) pulses; - - //IMU Drift calculation - DriveGimbalX((imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt); - DriveGimbalY((imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt); - DriveGimbalZ((imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt); - SetOrbiterAttitudeReference(); } LastSimDT = simdt; } diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn index 73a67b8e6b..b0070b18d8 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn @@ -697,6 +697,9 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 From 12cddc29b0d22c0c97fc608a517f05175b473cbf Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 28 Apr 2023 00:28:10 -0400 Subject: [PATCH 08/51] fix axis order; Apollo 11 test with rates that match padload exactly --- Missions/ProjectApollo/Apollo 11.cfg | 6 +++--- Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 11.cfg b/Missions/ProjectApollo/Apollo 11.cfg index 99099f4e2d..f266b11fe3 100644 --- a/Missions/ProjectApollo/Apollo 11.cfg +++ b/Missions/ProjectApollo/Apollo 11.cfg @@ -9,9 +9,9 @@ LMPVesselName=Buzz Aldrin CDRSuitName=N. ARMSTRONG CMPSuitName=M. COLLINS LMPSuitName=E. ALDRIN -CMNBDX=-1.8 -CMNBDY=-0.6 -CMNBDZ=-0.2 +CMNBDX=-1.794576296677 +CMNBDY=-0.595579561842233 +CMNBDZ=-0.196544246486212 CMADSRAX=0.0 CMADSRAY=0.0 CMADSRAZ=0.0 diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index d2a0383c90..09ee47f192 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -462,7 +462,7 @@ void IMU::Timestep(double simdt) // Gimbals MATRIX3 vesselTransform = mul(Orbiter.Attitude_g2v, Orbiter.AttitudeReference); - MATRIX3 DriftTransform = mul(DriftXRot,mul(DriftYRot, DriftZRot)); + MATRIX3 DriftTransform = mul(DriftXRot,mul(DriftZRot, DriftYRot)); MATRIX3 StableMemberTransform = mul(getOrbiterLocalToNavigationBaseTransformation(), mul(vesselTransform, DriftTransform)); // calculate the new gimbal angles VECTOR3 newAngles = getRotationAnglesXZY(StableMemberTransform); From 715da134e56af3fe3f486c9bf246649667f911c5 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 16 Jul 2023 23:06:48 -0400 Subject: [PATCH 09/51] unbreak loading from mission config --- .../samples/ProjectApollo/src_aux/Mission.cpp | 20 ++++++++++++++++--- .../samples/ProjectApollo/src_aux/Mission.h | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 3efbfc7c35..761c9ae01a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -324,8 +324,22 @@ namespace mission { return true; } - void Mission::LoadIMU_AndPIPA_RatesAndBiases(FILEHANDLE hFile) { - oapiReadItem_float(hFile, "CMNBDX", CM_IMUDriftRates.m11); + void Mission::LoadIMU_AndPIPA_RatesAndBiases(std::ifstream &hFile) { + char line[256]; + + while (hFile.getline(line, sizeof line)) { + if (!_strnicmp(line, "CMNBDX", 6)) { + sscanf(line + 7, "%lf", &CM_IMUDriftRates.m11); + } + if (!_strnicmp(line, "CMNBDY", 6)) { + sscanf(line + 7, "%lf", &CM_IMUDriftRates.m12); + } + if (!_strnicmp(line, "CMNBDZ", 6)) { + sscanf(line + 7, "%lf", &CM_IMUDriftRates.m13); + } + } + + /*oapiReadItem_float(hFile, "CMNBDX", CM_IMUDriftRates.m11); oapiReadItem_float(hFile, "CMNBDY", CM_IMUDriftRates.m12); oapiReadItem_float(hFile, "CMNBDZ", CM_IMUDriftRates.m13); oapiReadItem_float(hFile, "CMADSRAX", CM_IMUDriftRates.m21); @@ -359,7 +373,7 @@ namespace mission { oapiReadItem_float(hFile, "LMPIPASCALEX", LM_PIPAScale.x); oapiReadItem_float(hFile, "LMPIPASCALEY", LM_PIPAScale.y); - oapiReadItem_float(hFile, "LMPIPASCALEZ", LM_PIPAScale.z); + oapiReadItem_float(hFile, "LMPIPASCALEZ", LM_PIPAScale.z);*/ } MATRIX3 Mission::GetCM_IMU_Drift() const { diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h index eb553aef6a..50877b9ce4 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h @@ -183,7 +183,7 @@ namespace mission VECTOR3 LM_PIPABias; VECTOR3 LM_PIPAScale; - void Mission::LoadIMU_AndPIPA_RatesAndBiases(FILEHANDLE hFile); + void Mission::LoadIMU_AndPIPA_RatesAndBiases(std::ifstream &hFile); void SetDefaultValues(); }; From b13370f089644727ef06b23fc4acdbb2549b2dd9 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Tue, 18 Jul 2023 00:07:02 -0400 Subject: [PATCH 10/51] attempt to fix loading --- .../samples/ProjectApollo/src_aux/Mission.cpp | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 761c9ae01a..e0020538f4 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -317,8 +317,17 @@ namespace mission { else if (!_strnicmp(line, "LMCueCard=", 10)) { ReadCueCardLine(line + 10, 1); } + else if (!_strnicmp(line, "CMNBDX=", 8)) { + sscanf(line + 8, "%lf", &CM_IMUDriftRates.m11); + } + else if (!_strnicmp(line, "CMNBDY=", 8)) { + sscanf(line + 8, "%lf", &CM_IMUDriftRates.m12); + } + else if (!_strnicmp(line, "CMNBDZ=", 8)) { + sscanf(line + 8, "%lf", &CM_IMUDriftRates.m13); + } } - LoadIMU_AndPIPA_RatesAndBiases(hFile); + //LoadIMU_AndPIPA_RatesAndBiases(hFile); hFile.close(); return true; @@ -327,17 +336,29 @@ namespace mission { void Mission::LoadIMU_AndPIPA_RatesAndBiases(std::ifstream &hFile) { char line[256]; - while (hFile.getline(line, sizeof line)) { - if (!_strnicmp(line, "CMNBDX", 6)) { - sscanf(line + 7, "%lf", &CM_IMUDriftRates.m11); - } - if (!_strnicmp(line, "CMNBDY", 6)) { - sscanf(line + 7, "%lf", &CM_IMUDriftRates.m12); - } - if (!_strnicmp(line, "CMNBDZ", 6)) { - sscanf(line + 7, "%lf", &CM_IMUDriftRates.m13); - } - } + //for (std::string line; std::getline(hFile, line);) { + // if (!line.compare(0,7,"CMNBDX=")) { + // CM_IMUDriftRates.m11 = std::stod(line.substr(7)); + // } + // else if (!line.compare(0, 7, "CMNBDY=")) { + // CM_IMUDriftRates.m12 = std::stod(line.substr(7)); + // } + // else if (!line.compare(0, 7, "CMNBDZ=")) { + // CM_IMUDriftRates.m13 = std::stod(line.substr(7)); + // } + //} + + //while (hFile.getline(line, sizeof line)) { + // if (!_strnicmp(line, "CMNBDX=", 7)) { + // sscanf(line + 7, "%lf", &CM_IMUDriftRates.m11); + // } + // else if (!_strnicmp(line, "CMNBDY=", 7)) { + // sscanf(line + 7, "%lf", &CM_IMUDriftRates.m12); + // } + // else if (!_strnicmp(line, "CMNBDZ=", 7)) { + // sscanf(line + 7, "%lf", &CM_IMUDriftRates.m13); + // } + //} /*oapiReadItem_float(hFile, "CMNBDX", CM_IMUDriftRates.m11); oapiReadItem_float(hFile, "CMNBDY", CM_IMUDriftRates.m12); From 90bbd25c141cf798250388820f9e64e64ad7598d Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 19 Jul 2023 21:59:11 -0400 Subject: [PATCH 11/51] simplify (but not fix) drift and loading --- .../samples/ProjectApollo/src_aux/Mission.cpp | 12 +++++------ .../samples/ProjectApollo/src_sys/imu.cpp | 20 +++++++------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index e0020538f4..29069fa703 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -317,14 +317,14 @@ namespace mission { else if (!_strnicmp(line, "LMCueCard=", 10)) { ReadCueCardLine(line + 10, 1); } - else if (!_strnicmp(line, "CMNBDX=", 8)) { - sscanf(line + 8, "%lf", &CM_IMUDriftRates.m11); + else if (!_strnicmp(line, "CMNBDX=", 7)) { + sscanf(line + 7, "%lf", &CM_IMUDriftRates.m11); } - else if (!_strnicmp(line, "CMNBDY=", 8)) { - sscanf(line + 8, "%lf", &CM_IMUDriftRates.m12); + else if (!_strnicmp(line, "CMNBDY=", 7)) { + sscanf(line + 7, "%lf", &CM_IMUDriftRates.m12); } - else if (!_strnicmp(line, "CMNBDZ=", 8)) { - sscanf(line + 8, "%lf", &CM_IMUDriftRates.m13); + else if (!_strnicmp(line, "CMNBDZ=", 7)) { + sscanf(line + 7, "%lf", &CM_IMUDriftRates.m13); } } //LoadIMU_AndPIPA_RatesAndBiases(hFile); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 09ee47f192..c3857c8a81 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -455,27 +455,21 @@ void IMU::Timestep(double simdt) double DriftY = (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; double DriftZ = (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; - MATRIX3 DriftXRot, DriftYRot, DriftZRot; - GetRotMatrixX(-DriftX, DriftXRot); - GetRotMatrixY(-DriftY, DriftYRot); - GetRotMatrixZ(DriftZ, DriftZRot); // Gimbals - MATRIX3 vesselTransform = mul(Orbiter.Attitude_g2v, Orbiter.AttitudeReference); - MATRIX3 DriftTransform = mul(DriftXRot,mul(DriftZRot, DriftYRot)); - MATRIX3 StableMemberTransform = mul(getOrbiterLocalToNavigationBaseTransformation(), mul(vesselTransform, DriftTransform)); - // calculate the new gimbal angles - VECTOR3 newAngles = getRotationAnglesXZY(StableMemberTransform); - VECTOR3 DriftAngles = getRotationAnglesXZY(DriftTransform); + MATRIX3 t = Orbiter.AttitudeReference; + t = mul(Orbiter.Attitude_g2v, t); + t = mul(getOrbiterLocalToNavigationBaseTransformation(), t); + VECTOR3 newAngles = getRotationAnglesXZY(t); //Calculate resolver outputs before the gimbals get moved to their new position calculatePhase(newAngles); // drive gimbals to new angles // CAUTION: gimbal angles are left-handed - DriveGimbalX(-newAngles.x - Gimbal.X); - DriveGimbalY(-newAngles.y - Gimbal.Y); - DriveGimbalZ(-newAngles.z - Gimbal.Z); + DriveGimbalX(-newAngles.x - Gimbal.X - DriftX); + DriveGimbalY(-newAngles.y - Gimbal.Y - DriftZ); + DriveGimbalZ(-newAngles.z - Gimbal.Z + DriftY); SetOrbiterAttitudeReference(); accel.x += pipaBiasScale.PIPA_BiasX + accel.x * pipaBiasScale.PIPA_ScalePPM_X; From c7bc7f17b73866b33e8b9aab1b9ecbafb7c341a3 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 22 Jul 2023 19:52:39 -0400 Subject: [PATCH 12/51] fix coordinate system problem in drift rate... probably --- .../samples/ProjectApollo/src_csm/saturn.cpp | 2 +- .../samples/ProjectApollo/src_sys/imu.cpp | 25 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 0dc78c12ac..fc7ca55a8b 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -1550,7 +1550,7 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z, IMURESOLVERPHASEERROR.x, IMURESOLVERPHASEERROR.y, IMURESOLVERPHASEERROR.z); - fprintf(IMUDriftLogger, "%0.10f, %0.10f, %0.10f, %0.10f\n", simt, ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z); + fprintf(IMUDriftLogger, "%0.15f, %0.15f, %0.15f, %0.15f\n", simt, ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z); fflush(IMUDriftLogger); Timestep(simt, simdt, mjd); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index c3857c8a81..a86c892bf0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -455,6 +455,21 @@ void IMU::Timestep(double simdt) double DriftY = (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; double DriftZ = (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; + // gyro drift about is done in stable member coordinates + MATRIX3 DriftXRot = getRotationMatrixX(-DriftX); + MATRIX3 DriftYRot = getRotationMatrixY(-DriftY); + MATRIX3 DriftZRot = getRotationMatrixZ(-DriftZ); + + MATRIX3 DriftXYZRot = mul(DriftYRot, mul(DriftZRot, DriftXRot)); + + // transformation to navigation base coordinates + // CAUTION: gimbal angles are left-handed + DriftXYZRot = mul(getRotationMatrixY(-Gimbal.Y), DriftXYZRot); + DriftXYZRot = mul(getRotationMatrixZ(-Gimbal.Z), DriftXYZRot); + DriftXYZRot = mul(getRotationMatrixX(-Gimbal.X), DriftXYZRot); + + // calculate the new gimbal angles + VECTOR3 DriftAngles = getRotationAnglesXZY(DriftXYZRot); // Gimbals MATRIX3 t = Orbiter.AttitudeReference; @@ -463,14 +478,16 @@ void IMU::Timestep(double simdt) VECTOR3 newAngles = getRotationAnglesXZY(t); //Calculate resolver outputs before the gimbals get moved to their new position - calculatePhase(newAngles); + VECTOR3 GimbalPositionforPhase = _V(Gimbal.X, Gimbal.Y, Gimbal.Z); + //calculatePhase(newAngles + (DriftAngles - _V(Gimbal.X, Gimbal.Y, Gimbal.Z))); // drive gimbals to new angles // CAUTION: gimbal angles are left-handed - DriveGimbalX(-newAngles.x - Gimbal.X - DriftX); - DriveGimbalY(-newAngles.y - Gimbal.Y - DriftZ); - DriveGimbalZ(-newAngles.z - Gimbal.Z + DriftY); + DriveGimbalX((-newAngles.x - Gimbal.X) - (-DriftAngles.x - Gimbal.X)); + DriveGimbalY((-newAngles.y - Gimbal.Y) - (-DriftAngles.y - Gimbal.Y)); + DriveGimbalZ((-newAngles.z - Gimbal.Z) - (-DriftAngles.z - Gimbal.Z)); SetOrbiterAttitudeReference(); + calculatePhase(-GimbalPositionforPhase); accel.x += pipaBiasScale.PIPA_BiasX + accel.x * pipaBiasScale.PIPA_ScalePPM_X; accel.y += pipaBiasScale.PIPA_BiasY + accel.y * pipaBiasScale.PIPA_ScalePPM_Y; From 99897581bea871ba101cc8c0d8bf7fad41bac48c Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 22 Jul 2023 20:19:45 -0400 Subject: [PATCH 13/51] add sin and cos resolver output to telemetry --- .../samples/ProjectApollo/src_csm/csm_telecom.cpp | 12 ++++++------ Orbitersdk/samples/ProjectApollo/src_sys/IMU.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp index 8e7cabe670..a235242b63 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp @@ -2630,7 +2630,7 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 53: // TRUNNION CDU DAC OUT return(scale_data(0,-10,10)); case 54: // IG 1X RSVR OUT SIN - return(scale_data(0,-50,50)); + return(scale_data(sat->imu.getResolverSineGimbal().y,-50,50)); case 55: // O2 SUPPLY MANF PRESS return(scale_data(sat->O2SupplyManifPressSensor.Voltage(), 0.0, 5.0)); case 56: // AC BUS 2 PH A VOLTS @@ -2640,15 +2640,15 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 58: // MAIN BUS B VOLTS return scale_data(sat->sce.GetVoltage(0, 1), 0.0, 5.0); case 59: // IG 1X RSVR OUT COS - return(scale_data(0,130,50)); + return(scale_data(sat->imu.getResolverCosineGimbal().y,130,50)); case 60: // MG 1X RSVR OUT SIN - return(scale_data(0,-50,50)); + return(scale_data(sat->imu.getResolverSineGimbal().z,-50,50)); case 61: // MG 1X RSVR OUT COS - return(scale_data(0,130,50)); + return(scale_data(sat->imu.getResolverCosineGimbal().z,130,50)); case 62: // OG 1X RSVR OUT SIN - return(scale_data(0,-50,50)); + return(scale_data(sat->imu.getResolverSineGimbal().x,-50,50)); case 63: // OG 1X RSVR OUT COS - return(scale_data(0,130,50)); + return(scale_data(sat->imu.getResolverCosineGimbal().x,130,50)); case 64: // UNKNOWN - HBR ONLY return(0); case 65: // UNKNOWN - HBR ONLY diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index 7f967d5f5d..c9206ef5d0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -53,6 +53,8 @@ class IMU { VECTOR3 GetNBDriftRates(); VECTOR3 GetTotalAttitude(); inline VECTOR3 getResolverPhaseError() { return ResolverPhaseError; }; + inline VECTOR3 getResolverSineGimbal() { return SineGimbal; }; + inline VECTOR3 getResolverCosineGimbal() { return CosineGimbal; }; virtual VECTOR3 GetTotalAttitude(); void WireToBuses(e_object *a, e_object *b, GuardedToggleSwitch *s); From 56a93e6009cf356871aeedfb747258337bef9019 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 22 Jul 2023 21:57:13 -0400 Subject: [PATCH 14/51] update comment --- Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index a86c892bf0..9963a85930 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -455,7 +455,7 @@ void IMU::Timestep(double simdt) double DriftY = (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; double DriftZ = (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; - // gyro drift about is done in stable member coordinates + // convert drift rates to rotation matrices MATRIX3 DriftXRot = getRotationMatrixX(-DriftX); MATRIX3 DriftYRot = getRotationMatrixY(-DriftY); MATRIX3 DriftZRot = getRotationMatrixZ(-DriftZ); From 2fb32287a1259cc28a75252e202e06956ca2b8ef Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 31 Jul 2023 23:18:34 -0400 Subject: [PATCH 15/51] plausable but not quite right change --- .../samples/ProjectApollo/src_sys/imu.cpp | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 9963a85930..a15a538a5b 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -449,43 +449,35 @@ void IMU::Timestep(double simdt) inertialData.getAcceleration(accel); accel = mul(Orbiter.Attitude_v2g, -accel); accel = tmul(Orbiter.AttitudeReference, accel); - + //IMU Drift calculation - double DriftX = (imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; - double DriftY = (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; - double DriftZ = (imuDriftRates.NBD_Z + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; + double DriftX = (imuDriftRates.NBD_X) * simdt;// - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; + double DriftY = (imuDriftRates.NBD_Y) * simdt;// - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; + double DriftZ = (imuDriftRates.NBD_Z) * simdt;// + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; // convert drift rates to rotation matrices - MATRIX3 DriftXRot = getRotationMatrixX(-DriftX); - MATRIX3 DriftYRot = getRotationMatrixY(-DriftY); - MATRIX3 DriftZRot = getRotationMatrixZ(-DriftZ); - - MATRIX3 DriftXYZRot = mul(DriftYRot, mul(DriftZRot, DriftXRot)); - - // transformation to navigation base coordinates - // CAUTION: gimbal angles are left-handed - DriftXYZRot = mul(getRotationMatrixY(-Gimbal.Y), DriftXYZRot); - DriftXYZRot = mul(getRotationMatrixZ(-Gimbal.Z), DriftXYZRot); - DriftXYZRot = mul(getRotationMatrixX(-Gimbal.X), DriftXYZRot); + MATRIX3 DriftXRot = getRotationMatrixX(DriftX); + MATRIX3 DriftYRot = getRotationMatrixY(DriftY); + MATRIX3 DriftZRot = getRotationMatrixZ(DriftZ); - // calculate the new gimbal angles - VECTOR3 DriftAngles = getRotationAnglesXZY(DriftXYZRot); + MATRIX3 DriftXYZRot = mul(DriftZRot, mul(DriftYRot, DriftXRot)); // Gimbals MATRIX3 t = Orbiter.AttitudeReference; t = mul(Orbiter.Attitude_g2v, t); t = mul(getOrbiterLocalToNavigationBaseTransformation(), t); + t = mul(DriftXYZRot,t); VECTOR3 newAngles = getRotationAnglesXZY(t); //Calculate resolver outputs before the gimbals get moved to their new position VECTOR3 GimbalPositionforPhase = _V(Gimbal.X, Gimbal.Y, Gimbal.Z); - //calculatePhase(newAngles + (DriftAngles - _V(Gimbal.X, Gimbal.Y, Gimbal.Z))); // drive gimbals to new angles // CAUTION: gimbal angles are left-handed - DriveGimbalX((-newAngles.x - Gimbal.X) - (-DriftAngles.x - Gimbal.X)); - DriveGimbalY((-newAngles.y - Gimbal.Y) - (-DriftAngles.y - Gimbal.Y)); - DriveGimbalZ((-newAngles.z - Gimbal.Z) - (-DriftAngles.z - Gimbal.Z)); + + DriveGimbalX(-newAngles.x - Gimbal.X); + DriveGimbalY(-newAngles.y - Gimbal.Y); + DriveGimbalZ(-newAngles.z - Gimbal.Z); SetOrbiterAttitudeReference(); calculatePhase(-GimbalPositionforPhase); From e63128f268f543be57138909a71295ce105bb9ec Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Tue, 1 Aug 2023 03:27:33 -0400 Subject: [PATCH 16/51] fix Z drift rate sign --- Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index a15a538a5b..f1a6831f8f 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -458,7 +458,7 @@ void IMU::Timestep(double simdt) // convert drift rates to rotation matrices MATRIX3 DriftXRot = getRotationMatrixX(DriftX); MATRIX3 DriftYRot = getRotationMatrixY(DriftY); - MATRIX3 DriftZRot = getRotationMatrixZ(DriftZ); + MATRIX3 DriftZRot = getRotationMatrixZ(-DriftZ); MATRIX3 DriftXYZRot = mul(DriftZRot, mul(DriftYRot, DriftXRot)); @@ -466,7 +466,7 @@ void IMU::Timestep(double simdt) MATRIX3 t = Orbiter.AttitudeReference; t = mul(Orbiter.Attitude_g2v, t); t = mul(getOrbiterLocalToNavigationBaseTransformation(), t); - t = mul(DriftXYZRot,t); + t = mul(t,DriftXYZRot); VECTOR3 newAngles = getRotationAnglesXZY(t); //Calculate resolver outputs before the gimbals get moved to their new position From eedaa7b0c8c14d9fc657f244776c7bb689691f80 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 6 Aug 2023 17:03:38 -0400 Subject: [PATCH 17/51] Add ADIA and ADSRA drift. --- Missions/ProjectApollo/Apollo 11.cfg | 12 ++++----- .../samples/ProjectApollo/src_aux/Mission.cpp | 20 +++++++++++++- .../samples/ProjectApollo/src_csm/saturn.cpp | 3 ++- .../samples/ProjectApollo/src_sys/IMU.h | 1 + .../samples/ProjectApollo/src_sys/imu.cpp | 27 +++++++++++-------- 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 11.cfg b/Missions/ProjectApollo/Apollo 11.cfg index f266b11fe3..037af74081 100644 --- a/Missions/ProjectApollo/Apollo 11.cfg +++ b/Missions/ProjectApollo/Apollo 11.cfg @@ -12,10 +12,10 @@ LMPSuitName=E. ALDRIN CMNBDX=-1.794576296677 CMNBDY=-0.595579561842233 CMNBDZ=-0.196544246486212 -CMADSRAX=0.0 -CMADSRAY=0.0 -CMADSRAZ=0.0 -CMADIAX=0.0 -CMADIAY=0.0 -CMADIAZ=0.0 +CMADSRAX=-6.0 +CMADSRAY=3.0 +CMADSRAZ=5.0 +CMADIAX=15.0 +CMADIAY=5.0 +CMADIAZ=1.0 CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 29069fa703..186d27d639 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -326,6 +326,24 @@ namespace mission { else if (!_strnicmp(line, "CMNBDZ=", 7)) { sscanf(line + 7, "%lf", &CM_IMUDriftRates.m13); } + else if (!_strnicmp(line, "CMADSRAX=", 9)) { + sscanf(line + 9, "%lf", &CM_IMUDriftRates.m21); + } + else if (!_strnicmp(line, "CMADSRAY=", 9)) { + sscanf(line + 9, "%lf", &CM_IMUDriftRates.m22); + } + else if (!_strnicmp(line, "CMADSRAZ=", 9)) { + sscanf(line + 9, "%lf", &CM_IMUDriftRates.m23); + } + else if (!_strnicmp(line, "CMADIAX=", 8)) { + sscanf(line + 8, "%lf", &CM_IMUDriftRates.m31); + } + else if (!_strnicmp(line, "CMADIAY=", 8)) { + sscanf(line + 8, "%lf", &CM_IMUDriftRates.m32); + } + else if (!_strnicmp(line, "CMADIAZ=", 8)) { + sscanf(line + 8, "%lf", &CM_IMUDriftRates.m33); + } } //LoadIMU_AndPIPA_RatesAndBiases(hFile); hFile.close(); @@ -334,7 +352,7 @@ namespace mission { } void Mission::LoadIMU_AndPIPA_RatesAndBiases(std::ifstream &hFile) { - char line[256]; + //char line[256]; //for (std::string line; std::getline(hFile, line);) { // if (!line.compare(0,7,"CMNBDX=")) { diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index fc7ca55a8b..43d961ca16 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -1543,7 +1543,8 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) // // Subclass specific handling // - VECTOR3 ATTITUDEFORTESTING = imu.GetTotalAttitude(); + //VECTOR3 ATTITUDEFORTESTING = imu.GetTotalAttitude(); + VECTOR3 ATTITUDEFORTESTING = imu.getPlatformEulerAnglesZYX(); VECTOR3 DRIFTRATEFORTESTING = imu.GetNBDriftRates(); VECTOR3 IMURESOLVERPHASEERROR = imu.getResolverPhaseError(); sprintf(oapiDebugString(), "<%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>", diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index c9206ef5d0..87c04ae468 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -55,6 +55,7 @@ class IMU { inline VECTOR3 getResolverPhaseError() { return ResolverPhaseError; }; inline VECTOR3 getResolverSineGimbal() { return SineGimbal; }; inline VECTOR3 getResolverCosineGimbal() { return CosineGimbal; }; + VECTOR3 getPlatformEulerAnglesZYX(); virtual VECTOR3 GetTotalAttitude(); void WireToBuses(e_object *a, e_object *b, GuardedToggleSwitch *s); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index f1a6831f8f..240dd5d2be 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -59,7 +59,6 @@ IMU::~IMU() } void IMU::Init() - { Operate = false; TurnedOn = false; @@ -135,13 +134,13 @@ void IMU::SetDriftRates(const MATRIX3 DriftRateMatrix) imuDriftRates.NBD_Y = DriftRateMatrix.m12 * MERU; imuDriftRates.NBD_Z = DriftRateMatrix.m13 * MERU; - imuDriftRates.ADSRA_X = DriftRateMatrix.m21; - imuDriftRates.ADSRA_Y = DriftRateMatrix.m22; - imuDriftRates.ADSRA_Z = DriftRateMatrix.m23; + imuDriftRates.ADSRA_X = DriftRateMatrix.m21 * MERU; + imuDriftRates.ADSRA_Y = DriftRateMatrix.m22 * MERU; + imuDriftRates.ADSRA_Z = DriftRateMatrix.m23 * MERU; - imuDriftRates.ADIA_X = DriftRateMatrix.m31; - imuDriftRates.ADIA_Y = DriftRateMatrix.m32; - imuDriftRates.ADIA_Z = DriftRateMatrix.m33; + imuDriftRates.ADIA_X = DriftRateMatrix.m31 * MERU; + imuDriftRates.ADIA_Y = DriftRateMatrix.m32 * MERU; + imuDriftRates.ADIA_Z = DriftRateMatrix.m33 * MERU; } VECTOR3 IMU::GetNBDriftRates() @@ -319,7 +318,13 @@ bool IMU::IsPowered() return true; } -void IMU::WireToBuses(e_object *a, e_object *b, GuardedToggleSwitch *s) +VECTOR3 IMU::getPlatformEulerAnglesZYX() +{ + VECTOR3 RotationDeviation = getRotationAnglesZYX(Orbiter.AttitudeReference); + return(_V(RotationDeviation.x, RotationDeviation.z, RotationDeviation.y)); +} + +void IMU::WireToBuses(e_object *a, e_object *b, GuardedToggleSwitch *s) { DCPower.WireToBuses(a, b); @@ -451,9 +456,9 @@ void IMU::Timestep(double simdt) accel = tmul(Orbiter.AttitudeReference, accel); //IMU Drift calculation - double DriftX = (imuDriftRates.NBD_X) * simdt;// - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; - double DriftY = (imuDriftRates.NBD_Y) * simdt;// - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; - double DriftZ = (imuDriftRates.NBD_Z) * simdt;// + (imuDriftRates.ADSRA_Z * accel.y / 9.80665) + (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; + double DriftX = (imuDriftRates.NBD_X - (imuDriftRates.ADSRA_X * accel.y / 9.80665) + (imuDriftRates.ADIA_X * accel.x / 9.80665)) * simdt; + double DriftY = (imuDriftRates.NBD_Y - (imuDriftRates.ADSRA_Y * accel.z / 9.80665) + (imuDriftRates.ADIA_Y * accel.y / 9.80665)) * simdt; + double DriftZ = (imuDriftRates.NBD_Z - (imuDriftRates.ADSRA_Z * accel.y / 9.80665) - (imuDriftRates.ADIA_Z * accel.z / 9.80665)) * simdt; // convert drift rates to rotation matrices MATRIX3 DriftXRot = getRotationMatrixX(DriftX); From 69f1ce41706cc0f1f7f6b0702dc3112bd7543a0a Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 9 Dec 2023 22:12:04 -0500 Subject: [PATCH 18/51] add parsing for LM drift and bias --- .../samples/ProjectApollo/src_aux/Mission.cpp | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 186d27d639..208e3cc75d 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -344,6 +344,33 @@ namespace mission { else if (!_strnicmp(line, "CMADIAZ=", 8)) { sscanf(line + 8, "%lf", &CM_IMUDriftRates.m33); } + else if (!_strnicmp(line, "LMNBDX=", 7)) { + sscanf(line + 7, "%lf", &LM_IMUDriftRates.m11); + } + else if (!_strnicmp(line, "LMNBDY=", 7)) { + sscanf(line + 7, "%lf", &LM_IMUDriftRates.m12); + } + else if (!_strnicmp(line, "LMNBDZ=", 7)) { + sscanf(line + 7, "%lf", &LM_IMUDriftRates.m13); + } + else if (!_strnicmp(line, "LMADSRAX=", 9)) { + sscanf(line + 9, "%lf", &LM_IMUDriftRates.m21); + } + else if (!_strnicmp(line, "LMADSRAY=", 9)) { + sscanf(line + 9, "%lf", &LM_IMUDriftRates.m22); + } + else if (!_strnicmp(line, "LMADSRAZ=", 9)) { + sscanf(line + 9, "%lf", &LM_IMUDriftRates.m23); + } + else if (!_strnicmp(line, "LMADIAX=", 8)) { + sscanf(line + 8, "%lf", &LM_IMUDriftRates.m31); + } + else if (!_strnicmp(line, "LMADIAY=", 8)) { + sscanf(line + 8, "%lf", &LM_IMUDriftRates.m32); + } + else if (!_strnicmp(line, "LMADIAZ=", 8)) { + sscanf(line + 8, "%lf", &LM_IMUDriftRates.m33); + } } //LoadIMU_AndPIPA_RatesAndBiases(hFile); hFile.close(); From 166086bce65b694cef883971ca57d369cd65190d Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 9 Dec 2023 23:07:33 -0500 Subject: [PATCH 19/51] set LM drifts --- Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp index 60bf385f8c..88a8507ba0 100644 --- a/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp @@ -2464,6 +2464,7 @@ void LEM::CreateMissionSpecificSystems() agc.SetMissionInfo(pMission->GetLGCVersion()); aea.SetMissionInfo(pMission->GetAEAVersion()); + imu.SetDriftRates(pMission->GetLM_IMU_Drift()); if (pMission->LMHasAscEngArmAssy()) { aeaa = new LEM_AEAA(); From e9d1f375fa3a891336ea96d2532eb7d2038ad058 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 13 Jan 2024 01:13:34 -0500 Subject: [PATCH 20/51] remove extranious GetTotalAttitude, not sure why that was there. bad rebase? --- Orbitersdk/samples/ProjectApollo/src_sys/IMU.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index 87c04ae468..352e95b54f 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -51,7 +51,6 @@ class IMU { void SetVesselFlag(bool LEMFlag); void SetDriftRates(const MATRIX3 DriftRateMatrix); VECTOR3 GetNBDriftRates(); - VECTOR3 GetTotalAttitude(); inline VECTOR3 getResolverPhaseError() { return ResolverPhaseError; }; inline VECTOR3 getResolverSineGimbal() { return SineGimbal; }; inline VECTOR3 getResolverCosineGimbal() { return CosineGimbal; }; From e5c372e443319263197e35a97aced50a9b4a9cbe Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 14 Feb 2024 23:56:35 -0500 Subject: [PATCH 21/51] add more load functions --- .../samples/ProjectApollo/src_aux/Mission.cpp | 36 ++++++++++++++----- .../samples/ProjectApollo/src_csm/saturn.cpp | 2 ++ .../samples/ProjectApollo/src_sys/IMU.h | 2 ++ .../samples/ProjectApollo/src_sys/imu.cpp | 14 ++++++++ 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 208e3cc75d..7f0c231b9b 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -344,32 +344,50 @@ namespace mission { else if (!_strnicmp(line, "CMADIAZ=", 8)) { sscanf(line + 8, "%lf", &CM_IMUDriftRates.m33); } + else if (!_strnicmp(line, "CMPIPABIASX=", 12)) { + sscanf(line + 12, "%lf", &CM_PIPABias.x); + } + else if (!_strnicmp(line, "CMPIPABIASY=", 12)) { + sscanf(line + 12, "%lf", &CM_PIPABias.y); + } + else if (!_strnicmp(line, "CMPIPABIASZ=", 12)) { + sscanf(line + 12, "%lf", &CM_PIPABias.z); + } + else if (!_strnicmp(line, "CMPIPASCALEX=", 12)) { + sscanf(line + 12, "%lf", &CM_PIPAScale.x); + } + else if (!_strnicmp(line, "CMPIPASCALEY=", 12)) { + sscanf(line + 12, "%lf", &CM_PIPAScale.y); + } + else if (!_strnicmp(line, "CMPIPASCALEZ=", 12)) { + sscanf(line + 12, "%lf", &CM_PIPAScale.z); + } else if (!_strnicmp(line, "LMNBDX=", 7)) { - sscanf(line + 7, "%lf", &LM_IMUDriftRates.m11); + sscanf(line + 7, "%lf", &LM_IMUDriftRates.m11); } else if (!_strnicmp(line, "LMNBDY=", 7)) { - sscanf(line + 7, "%lf", &LM_IMUDriftRates.m12); + sscanf(line + 7, "%lf", &LM_IMUDriftRates.m12); } else if (!_strnicmp(line, "LMNBDZ=", 7)) { - sscanf(line + 7, "%lf", &LM_IMUDriftRates.m13); + sscanf(line + 7, "%lf", &LM_IMUDriftRates.m13); } else if (!_strnicmp(line, "LMADSRAX=", 9)) { - sscanf(line + 9, "%lf", &LM_IMUDriftRates.m21); + sscanf(line + 9, "%lf", &LM_IMUDriftRates.m21); } else if (!_strnicmp(line, "LMADSRAY=", 9)) { - sscanf(line + 9, "%lf", &LM_IMUDriftRates.m22); + sscanf(line + 9, "%lf", &LM_IMUDriftRates.m22); } else if (!_strnicmp(line, "LMADSRAZ=", 9)) { - sscanf(line + 9, "%lf", &LM_IMUDriftRates.m23); + sscanf(line + 9, "%lf", &LM_IMUDriftRates.m23); } else if (!_strnicmp(line, "LMADIAX=", 8)) { - sscanf(line + 8, "%lf", &LM_IMUDriftRates.m31); + sscanf(line + 8, "%lf", &LM_IMUDriftRates.m31); } else if (!_strnicmp(line, "LMADIAY=", 8)) { - sscanf(line + 8, "%lf", &LM_IMUDriftRates.m32); + sscanf(line + 8, "%lf", &LM_IMUDriftRates.m32); } else if (!_strnicmp(line, "LMADIAZ=", 8)) { - sscanf(line + 8, "%lf", &LM_IMUDriftRates.m33); + sscanf(line + 8, "%lf", &LM_IMUDriftRates.m33); } } //LoadIMU_AndPIPA_RatesAndBiases(hFile); diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 43d961ca16..45e7fcb034 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -2784,6 +2784,8 @@ void Saturn::GetScenarioState (FILEHANDLE scn, void *vstatus) agc.SetMissionInfo(pMission->GetCMCVersion(), PayloadName); imu.SetDriftRates(pMission->GetCM_IMU_Drift()); + imu.SetPIPABias(pMission->GetCM_PIPA_Bias()); + imu.SetPIPAScale(pMission->GetCM_PIPA_Scale()); secs.SetSaturnType(SaturnType); // diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h index 352e95b54f..3d050d7e1d 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/IMU.h @@ -50,6 +50,8 @@ class IMU { void SetVessel(VESSEL* v, bool LEMFlag); void SetVesselFlag(bool LEMFlag); void SetDriftRates(const MATRIX3 DriftRateMatrix); + void SetPIPABias(const VECTOR3 PIPABias); + void SetPIPAScale(const VECTOR3 PIPAScale); VECTOR3 GetNBDriftRates(); inline VECTOR3 getResolverPhaseError() { return ResolverPhaseError; }; inline VECTOR3 getResolverSineGimbal() { return SineGimbal; }; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 240dd5d2be..18645a5f1e 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -143,6 +143,20 @@ void IMU::SetDriftRates(const MATRIX3 DriftRateMatrix) imuDriftRates.ADIA_Z = DriftRateMatrix.m33 * MERU; } +void IMU::SetPIPABias(const VECTOR3 PIPABias) +{ + pipaBiasScale.PIPA_BiasX = PIPABias.x; + pipaBiasScale.PIPA_BiasY = PIPABias.y; + pipaBiasScale.PIPA_BiasZ = PIPABias.z; +} + +void IMU::SetPIPAScale(const VECTOR3 PIPAScale) +{ + pipaBiasScale.PIPA_ScalePPM_X = PIPAScale.x; + pipaBiasScale.PIPA_ScalePPM_X = PIPAScale.y; + pipaBiasScale.PIPA_ScalePPM_X = PIPAScale.z; +} + VECTOR3 IMU::GetNBDriftRates() { return _V(imuDriftRates.NBD_X, imuDriftRates.NBD_Y, imuDriftRates.NBD_Z); From 9308b7880f72f15c2f1bc4147be96ac45853e201 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Thu, 15 Feb 2024 23:43:43 -0500 Subject: [PATCH 22/51] add saving and loading of drift rates and biases --- .../samples/ProjectApollo/src_aux/Mission.cpp | 18 +++++ .../ProjectApollo/src_lm/lemsystems.cpp | 2 + .../samples/ProjectApollo/src_sys/imu.cpp | 79 +++++++++++++++++-- 3 files changed, 91 insertions(+), 8 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 7f0c231b9b..d66c5e985a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -389,6 +389,24 @@ namespace mission { else if (!_strnicmp(line, "LMADIAZ=", 8)) { sscanf(line + 8, "%lf", &LM_IMUDriftRates.m33); } + else if (!_strnicmp(line, "LMPIPABIASX=", 12)) { + sscanf(line + 12, "%lf", &LM_PIPABias.x); + } + else if (!_strnicmp(line, "LMPIPABIASY=", 12)) { + sscanf(line + 12, "%lf", &LM_PIPABias.y); + } + else if (!_strnicmp(line, "LMPIPABIASZ=", 12)) { + sscanf(line + 12, "%lf", &LM_PIPABias.z); + } + else if (!_strnicmp(line, "LMPIPASCALEX=", 12)) { + sscanf(line + 12, "%lf", &LM_PIPAScale.x); + } + else if (!_strnicmp(line, "LMPIPASCALEY=", 12)) { + sscanf(line + 12, "%lf", &LM_PIPAScale.y); + } + else if (!_strnicmp(line, "LMPIPASCALEZ=", 12)) { + sscanf(line + 12, "%lf", &LM_PIPAScale.z); + } } //LoadIMU_AndPIPA_RatesAndBiases(hFile); hFile.close(); diff --git a/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp index 88a8507ba0..06743f39d5 100644 --- a/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_lm/lemsystems.cpp @@ -2465,6 +2465,8 @@ void LEM::CreateMissionSpecificSystems() agc.SetMissionInfo(pMission->GetLGCVersion()); aea.SetMissionInfo(pMission->GetAEAVersion()); imu.SetDriftRates(pMission->GetLM_IMU_Drift()); + imu.SetPIPABias(pMission->GetLM_PIPA_Bias()); + imu.SetPIPAScale(pMission->GetLM_PIPA_Scale()); if (pMission->LMHasAscEngArmAssy()) { aeaa = new LEM_AEAA(); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 18645a5f1e..3bccb7eb02 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -143,18 +143,18 @@ void IMU::SetDriftRates(const MATRIX3 DriftRateMatrix) imuDriftRates.ADIA_Z = DriftRateMatrix.m33 * MERU; } -void IMU::SetPIPABias(const VECTOR3 PIPABias) +void IMU::SetPIPABias(const VECTOR3 PIPABias) // input is in cm/sec { - pipaBiasScale.PIPA_BiasX = PIPABias.x; - pipaBiasScale.PIPA_BiasY = PIPABias.y; - pipaBiasScale.PIPA_BiasZ = PIPABias.z; + pipaBiasScale.PIPA_BiasX = PIPABias.x / 100.0; + pipaBiasScale.PIPA_BiasY = PIPABias.y / 100.0; + pipaBiasScale.PIPA_BiasZ = PIPABias.z / 100.0; } -void IMU::SetPIPAScale(const VECTOR3 PIPAScale) +void IMU::SetPIPAScale(const VECTOR3 PIPAScale) // input is in ppm { - pipaBiasScale.PIPA_ScalePPM_X = PIPAScale.x; - pipaBiasScale.PIPA_ScalePPM_X = PIPAScale.y; - pipaBiasScale.PIPA_ScalePPM_X = PIPAScale.z; + pipaBiasScale.PIPA_ScalePPM_X = (PIPAScale.x / 1E6) + 1; + pipaBiasScale.PIPA_ScalePPM_X = (PIPAScale.y / 1E6) + 1; + pipaBiasScale.PIPA_ScalePPM_X = (PIPAScale.z / 1E6) + 1; } VECTOR3 IMU::GetNBDriftRates() @@ -835,6 +835,51 @@ void IMU::LoadState(FILEHANDLE scn) TurnedOn = (state.u.TurnedOn != 0); Caged = (state.u.Caged != 0); } + else if (!strnicmp(line, "NBD_X", 5)) { + scanf(line + 5, "%lf", &imuDriftRates.NBD_X); + } + else if (!strnicmp(line, "NBD_Y", 5)) { + scanf(line + 5, "%lf", &imuDriftRates.NBD_Y); + } + else if (!strnicmp(line, "NBD_Z", 5)) { + scanf(line + 5, "%lf", &imuDriftRates.NBD_Z); + } + else if (!strnicmp(line, "ADIA_X", 6)) { + scanf(line + 5, "%lf", &imuDriftRates.ADIA_X); + } + else if (!strnicmp(line, "ADIA_Y", 6)) { + scanf(line + 5, "%lf", &imuDriftRates.ADIA_Y); + } + else if (!strnicmp(line, "ADIA_Z", 6)) { + scanf(line + 5, "%lf", &imuDriftRates.ADIA_Z); + } + else if (!strnicmp(line, "ADSRA_X", 7)) { + scanf(line + 5, "%lf", &imuDriftRates.ADSRA_X); + } + else if (!strnicmp(line, "ADSRA_Y", 7)) { + scanf(line + 5, "%lf", &imuDriftRates.ADSRA_Y); + } + else if (!strnicmp(line, "ADSRA_Z", 7)) { + scanf(line + 5, "%lf", &imuDriftRates.ADSRA_Z); + } + else if (!strnicmp(line, "PBIAS_X", 7)) { + scanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasX); + } + else if (!strnicmp(line, "PBIAS_Y", 7)) { + scanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasY); + } + else if (!strnicmp(line, "PBIAS_Z", 7)) { + scanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasZ); + } + else if (!strnicmp(line, "PSCALE_X", 8)) { + scanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_X); + } + else if (!strnicmp(line, "PSCALE_Y", 8)) { + scanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_Y); + } + else if (!strnicmp(line, "PSCALE_Z", 8)) { + scanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_Z); + } } } @@ -874,5 +919,23 @@ void IMU::SaveState(FILEHANDLE scn) oapiWriteScenario_int (scn, "STATE", state.word); + //Drift rates and biases + papiWriteScenario_double(scn, "NBD_X", imuDriftRates.NBD_X); + papiWriteScenario_double(scn, "NBD_Y", imuDriftRates.NBD_Y); + papiWriteScenario_double(scn, "NBD_Z", imuDriftRates.NBD_Z); + papiWriteScenario_double(scn, "ADIA_X", imuDriftRates.ADIA_X); + papiWriteScenario_double(scn, "ADIA_Y", imuDriftRates.ADIA_Y); + papiWriteScenario_double(scn, "ADIA_Z", imuDriftRates.ADIA_Z); + papiWriteScenario_double(scn, "ADSRA_X", imuDriftRates.ADSRA_X); + papiWriteScenario_double(scn, "ADSRA_Y", imuDriftRates.ADSRA_Y); + papiWriteScenario_double(scn, "ADSRA_Z", imuDriftRates.ADSRA_Z); + papiWriteScenario_double(scn, "PBIAS_X", pipaBiasScale.PIPA_BiasX); + papiWriteScenario_double(scn, "PBIAS_Y", pipaBiasScale.PIPA_BiasY); + papiWriteScenario_double(scn, "PBIAS_Z", pipaBiasScale.PIPA_BiasZ); + papiWriteScenario_double(scn, "PSCALE_X", pipaBiasScale.PIPA_ScalePPM_X); + papiWriteScenario_double(scn, "PSCALE_Y", pipaBiasScale.PIPA_ScalePPM_Y); + papiWriteScenario_double(scn, "PSCALE_Z", pipaBiasScale.PIPA_ScalePPM_Z); + + oapiWriteLine(scn, IMU_END_STRING); } From 3a90c3ee4b20f5d77b352fffd69cf014f00513c4 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 18 Feb 2024 02:14:42 -0500 Subject: [PATCH 23/51] Add imu drift rates to Apollo 11 and 12 --- Missions/ProjectApollo/Apollo 11.cfg | 41 +++++++++---- Missions/ProjectApollo/Apollo 12.cfg | 32 ++++++++++- .../Apollo 11 - Launch.scn | 45 ++++++++++----- .../Apollo 12 - Launch.scn | 57 ++++++++++++------- 4 files changed, 128 insertions(+), 47 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 11.cfg b/Missions/ProjectApollo/Apollo 11.cfg index 037af74081..1f236b8a9d 100644 --- a/Missions/ProjectApollo/Apollo 11.cfg +++ b/Missions/ProjectApollo/Apollo 11.cfg @@ -9,13 +9,34 @@ LMPVesselName=Buzz Aldrin CDRSuitName=N. ARMSTRONG CMPSuitName=M. COLLINS LMPSuitName=E. ALDRIN -CMNBDX=-1.794576296677 -CMNBDY=-0.595579561842233 -CMNBDZ=-0.196544246486212 -CMADSRAX=-6.0 -CMADSRAY=3.0 -CMADSRAZ=5.0 -CMADIAX=15.0 -CMADIAY=5.0 -CMADIAZ=1.0 -CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file +CSMCueCard=1 SATURN_BOOST_A14 +CMPIPABIASX=-0.26 +CMPIPASCALEX=40 +CMPIPABIASY=-0.13 +CMPIPASCALEY=-80 +CMPIPABIASZ=0.14 +CMPIPASCALEZ=-30 +CMNBDX=-1.8 +CMNBDY=-0.6 +CMNBDZ=-0.2 +CMADIAX=15 +CMADIAY=5 +CMADIAZ=1 +CMADSRAX=-6 +CMADSRAY=3 +CMADSRAZ=5 +LMPIPABIASX=0.66 +LMPIPASCALEX=-270 +LMPIPABIASY=0.1 +LMPIPASCALEY=-1150 +LMPIPABIASZ=0.2 +LMPIPASCALEZ=-620 +LMNBDX=-1.6 +LMNBDY=3.8 +LMNBDZ=4.4 +LMADIAX=10 +LMADIAY=4.4 +LMADIAZ=-3.3 +LMADSRAX=6 +LMADSRAY=-5 +LMADSRAZ=-5 \ No newline at end of file diff --git a/Missions/ProjectApollo/Apollo 12.cfg b/Missions/ProjectApollo/Apollo 12.cfg index d54c454905..3c83ffecad 100644 --- a/Missions/ProjectApollo/Apollo 12.cfg +++ b/Missions/ProjectApollo/Apollo 12.cfg @@ -9,4 +9,34 @@ LMPVesselName=Al Bean CDRSuitName=C. CONRAD CMPSuitName=R. GORDON LMPSuitName=A. BEAN -CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file +CSMCueCard=1 SATURN_BOOST_A14 +CMPIPABIASX=0 +CMPIPASCALEX=-173 +CMPIPABIASY=-0.15 +CMPIPASCALEY=-243 +CMPIPABIASZ=-0.16 +CMPIPASCALEZ=-306 +CMNBDX=-0.9 +CMNBDY=1.3 +CMNBDZ=0.5 +CMADIAX=6.7 +CMADIAY=0.7 +CMADIAZ=-0.1 +CMADSRAX=-1.4 +CMADSRAY=-3.3 +CMADSRAZ=-3.5 +LMPIPABIASX=-0.296 +LMPIPASCALEX=-649 +LMPIPABIASY=-0.28 +LMPIPASCALEY=-681 +LMPIPABIASZ=0.54 +LMPIPASCALEZ=-885 +LMNBDX=0.6 +LMNBDY=0.8 +LMNBDZ=1.3 +LMADIAX=10.6 +LMADIAY=-16 +LMADIAZ=10.8 +LMADSRAX=-1.3 +LMADSRAY=4.1 +LMADSRAZ=-0.3 \ No newline at end of file diff --git a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn index fde6f7a431..9387a1d8a2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn @@ -72,6 +72,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 + LMPAD 1452 06604 + LMPAD 1453 73446 + LMPAD 1454 01014 + LMPAD 1455 55120 + LMPAD 1456 02031 + LMPAD 1457 65656 + LMPAD 1460 77463 + LMPAD 1461 00744 + LMPAD 1462 01060 + LMPAD 1463 00404 + LMPAD 1464 00116 + LMPAD 1465 77661 + LMPAD 1466 00234 + LMPAD 1467 77575 + LMPAD 1470 77575 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -665,21 +680,21 @@ Columbia:ProjectApollo\Saturn5 CMPAD1354 0 CMPAD1355 27340 CMPAD1356 37777 - CMPAD1452 0 - CMPAD1453 0 - CMPAD1454 0 - CMPAD1455 0 - CMPAD1456 0 - CMPAD1457 0 - CMPAD1460 77432 - CMPAD1461 77663 - CMPAD1462 77746 - CMPAD1463 0 - CMPAD1464 0 - CMPAD1465 0 - CMPAD1466 0 - CMPAD1467 0 - CMPAD1470 0 + CMPAD1452 74267 + CMPAD1453 00520 + CMPAD1454 76133 + CMPAD1455 76450 + CMPAD1456 01754 + CMPAD1457 77403 + CMPAD1460 77432 + CMPAD1461 77663 + CMPAD1462 77746 + CMPAD1463 00435 + CMPAD1464 00137 + CMPAD1465 00023 + CMPAD1466 77615 + CMPAD1467 00071 + CMPAD1470 00137 CMPAD1477 0 CMPAD1706 0 CMPAD1707 16326 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn index f79fdd320b..5a23853748 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn @@ -68,6 +68,21 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 + LMPAD 1452 77015 + LMPAD 1453 65137 + LMPAD 1454 00032 + LMPAD 1455 64147 + LMPAD 1456 01455 + LMPAD 1457 61325 + LMPAD 1460 00015 + LMPAD 1461 00146 + LMPAD 1462 00576 + LMPAD 1463 00672 + LMPAD 1464 77171 + LMPAD 1465 00522 + LMPAD 1466 77713 + LMPAD 1467 00150 + LMPAD 1470 77713 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -525,27 +540,27 @@ Yankee-Clipper:ProjectApollo\Saturn5 CMPAD1272 0 CMPAD1273 55 CMPAD1341 5 - CMPAD1345 6510 - CMPAD1346 7025 - CMPAD1347 620 - CMPAD1350 0 - CMPAD1351 27340 - CMPAD1352 37723 - CMPAD1452 0 - CMPAD1453 0 - CMPAD1454 0 - CMPAD1455 0 - CMPAD1456 0 - CMPAD1457 0 - CMPAD1460 0 - CMPAD1461 0 - CMPAD1462 0 - CMPAD1463 0 - CMPAD1464 0 - CMPAD1465 0 - CMPAD1466 0 - CMPAD1467 0 - CMPAD1470 0 + CMPAD1351 6510 + CMPAD1352 7025 + CMPAD1353 620 + CMPAD1354 0 + CMPAD1355 27340 + CMPAD1356 37723 + CMPAD1452 77536 + CMPAD1453 74312 + CMPAD1454 77536 + CMPAD1455 72207 + CMPAD1456 77340 + CMPAD1457 71737 + CMPAD1460 77762 + CMPAD1461 77762 + CMPAD1462 00015 + CMPAD1463 00367 + CMPAD1464 00000 + CMPAD1465 77754 + CMPAD1466 77663 + CMPAD1467 77663 + CMPAD1470 77615 CMPAD1477 0 CMPAD1706 4 CMPAD1707 13027 From a991ca18bbe5ad0b28928786acf42044c98fbded Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 18 Feb 2024 21:59:26 -0500 Subject: [PATCH 24/51] comment out logging and debug string --- .../samples/ProjectApollo/src_csm/satsystems.cpp | 2 +- .../samples/ProjectApollo/src_csm/saturn.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp index 7ff758cd03..d52e545d71 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp @@ -59,7 +59,7 @@ void Saturn::SystemsInit() { Panelsdk.InitFromFile("ProjectApollo\\SaturnSystems"); //PanelsdkLogFile = fopen("ProjectApollo Saturn Systems.log", "w"); - IMUDriftLogger = fopen("IMUDriftLogger.log", "w"); + //IMUDriftLogger = fopen("IMUDriftLogger.log", "w"); // // Electrical systems. diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 45e7fcb034..9fa22dee86 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -72,7 +72,7 @@ extern "C" { using namespace nassp; //extern FILE *PanelsdkLogFile; -extern FILE* IMUDriftLogger; +//extern FILE* IMUDriftLogger; #define CSM_AXIS_INPUT_CNT 53 VesimInputDefinition vesim_csm_inputs[CSM_AXIS_INPUT_CNT] = { @@ -1547,12 +1547,12 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) VECTOR3 ATTITUDEFORTESTING = imu.getPlatformEulerAnglesZYX(); VECTOR3 DRIFTRATEFORTESTING = imu.GetNBDriftRates(); VECTOR3 IMURESOLVERPHASEERROR = imu.getResolverPhaseError(); - sprintf(oapiDebugString(), "<%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>", - ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, - DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z, - IMURESOLVERPHASEERROR.x, IMURESOLVERPHASEERROR.y, IMURESOLVERPHASEERROR.z); - fprintf(IMUDriftLogger, "%0.15f, %0.15f, %0.15f, %0.15f\n", simt, ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z); - fflush(IMUDriftLogger); + //sprintf(oapiDebugString(), "<%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>", + // ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, + // DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z, + // IMURESOLVERPHASEERROR.x, IMURESOLVERPHASEERROR.y, IMURESOLVERPHASEERROR.z); + //fprintf(IMUDriftLogger, "%0.15f, %0.15f, %0.15f, %0.15f\n", simt, ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z); + //fflush(IMUDriftLogger); Timestep(simt, simdt, mjd); From fec956c44466f9bf1de8856b8190642c7566776c Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 19 Feb 2024 22:21:23 -0500 Subject: [PATCH 25/51] fix error in mission loading --- .../samples/ProjectApollo/src_aux/Mission.cpp | 24 +++++++++---------- .../samples/ProjectApollo/src_sys/imu.cpp | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index d66c5e985a..2078778ffe 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -353,14 +353,14 @@ namespace mission { else if (!_strnicmp(line, "CMPIPABIASZ=", 12)) { sscanf(line + 12, "%lf", &CM_PIPABias.z); } - else if (!_strnicmp(line, "CMPIPASCALEX=", 12)) { - sscanf(line + 12, "%lf", &CM_PIPAScale.x); + else if (!_strnicmp(line, "CMPIPASCALEX=", 13)) { + sscanf(line + 13, "%lf", &CM_PIPAScale.x); } - else if (!_strnicmp(line, "CMPIPASCALEY=", 12)) { - sscanf(line + 12, "%lf", &CM_PIPAScale.y); + else if (!_strnicmp(line, "CMPIPASCALEY=", 13)) { + sscanf(line + 13, "%lf", &CM_PIPAScale.y); } - else if (!_strnicmp(line, "CMPIPASCALEZ=", 12)) { - sscanf(line + 12, "%lf", &CM_PIPAScale.z); + else if (!_strnicmp(line, "CMPIPASCALEZ=", 13)) { + sscanf(line + 13, "%lf", &CM_PIPAScale.z); } else if (!_strnicmp(line, "LMNBDX=", 7)) { sscanf(line + 7, "%lf", &LM_IMUDriftRates.m11); @@ -398,14 +398,14 @@ namespace mission { else if (!_strnicmp(line, "LMPIPABIASZ=", 12)) { sscanf(line + 12, "%lf", &LM_PIPABias.z); } - else if (!_strnicmp(line, "LMPIPASCALEX=", 12)) { - sscanf(line + 12, "%lf", &LM_PIPAScale.x); + else if (!_strnicmp(line, "LMPIPASCALEX=", 13)) { + sscanf(line + 13, "%lf", &LM_PIPAScale.x); } - else if (!_strnicmp(line, "LMPIPASCALEY=", 12)) { - sscanf(line + 12, "%lf", &LM_PIPAScale.y); + else if (!_strnicmp(line, "LMPIPASCALEY=", 13)) { + sscanf(line + 13, "%lf", &LM_PIPAScale.y); } - else if (!_strnicmp(line, "LMPIPASCALEZ=", 12)) { - sscanf(line + 12, "%lf", &LM_PIPAScale.z); + else if (!_strnicmp(line, "LMPIPASCALEZ=", 13)) { + sscanf(line + 13, "%lf", &LM_PIPAScale.z); } } //LoadIMU_AndPIPA_RatesAndBiases(hFile); diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 3bccb7eb02..8da621c3ff 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -153,8 +153,8 @@ void IMU::SetPIPABias(const VECTOR3 PIPABias) // input is in cm/sec void IMU::SetPIPAScale(const VECTOR3 PIPAScale) // input is in ppm { pipaBiasScale.PIPA_ScalePPM_X = (PIPAScale.x / 1E6) + 1; - pipaBiasScale.PIPA_ScalePPM_X = (PIPAScale.y / 1E6) + 1; - pipaBiasScale.PIPA_ScalePPM_X = (PIPAScale.z / 1E6) + 1; + pipaBiasScale.PIPA_ScalePPM_Y = (PIPAScale.y / 1E6) + 1; + pipaBiasScale.PIPA_ScalePPM_Z = (PIPAScale.z / 1E6) + 1; } VECTOR3 IMU::GetNBDriftRates() From 406ec15a91020b0bb7837049998df0d900df73aa Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Thu, 22 Feb 2024 20:10:47 -0500 Subject: [PATCH 26/51] update resolver output --- .../ProjectApollo/src_csm/csm_telecom.cpp | 12 +++++----- .../samples/ProjectApollo/src_sys/imu.cpp | 23 +++++-------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp index a235242b63..c79343ee11 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp @@ -2630,7 +2630,7 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 53: // TRUNNION CDU DAC OUT return(scale_data(0,-10,10)); case 54: // IG 1X RSVR OUT SIN - return(scale_data(sat->imu.getResolverSineGimbal().y,-50,50)); + return(scale_data(sat->imu.getResolverSineGimbal().y, -21, 21)); case 55: // O2 SUPPLY MANF PRESS return(scale_data(sat->O2SupplyManifPressSensor.Voltage(), 0.0, 5.0)); case 56: // AC BUS 2 PH A VOLTS @@ -2640,15 +2640,15 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 58: // MAIN BUS B VOLTS return scale_data(sat->sce.GetVoltage(0, 1), 0.0, 5.0); case 59: // IG 1X RSVR OUT COS - return(scale_data(sat->imu.getResolverCosineGimbal().y,130,50)); + return(scale_data(sat->imu.getResolverCosineGimbal().y, -21, 21)); case 60: // MG 1X RSVR OUT SIN - return(scale_data(sat->imu.getResolverSineGimbal().z,-50,50)); + return(scale_data(sat->imu.getResolverSineGimbal().z,-21,21)); case 61: // MG 1X RSVR OUT COS - return(scale_data(sat->imu.getResolverCosineGimbal().z,130,50)); + return(scale_data(sat->imu.getResolverCosineGimbal().z,-21,21)); case 62: // OG 1X RSVR OUT SIN - return(scale_data(sat->imu.getResolverSineGimbal().x,-50,50)); + return(scale_data(sat->imu.getResolverSineGimbal().x, -21, 21)); case 63: // OG 1X RSVR OUT COS - return(scale_data(sat->imu.getResolverCosineGimbal().x,130,50)); + return(scale_data(sat->imu.getResolverCosineGimbal().x, -21, 21)); case 64: // UNKNOWN - HBR ONLY return(0); case 65: // UNKNOWN - HBR ONLY diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 8da621c3ff..b76f4c8288 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -692,23 +692,12 @@ void IMU::DoZeroIMUGimbals() void IMU::calculatePhase(const VECTOR3 NewAngles) { - SineGimbal.x = Gimbal.X - degToRad(50.0); - clampTo2pi(SineGimbal.x); - - SineGimbal.y = Gimbal.Y - degToRad(50.0); - clampTo2pi(SineGimbal.y); - - SineGimbal.z = Gimbal.Z - degToRad(50.0); - clampTo2pi(SineGimbal.z); - - CosineGimbal.x = Gimbal.X + degToRad(130.0); - clampTo2pi(CosineGimbal.x); - - CosineGimbal.y = Gimbal.Y + degToRad(130.0); - clampTo2pi(CosineGimbal.y); - - CosineGimbal.z = Gimbal.Z + degToRad(130.0); - clampTo2pi(CosineGimbal.z); + SineGimbal.x = sin(Gimbal.X - degToRad(50.0)) * 21; //FIXME: This should be fed by 28V 800cps Resolver Phase Excitation. Output is +/- 21VRMS + SineGimbal.y = sin(Gimbal.Y - degToRad(50.0)) * 21; + SineGimbal.z = sin(Gimbal.Z - degToRad(50.0)) * 21; + CosineGimbal.x = cos(Gimbal.X + degToRad(130.0)) * 21; + CosineGimbal.y = cos(Gimbal.Y + degToRad(130.0)) * 21; + CosineGimbal.z = cos(Gimbal.Z + degToRad(130.0)) * 21; ResolverPhaseError.x = (-NewAngles.x - Gimbal.X); ResolverPhaseError.y = (-NewAngles.y - Gimbal.Y); From 784732b43446d790c936fa2fe398a9b4f346a7b2 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 25 Feb 2024 21:42:01 -0500 Subject: [PATCH 27/51] Fix accel bug in PIPA calculation --- Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index b76f4c8288..37fffed1f8 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -500,9 +500,9 @@ void IMU::Timestep(double simdt) SetOrbiterAttitudeReference(); calculatePhase(-GimbalPositionforPhase); - accel.x += pipaBiasScale.PIPA_BiasX + accel.x * pipaBiasScale.PIPA_ScalePPM_X; - accel.y += pipaBiasScale.PIPA_BiasY + accel.y * pipaBiasScale.PIPA_ScalePPM_Y; - accel.z += pipaBiasScale.PIPA_BiasZ + accel.z * pipaBiasScale.PIPA_ScalePPM_Z; + accel.x = pipaBiasScale.PIPA_BiasX + accel.x * pipaBiasScale.PIPA_ScalePPM_X; + accel.y = pipaBiasScale.PIPA_BiasY + accel.y * pipaBiasScale.PIPA_ScalePPM_Y; + accel.z = pipaBiasScale.PIPA_BiasZ + accel.z * pipaBiasScale.PIPA_ScalePPM_Z; // pulse PIPAs pulses = RemainingPIPA.X + (accel.x * LastSimDT / pipaRate); From 425593e5fbec46fdc15a243c8a1f1b12bd19e2b2 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 20 Apr 2024 22:43:36 -0400 Subject: [PATCH 28/51] update Apollo 11 LMPADCNT --- Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn index 9387a1d8a2..1d44889902 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn @@ -58,7 +58,7 @@ Columbia:ProjectApollo\Saturn5 LMASCFUEL 2376.09827 LMDSCEMPTY 2127.25750 LMASCEMPTY 2301.57304 - LMPADCNT 254 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 From 75766f72d640a7b3cc4bbe5fdd37c7d553893bb3 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 12 May 2024 10:38:54 -0400 Subject: [PATCH 29/51] proper resolver output voltage as described by @thewonderidiot --- .../samples/ProjectApollo/src_csm/csm_telecom.cpp | 12 ++++++------ Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp index c79343ee11..2fcba6f33a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp @@ -2630,7 +2630,7 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 53: // TRUNNION CDU DAC OUT return(scale_data(0,-10,10)); case 54: // IG 1X RSVR OUT SIN - return(scale_data(sat->imu.getResolverSineGimbal().y, -21, 21)); + return(scale_data(sat->imu.getResolverSineGimbal().y, 0.0, 5.0)); case 55: // O2 SUPPLY MANF PRESS return(scale_data(sat->O2SupplyManifPressSensor.Voltage(), 0.0, 5.0)); case 56: // AC BUS 2 PH A VOLTS @@ -2640,15 +2640,15 @@ unsigned char PCM::measure(int channel, int type, int ccode){ case 58: // MAIN BUS B VOLTS return scale_data(sat->sce.GetVoltage(0, 1), 0.0, 5.0); case 59: // IG 1X RSVR OUT COS - return(scale_data(sat->imu.getResolverCosineGimbal().y, -21, 21)); + return(scale_data(sat->imu.getResolverCosineGimbal().y, 0.0, 5.0)); case 60: // MG 1X RSVR OUT SIN - return(scale_data(sat->imu.getResolverSineGimbal().z,-21,21)); + return(scale_data(sat->imu.getResolverSineGimbal().z, 0.0, 5.0)); case 61: // MG 1X RSVR OUT COS - return(scale_data(sat->imu.getResolverCosineGimbal().z,-21,21)); + return(scale_data(sat->imu.getResolverCosineGimbal().z, 0.0, 5.0)); case 62: // OG 1X RSVR OUT SIN - return(scale_data(sat->imu.getResolverSineGimbal().x, -21, 21)); + return(scale_data(sat->imu.getResolverSineGimbal().x, 0.0, 5.0)); case 63: // OG 1X RSVR OUT COS - return(scale_data(sat->imu.getResolverCosineGimbal().x, -21, 21)); + return(scale_data(sat->imu.getResolverCosineGimbal().x, 0.0, 5.0)); case 64: // UNKNOWN - HBR ONLY return(0); case 65: // UNKNOWN - HBR ONLY diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 37fffed1f8..18c34aef3e 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -692,12 +692,12 @@ void IMU::DoZeroIMUGimbals() void IMU::calculatePhase(const VECTOR3 NewAngles) { - SineGimbal.x = sin(Gimbal.X - degToRad(50.0)) * 21; //FIXME: This should be fed by 28V 800cps Resolver Phase Excitation. Output is +/- 21VRMS - SineGimbal.y = sin(Gimbal.Y - degToRad(50.0)) * 21; - SineGimbal.z = sin(Gimbal.Z - degToRad(50.0)) * 21; - CosineGimbal.x = cos(Gimbal.X + degToRad(130.0)) * 21; - CosineGimbal.y = cos(Gimbal.Y + degToRad(130.0)) * 21; - CosineGimbal.z = cos(Gimbal.Z + degToRad(130.0)) * 21; + SineGimbal.x = 2.5 + sin(Gimbal.X) * 26 * 2.5 / 20.25; //FIXME: This should be fed by 28V 800cps Resolver Phase Excitation. Output is +/- 21VRMS + SineGimbal.y = 2.5 + sin(Gimbal.Y) * 26 * 2.5 / 20.25; + SineGimbal.z = 2.5 + sin(Gimbal.Z) * 26 * 2.5 / 20.25; + CosineGimbal.x = 2.5 + cos(Gimbal.X) * 26 * 2.5 / 20.25; + CosineGimbal.y = 2.5 + cos(Gimbal.Y) * 26 * 2.5 / 20.25; + CosineGimbal.z = 2.5 + cos(Gimbal.Z) * 26 * 2.5 / 20.25; ResolverPhaseError.x = (-NewAngles.x - Gimbal.X); ResolverPhaseError.y = (-NewAngles.y - Gimbal.Y); From b5bfbe4e00fdc93e4756e6bba95492641c80aee5 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 12 May 2024 10:57:13 -0400 Subject: [PATCH 30/51] add CMC EMEMs for Apollo 11 --- .../Apollo 11 - 01 - Before Launch T-20min.scn | 15 +++++++++++++++ .../Apollo 11 - 02 - Before Launch T-30sec.scn | 15 +++++++++++++++ ...o 11 - 03 - After Insertion Checklist T+1h.scn | 15 +++++++++++++++ .../Apollo 11 - 04 - Before TLI T+2h30min.scn | 15 +++++++++++++++ ...1 - 05 - Before S-IVB Separation T+3h15min.scn | 15 +++++++++++++++ .../Apollo 11 - 06 - Before MCC-2 T+26h30min.scn | 15 +++++++++++++++ .../Apollo 11 - 07 - Before LOI Day T+69h.scn | 15 +++++++++++++++ .../Apollo 11 - 08 - Before LOI-1 T+75h50min.scn | 15 +++++++++++++++ .../Apollo 11 - 09 - Before LOI-2 T+79h46min.scn | 15 +++++++++++++++ .../Apollo 11 - 10 - Before PDI Day T+94h.scn | 15 +++++++++++++++ .../Apollo 11 - 11 - Before DOI T+101h34min.scn | 15 +++++++++++++++ .../Apollo 11 - 12 - Before PDI T+102h28min.scn | 15 +++++++++++++++ ...Apollo 11 - 13 - After Landing T+103h10min.scn | 15 +++++++++++++++ .../Apollo 11 - 14 - Before EVA T+109h54min.scn | 15 +++++++++++++++ .../Apollo 11 - 15 - After EVA T+116h27min.scn | 15 +++++++++++++++ ...o 11 - 16 - Lunar Liftoff Prep T+122h14min.scn | 15 +++++++++++++++ ...11 - 17 - Before Lunar Liftoff T+124h20min.scn | 15 +++++++++++++++ ...Apollo 11 - 18 - After Docking T+128h23min.scn | 15 +++++++++++++++ .../Apollo 11 - 19 - Before TEI T+135h13min.scn | 15 +++++++++++++++ .../Apollo 11 - 20 - Before MCC-6 T+171h54min.scn | 12 ++++++++++++ ...o 11 - 21 - Entry Preparations T+193h17min.scn | 15 +++++++++++++++ .../Project Apollo - NASSP/Apollo 12 - Launch.scn | 2 +- 22 files changed, 313 insertions(+), 1 deletion(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn index f59b094082..541cad5f1e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn @@ -607,6 +607,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3470 EMEM1441 26063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn index 806ee36c48..5e605794fb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn @@ -610,6 +610,21 @@ AGC_BEGIN EMEM1434 5324 EMEM1435 2003 EMEM1440 3470 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1441 26063 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn index 9ed4952fa1..8f06231609 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn @@ -884,6 +884,21 @@ AGC_BEGIN EMEM1445 32005 EMEM1446 3162 EMEM1447 76067 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn index ee4fc7cfae..7655178dbb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn @@ -898,6 +898,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn index 8b8344988d..f78da74caf 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn @@ -897,6 +897,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn index e886e06215..ab2bd05c44 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn @@ -644,6 +644,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn index 8501788627..ead4fd44ad 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn @@ -641,6 +641,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn index d01eb2c0f6..0af8592724 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn @@ -644,6 +644,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn index b44b8784e2..70c3436a6c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn @@ -666,6 +666,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn index 447ac6e840..ec18519470 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn @@ -678,6 +678,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn index f78684eac5..bb0baa31c3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn @@ -709,6 +709,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn index 4c4cfdaecd..2e5cebea17 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn @@ -713,6 +713,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn index ab07ee4c39..2f3b297c6b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn @@ -706,6 +706,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn index 396cacea9b..9622d9c8e0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn @@ -689,6 +689,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56060 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn index 40c770af1e..f95cc00572 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn @@ -692,6 +692,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56060 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn index f75aa840e0..2dcea6e1e9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn @@ -688,6 +688,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56060 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn index 008260a635..afce5ba262 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn @@ -703,6 +703,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn index 16a5fcff49..24ea523117 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn @@ -700,6 +700,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn index f8d1527162..ef4a727a5a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn @@ -698,6 +698,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn index b0070b18d8..123ba77570 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 20 - Before MCC-6 T+171h54min.scn @@ -697,9 +697,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 EMEM1460 77432 EMEM1461 77663 EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 21 - Entry Preparations T+193h17min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 21 - Entry Preparations T+193h17min.scn index 565c38eb9f..63a283b75d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 21 - Entry Preparations T+193h17min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 21 - Entry Preparations T+193h17min.scn @@ -700,6 +700,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56060 + EMEM1452 74267 + EMEM1453 00520 + EMEM1454 76133 + EMEM1455 76450 + EMEM1456 01754 + EMEM1457 77403 + EMEM1460 77432 + EMEM1461 77663 + EMEM1462 77746 + EMEM1463 00435 + EMEM1464 00137 + EMEM1465 00023 + EMEM1466 77615 + EMEM1467 00071 + EMEM1470 00137 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn index 5a23853748..45864c78f2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn @@ -55,7 +55,7 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMASCFUEL 2375.009649 LMDSCEMPTY 2163.680964 LMASCEMPTY 2335.592472 - LMPADCNT 253 + LMPADCNT 268 LMPAD 0077 12000 LMPAD 0104 06000 LMPAD 0106 00000 From 8f750d5e79f1fa6dcaf762d5ad0f16da80da519f Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sun, 12 May 2024 14:36:55 -0400 Subject: [PATCH 31/51] Update LM EMEMs for IMU drift and bias --- .../Apollo 11 - 01 - Before Launch T-20min.scn | 17 ++++++++++++++++- .../Apollo 11 - 02 - Before Launch T-30sec.scn | 17 ++++++++++++++++- ...11 - 03 - After Insertion Checklist T+1h.scn | 17 ++++++++++++++++- .../Apollo 11 - 04 - Before TLI T+2h30min.scn | 17 ++++++++++++++++- ...- 05 - Before S-IVB Separation T+3h15min.scn | 17 ++++++++++++++++- ...Apollo 11 - 06 - Before MCC-2 T+26h30min.scn | 15 +++++++++++++++ .../Apollo 11 - 07 - Before LOI Day T+69h.scn | 15 +++++++++++++++ ...Apollo 11 - 08 - Before LOI-1 T+75h50min.scn | 15 +++++++++++++++ ...Apollo 11 - 09 - Before LOI-2 T+79h46min.scn | 15 +++++++++++++++ .../Apollo 11 - 10 - Before PDI Day T+94h.scn | 15 +++++++++++++++ .../Apollo 11 - 11 - Before DOI T+101h34min.scn | 15 +++++++++++++++ .../Apollo 11 - 12 - Before PDI T+102h28min.scn | 15 +++++++++++++++ ...ollo 11 - 13 - After Landing T+103h10min.scn | 15 +++++++++++++++ .../Apollo 11 - 14 - Before EVA T+109h54min.scn | 15 +++++++++++++++ .../Apollo 11 - 15 - After EVA T+116h27min.scn | 15 +++++++++++++++ ...11 - 16 - Lunar Liftoff Prep T+122h14min.scn | 15 +++++++++++++++ ...ollo 11 - 18 - After Docking T+128h23min.scn | 15 +++++++++++++++ .../Apollo 11 - 19 - Before TEI T+135h13min.scn | 15 +++++++++++++++ 18 files changed, 275 insertions(+), 5 deletions(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn index 541cad5f1e..4321488a38 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn @@ -75,7 +75,7 @@ Columbia:ProjectApollo\Saturn5 SMMASS 4222.491210937500 CMFUELLOAD 111.000000000000 CMMASS 5458.576171875000 - LMPADCNT 254 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 @@ -89,6 +89,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 + LMPAD 1452 06604 + LMPAD 1453 73446 + LMPAD 1454 01014 + LMPAD 1455 55120 + LMPAD 1456 02031 + LMPAD 1457 65656 + LMPAD 1460 77463 + LMPAD 1461 00744 + LMPAD 1462 01060 + LMPAD 1463 00404 + LMPAD 1464 00116 + LMPAD 1465 77661 + LMPAD 1466 00234 + LMPAD 1467 77575 + LMPAD 1470 77575 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn index 5e605794fb..a422038438 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn @@ -75,7 +75,7 @@ Columbia:ProjectApollo\Saturn5 SMMASS 4222.491210937500 CMFUELLOAD 111.000000000000 CMMASS 5458.576171875000 - LMPADCNT 254 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 @@ -89,6 +89,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 + LMPAD 1452 06604 + LMPAD 1453 73446 + LMPAD 1454 01014 + LMPAD 1455 55120 + LMPAD 1456 02031 + LMPAD 1457 65656 + LMPAD 1460 77463 + LMPAD 1461 00744 + LMPAD 1462 01060 + LMPAD 1463 00404 + LMPAD 1464 00116 + LMPAD 1465 77661 + LMPAD 1466 00234 + LMPAD 1467 77575 + LMPAD 1470 77575 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn index 8f06231609..0029e0e79a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn @@ -64,7 +64,7 @@ Columbia:ProjectApollo\Saturn5 SMMASS 4222.491210937500 CMFUELLOAD 111.000000000000 CMMASS 5458.576171875000 - LMPADCNT 254 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 @@ -78,6 +78,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 + LMPAD 1452 06604 + LMPAD 1453 73446 + LMPAD 1454 01014 + LMPAD 1455 55120 + LMPAD 1456 02031 + LMPAD 1457 65656 + LMPAD 1460 77463 + LMPAD 1461 00744 + LMPAD 1462 01060 + LMPAD 1463 00404 + LMPAD 1464 00116 + LMPAD 1465 77661 + LMPAD 1466 00234 + LMPAD 1467 77575 + LMPAD 1470 77575 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn index 7655178dbb..e3a3a62fe9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn @@ -63,7 +63,7 @@ Columbia:ProjectApollo\Saturn5 SMMASS 4222.491210937500 CMFUELLOAD 111.000000000000 CMMASS 5458.576171875000 - LMPADCNT 254 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 @@ -77,6 +77,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 + LMPAD 1452 06604 + LMPAD 1453 73446 + LMPAD 1454 01014 + LMPAD 1455 55120 + LMPAD 1456 02031 + LMPAD 1457 65656 + LMPAD 1460 77463 + LMPAD 1461 00744 + LMPAD 1462 01060 + LMPAD 1463 00404 + LMPAD 1464 00116 + LMPAD 1465 77661 + LMPAD 1466 00234 + LMPAD 1467 77575 + LMPAD 1470 77575 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn index f78da74caf..9ab6e295df 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn @@ -62,7 +62,7 @@ Columbia:ProjectApollo\Saturn5 SMMASS 4222.491210937500 CMFUELLOAD 111.000000000000 CMMASS 5458.576171875000 - LMPADCNT 254 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 @@ -76,6 +76,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 + LMPAD 1452 06604 + LMPAD 1453 73446 + LMPAD 1454 01014 + LMPAD 1455 55120 + LMPAD 1456 02031 + LMPAD 1457 65656 + LMPAD 1460 77463 + LMPAD 1461 00744 + LMPAD 1462 01060 + LMPAD 1463 00404 + LMPAD 1464 00116 + LMPAD 1465 77661 + LMPAD 1466 00234 + LMPAD 1467 77575 + LMPAD 1470 77575 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn index ab2bd05c44..b5b827ac1b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn @@ -7731,6 +7731,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn index ead4fd44ad..5787fc22aa 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn @@ -7027,6 +7027,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn index 0af8592724..ad3939bff9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn @@ -8590,6 +8590,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn index 70c3436a6c..5113deca4d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn @@ -7990,6 +7990,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn index ec18519470..1123a53378 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn @@ -7198,6 +7198,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn index bb0baa31c3..a924a79b78 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn @@ -7987,6 +7987,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn index 2e5cebea17..f31d3c8e4b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn @@ -8002,6 +8002,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn index 2f3b297c6b..88c946149e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn @@ -8022,6 +8022,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn index 9622d9c8e0..9c3adac941 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn @@ -8035,6 +8035,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn index f95cc00572..2022fb4b2c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn @@ -8053,6 +8053,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn index 2dcea6e1e9..ac0a223ff1 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn @@ -8046,6 +8046,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn index 24ea523117..d19c15292d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn @@ -8507,6 +8507,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn index ef4a727a5a..db3cd2cba4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn @@ -8860,6 +8860,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 From 4ab148eeb2fdd4893f49bc0091f52b72b4214b48 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Tue, 14 May 2024 23:29:17 -0400 Subject: [PATCH 32/51] add IMU compensation values --- Missions/ProjectApollo/Apollo 10.cfg | 32 ++++++++++++++++++- Missions/ProjectApollo/Apollo 7.cfg | 15 +++++++++ Missions/ProjectApollo/Apollo 8.cfg | 17 +++++++++- Missions/ProjectApollo/Apollo 9.cfg | 32 ++++++++++++++++++- ...Apollo 10 - 01 - Before Launch T-20min.scn | 32 ++++++++++++++++++- ...Apollo 10 - 02 - Before Launch T-30sec.scn | 32 ++++++++++++++++++- ...03 - After Insertion Checklist T+44min.scn | 32 ++++++++++++++++++- .../Apollo 10 - 04 - Before TLI T+2h20min.scn | 32 ++++++++++++++++++- ...o 10 - 05 - Before CSM Separation T+3h.scn | 32 ++++++++++++++++++- ...pollo 10 - 06 - Before MCC-1 TIG-15min.scn | 30 +++++++++++++++++ ...pollo 10 - 07 - Before LOI-1 TIG-15min.scn | 30 +++++++++++++++++ ...pollo 10 - 08 - Before LOI-2 TIG-15min.scn | 30 +++++++++++++++++ ...- 09 - Before LM Activation T+94h13min.scn | 30 +++++++++++++++++ ... 10 - 10 - Before Undocking T+98h15min.scn | 30 +++++++++++++++++ .../Apollo 10 - 11 - Before DOI TIG-6min.scn | 30 +++++++++++++++++ ...ollo 10 - 12 - Before Phasing TIG-6min.scn | 30 +++++++++++++++++ ...o 10 - 13 - Before Insertion TIG-11min.scn | 30 +++++++++++++++++ .../Apollo 10 - 14 - Before CSI TIG-6min.scn | 30 +++++++++++++++++ ...lo 10 - 15 - After Docking T+106h20min.scn | 30 +++++++++++++++++ .../Apollo 9/Apollo 9 - 01 - Launch T-60s.scn | 32 ++++++++++++++++++- .../Apollo 9 - 02 - After Insertion.scn | 32 ++++++++++++++++++- .../Apollo 9/Apollo 9 - 03 - Before TD&E.scn | 32 ++++++++++++++++++- .../Apollo 9 - 04 - Before LM ejection.scn | 30 +++++++++++++++++ .../Apollo 10 - Launch.scn | 32 ++++++++++++++++++- .../Apollo 9 - Launch.scn | 32 ++++++++++++++++++- 25 files changed, 733 insertions(+), 13 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 10.cfg b/Missions/ProjectApollo/Apollo 10.cfg index 24b9785a02..6fe67a44ef 100644 --- a/Missions/ProjectApollo/Apollo 10.cfg +++ b/Missions/ProjectApollo/Apollo 10.cfg @@ -13,4 +13,34 @@ LMPVesselName=Gene Cernan CDRSuitName=T. STAFFORD CMPSuitName=J. YOUNG LMPSuitName=E. CERNAN -CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file +CSMCueCard=1 SATURN_BOOST_A14 +CMPIPABIASX=-0.27 +CMPIPASCALEX=-100 +CMPIPABIASY=-0.07 +CMPIPASCALEY=-230 +CMPIPABIASZ=0.05 +CMPIPASCALEZ=-80 +CMNBDX=0.4 +CMNBDY=-1.3 +CMNBDZ=1.2 +CMADIAX=1 +CMADIAY=13 +CMADIAZ=11 +CMADSRAX=10 +CMADSRAY=-1.3 +CMADSRAZ=7 +LMPIPABIASX=-0.41 +LMPIPASCALEX=-430 +LMPIPABIASY=0.18 +LMPIPASCALEY=-840 +LMPIPABIASZ=-0.03 +LMPIPASCALEZ=-530 +LMNBDX=-3.2 +LMNBDY=1.5 +LMNBDZ=1.2 +LMADIAX=1 +LMADIAY=20 +LMADIAZ=-24 +LMADSRAX=5 +LMADSRAY=2 +LMADSRAZ=-1 \ No newline at end of file diff --git a/Missions/ProjectApollo/Apollo 7.cfg b/Missions/ProjectApollo/Apollo 7.cfg index fb1429d664..1c698a61ff 100644 --- a/Missions/ProjectApollo/Apollo 7.cfg +++ b/Missions/ProjectApollo/Apollo 7.cfg @@ -8,3 +8,18 @@ LMPVesselName=Walt Cunningham CDRSuitName=W. SCHIRRA CMPSuitName=D. EISELE LMPSuitName=W. CUNNINGHAM +CMPIPABIASX=0.24 +CMPIPASCALEX=-300 +CMPIPABIASY=0.24 +CMPIPASCALEY=-190 +CMPIPABIASZ=0.14 +CMPIPASCALEZ=-340 +CMNBDX=-0.5 +CMNBDY=0 +CMNBDZ=-0.6 +CMADIAX=8.2 +CMADIAY=11.6 +CMADIAZ=20.8 +CMADSRAX=3.9 +CMADSRAY=-0.4 +CMADSRAZ=-8.8 diff --git a/Missions/ProjectApollo/Apollo 8.cfg b/Missions/ProjectApollo/Apollo 8.cfg index 5f9338505d..2fcc7aeba9 100644 --- a/Missions/ProjectApollo/Apollo 8.cfg +++ b/Missions/ProjectApollo/Apollo 8.cfg @@ -7,4 +7,19 @@ LMPVesselName=Bill Anders CDRSuitName=F. BORMAN CMPSuitName=J. LOVELL LMPSuitName=W. ANDERS -CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file +CSMCueCard=1 SATURN_BOOST_A14 +CMPIPABIASX=-0.0013 +CMPIPASCALEX=-76.57 +CMPIPABIASY=0.803 +CMPIPASCALEY=-329.14 +CMPIPABIASZ=0.631 +CMPIPASCALEZ=-200.71 +CMNBDX=2.18 +CMNBDY=2.62 +CMNBDZ=3.22 +CMADIAX=17.88 +CMADIAY=-3.22 +CMADIAZ=28.23 +CMADSRAX=-2.24 +CMADSRAY=1.66 +CMADSRAZ=-3.22 \ No newline at end of file diff --git a/Missions/ProjectApollo/Apollo 9.cfg b/Missions/ProjectApollo/Apollo 9.cfg index 3239095f4d..84e6efabff 100644 --- a/Missions/ProjectApollo/Apollo 9.cfg +++ b/Missions/ProjectApollo/Apollo 9.cfg @@ -14,4 +14,34 @@ LMPVesselName=Rusty Schweickart CDRSuitName=J. MCDIVITT CMPSuitName=D. SCOTT LMPSuitName=R. SCHWEICKART -CSMCueCard=1 SATURN_BOOST_A14 \ No newline at end of file +CSMCueCard=1 SATURN_BOOST_A14 +CMPIPABIASX=0.64 +CMPIPASCALEX=-140 +CMPIPABIASY=-0.1 +CMPIPASCALEY=-330 +CMPIPABIASZ=0.44 +CMPIPASCALEZ=-280 +CMNBDX=2.4 +CMNBDY=0 +CMNBDZ=2.4 +CMADIAX=5 +CMADIAY=8 +CMADIAZ=-18 +CMADSRAX=7 +CMADSRAY=9 +CMADSRAZ=-4 +LMPIPABIASX=0.31 +LMPIPASCALEX=-968 +LMPIPABIASY=0.19 +LMPIPASCALEY=-941 +LMPIPABIASZ=0 +LMPIPASCALEZ=-852 +LMNBDX=4.6 +LMNBDY=5 +LMNBDZ=4.5 +LMADIAX=5.4 +LMADIAY=-0.3 +LMADIAZ=19.6 +LMADSRAX=-0.5 +LMADSRAY=16.3 +LMADSRAZ=-1.7 \ No newline at end of file diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn index 3e4ed070e9..52a92e6bc3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn @@ -76,12 +76,27 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 183 + LMPADCNT 198 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1452 73631 + LMPAD 1453 70750 + LMPAD 1454 01660 + LMPAD 1455 62171 + LMPAD 1456 77542 + LMPAD 1457 67241 + LMPAD 1460 77150 + LMPAD 1461 00277 + LMPAD 1462 00231 + LMPAD 1463 00032 + LMPAD 1464 01010 + LMPAD 1465 76617 + LMPAD 1466 00202 + LMPAD 1467 00064 + LMPAD 1470 77745 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -513,6 +528,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3470 EMEM1441 26063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn index 5e0a6e992c..5a02e75d92 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn @@ -76,12 +76,27 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 183 + LMPADCNT 198 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1452 73631 + LMPAD 1453 70750 + LMPAD 1454 01660 + LMPAD 1455 62171 + LMPAD 1456 77542 + LMPAD 1457 67241 + LMPAD 1460 77150 + LMPAD 1461 00277 + LMPAD 1462 00231 + LMPAD 1463 00032 + LMPAD 1464 01010 + LMPAD 1465 76617 + LMPAD 1466 00202 + LMPAD 1467 00064 + LMPAD 1470 77745 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -515,6 +530,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3470 EMEM1441 26063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn index 510386f0a5..cfcb1777c2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn @@ -64,12 +64,27 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 183 + LMPADCNT 198 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1452 73631 + LMPAD 1453 70750 + LMPAD 1454 01660 + LMPAD 1455 62171 + LMPAD 1456 77542 + LMPAD 1457 67241 + LMPAD 1460 77150 + LMPAD 1461 00277 + LMPAD 1462 00231 + LMPAD 1463 00032 + LMPAD 1464 01010 + LMPAD 1465 76617 + LMPAD 1466 00202 + LMPAD 1467 00064 + LMPAD 1470 77745 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -735,6 +750,21 @@ AGC_BEGIN EMEM1443 70065 EMEM1446 3161 EMEM1447 76067 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn index 53fa253244..a598a7a106 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn @@ -63,12 +63,27 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 183 + LMPADCNT 198 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1452 73631 + LMPAD 1453 70750 + LMPAD 1454 01660 + LMPAD 1455 62171 + LMPAD 1456 77542 + LMPAD 1457 67241 + LMPAD 1460 77150 + LMPAD 1461 00277 + LMPAD 1462 00231 + LMPAD 1463 00032 + LMPAD 1464 01010 + LMPAD 1465 76617 + LMPAD 1466 00202 + LMPAD 1467 00064 + LMPAD 1470 77745 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -810,6 +825,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn index ef20b9e73c..9c54c11854 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn @@ -63,12 +63,27 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 183 + LMPADCNT 198 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1452 73631 + LMPAD 1453 70750 + LMPAD 1454 01660 + LMPAD 1455 62171 + LMPAD 1456 77542 + LMPAD 1457 67241 + LMPAD 1460 77150 + LMPAD 1461 00277 + LMPAD 1462 00231 + LMPAD 1463 00032 + LMPAD 1464 01010 + LMPAD 1465 76617 + LMPAD 1466 00202 + LMPAD 1467 00064 + LMPAD 1470 77745 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -814,6 +829,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn index 5e4dfab4f4..be7b564572 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn @@ -639,6 +639,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7659,6 +7674,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1570 37777 EMEM1642 37777 EMEM1706 12 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn index c5536eaf13..fd81c5c50a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn @@ -646,6 +646,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8036,6 +8051,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1570 37777 EMEM1642 37777 EMEM1706 12 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn index 1ceb482365..97e14d3b37 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn @@ -646,6 +646,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56067 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8046,6 +8061,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1570 37777 EMEM1642 37777 EMEM1706 12 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn index 4fbe9a2b5b..3e20a00bef 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn @@ -682,6 +682,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7360,6 +7375,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1570 37777 EMEM1642 37777 EMEM1706 12 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn index 36f71f26e1..32375529d6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn @@ -7980,6 +7980,36 @@ AGC_BEGIN EMEM1445 30005 EMEM1450 3162 EMEM1451 10103 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn index 608dad44fc..4d90020c8e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn @@ -668,6 +668,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7944,6 +7959,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3162 EMEM1451 10103 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn index 1f7ab7fc28..54da26d11a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn @@ -670,6 +670,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM 1467 00064 + EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8004,6 +8019,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3162 EMEM1451 10103 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn index 5bdf794c81..f440f6891a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn @@ -700,6 +700,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8097,6 +8112,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3162 EMEM1451 10103 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM 1467 00064 + EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn index 03359f1281..64d408851c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn @@ -699,6 +699,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8115,6 +8130,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3162 EMEM1451 10103 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn index d1d1883725..eb5cce15ff 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn @@ -705,6 +705,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 546 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 77746 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8532,6 +8547,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3162 EMEM1451 10103 + EMEM1452 73631 + EMEM1453 70750 + EMEM1454 01660 + EMEM1455 62171 + EMEM1456 77542 + EMEM1457 67241 + EMEM1460 77150 + EMEM1461 00277 + EMEM1462 00231 + EMEM1463 00032 + EMEM1464 01010 + EMEM1465 76617 + EMEM1466 00202 + EMEM1467 00064 + EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn index 63a46caf11..547fe3fb64 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn @@ -76,13 +76,28 @@ Gumdrop:ProjectApollo\Saturn5 SMMASS 4170.509765625000 CMFUELLOAD 111.000000000000 CMMASS 5476.674316406250 - LMPADCNT 84 + LMPADCNT 99 LMPAD 0333 10000 LMPAD 1057 13000 LMPAD 1243 15652 LMPAD 1244 04422 LMPAD 1335 07132 LMPAD 1336 06520 + LMPAD 1452 03131 + LMPAD 1453 60066 + LMPAD 1454 01454 + LMPAD 1455 60462 + LMPAD 1456 00000 + LMPAD 1457 62045 + LMPAD 1460 01111 + LMPAD 1461 01174 + LMPAD 1462 01075 + LMPAD 1463 00202 + LMPAD 1464 00000 + LMPAD 1465 01010 + LMPAD 1466 77745 + LMPAD 1467 00640 + LMPAD 1470 77713 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -446,6 +461,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3417 EMEM1441 26063 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn index 7057fed528..d1e32b158d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn @@ -66,13 +66,28 @@ Gumdrop:ProjectApollo\Saturn5 SMMASS 4170.509765625000 CMFUELLOAD 111.000000000000 CMMASS 5476.674316406250 - LMPADCNT 84 + LMPADCNT 99 LMPAD 0333 10000 LMPAD 1057 13000 LMPAD 1243 15652 LMPAD 1244 04422 LMPAD 1335 07132 LMPAD 1336 06520 + LMPAD 1452 03131 + LMPAD 1453 60066 + LMPAD 1454 01454 + LMPAD 1455 60462 + LMPAD 1456 00000 + LMPAD 1457 62045 + LMPAD 1460 01111 + LMPAD 1461 01174 + LMPAD 1462 01075 + LMPAD 1463 00202 + LMPAD 1464 00000 + LMPAD 1465 01010 + LMPAD 1466 77745 + LMPAD 1467 00640 + LMPAD 1470 77713 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -635,6 +650,21 @@ AGC_BEGIN EMEM1445 32005 EMEM1446 3065 EMEM1447 76067 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn index 23c190a780..6a5d3fd366 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn @@ -66,13 +66,28 @@ Gumdrop:ProjectApollo\Saturn5 SMMASS 4170.509765625000 CMFUELLOAD 111.000000000000 CMMASS 5476.674316406250 - LMPADCNT 84 + LMPADCNT 99 LMPAD 0333 10000 LMPAD 1057 13000 LMPAD 1243 15652 LMPAD 1244 04422 LMPAD 1335 07132 LMPAD 1336 06520 + LMPAD 1452 03131 + LMPAD 1453 60066 + LMPAD 1454 01454 + LMPAD 1455 60462 + LMPAD 1456 00000 + LMPAD 1457 62045 + LMPAD 1460 01111 + LMPAD 1461 01174 + LMPAD 1462 01075 + LMPAD 1463 00202 + LMPAD 1464 00000 + LMPAD 1465 01010 + LMPAD 1466 77745 + LMPAD 1467 00640 + LMPAD 1470 77713 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -652,6 +667,21 @@ AGC_BEGIN EMEM1445 32005 EMEM1446 3065 EMEM1447 76067 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn index f6dd8a7814..f753ad8351 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn @@ -596,6 +596,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56103 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -4859,6 +4874,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index a131ee48bc..43b392827a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn @@ -59,12 +59,27 @@ Charlie-Brown:ProjectApollo\Saturn5 LMASCFUEL 1193.40153 LMDSCEMPTY 2133.24492 LMASCEMPTY 2446.22365 - LMPADCNT 183 + LMPADCNT 198 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1452 73631 + LMPAD 1453 70750 + LMPAD 1454 01660 + LMPAD 1455 62171 + LMPAD 1456 77542 + LMPAD 1457 67241 + LMPAD 1460 77150 + LMPAD 1461 00277 + LMPAD 1462 00231 + LMPAD 1463 00032 + LMPAD 1464 01010 + LMPAD 1465 76617 + LMPAD 1466 00202 + LMPAD 1467 00064 + LMPAD 1470 77745 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -533,6 +548,21 @@ LVIMU_END CMPAD1353 620 CMPAD1354 0 CMPAD1355 33260 + CMPAD1452 74157 + CMPAD1453 76270 + CMPAD1454 77011 + CMPAD1455 74166 + CMPAD1456 546 + CMPAD1457 76540 + CMPAD1460 63 + CMPAD1461 77532 + CMPAD1462 231 + CMPAD1463 23 + CMPAD1464 367 + CMPAD1465 321 + CMPAD1466 276 + CMPAD1467 77746 + CMPAD1470 205 CMPAD1706 12 CMPAD1707 13256 CMPAD1710 33160 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn index 80a3f617e6..b78b612e05 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn @@ -58,13 +58,28 @@ Gumdrop:ProjectApollo\Saturn5 LMASCFUEL 1882.40834 LMDSCEMPTY 1883.76911 LMASCEMPTY 2278.39447 - LMPADCNT 84 + LMPADCNT 99 LMPAD 0333 10000 LMPAD 1057 13000 LMPAD 1243 15652 LMPAD 1244 04422 LMPAD 1335 07132 LMPAD 1336 06520 + LMPAD 1452 03131 + LMPAD 1453 60066 + LMPAD 1454 01454 + LMPAD 1455 60462 + LMPAD 1456 00000 + LMPAD 1457 62045 + LMPAD 1460 01111 + LMPAD 1461 01174 + LMPAD 1462 01075 + LMPAD 1463 00202 + LMPAD 1464 00000 + LMPAD 1465 01010 + LMPAD 1466 77745 + LMPAD 1467 00640 + LMPAD 1470 77713 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 @@ -223,6 +238,21 @@ LVIMU_END CMPAD1353 632 CMPAD1354 0 CMPAD1355 21450 + CMPAD1452 10755 + CMPAD1453 75551 + CMPAD1454 76462 + CMPAD1455 72457 + CMPAD1456 6123 + CMPAD1457 73322 + CMPAD1460 461 + CMPAD1461 0 + CMPAD1462 461 + CMPAD1463 137 + CMPAD1464 230 + CMPAD1465 77251 + CMPAD1466 205 + CMPAD1467 253 + CMPAD1470 77663 CMPAD1706 7 CMPAD1707 35016 CMPAD1710 31003 From 6149a9632808cb388032218ad97f84e1d43f2c06 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 15 May 2024 22:28:12 -0400 Subject: [PATCH 33/51] finish adding IMU bias EMEMs --- .../Apollo 7 - 01 - Before Launch T-60s.scn | 15 ++++++++++ ...- 02 - After Insertion Checklist T+30m.scn | 15 ++++++++++ ...- 03 - Before S-IVB Separation T+2h40m.scn | 15 ++++++++++ ...- 04 - Before Phasing Maneuver T+3h10m.scn | 15 ++++++++++ ...- Before 2nd Phasing Maneuver T+15h40m.scn | 15 ++++++++++ ...7 - 06 - Before NCC1 Maneuver T+26h10m.scn | 15 ++++++++++ ...lo 7 - 07 - Before Rendezvous T+28h02m.scn | 15 ++++++++++ .../Apollo 7 - 08 - Before TPI T+29h16m.scn | 15 ++++++++++ ...efore 2nd Separation Maneuver T+30h05m.scn | 15 ++++++++++ .../Apollo 7 - 10 - Before SPS-3 T+75h24m.scn | 15 ++++++++++ ...Apollo 7 - 11 - Before SPS-4 T+120h28m.scn | 15 ++++++++++ ...- 12 - Before Landmark Tracking T+122h.scn | 15 ++++++++++ ...Before 2nd Landmark Tracking T+142h30m.scn | 15 ++++++++++ ...Apollo 7 - 14 - Before SPS-5 T+164h30m.scn | 15 ++++++++++ ...Apollo 7 - 15 - Before SPS-6 T+209h52m.scn | 15 ++++++++++ ...Before 3rd Landmark Tracking T+214h25m.scn | 15 ++++++++++ ...Apollo 7 - 17 - Before SPS-7 T+238h51m.scn | 15 ++++++++++ ... Before Deorbit Preparations T+257h19m.scn | 15 ++++++++++ ... 19 - Before SPS-8 (Deorbit) T+258h59m.scn | 15 ++++++++++ ... 7 - 20 - At Entry Interface T+259h34m.scn | 15 ++++++++++ .../Apollo 8 - 01 - Before Launch T-20min.scn | 15 ++++++++++ .../Apollo 8 - 02 - Before Launch T-60s.scn | 15 ++++++++++ ...03 - After Insertion Checklist T+54min.scn | 15 ++++++++++ ...lo 8 - 04 - TLI Preparations T+2h20min.scn | 15 ++++++++++ ...05 - Before S-IVB Separation T+3h10min.scn | 15 ++++++++++ .../Apollo 8 - 06 - Before MCC1 TIG-15min.scn | 15 ++++++++++ .../Apollo 8 - 07 - Before MCC4 TIG-15min.scn | 15 ++++++++++ ...Apollo 8 - 08 - Before LOI-1 TIG-15min.scn | 15 ++++++++++ ...Apollo 8 - 09 - Before LOI-2 TIG-15min.scn | 15 ++++++++++ .../Apollo 8 - 10 - Before TEI TIG-15min.scn | 15 ++++++++++ .../Apollo 8 - 11 - Before MCC6 TIG-15min.scn | 15 ++++++++++ ... - 12 - Entry Preparations T+142h40min.scn | 15 ++++++++++ ...o 8 - 13 - Entry Interface T+146h40min.scn | 15 ++++++++++ .../Apollo 9/Apollo 9 - 05 - Before SPS-1.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 06 - Before SPS-2.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 07 - Before SPS-3.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 08 - Before SPS-4.scn | 30 +++++++++++++++++++ .../Apollo 9 - 09 - Before LM activation.scn | 30 +++++++++++++++++++ .../Apollo 9 - 10 - Entering the LM.scn | 30 +++++++++++++++++++ ...9 - 11 - Before LM landing gear deploy.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn | 30 +++++++++++++++++++ ...Apollo 9 - 13 - Before Docked DPS burn.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 14 - Before SPS-5.scn | 30 +++++++++++++++++++ .../Apollo 9 - 15 - Before LM Undocking.scn | 30 +++++++++++++++++++ .../Apollo 9 - 16 - Before phasing burn.scn | 30 +++++++++++++++++++ .../Apollo 9 - 17 - Before Insertion burn.scn | 30 +++++++++++++++++++ .../Apollo 9 - 18 - Before CSI update.scn | 30 +++++++++++++++++++ .../Apollo 9 - 19 - Before CDH burn.scn | 30 +++++++++++++++++++ .../Apollo 9 - 20 - Before TPI burn.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 21 - Before MCC-2.scn | 30 +++++++++++++++++++ .../Apollo 9 - 22 - Station Keeping.scn | 30 +++++++++++++++++++ .../Apollo 9 - 23 - LM Active Docking.scn | 30 +++++++++++++++++++ .../Apollo 9 - 24 - Before LM Jettison.scn | 30 +++++++++++++++++++ .../Apollo 9/Apollo 9 - 25 - Before SPS-6.scn | 15 ++++++++++ .../Apollo 9 - 26 - Before S065 Mexico.scn | 15 ++++++++++ ...ollo 9 - 27 - Before landmark tracking.scn | 15 ++++++++++ .../Apollo 9/Apollo 9 - 28 - Before SPS-7.scn | 15 ++++++++++ .../Apollo 9 - 29 - Deorbit Preparations.scn | 15 ++++++++++ .../Apollo 9/Apollo 9 - 30 - Final Orbit.scn | 15 ++++++++++ .../Apollo 9 - 31 - SPS Deorbit & Entry.scn | 15 ++++++++++ .../Apollo 9 - 32 - Before deorbit burn.scn | 15 ++++++++++ ...Apollo 9 - 33 - Before Entry Interface.scn | 30 +++++++++++++++++++ .../Apollo 7 - Launch.scn | 17 ++++++++++- .../Apollo 8 - Launch.scn | 15 ++++++++++ 64 files changed, 1276 insertions(+), 1 deletion(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Before Launch T-60s.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Before Launch T-60s.scn index 264a292fb9..c3d6a5e217 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Before Launch T-60s.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Before Launch T-60s.scn @@ -325,6 +325,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3417 EMEM1441 26063 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - After Insertion Checklist T+30m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - After Insertion Checklist T+30m.scn index c72240fe34..7fb1d85fdf 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - After Insertion Checklist T+30m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - After Insertion Checklist T+30m.scn @@ -534,6 +534,21 @@ AGC_BEGIN EMEM1443 70065 EMEM1446 3071 EMEM1447 76067 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - Before S-IVB Separation T+2h40m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - Before S-IVB Separation T+2h40m.scn index cf840f1a97..4ae4a30abf 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - Before S-IVB Separation T+2h40m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - Before S-IVB Separation T+2h40m.scn @@ -610,6 +610,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56103 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Before Phasing Maneuver T+3h10m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Before Phasing Maneuver T+3h10m.scn index c70e9be610..0676201611 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Before Phasing Maneuver T+3h10m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Before Phasing Maneuver T+3h10m.scn @@ -615,6 +615,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56103 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - Before 2nd Phasing Maneuver T+15h40m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - Before 2nd Phasing Maneuver T+15h40m.scn index 1619bf7b15..be8ae0c786 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - Before 2nd Phasing Maneuver T+15h40m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - Before 2nd Phasing Maneuver T+15h40m.scn @@ -619,6 +619,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56100 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Before NCC1 Maneuver T+26h10m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Before NCC1 Maneuver T+26h10m.scn index 9cd2caee6f..9a9a524f20 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Before NCC1 Maneuver T+26h10m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Before NCC1 Maneuver T+26h10m.scn @@ -625,6 +625,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - Before Rendezvous T+28h02m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - Before Rendezvous T+28h02m.scn index 8f2986d470..c04ef07ce5 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - Before Rendezvous T+28h02m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - Before Rendezvous T+28h02m.scn @@ -634,6 +634,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - Before TPI T+29h16m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - Before TPI T+29h16m.scn index 9044434a38..6dc75ff482 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - Before TPI T+29h16m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - Before TPI T+29h16m.scn @@ -720,6 +720,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - Before 2nd Separation Maneuver T+30h05m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - Before 2nd Separation Maneuver T+30h05m.scn index 736b11a881..aa072c28f8 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - Before 2nd Separation Maneuver T+30h05m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - Before 2nd Separation Maneuver T+30h05m.scn @@ -702,6 +702,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - Before SPS-3 T+75h24m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - Before SPS-3 T+75h24m.scn index a7f7430d58..067396366e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - Before SPS-3 T+75h24m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - Before SPS-3 T+75h24m.scn @@ -700,6 +700,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Before SPS-4 T+120h28m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Before SPS-4 T+120h28m.scn index d5db5b94de..62076a6e60 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Before SPS-4 T+120h28m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Before SPS-4 T+120h28m.scn @@ -712,6 +712,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Before Landmark Tracking T+122h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Before Landmark Tracking T+122h.scn index 1dba95b9c8..9a56b129ee 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Before Landmark Tracking T+122h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Before Landmark Tracking T+122h.scn @@ -707,6 +707,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 13 - Before 2nd Landmark Tracking T+142h30m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 13 - Before 2nd Landmark Tracking T+142h30m.scn index 7b5188bc0b..f349a63673 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 13 - Before 2nd Landmark Tracking T+142h30m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 13 - Before 2nd Landmark Tracking T+142h30m.scn @@ -703,6 +703,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56103 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 14 - Before SPS-5 T+164h30m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 14 - Before SPS-5 T+164h30m.scn index 00627c81f2..30aa6fa316 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 14 - Before SPS-5 T+164h30m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 14 - Before SPS-5 T+164h30m.scn @@ -717,6 +717,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 15 - Before SPS-6 T+209h52m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 15 - Before SPS-6 T+209h52m.scn index 9a1aafb370..38650b9fe9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 15 - Before SPS-6 T+209h52m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 15 - Before SPS-6 T+209h52m.scn @@ -711,6 +711,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 16 - Before 3rd Landmark Tracking T+214h25m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 16 - Before 3rd Landmark Tracking T+214h25m.scn index 8154e5bcdb..f198e92578 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 16 - Before 3rd Landmark Tracking T+214h25m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 16 - Before 3rd Landmark Tracking T+214h25m.scn @@ -708,6 +708,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56104 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 17 - Before SPS-7 T+238h51m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 17 - Before SPS-7 T+238h51m.scn index d13e80c547..8d837f00e3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 17 - Before SPS-7 T+238h51m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 17 - Before SPS-7 T+238h51m.scn @@ -712,6 +712,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 18 - Before Deorbit Preparations T+257h19m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 18 - Before Deorbit Preparations T+257h19m.scn index f1c90c7c2e..3ee71a5ecc 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 18 - Before Deorbit Preparations T+257h19m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 18 - Before Deorbit Preparations T+257h19m.scn @@ -704,6 +704,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56103 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 19 - Before SPS-8 (Deorbit) T+258h59m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 19 - Before SPS-8 (Deorbit) T+258h59m.scn index 08f3fcfb4b..322f21db81 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 19 - Before SPS-8 (Deorbit) T+258h59m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 19 - Before SPS-8 (Deorbit) T+258h59m.scn @@ -719,6 +719,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56100 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 20 - At Entry Interface T+259h34m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 20 - At Entry Interface T+259h34m.scn index 9cee395327..6a6538843d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 20 - At Entry Interface T+259h34m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 20 - At Entry Interface T+259h34m.scn @@ -726,6 +726,21 @@ AGC_BEGIN EMEM1447 52066 EMEM1450 2707 EMEM1451 56100 + EMEM1452 3271 + EMEM1453 73052 + EMEM1454 3271 + EMEM1455 74705 + EMEM1456 1754 + EMEM1457 72333 + EMEM1460 77677 + EMEM1461 0 + EMEM1462 77663 + EMEM1463 234 + EMEM1464 334 + EMEM1465 613 + EMEM1466 112 + EMEM1467 77767 + EMEM1470 77530 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Before Launch T-20min.scn index 112eb807fd..c950cf0ba1 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Before Launch T-20min.scn @@ -322,6 +322,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3417 EMEM1441 26063 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Before Launch T-60s.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Before Launch T-60s.scn index ebcc32b9be..b750b529be 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Before Launch T-60s.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Before Launch T-60s.scn @@ -325,6 +325,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3417 EMEM1441 26063 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - After Insertion Checklist T+54min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - After Insertion Checklist T+54min.scn index 36deda1cec..f373084399 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - After Insertion Checklist T+54min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - After Insertion Checklist T+54min.scn @@ -528,6 +528,21 @@ AGC_BEGIN EMEM1443 70065 EMEM1446 3071 EMEM1447 76067 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - TLI Preparations T+2h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - TLI Preparations T+2h20min.scn index a3bcd98d2b..409017e517 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - TLI Preparations T+2h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - TLI Preparations T+2h20min.scn @@ -581,6 +581,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56103 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - Before S-IVB Separation T+3h10min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - Before S-IVB Separation T+3h10min.scn index c52fff72b4..3b6ae21a60 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - Before S-IVB Separation T+3h10min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - Before S-IVB Separation T+3h10min.scn @@ -582,6 +582,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56103 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - Before MCC1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - Before MCC1 TIG-15min.scn index da60ce8539..91f8665bf9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - Before MCC1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - Before MCC1 TIG-15min.scn @@ -601,6 +601,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - Before MCC4 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - Before MCC4 TIG-15min.scn index 45abae0b79..58121a73a7 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - Before MCC4 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - Before MCC4 TIG-15min.scn @@ -604,6 +604,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56100 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - Before LOI-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - Before LOI-1 TIG-15min.scn index 4a7620d424..f6ed50cd33 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - Before LOI-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - Before LOI-1 TIG-15min.scn @@ -599,6 +599,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - Before LOI-2 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - Before LOI-2 TIG-15min.scn index e388eca0f8..f0511d1beb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - Before LOI-2 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - Before LOI-2 TIG-15min.scn @@ -606,6 +606,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Before TEI TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Before TEI TIG-15min.scn index 07099d42ad..0a07973de1 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Before TEI TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Before TEI TIG-15min.scn @@ -617,6 +617,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Before MCC6 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Before MCC6 TIG-15min.scn index 26e41c6096..af684c7cb6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Before MCC6 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Before MCC6 TIG-15min.scn @@ -620,6 +620,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 12 - Entry Preparations T+142h40min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 12 - Entry Preparations T+142h40min.scn index b5e03e14e3..a119348966 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 12 - Entry Preparations T+142h40min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 12 - Entry Preparations T+142h40min.scn @@ -615,6 +615,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 13 - Entry Interface T+146h40min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 13 - Entry Interface T+146h40min.scn index 6cf86093a0..f55e0d7b87 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 13 - Entry Interface T+146h40min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 13 - Entry Interface T+146h40min.scn @@ -621,6 +621,21 @@ AGC_BEGIN EMEM1447 52066 EMEM1450 2707 EMEM1451 56107 + EMEM1452 77766 + EMEM1453 76575 + EMEM1454 13175 + EMEM1455 72466 + EMEM1456 10654 + EMEM1457 74553 + EMEM1460 425 + EMEM1461 515 + EMEM1462 632 + EMEM1463 524 + EMEM1464 77702 + EMEM1465 1031 + EMEM1466 77724 + EMEM1467 40 + EMEM1470 77702 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn index 24e95aff22..8bff8a7068 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn @@ -628,6 +628,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7726,6 +7741,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn index 54be260aac..daaf4e0355 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn @@ -622,6 +622,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7863,6 +7878,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn index dafc62791c..7f49daec69 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn @@ -621,6 +621,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7892,6 +7907,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn index 9732b3418a..2fb84749c0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn @@ -618,6 +618,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7851,6 +7866,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn index 9ff51f1f7d..842e195e6f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn @@ -618,6 +618,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56103 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7092,6 +7107,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn index f36df190f4..a15d1c0244 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn @@ -623,6 +623,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7164,6 +7179,21 @@ AGC_BEGIN EMEM1244 4422 EMEM1335 7132 EMEM1336 6520 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn index dd5dec1fe5..15a8d03792 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn @@ -627,6 +627,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7330,6 +7345,21 @@ AGC_BEGIN EMEM1427 4063 EMEM1430 5310 EMEM1431 4063 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn index 89b1ddbb5c..1b17a0541c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn @@ -615,6 +615,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7369,6 +7384,21 @@ AGC_BEGIN EMEM1427 4063 EMEM1430 5310 EMEM1431 4063 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1570 37777 EMEM1642 37777 EMEM1706 7 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn index b1b83f48a2..c830dfff3f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn @@ -630,6 +630,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56103 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7843,6 +7858,21 @@ AGC_BEGIN EMEM1445 72007 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn index fadb05bb4b..07b9f390a9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn @@ -627,6 +627,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8543,6 +8558,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn index 20a646f8a2..7953f10e5a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn @@ -639,6 +639,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8210,6 +8225,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn index 31fd967629..abd34c286d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn @@ -659,6 +659,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8106,6 +8121,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn index 5bc764144f..4be6b35ad7 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn @@ -671,6 +671,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8203,6 +8218,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn index 35446cf517..8fe53a5121 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn @@ -685,6 +685,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8245,6 +8260,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn index 83ccbd1b8e..37f2b7b337 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn @@ -663,6 +663,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8172,6 +8187,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn index 08bcac4b5a..ee03e6de9b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn @@ -654,6 +654,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8179,6 +8194,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn index 36dbea4ed8..fa72234499 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn @@ -668,6 +668,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8192,6 +8207,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn index 634661f651..91d03c8a42 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn @@ -669,6 +669,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8211,6 +8226,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn index fc2808bd55..8beea0b2e6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn @@ -662,6 +662,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8564,6 +8579,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn index 003e9e4a0c..2737ad3eea 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn @@ -667,6 +667,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8466,6 +8481,21 @@ AGC_BEGIN EMEM1447 66066 EMEM1450 3054 EMEM1451 10103 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 25 - Before SPS-6.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 25 - Before SPS-6.scn index 5bb6a616ba..825cf15b1f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 25 - Before SPS-6.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 25 - Before SPS-6.scn @@ -678,6 +678,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 26 - Before S065 Mexico.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 26 - Before S065 Mexico.scn index a22c4af61e..c022cec7c6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 26 - Before S065 Mexico.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 26 - Before S065 Mexico.scn @@ -670,6 +670,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 27 - Before landmark tracking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 27 - Before landmark tracking.scn index d69763bd88..3f950b116e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 27 - Before landmark tracking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 27 - Before landmark tracking.scn @@ -664,6 +664,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56103 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 28 - Before SPS-7.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 28 - Before SPS-7.scn index 81741fd6c0..8ae0b7997f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 28 - Before SPS-7.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 28 - Before SPS-7.scn @@ -667,6 +667,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56107 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 29 - Deorbit Preparations.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 29 - Deorbit Preparations.scn index 6f208f12eb..96e61d8fd8 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 29 - Deorbit Preparations.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 29 - Deorbit Preparations.scn @@ -654,6 +654,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56103 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 30 - Final Orbit.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 30 - Final Orbit.scn index 9477edb080..70f61426f6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 30 - Final Orbit.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 30 - Final Orbit.scn @@ -678,6 +678,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 31 - SPS Deorbit & Entry.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 31 - SPS Deorbit & Entry.scn index 7d5d998614..be20eebd9a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 31 - SPS Deorbit & Entry.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 31 - SPS Deorbit & Entry.scn @@ -664,6 +664,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 32 - Before deorbit burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 32 - Before deorbit burn.scn index a613d664b8..3b1eb0099d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 32 - Before deorbit burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 32 - Before deorbit burn.scn @@ -685,6 +685,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn index a047aaff56..ebc92867ff 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn @@ -675,6 +675,21 @@ AGC_BEGIN EMEM1447 52066 EMEM1450 2736 EMEM1451 56100 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8020,6 +8035,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3054 EMEM1451 10103 + EMEM1452 10755 + EMEM1453 75551 + EMEM1454 76462 + EMEM1455 72457 + EMEM1456 6123 + EMEM1457 73322 + EMEM1460 461 + EMEM1461 0 + EMEM1462 461 + EMEM1463 137 + EMEM1464 230 + EMEM1465 77251 + EMEM1466 205 + EMEM1467 253 + EMEM1470 77663 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn index a78d5529c5..628bd2fb29 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn @@ -84,7 +84,22 @@ AS-205:ProjectApollo/Saturn1B CMPAD1353 632 CMPAD1354 0 CMPAD1355 21450 - CMPAD1356 0 + CMPAD1356 0 + CMPAD1452 3271 + CMPAD1453 73052 + CMPAD1454 3271 + CMPAD1455 74705 + CMPAD1456 1754 + CMPAD1457 72333 + CMPAD1460 77677 + CMPAD1461 0 + CMPAD1462 77663 + CMPAD1463 234 + CMPAD1464 334 + CMPAD1465 613 + CMPAD1466 112 + CMPAD1467 77767 + CMPAD1470 77530 CMPAD1706 3 CMPAD1707 11547 CMPAD1710 25066 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn index d2ceda1328..5a92ea71a3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn @@ -373,6 +373,21 @@ LVIMU_END CMPAD1353 632 CMPAD1354 0 CMPAD1355 21450 + CMPAD1452 77766 + CMPAD1453 76575 + CMPAD1454 13175 + CMPAD1455 72466 + CMPAD1456 10654 + CMPAD1457 74553 + CMPAD1460 425 + CMPAD1461 515 + CMPAD1462 632 + CMPAD1463 524 + CMPAD1464 77702 + CMPAD1465 1031 + CMPAD1466 77724 + CMPAD1467 40 + CMPAD1470 77702 CMPAD1706 5 CMPAD1707 22570 CMPAD1710 32123 From acb45b865994d0fc38a766955fa455b7536809f2 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 15 May 2024 23:09:23 -0400 Subject: [PATCH 34/51] remove iLMCWEAVersion accidentally added in from rebase --- Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 2078778ffe..0e58225e70 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -119,7 +119,6 @@ namespace mission { LM_IMUDriftRates = _M(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); LM_PIPABias = _V(0.0, 0.0, 0.0);; LM_PIPAScale = _V(0.0, 0.0, 0.0); - iLMCWEAVersion = 0; bCrossPointerReversePolarity = false; bCrossPointerShades = false; iLMNumber = 5; //LM-5 From 32af28b46eb121e677320c82f0a47e6d68cc99fc Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 5 Jun 2024 19:42:51 -0400 Subject: [PATCH 35/51] correct scanf/sscanf mistake --- .../samples/ProjectApollo/src_sys/imu.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp index 18c34aef3e..19f2850fb7 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/imu.cpp @@ -825,49 +825,49 @@ void IMU::LoadState(FILEHANDLE scn) Caged = (state.u.Caged != 0); } else if (!strnicmp(line, "NBD_X", 5)) { - scanf(line + 5, "%lf", &imuDriftRates.NBD_X); + sscanf(line + 5, "%lf", &imuDriftRates.NBD_X); } else if (!strnicmp(line, "NBD_Y", 5)) { - scanf(line + 5, "%lf", &imuDriftRates.NBD_Y); + sscanf(line + 5, "%lf", &imuDriftRates.NBD_Y); } else if (!strnicmp(line, "NBD_Z", 5)) { - scanf(line + 5, "%lf", &imuDriftRates.NBD_Z); + sscanf(line + 5, "%lf", &imuDriftRates.NBD_Z); } else if (!strnicmp(line, "ADIA_X", 6)) { - scanf(line + 5, "%lf", &imuDriftRates.ADIA_X); + sscanf(line + 5, "%lf", &imuDriftRates.ADIA_X); } else if (!strnicmp(line, "ADIA_Y", 6)) { - scanf(line + 5, "%lf", &imuDriftRates.ADIA_Y); + sscanf(line + 5, "%lf", &imuDriftRates.ADIA_Y); } else if (!strnicmp(line, "ADIA_Z", 6)) { - scanf(line + 5, "%lf", &imuDriftRates.ADIA_Z); + sscanf(line + 5, "%lf", &imuDriftRates.ADIA_Z); } else if (!strnicmp(line, "ADSRA_X", 7)) { - scanf(line + 5, "%lf", &imuDriftRates.ADSRA_X); + sscanf(line + 5, "%lf", &imuDriftRates.ADSRA_X); } else if (!strnicmp(line, "ADSRA_Y", 7)) { - scanf(line + 5, "%lf", &imuDriftRates.ADSRA_Y); + sscanf(line + 5, "%lf", &imuDriftRates.ADSRA_Y); } else if (!strnicmp(line, "ADSRA_Z", 7)) { - scanf(line + 5, "%lf", &imuDriftRates.ADSRA_Z); + sscanf(line + 5, "%lf", &imuDriftRates.ADSRA_Z); } else if (!strnicmp(line, "PBIAS_X", 7)) { - scanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasX); + sscanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasX); } else if (!strnicmp(line, "PBIAS_Y", 7)) { - scanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasY); + sscanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasY); } else if (!strnicmp(line, "PBIAS_Z", 7)) { - scanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasZ); + sscanf(line + 5, "%lf", &pipaBiasScale.PIPA_BiasZ); } else if (!strnicmp(line, "PSCALE_X", 8)) { - scanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_X); + sscanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_X); } else if (!strnicmp(line, "PSCALE_Y", 8)) { - scanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_Y); + sscanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_Y); } else if (!strnicmp(line, "PSCALE_Z", 8)) { - scanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_Z); + sscanf(line + 5, "%lf", &pipaBiasScale.PIPA_ScalePPM_Z); } } } From b01ba0045a18686ec892cd2dcd111f6779452d6f Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 5 Jun 2024 20:05:18 -0400 Subject: [PATCH 36/51] add zero PAD values for 1351 and 1352 --- .../Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn | 4 +++- .../Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn | 4 +++- .../Apollo 10 - 03 - After Insertion Checklist T+44min.scn | 4 +++- .../Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn | 4 +++- .../Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn | 4 +++- Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn index 52a92e6bc3..969f7a18b0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn @@ -76,12 +76,14 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 198 + LMPADCNT 200 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 00000 + LMPAD 1352 00000 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn index 5a02e75d92..adc87e0d5f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn @@ -76,12 +76,14 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 198 + LMPADCNT 200 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 00000 + LMPAD 1352 00000 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn index cfcb1777c2..a47d5f6204 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn @@ -64,12 +64,14 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 198 + LMPADCNT 200 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 00000 + LMPAD 1352 00000 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn index a598a7a106..5e8c1fe677 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn @@ -63,12 +63,14 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 198 + LMPADCNT 200 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 00000 + LMPAD 1352 00000 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn index 9c54c11854..096fc28c47 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn @@ -63,12 +63,14 @@ Charlie-Brown:ProjectApollo\Saturn5 SMMASS 4287.890411 CMFUELLOAD 111.000000000000 CMMASS 5468.186151 - LMPADCNT 198 + LMPADCNT 200 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 00000 + LMPAD 1352 00000 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index 43b392827a..778192daf2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn @@ -59,12 +59,14 @@ Charlie-Brown:ProjectApollo\Saturn5 LMASCFUEL 1193.40153 LMDSCEMPTY 2133.24492 LMASCEMPTY 2446.22365 - LMPADCNT 198 + LMPADCNT 200 LMPAD 0333 10000 LMPAD 1244 07351 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 00000 + LMPAD 1352 00000 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 From d6585dea508a8e9db7aa33c0436d50e99d7037d5 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 17 Jun 2024 22:31:57 -0400 Subject: [PATCH 37/51] fix typos --- Missions/ProjectApollo/Apollo 10.cfg | 6 ++-- ...Apollo 10 - 01 - Before Launch T-20min.scn | 30 +++++++++---------- ...Apollo 10 - 02 - Before Launch T-30sec.scn | 30 +++++++++---------- ...03 - After Insertion Checklist T+44min.scn | 30 +++++++++---------- .../Apollo 10 - 04 - Before TLI T+2h20min.scn | 4 +-- ...o 10 - 05 - Before CSM Separation T+3h.scn | 4 +-- ...pollo 10 - 06 - Before MCC-1 TIG-15min.scn | 4 +-- ...pollo 10 - 07 - Before LOI-1 TIG-15min.scn | 4 +-- ...pollo 10 - 08 - Before LOI-2 TIG-15min.scn | 4 +-- ...- 09 - Before LM Activation T+94h13min.scn | 4 +-- ... 10 - 10 - Before Undocking T+98h15min.scn | 30 +++++++++---------- .../Apollo 10 - 11 - Before DOI TIG-6min.scn | 4 +-- ...ollo 10 - 12 - Before Phasing TIG-6min.scn | 29 +++++++++--------- ...o 10 - 13 - Before Insertion TIG-11min.scn | 4 +-- .../Apollo 10 - 14 - Before CSI TIG-6min.scn | 4 +-- ...lo 10 - 15 - After Docking T+106h20min.scn | 4 +-- .../Apollo 10 - Launch.scn | 4 +-- .../Apollo 9 - Launch.scn | 2 +- 18 files changed, 101 insertions(+), 100 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 10.cfg b/Missions/ProjectApollo/Apollo 10.cfg index 6fe67a44ef..d0caf0a1f1 100644 --- a/Missions/ProjectApollo/Apollo 10.cfg +++ b/Missions/ProjectApollo/Apollo 10.cfg @@ -18,16 +18,16 @@ CMPIPABIASX=-0.27 CMPIPASCALEX=-100 CMPIPABIASY=-0.07 CMPIPASCALEY=-230 -CMPIPABIASZ=0.05 +CMPIPABIASZ=-0.05 CMPIPASCALEZ=-80 CMNBDX=0.4 CMNBDY=-1.3 -CMNBDZ=1.2 +CMNBDZ=-1.2 CMADIAX=1 CMADIAY=13 CMADIAZ=11 CMADSRAX=10 -CMADSRAY=-1.3 +CMADSRAY=3 CMADSRAZ=7 LMPIPABIASX=-0.41 LMPIPASCALEX=-430 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn index 969f7a18b0..c9e3be2195 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn @@ -530,21 +530,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3470 EMEM1441 26063 - EMEM1452 74157 - EMEM1453 76270 - EMEM1454 77011 - EMEM1455 74166 - EMEM1456 546 - EMEM1457 76540 - EMEM1460 63 - EMEM1461 77532 - EMEM1462 231 - EMEM1463 23 - EMEM1464 367 - EMEM1465 321 - EMEM1466 276 - EMEM1467 77746 - EMEM1470 205 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 77231 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 71 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn index adc87e0d5f..e5eb78696e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn @@ -532,21 +532,21 @@ AGC_BEGIN EMEM1435 2003 EMEM1440 3470 EMEM1441 26063 - EMEM1452 74157 - EMEM1453 76270 - EMEM1454 77011 - EMEM1455 74166 - EMEM1456 546 - EMEM1457 76540 - EMEM1460 63 - EMEM1461 77532 - EMEM1462 231 - EMEM1463 23 - EMEM1464 367 - EMEM1465 321 - EMEM1466 276 - EMEM1467 77746 - EMEM1470 205 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 77231 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 71 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn index a47d5f6204..4829a8809b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn @@ -752,21 +752,21 @@ AGC_BEGIN EMEM1443 70065 EMEM1446 3161 EMEM1447 76067 - EMEM1452 74157 - EMEM1453 76270 - EMEM1454 77011 - EMEM1455 74166 - EMEM1456 546 - EMEM1457 76540 - EMEM1460 63 - EMEM1461 77532 - EMEM1462 231 - EMEM1463 23 - EMEM1464 367 - EMEM1465 321 - EMEM1466 276 - EMEM1467 77746 - EMEM1470 205 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 77231 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 71 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn index 5e8c1fe677..8ec47b0408 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn @@ -831,7 +831,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -840,7 +840,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn index 096fc28c47..608041e494 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn @@ -835,7 +835,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -844,7 +844,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn index be7b564572..9c6a0fbb9a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn @@ -643,7 +643,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -652,7 +652,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn index fd81c5c50a..f13980c34e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn @@ -650,7 +650,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -659,7 +659,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn index 97e14d3b37..1ba4e57a9f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn @@ -650,7 +650,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -659,7 +659,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn index 3e20a00bef..038b474f3c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn @@ -686,7 +686,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -695,7 +695,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn index 32375529d6..1c14ef890e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn @@ -678,6 +678,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 77231 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 71 + EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -7995,21 +8010,6 @@ AGC_BEGIN EMEM1466 00202 EMEM1467 00064 EMEM1470 77745 - EMEM1452 74157 - EMEM1453 76270 - EMEM1454 77011 - EMEM1455 74166 - EMEM1456 546 - EMEM1457 76540 - EMEM1460 63 - EMEM1461 77532 - EMEM1462 231 - EMEM1463 23 - EMEM1464 367 - EMEM1465 321 - EMEM1466 276 - EMEM1467 77746 - EMEM1470 205 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn index 4d90020c8e..c6b0933158 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn @@ -672,7 +672,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -681,7 +681,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn index 54da26d11a..e93b0ecf9d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn @@ -670,20 +670,21 @@ AGC_BEGIN EMEM1447 76067 EMEM1450 2745 EMEM1451 56063 - EMEM1452 73631 - EMEM1453 70750 - EMEM1454 01660 - EMEM1455 62171 - EMEM1456 77542 - EMEM1457 67241 - EMEM1460 77150 - EMEM1461 00277 - EMEM1462 00231 - EMEM1463 00032 - EMEM1464 01010 - EMEM1465 76617 - EMEM1466 00202 - EMEM 1467 00064 + EMEM1452 74157 + EMEM1453 76270 + EMEM1454 77011 + EMEM1455 74166 + EMEM1456 77231 + EMEM1457 76540 + EMEM1460 63 + EMEM1461 77532 + EMEM1462 231 + EMEM1463 23 + EMEM1464 367 + EMEM1465 321 + EMEM1466 276 + EMEM1467 71 + EMEM1470 205 EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn index f440f6891a..4d173ca2ad 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn @@ -704,7 +704,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -713,7 +713,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn index 64d408851c..e1653cd374 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn @@ -703,7 +703,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -712,7 +712,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn index eb5cce15ff..3fecb38480 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn @@ -709,7 +709,7 @@ AGC_BEGIN EMEM1453 76270 EMEM1454 77011 EMEM1455 74166 - EMEM1456 546 + EMEM1456 77231 EMEM1457 76540 EMEM1460 63 EMEM1461 77532 @@ -718,7 +718,7 @@ AGC_BEGIN EMEM1464 367 EMEM1465 321 EMEM1466 276 - EMEM1467 77746 + EMEM1467 71 EMEM1470 205 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index 778192daf2..3892d64171 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn @@ -554,7 +554,7 @@ LVIMU_END CMPAD1453 76270 CMPAD1454 77011 CMPAD1455 74166 - CMPAD1456 546 + CMPAD1456 77231 CMPAD1457 76540 CMPAD1460 63 CMPAD1461 77532 @@ -563,7 +563,7 @@ LVIMU_END CMPAD1464 367 CMPAD1465 321 CMPAD1466 276 - CMPAD1467 77746 + CMPAD1467 71 CMPAD1470 205 CMPAD1706 12 CMPAD1707 13256 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn index b78b612e05..343af5c62d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn @@ -67,7 +67,7 @@ Gumdrop:ProjectApollo\Saturn5 LMPAD 1336 06520 LMPAD 1452 03131 LMPAD 1453 60066 - LMPAD 1454 01454 + LMPAD 1454 01744 LMPAD 1455 60462 LMPAD 1456 00000 LMPAD 1457 62045 From da9c1f855d4e28d980f577c392b2ce0b81dd6e05 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Wed, 19 Jun 2024 20:55:12 -0400 Subject: [PATCH 38/51] more scenerio fixes --- Missions/ProjectApollo/Apollo 10.cfg | 4 +-- ... 17 - Before Lunar Liftoff T+124h20min.scn | 15 ++++++++++ ...Apollo 9 - 33 - Before Entry Interface.scn | 30 +++++++++---------- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 10.cfg b/Missions/ProjectApollo/Apollo 10.cfg index d0caf0a1f1..344939c213 100644 --- a/Missions/ProjectApollo/Apollo 10.cfg +++ b/Missions/ProjectApollo/Apollo 10.cfg @@ -22,7 +22,7 @@ CMPIPABIASZ=-0.05 CMPIPASCALEZ=-80 CMNBDX=0.4 CMNBDY=-1.3 -CMNBDZ=-1.2 +CMNBDZ=1.2 CMADIAX=1 CMADIAY=13 CMADIAZ=11 @@ -37,7 +37,7 @@ LMPIPABIASZ=-0.03 LMPIPASCALEZ=-530 LMNBDX=-3.2 LMNBDY=1.5 -LMNBDZ=1.2 +LMNBDZ=-1.2 LMADIAX=1 LMADIAY=20 LMADIAZ=-24 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn index afce5ba262..9e856ade7a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn @@ -8071,6 +8071,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 + EMEM1452 06604 + EMEM1453 73446 + EMEM1454 01014 + EMEM1455 55120 + EMEM1456 02031 + EMEM1457 65656 + EMEM1460 77463 + EMEM1461 00744 + EMEM1462 01060 + EMEM1463 00404 + EMEM1464 00116 + EMEM1465 77661 + EMEM1466 00234 + EMEM1467 77575 + EMEM1470 77575 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn index ebc92867ff..541f52f5d0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn @@ -8035,21 +8035,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3054 EMEM1451 10103 - EMEM1452 10755 - EMEM1453 75551 - EMEM1454 76462 - EMEM1455 72457 - EMEM1456 6123 - EMEM1457 73322 - EMEM1460 461 - EMEM1461 0 - EMEM1462 461 - EMEM1463 137 - EMEM1464 230 - EMEM1465 77251 - EMEM1466 205 - EMEM1467 253 - EMEM1470 77663 + EMEM1452 03131 + EMEM1453 60066 + EMEM1454 01454 + EMEM1455 60462 + EMEM1456 00000 + EMEM1457 62045 + EMEM1460 01111 + EMEM1461 01174 + EMEM1462 01075 + EMEM1463 00202 + EMEM1464 00000 + EMEM1465 01010 + EMEM1466 77745 + EMEM1467 00640 + EMEM1470 77713 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 From 25f9ae77c3e4ff6c2f65127df626d35e6b497711 Mon Sep 17 00:00:00 2001 From: indy91 Date: Mon, 1 Jul 2024 18:44:48 +0200 Subject: [PATCH 39/51] Bugfixes to AGC IMU bias compensation in Apollo 9 and 10 mission scenarios --- .../Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn | 2 +- .../Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn | 2 +- .../Apollo 10 - 03 - After Insertion Checklist T+44min.scn | 2 +- .../Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn | 2 +- .../Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn | 2 +- .../Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn | 2 +- .../Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn | 2 +- .../Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn | 2 +- .../Apollo 10 - 09 - Before LM Activation T+94h13min.scn | 2 +- .../Apollo 10 - 10 - Before Undocking T+98h15min.scn | 2 +- .../Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn | 2 +- .../Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn | 3 +-- .../Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn | 4 ++-- .../Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn | 2 +- .../Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn | 2 +- .../Apollo 9/Apollo 9 - 01 - Launch T-60s.scn | 2 +- .../Apollo 9/Apollo 9 - 02 - After Insertion.scn | 2 +- .../Apollo 9/Apollo 9 - 03 - Before TD&E.scn | 2 +- .../Apollo 9/Apollo 9 - 04 - Before LM ejection.scn | 2 +- .../Apollo 9/Apollo 9 - 05 - Before SPS-1.scn | 2 +- .../Apollo 9/Apollo 9 - 06 - Before SPS-2.scn | 2 +- .../Apollo 9/Apollo 9 - 07 - Before SPS-3.scn | 2 +- .../Apollo 9/Apollo 9 - 08 - Before SPS-4.scn | 2 +- .../Apollo 9/Apollo 9 - 09 - Before LM activation.scn | 2 +- .../Apollo 9/Apollo 9 - 10 - Entering the LM.scn | 2 +- .../Apollo 9 - 11 - Before LM landing gear deploy.scn | 2 +- .../Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn | 2 +- .../Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn | 2 +- .../Apollo 9/Apollo 9 - 14 - Before SPS-5.scn | 2 +- .../Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn | 2 +- .../Apollo 9/Apollo 9 - 16 - Before phasing burn.scn | 2 +- .../Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn | 2 +- .../Apollo 9/Apollo 9 - 18 - Before CSI update.scn | 2 +- .../Apollo 9/Apollo 9 - 19 - Before CDH burn.scn | 2 +- .../Apollo 9/Apollo 9 - 20 - Before TPI burn.scn | 2 +- .../Apollo 9/Apollo 9 - 21 - Before MCC-2.scn | 2 +- .../Apollo 9/Apollo 9 - 22 - Station Keeping.scn | 2 +- .../Apollo 9/Apollo 9 - 23 - LM Active Docking.scn | 2 +- .../Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn | 2 +- .../Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn | 2 +- Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn | 2 +- 41 files changed, 42 insertions(+), 43 deletions(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn index c9e3be2195..13a19ac08f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Before Launch T-20min.scn @@ -92,7 +92,7 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1457 67241 LMPAD 1460 77150 LMPAD 1461 00277 - LMPAD 1462 00231 + LMPAD 1462 77546 LMPAD 1463 00032 LMPAD 1464 01010 LMPAD 1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn index e5eb78696e..19b89eb5f3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Before Launch T-30sec.scn @@ -92,7 +92,7 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1457 67241 LMPAD 1460 77150 LMPAD 1461 00277 - LMPAD 1462 00231 + LMPAD 1462 77546 LMPAD 1463 00032 LMPAD 1464 01010 LMPAD 1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn index 4829a8809b..4978169bda 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - After Insertion Checklist T+44min.scn @@ -80,7 +80,7 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1457 67241 LMPAD 1460 77150 LMPAD 1461 00277 - LMPAD 1462 00231 + LMPAD 1462 77546 LMPAD 1463 00032 LMPAD 1464 01010 LMPAD 1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn index 8ec47b0408..2dfb26cca7 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - Before TLI T+2h20min.scn @@ -79,7 +79,7 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1457 67241 LMPAD 1460 77150 LMPAD 1461 00277 - LMPAD 1462 00231 + LMPAD 1462 77546 LMPAD 1463 00032 LMPAD 1464 01010 LMPAD 1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn index 608041e494..e9b6009c4b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - Before CSM Separation T+3h.scn @@ -79,7 +79,7 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1457 67241 LMPAD 1460 77150 LMPAD 1461 00277 - LMPAD 1462 00231 + LMPAD 1462 77546 LMPAD 1463 00032 LMPAD 1464 01010 LMPAD 1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn index 9c6a0fbb9a..d24006d175 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - Before MCC-1 TIG-15min.scn @@ -7682,7 +7682,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn index f13980c34e..7219418a97 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - Before LOI-1 TIG-15min.scn @@ -8059,7 +8059,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn index 1ba4e57a9f..6a16da89ed 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - Before LOI-2 TIG-15min.scn @@ -8069,7 +8069,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn index 038b474f3c..88f45e7682 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - Before LM Activation T+94h13min.scn @@ -7383,7 +7383,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn index 1c14ef890e..2a1ab37655 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Before Undocking T+98h15min.scn @@ -8003,7 +8003,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn index c6b0933158..0a312753a1 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - Before DOI TIG-6min.scn @@ -7967,7 +7967,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn index e93b0ecf9d..6fe0c02da2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Before Phasing TIG-6min.scn @@ -685,7 +685,6 @@ AGC_BEGIN EMEM1466 276 EMEM1467 71 EMEM1470 205 - EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 @@ -8028,7 +8027,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn index 4d173ca2ad..53dd5471a9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - Before Insertion TIG-11min.scn @@ -8120,12 +8120,12 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 EMEM1466 00202 - EMEM 1467 00064 + EMEM1467 00064 EMEM1470 77745 EMEM1471 77777 EMEM1472 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn index e1653cd374..5ad5170608 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Before CSI TIG-6min.scn @@ -8138,7 +8138,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn index 3fecb38480..59a8dcf367 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - After Docking T+106h20min.scn @@ -8555,7 +8555,7 @@ AGC_BEGIN EMEM1457 67241 EMEM1460 77150 EMEM1461 00277 - EMEM1462 00231 + EMEM1462 77546 EMEM1463 00032 EMEM1464 01010 EMEM1465 76617 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn index 547fe3fb64..05506b68bb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-60s.scn @@ -85,7 +85,7 @@ Gumdrop:ProjectApollo\Saturn5 LMPAD 1336 06520 LMPAD 1452 03131 LMPAD 1453 60066 - LMPAD 1454 01454 + LMPAD 1454 01744 LMPAD 1455 60462 LMPAD 1456 00000 LMPAD 1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn index d1e32b158d..0bf6528df6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - After Insertion.scn @@ -75,7 +75,7 @@ Gumdrop:ProjectApollo\Saturn5 LMPAD 1336 06520 LMPAD 1452 03131 LMPAD 1453 60066 - LMPAD 1454 01454 + LMPAD 1454 01744 LMPAD 1455 60462 LMPAD 1456 00000 LMPAD 1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn index 6a5d3fd366..1407378828 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - Before TD&E.scn @@ -75,7 +75,7 @@ Gumdrop:ProjectApollo\Saturn5 LMPAD 1336 06520 LMPAD 1452 03131 LMPAD 1453 60066 - LMPAD 1454 01454 + LMPAD 1454 01744 LMPAD 1455 60462 LMPAD 1456 00000 LMPAD 1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn index f753ad8351..391c1028a4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - Before LM ejection.scn @@ -4876,7 +4876,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn index 8bff8a7068..5d0843a806 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - Before SPS-1.scn @@ -7743,7 +7743,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn index daaf4e0355..0930a45a3f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Before SPS-2.scn @@ -7880,7 +7880,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn index 7f49daec69..96f97913c6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - Before SPS-3.scn @@ -7909,7 +7909,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn index 2fb84749c0..e10cf85b73 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - Before SPS-4.scn @@ -7868,7 +7868,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn index 842e195e6f..db25e864d5 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Before LM activation.scn @@ -7109,7 +7109,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn index a15d1c0244..635a8069fb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - Entering the LM.scn @@ -7181,7 +7181,7 @@ AGC_BEGIN EMEM1336 6520 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn index 15a8d03792..a57c0f4286 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Before LM landing gear deploy.scn @@ -7347,7 +7347,7 @@ AGC_BEGIN EMEM1431 4063 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn index 1b17a0541c..d5b037c5ed 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - PGNS turn-on.scn @@ -7386,7 +7386,7 @@ AGC_BEGIN EMEM1431 4063 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn index c830dfff3f..7a63fd132d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - Before Docked DPS burn.scn @@ -7860,7 +7860,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn index 07b9f390a9..e0ca8ff91f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Before SPS-5.scn @@ -8560,7 +8560,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn index 7953f10e5a..36470e0fb7 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Before LM Undocking.scn @@ -8227,7 +8227,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn index abd34c286d..09a34a41c1 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 16 - Before phasing burn.scn @@ -8123,7 +8123,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn index 4be6b35ad7..9fde1b4904 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 17 - Before Insertion burn.scn @@ -8220,7 +8220,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn index 8fe53a5121..a432a6ddba 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 18 - Before CSI update.scn @@ -8262,7 +8262,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn index 37f2b7b337..1ea88b4ce3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 19 - Before CDH burn.scn @@ -8189,7 +8189,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn index ee03e6de9b..2441da3656 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 20 - Before TPI burn.scn @@ -8196,7 +8196,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn index fa72234499..7e028fe737 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 21 - Before MCC-2.scn @@ -8209,7 +8209,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn index 91d03c8a42..f05cff3bf4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 22 - Station Keeping.scn @@ -8228,7 +8228,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn index 8beea0b2e6..96701074f4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 23 - LM Active Docking.scn @@ -8581,7 +8581,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn index 2737ad3eea..6185ba69b9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 24 - Before LM Jettison.scn @@ -8483,7 +8483,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn index 541f52f5d0..066874178d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 33 - Before Entry Interface.scn @@ -8037,7 +8037,7 @@ AGC_BEGIN EMEM1451 10103 EMEM1452 03131 EMEM1453 60066 - EMEM1454 01454 + EMEM1454 01744 EMEM1455 60462 EMEM1456 00000 EMEM1457 62045 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index 3892d64171..eb4b1eede8 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn @@ -75,7 +75,7 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1457 67241 LMPAD 1460 77150 LMPAD 1461 00277 - LMPAD 1462 00231 + LMPAD 1462 77546 LMPAD 1463 00032 LMPAD 1464 01010 LMPAD 1465 76617 From bc7d08869275cc9bc7143be5c441991bea62c28e Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Thu, 4 Jul 2024 14:03:45 -0400 Subject: [PATCH 40/51] update Apollo 11 with bias/scale and padloads for correct IMU --- Missions/ProjectApollo/Apollo 11.cfg | 30 +++++++++---------- ...Apollo 11 - 01 - Before Launch T-20min.scn | 30 +++++++++---------- ...Apollo 11 - 02 - Before Launch T-30sec.scn | 30 +++++++++---------- ... - 03 - After Insertion Checklist T+1h.scn | 30 +++++++++---------- .../Apollo 11 - 04 - Before TLI T+2h30min.scn | 30 +++++++++---------- ...05 - Before S-IVB Separation T+3h15min.scn | 30 +++++++++---------- ...ollo 11 - 06 - Before MCC-2 T+26h30min.scn | 30 +++++++++---------- .../Apollo 11 - 07 - Before LOI Day T+69h.scn | 30 +++++++++---------- ...ollo 11 - 08 - Before LOI-1 T+75h50min.scn | 30 +++++++++---------- ...ollo 11 - 09 - Before LOI-2 T+79h46min.scn | 30 +++++++++---------- .../Apollo 11 - 10 - Before PDI Day T+94h.scn | 30 +++++++++---------- ...pollo 11 - 11 - Before DOI T+101h34min.scn | 30 +++++++++---------- ...pollo 11 - 12 - Before PDI T+102h28min.scn | 30 +++++++++---------- ...lo 11 - 13 - After Landing T+103h10min.scn | 30 +++++++++---------- ...pollo 11 - 14 - Before EVA T+109h54min.scn | 30 +++++++++---------- ...Apollo 11 - 15 - After EVA T+116h27min.scn | 30 +++++++++---------- ... - 16 - Lunar Liftoff Prep T+122h14min.scn | 30 +++++++++---------- ... 17 - Before Lunar Liftoff T+124h20min.scn | 30 +++++++++---------- ...lo 11 - 18 - After Docking T+128h23min.scn | 30 +++++++++---------- .../Apollo 11 - Launch.scn | 30 +++++++++---------- 20 files changed, 300 insertions(+), 300 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 11.cfg b/Missions/ProjectApollo/Apollo 11.cfg index 1f236b8a9d..c225983335 100644 --- a/Missions/ProjectApollo/Apollo 11.cfg +++ b/Missions/ProjectApollo/Apollo 11.cfg @@ -25,18 +25,18 @@ CMADIAZ=1 CMADSRAX=-6 CMADSRAY=3 CMADSRAZ=5 -LMPIPABIASX=0.66 -LMPIPASCALEX=-270 -LMPIPABIASY=0.1 -LMPIPASCALEY=-1150 -LMPIPABIASZ=0.2 -LMPIPASCALEZ=-620 -LMNBDX=-1.6 -LMNBDY=3.8 -LMNBDZ=4.4 -LMADIAX=10 -LMADIAY=4.4 -LMADIAZ=-3.3 -LMADSRAX=6 -LMADSRAY=-5 -LMADSRAZ=-5 \ No newline at end of file +LMPIPABIASX=-0.12 +LMPIPASCALEX=-210 +LMPIPABIASY=0.17 +LMPIPASCALEY=-210 +LMPIPABIASZ=0.07 +LMPIPASCALEZ=-920 +LMNBDX=1.3 +LMNBDY=-1.5 +LMNBDZ=-1.9 +LMADIAX=57 +LMADIAY=-4 +LMADIAZ=20 +LMADSRAX=2 +LMADSRAY=26 +LMADSRAZ=-11 \ No newline at end of file diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn index 4321488a38..61570a5ac9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Before Launch T-20min.scn @@ -89,21 +89,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 - LMPAD 1452 06604 - LMPAD 1453 73446 - LMPAD 1454 01014 - LMPAD 1455 55120 - LMPAD 1456 02031 - LMPAD 1457 65656 - LMPAD 1460 77463 - LMPAD 1461 00744 - LMPAD 1462 01060 - LMPAD 1463 00404 - LMPAD 1464 00116 - LMPAD 1465 77661 - LMPAD 1466 00234 - LMPAD 1467 77575 - LMPAD 1470 77575 + LMPAD 1452 76612 + LMPAD 1453 74435 + LMPAD 1454 01573 + LMPAD 1455 74435 + LMPAD 1456 00557 + LMPAD 1457 60731 + LMPAD 1460 00245 + LMPAD 1461 77500 + LMPAD 1462 77415 + LMPAD 1463 02712 + LMPAD 1464 77627 + LMPAD 1465 01010 + LMPAD 1466 00064 + LMPAD 1467 01244 + LMPAD 1470 77314 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn index a422038438..a9cb27fde1 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Before Launch T-30sec.scn @@ -89,21 +89,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 - LMPAD 1452 06604 - LMPAD 1453 73446 - LMPAD 1454 01014 - LMPAD 1455 55120 - LMPAD 1456 02031 - LMPAD 1457 65656 - LMPAD 1460 77463 - LMPAD 1461 00744 - LMPAD 1462 01060 - LMPAD 1463 00404 - LMPAD 1464 00116 - LMPAD 1465 77661 - LMPAD 1466 00234 - LMPAD 1467 77575 - LMPAD 1470 77575 + LMPAD 1452 76612 + LMPAD 1453 74435 + LMPAD 1454 01573 + LMPAD 1455 74435 + LMPAD 1456 00557 + LMPAD 1457 60731 + LMPAD 1460 00245 + LMPAD 1461 77500 + LMPAD 1462 77415 + LMPAD 1463 02712 + LMPAD 1464 77627 + LMPAD 1465 01010 + LMPAD 1466 00064 + LMPAD 1467 01244 + LMPAD 1470 77314 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn index 0029e0e79a..967d630ffa 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - After Insertion Checklist T+1h.scn @@ -78,21 +78,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 - LMPAD 1452 06604 - LMPAD 1453 73446 - LMPAD 1454 01014 - LMPAD 1455 55120 - LMPAD 1456 02031 - LMPAD 1457 65656 - LMPAD 1460 77463 - LMPAD 1461 00744 - LMPAD 1462 01060 - LMPAD 1463 00404 - LMPAD 1464 00116 - LMPAD 1465 77661 - LMPAD 1466 00234 - LMPAD 1467 77575 - LMPAD 1470 77575 + LMPAD 1452 76612 + LMPAD 1453 74435 + LMPAD 1454 01573 + LMPAD 1455 74435 + LMPAD 1456 00557 + LMPAD 1457 60731 + LMPAD 1460 00245 + LMPAD 1461 77500 + LMPAD 1462 77415 + LMPAD 1463 02712 + LMPAD 1464 77627 + LMPAD 1465 01010 + LMPAD 1466 00064 + LMPAD 1467 01244 + LMPAD 1470 77314 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn index e3a3a62fe9..c0836aa86a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - Before TLI T+2h30min.scn @@ -77,21 +77,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 - LMPAD 1452 06604 - LMPAD 1453 73446 - LMPAD 1454 01014 - LMPAD 1455 55120 - LMPAD 1456 02031 - LMPAD 1457 65656 - LMPAD 1460 77463 - LMPAD 1461 00744 - LMPAD 1462 01060 - LMPAD 1463 00404 - LMPAD 1464 00116 - LMPAD 1465 77661 - LMPAD 1466 00234 - LMPAD 1467 77575 - LMPAD 1470 77575 + LMPAD 1452 76612 + LMPAD 1453 74435 + LMPAD 1454 01573 + LMPAD 1455 74435 + LMPAD 1456 00557 + LMPAD 1457 60731 + LMPAD 1460 00245 + LMPAD 1461 77500 + LMPAD 1462 77415 + LMPAD 1463 02712 + LMPAD 1464 77627 + LMPAD 1465 01010 + LMPAD 1466 00064 + LMPAD 1467 01244 + LMPAD 1470 77314 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn index 9ab6e295df..c8bf91c35b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - Before S-IVB Separation T+3h15min.scn @@ -76,21 +76,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 - LMPAD 1452 06604 - LMPAD 1453 73446 - LMPAD 1454 01014 - LMPAD 1455 55120 - LMPAD 1456 02031 - LMPAD 1457 65656 - LMPAD 1460 77463 - LMPAD 1461 00744 - LMPAD 1462 01060 - LMPAD 1463 00404 - LMPAD 1464 00116 - LMPAD 1465 77661 - LMPAD 1466 00234 - LMPAD 1467 77575 - LMPAD 1470 77575 + LMPAD 1452 76612 + LMPAD 1453 74435 + LMPAD 1454 01573 + LMPAD 1455 74435 + LMPAD 1456 00557 + LMPAD 1457 60731 + LMPAD 1460 00245 + LMPAD 1461 77500 + LMPAD 1462 77415 + LMPAD 1463 02712 + LMPAD 1464 77627 + LMPAD 1465 01010 + LMPAD 1466 00064 + LMPAD 1467 01244 + LMPAD 1470 77314 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn index b5b827ac1b..673e21f2d4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - Before MCC-2 T+26h30min.scn @@ -7731,21 +7731,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn index 5787fc22aa..64f7db1dcf 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - Before LOI Day T+69h.scn @@ -7027,21 +7027,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn index ad3939bff9..5ccb83006d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - Before LOI-1 T+75h50min.scn @@ -8590,21 +8590,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn index 5113deca4d..fcacc02f0f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - Before LOI-2 T+79h46min.scn @@ -7990,21 +7990,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn index 1123a53378..4f2c9798a0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - Before PDI Day T+94h.scn @@ -7198,21 +7198,21 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1570 37777 EMEM1642 37777 EMEM1707 20017 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn index a924a79b78..6df8bcb092 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Before DOI T+101h34min.scn @@ -7987,21 +7987,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn index f31d3c8e4b..4b502930eb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Before PDI T+102h28min.scn @@ -8002,21 +8002,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn index 88c946149e..84c6d364cb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - After Landing T+103h10min.scn @@ -8022,21 +8022,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn index 9c3adac941..43ac93a412 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Before EVA T+109h54min.scn @@ -8035,21 +8035,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn index 2022fb4b2c..090786d345 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - After EVA T+116h27min.scn @@ -8053,21 +8053,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn index ac0a223ff1..46b4050e6e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 16 - Lunar Liftoff Prep T+122h14min.scn @@ -8046,21 +8046,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn index 9e856ade7a..ea143fe789 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 17 - Before Lunar Liftoff T+124h20min.scn @@ -8071,21 +8071,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn index d19c15292d..8dbb1299fc 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 18 - After Docking T+128h23min.scn @@ -8507,21 +8507,21 @@ AGC_BEGIN EMEM1447 66067 EMEM1450 3241 EMEM1451 10103 - EMEM1452 06604 - EMEM1453 73446 - EMEM1454 01014 - EMEM1455 55120 - EMEM1456 02031 - EMEM1457 65656 - EMEM1460 77463 - EMEM1461 00744 - EMEM1462 01060 - EMEM1463 00404 - EMEM1464 00116 - EMEM1465 77661 - EMEM1466 00234 - EMEM1467 77575 - EMEM1470 77575 + EMEM1452 76612 + EMEM1453 74435 + EMEM1454 01573 + EMEM1455 74435 + EMEM1456 00557 + EMEM1457 60731 + EMEM1460 00245 + EMEM1461 77500 + EMEM1462 77415 + EMEM1463 02712 + EMEM1464 77627 + EMEM1465 01010 + EMEM1466 00064 + EMEM1467 01244 + EMEM1470 77314 EMEM1471 77777 EMEM1472 77777 EMEM1473 77777 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn index 1d44889902..0ffbf7ae62 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn @@ -72,21 +72,21 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 - LMPAD 1452 06604 - LMPAD 1453 73446 - LMPAD 1454 01014 - LMPAD 1455 55120 - LMPAD 1456 02031 - LMPAD 1457 65656 - LMPAD 1460 77463 - LMPAD 1461 00744 - LMPAD 1462 01060 - LMPAD 1463 00404 - LMPAD 1464 00116 - LMPAD 1465 77661 - LMPAD 1466 00234 - LMPAD 1467 77575 - LMPAD 1470 77575 + LMPAD 1452 76612 + LMPAD 1453 74435 + LMPAD 1454 01573 + LMPAD 1455 74435 + LMPAD 1456 00557 + LMPAD 1457 60731 + LMPAD 1460 00245 + LMPAD 1461 77500 + LMPAD 1462 77415 + LMPAD 1463 02712 + LMPAD 1464 77627 + LMPAD 1465 01010 + LMPAD 1466 00064 + LMPAD 1467 01244 + LMPAD 1470 77314 LMPAD 1477 00000 LMPAD 1570 37777 LMPAD 1642 37777 From 3836902824743a7af843d5f5501e77497724d62d Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 5 Jul 2024 00:25:58 -0400 Subject: [PATCH 41/51] Update Apollo 12 IMU properties with data from @indy91's utility --- Missions/ProjectApollo/Apollo 12.cfg | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 12.cfg b/Missions/ProjectApollo/Apollo 12.cfg index 3c83ffecad..deaafe5694 100644 --- a/Missions/ProjectApollo/Apollo 12.cfg +++ b/Missions/ProjectApollo/Apollo 12.cfg @@ -10,33 +10,33 @@ CDRSuitName=C. CONRAD CMPSuitName=R. GORDON LMPSuitName=A. BEAN CSMCueCard=1 SATURN_BOOST_A14 -CMPIPABIASX=0 -CMPIPASCALEX=-173 -CMPIPABIASY=-0.15 -CMPIPASCALEY=-243 -CMPIPABIASZ=-0.16 -CMPIPASCALEZ=-306 -CMNBDX=-0.9 -CMNBDY=1.3 -CMNBDZ=0.5 -CMADIAX=6.7 -CMADIAY=0.7 -CMADIAZ=-0.1 -CMADSRAX=-1.4 -CMADSRAY=-3.3 -CMADSRAZ=-3.5 -LMPIPABIASX=-0.296 -LMPIPASCALEX=-649 -LMPIPABIASY=-0.28 -LMPIPASCALEY=-681 -LMPIPABIASZ=0.54 -LMPIPASCALEZ=-885 -LMNBDX=0.6 -LMNBDY=0.8 -LMNBDZ=1.3 -LMADIAX=10.6 -LMADIAY=-16 -LMADIAZ=10.8 -LMADSRAX=-1.3 -LMADSRAY=4.1 -LMADSRAZ=-0.3 \ No newline at end of file +CMPIPABIASX=-0.09 +CMPIPASCALEX=-220 +CMPIPABIASY=-0.09 +CMPIPASCALEY=-350 +CMPIPABIASZ=-0.160 +CMPIPASCALEZ=-370 +CMNBDX=-0.102 +CMNBDY=-0.102 +CMNBDZ=0.102 +CMADIAX=13 +CMADIAY=0 +CMADIAZ=-1 +CMADSRAX=-4 +CMADSRAY=-4 +CMADSRAZ=-6 +LMPIPABIASX=-0.38 +LMPIPASCALEX=-660 +LMPIPABIASY=0.02 +LMPIPASCALEY=-720 +LMPIPABIASZ=0.62 +LMPIPASCALEZ=-890 +LMNBDX=0.102 +LMNBDY=0.802 +LMNBDZ=3.00 +LMADIAX=17 +LMADIAY=-15 +LMADIAZ=13 +LMADSRAX=-2 +LMADSRAY=4 +LMADSRAZ=-2 \ No newline at end of file From 72404f725cac5a100f150125e2c09e4b4aa75e09 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 5 Jul 2024 10:33:12 -0400 Subject: [PATCH 42/51] Remove debugging code --- Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 613865953f..4af8009347 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -1556,18 +1556,8 @@ void Saturn::clbkPreStep(double simt, double simdt, double mjd) // // Subclass specific handling // - //VECTOR3 ATTITUDEFORTESTING = imu.GetTotalAttitude(); - VECTOR3 ATTITUDEFORTESTING = imu.getPlatformEulerAnglesZYX(); - VECTOR3 DRIFTRATEFORTESTING = imu.GetNBDriftRates(); - VECTOR3 IMURESOLVERPHASEERROR = imu.getResolverPhaseError(); - //sprintf(oapiDebugString(), "<%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>, <%0.10f, %0.10f, %0.10f>", - // ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z, - // DRIFTRATEFORTESTING.x, DRIFTRATEFORTESTING.y, DRIFTRATEFORTESTING.z, - // IMURESOLVERPHASEERROR.x, IMURESOLVERPHASEERROR.y, IMURESOLVERPHASEERROR.z); - //fprintf(IMUDriftLogger, "%0.15f, %0.15f, %0.15f, %0.15f\n", simt, ATTITUDEFORTESTING.x, ATTITUDEFORTESTING.y, ATTITUDEFORTESTING.z); - //fflush(IMUDriftLogger); + Timestep(simt, simdt, mjd); - sprintf(buffer, "End time(0) %lld", time(0)); TRACE(buffer); From a49c901a0b476b94c1075472e8842c160f394e62 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 5 Jul 2024 10:33:44 -0400 Subject: [PATCH 43/51] remove debugging file --- Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 4af8009347..6c790c5503 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -72,7 +72,6 @@ extern "C" { using namespace nassp; //extern FILE *PanelsdkLogFile; -//extern FILE* IMUDriftLogger; #define CSM_AXIS_INPUT_CNT 53 VesimInputDefinition vesim_csm_inputs[CSM_AXIS_INPUT_CNT] = { From 470e273b458bb176a267ff3d8137fbe02ddc480a Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 5 Jul 2024 20:54:25 -0400 Subject: [PATCH 44/51] fix Apollo 12 error created by merge conflict --- .../Project Apollo - NASSP/Apollo 12 - Launch.scn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn index 45864c78f2..bc86524f42 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn @@ -540,12 +540,12 @@ Yankee-Clipper:ProjectApollo\Saturn5 CMPAD1272 0 CMPAD1273 55 CMPAD1341 5 - CMPAD1351 6510 - CMPAD1352 7025 - CMPAD1353 620 - CMPAD1354 0 - CMPAD1355 27340 - CMPAD1356 37723 + CMPAD1345 6510 + CMPAD1346 7025 + CMPAD1347 620 + CMPAD1350 0 + CMPAD1351 27340 + CMPAD1352 37723 CMPAD1452 77536 CMPAD1453 74312 CMPAD1454 77536 From b8383cce8b55d37666dd17346000eace2e191507 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Fri, 5 Jul 2024 20:58:24 -0400 Subject: [PATCH 45/51] reduce drift rate precision in Apollo 12 mission file --- Missions/ProjectApollo/Apollo 12.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Missions/ProjectApollo/Apollo 12.cfg b/Missions/ProjectApollo/Apollo 12.cfg index deaafe5694..62e362f1f1 100644 --- a/Missions/ProjectApollo/Apollo 12.cfg +++ b/Missions/ProjectApollo/Apollo 12.cfg @@ -16,9 +16,9 @@ CMPIPABIASY=-0.09 CMPIPASCALEY=-350 CMPIPABIASZ=-0.160 CMPIPASCALEZ=-370 -CMNBDX=-0.102 -CMNBDY=-0.102 -CMNBDZ=0.102 +CMNBDX=-0.1 +CMNBDY=-0.1 +CMNBDZ=0.1 CMADIAX=13 CMADIAY=0 CMADIAZ=-1 @@ -31,9 +31,9 @@ LMPIPABIASY=0.02 LMPIPASCALEY=-720 LMPIPABIASZ=0.62 LMPIPASCALEZ=-890 -LMNBDX=0.102 -LMNBDY=0.802 -LMNBDZ=3.00 +LMNBDX=0.1 +LMNBDY=0.8 +LMNBDZ=3.0 LMADIAX=17 LMADIAY=-15 LMADIAZ=13 From e8f2521978c49bb8105ff75da09c5649694c66b7 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 6 Jul 2024 23:37:07 -0400 Subject: [PATCH 46/51] remove LoadIMU_AndPIPA_RatesAndBiases (unused) --- .../samples/ProjectApollo/src_aux/Mission.cpp | 65 ------------------- 1 file changed, 65 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp index 02b188fc24..27d8427311 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.cpp @@ -412,76 +412,11 @@ namespace mission { sscanf(line + 13, "%lf", &LM_PIPAScale.z); } } - //LoadIMU_AndPIPA_RatesAndBiases(hFile); hFile.close(); return true; } - void Mission::LoadIMU_AndPIPA_RatesAndBiases(std::ifstream &hFile) { - //char line[256]; - - //for (std::string line; std::getline(hFile, line);) { - // if (!line.compare(0,7,"CMNBDX=")) { - // CM_IMUDriftRates.m11 = std::stod(line.substr(7)); - // } - // else if (!line.compare(0, 7, "CMNBDY=")) { - // CM_IMUDriftRates.m12 = std::stod(line.substr(7)); - // } - // else if (!line.compare(0, 7, "CMNBDZ=")) { - // CM_IMUDriftRates.m13 = std::stod(line.substr(7)); - // } - //} - - //while (hFile.getline(line, sizeof line)) { - // if (!_strnicmp(line, "CMNBDX=", 7)) { - // sscanf(line + 7, "%lf", &CM_IMUDriftRates.m11); - // } - // else if (!_strnicmp(line, "CMNBDY=", 7)) { - // sscanf(line + 7, "%lf", &CM_IMUDriftRates.m12); - // } - // else if (!_strnicmp(line, "CMNBDZ=", 7)) { - // sscanf(line + 7, "%lf", &CM_IMUDriftRates.m13); - // } - //} - - /*oapiReadItem_float(hFile, "CMNBDX", CM_IMUDriftRates.m11); - oapiReadItem_float(hFile, "CMNBDY", CM_IMUDriftRates.m12); - oapiReadItem_float(hFile, "CMNBDZ", CM_IMUDriftRates.m13); - oapiReadItem_float(hFile, "CMADSRAX", CM_IMUDriftRates.m21); - oapiReadItem_float(hFile, "CMADSRAY", CM_IMUDriftRates.m22); - oapiReadItem_float(hFile, "CMADSRAZ", CM_IMUDriftRates.m23); - oapiReadItem_float(hFile, "CMADIAX", CM_IMUDriftRates.m31); - oapiReadItem_float(hFile, "CMADIAY", CM_IMUDriftRates.m32); - oapiReadItem_float(hFile, "CMADIAZ", CM_IMUDriftRates.m33); - - oapiReadItem_float(hFile, "CMPIPABIASX", CM_PIPABias.x); - oapiReadItem_float(hFile, "CMPIPABIASY", CM_PIPABias.y); - oapiReadItem_float(hFile, "CMPIPABIASZ", CM_PIPABias.z); - - oapiReadItem_float(hFile, "CMPIPASCALEX", CM_PIPAScale.x); - oapiReadItem_float(hFile, "CMPIPASCALEY", CM_PIPAScale.y); - oapiReadItem_float(hFile, "CMPIPASCALEZ", CM_PIPAScale.z); - - oapiReadItem_float(hFile, "LMNBDX", LM_IMUDriftRates.m11); - oapiReadItem_float(hFile, "LMNBDY", LM_IMUDriftRates.m12); - oapiReadItem_float(hFile, "LMNBDZ", LM_IMUDriftRates.m13); - oapiReadItem_float(hFile, "LMADSRAX", LM_IMUDriftRates.m21); - oapiReadItem_float(hFile, "LMADSRAY", LM_IMUDriftRates.m22); - oapiReadItem_float(hFile, "LMADSRAZ", LM_IMUDriftRates.m23); - oapiReadItem_float(hFile, "LMADIAX", LM_IMUDriftRates.m31); - oapiReadItem_float(hFile, "LMADIAY", LM_IMUDriftRates.m32); - oapiReadItem_float(hFile, "LMADIAZ", LM_IMUDriftRates.m33); - - oapiReadItem_float(hFile, "LMPIPABIASX", LM_PIPABias.x); - oapiReadItem_float(hFile, "LMPIPABIASY", LM_PIPABias.y); - oapiReadItem_float(hFile, "LMPIPABIASZ", LM_PIPABias.z); - - oapiReadItem_float(hFile, "LMPIPASCALEX", LM_PIPAScale.x); - oapiReadItem_float(hFile, "LMPIPASCALEY", LM_PIPAScale.y); - oapiReadItem_float(hFile, "LMPIPASCALEZ", LM_PIPAScale.z);*/ - } - MATRIX3 Mission::GetCM_IMU_Drift() const { return CM_IMUDriftRates; } From 521d8eb433836614e5481c8e7452eb24912755c0 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Sat, 6 Jul 2024 23:38:30 -0400 Subject: [PATCH 47/51] remove IMUDriftLogger fopen call --- Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp index 60d385c476..9808442567 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp @@ -59,7 +59,6 @@ void Saturn::SystemsInit() { Panelsdk.InitFromFile("ProjectApollo\\SaturnSystems"); //PanelsdkLogFile = fopen("ProjectApollo Saturn Systems.log", "w"); - //IMUDriftLogger = fopen("IMUDriftLogger.log", "w"); // // Electrical systems. From ac5bfee0d51090a78a4e9f6b59c26e14b281d0dd Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 8 Jul 2024 15:14:58 -0400 Subject: [PATCH 48/51] remove LoadIMU_AndPIPA_RatesAndBiases --- Orbitersdk/samples/ProjectApollo/src_aux/Mission.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h index cf0f4e87ec..d005dc116f 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h @@ -186,8 +186,6 @@ namespace mission VECTOR3 LM_PIPABias; VECTOR3 LM_PIPAScale; - void Mission::LoadIMU_AndPIPA_RatesAndBiases(std::ifstream &hFile); - void SetDefaultValues(); }; } @@ -195,4 +193,4 @@ namespace mission DLLCLBK mission::Mission* paGetDefaultMission(); DLLCLBK mission::Mission* paGetMission(const std::string& filename); void ClearMissionManagementMemory(); -void InitMissionManagementMemory(); \ No newline at end of file +void InitMissionManagementMemory(); From ef2a15571a65674d7abdc4a77d2b0b21fae98f62 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 8 Jul 2024 15:43:48 -0400 Subject: [PATCH 49/51] remove GetLMCWEAVersion() --- Orbitersdk/samples/ProjectApollo/src_aux/Mission.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h index d005dc116f..a76f128b09 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h @@ -102,7 +102,6 @@ namespace mission // VECTOR3 GetLM_PIPA_Scale() const; //0 = LM-7 and before (ASC PRESS LOW before staging, RCS for HEATER FAILURE CAUTION), 1 = LM-8 and after (both cut and capped) - int GetLMCWEAVersion() const; //false = Normal polarity (Apollo 14 and earlier), Lateral axis for PGNS and LR input has switched polarity (Apollo 15 and later) bool GetCrossPointerReversePolarity() const; //false = No shades (Apollo 15 and earlier), Shades (Apollo 16 & 17) From 2c34854c6b4397b3a01300983ca9e6752fc41ac7 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 8 Jul 2024 15:46:46 -0400 Subject: [PATCH 50/51] remove comment --- Orbitersdk/samples/ProjectApollo/src_aux/Mission.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h index a76f128b09..f46a019aec 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h +++ b/Orbitersdk/samples/ProjectApollo/src_aux/Mission.h @@ -101,7 +101,6 @@ namespace mission VECTOR3 GetCM_PIPA_Scale() const; // VECTOR3 GetLM_PIPA_Scale() const; - //0 = LM-7 and before (ASC PRESS LOW before staging, RCS for HEATER FAILURE CAUTION), 1 = LM-8 and after (both cut and capped) //false = Normal polarity (Apollo 14 and earlier), Lateral axis for PGNS and LR input has switched polarity (Apollo 15 and later) bool GetCrossPointerReversePolarity() const; //false = No shades (Apollo 15 and earlier), Shades (Apollo 16 & 17) From c7d1ffc6c0c483745924a876eac15fb01c0e59e6 Mon Sep 17 00:00:00 2001 From: Matthew W Hume Date: Mon, 8 Jul 2024 15:47:31 -0400 Subject: [PATCH 51/51] remove drift logger FILE* --- Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp index 9808442567..f050800033 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp @@ -44,8 +44,6 @@ //FILE *PanelsdkLogFile; -FILE *IMUDriftLogger; - void Saturn::SystemsInit() {