Merge pull request #470 from #463-css-checkout

[#463] Generic CSS Checkout
nasa · Jan 21, 2025 · 9fae1ac · 9fae1ac
2 parents 7af7b99 + 06c5b76
commit 9fae1ac
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/components/generic_css b/components/generic_css
diff --git a/scripts/cfg/configure.py b/scripts/cfg/configure.py
@@ -469,11 +469,11 @@
 
         sim_disabled = '            <active>false</active>\n'
         if (sc_cam_en != 'true'):
-            lines[css_index] = sim_disabled
+            lines[cam_index] = sim_disabled
         if (sc_css_en != 'true'):
             lines[css_index] = sim_disabled
         if (sc_eps_en != 'true'):
-            lines[css_index] = sim_disabled
+            lines[eps_index] = sim_disabled
         if (sc_fss_en != 'true'):
             lines[fss_index] = sim_disabled
         if (sc_gps_en != 'true'):
@@ -483,7 +483,7 @@
         if (sc_mag_en != 'true'):
             lines[mag_index] = sim_disabled
         if (sc_radio_en != 'true'):
-            lines[mag_index] = sim_disabled
+            lines[radio_index] = sim_disabled
         if (sc_rw_en != 'true'):
             lines[rw0_index] = sim_disabled
             lines[rw1_index] = sim_disabled

diff --git a/scripts/checkout.sh b/scripts/checkout.sh
@@ -64,9 +64,20 @@ echo "Checkout..."
 #gnome-terminal --tab --title="Arducam Sim"   -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim"   --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim
 #gnome-terminal --title="Arducam Checkout"   -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_arducam_checkout"   --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/arducam/fsw/standalone/build/arducam_checkout
 
-# ##
-# ## Fine Sun Sensor (FSS)
-# ##
+##
+## Coarse Sun Sensor (CSS)
+##
+# rm -rf $USER_NOS3_DIR/42/NOS3InOut
+# cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut
+# xhost +local:*
+# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut
+# echo ""
+# gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim
+# gnome-terminal --title="CSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_css_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_css/fsw/standalone/build/generic_css_checkout
+
+##
+## Fine Sun Sensor (FSS)
+##
 # rm -rf $USER_NOS3_DIR/42/NOS3InOut
 # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut
 # xhost +local:*
+16 −0		.gitignore
+1 −0		fsw/cfs/CMakeLists.txt
+59 −59		fsw/shared/generic_css_device.c
+41 −41		fsw/shared/generic_css_device.h
+65 −0		fsw/standalone/CMakeLists.txt
+14 −0		fsw/standalone/device_cfg.h
+29 −100		fsw/standalone/generic_css_checkout.c
+4 −8		fsw/standalone/generic_css_checkout.h
+0 −29		support/CMakeLists.txt
+0 −17		support/device_cfg.h