diff --git a/rm_common/CHANGELOG.rst b/rm_common/CHANGELOG.rst index b1b7dae0..bbf3c1d1 100644 --- a/rm_common/CHANGELOG.rst +++ b/rm_common/CHANGELOG.rst @@ -2,6 +2,45 @@ Changelog for package rm_common ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2022-06-10) +------------------- +* Add synchronized calibration. +* Changed gpio type in gpio interface to enum. +* Move gpio type from rm_hw to rm_common. +* Changed gpio type in gpio interface to enum. +* Gpio interface 2 (`#51 `_) + * Write a gpio_manager, it can initialize with pin ID and direction, and write output or read Input. + * Modifier readInput(). + * Write gpio_state_interface.h(read only) + * write gpio_state_interface.h(read only) + * Modifier gpio manager. Write a new writeOutput() function. + * Add gpio_state_interface in robotHW + * Solve a error + * Modifier names of variables. + * Set GpioReadHandle and GpioWriteHandle. Register GpioReadInterface and GpioWriteInterface. Improve the code about gpio and delete unnecessary things. + * Add GpioRead.msg GpioWrite.msg. + * Add Gpio controller. + * Update Gpio controller. + * Update Gpio controller. + * Update gpio controller. + * Update gpio_controller. + * Update gpio_controller to version 2.0. + * Update gpio_interface to version2.0. + Co-authored-by: yezi <1536117624@qq.com> + Co-authored-by: ye-luo-xi-tui <74857762+ye-luo-xi-tui@users.noreply.github.com> + Co-authored-by: QiayuanLiao +* Merge pull request `#49 `_ from ChenZheng29/master + Delete cost function and modify the track topic +* Delete target_cost_function.cpp and target_cost_function.h +* Merge pull request `#48 `_ from ye-luo-xi-tui/master + Fix a stupid bug +* Fix a stupid bug. +* Merge remote-tracking branch 'origin/master' +* Merge pull request `#47 `_ from ye-luo-xi-tui/master + Decide acceleration and max_vel by power limit +* Decide acceleration and max_vel by power limit. +* Contributors: QiayuanLiao, XYM-github, Yuexin Mu, YuuinIH, chenzheng, qiayuan, yezi + 0.1.10 (2022-05-22) ------------------- * Merge pull request `#42 `_ from ye-luo-xi-tui/service diff --git a/rm_common/include/rm_common/decision/service_caller.h b/rm_common/include/rm_common/decision/service_caller.h index 9ac71a43..9a68b269 100644 --- a/rm_common/include/rm_common/decision/service_caller.h +++ b/rm_common/include/rm_common/decision/service_caller.h @@ -190,18 +190,19 @@ class SwitchDetectionCaller : public ServiceCallerBase service_.request.target = rm_msgs::StatusChangeRequest::ARMOR; service_.request.exposure = rm_msgs::StatusChangeRequest::EXPOSURE_LEVEL_0; service_.request.armor_target = rm_msgs::StatusChangeRequest::ARMOR_ALL; - callService(); } void setEnemyColor(const RefereeData& referee_data) { - if (referee_data.robot_id_ != 0 && !is_set_) + if (referee_data.robot_id_ != 0) { service_.request.color = referee_data.robot_color_ == "blue" ? rm_msgs::StatusChangeRequest::RED : rm_msgs::StatusChangeRequest::BLUE; + ROS_INFO_STREAM("Set enemy color: " << (service_.request.color == service_.request.RED ? "red" : "blue")); + callService(); - if (getIsSwitch()) - is_set_ = true; } + else + ROS_INFO_STREAM("Set enemy color failed: referee offline"); } void switchEnemyColor() { @@ -241,14 +242,5 @@ class SwitchDetectionCaller : public ServiceCallerBase { return service_.request.exposure; } - bool getIsSwitch() - { - if (isCalling()) - return false; - return service_.response.switch_is_success; - } - -private: - bool is_set_{}; }; } // namespace rm_common diff --git a/rm_common/package.xml b/rm_common/package.xml index 757b24df..f7a40b31 100644 --- a/rm_common/package.xml +++ b/rm_common/package.xml @@ -1,7 +1,7 @@ rm_common - 0.1.10 + 0.1.11 The rm_common package qiayuan diff --git a/rm_control/CHANGELOG.rst b/rm_control/CHANGELOG.rst index ed18b313..011748fa 100644 --- a/rm_control/CHANGELOG.rst +++ b/rm_control/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package rm_control ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2022-06-10) +------------------- +* Merge remote-tracking branch 'origin/master' +* Contributors: QiayuanLiao, YuuinIH, qiayuan, yezi + 0.1.10 (2022-05-22) ------------------- * Merge pull request `#45 `_ from ye-luo-xi-tui/master diff --git a/rm_control/package.xml b/rm_control/package.xml index 13574f47..d3bd5c5b 100644 --- a/rm_control/package.xml +++ b/rm_control/package.xml @@ -1,7 +1,7 @@ rm_control - 0.1.10 + 0.1.11 Meta package that contains package of rm_control. Qiayuan Liao diff --git a/rm_dbus/CHANGELOG.rst b/rm_dbus/CHANGELOG.rst index 0b29892f..cd015a57 100644 --- a/rm_dbus/CHANGELOG.rst +++ b/rm_dbus/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package rm_dbus ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2022-06-10) +------------------- +* Merge remote-tracking branch 'origin/master' +* Contributors: QiayuanLiao, YuuinIH, qiayuan + 0.1.10 (2022-05-22) ------------------- diff --git a/rm_dbus/package.xml b/rm_dbus/package.xml index 012cc89a..38f4b4fe 100644 --- a/rm_dbus/package.xml +++ b/rm_dbus/package.xml @@ -1,7 +1,7 @@ rm_dbus - 0.1.10 + 0.1.11 A package that uses dbus to read remote control information Qiayuan Liao diff --git a/rm_gazebo/CHANGELOG.rst b/rm_gazebo/CHANGELOG.rst index ea4b21f6..3c7fe640 100644 --- a/rm_gazebo/CHANGELOG.rst +++ b/rm_gazebo/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package rm_gazebo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2022-06-10) +------------------- +* Merge remote-tracking branch 'origin/master' +* Contributors: QiayuanLiao, YuuinIH, qiayuan + 0.1.10 (2022-05-22) ------------------- diff --git a/rm_gazebo/package.xml b/rm_gazebo/package.xml index 973d3ddd..d98053c8 100644 --- a/rm_gazebo/package.xml +++ b/rm_gazebo/package.xml @@ -1,7 +1,7 @@ rm_gazebo - 0.1.10 + 0.1.11 A template for ROS packages. Qiayuan Liao BSD diff --git a/rm_hw/CHANGELOG.rst b/rm_hw/CHANGELOG.rst index 0f524e06..8c7f53ae 100644 --- a/rm_hw/CHANGELOG.rst +++ b/rm_hw/CHANGELOG.rst @@ -2,6 +2,41 @@ Changelog for package rm_hw ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2022-06-10) +------------------- +* Merge pull request `#52 `_ from XYM-github/gpio_interface_2.0 + Changed gpio type in gpio interface to enum. +* Add the namespace of gpio_manager. +* Move gpio type from rm_hw to rm_common. +* Changed gpio type in gpio interface to enum. +* Gpio interface 2 (`#51 `_) + * Write a gpio_manager, it can initialize with pin ID and direction, and write output or read Input. + * Modifier readInput(). + * Write gpio_state_interface.h(read only) + * write gpio_state_interface.h(read only) + * Modifier gpio manager. Write a new writeOutput() function. + * Add gpio_state_interface in robotHW + * Solve a error + * Modifier names of variables. + * Set GpioReadHandle and GpioWriteHandle. Register GpioReadInterface and GpioWriteInterface. Improve the code about gpio and delete unnecessary things. + * Add GpioRead.msg GpioWrite.msg. + * Add Gpio controller. + * Update Gpio controller. + * Update Gpio controller. + * Update gpio controller. + * Update gpio_controller. + * Update gpio_controller to version 2.0. + * Update gpio_interface to version2.0. + Co-authored-by: yezi <1536117624@qq.com> + Co-authored-by: ye-luo-xi-tui <74857762+ye-luo-xi-tui@users.noreply.github.com> + Co-authored-by: QiayuanLiao +* Merge remote-tracking branch 'origin/master' +* Merge pull request `#46 `_ from XYM-github/imu_angular_offset + Add imu angular_vel_offset. +* Add imu angular_vel_offset. +* Merge remote-tracking branch 'origin/master' +* Contributors: Edwinlinks, QiayuanLiao, XYM-github, Yuexin Mu, YuuinIH, chenzheng, qiayuan, ye-luo-xi-tui, yezi + 0.1.10 (2022-05-22) ------------------- * Merge branch 'rm-controls:master' into master diff --git a/rm_hw/package.xml b/rm_hw/package.xml index 85c25de6..2eebe54f 100644 --- a/rm_hw/package.xml +++ b/rm_hw/package.xml @@ -1,7 +1,7 @@ rm_hw - 0.1.10 + 0.1.11 ROS control warped interface for RoboMaster motor and some robot hardware Qiayuan Liao diff --git a/rm_msgs/CHANGELOG.rst b/rm_msgs/CHANGELOG.rst index a70d9ec7..c8f44aa9 100644 --- a/rm_msgs/CHANGELOG.rst +++ b/rm_msgs/CHANGELOG.rst @@ -2,6 +2,45 @@ Changelog for package rm_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2022-06-10) +------------------- +* Merge pull request `#55 `_ from jceleven/master + Add the use_id_classification flag. +* Add the use_id_classification flag. +* Merge pull request `#53 `_ from ye-luo-xi-tui/master + Delete target_velocity in GimbalCmd.msg +* Merge pull request `#54 `_ from ye-luo-xi-tui/command_source_frame + Add command_source_frame to ChassisCmd.msg +* Add command_source_frame to ChassisCmd.msg. +* Delete target_velocity in GimbalCmd.msg. +* Gpio interface 2 (`#51 `_) + * Write a gpio_manager, it can initialize with pin ID and direction, and write output or read Input. + * Modifier readInput(). + * Write gpio_state_interface.h(read only) + * write gpio_state_interface.h(read only) + * Modifier gpio manager. Write a new writeOutput() function. + * Add gpio_state_interface in robotHW + * Solve a error + * Modifier names of variables. + * Set GpioReadHandle and GpioWriteHandle. Register GpioReadInterface and GpioWriteInterface. Improve the code about gpio and delete unnecessary things. + * Add GpioRead.msg GpioWrite.msg. + * Add Gpio controller. + * Update Gpio controller. + * Update Gpio controller. + * Update gpio controller. + * Update gpio_controller. + * Update gpio_controller to version 2.0. + * Update gpio_interface to version2.0. + Co-authored-by: yezi <1536117624@qq.com> + Co-authored-by: ye-luo-xi-tui <74857762+ye-luo-xi-tui@users.noreply.github.com> + Co-authored-by: QiayuanLiao +* Merge pull request `#49 `_ from ChenZheng29/master + Delete cost function and modify the track topic +* Modify the track topic name and message, and unify the track interface +* Merge remote-tracking branch 'origin/master' +* Add testing option to shooter for testing the trigger without friction wheel +* Contributors: Jiachen Shen, QiayuanLiao, Yuexin Mu, YuuinIH, chenzheng, qiayuan, yezi + 0.1.10 (2022-05-22) ------------------- * Merge pull request `#43 `_ from ye-luo-xi-tui/track_msg diff --git a/rm_msgs/package.xml b/rm_msgs/package.xml index 019e2e8f..568d455d 100644 --- a/rm_msgs/package.xml +++ b/rm_msgs/package.xml @@ -1,7 +1,7 @@ rm_msgs - 0.1.10 + 0.1.11 The rm_msgs package provides all the messages for all kind of robot qiayuan BSD