Skip to content

Commit

Permalink
Merge branch 'gz-msgs10' into mjcarroll/bazel_harmonic
Browse files Browse the repository at this point in the history
  • Loading branch information
mjcarroll committed Apr 3, 2024
2 parents 1c36fed + 5f90910 commit bb61343
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-msgs10 VERSION 10.1.0)
project(gz-msgs10 VERSION 10.1.1)

#============================================================================
# Find gz-cmake
Expand Down
20 changes: 20 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## Gazebo Msgs 10.x

### Gazebo Msgs 10.1.1 (2024-03-14)

1. Allow topic and service to construct messages from description files
* [Pull request #428](https://github.com/gazebosim/gz-msgs/pull/428)

1. Conditionally use cmake_path on cmake < 3.20
* [Pull request #424](https://github.com/gazebosim/gz-msgs/pull/424)

1. Remove duplicate find_package(Python3) call
* [Pull request #420](https://github.com/gazebosim/gz-msgs/pull/420)

1. Bazel: Fix py_binary location
* [Pull request #406](https://github.com/gazebosim/gz-msgs/pull/406)

1. Fix compiler warning in `generator.cc`
* [Pull request #403](https://github.com/gazebosim/gz-msgs/pull/403)

1. Set GZ_TOOLS_VER to 2 for consistency with rest of Garden and Harmonic libraries
* [Pull request #391](https://github.com/gazebosim/gz-msgs/pull/391)

### Gazebo Msgs 10.1.0 (2024-01-22)

1. Add proto message for MaterialColor.
Expand Down
2 changes: 1 addition & 1 deletion core/include/gz/msgs/convert/StdTypes.hh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ inline void Set(gz::msgs::Time *_msg,
gz::math::durationToSecNsec(_data);
msgs::Time msg;
_msg->set_sec(timeSecAndNsecs.first);
_msg->set_nsec(timeSecAndNsecs.second);
_msg->set_nsec(static_cast<int32_t>(timeSecAndNsecs.second));
}

inline void Set(std::chrono::steady_clock::duration *_data,
Expand Down

0 comments on commit bb61343

Please sign in to comment.