-
Notifications
You must be signed in to change notification settings - Fork 4
Added pressure limit check in MAINSTAGE #9
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.
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
Open
mootz12
wants to merge
1
commit into
LPRD:master
Choose a base branch
from
mootz12:patch-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,11 @@ | |
| // Max outlet temperature before triggering a shutdown | ||
| #define MAX_COOLANT_TEMP 60 | ||
|
|
||
| #if CONFIGURATION != DEMO | ||
| #define MAX_PRESSURE_FUEL 150 //TODO: Cement this value | ||
| #define MAX_PRESSURE_OX 150 //TODO: Cement this value | ||
| #endif | ||
|
|
||
| // Min thrust that must be reached to avoid triggering a no-ignition shutdown | ||
| #if CONFIGURATION == DEMO | ||
| #define MIN_THRUST 100 | ||
|
|
@@ -146,6 +151,17 @@ void run_control() { | |
| Serial.println(F("Thrust below critical level")); | ||
| abort_autosequence(); | ||
| } | ||
| // Check that the pressure of the fuel and oxidizer line have not exceeded the maximum limit | ||
| #if CONFIGURATION != DEMO | ||
| else if (run_time >= STARTUP_TIME && pressure_fuel > MAX_PRESSURE_FUEL) { | ||
| Serial.println(F("Fuel pressue above critical level")); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Spelling error. |
||
| abort_autosequence(); | ||
| } | ||
| else if (run_time >= STARTUP_TIME && pressure_ox > MAX_PRESSURE_OX) { | ||
| Serial.println(F("Oxidizer pressure above critical level")); | ||
| abort_autosequence(); | ||
| } | ||
| #endif | ||
|
|
||
| if (run_time >= RUN_TIME) { | ||
| SET_STATE(COOL_DOWN) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure that we only want this check after ignition and mainstage? Seems like we might want to abort before ignition if the line pressures are too high. Unless those sensors are downstream of the valves, in which case ignore this comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch. I'll double check that with Jame as I'm not positive
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do want to check pressures after the prestage valves have opened before ignition.