Advertisement
Thymo

NASSP ACE

Jan 15th, 2017
105
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.86 KB | None | 0 0
  1. diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp
  2. index a17638d..9b8b872 100644
  3. --- a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp
  4. +++ b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp
  5. @@ -4227,3 +4227,18 @@ void DSE::SaveState(FILEHANDLE scn) {
  6.     sprintf(buffer, "%lf %lf %lf %i %lf", tapeSpeedInchesPerSecond, desiredTapeSpeed, tapeMotion, state, lastEventTime);
  7.     oapiWriteScenario_string(scn, "DATARECORDER", buffer);
  8.  }
  9. +
  10. +void ACE::Init(Saturn *vessel) {
  11. +   sat = vessel;
  12. +}
  13. +
  14. +void ACE::TimeStep(double simt) {
  15. +   if (sat->LeftAudioPowerSwitch.IsUp()) {
  16. +       sat->cws.SetPlaySounds(true);
  17. +       //sprintf(oapiDebugString(), "Master Alarm Tone enabled.");
  18. +   }
  19. +   else {
  20. +       sat->cws.SetPlaySounds(false);
  21. +       //sprintf(oapiDebugString(), "Master Alarm Tone disabled.");
  22. +   }
  23. +}
  24. \ No newline at end of file
  25. diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.h b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.h
  26. index e193424..cd6402c 100644
  27. --- a/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.h
  28. +++ b/Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.h
  29. @@ -382,4 +382,14 @@ public:
  30.     bool scanlimitwarn;
  31.  private:
  32.     void ServoDrive(double &Angle, double AngleCmd, double RateLimit, double simdt);
  33. +};
  34. +
  35. +class ACE {
  36. +public:
  37. +   //ACE();
  38. +   void Init(Saturn *vessel);
  39. +   void TimeStep(double simt);
  40. +   //bool IsPowered();
  41. +
  42. +   Saturn *sat;
  43.  };
  44. \ No newline at end of file
  45. diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp
  46. index fc8d1fc..5f9e8ce 100644
  47. --- a/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp
  48. +++ b/Orbitersdk/samples/ProjectApollo/src_csm/satsystems.cpp
  49. @@ -373,6 +373,7 @@ void Saturn::SystemsInit() {
  50.     hga.Init(this);
  51.     dataRecorder.Init(this);
  52.     pcm.Init(this);
  53. +   ace.Init(this);
  54.  
  55.     // Optics initialization
  56.     optics.Init(this);
  57. @@ -563,7 +564,8 @@ void Saturn::SystemsTimestep(double simt, double simdt, double mjd) {
  58.         if (!agc.Yaagc) {
  59.             // PCM update unless yaAGC did it earlier
  60.             pcm.TimeStep(MissionTime);
  61. -       }
  62. +       }
  63. +       ace.TimeStep(MissionTime);
  64.         pmp.TimeStep(MissionTime);
  65.         usb.TimeStep(MissionTime);
  66.         hga.TimeStep(MissionTime, simdt);
  67. diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h
  68. index b6973d9..da07e4c 100644
  69. --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h
  70. +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.h
  71. @@ -3611,6 +3611,7 @@ protected:
  72.     USB  usb;
  73.     HGA  hga;
  74.     EMS  ems;
  75. +   ACE  ace;
  76.  
  77.     // CM Optics
  78.     CMOptics optics;
  79. @@ -4491,6 +4492,7 @@ protected:
  80.     friend class USB;
  81.     friend class HGA;
  82.     friend class DSE;
  83. +   friend class ACE;
  84.     friend class EMS;
  85.     friend class ORDEAL;
  86.     friend class SPSPropellantSource;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement