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

Jump to bottom

[nasa/nos3#285] Attempted to implemented suggestions from sdunlap-afit #324

Merged
merged 2 commits into from
Jul 2, 2024
Merged

[nasa/nos3#285] Attempted to implemented suggestions from sdunlap-afit #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4edf97e
[nasa/nos3#285] Attempted to implemented suggestions from sdunlap-afi…
jlucas9 Jun 25, 2024
da13351
[nasa/nos3#285] Update nos_time_driver after merge;
jlucas9 Jul 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
2 changes: 1 addition & 1 deletion cfg/sc-minimal-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</torquer>
</components>
<gui>
<enable>true</enable>
<enable>false</enable>
</gui>
<orbit>
<tipoff_x>0.1</tipoff_x>
Expand Down
12 changes: 6 additions & 6 deletions scripts/configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
rw1_from_index = 999
rw2_to_index = 999
rw2_from_index = 999
sample_index = 999
#sample_index = 999
st_index = 999
torquer_index = 999

Expand Down Expand Up @@ -303,9 +303,9 @@
if line.find('RW 2 from 42') != -1:
if (lines.index(line)) < rw2_from_index:
rw2_from_index = lines.index(line) + 1
if line.find('Sample IPC') != -1:
if (lines.index(line)) < sample_index:
sample_index = lines.index(line) + 1
#if line.find('Sample IPC') != -1:
# if (lines.index(line)) < sample_index:
# sample_index = lines.index(line) + 1
if line.find('Star Tracker IPC') != -1:
if (lines.index(line)) < st_index:
st_index = lines.index(line) + 1
Expand All @@ -331,8 +331,8 @@
lines[rw1_from_index] = ipc_off
lines[rw2_to_index] = ipc_off
lines[rw2_from_index] = ipc_off
if (sc_sample_en != 'true'):
lines[sample_index] = ipc_off
#if (sc_sample_en != 'true'):
# lines[sample_index] = ipc_off
if (sc_st_en != 'true'):
lines[st_index] = ipc_off
if (sc_torquer_en != 'true'):
Expand Down
2 changes: 1 addition & 1 deletion sims/nos_time_driver
Open in desktop
Submodule nos_time_driver updated 2 files
+1 −0 inc/time_driver.hpp
+34 −26 src/time_driver.cpp
Loading