Skip to content

Commit 55f05d8

Browse files
ye-luo-xi-tuiye-luo-xi-tui
authored
Merge pull request #84 from ye-luo-xi-tui/master
0.1.16
2 parents 79e6a96 + 09a2fac commit 55f05d8

File tree

14 files changed

+404
-7
lines changed

14 files changed

+404
-7
lines changed

‎rm_common/CHANGELOG.rst‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,104 @@
22
Changelog for package rm_common
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.16 (2022-11-24)
6+
-------------------
7+
* Merge branch 'master' into new_ui_test
8+
* Merge pull request `#78 <https://github.com/ye-luo-xi-tui/rm_control/issues/78>`_ from chenhuiYu00/dev/command_sender
9+
Check the modification of command sender.
10+
* Cancel passing msg in constructor.
11+
* Cancel constructor transfer cmd.
12+
* Optimize command sender.
13+
* Merge branch 'master' into dev/command_sender
14+
* Delete referee msg and update command sender.
15+
* Merge pull request `#79 <https://github.com/ye-luo-xi-tui/rm_control/issues/79>`_ from ye-luo-xi-tui/rm_imu_handle
16+
Add RmImuSensorInterface and add a service to enable or disable imus in rm_gazebo
17+
* Add RmImuSensorInterface.
18+
* Merge pull request `#76 <https://github.com/ye-luo-xi-tui/rm_control/issues/76>`_ from chenhuiYu00/accleration_Initial_value
19+
Add accleration initial value.
20+
* Merge branch 'rm-controls:master' into master
21+
* Add accleration initial value.
22+
* Merge pull request `#70 <https://github.com/ye-luo-xi-tui/rm_control/issues/70>`_ from chenhuiYu00/rm_referee_pr
23+
Complete the referee part of manual separation.
24+
* Conflict resolution.
25+
* Updata befor merge.
26+
* Merge pull request `#73 <https://github.com/ye-luo-xi-tui/rm_control/issues/73>`_ from 1moule/chassis_power_buffer
27+
Add power buffer to power limit.
28+
* Modified some variable names.
29+
* Merge pull request `#71 <https://github.com/ye-luo-xi-tui/rm_control/issues/71>`_ from Edwinlinks/dart-command-sender
30+
Add command sender for dart command sending.
31+
* Merge pull request `#75 <https://github.com/ye-luo-xi-tui/rm_control/issues/75>`_ from ye-luo-xi-tui/master
32+
Reset imu_filter when robot relive
33+
* Merge branch 'dev'
34+
* Modified some variable names.
35+
* Merge branch 'rm-controls:master' into master
36+
* Merge branch 'master' into rm_referee_pr
37+
* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
38+
Update 0.1.15
39+
* Modify prompt information.
40+
* Add power buffer to power limit.
41+
* Add RobotID enum.
42+
* Delete /common/data.h, Update power_limit and heat_limit.
43+
* Update date acquisition in command_sender.
44+
* Move referee part from rm_common to rm_referee and modify ui sending logic.
45+
* Reset imu_filter when robot relive.
46+
* Delete unnecessary offset
47+
* Modify getIndex() function.
48+
* Add command's offset for servo control
49+
* Add ManualToReferee msg.
50+
* Modify joint point command sender for dat manual.
51+
* Merge and fixed conflict.
52+
* Merge branch 'master' into referee
53+
# Conflicts:
54+
# rm_common/include/rm_common/decision/service_caller.h
55+
# rm_msgs/CMakeLists.txt
56+
# rm_msgs/msg/referee/GameRobotStatus.msg
57+
# rm_msgs/msg/referee/GameStatus.msg
58+
* Merge branch 'master' into referee1
59+
* Add defect code.
60+
* Merge branch 'master' into referee1
61+
* Merge branch 'referee1' of github.com:chenhuiYu00/rm_control into referee1
62+
 Conflicts:
63+
 rm_common/include/rm_common/decision/command_sender.h
64+
 rm_common/include/rm_common/decision/service_caller.h
65+
 rm_msgs/msg/referee/CalibrationStatus.msg
66+
 rm_msgs/msg/referee/CapacityData.msg
67+
 rm_msgs/msg/referee/DetectionStatus.msg
68+
 rm_msgs/msg/referee/EngineerCmd.msg
69+
 rm_msgs/msg/referee/GameRobotHp.msg
70+
 rm_msgs/msg/referee/GameRobotStatus.msg
71+
 rm_msgs/msg/referee/GameStatus.msg
72+
 rm_msgs/msg/referee/PowerHeatData.msg
73+
 rm_msgs/msg/referee/StateCmd.msg
