update tools submodule: fix issue when sometimes slcan could not be c…

…reated
ZilantRobotics · Oct 4, 2023 · 5d4004d · 5d4004d
1 parent 1f4a05a
commit 5d4004d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/scripts/docker.sh b/scripts/docker.sh
@@ -61,8 +61,8 @@ setup_mavlink_sitl_config() {
 
 setup_dronecan_hitl_config() {
     setup_mavlink_sitl_config
-    source ./tools/can/get_sniffer_symlink.sh
-    DRONECAN_DEV_PATH_SYMLINK=$DEV_PATH_SYMLINK
+    source ./tools/can/create_slcan.sh --only-find
+    DRONECAN_DEV_PATH_SYMLINK=$DEV_PATH
 
     if [ ! -z $DRONECAN_DEV_PATH_SYMLINK ]; then
         DOCKER_FLAGS="$DOCKER_FLAGS --privileged -v $DRONECAN_DEV_PATH_SYMLINK:$DRONECAN_DEV_PATH_SYMLINK"
@@ -76,8 +76,8 @@ setup_dronecan_hitl_config() {
 
 setup_cyphal_hitl_config() {
     setup_mavlink_sitl_config
-    source ./tools/can/get_sniffer_symlink.sh
-    CYPHAL_DEV_PATH_SYMLINK=$DEV_PATH_SYMLINK
+    source ./tools/can/create_slcan.sh --only-find
+    CYPHAL_DEV_PATH_SYMLINK=$DEV_PATH
 
     if [ ! -z $CYPHAL_DEV_PATH_SYMLINK ]; then
         DOCKER_FLAGS="$DOCKER_FLAGS --privileged -v $CYPHAL_DEV_PATH_SYMLINK:$CYPHAL_DEV_PATH_SYMLINK"

diff --git a/scripts/run_sim.sh b/scripts/run_sim.sh
@@ -51,7 +51,7 @@ setup_sitl_px4_flight_stack() {
 setup_dronecan_hitl() {
     if [ ! -z $DRONECAN_DEV_PATH_SYMLINK ]; then
         echo "Trying to create slcan0 for dronecan..."
-        $SCRIPT_DIR/tools/can/create_slcan_from_serial.sh $DRONECAN_DEV_PATH_SYMLINK slcan0
+        $SCRIPT_DIR/tools/can/create_slcan.sh -d $DRONECAN_DEV_PATH_SYMLINK -i slcan0
     fi
     if [[ -z $(ifconfig | grep slcan0) ]]; then
         echo "HITL can't be started without CAN interface!"
@@ -62,7 +62,7 @@ setup_dronecan_hitl() {
 setup_cyphal_hitl() {
     if [ ! -z $CYPHAL_DEV_PATH_SYMLINK ]; then
         echo "Trying to create slcan0 for cyphal/serial..."
-        $SCRIPT_DIR/tools/can/create_slcan_from_serial.sh $CYPHAL_DEV_PATH_SYMLINK slcan0
+        $SCRIPT_DIR/tools/can/create_slcan.sh -d $CYPHAL_DEV_PATH_SYMLINK -i slcan0
     fi
     if [[ -z $(ifconfig | grep slcan0) ]]; then
         echo "HITL can't be started without CAN interface!"
@@ -74,11 +74,11 @@ setup_cyphal_hitl() {
 setup_combined_hitl() {
     if [ ! -z $DRONECAN_DEV_PATH_SYMLINK ]; then
         echo "Trying to create slcan0 for dronecan..."
-        $SCRIPT_DIR/tools/can/create_slcan_from_serial.sh $DRONECAN_DEV_PATH_SYMLINK slcan0
+        $SCRIPT_DIR/tools/can/create_slcan.sh -d $DRONECAN_DEV_PATH_SYMLINK -i slcan0
     fi
     if [ ! -z $CYPHAL_DEV_PATH_SYMLINK ]; then
         echo "Trying to create slcan1 for cyphal..."
-        $SCRIPT_DIR/tools/can/create_slcan_from_serial.sh $CYPHAL_DEV_PATH_SYMLINK slcan1
+        $SCRIPT_DIR/tools/can/create_slcan.sh -d $CYPHAL_DEV_PATH_SYMLINK -i slcan1
         source $SCRIPT_DIR/cyphal_config_slcan1.sh
     fi
 }

diff --git a/scripts/tools b/scripts/tools
+1 −1		README.md
+32 −10		can/README.md
+126 −0		can/create_slcan.sh
+16 −27		can/create_slcan_from_serial.sh
+13 −24		can/get_sniffer_symlink.sh
+21 −0		can/test.py
+1 −1		cyphal/init.sh
+1 −1		dronecan/README.md
+1 −1		dronecan/config.sh
+31 −0		nodes/common.py
+8 −34		nodes/gnss/test.py
+7 −0		nodes/latest_firmware.yml