Skip to content

Commit 60dbd3c

Browse files
BruceLannnBruceLannn
committed
Merge remote-tracking branch 'origin/master'
2 parents 98f40dd + 6cd395a commit 60dbd3c

File tree

13 files changed

+139
-19
lines changed

13 files changed

+139
-19
lines changed

‎rm_common/CHANGELOG.rst‎

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

5+
0.1.11 (2022-06-10)
6+
-------------------
7+
* Add synchronized calibration.
8+
* Changed gpio type in gpio interface to enum.
9+
* Move gpio type from rm_hw to rm_common.
10+
* Changed gpio type in gpio interface to enum.
11+
* Gpio interface 2 (`#51 <https://github.com/ye-luo-xi-tui/rm_control/issues/51>`_)
12+
* Write a gpio_manager, it can initialize with pin ID and direction, and write output or read Input.
13+
* Modifier readInput().
14+
* Write gpio_state_interface.h(read only)
15+
* write gpio_state_interface.h(read only)
16+
* Modifier gpio manager. Write a new writeOutput() function.
17+
* Add gpio_state_interface in robotHW
18+
* Solve a error
19+
* Modifier names of variables.
20+
* Set GpioReadHandle and GpioWriteHandle. Register GpioReadInterface and GpioWriteInterface. Improve the code about gpio and delete unnecessary things.
21+
* Add GpioRead.msg GpioWrite.msg.
22+
* Add Gpio controller.
23+
* Update Gpio controller.
24+
* Update Gpio controller.
25+
* Update gpio controller.
26+
* Update gpio_controller.
27+
* Update gpio_controller to version 2.0.
28+
* Update gpio_interface to version2.0.
29+
Co-authored-by: yezi <1536117624@qq.com>
30+
Co-authored-by: ye-luo-xi-tui <74857762+ye-luo-xi-tui@users.noreply.github.com>
31+
Co-authored-by: QiayuanLiao <liaoqiayuan@gmail.com>
32+
* Merge pull request `#49 <https://github.com/ye-luo-xi-tui/rm_control/issues/49>`_ from ChenZheng29/master
33+
Delete cost function and modify the track topic
34+
* Delete target_cost_function.cpp and target_cost_function.h
35+
* Merge pull request `#48 <https://github.com/ye-luo-xi-tui/rm_control/issues/48>`_ from ye-luo-xi-tui/master
36+
Fix a stupid bug
37+
* Fix a stupid bug.
38+
* Merge remote-tracking branch 'origin/master'
39+
* Merge pull request `#47 <https://github.com/ye-luo-xi-tui/rm_control/issues/47>`_ from ye-luo-xi-tui/master
40+
Decide acceleration and max_vel by power limit
41+
* Decide acceleration and max_vel by power limit.
42+
* Contributors: QiayuanLiao, XYM-github, Yuexin Mu, YuuinIH, chenzheng, qiayuan, yezi
43+
544
0.1.10 (2022-05-22)
645
-------------------
746
* Merge pull request `#42 <https://github.com/rm-controls/rm_control/issues/42>`_ from ye-luo-xi-tui/service

‎rm_common/include/rm_common/decision/service_caller.h‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,19 @@ class SwitchDetectionCaller : public ServiceCallerBase<rm_msgs::StatusChange>
190190
service_.request.target = rm_msgs::StatusChangeRequest::ARMOR;
191191
service_.request.exposure = rm_msgs::StatusChangeRequest::EXPOSURE_LEVEL_0;
192192
service_.request.armor_target = rm_msgs::StatusChangeRequest::ARMOR_ALL;
193-
callService();
194193
}
195194
void setEnemyColor(const RefereeData& referee_data)
196195
{
197-
if (referee_data.robot_id_ != 0 && !is_set_)
196+
if (referee_data.robot_id_ != 0)
198197
{
199198
service_.request.color =
200199
referee_data.robot_color_ == "blue" ? rm_msgs::StatusChangeRequest::RED : rm_msgs::StatusChangeRequest::BLUE;
200+
ROS_INFO_STREAM("Set enemy color: " << (service_.request.color == service_.request.RED ? "red" : "blue"));
201+
201202
callService();
202-
if (getIsSwitch())
203-
is_set_ = true;
204203
}
204+
else
205+
ROS_INFO_STREAM("Set enemy color failed: referee offline");
205206
}
206207
void switchEnemyColor()
207208
{
@@ -241,14 +242,5 @@ class SwitchDetectionCaller : public ServiceCallerBase<rm_msgs::StatusChange>
241242
{
242243
return service_.request.exposure;
243244
}
244-
bool getIsSwitch()
245-
{
246-
if (isCalling())
247-
return false;
248-
return service_.response.switch_is_success;
249-
}
250-
251-
private:
252-
bool is_set_{};
253245
};
254246
} // namespace rm_common

