Merge pull request #152 from rm-controls/master

Merge master into dev

.github/workflows/deb_package.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
@@ -31,16 +31,17 @@ jobs:
           host: ${{ secrets.SOURCE_SSH_HOST }}
           username: ${{ secrets.SOURCE_SSH_NAME }}
           key: ${{ secrets.SOURCE_SSH_KEYGEN }}
+          port: ${{ secrets.SOURCE_SSH_PORT }}
           source: "*.deb"
-          target: "/usr/local/web/rm-source/ubuntu/incoming/"
+          target: "/home/dynamicx/package_hub/wwwroot/ppa/incoming"
       - name: Deploy deb package to source
         if: ${{ github.repository == 'rm-controls/rm_controllers' }}
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.SOURCE_SSH_HOST }}
           username: ${{ secrets.SOURCE_SSH_NAME }}
           key: ${{ secrets.SOURCE_SSH_KEYGEN }}
+          port: ${{ secrets.SOURCE_SSH_PORT }}
           script: |
-                  cd /usr/local/web/rm-source/ubuntu/incoming/
-                  reprepro  -s  -b  /usr/local/web/rm-source/ubuntu/  --waitforlock  1000  includedeb focal /usr/local/web/rm-source/ubuntu/incoming/*.deb && \
-                  rm -f *.deb
+                  cd /home/dynamicx/package_hub/wwwroot/ppa/
+                  bash deploy.sh

.github/workflows/format.yml

@@ -11,19 +11,22 @@ on:
 jobs:
   pre-commit:
     name: pre-commit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
       - name: Install clang-format-10
-        run: sudo apt-get install clang-format-10
+        run: |
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+          sudo apt-get install clang-format-10
       - name: Install catkin-lint
         run: |
           lsb_release -sc
           sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
           sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
           sudo apt-get -q update
           sudo apt-get -q install python3-rosdep
+          rm -f /etc/ros/rosdep/sources.list.d/*.list
           sudo rosdep init
           rosdep update
           sudo apt-get -q install catkin-lint

gpio_controller/CHANGELOG.rst

@@ -2,6 +2,38 @@
 Changelog for package gpio_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.11 (2023-06-20)
+-------------------
+* Merge branch 'master' into dev/balance
+* Merge pull request `#120 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/120>`_ from ye-luo-xi-tui/master
+  0.1.10
+* Merge branch 'rm-controls:master' into gpio_calibration_controller
+* Contributors: 1moule, ye-luo-xi-tui, yuchen
+
+0.1.10 (2023-03-25)
+-------------------
+* Merge pull request `#106 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/106>`_ from ye-luo-xi-tui/master
+  0.1.9
+* Contributors: ye-luo-xi-tui
+
+0.1.9 (2023-02-21)
+------------------
+* Merge branch 'master' into balance_standard
+* Merge pull request `#97 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/97>`_ from ye-luo-xi-tui/master
+  0.1.8
+* Contributors: ye-luo-xi-tui, yezi
+
+0.1.8 (2022-11-24)
+------------------
+* Merge pull request `#85 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/85>`_ from ye-luo-xi-tui/master
+  0.1.7
+* Contributors: ye-luo-xi-tui
+
+0.1.7 (2022-09-10)
+------------------
+* Merge remote-tracking branch 'origin/master'
+* Contributors: qiayuan
+
 0.1.6 (2022-06-16)
 ------------------
 * Merge remote-tracking branch 'origin/master'

gpio_controller/CMakeLists.txt

@@ -3,14 +3,10 @@ project(gpio_controller)
 
 find_package(catkin REQUIRED COMPONENTS
         roscpp
-        roslint
 
-        rm_msgs
         rm_common
 
-
         pluginlib
-        hardware_interface
         controller_interface
         realtime_tools
         )
@@ -20,13 +16,10 @@ catkin_package(
         include
         CATKIN_DEPENDS
         roscpp
-        roslint
 
-        rm_msgs
         rm_common
 
         pluginlib
-        hardware_interface
         controller_interface
         realtime_tools
         LIBRARIES ${PROJECT_NAME}
@@ -61,13 +54,10 @@ install(
 
 # Mark other files for installation
 install(
-        DIRECTORY config launch
+        DIRECTORY test
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 install(
         FILES gpio_controller_plugins.xml
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
-
-
-roslint_cpp()

gpio_controller/package.xml

@@ -1,21 +1,18 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>gpio_controller</name>
-    <version>0.1.6</version>
+    <version>0.1.11</version>
     <description>The gpio_controller package</description>
     <maintainer email="[email protected]">muyuexin</maintainer>
 
     <license>BSD</license>
 
     <buildtool_depend>catkin</buildtool_depend>
 
-    <depend>rm_msgs</depend>
     <depend>rm_common</depend>
     <depend>pluginlib</depend>
     <depend>roscpp</depend>
-    <depend>roslint</depend>
     <depend>controller_interface</depend>
-    <depend>hardware_interface</depend>
     <depend>realtime_tools</depend>
 
 

mimic_joint_controller/CHANGELOG.rst

@@ -2,6 +2,38 @@
 Changelog for package mimic_joint_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.11 (2023-06-20)
+-------------------
+* Merge branch 'master' into dev/balance
+* Merge pull request `#120 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/120>`_ from ye-luo-xi-tui/master
+  0.1.10
+* Merge branch 'rm-controls:master' into gpio_calibration_controller
+* Contributors: 1moule, ye-luo-xi-tui, yuchen
+
+0.1.10 (2023-03-25)
+-------------------
+* Merge pull request `#106 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/106>`_ from ye-luo-xi-tui/master
+  0.1.9
+* Contributors: ye-luo-xi-tui
+
+0.1.9 (2023-02-21)
+------------------
+* Merge branch 'master' into balance_standard
+* Merge pull request `#97 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/97>`_ from ye-luo-xi-tui/master
+  0.1.8
+* Contributors: ye-luo-xi-tui, yezi
+
+0.1.8 (2022-11-24)
+------------------
+* Merge pull request `#85 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/85>`_ from ye-luo-xi-tui/master
+  0.1.7
+* Contributors: ye-luo-xi-tui
+
+0.1.7 (2022-09-10)
+------------------
+* Merge remote-tracking branch 'origin/master'
+* Contributors: qiayuan
+
 0.1.6 (2022-06-16)
 ------------------
 * Merge remote-tracking branch 'origin/master'

mimic_joint_controller/CMakeLists.txt

@@ -3,10 +3,8 @@ project(mimic_joint_controller)
 
 find_package(catkin REQUIRED COMPONENTS
         roscpp
-        roslint
 
         pluginlib
-        hardware_interface
         controller_interface
         )
 
@@ -15,10 +13,8 @@ catkin_package(
         include
         CATKIN_DEPENDS
         roscpp
-        roslint
 
         pluginlib
-        hardware_interface
         controller_interface
         LIBRARIES ${PROJECT_NAME}
 )
@@ -51,14 +47,7 @@ install(
 )
 
 # Mark other files for installation
-install(
-        DIRECTORY config
-        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-)
 install(
         FILES mimic_joint_controller_plugins.xml
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
-
-
-roslint_cpp()

mimic_joint_controller/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>mimic_joint_controller</name>
-  <version>0.1.6</version>
+  <version>0.1.11</version>
   <description>The mimic_joint_controller package</description>
   <maintainer email="[email protected]">ljq</maintainer>
 
@@ -11,9 +11,7 @@
 
   <depend>pluginlib</depend>
   <depend>roscpp</depend>
-  <depend>roslint</depend>
   <depend>controller_interface</depend>
-  <depend>hardware_interface</depend>
 
   <export>
     <controller_interface plugin="${prefix}/mimic_joint_controller_plugins.xml"/>

rm_calibration_controllers/CHANGELOG.rst

@@ -2,6 +2,83 @@
 Changelog for package rm_calibration_controllers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.11 (2023-06-20)
+-------------------
+* Merge pull request `#127 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/127>`_ from 1moule/gpio_calibration_controller
+  Rewrite the stopping function and set calibration success to false in stopping function
+* Rewrite the stopping function and set calibration success to false in the stopping function.
+* Merge pull request `#126 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/126>`_ from 1moule/master
+  Remove unnecessary variables
+* Remove unnecessary variables.
+* Merge pull request `#125 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/125>`_ from rm-controls/calibration
+  Add gpio calibration controller
+* Merge pull request `#116 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/116>`_ from 1moule/gpio_calibration_controller
+  Split the calibration controller and add a controller that uses gpio calibration
+* Modefy CMakeLists, delete TODO and initialize a variable.
+* Modified to get the error message when gpio is obtained.
+* Delete vector and some unnecessary code.
+* Merge branch 'master' into dev/balance
+* Change gpio calibration controller to the same one and modify gpio calibration logic.
+* Merge pull request `#120 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/120>`_ from ye-luo-xi-tui/master
+  0.1.10
+* Modify the unmodified name in the joint calibration controller.
+* Rename joint calibration controller.
+* Write the velocity threshold in the base class.
+* Modify the name of an enumeration type.
+* Modify the name of an enumeration type.
+* Modify variable name.
+* Delete some comments, modify the initialization function of the gpio calibration controller base class.
+* Modified hardware interface for instantiating template classes.
+* Add a new line at the end and delete update function of calibration_base.h file.
+* Factor out the calibration controller into a form derived from a base class and modify the controller appropriately.
+* Use gpio handle to replace gpio call back function.
+* Solved the problem of not being in the detection range of the hall switch when starting the calibration.
+* Modify gpio calibration controller scheme to first use speed control to find a fixed point, and then use position control to reach.
+* Modify logic and callback function of gpio calibration controller.
+* Modify queue length of gpio subscriber.
+* Merge branch 'rm-controls:master' into gpio_calibration_controller
+* Add gpio calibration controller.
+* Contributors: 1moule, ye-luo-xi-tui, yuchen
+
+0.1.10 (2023-03-25)
+-------------------
+* Merge pull request `#106 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/106>`_ from ye-luo-xi-tui/master
+  0.1.9
+* Contributors: ye-luo-xi-tui
+
+0.1.9 (2023-02-21)
+------------------
+* Merge pull request `#103 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/103>`_ from L-SY/fix_return
+  Fix calibration controller no return true.
+* Fix bug.
+* Run pre-commit.
+* Merge branch 'master' into balance_standard
+* Add engineer trigger ui .
+* Merge pull request `#96 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/96>`_ from L-SY/fix_return
+  Fix joint_calibration_controller
+* Delete repetitive set.
+* delete useless target_velocity\_.
+* Merge pull request `#97 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/97>`_ from ye-luo-xi-tui/master
+  0.1.8
+* eyes is lost.
+* Update fix can not return .
+* Contributors: lsy, ye-luo-xi-tui, yezi
+
+0.1.8 (2022-11-24)
+------------------
+* Merge branch 'master' into target_velocity_correction
+* Merge pull request `#87 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/87>`_ from NaHCO3bc/Readme
+  Fix the dependence bug in rm_calibration_controllers.
+* Fix the dependence bug in rm_calibration_controllers.
+* Merge pull request `#85 <https://github.com/ye-luo-xi-tui/rm_controllers/issues/85>`_ from ye-luo-xi-tui/master
+  0.1.7
+* Contributors: NaHCO3bc, ye-luo-xi-tui, yezi
+
+0.1.7 (2022-09-10)
+------------------
+* Merge remote-tracking branch 'origin/master'
+* Contributors: qiayuan
+
 0.1.6 (2022-06-16)
 ------------------
 * Merge remote-tracking branch 'origin/master'