diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml index 712b8e8..6d4bb60 100644 --- a/.github/workflows/ros-ci.yml +++ b/.github/workflows/ros-ci.yml @@ -6,9 +6,13 @@ name: ROS # events but only for the master branch on: push: - branches: [ next ] + branches: + - main + - next pull_request: - branches: [ next ] + branches: + - main + - next # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/.github/workflows/standalone-ci.yml b/.github/workflows/standalone-ci.yml index 9f060cd..d444f7a 100644 --- a/.github/workflows/standalone-ci.yml +++ b/.github/workflows/standalone-ci.yml @@ -2,9 +2,13 @@ name: Cpp on: push: - branches: [ next ] + branches: + - main + - next pull_request: - branches: [ next ] + branches: + - main + - next jobs: build: diff --git a/README.md b/README.md index 056d368..e5dfeb2 100755 --- a/README.md +++ b/README.md @@ -33,19 +33,21 @@ It should also work in other similar Linux environments but only the above liste | Robot | Protocol V1 | Protocol V2 | UART | CAN | Support Status | | :---------------: | :---------: | :---------: | :---: | :---: | :------------: | -| Scout 1.0 | Y | - | TODO | Y | Discontinued | -| Scout 2.0 | Y | Y | TODO | Y | Active | +| Scout 1.0 | Y | - | N | Y | Discontinued | +| Scout 2.0 | Y | Y | N | Y | Active | | Scout Mini (Skid) | Y | Y | - | Y | Active | | Scout Mini (Omni) | Y | Y | - | Y | Active | | Hunter 1.0 | Y | Y | - | Y | Active | | Hunter 2.0 | - | Y | - | Y | Active | | Bunker | Y | Y | - | Y | Active | -| Tracer | - | Y | TODO | Y | Active | +| Tracer | - | Y | N | Y | Active | | Ranger Mini | - | Y | - | Y | Active | -**Important Note:** Currently we're transitioning the communication protocol from version 1 to version 2. Please check with Weston Robot or AgileX Robotics to confirm which version your robot is using. +**Important Note** -* V1 Protocol: master branch of scout_ros and ugv_sdk +The main branch of this repository supports all Scout variants and both V1 and V2 protocol. Earlier versions of the SDK can be found in v1.x and v2.x branch for V1 and V2 protocol support respectively. + +* V1 Protocol: v1.x branch of scout_ros and ugv_sdk * V2 Protocol: v2.x branch of scout_ros and ugv_sdk ## Build SDK @@ -61,7 +63,7 @@ $ sudo apt-get install build-essential git cmake libasio-dev ``` $ cd /src -$ git clone -b next https://github.com/westonrobot/ugv_sdk.git +$ git clone https://github.com/westonrobot/ugv_sdk.git $ cd .. $ catkin_make ```