From f5bc833e654f5130c0aec7943a668a8e3f50cd9e Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 8 Jan 2025 12:23:47 -0500 Subject: [PATCH 1/3] https://github.com/nasa/nos3/issues/438 - Change time ticker to 10 ticks per second / 0.1 seconds per time step / 100000 microseconds per tick. --- cfg/InOut/Inp_Sim.txt | 2 +- cfg/InOut/SC_NOS3.txt | 12 ++++++------ cfg/sims/nos3-simulator.xml | 4 ++-- fsw/psp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cfg/InOut/Inp_Sim.txt b/cfg/InOut/Inp_Sim.txt index cadbf8ec..afbd06e2 100644 --- a/cfg/InOut/Inp_Sim.txt +++ b/cfg/InOut/Inp_Sim.txt @@ -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? diff --git a/cfg/InOut/SC_NOS3.txt b/cfg/InOut/SC_NOS3.txt index 19878b76..75c248d5 100644 --- a/cfg/InOut/SC_NOS3.txt +++ b/cfg/InOut/SC_NOS3.txt @@ -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 @@ -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 @@ -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 @@ -162,7 +162,7 @@ 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 @@ -170,7 +170,7 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 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 @@ -178,7 +178,7 @@ PROPORTIONAL ! Mode (PULSED or PROPORTIONAL) 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 diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index ea741a33..f54b7b92 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -8,8 +8,8 @@ 814048200.0 - 10000 - 10000 + 100000 + 100000 tcp://nos_engine_server:12001 diff --git a/fsw/psp b/fsw/psp index 0789462a..4449f4eb 160000 --- a/fsw/psp +++ b/fsw/psp @@ -1 +1 @@ -Subproject commit 0789462a6bf91202833b3d2798f6c74b2b6c9634 +Subproject commit 4449f4eb8f678ba4b0dfb20cdcae20a8f3cefe86 From 9fae1c3312896625cc2d5043cc5223c32a7e5070 Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Wed, 8 Jan 2025 19:21:48 +0000 Subject: [PATCH 2/3] [nasa/nos3#438] fixing time in fprime world with new ticks per second --- fsw/fprime/fprime-nos3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/fprime/fprime-nos3 b/fsw/fprime/fprime-nos3 index 9346f0ab..fd723f26 160000 --- a/fsw/fprime/fprime-nos3 +++ b/fsw/fprime/fprime-nos3 @@ -1 +1 @@ -Subproject commit 9346f0abcdf60922aa0afdb665abe264c775a0e9 +Subproject commit fd723f26aed239ace476d31e9884dea51f08b267 From 5451cfa17734d0ddc802e8f5486550c9b061d2f3 Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Thu, 16 Jan 2025 17:37:38 +0000 Subject: [PATCH 3/3] updated sbn app to fix sbn errors --- fsw/apps/sbn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/apps/sbn b/fsw/apps/sbn index 7953a380..3154dbef 160000 --- a/fsw/apps/sbn +++ b/fsw/apps/sbn @@ -1 +1 @@ -Subproject commit 7953a380acd6c024e53b90380d0dcb5fc3c26a55 +Subproject commit 3154dbef5c7d501e661e94a8fc7b32c36389e6dd