From 3cc0c2f56156ce81e916840a35130cf2e65354f3 Mon Sep 17 00:00:00 2001 From: yezi <1536117624@qq.com> Date: Sat, 25 Mar 2023 01:08:37 +0800 Subject: [PATCH 1/2] 0.1.18 --- rm_common/CHANGELOG.rst | 39 +++++++++++++++++++++++++++++++++++++++ rm_control/CHANGELOG.rst | 9 +++++++++ rm_dbus/CHANGELOG.rst | 15 +++++++++++++++ rm_gazebo/CHANGELOG.rst | 19 +++++++++++++++++++ rm_hw/CHANGELOG.rst | 15 +++++++++++++++ rm_msgs/CHANGELOG.rst | 23 +++++++++++++++++++++++ rm_referee/CHANGELOG.rst | 28 ++++++++++++++++++++++++++++ 7 files changed, 148 insertions(+) diff --git a/rm_common/CHANGELOG.rst b/rm_common/CHANGELOG.rst index 6a06edf7..e05b286e 100644 --- a/rm_common/CHANGELOG.rst +++ b/rm_common/CHANGELOG.rst @@ -2,6 +2,45 @@ Changelog for package rm_common ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#119 `_ from 1moule/fix_power_limit + Modify the power limit when the capacitor is offline. +* Modify the power limit when the capacitor is offline. +* Merge pull request `#109 `_ from ljq-lv/Delete + Delete the chassis mode "GYRO" +* Merge pull request `#115 `_ from 1moule/camera_command_sender + Add a command serder class for switching camera. +* Delete redundant functions, use the ternary operator to change the data of msg. +* Modify variable name. +* Modify variable name. +* Add a command serder class for switching camera. +* Merge branch 'master' into dev/polygon_ui +* Delete the judge of chassis mode +* Add the param "is_gyro" +* Merge pull request `#110 `_ from ye-luo-xi-tui/master + Add clear() method to Vector3WithFilter +* Merge branch 'acceleration' +* Add clear() method to Vector3WithFilter. +* Delete the chassis mode "GYRO" +* Merge pull request `#108 `_ from ye-luo-xi-tui/acceleration + Remove acceleration computing +* Remove acceleration computing. +* Merge branch 'master' into gazebo_imu_reserve +* Merge pull request `#106 `_ from YoujianWu/work + Delete dependence roslint. +* Run pre-commit. +* Delete dependence roslint. +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Add accel to TrackData.msg and Add a filter. +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Publish acceleration. +* Corrected acceleration calculation. +* Contributors: 1moule, Kook, ljq-lv, ye-luo-xi-tui, yezi, yuchen, 吕骏骐 + 0.1.17 (2023-02-21) ------------------- * Merge pull request `#95 `_ from Edwinlinks/for-location diff --git a/rm_control/CHANGELOG.rst b/rm_control/CHANGELOG.rst index 9a5ff70d..f6000e0c 100644 --- a/rm_control/CHANGELOG.rst +++ b/rm_control/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package rm_control ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Contributors: ye-luo-xi-tui, yezi + 0.1.17 (2023-02-21) ------------------- * Merge branch 'rm-controls:master' into master diff --git a/rm_dbus/CHANGELOG.rst b/rm_dbus/CHANGELOG.rst index 948f5db7..cb08a829 100644 --- a/rm_dbus/CHANGELOG.rst +++ b/rm_dbus/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog for package rm_dbus ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into dev/polygon_ui +* Merge branch 'master' into gazebo_imu_reserve +* Merge pull request `#106 `_ from YoujianWu/work + Delete dependence roslint. +* Run pre-commit. +* Delete dependence roslint. +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Contributors: Kook, ye-luo-xi-tui, yezi, yuchen + 0.1.17 (2023-02-21) ------------------- * Merge branch 'rm-controls:master' into master diff --git a/rm_gazebo/CHANGELOG.rst b/rm_gazebo/CHANGELOG.rst index ae003ba2..aca5ab23 100644 --- a/rm_gazebo/CHANGELOG.rst +++ b/rm_gazebo/CHANGELOG.rst @@ -2,6 +2,25 @@ Changelog for package rm_gazebo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into dev/polygon_ui +* Merge pull request `#107 `_ from chenhuiYu00/gazebo_imu_reserve + Fix imu problem in gazebo simulation. +* Use list instead of vector. +* Merge branch 'master' into gazebo_imu_reserve +* Pre-allocate imu vector memory. +* Merge pull request `#106 `_ from YoujianWu/work + Delete dependence roslint. +* Run pre-commit. +* Delete dependence roslint. +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Contributors: Kook, ye-luo-xi-tui, yezi, yuchen + 0.1.17 (2023-02-21) ------------------- * Merge pull request `#99 `_ from ye-luo-xi-tui/master diff --git a/rm_hw/CHANGELOG.rst b/rm_hw/CHANGELOG.rst index 10d128b4..76aabda4 100644 --- a/rm_hw/CHANGELOG.rst +++ b/rm_hw/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog for package rm_hw ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into dev/polygon_ui +* Merge branch 'master' into gazebo_imu_reserve +* Merge pull request `#106 `_ from YoujianWu/work + Delete dependence roslint. +* Run pre-commit. +* Delete dependence roslint. +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Contributors: Kook, ye-luo-xi-tui, yezi, yuchen + 0.1.17 (2023-02-21) ------------------- * Merge branch 'rm-controls:master' into master diff --git a/rm_msgs/CHANGELOG.rst b/rm_msgs/CHANGELOG.rst index c48aed0d..8c62a751 100644 --- a/rm_msgs/CHANGELOG.rst +++ b/rm_msgs/CHANGELOG.rst @@ -2,6 +2,29 @@ Changelog for package rm_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#109 `_ from ljq-lv/Delete + Delete the chassis mode "GYRO" +* Merge pull request `#116 `_ from ye-luo-xi-tui/master + Display shooter block state +* Display shooter block state. +* Merge branch 'master' into dev/polygon_ui +* Merge pull request `#111 `_ from Aung-xiao/master + add tag_detection msg +* run pre-commit +* add tag_detection msg +* Delete the chassis mode "GYRO" +* Merge pull request `#108 `_ from ye-luo-xi-tui/acceleration + Remove acceleration computing +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Add accel to TrackData.msg and Add a filter. +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Contributors: Aung-xiao, ljq-lv, ye-luo-xi-tui, yezi, yuchen + 0.1.17 (2023-02-21) ------------------- * Merge pull request `#100 `_ from ljq-lv/modified_msgs_name diff --git a/rm_referee/CHANGELOG.rst b/rm_referee/CHANGELOG.rst index 070e5a47..d8c36e26 100644 --- a/rm_referee/CHANGELOG.rst +++ b/rm_referee/CHANGELOG.rst @@ -2,6 +2,34 @@ Changelog for package rm_referee ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#113 `_ from chenhuiYu00/dev/polygon_ui + Add polygon UI. +* Merge pull request `#109 `_ from ljq-lv/Delete + Delete the chassis mode "GYRO" +* Merge pull request `#116 `_ from ye-luo-xi-tui/master + Display shooter block state +* Delete ShootCmd subscriber. +* Display shooter block state. +* Delete test polygon ui. +* Merge branch 'master' into dev/polygon_ui +* Delete the chassis mode "GYRO" +* Merge branch 'master' into gazebo_imu_reserve +* Merge pull request `#106 `_ from YoujianWu/work + Delete dependence roslint. +* Run pre-commit. +* Delete dependence roslint. +* Test GroupUi in real robot. +* Rebase FixedUi. +* Add GroupUiBase class and Polygon ui. +* Merge branch 'master' into acceleration + # Conflicts: + # rm_common/include/rm_common/decision/command_sender.h +* Merge pull request `#104 `_ from ye-luo-xi-tui/master + 0.1.17 +* Contributors: Kook, ljq-lv, ye-luo-xi-tui, yezi, yuchen + 0.1.17 (2023-02-21) ------------------- * Merge pull request `#100 `_ from ljq-lv/modified_msgs_name From 1ffea40bcbf0ab3ee572d7b0803f895fa7468e7d Mon Sep 17 00:00:00 2001 From: yezi <1536117624@qq.com> Date: Sat, 25 Mar 2023 01:08:52 +0800 Subject: [PATCH 2/2] 0.1.18 --- rm_common/CHANGELOG.rst | 4 ++-- rm_common/package.xml | 2 +- rm_control/CHANGELOG.rst | 4 ++-- rm_control/package.xml | 2 +- rm_dbus/CHANGELOG.rst | 4 ++-- rm_dbus/package.xml | 2 +- rm_gazebo/CHANGELOG.rst | 4 ++-- rm_gazebo/package.xml | 2 +- rm_hw/CHANGELOG.rst | 4 ++-- rm_hw/package.xml | 2 +- rm_msgs/CHANGELOG.rst | 4 ++-- rm_msgs/package.xml | 2 +- rm_referee/CHANGELOG.rst | 4 ++-- rm_referee/package.xml | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/rm_common/CHANGELOG.rst b/rm_common/CHANGELOG.rst index e05b286e..3490b2ee 100644 --- a/rm_common/CHANGELOG.rst +++ b/rm_common/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_common ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge pull request `#119 `_ from 1moule/fix_power_limit Modify the power limit when the capacitor is offline. * Modify the power limit when the capacitor is offline. diff --git a/rm_common/package.xml b/rm_common/package.xml index 85706e17..21df7532 100644 --- a/rm_common/package.xml +++ b/rm_common/package.xml @@ -1,7 +1,7 @@ rm_common - 0.1.17 + 0.1.18 The rm_common package qiayuan diff --git a/rm_control/CHANGELOG.rst b/rm_control/CHANGELOG.rst index f6000e0c..5b83d5c7 100644 --- a/rm_control/CHANGELOG.rst +++ b/rm_control/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_control ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge branch 'master' into acceleration # Conflicts: # rm_common/include/rm_common/decision/command_sender.h diff --git a/rm_control/package.xml b/rm_control/package.xml index 4f7744f3..56fddd2d 100644 --- a/rm_control/package.xml +++ b/rm_control/package.xml @@ -1,7 +1,7 @@ rm_control - 0.1.17 + 0.1.18 Meta package that contains package of rm_control. Qiayuan Liao diff --git a/rm_dbus/CHANGELOG.rst b/rm_dbus/CHANGELOG.rst index cb08a829..10f403ec 100644 --- a/rm_dbus/CHANGELOG.rst +++ b/rm_dbus/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_dbus ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge branch 'master' into dev/polygon_ui * Merge branch 'master' into gazebo_imu_reserve * Merge pull request `#106 `_ from YoujianWu/work diff --git a/rm_dbus/package.xml b/rm_dbus/package.xml index c24deadd..acdae93c 100644 --- a/rm_dbus/package.xml +++ b/rm_dbus/package.xml @@ -1,7 +1,7 @@ rm_dbus - 0.1.17 + 0.1.18 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 aca5ab23..aaae1fca 100644 --- a/rm_gazebo/CHANGELOG.rst +++ b/rm_gazebo/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_gazebo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge branch 'master' into dev/polygon_ui * Merge pull request `#107 `_ from chenhuiYu00/gazebo_imu_reserve Fix imu problem in gazebo simulation. diff --git a/rm_gazebo/package.xml b/rm_gazebo/package.xml index 5ffb33e0..678344ff 100644 --- a/rm_gazebo/package.xml +++ b/rm_gazebo/package.xml @@ -1,7 +1,7 @@ rm_gazebo - 0.1.17 + 0.1.18 A template for ROS packages. Qiayuan Liao BSD diff --git a/rm_hw/CHANGELOG.rst b/rm_hw/CHANGELOG.rst index 76aabda4..3946dcb2 100644 --- a/rm_hw/CHANGELOG.rst +++ b/rm_hw/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_hw ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge branch 'master' into dev/polygon_ui * Merge branch 'master' into gazebo_imu_reserve * Merge pull request `#106 `_ from YoujianWu/work diff --git a/rm_hw/package.xml b/rm_hw/package.xml index 38fe91ed..773a3470 100644 --- a/rm_hw/package.xml +++ b/rm_hw/package.xml @@ -1,7 +1,7 @@ rm_hw - 0.1.17 + 0.1.18 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 8c62a751..a2d67541 100644 --- a/rm_msgs/CHANGELOG.rst +++ b/rm_msgs/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge pull request `#109 `_ from ljq-lv/Delete Delete the chassis mode "GYRO" * Merge pull request `#116 `_ from ye-luo-xi-tui/master diff --git a/rm_msgs/package.xml b/rm_msgs/package.xml index eebd677d..ee01e854 100644 --- a/rm_msgs/package.xml +++ b/rm_msgs/package.xml @@ -1,7 +1,7 @@ rm_msgs - 0.1.17 + 0.1.18 The rm_msgs package provides all the messages for all kind of robot qiayuan BSD diff --git a/rm_referee/CHANGELOG.rst b/rm_referee/CHANGELOG.rst index d8c36e26..019d7876 100644 --- a/rm_referee/CHANGELOG.rst +++ b/rm_referee/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package rm_referee ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.1.18 (2023-03-25) +------------------- * Merge pull request `#113 `_ from chenhuiYu00/dev/polygon_ui Add polygon UI. * Merge pull request `#109 `_ from ljq-lv/Delete diff --git a/rm_referee/package.xml b/rm_referee/package.xml index efd17011..b31e4785 100644 --- a/rm_referee/package.xml +++ b/rm_referee/package.xml @@ -1,7 +1,7 @@ rm_referee - 0.1.17 + 0.1.18 A template for ROS packages. Qiayuan Liao