‎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.10</version>
4+
<version>0.1.11</version>
55
<description>The rm_common package</description>
66

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

‎rm_control/CHANGELOG.rst‎

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

5+
0.1.11 (2022-06-10)
6+
-------------------
7+
* Merge remote-tracking branch 'origin/master'
8+
* Contributors: QiayuanLiao, YuuinIH, qiayuan, yezi
9+
510
0.1.10 (2022-05-22)
611
-------------------
712
* Merge pull request `#45 <https://github.com/rm-controls/rm_control/issues/45>`_ from ye-luo-xi-tui/master

‎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.10</version>
4+
<version>0.1.11</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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package rm_dbus
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.11 (2022-06-10)
6+
-------------------
7+
* Merge remote-tracking branch 'origin/master'
8+
* Contributors: QiayuanLiao, YuuinIH, qiayuan
9+
510
0.1.10 (2022-05-22)
611
-------------------
712

‎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.10</version>
4+
<version>0.1.11</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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package rm_gazebo
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.11 (2022-06-10)
6+
-------------------
7+
* Merge remote-tracking branch 'origin/master'
8+
* Contributors: QiayuanLiao, YuuinIH, qiayuan
9+
510
0.1.10 (2022-05-22)
611
-------------------
712

‎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.10</version>
4+
<version>0.1.11</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: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,41 @@
22
Changelog for package rm_hw
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.1.11 (2022-06-10)
6+
-------------------
7+
* Merge pull request `#52 <https://github.com/ye-luo-xi-tui/rm_control/issues/52>`_ from XYM-github/gpio_interface_2.0
8+
Changed gpio type in gpio interface to enum.
9+
* Add the namespace of gpio_manager.
10+
* Move gpio type from rm_hw to rm_common.
11+
* Changed gpio type in gpio interface to enum.
12+
* Gpio interface 2 (`#51 <https://github.com/ye-luo-xi-tui/rm_control/issues/51>`_)
13+
* Write a gpio_manager, it can initialize with pin ID and direction, and write output or read Input.
14+
* Modifier readInput().
15+
* Write gpio_state_interface.h(read only)
16+
* write gpio_state_interface.h(read only)
17+
* Modifier gpio manager. Write a new writeOutput() function.
18+
* Add gpio_state_interface in robotHW
19+
* Solve a error
20+
* Modifier names of variables.
21+
* Set GpioReadHandle and GpioWriteHandle. Register GpioReadInterface and GpioWriteInterface. Improve the code about gpio and delete unnecessary things.
22+
* Add GpioRead.msg GpioWrite.msg.
23+
* Add Gpio controller.
24+
* Update Gpio controller.
25+
* Update Gpio controller.
26+
* Update gpio controller.
27+
* Update gpio_controller.
28+
* Update gpio_controller to version 2.0.
29+
* Update gpio_interface to version2.0.
30+
Co-authored-by: yezi <1536117624@qq.com>
31+
Co-authored-by: ye-luo-xi-tui <74857762+ye-luo-xi-tui@users.noreply.github.com>
32+
Co-authored-by: QiayuanLiao <liaoqiayuan@gmail.com>
33+
* Merge remote-tracking branch 'origin/master'
34+
* Merge pull request `#46 <https://github.com/ye-luo-xi-tui/rm_control/issues/46>`_ from XYM-github/imu_angular_offset
35+
Add imu angular_vel_offset.
36+
* Add imu angular_vel_offset.
37+
* Merge remote-tracking branch 'origin/master'
38+
* Contributors: Edwinlinks, QiayuanLiao, XYM-github, Yuexin Mu, YuuinIH, chenzheng, qiayuan, ye-luo-xi-tui, yezi
39+
540
0.1.10 (2022-05-22)
641
-------------------
742
* Merge branch 'rm-controls:master' into master

0 commit comments

Comments
 (0)