Skip to content

Commit

Permalink
Merge branch 'micro-ROS-iron' into iron
Browse files Browse the repository at this point in the history
  • Loading branch information
kaiaai committed Oct 28, 2024
2 parents 37f8d5a + 8e212b1 commit 66a6ce0
Showing 25 changed files with 557 additions and 6 deletions.
1 change: 1 addition & 0 deletions available_ros2_types
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ geometry_msgs/TwistWithCovariance.msg
geometry_msgs/TwistWithCovarianceStamped.msg
geometry_msgs/Vector3.msg
geometry_msgs/Vector3Stamped.msg
geometry_msgs/VelocityStamped.msg
geometry_msgs/Wrench.msg
geometry_msgs/WrenchStamped.msg
kaiaai_msgs/KaiaaiTelemetry.msg
31 changes: 26 additions & 5 deletions built_packages
Original file line number Diff line number Diff line change
@@ -1,34 +1,55 @@

https://github.com/ament/ament_cmake.git 4248cdfcf0d8d0a462c04e5dce498fee5721da4b
https://github.com/ament/ament_cmake.git d87f6f04af0ac2b4234512e032672afc201194ec
https://github.com/ament/ament_index.git ba818db036e82d5f752d17e3e6fe6e3efd583bfb
<<<<<<< HEAD
https://github.com/ament/ament_lint.git f4f0f7fd061575a22367a5ecfa5fa5e5b8ed0895
=======
https://github.com/ament/ament_lint.git 9a4c6c8563df572a3e1610d0924c8a6700672ddb
>>>>>>> 83a33fb80649c01f72db51d538f740aadb572746
https://github.com/ament/ament_package.git cf415e74bb8faff896bb6915ee3d120cc7b60fc3
https://github.com/ament/googletest.git 1c2fdcd80b08fcfe6b70fa2a369ae6bab9d5f78e
https://github.com/ament/uncrustify_vendor.git 94ed3f68d1d2e44e04398c4538509f5e78114dae
https://github.com/eProsima/Micro-CDR.git ed4fd513a24a53b93d548d342cb7aa0a18716f04
<<<<<<< HEAD
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 371718ca16c361f639c06a2761b9497f8706794a
https://github.com/kaiaai/kaiaai_msgs 249b94e2bf9159a66c7ab992aff9d0a2e8fe43cc
https://github.com/micro-ROS/micro_ros_msgs.git b9a1df227be07375b3ad32a27d81b4012d09ecc0
https://github.com/micro-ROS/micro_ros_utilities 74f7a6b08690079ecbb0262db563aa96f667277d
https://github.com/micro-ROS/rcl d50d3670258e26291ab996fd361175cb612abfe9
https://github.com/micro-ROS/rcutils 056c89c2b41b4cd4f20500e0f125c10deef4ee0d
https://github.com/micro-ROS/rmw-microxrcedds.git bc4eb312ac4601a4137c35f4a56b9b83b4b18339
=======
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 83f129a80770a09aac9e823896ecbf6a0eddf0fc
https://github.com/micro-ROS/micro_ros_msgs.git 8562b604ca4ce5b29c849bfd4be0c49dcc2b6906
https://github.com/micro-ROS/micro_ros_utilities d74d13bfc71ff41c5e2a56b2818177a55e383314
https://github.com/micro-ROS/rcl dce428901d29523ded916cb06d9c5864ca29a8db
https://github.com/micro-ROS/rcutils d3f08898b9092b07102257a804ae0e6a9606eb11
https://github.com/micro-ROS/rmw-microxrcedds.git 1b0527eddb98e4ca68761129987cbde89a769bbf
>>>>>>> 83a33fb80649c01f72db51d538f740aadb572746
https://github.com/micro-ROS/rosidl_typesupport.git 82bfacb38aae26cda159592aca5c43e4f4c291ea
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git c2776855f591388cf8900e3b8df15f9dfd95305b
https://github.com/ros-controls/control_msgs 1416954c31432c192ff95a06559847e87386cf60
https://github.com/ros2/ament_cmake_ros.git ede6248e1f36aaef85eb4eac23c782a134ef2bff
https://github.com/ros2/common_interfaces.git 86801a504b97f25a3b6e1c36e42a445500c98f79
https://github.com/ros2/common_interfaces.git dc6a22f88519982ead887de0f711aeae37456f78
https://github.com/ros2/example_interfaces.git 58899de0f85388be333e32bcb78c551a6877db4d
https://github.com/ros2/libyaml_vendor.git 0c814892fe8c31aeb20688a8b43906aeefda015e
<<<<<<< HEAD
https://github.com/ros2/rcl.git 723735a055c1158470fa7b3ed18581d5e6c97aaf
https://github.com/ros2/rcl_interfaces.git 6d28b16a6f74485af03a2c4f043dd568e576c25e
https://github.com/ros2/rcl_logging.git 2bc49ab7ff557a45d4fa152e2f400e9ad2bb6a68
https://github.com/ros2/rclc 24ab126bb489984c2b66a72d2ce56e221dd707d1
https://github.com/ros2/rcpputils.git d42faa7182602741caed7c9d89ca959cc201d9a7
=======
https://github.com/ros2/rcl.git 261710056fd706a55e9ea5f6eb7bfedde8b37742
https://github.com/ros2/rcl_interfaces.git 6d28b16a6f74485af03a2c4f043dd568e576c25e
https://github.com/ros2/rcl_logging.git 2bc49ab7ff557a45d4fa152e2f400e9ad2bb6a68
https://github.com/ros2/rclc 63d5c43993cb2d0d03ecd1b68d771046fd4ad19f
https://github.com/ros2/rcpputils.git bf58c5eee4215e0a58d2220cdcc18125141d012b
>>>>>>> 83a33fb80649c01f72db51d538f740aadb572746
https://github.com/ros2/rmw.git 17e3a94e447cd043dc20aec7dd620b5eb26241c6
https://github.com/ros2/rmw_implementation.git 124a45b2c65df5e69017dec230740c23d937787e
https://github.com/ros2/ros2_tracing.git fb240709fda0e0cc6c08f12ae8052d3a32221d29
https://github.com/ros2/rosidl.git 995917e9ce14d17821c04bf28d5a092111537842
https://github.com/ros2/rmw_implementation.git 5aa91b6a9c5e8d2d41472c78cff0a628f39e1bfd
https://github.com/ros2/ros2_tracing.git 9a37d75b9cdd2d939a31cc25069572b6c6ca490a
https://github.com/ros2/rosidl.git 6e4689464b5f361d01ac4eea7da50b20465d0e79
https://github.com/ros2/rosidl_core.git 83df4c6574f90a8479d0b0211a463a7806ad6179
https://github.com/ros2/rosidl_dds.git f074b295c316e9bbb9845344cc6ab882339e9305
https://github.com/ros2/rosidl_defaults.git 34a204f3ce0528c6ec3bb89d33404422eb879995
15 changes: 15 additions & 0 deletions extras/library_generation/library_generation.sh
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ if [ $OPTIND -eq 1 ]; then
PLATFORMS+=("portenta-m7")
PLATFORMS+=("kakutef7-m7")
PLATFORMS+=("esp32")
PLATFORMS+=("esp32s3")
fi

shift $((OPTIND-1))
@@ -230,6 +231,20 @@ if [[ " ${PLATFORMS[@]} " =~ " esp32 " ]]; then
cp -R firmware/build/libmicroros.a /project/src/esp32/libmicroros.a
fi

######## Build for ESP32S3 ######
if [[ " ${PLATFORMS[@]} " =~ " esp32s3 " ]]; then
rm -rf firmware/build

export TOOLCHAIN_PREFIX=/uros_ws/xtensa-esp32-elf/bin/xtensa-esp32-elf-
ros2 run micro_ros_setup build_firmware.sh /project/extras/library_generation/esp32_toolchain.cmake /project/extras/library_generation/colcon.meta

find firmware/build/include/ -name "*.c" -delete
cp -R firmware/build/include/* /project/src/

mkdir -p /project/src/esp32s3
cp -R firmware/build/libmicroros.a /project/src/esp32s3/libmicroros.a
fi

######## Fix include paths ########
pushd firmware/mcu_ws > /dev/null
INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')
Binary file removed src/cortex-m0plus/libmicroros.a
Binary file not shown.
Binary file removed src/cortex-m3/libmicroros.a
Binary file not shown.
Binary file removed src/cortex-m4/libmicroros.a
Binary file not shown.
Binary file removed src/cortex-m7/fpv5-d16-softfp/libmicroros.a
Binary file not shown.
Binary file removed src/cortex-m7/fpv5-sp-d16-hardfp/libmicroros.a
Binary file not shown.
Binary file removed src/cortex-m7/fpv5-sp-d16-softfp/libmicroros.a
Binary file not shown.
Binary file removed src/esp32/libmicroros.a
Binary file not shown.
207 changes: 207 additions & 0 deletions src/geometry_msgs/msg/detail/velocity_stamped__functions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
// generated from rosidl_generator_c/resource/idl__functions.h.em
// with input from geometry_msgs:msg/VelocityStamped.idl
// generated code does not contain a copyright notice

#ifndef GEOMETRY_MSGS__MSG__DETAIL__VELOCITY_STAMPED__FUNCTIONS_H_
#define GEOMETRY_MSGS__MSG__DETAIL__VELOCITY_STAMPED__FUNCTIONS_H_

#ifdef __cplusplus
extern "C"
{
#endif

#include <stdbool.h>
#include <stdlib.h>

#include "rosidl_runtime_c/action_type_support_struct.h"
#include "rosidl_runtime_c/message_type_support_struct.h"
#include "rosidl_runtime_c/service_type_support_struct.h"
#include "rosidl_runtime_c/type_description/type_description__struct.h"
#include "rosidl_runtime_c/type_description/type_source__struct.h"
#include "rosidl_runtime_c/type_hash.h"
#include "rosidl_runtime_c/visibility_control.h"
#include "geometry_msgs/msg/rosidl_generator_c__visibility_control.h"

#include "geometry_msgs/msg/detail/velocity_stamped__struct.h"

/// Initialize msg/VelocityStamped message.
/**
* If the init function is called twice for the same message without
* calling fini inbetween previously allocated memory will be leaked.
* \param[in,out] msg The previously allocated message pointer.
* Fields without a default value will not be initialized by this function.
* You might want to call memset(msg, 0, sizeof(
* geometry_msgs__msg__VelocityStamped
* )) before or use
* geometry_msgs__msg__VelocityStamped__create()
* to allocate and initialize the message.
* \return true if initialization was successful, otherwise false
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
bool
geometry_msgs__msg__VelocityStamped__init(geometry_msgs__msg__VelocityStamped * msg);

/// Finalize msg/VelocityStamped message.
/**
* \param[in,out] msg The allocated message pointer.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
void
geometry_msgs__msg__VelocityStamped__fini(geometry_msgs__msg__VelocityStamped * msg);

/// Create msg/VelocityStamped message.
/**
* It allocates the memory for the message, sets the memory to zero, and
* calls
* geometry_msgs__msg__VelocityStamped__init().
* \return The pointer to the initialized message if successful,
* otherwise NULL
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
geometry_msgs__msg__VelocityStamped *
geometry_msgs__msg__VelocityStamped__create();

/// Destroy msg/VelocityStamped message.
/**
* It calls
* geometry_msgs__msg__VelocityStamped__fini()
* and frees the memory of the message.
* \param[in,out] msg The allocated message pointer.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
void
geometry_msgs__msg__VelocityStamped__destroy(geometry_msgs__msg__VelocityStamped * msg);

/// Check for msg/VelocityStamped message equality.
/**
* \param[in] lhs The message on the left hand size of the equality operator.
* \param[in] rhs The message on the right hand size of the equality operator.
* \return true if messages are equal, otherwise false.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
bool
geometry_msgs__msg__VelocityStamped__are_equal(const geometry_msgs__msg__VelocityStamped * lhs, const geometry_msgs__msg__VelocityStamped * rhs);

/// Copy a msg/VelocityStamped message.
/**
* This functions performs a deep copy, as opposed to the shallow copy that
* plain assignment yields.
*
* \param[in] input The source message pointer.
* \param[out] output The target message pointer, which must
* have been initialized before calling this function.
* \return true if successful, or false if either pointer is null
* or memory allocation fails.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
bool
geometry_msgs__msg__VelocityStamped__copy(
const geometry_msgs__msg__VelocityStamped * input,
geometry_msgs__msg__VelocityStamped * output);

/// Retrieve pointer to the hash of the description of this type.
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
const rosidl_type_hash_t *
geometry_msgs__msg__VelocityStamped__get_type_hash(
const rosidl_message_type_support_t * type_support);

/// Retrieve pointer to the description of this type.
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
const rosidl_runtime_c__type_description__TypeDescription *
geometry_msgs__msg__VelocityStamped__get_type_description(
const rosidl_message_type_support_t * type_support);

/// Retrieve pointer to the single raw source text that defined this type.
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
const rosidl_runtime_c__type_description__TypeSource *
geometry_msgs__msg__VelocityStamped__get_individual_type_description_source(
const rosidl_message_type_support_t * type_support);

/// Retrieve pointer to the recursive raw sources that defined the description of this type.
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
const rosidl_runtime_c__type_description__TypeSource__Sequence *
geometry_msgs__msg__VelocityStamped__get_type_description_sources(
const rosidl_message_type_support_t * type_support);

/// Initialize array of msg/VelocityStamped messages.
/**
* It allocates the memory for the number of elements and calls
* geometry_msgs__msg__VelocityStamped__init()
* for each element of the array.
* \param[in,out] array The allocated array pointer.
* \param[in] size The size / capacity of the array.
* \return true if initialization was successful, otherwise false
* If the array pointer is valid and the size is zero it is guaranteed
# to return true.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
bool
geometry_msgs__msg__VelocityStamped__Sequence__init(geometry_msgs__msg__VelocityStamped__Sequence * array, size_t size);

/// Finalize array of msg/VelocityStamped messages.
/**
* It calls
* geometry_msgs__msg__VelocityStamped__fini()
* for each element of the array and frees the memory for the number of
* elements.
* \param[in,out] array The initialized array pointer.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
void
geometry_msgs__msg__VelocityStamped__Sequence__fini(geometry_msgs__msg__VelocityStamped__Sequence * array);

/// Create array of msg/VelocityStamped messages.
/**
* It allocates the memory for the array and calls
* geometry_msgs__msg__VelocityStamped__Sequence__init().
* \param[in] size The size / capacity of the array.
* \return The pointer to the initialized array if successful, otherwise NULL
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
geometry_msgs__msg__VelocityStamped__Sequence *
geometry_msgs__msg__VelocityStamped__Sequence__create(size_t size);

/// Destroy array of msg/VelocityStamped messages.
/**
* It calls
* geometry_msgs__msg__VelocityStamped__Sequence__fini()
* on the array,
* and frees the memory of the array.
* \param[in,out] array The initialized array pointer.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
void
geometry_msgs__msg__VelocityStamped__Sequence__destroy(geometry_msgs__msg__VelocityStamped__Sequence * array);

/// Check for msg/VelocityStamped message array equality.
/**
* \param[in] lhs The message array on the left hand size of the equality operator.
* \param[in] rhs The message array on the right hand size of the equality operator.
* \return true if message arrays are equal in size and content, otherwise false.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
bool
geometry_msgs__msg__VelocityStamped__Sequence__are_equal(const geometry_msgs__msg__VelocityStamped__Sequence * lhs, const geometry_msgs__msg__VelocityStamped__Sequence * rhs);

/// Copy an array of msg/VelocityStamped messages.
/**
* This functions performs a deep copy, as opposed to the shallow copy that
* plain assignment yields.
*
* \param[in] input The source array pointer.
* \param[out] output The target array pointer, which must
* have been initialized before calling this function.
* \return true if successful, or false if either pointer
* is null or memory allocation fails.
*/
ROSIDL_GENERATOR_C_PUBLIC_geometry_msgs
bool
geometry_msgs__msg__VelocityStamped__Sequence__copy(
const geometry_msgs__msg__VelocityStamped__Sequence * input,
geometry_msgs__msg__VelocityStamped__Sequence * output);

