Merge pull request #1038 from indy91/Apollo11MCCWeightUpdate

Apollo 11 MCC: Add DAP PAD after docking
orbiternassp · Jul 31, 2023 · 24c5592 · 24c5592
2 parents 4bdb01c + 3f00b2b
commit 24c5592
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/MCC_Mission_G.cpp b/Orbitersdk/samples/ProjectApollo/src_launch/MCC_Mission_G.cpp
@@ -316,23 +316,26 @@ void MCC::MissionSequence_G()
 	case MST_G_LUNAR_ORBIT_ASCENT_DAY_6: //LM Liftoff Evaluation to CMC LM State Vector update
 		UpdateMacro(UTP_NONE, PT_NONE, rtcc->GETEval2(rtcc->calcParams.Insertion + 120.0), 104, MST_G_LUNAR_ORBIT_ASCENT_DAY_7, scrubbed, SubStateTime > 15.0*60.0, MST_G_LUNAR_ORBIT_ASCENT_DAY_2);
 		break;
-	case MST_G_LUNAR_ORBIT_ASCENT_DAY_7: //CMC LM State Vector update to CSM state vector update
-		UpdateMacro(UTP_CMCUPLINKONLY, PT_NONE, MoonRev >= 27 && MoonRevTime > 95.0*60.0, 2, MST_G_LUNAR_ORBIT_ASCENT_DAY_8);
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_7: //CMC LM State Vector update to CSM DAP Update
+		UpdateMacro(UTP_CMCUPLINKONLY, PT_NONE, (rtcc->calcParams.src->DockingStatus(0) == 1) && (MoonRev >= 27 && MoonRevTime > 38.0*60.0), 2, MST_G_LUNAR_ORBIT_ASCENT_DAY_8);
 		break;
-	case MST_G_LUNAR_ORBIT_ASCENT_DAY_8: //CSM state vector update to Preliminary TEI-30 update
-		UpdateMacro(UTP_CMCUPLINKONLY, PT_NONE, MoonRev >= 29 && MoonRevTime > 40.0*60.0, 1, MST_G_LUNAR_ORBIT_ASCENT_DAY_9);
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_8: //CSM DAP Update to CSM state vector update
+		UpdateMacro(UTP_PADONLY, PT_AP10DAPDATA, MoonRev >= 27 && MoonRevTime > 95.0*60.0, 39, MST_G_LUNAR_ORBIT_ASCENT_DAY_9);
 		break;
-	case MST_G_LUNAR_ORBIT_ASCENT_DAY_9: //Preliminary TEI-30 update to Final TEI-30 Update
-		UpdateMacro(UTP_PADONLY, PT_AP11MNV, MoonRev >= 30 && MoonRevTime > 55.0*60.0, 45, MST_G_LUNAR_ORBIT_ASCENT_DAY_10);
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_9: //CSM state vector update to Preliminary TEI-30 update
+		UpdateMacro(UTP_CMCUPLINKONLY, PT_NONE, MoonRev >= 29 && MoonRevTime > 40.0*60.0, 1, MST_G_LUNAR_ORBIT_ASCENT_DAY_10);
 		break;
-	case MST_G_LUNAR_ORBIT_ASCENT_DAY_10: //Final TEI-30 Update to TEI-31 PAD
-		UpdateMacro(UTP_PADWITHCMCUPLINK, PT_AP11MNV, SubStateTime > 5.0*60.0, 46, MST_G_LUNAR_ORBIT_ASCENT_DAY_11);
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_10: //Preliminary TEI-30 update to Final TEI-30 Update
+		UpdateMacro(UTP_PADONLY, PT_AP11MNV, MoonRev >= 30 && MoonRevTime > 55.0*60.0, 45, MST_G_LUNAR_ORBIT_ASCENT_DAY_11);
 		break;
-	case MST_G_LUNAR_ORBIT_ASCENT_DAY_11: //TEI-31 PAD to TEI Evaluation
-		UpdateMacro(UTP_PADONLY, PT_AP11MNV, rtcc->GETEval2(rtcc->calcParams.TEI + 300.0), 47, MST_G_LUNAR_ORBIT_ASCENT_DAY_12);
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_11: //Final TEI-30 Update to TEI-31 PAD
+		UpdateMacro(UTP_PADWITHCMCUPLINK, PT_AP11MNV, SubStateTime > 5.0*60.0, 46, MST_G_LUNAR_ORBIT_ASCENT_DAY_12);
 		break;
-	case MST_G_LUNAR_ORBIT_ASCENT_DAY_12: //TEI Evaluation to TEI
-		UpdateMacro(UTP_NONE, PT_NONE, true, 105, MST_G_TRANSEARTH_1, scrubbed, MoonRevTime > 40.0*60.0, MST_G_LUNAR_ORBIT_ASCENT_DAY_10);
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_12: //TEI-31 PAD to TEI Evaluation
+		UpdateMacro(UTP_PADONLY, PT_AP11MNV, rtcc->GETEval2(rtcc->calcParams.TEI + 300.0), 47, MST_G_LUNAR_ORBIT_ASCENT_DAY_13);
+		break;
+	case MST_G_LUNAR_ORBIT_ASCENT_DAY_13: //TEI Evaluation to TEI
+		UpdateMacro(UTP_NONE, PT_NONE, true, 105, MST_G_TRANSEARTH_1, scrubbed, MoonRevTime > 40.0*60.0, MST_G_LUNAR_ORBIT_ASCENT_DAY_11);
 		break;
 	case MST_G_TRANSEARTH_1: //TEI to PTC REFSMMAT
 		switch (SubState)

diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/MCC_Mission_G.h b/Orbitersdk/samples/ProjectApollo/src_launch/MCC_Mission_G.h
@@ -108,6 +108,7 @@ See http://nassp.sourceforge.net/license/ for more details.
 #define MST_G_LUNAR_ORBIT_ASCENT_DAY_10 169
 #define MST_G_LUNAR_ORBIT_ASCENT_DAY_11 170
 #define MST_G_LUNAR_ORBIT_ASCENT_DAY_12 171
+#define MST_G_LUNAR_ORBIT_ASCENT_DAY_13 172
 #define MST_G_TRANSEARTH_1 200
 #define MST_G_TRANSEARTH_2 201
 #define MST_G_TRANSEARTH_3 202

diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/RTCC_Mission_G.cpp b/Orbitersdk/samples/ProjectApollo/src_launch/RTCC_Mission_G.cpp
@@ -1175,13 +1175,20 @@ bool RTCC::CalculationMTP_G(int fcn, LPVOID &pad, char * upString, char * upDesc
 		}
 	}
 	break;
-	case 33: //CSM DAP DATA
+	case 33: //CSM DAP DATA (Undocked)
 	{
 		AP10DAPDATA * form = (AP10DAPDATA *)pad;
 
 		CSMDAPUpdate(calcParams.src, *form, false);
 	}
 	break;
+	case 39: //CSM DAP DATA (Docked)
+	{
+		AP10DAPDATA * form = (AP10DAPDATA *)pad;
+
+		CSMDAPUpdate(calcParams.src, *form, true);
+	}
+	break;
 	case 34: //LM DAP DATA
 	{
 		LMACTDATA * form = (LMACTDATA *)pad;

diff --git a/... - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn b/... - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 19 - Before TEI T+135h13min.scn
@@ -7158,7 +7158,7 @@ MCC_BEGIN
   MCC_scrubbed 0
   MCC_MissionType 7
   MCC_MissionPhase 4
-  MCC_MissionState 170
+  MCC_MissionState 171
   MCC_SubState 2
   MCC_EarthRev 5
   MCC_MoonRev 30