Merge pull request #84 from ye-luo-xi-tui/master

0.1.16

rm_common/CHANGELOG.rst

@@ -2,6 +2,104 @@
 Changelog for package rm_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2022-11-24)
+-------------------
+* Merge branch 'master' into new_ui_test
+* Merge pull request `#78 <https://github.com/ye-luo-xi-tui/rm_control/issues/78>`_ from chenhuiYu00/dev/command_sender
+  Check the modification of command sender.
+* Cancel passing msg in constructor.
+* Cancel constructor transfer cmd.
+* Optimize command sender.
+* Merge branch 'master' into dev/command_sender
+* Delete referee msg and update command sender.
+* Merge pull request `#79 <https://github.com/ye-luo-xi-tui/rm_control/issues/79>`_ from ye-luo-xi-tui/rm_imu_handle
+  Add RmImuSensorInterface and add a service to enable or disable imus in rm_gazebo
+* Add RmImuSensorInterface.
+* Merge pull request `#76 <https://github.com/ye-luo-xi-tui/rm_control/issues/76>`_ from chenhuiYu00/accleration_Initial_value
+  Add accleration initial value.
+* Merge branch 'rm-controls:master' into master
+* Add accleration initial value.
+* Merge pull request `#70 <https://github.com/ye-luo-xi-tui/rm_control/issues/70>`_ from chenhuiYu00/rm_referee_pr
+  Complete the referee part of manual separation.
+* Conflict resolution.
+* Updata befor merge.
+* Merge pull request `#73 <https://github.com/ye-luo-xi-tui/rm_control/issues/73>`_ from 1moule/chassis_power_buffer
+  Add power buffer to power limit.
+* Modified some variable names.
+* Merge pull request `#71 <https://github.com/ye-luo-xi-tui/rm_control/issues/71>`_ from Edwinlinks/dart-command-sender
+  Add command sender for dart command sending.
+* Merge pull request `#75 <https://github.com/ye-luo-xi-tui/rm_control/issues/75>`_ from ye-luo-xi-tui/master
+  Reset imu_filter when robot relive
+* Merge branch 'dev'
+* Modified some variable names.
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'master' into rm_referee_pr
+* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
+  Update 0.1.15
+* Modify prompt information.
+* Add power buffer to power limit.
+* Add RobotID enum.
+* Delete /common/data.h, Update power_limit and heat_limit.
+* Update date acquisition in command_sender.
+* Move referee part from rm_common to rm_referee and modify ui sending logic.
+* Reset imu_filter when robot relive.
+* Delete unnecessary offset
+* Modify getIndex() function.
+* Add command's offset for servo control
+* Add ManualToReferee msg.
+* Modify joint point command sender for dat manual.
+* Merge and fixed conflict.
+* Merge branch 'master' into referee
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/service_caller.h
+  #	rm_msgs/CMakeLists.txt
+  #	rm_msgs/msg/referee/GameRobotStatus.msg
+  #	rm_msgs/msg/referee/GameStatus.msg
+* Merge branch 'master' into referee1
+* Add defect code.
+* Merge branch 'master' into referee1
+* Merge branch 'referee1' of github.com:chenhuiYu00/rm_control into referee1
+  
 Conflicts:
+  
	rm_common/include/rm_common/decision/command_sender.h
+  
	rm_common/include/rm_common/decision/service_caller.h
+  
	rm_msgs/msg/referee/CalibrationStatus.msg
+  
	rm_msgs/msg/referee/CapacityData.msg
+  
	rm_msgs/msg/referee/DetectionStatus.msg
+  
	rm_msgs/msg/referee/EngineerCmd.msg
+  
	rm_msgs/msg/referee/GameRobotHp.msg
+  
	rm_msgs/msg/referee/GameRobotStatus.msg
+  
	rm_msgs/msg/referee/GameStatus.msg
+  
	rm_msgs/msg/referee/PowerHeatData.msg
+  
	rm_msgs/msg/referee/StateCmd.msg
+  
	rm_referee/config/standard3.yaml
+  
	rm_referee/include/rm_referee/common/data.h
+  
	rm_referee/include/rm_referee/common/referee_base.h
+  
	rm_referee/include/rm_referee/engineer_referee.h
+  
	rm_referee/include/rm_referee/hero_referee.h
+  
	rm_referee/include/rm_referee/referee/referee.h
+  
	rm_referee/include/rm_referee/referee/ui.h
+  
	rm_referee/include/rm_referee/robot_referee.h
+  
	rm_referee/include/rm_referee/standard_referee.h
+  
	rm_referee/launch/load.launch
+  
	rm_referee/src/common/referee_base.cpp
+  
	rm_referee/src/engineer_referee.cpp
+  
	rm_referee/src/hero_referee.cpp
+  
	rm_referee/src/main.cpp
+  
	rm_referee/src/referee/referee.cpp
+  
	rm_referee/src/referee/ui.cpp
+  
	rm_referee/src/robot_referee.cpp
+  
	rm_referee/src/standard_referee.cpp