#ifdef __cplusplus
}
#endif

#endif // GEOMETRY_MSGS__MSG__DETAIL__VELOCITY_STAMPED__FUNCTIONS_H_
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// generated from rosidl_typesupport_introspection_c/resource/idl__rosidl_typesupport_introspection_c.h.em
// with input from geometry_msgs:msg/VelocityStamped.idl
// generated code does not contain a copyright notice

#ifndef GEOMETRY_MSGS__MSG__DETAIL__VELOCITY_STAMPED__ROSIDL_TYPESUPPORT_INTROSPECTION_C_H_
#define GEOMETRY_MSGS__MSG__DETAIL__VELOCITY_STAMPED__ROSIDL_TYPESUPPORT_INTROSPECTION_C_H_

#ifdef __cplusplus
extern "C"
{
#endif


#include "rosidl_runtime_c/message_type_support_struct.h"
#include "rosidl_typesupport_interface/macros.h"
#include "geometry_msgs/msg/rosidl_typesupport_introspection_c__visibility_control.h"

ROSIDL_TYPESUPPORT_INTROSPECTION_C_PUBLIC_geometry_msgs
const rosidl_message_type_support_t *
ROSIDL_TYPESUPPORT_INTERFACE__MESSAGE_SYMBOL_NAME(rosidl_typesupport_introspection_c, geometry_msgs, msg, VelocityStamped)();

#ifdef __cplusplus
}
#endif