74+
 rm_referee/config/standard3.yaml
75+
 rm_referee/include/rm_referee/common/data.h
76+
 rm_referee/include/rm_referee/common/referee_base.h
77+
 rm_referee/include/rm_referee/engineer_referee.h
78+
 rm_referee/include/rm_referee/hero_referee.h
79+
 rm_referee/include/rm_referee/referee/referee.h
80+
 rm_referee/include/rm_referee/referee/ui.h
81+
 rm_referee/include/rm_referee/robot_referee.h
82+
 rm_referee/include/rm_referee/standard_referee.h
83+
 rm_referee/launch/load.launch
84+
 rm_referee/src/common/referee_base.cpp
85+
 rm_referee/src/engineer_referee.cpp
86+
 rm_referee/src/hero_referee.cpp
87+
 rm_referee/src/main.cpp
88+
 rm_referee/src/referee/referee.cpp
89+
 rm_referee/src/referee/ui.cpp
90+
 rm_referee/src/robot_referee.cpp
91+
 rm_referee/src/standard_referee.cpp
92+
* Merge branch 'master' into referee1
93+
* Fixed for test manual,Immature work.
94+
* Merge branch 'rm_referee1' into referee1
95+
* Ljq update,fixed for test manual,Immature work.
96+
* Update calibration_status_pub's position
97+
* Update game_robot_status, game_status, capacity_data's pub
98+
* Add detection_state pub
99+
* Update stateCommandSender
100+
* Add calibration_status_pub
101+
* Contributors: 1moule, Chenhui, Edwinlinks, QiayuanLiao, ljq-lv, ye-luo-xi-tui, yezi, yuchen, 吕骏骐
102+
5103
0.1.15 (2022-09-02)
6104
-------------------
7105

‎rm_common/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>rm_common</name>
4-
<version>0.1.15</version>
4+
<version>0.1.16</version>
55
<description>The rm_common package</description>
66

77
<maintainer email="liaoqiayuan@gmail.com">qiayuan</maintainer>

‎rm_control/CHANGELOG.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
Changelog for package rm_control
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.16 (2022-11-24)
6+
-------------------
7+
* Merge branch 'dev'
8+
* Merge branch 'rm-controls:master' into master
9+
* Merge branch 'master' into rm_referee_pr
10+
* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
11+
Update 0.1.15
12+
* Merge branch 'master' into referee
13+
# Conflicts:
14+
# rm_common/include/rm_common/decision/service_caller.h
15+
# rm_msgs/CMakeLists.txt
16+
# rm_msgs/msg/referee/GameRobotStatus.msg
17+
# rm_msgs/msg/referee/GameStatus.msg
18+
* Merge branch 'master' into referee1
19+
* Contributors: ye-luo-xi-tui, yezi, yuchen, 吕骏骐
20+
521
0.1.15 (2022-09-02)
622
-------------------
723

‎rm_control/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>rm_control</name>
4-
<version>0.1.15</version>
4+
<version>0.1.16</version>
55
<description>Meta package that contains package of rm_control.</description>
66
<maintainer email="liaoqiayuan@gmail.com">Qiayuan Liao</maintainer>
77

‎rm_dbus/CHANGELOG.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
Changelog for package rm_dbus
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.16 (2022-11-24)
6+
-------------------
7+
* Merge branch 'dev'
8+
* Merge branch 'rm-controls:master' into master
9+
* Merge branch 'master' into rm_referee_pr
10+
* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
11+
Update 0.1.15
12+
* Merge branch 'master' into referee
13+
# Conflicts:
14+
# rm_common/include/rm_common/decision/service_caller.h
15+
# rm_msgs/CMakeLists.txt
16+
# rm_msgs/msg/referee/GameRobotStatus.msg
17+
# rm_msgs/msg/referee/GameStatus.msg
18+
* Merge branch 'master' into referee1
19+
* Contributors: ye-luo-xi-tui, yezi, yuchen, 吕骏骐
20+
521
0.1.15 (2022-09-02)
622
-------------------
723

‎rm_dbus/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>rm_dbus</name>
4-
<version>0.1.15</version>
4+
<version>0.1.16</version>
55
<description>A package that uses dbus to read remote control information</description>
66
<maintainer email="liaoqiayuan@gmail.com">Qiayuan Liao</maintainer>
77

