Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing wrappers for uavcan/si #133

Merged
merged 8 commits into from
Sep 21, 2021
Merged

Add missing wrappers for uavcan/si #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ca5ad9
Add missing warppers for uavcan/si/sample/acceleration
joelsa Sep 13, 2021
e232e5a
Add newly created wrappers to ArduinoUAVCANTypes.h
joelsa Sep 13, 2021
3af95c4
Remove redundant namespaces
joelsa Sep 14, 2021
02a6793
Add missing wrappers for uavcan/si
joelsa Sep 21, 2021
45152e5
Add missing includes
joelsa Sep 21, 2021
cc3b30c
Fix typo
joelsa Sep 21, 2021
fcfaa80
Remove redundant _torque type
joelsa Sep 21, 2021
67dceff
Remove usages of now removed _torque data type
joelsa Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions src/ArduinoUAVCANTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,75 @@
#include "wrappers/uavcan/register/Name_1_0.hpp"
#include "wrappers/uavcan/register/Value_1_0.hpp"

/* /uavcan/si *******************************************************************/
#include "wrappers/uavcan/si/sample/acceleration/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/acceleration/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/angle/Quaternion_1_0.hpp"
#include "wrappers/uavcan/si/sample/angle/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/angular_acceleration/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/angular_acceleration/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/angular_velocity/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/angular_velocity/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/duration/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/duration/WideScalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/electric_charge/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/electric_current/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/energy/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/force/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/force/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/frequency/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/length/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/length/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/length/WideScalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/length/WideVector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/magnetic_field_strength/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/magnetic_field_strength/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/mass/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/power/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/pressure/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/temperature/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/torque/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/torque/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/velocity/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/velocity/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/sample/voltage/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/volume/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/sample/volumetric_flow_rate/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/acceleration/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/acceleration/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/angle/Quaternion_1_0.hpp"
#include "wrappers/uavcan/si/unit/angle/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/angular_acceleration/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/angular_acceleration/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/angular_velocity/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/angular_velocity/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/duration/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/duration/WideScalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/electric_charge/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/electric_current/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/energy/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/force/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/force/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/frequency/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/length/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/length/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/length/WideScalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/length/WideVector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/magnetic_field_strength/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/magnetic_field_strength/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/mass/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/power/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/pressure/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/temperature/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/torque/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/torque/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/velocity/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/velocity/Vector3_1_0.hpp"
#include "wrappers/uavcan/si/unit/voltage/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/volume/Scalar_1_0.hpp"
#include "wrappers/uavcan/si/unit/volumetric_flow_rate/Scalar_1_0.hpp"


/* /uavcan/time ***********************************************************************/
#include "wrappers/uavcan/time/GetSynchronizationMasterInfo_0_1.hpp"
#include "wrappers/uavcan/time/Synchronization_1_0.hpp"
Expand Down
8 changes: 4 additions & 4 deletions src/types/reg/drone/physics/dynamics/rotation/Planar_0_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <nunavut/support/serialization.h>
#include <types/reg/drone/physics/kinematics/rotation/Planar_0_1.h>
#include <types/uavcan/si/unit/_torque/Scalar_1_0.h>
#include <types/uavcan/si/unit/torque/Scalar_1_0.h>
#include <stdlib.h>

static_assert( NUNAVUT_SUPPORT_LANGUAGE_OPTION_TARGET_ENDIANNESS == 1693710260,
Expand Down Expand Up @@ -66,7 +66,7 @@ typedef struct
reg_drone_physics_kinematics_rotation_Planar_0_1 kinematics;

/// uavcan.si.unit.torque.Scalar.1.0 torque
uavcan_si_unit_torque_Scalar_1_0 _torque;
uavcan_si_unit_torque_Scalar_1_0 torque;
} reg_drone_physics_dynamics_rotation_Planar_0_1;

/// Serialize an instance into the provided buffer.
Expand Down Expand Up @@ -142,7 +142,7 @@ static inline int8_t reg_drone_physics_dynamics_rotation_Planar_0_1_serialize_(
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits / 8U + _size_bytes1_) <= capacity_bytes);
int8_t _err2_ = uavcan_si_unit_torque_Scalar_1_0_serialize_(
&obj->_torque, &buffer[offset_bits / 8U], &_size_bytes1_);
&obj->torque, &buffer[offset_bits / 8U], &_size_bytes1_);
if (_err2_ < 0)
{
return _err2_;
Expand Down Expand Up @@ -230,7 +230,7 @@ static inline int8_t reg_drone_physics_dynamics_rotation_Planar_0_1_deserialize_
size_t _size_bytes3_ = (size_t)(capacity_bytes - nunavutChooseMin((offset_bits / 8U), capacity_bytes));
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
const int8_t _err5_ = uavcan_si_unit_torque_Scalar_1_0_deserialize_(
&out_obj->_torque, &buffer[offset_bits / 8U], &_size_bytes3_);
&out_obj->torque, &buffer[offset_bits / 8U], &_size_bytes3_);
if (_err5_ < 0)
{
return _err5_;
Expand Down
236 changes: 0 additions & 236 deletions src/types/uavcan/si/sample/_torque/Scalar_1_0.h
View file
Open in desktop

This file was deleted.

Loading