fhansch
/
procedure
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge conflict fixed

This commit is contained in:
Finn 2020-06-04 16:51:16 +02:00
parent b826bd1d07 5b2be1bb18
commit 3ecba754af
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AbortProcedure.csv
View File

@ -1,4 +1,4 @@
vers.;v4.19;Abort Procedure;;3;;;;; vers.;v4.20;Abort Procedure;;3;;;;;
0:00;MCC;Inform OPS of Launch Abort;;3;;;;; 0:00;MCC;Inform OPS of Launch Abort;;3;;;;;
0:00;MCC;BEGIN:Defueling Rocket;Defueling;3;;;;; 0:00;MCC;BEGIN:Defueling Rocket;Defueling;3;;;;;
0:00;EGSE;Confirm all valve switches are in OFF position (Except OxDV & HPDV);;3;;;;; 0:00;EGSE;Confirm all valve switches are in OFF position (Except OxDV & HPDV);;3;;;;;

1 vers. v4.19 v4.20 Abort Procedure 3
2 0:00 MCC Inform OPS of Launch Abort 3
3 0:00 MCC BEGIN:Defueling Rocket Defueling 3
4 0:00 EGSE Confirm all valve switches are in OFF position (Except OxDV & HPDV) 3

2
LaunchProcedure.csv
View File

@ -1,4 +1,4 @@
vers.;v4.19;Launch Procedure;;0;MRL;MCC;RdHill;Time per step; vers.;v4.20;Launch Procedure;;0;MRL;MCC;RdHill;Time per step;
147:20;WIND;Start wind weighting analysis;;1;;;;; 147:20;WIND;Start wind weighting analysis;;1;;;;;
147:20;MCC;BEGIN SEQUENCE: Power on EGSE;Power on EGSE;1;;;;; 147:20;MCC;BEGIN SEQUENCE: Power on EGSE;Power on EGSE;1;;;;;
147:20;EGSE;Check CLD connection;;1;;;;; 147:20;EGSE;Check CLD connection;;1;;;;;

1 vers. v4.19 v4.20 Launch Procedure 0 MRL MCC RdHill Time per step
2 147:20 WIND Start wind weighting analysis 1
3 147:20 MCC BEGIN SEQUENCE: Power on EGSE Power on EGSE 1
4 147:20 EGSE Check CLD connection 1

2
PassivationProcedure.csv
View File

@ -1,4 +1,4 @@
vers.;v4.19;Passivation out of sequence Procedure;;2;;;;; vers.;v4.20;Passivation out of sequence Procedure;;2;;;;;
0:00;MCC/MRL;Recall and make sure BOTH N2O Bottles & He Bottle 2 are still closed! Else continue with Abort Procedure;;2;;;;; 0:00;MCC/MRL;Recall and make sure BOTH N2O Bottles & He Bottle 2 are still closed! Else continue with Abort Procedure;;2;;;;;
0:00;MCC;Inform OPS of Passivation out of sequence;;2;;;;; 0:00;MCC;Inform OPS of Passivation out of sequence;;2;;;;;
0:00;MRL;Step Back/Leave MRL;;2;;;;; 0:00;MRL;Step Back/Leave MRL;;2;;;;;

1 vers. v4.19 v4.20 Passivation out of sequence Procedure 2
2 0:00 MCC/MRL Recall and make sure BOTH N2O Bottles & He Bottle 2 are still closed! Else continue with Abort Procedure 2
3 0:00 MCC Inform OPS of Passivation out of sequence 2
4 0:00 MRL Step Back/Leave MRL 2