#endif // GEOMETRY_MSGS__MSG__DETAIL__VELOCITY_STAMPED__ROSIDL_TYPESUPPORT_INTROSPECTION_C_H_
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// generated from rosidl_typesupport_microxrcedds_c/resource/idl__rosidl_typesupport_c.h.em
// with input from geometry_msgs:msg/VelocityStamped.idl
// generated code does not contain a copyright notice
#ifndef GEOMETRY_MSGS__MSG__VELOCITY_STAMPED__ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_H_
#define GEOMETRY_MSGS__MSG__VELOCITY_STAMPED__ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_H_


#include <stddef.h>
#include <stdbool.h>
#include <stdint.h>
#include "rosidl_runtime_c/message_type_support_struct.h"
#include "rosidl_typesupport_interface/macros.h"
#include "geometry_msgs/msg/rosidl_typesupport_microxrcedds_c__visibility_control.h"

#ifdef __cplusplus
extern "C"
{
#endif

ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_PUBLIC_geometry_msgs
size_t get_serialized_size_geometry_msgs__msg__VelocityStamped(
const void * untyped_ros_message,
size_t current_alignment);

ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_PUBLIC_geometry_msgs
size_t max_serialized_size_geometry_msgs__msg__VelocityStamped(
bool * full_bounded,
size_t current_alignment);

ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_PUBLIC_geometry_msgs
const rosidl_message_type_support_t *
ROSIDL_TYPESUPPORT_INTERFACE__MESSAGE_SYMBOL_NAME(rosidl_typesupport_microxrcedds_c, geometry_msgs, msg, VelocityStamped)();

#ifdef __cplusplus
}
#endif


#endif // GEOMETRY_MSGS__MSG__VELOCITY_STAMPED__ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_H_
Loading

0 comments on commit 66a6ce0

Please sign in to comment.