Merge remote-tracking branch 'origin/master'

rm-controls · Jun 11, 2022 · 70068c1 · 70068c1
2 parents 60dbd3c + f53b732
commit 70068c1
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 6 deletions.
diff --git a/rm_common/CHANGELOG.rst b/rm_common/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package rm_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.12 (2022-06-11)
+-------------------
+* Update logic of changing enemy color.
+* Merge pull request `#59 <https://github.com/ye-luo-xi-tui/rm_control/issues/59>`_ from ye-luo-xi-tui/master
+  0.1.11
+* Contributors: QiayuanLiao, yezi
+
 0.1.11 (2022-06-10)
 -------------------
 * Add synchronized calibration.

diff --git a/rm_common/package.xml b/rm_common/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_common</name>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <description>The rm_common package</description>
 
     <maintainer email="[email protected]">qiayuan</maintainer>

diff --git a/rm_control/CHANGELOG.rst b/rm_control/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package rm_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.12 (2022-06-11)
+-------------------
+* Merge pull request `#59 <https://github.com/ye-luo-xi-tui/rm_control/issues/59>`_ from ye-luo-xi-tui/master
+  0.1.11
+* Contributors: QiayuanLiao
+
 0.1.11 (2022-06-10)
 -------------------
 * Merge remote-tracking branch 'origin/master'

diff --git a/rm_control/package.xml b/rm_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_control</name>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <description>Meta package that contains package of rm_control.</description>
     <maintainer email="[email protected]">Qiayuan Liao</maintainer>
 

diff --git a/rm_dbus/CHANGELOG.rst b/rm_dbus/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package rm_dbus
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.12 (2022-06-11)
+-------------------
+* Merge pull request `#59 <https://github.com/ye-luo-xi-tui/rm_control/issues/59>`_ from ye-luo-xi-tui/master
+  0.1.11
+* Contributors: QiayuanLiao
+
 0.1.11 (2022-06-10)
 -------------------
 * Merge remote-tracking branch 'origin/master'

diff --git a/rm_dbus/package.xml b/rm_dbus/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_dbus</name>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <description>A package that uses dbus to read remote control information</description>
     <maintainer email="[email protected]">Qiayuan Liao</maintainer>
 

diff --git a/rm_gazebo/CHANGELOG.rst b/rm_gazebo/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package rm_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.12 (2022-06-11)
+-------------------
+* Merge pull request `#59 <https://github.com/ye-luo-xi-tui/rm_control/issues/59>`_ from ye-luo-xi-tui/master
+  0.1.11
+* Contributors: QiayuanLiao
+
 0.1.11 (2022-06-10)
 -------------------
 * Merge remote-tracking branch 'origin/master'

diff --git a/rm_gazebo/package.xml b/rm_gazebo/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_gazebo</name>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <description>A template for ROS packages.</description>
     <maintainer email="[email protected]">Qiayuan Liao</maintainer>
     <license>BSD</license>

diff --git a/rm_hw/CHANGELOG.rst b/rm_hw/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package rm_hw
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.12 (2022-06-11)
+-------------------
+* Merge pull request `#59 <https://github.com/ye-luo-xi-tui/rm_control/issues/59>`_ from ye-luo-xi-tui/master
+  0.1.11
+* Contributors: QiayuanLiao
+
 0.1.11 (2022-06-10)
 -------------------
 * Merge pull request `#52 <https://github.com/ye-luo-xi-tui/rm_control/issues/52>`_ from XYM-github/gpio_interface_2.0

diff --git a/rm_hw/package.xml b/rm_hw/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_hw</name>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <description>ROS control warped interface for RoboMaster motor and some robot hardware</description>
     <maintainer email="[email protected]">Qiayuan Liao</maintainer>
 

diff --git a/rm_msgs/CHANGELOG.rst b/rm_msgs/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package rm_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.12 (2022-06-11)
+-------------------
+* Merge pull request `#59 <https://github.com/ye-luo-xi-tui/rm_control/issues/59>`_ from ye-luo-xi-tui/master
+  0.1.11
+* Contributors: QiayuanLiao
+
 0.1.11 (2022-06-10)
 -------------------
 * Merge pull request `#55 <https://github.com/ye-luo-xi-tui/rm_control/issues/55>`_ from jceleven/master

diff --git a/rm_msgs/package.xml b/rm_msgs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_msgs</name>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <description>The rm_msgs package provides all the messages for all kind of robot</description>
     <maintainer email="[email protected]">qiayuan</maintainer>
     <license>BSD</license>