From 80c52ab8318c9e00295ca7181ff99e41612ac69b Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 1 Apr 2026 12:07:04 -0400 Subject: [PATCH 1/3] https://github.com/nasa/nos3/issues/846 - Upgrade to the latest 42 which includes RF comm link capabilities. --- cfg/InOut/Inp_CommLink.txt | 42 ++++++++++++++++++++++++++++++++++++++ scripts/cfg/prepare.sh | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 cfg/InOut/Inp_CommLink.txt diff --git a/cfg/InOut/Inp_CommLink.txt b/cfg/InOut/Inp_CommLink.txt new file mode 100644 index 000000000..cf81fbd38 --- /dev/null +++ b/cfg/InOut/Inp_CommLink.txt @@ -0,0 +1,42 @@ +<<<<<<<<<<<<<<<<<<< 42: Comm Link Description File >>>>>>>>>>>>>>>>>>> +0 ! Number of Links +=============================== Link 0 ================================ +S-Band Uplink ! Description +TRUE ! Comm Link Exists +TRUE 10.0 ! Output Enabled, Interval (sec) +FALSE 1.0E-3 ! Adjust Positions for Delay, Delay Accuracy (sec) +UPLINK ! Link Type (UPLINK, DOWNLINK, or CROSSLINK) +3.0E9 ! Frequency (Hz) +-200.0 ! Link Noise Floor (dBw) +1 0 ! Tx Terminal ID, Body +0.0 0.0 0.0 123 ! Tx Mounting Angles (deg), Euler Sequence +100.0 ! Tx Power (dBw) +40.0 -50.0 ! Tx Antenna Peak Gain, Floor Gain (dB) +"Ant_Gnd.obj" ! Tx Antenna Pattern Mesh File +0 0 ! Rx Terminal ID, Body +0.0 0.0 0.0 123 ! Rx Mounting Angles (deg), Euler Sequence +10.0 -50.0 ! Rx Antenna Peak Gain, Floor Gain (dB) +"Ant_SBand.obj" ! Rx Antenna Pattern Mesh File +-130.0 ! Rx System Noise Power (dBw) +1.0 ! Atmo Loss Mean (dB) +0.1 10.0 100 ! Atmo Loss Ran Walk std (dB), Corr Time (sec), Seed +=============================== Link 1 ================================ +X-Band Downlink ! Description +TRUE ! Comm Link Exists +TRUE 20.0 ! Output Enabled, Interval (sec) +TRUE 1.0E-6 ! Adjust Positions for Delay, Delay Accuracy (sec) +DOWNLINK ! Link Type (UPLINK, DOWNLINK, or CROSSLINK) +10.0E9 ! Frequency (Hz) +-200.0 ! Link Noise Floor (dBw) +0 1 ! Tx Terminal ID, Body +0.0 0.0 0.0 123 ! Tx Mounting Angles (deg), Euler Sequence +17.0 ! Tx Power, (dBw) +35.0 -50.0 ! Tx Antenna Peak Gain, Floor Gain (dB) +"Ant_XBand.obj" ! Tx Antenna Pattern File +2 0 ! Rx Terminal ID, Body +0.0 0.0 0.0 123 ! Rx Mounting Angles (deg), Euler Sequence +70.0 -50.0 ! Rx Antenna Peak Gain, Floor Gain (dB) +"Ant_Gnd.obj" ! Rx Antenna Pattern File +-130.0 ! Rx System Noise Power (dBw) +1.0 ! Atmo Loss Mean (dB) +0.1 10.0 101 ! Atmo Loss Ran Walk std (dB), Corr Time (sec), Seed diff --git a/scripts/cfg/prepare.sh b/scripts/cfg/prepare.sh index cc9041bf0..7f32e83db 100755 --- a/scripts/cfg/prepare.sh +++ b/scripts/cfg/prepare.sh @@ -25,7 +25,7 @@ echo "" echo "Prepare 42..." cd $USER_NOS3_DIR -git clone https://github.com/nasa-itc/42.git --depth 1 -b nos3-main +git clone https://github.com/nasa-itc/42.git --depth 1 -b V20260401 cd $USER_NOS3_DIR/42 $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NOS3_DIR/42 --name "nos3_42_build" $DBOX make echo "" From d43ab4edf1cdcf6cbc2b78e29d7a9380c43643d2 Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Thu, 2 Apr 2026 19:40:21 +0000 Subject: [PATCH 2/3] [nasa/nos3#846] nos3-dev tag release later --- scripts/cfg/prepare.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/cfg/prepare.sh b/scripts/cfg/prepare.sh index 7f32e83db..127820e50 100755 --- a/scripts/cfg/prepare.sh +++ b/scripts/cfg/prepare.sh @@ -25,7 +25,8 @@ echo "" echo "Prepare 42..." cd $USER_NOS3_DIR -git clone https://github.com/nasa-itc/42.git --depth 1 -b V20260401 +# git clone https://github.com/nasa-itc/42.git --depth 1 -b V20260401 #change to tag once ready for release +git clone https://github.com/nasa-itc/42.git --depth 1 -b nos3-dev cd $USER_NOS3_DIR/42 $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NOS3_DIR/42 --name "nos3_42_build" $DBOX make echo "" From 46a6ce11a428a549ac7466e970342d9fb1be4818 Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Fri, 3 Apr 2026 13:58:52 +0000 Subject: [PATCH 3/3] [nasa/nos3#846] tag dev for 42 repo --- scripts/cfg/prepare.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/cfg/prepare.sh b/scripts/cfg/prepare.sh index 127820e50..181f782a1 100755 --- a/scripts/cfg/prepare.sh +++ b/scripts/cfg/prepare.sh @@ -25,8 +25,7 @@ echo "" echo "Prepare 42..." cd $USER_NOS3_DIR -# git clone https://github.com/nasa-itc/42.git --depth 1 -b V20260401 #change to tag once ready for release -git clone https://github.com/nasa-itc/42.git --depth 1 -b nos3-dev +git clone https://github.com/nasa-itc/42.git --depth 1 -b dev_20260403 cd $USER_NOS3_DIR/42 $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NOS3_DIR/42 --name "nos3_42_build" $DBOX make echo ""