Resolved merge conflict by keeping launch/rosbag.launch

MarlonRiv · Apr 11, 2024 · 16afea1 · 16afea1
2 parents 91ef251 + 921505e
commit 16afea1
Show file tree

Hide file tree

Showing 35 changed files with 210 additions and 3,200 deletions.
diff --git a/config/blinking_sequences/test_assignment.txt b/config/blinking_sequences/test_assignment.txt
@@ -1,4 +1,4 @@
-1,0,0,0,1,1,0,0,0,0,0
-1,0,0,0,0,0,0,0,1,1,0
 1,0,1,1,0,0,0,0,0,0,0
 1,0,0,0,0,0,1,1,0,0,0
+1,0,0,0,0,0,0,0,1,1,0
+1,0,0,0,1,1,0,0,0,0,0
diff --git a/install/install_on_real_UAV.sh b/install/install_on_real_UAV.sh
@@ -4,7 +4,7 @@ set -e
 
 ####################### USER Parameter ########################
 # default workspace location
-workspace=/home/$USER/workspace
+workspace=/home/$USER/ws_uvdar
 # default git folder
 GIT_PATH="/home/$USER/git"
 # default exposure for bluefox cams
@@ -122,6 +122,7 @@ build_workspace(){
             ln -s $GIT_PATH/bluefox2 $workspace/src/bluefox2 
         fi
         cd $workspace
+        catkin init
         catkin clean -y
         catkin build
     else 

diff --git a/launch/uvdar_fpga_frontend.launch → launch/fpga/uvdar_fpga_frontend.launch b/launch/uvdar_fpga_frontend.launch → launch/fpga/uvdar_fpga_frontend.launch
diff --git a/launch/new_signaling.launch b/launch/new_signaling.launch
diff --git a/launch/record_calibration.launch b/launch/record_calibration.launch
diff --git a/launch/rosbag_camp.launch b/launch/rosbag_camp.launch