Merge branch 'master' into update-can-dep

huskyroboticsteam · Sep 29, 2023 · 6663299 · 6663299
2 parents 9b38ba0 + c39dbd4
commit 6663299
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/rover-config/50-rover-cameras.rules b/rover-config/50-rover-cameras.rules
@@ -7,10 +7,10 @@
 # Install this in /etc/udev/rules.d
 
 # Mast camera
-SUBSYSTEM=="video4linux", ATTRS{idVendor}=="05a3", ATTRS{idProduct}=="9601", KERNELS=="1-2.3", SYMLINK+="video20"
+SUBSYSTEM=="video4linux", ATTRS{idVendor}=="05a3", ATTRS{idProduct}=="9230", KERNELS=="1-2.2", SYMLINK+="video20"
 
 # Forearm camera
-SUBSYSTEM=="video4linux", ATTRS{idVendor}=="05a3", ATTRS{idProduct}=="9601", KERNELS=="1-2.1", SYMLINK+="video30"
+# SUBSYSTEM=="video4linux", ATTRS{idVendor}=="05a3", ATTRS{idProduct}=="9601", KERNELS=="1-2.1", SYMLINK+="video30"
 
 # Hand camera
-SUBSYSTEM=="video4linux", ATTRS{idVendor}=="05a3", ATTRS{idProduct}=="9230", SYMLINK+="video40"
+SUBSYSTEM=="video4linux", ATTRS{idVendor}=="05a3", ATTRS{idProduct}=="9230", KERNELS=="1-2.1", SYMLINK+="video40"
diff --git a/rover-config/rover-config.sh b/rover-config/rover-config.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
-cp -r ./.motion/ /home/$USER
 sudo cp ./50-rover-cameras.rules /etc/udev/rules.d/
-sudo cp ./50-usb-hokuyo-lidar.rules /etc/udev/rules.d/
 
 # Reloads udev rules instead of having to reboot
 sudo udevadm control --reload-rules
diff --git a/src/world_interface/real_world_interface.cpp b/src/world_interface/real_world_interface.cpp
@@ -129,7 +129,7 @@ void openCamera(CameraID camID, const char* cameraPath) {
 }
 
 void setupCameras() {
-	// openCamera(Constants::AR_CAMERA_ID, Constants::AR_CAMERA_CONFIG_PATH);
+	openCamera(Constants::AR_CAMERA_ID, Constants::AR_CAMERA_CONFIG_PATH);
 	openCamera(Constants::HAND_CAMERA_ID, Constants::HAND_CAMERA_CONFIG_PATH);
 }
 } // namespace