Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved LM RCS behavior #1218

Draft
wants to merge 7 commits into
base: Orbiter2016
Choose a base branch
from
Draft

Improved LM RCS behavior #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1f35f2
First attempt at new LM RCS behavior
indy91 Jan 11, 2024
fb16d96
Merge branch 'Orbiter2016' into RCSBehavior
indy91 Jan 12, 2024
4edad47
Merge branch 'RTCCFix' into RCSBehavior
indy91 Jan 16, 2024
e6de81f
Merge branch 'Orbiter2016' into RCSBehavior
indy91 Jan 16, 2024
5194734
Merge branch 'Orbiter2016' into RCSBehavior
indy91 Jan 21, 2024
28b1544
Merge branch 'Orbiter2016' into RCSBehavior
indy91 Jan 21, 2024
70e9137
Merge branch 'Orbiter2016' into RCSBehavior
indy91 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions Orbitersdk/samples/ProjectApollo/src_lm/LEMcomputer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@ LEMcomputer::LEMcomputer(SoundLib &s, DSKY &display, IMU &im, CDU &sc, CDU &tc,

isLGC = true;

/* FIXME LOAD FILE SHOULD BE SET IN SCENARIO */
//InitVirtualAGC("Config/ProjectApollo/Luminary099.bin");

/* FIXME REMOVE THIS LATER, THIS IS TEMPORARY FOR TESTING ONLY AND SHOULD BE IN THE SCENARIO LATER */
/* LM PAD LOAD FOR LUMINARY 099 AND APOLLO 11 - OFFICIAL VERSION */
ThrustOnDelay = 30; // 0.019 seconds in units of 1/1600 seconds
ThrustOffDelay = 24; // 0.015 seconds in units of 1/1600 seconds

Start();
}
Expand Down Expand Up @@ -86,9 +83,12 @@ void LEMcomputer::agcTimestep(double simt, double simdt)
if (LastCycled == 0) { // Use simdt as difference if new run
LastCycled = (simt - simdt);
lem->PCM.last_update = LastCycled;
LastRCSTime = LastCycled;
}
double ThisTime = LastCycled; // Save here

InitRCSActivity();

long cycles = (long)((simt - LastCycled) / 0.00001171875); // Get number of CPU cycles to do
LastCycled += (0.00001171875 * cycles); // Preserve the remainder
long x = 0;
Expand All @@ -98,8 +98,15 @@ void LEMcomputer::agcTimestep(double simt, double simdt)
if ((ThisTime - lem->PCM.last_update) > 0.00015625) { // If a step is needed
lem->PCM.Timestep(ThisTime); // do it
}
if (ThisTime - LastRCSTime > 6.25e-04) // 1/1600 second
{
MonitorRCSActivity();
LastRCSTime = ThisTime;
}
x++;
}

CalculateRCSDutyCycle();
}

void LEMcomputer::Run ()
Expand Down Expand Up @@ -178,7 +185,7 @@ void LEMcomputer::Timestep(double simt, double simdt)
lem->PCM.last_update = simt - simdt;
}
lem->PCM.Timestep(simt);

ResetRCSDutyCycle();
// and do nothing more.
return;
}
Expand Down Expand Up @@ -261,14 +268,14 @@ void LEMcomputer::ProcessChannel13(ChannelValue val){

void LEMcomputer::ProcessChannel5(ChannelValue val){
// This is now handled inside the ATCA
LEM *lem = (LEM *) OurVessel;
lem->atca.ProcessLGC(5,val.to_ulong());
//LEM *lem = (LEM *) OurVessel;
//lem->atca.ProcessLGC(5,val.to_ulong());
}

void LEMcomputer::ProcessChannel6(ChannelValue val){
// This is now handled inside the ATCA
LEM *lem = (LEM *) OurVessel;
lem->atca.ProcessLGC(6,val.to_ulong());
//LEM *lem = (LEM *) OurVessel;
//lem->atca.ProcessLGC(6,val.to_ulong());
}

void LEMcomputer::ProcessChannel142(ChannelValue val) {
Expand Down
Loading