Merge branch 'main' into More-Graph-Changes

GOFIRST-Robotics · Oct 23, 2024 · ba311d7 · ba311d7
2 parents 46bdc74 + 4e7fe65
commit ba311d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -76,7 +76,10 @@
 					"W"
 				],
 				"ruff.nativeServer": true,
-				"C_Cpp.clang_format_fallbackStyle": "Google"
+				"C_Cpp.clang_format_fallbackStyle": "Google",
+				"diffEditor.ignoreTrimWhitespace": false,
+				// Make bash the default shell in the container terminal
+				"terminal.integrated.defaultProfile.linux": "bash"
 			}
 		}
 	},

diff --git a/README.md b/README.md
@@ -283,6 +283,9 @@ Follow [this](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_apriltag/blob/main/d
 <details>
 <summary>How to load the CAN modules at startup on Nvidia Jetson</summary>
 <br>
+
+Follow [these](https://docs.nvidia.com/jetson/archives/r36.4/DeveloperGuide/HR/ControllerAreaNetworkCan.html) instructions to enable CAN communication on Nvidia Jetson Orin.
+
 1: Put the following in a .conf file in /modules-load.d/
 
 ```