+* Merge branch 'master' into referee1
+* Fixed for test manual,Immature work.
+* Merge branch 'rm_referee1' into referee1
+* Ljq update,fixed for test manual,Immature work.
+* Update calibration_status_pub's position
+* Update game_robot_status, game_status, capacity_data's pub
+* Add detection_state pub
+* Update stateCommandSender
+* Add calibration_status_pub
+* Contributors: 1moule, Chenhui, Edwinlinks, QiayuanLiao, ljq-lv, ye-luo-xi-tui, yezi, yuchen, 吕骏骐
+
 0.1.15 (2022-09-02)
 -------------------
 

rm_common/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_common</name>
-    <version>0.1.15</version>
+    <version>0.1.16</version>
     <description>The rm_common package</description>
 
     <maintainer email="[email protected]">qiayuan</maintainer>

rm_control/CHANGELOG.rst

@@ -2,6 +2,22 @@
 Changelog for package rm_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2022-11-24)
+-------------------
+* Merge branch 'dev'
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'master' into rm_referee_pr
+* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
+  Update 0.1.15
+* Merge branch 'master' into referee
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/service_caller.h
+  #	rm_msgs/CMakeLists.txt
+  #	rm_msgs/msg/referee/GameRobotStatus.msg
+  #	rm_msgs/msg/referee/GameStatus.msg
+* Merge branch 'master' into referee1
+* Contributors: ye-luo-xi-tui, yezi, yuchen, 吕骏骐
+
 0.1.15 (2022-09-02)
 -------------------
 

rm_control/package.xml

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

rm_dbus/CHANGELOG.rst

@@ -2,6 +2,22 @@
 Changelog for package rm_dbus
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2022-11-24)
+-------------------
+* Merge branch 'dev'
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'master' into rm_referee_pr
+* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
+  Update 0.1.15
+* Merge branch 'master' into referee
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/service_caller.h
+  #	rm_msgs/CMakeLists.txt
+  #	rm_msgs/msg/referee/GameRobotStatus.msg
+  #	rm_msgs/msg/referee/GameStatus.msg
+* Merge branch 'master' into referee1
+* Contributors: ye-luo-xi-tui, yezi, yuchen, 吕骏骐
+
 0.1.15 (2022-09-02)
 -------------------
 

rm_dbus/package.xml

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

rm_gazebo/CHANGELOG.rst

@@ -2,6 +2,28 @@
 Changelog for package rm_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2022-11-24)
+-------------------
+* Merge branch 'master' into new_ui_test
+* Merge branch 'master' into dev/command_sender
+* Merge pull request `#79 <https://github.com/ye-luo-xi-tui/rm_control/issues/79>`_ from ye-luo-xi-tui/rm_imu_handle
+  Add RmImuSensorInterface and add a service to enable or disable imus in rm_gazebo
+* Add RmImuSensorInterface.
+* Add a service to enable or disable imus.
+* Merge branch 'dev'
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'master' into rm_referee_pr
+* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
+  Update 0.1.15
+* Merge branch 'master' into referee
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/service_caller.h
+  #	rm_msgs/CMakeLists.txt
+  #	rm_msgs/msg/referee/GameRobotStatus.msg
+  #	rm_msgs/msg/referee/GameStatus.msg
+* Merge branch 'master' into referee1
+* Contributors: ye-luo-xi-tui, yezi, yuchen, 吕骏骐
+
 0.1.15 (2022-09-02)
 -------------------
 

rm_gazebo/package.xml

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

rm_hw/CHANGELOG.rst

@@ -2,6 +2,47 @@
 Changelog for package rm_hw
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2022-11-24)
+-------------------
+* Merge branch 'master' into new_ui_test
+* Merge branch 'master' into dev/command_sender
+* Merge pull request `#79 <https://github.com/ye-luo-xi-tui/rm_control/issues/79>`_ from ye-luo-xi-tui/rm_imu_handle
+  Add RmImuSensorInterface and add a service to enable or disable imus in rm_gazebo
+* Add RmImuSensorInterface.
+* Merge branch 'rm-controls:master' into master
+* Merge pull request `#70 <https://github.com/ye-luo-xi-tui/rm_control/issues/70>`_ from chenhuiYu00/rm_referee_pr
+  Complete the referee part of manual separation.
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'dev'
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'master' into rm_referee_pr
+* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
+  Update 0.1.15
+* Merge pull request `#72 <https://github.com/ye-luo-xi-tui/rm_control/issues/72>`_ from ye-luo-xi-tui/dev
+  Fix realtime loop
+* Type conversion.
+* Merge branch 'master' into rm_referee_pr_buffer
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/power_limit.h
+* Merge pull request `#69 <https://github.com/ye-luo-xi-tui/rm_control/issues/69>`_ from Edwinlinks/gpio-name-modify
+  Modify the name of gpio manager which was misnamed before by his developers.
+* Merge pull request `#68 <https://github.com/ye-luo-xi-tui/rm_control/issues/68>`_ from Edwinlinks/modify-tof-can
+  Add continue which was missing in the previous development.
+* Modify the name of gpio manager which was misnamed before.
+* Add continue in tof data parsing.
+* Merge branch 'master' into referee
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/service_caller.h
+  #	rm_msgs/CMakeLists.txt
+  #	rm_msgs/msg/referee/GameRobotStatus.msg
+  #	rm_msgs/msg/referee/GameStatus.msg
+* Merge branch 'master' into referee1
+* Merge branch 'master' into referee1
+* Merge branch 'master' into referee1
+* Fixed for test manual,Immature work.
+* Ljq update,fixed for test manual,Immature work.
+* Contributors: Edwinlinks, QiayuanLiao, ye-luo-xi-tui, yezi, yuchen, 吕骏骐
+
 0.1.15 (2022-09-02)
 -------------------
 * Add namespace.

