Update repos (#126)

micro-ROS · Jun 2, 2020 · dd2c1ee · dd2c1ee
1 parent cfe6685
commit dd2c1ee
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/micro_ros_setup/config/freertos/crazyflie21/create.sh b/micro_ros_setup/config/freertos/crazyflie21/create.sh
@@ -19,6 +19,6 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/rcl/rcl_action/COLCON_IGNORE
     touch mcu_ws/ros2/rcl/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro dashing --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
 
 popd >/dev/null
diff --git a/micro_ros_setup/config/freertos/olimex-stm32-e407/create.sh b/micro_ros_setup/config/freertos/olimex-stm32-e407/create.sh
@@ -17,5 +17,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE
     touch mcu_ws/ros2/rcl/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro dashing --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/micro_ros_setup/config/nuttx/generic/create.sh b/micro_ros_setup/config/nuttx/generic/create.sh
@@ -23,9 +23,9 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE
     touch mcu_ws/ros2/rcl/rcl_action/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro dashing --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
 
 popd >/dev/null
 
 cp $PREFIX/config/$RTOS/generic/package.xml $FW_TARGETDIR/apps/package.xml
-rosdep install -y --from-paths $FW_TARGETDIR/apps -i $FW_TARGETDIR/apps --rosdistro dashing
+rosdep install -y --from-paths $FW_TARGETDIR/apps -i $FW_TARGETDIR/apps --rosdistro foxy
diff --git a/micro_ros_setup/config/zephyr/generic/create.sh b/micro_ros_setup/config/zephyr/generic/create.sh
@@ -22,26 +22,14 @@ pushd $FW_TARGETDIR >/dev/null
 
     pip3 install -r zephyrproject/zephyr/scripts/requirements.txt
 
-    if [ "$PLATFORM" = "host" ]; then
-        export TOOLCHAIN_VERSION=zephyr-sdk-0.11.2-setup.run
-    else
-        export TOOLCHAIN_VERSION=zephyr-toolchain-arm-0.11.2-setup.run
-    fi
+    export TOOLCHAIN_VERSION=zephyr-sdk-0.11.3-setup.run
 
-    wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.11.2/$TOOLCHAIN_VERSION
+    wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.11.3/$TOOLCHAIN_VERSION
     chmod +x $TOOLCHAIN_VERSION
-    ./$TOOLCHAIN_VERSION -- -d $(pwd)/zephyr-sdk -y
+    echo "n" | ./$TOOLCHAIN_VERSION -- -d $(pwd)/zephyr-sdk -y -norc
 
     rm -rf $TOOLCHAIN_VERSION
 
-
-    # Temporal until driver in mainstream
-    pushd zephyrproject/zephyr >/dev/null
-        git remote add eprosima https://github.com/eProsima/zephyr
-        git fetch --all
-        git checkout remotes/eprosima/feature/micro_ros
-    popd >/dev/null
-
     export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
     export ZEPHYR_SDK_INSTALL_DIR=$FW_TARGETDIR/zephyr-sdk
 
@@ -55,5 +43,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_c/COLCON_IGNORE
     touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro dashing --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/micro_ros_setup/scripts/create_firmware_ws.sh b/micro_ros_setup/scripts/create_firmware_ws.sh
@@ -88,7 +88,7 @@ pushd $FW_TARGETDIR >/dev/null
     if [ $RTOS != "host" ]; then
         ros2 run micro_ros_setup create_ws.sh $DEV_WS_DIR $PREFIX/config/$RTOS/dev_ros2_packages.txt \
             $PREFIX/config/$RTOS/dev_uros_packages.repos
-        rosdep install -y --from-paths $DEV_WS_DIR -i $DEV_WS_DIR --rosdistro dashing --skip-keys="$SKIP"
+        rosdep install -y --from-paths $DEV_WS_DIR -i $DEV_WS_DIR --rosdistro foxy --skip-keys="$SKIP"
 
          # Creating mcu directory
         mkdir mcu_ws