‎rm_gazebo/CHANGELOG.rst‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22
Changelog for package rm_gazebo
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.16 (2022-11-24)
6+
-------------------
7+
* Merge branch 'master' into new_ui_test
8+
* Merge branch 'master' into dev/command_sender
9+
* Merge pull request `#79 <https://github.com/ye-luo-xi-tui/rm_control/issues/79>`_ from ye-luo-xi-tui/rm_imu_handle
10+
Add RmImuSensorInterface and add a service to enable or disable imus in rm_gazebo
11+
* Add RmImuSensorInterface.
12+
* Add a service to enable or disable imus.
13+
* Merge branch 'dev'
14+
* Merge branch 'rm-controls:master' into master
15+
* Merge branch 'master' into rm_referee_pr
16+
* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
17+
Update 0.1.15
18+
* Merge branch 'master' into referee
19+
# Conflicts:
20+
# rm_common/include/rm_common/decision/service_caller.h
21+
# rm_msgs/CMakeLists.txt
22+
# rm_msgs/msg/referee/GameRobotStatus.msg
23+
# rm_msgs/msg/referee/GameStatus.msg
24+
* Merge branch 'master' into referee1
25+
* Contributors: ye-luo-xi-tui, yezi, yuchen, 吕骏骐
26+
527
0.1.15 (2022-09-02)
628
-------------------
729

‎rm_gazebo/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>rm_gazebo</name>
4-
<version>0.1.15</version>
4+
<version>0.1.16</version>
55
<description>A template for ROS packages.</description>
66
<maintainer email="liaoqiayuan@gmail.com">Qiayuan Liao</maintainer>
77
<license>BSD</license>

‎rm_hw/CHANGELOG.rst‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,47 @@
22
Changelog for package rm_hw
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.16 (2022-11-24)
6+
-------------------
7+
* Merge branch 'master' into new_ui_test
8+
* Merge branch 'master' into dev/command_sender
9+
* Merge pull request `#79 <https://github.com/ye-luo-xi-tui/rm_control/issues/79>`_ from ye-luo-xi-tui/rm_imu_handle
10+
Add RmImuSensorInterface and add a service to enable or disable imus in rm_gazebo
11+
* Add RmImuSensorInterface.
12+
* Merge branch 'rm-controls:master' into master
13+
* Merge pull request `#70 <https://github.com/ye-luo-xi-tui/rm_control/issues/70>`_ from chenhuiYu00/rm_referee_pr
14+
Complete the referee part of manual separation.
15+
* Merge branch 'rm-controls:master' into master
16+
* Merge branch 'dev'
17+
* Merge branch 'rm-controls:master' into master
18+
* Merge branch 'master' into rm_referee_pr
19+
* Merge pull request `#74 <https://github.com/ye-luo-xi-tui/rm_control/issues/74>`_ from ye-luo-xi-tui/dev
20+
Update 0.1.15
21+
* Merge pull request `#72 <https://github.com/ye-luo-xi-tui/rm_control/issues/72>`_ from ye-luo-xi-tui/dev
22+
Fix realtime loop
23+
* Type conversion.
24+
* Merge branch 'master' into rm_referee_pr_buffer
25+
# Conflicts:
26+
# rm_common/include/rm_common/decision/power_limit.h
27+
* Merge pull request `#69 <https://github.com/ye-luo-xi-tui/rm_control/issues/69>`_ from Edwinlinks/gpio-name-modify
28+
Modify the name of gpio manager which was misnamed before by his developers.
29+
* Merge pull request `#68 <https://github.com/ye-luo-xi-tui/rm_control/issues/68>`_ from Edwinlinks/modify-tof-can
30+
Add continue which was missing in the previous development.
31+
* Modify the name of gpio manager which was misnamed before.
32+
* Add continue in tof data parsing.
33+
* Merge branch 'master' into referee
34+
# Conflicts:
35+
# rm_common/include/rm_common/decision/service_caller.h
36+
# rm_msgs/CMakeLists.txt
37+
# rm_msgs/msg/referee/GameRobotStatus.msg
38+
# rm_msgs/msg/referee/GameStatus.msg
39+
* Merge branch 'master' into referee1
40+
* Merge branch 'master' into referee1
41+
* Merge branch 'master' into referee1
42+
* Fixed for test manual,Immature work.
43+
* Ljq update,fixed for test manual,Immature work.
44+
* Contributors: Edwinlinks, QiayuanLiao, ye-luo-xi-tui, yezi, yuchen, 吕骏骐
45+
546
0.1.15 (2022-09-02)
647
-------------------
748
* Add namespace.

‎rm_hw/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>rm_hw</name>
4-
<version>0.1.15</version>
4+
<version>0.1.16</version>
55
<description>ROS control warped interface for RoboMaster motor and some robot hardware</description>
66
<maintainer email="liaoqiayuan@gmail.com">Qiayuan Liao</maintainer>
77

0 commit comments

Comments
 (0)