rm_hw/package.xml

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

rm_msgs/CHANGELOG.rst

@@ -2,6 +2,83 @@
 Changelog for package rm_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.16 (2022-11-24)
+-------------------
+* Merge pull request `#81 <https://github.com/ye-luo-xi-tui/rm_control/issues/81>`_ from LJT666666/master
+  Add "distance_to_image_center" to detection message type
+* Add "distance_to_image_center" to detection message type
+* Merge branch 'master' into new_ui_test
+* Merge pull request `#78 <https://github.com/ye-luo-xi-tui/rm_control/issues/78>`_ from chenhuiYu00/dev/command_sender
+  Check the modification of command sender.
+* Delete referee msg and update command sender.
+* Merge branch 'rm-controls:master' into master
+* Merge pull request `#70 <https://github.com/ye-luo-xi-tui/rm_control/issues/70>`_ from chenhuiYu00/rm_referee_pr
+  Complete the referee part of manual separation.
+* Merge branch 'dev'
+* Merge branch 'rm-controls:master' into master
+* Merge branch 'master' into rm_referee_pr
+* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
+  Update 0.1.15
+* Add RobotID enum.
+* Delete /common/data.h, Update power_limit and heat_limit.
+* Move referee part from rm_common to rm_referee and modify ui sending logic.
+* Add referee is_online msg.
+* Add ManualToReferee msg.
+* Add referee msg.
+* Merge and fixed conflict.
+* Merge branch 'master' into referee
+  # Conflicts:
+  #	rm_common/include/rm_common/decision/service_caller.h
+  #	rm_msgs/CMakeLists.txt
+  #	rm_msgs/msg/referee/GameRobotStatus.msg
+  #	rm_msgs/msg/referee/GameStatus.msg
+* Merge branch 'master' into referee1
+* Add radar part.
+* Merge branch 'master' into referee1
+* Ui work success,ore ui is in test.
+* Merge branch 'referee1' of github.com:chenhuiYu00/rm_control into referee1
+  
 Conflicts:
+  
	rm_common/include/rm_common/decision/command_sender.h
+  
	rm_common/include/rm_common/decision/service_caller.h
+  
	rm_msgs/msg/referee/CalibrationStatus.msg
+  
	rm_msgs/msg/referee/CapacityData.msg
+  
	rm_msgs/msg/referee/DetectionStatus.msg
+  
	rm_msgs/msg/referee/EngineerCmd.msg
+  
	rm_msgs/msg/referee/GameRobotHp.msg
+  
	rm_msgs/msg/referee/GameRobotStatus.msg
+  
	rm_msgs/msg/referee/GameStatus.msg
+  
	rm_msgs/msg/referee/PowerHeatData.msg
+  
	rm_msgs/msg/referee/StateCmd.msg
+  
	rm_referee/config/standard3.yaml
+  
	rm_referee/include/rm_referee/common/data.h
+  
	rm_referee/include/rm_referee/common/referee_base.h
+  
	rm_referee/include/rm_referee/engineer_referee.h
+  
	rm_referee/include/rm_referee/hero_referee.h
+  
	rm_referee/include/rm_referee/referee/referee.h
+  
	rm_referee/include/rm_referee/referee/ui.h
+  
	rm_referee/include/rm_referee/robot_referee.h
+  
	rm_referee/include/rm_referee/standard_referee.h
+  
	rm_referee/launch/load.launch
+  
	rm_referee/src/common/referee_base.cpp
+  
	rm_referee/src/engineer_referee.cpp
+  
	rm_referee/src/hero_referee.cpp
+  
	rm_referee/src/main.cpp
+  
	rm_referee/src/referee/referee.cpp
+  
	rm_referee/src/referee/ui.cpp
+  
	rm_referee/src/robot_referee.cpp
+  
	rm_referee/src/standard_referee.cpp
+* Merge branch 'master' into referee1
+* Fixed topic naming, add time stamp in referee msgs.
+* Fixed for test manual,Immature work.
+* Merge branch 'rm_referee1' into referee1
+* Ljq update,fixed for test manual,Immature work.
+* Add PowerHearData.msg and GameRObotHp.msg
+* Add related msg of referee
+* Add related msg of referee
+* Add related msg of referee
+* Fixed the wrong type
+* Contributors: Chenhui, LJT666666, QiayuanLiao, ljq-lv, ye-luo-xi-tui, yezi, yuchen, 吕骏骐
+
 0.1.15 (2022-09-02)
 -------------------
 

rm_msgs/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rm_msgs</name>
-    <version>0.1.15</version>
+    <version>0.1.16</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>