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

https://github.com/nasa/nos3/issues/438 - Change time ticker to 10 ti… #442

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
+12 −12
Open

https://github.com/nasa/nos3/issues/438 - Change time ticker to 10 ti… #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5bc833
https://github.com/nasa/nos3/issues/438 - Change time ticker to 10 ti…
msuder Jan 8, 2025
9fae1c3
[nasa/nos3#438] fixing time in fprime world with new ticks per second
Jan 8, 2025
5451cfa
updated sbn app to fix sbn errors
Jan 16, 2025
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/InOut/Inp_Sim.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<<<<<<<<<<<<<<<<< 42: The Mostly Harmless Simulator >>>>>>>>>>>>>>>>>
************************** Simulation Control **************************
NOS3 ! Time Mode (FAST, REAL, EXTERNAL, or NOS3)
86400.0 0.01 ! Sim Duration, Step Size [sec]
86400.0 0.1 ! Sim Duration, Step Size [sec]
1.0 ! File Output Interval [sec]
0 ! RNG Seed
TRUE ! Graphics Front End?
Expand Down
12 changes: 6 additions & 6 deletions cfg/InOut/SC_NOS3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
******************************* Gyro ************************************
3 ! Number of Gyro Axes
============================== Axis 0 ===================================
0.01 ! Sample Time,sec
0.1 ! Sample Time,sec
0.0 0.0 1.0 ! Axis expressed in Body Frame
1000.0 ! Max Rate, deg/sec
100.0 ! Scale Factor Error, ppm
Expand All @@ -138,7 +138,7 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
0.1 ! Initial Bias (deg/hr)
0 ! Node
============================== Axis 1 ===================================
0.01 ! Sample Time,sec
0.1 ! Sample Time,secsa.gov
-1.0 0.0 0.0 ! Axis expressed in Body Frame
1000.0 ! Max Rate, deg/sec
100.0 ! Scale Factor Error, ppm
Expand All @@ -149,7 +149,7 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
0.1 ! Initial Bias (deg/hr)
0 ! Node
============================== Axis 2 ===================================
0.01 ! Sample Time,sec
0.1 ! Sample Time,sec
0.0 -1.0 0.0 ! Axis expressed in Body Frame
1000.0 ! Max Rate, deg/sec
100.0 ! Scale Factor Error, ppm
Expand All @@ -162,23 +162,23 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL)
*************************** Magnetometer ********************************
3 ! Number of Magnetometer Axes
============================== Axis 0 ===================================
0.03125 ! Sample Time,sec
0.1 ! Sample Time,sec
1.0 0.0 0.0 ! Axis expressed in Body Frame
65536E-9 ! Saturation, Tesla
0.0 ! Scale Factor Error, ppm
2.0E-9 ! Quantization, Tesla
0.1E-9 ! Noise, Tesla RMS
0 ! Node
============================== Axis 1 ===================================
0.03125 ! Sample Time,sec
0.1 ! Sample Time,sec
0.0 1.0 0.0 ! Axis expressed in Body Frame
65536E-9 ! Saturation, Tesla
0.0 ! Scale Factor Error, ppm
2.0E-9 ! Quantization, Tesla
0.1E-9 ! Noise, Tesla RMS
0 ! Node
============================== Axis 2 ===================================
0.03125 ! Sample Time,sec
0.1 ! Sample Time,sec
0.0 0.0 1.0 ! Axis expressed in Body Frame
65536E-9 ! Saturation, Tesla
0.0 ! Scale Factor Error, ppm
Expand Down
4 changes: 2 additions & 2 deletions cfg/sims/nos3-simulator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<!-- 552110400.0 UTC = 06/30/2017 16:00:00.00 UTC -->
<!-- 814048200.0 UTC = 10/18/2025 08:30:00.00 UTC -->
<absolute-start-time>814048200.0</absolute-start-time>
<sim-microseconds-per-tick>10000</sim-microseconds-per-tick>
<real-microseconds-per-tick>10000</real-microseconds-per-tick>
<sim-microseconds-per-tick>100000</sim-microseconds-per-tick>
<real-microseconds-per-tick>100000</real-microseconds-per-tick>
<nos-connection-string>tcp://nos_engine_server:12001</nos-connection-string>
</common>

Expand Down
2 changes: 1 addition & 1 deletion fsw/apps/sbn
Open in desktop
Submodule sbn updated 0 files
2 changes: 1 addition & 1 deletion fsw/fprime/fprime-nos3
Open in desktop
Submodule fprime-nos3 updated 1 files
+3 −3 Components/Nos3Time/Nos3Time.cpp
2 changes: 1 addition & 1 deletion fsw/psp
Open in desktop
Submodule psp updated 1 files
+1 −1 fsw/nos-linux/src/cfe_psp_start.c