[#378] Arducam reformatted to include fsw/shared folder and created f…

…unctional checkout with simulated hardware NOOP;
nasa · Oct 24, 2024 · 8597ec3 · 8597ec3
1 parent de3488f
commit 8597ec3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake
@@ -138,6 +138,8 @@ FOREACH(X ${MISSION_GLOBAL_APPLIST})
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/public_inc)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/public_inc)
 
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/../shared)
+
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/src)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/src)
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/src)

diff --git a/components/arducam b/components/arducam
diff --git a/scripts/docker_checkout.sh b/scripts/docker_checkout.sh
@@ -31,14 +31,8 @@ gnome-terminal --tab --title="NOS Engine Server" -- $DFLAGS -v $SIM_DIR:$SIM_DIR
 gnome-terminal --tab --title="NOS Time Driver"   -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE time
 gnome-terminal --tab --title="NOS Terminal"      -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal"        --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE stdio-terminal
 
-echo "Checkout..."
-# Rename for your simulator under test to allow checkout
-gnome-terminal --tab --title="Sample Sim"   -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim"   --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim
-
-#testing star tracker
-# gnome-terminal --tab --title="Generic Star Tracker" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_star_tracker_sim"   --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim
-#testing generic mag
-# gnome-terminal --tab --title="Generic Mag" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_mag_sim
+echo " Checkout..."
+# Rename for your simulator under test to allow checkout, uncomment if already exists
 
 # Example manual build for sample checkout:
 #   cd ./components/sample/support
@@ -47,18 +41,22 @@ gnome-terminal --tab --title="Sample Sim"   -- $DFLAGS -v $SIM_DIR:$SIM_DIR --na
 #   cmake .. -DTGTNAME=cpu1
 #   make
 
-# Rename for your checkout under test to allow checkout
-# gnome-terminal --tab --title="FPrime"   -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout"   --network=$SC_NETNAME -w $BASE_DIR $DBOX ./scripts/fsw_fprime_launch.sh
-gnome-terminal --title="Sample Checkout"   -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout"   --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/support/build/sample_checkout
+##
+## Arducam
+##
+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
 
-echo ""
+##
+## Sample
+##
+#gnome-terminal --tab --title="Sample Sim"   -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim"   --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim
+#gnome-terminal --tab --title="FPrime"   -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout"   --network=$SC_NETNAME -w $BASE_DIR $DBOX ./scripts/fsw_fprime_launch.sh
+#gnome-terminal --title="Sample Checkout"   -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout"   --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/support/build/sample_checkout
 
 # sleep 1
-
 # urlIP=$(docker container inspect sc_1_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b")
-
 # sleep 10
-
 # firefox ${urlIP}:5000
 
-# echo ""
+echo ""
+17 −0		.gitignore
+263 −0		LICENSE
+6 −2		fsw/cfs/CMakeLists.txt
+17 −33		fsw/cfs/platform_inc/cam_platform_cfg.h
+1 −1		fsw/cfs/src/cam_app.h
+432 −0		fsw/cfs/src/cam_child.c
+32 −0		fsw/cfs/src/cam_child.h
+1 −0		fsw/cfs/src/cam_msg.h
+614 −0		fsw/shared/cam_device.c
+117 −128		fsw/shared/cam_device.h
+1,964 −2,996		fsw/shared/cam_registers.c
+38 −0		fsw/shared/cam_registers.h
+66 −0		fsw/standalone/CMakeLists.txt
+384 −0		fsw/standalone/arducam_checkout.c
+74 −0		fsw/standalone/arducam_checkout.h
+23 −0		fsw/standalone/device_cfg.h
+9 −8		gsw/ARDUCAM/cmd_tlm/ARDUCAM_TLM.txt