Skip to content

Commit

Permalink
Merge pull request #102 from 107-systems/fix-esp32
Browse files Browse the repository at this point in the history 
Workaround for erroneous macro expansion (isfinite) on ESP32
  • Loading branch information
@aentinger
aentinger committed Apr 12, 2021
2 parents cc4ad43 + 2e42108 commit 7c4fde4
Show file tree
Hide file tree
Showing 20 changed files with 193 additions and 153 deletions.
14 changes: 8 additions & 6 deletions src/types/reg/drone/physics/kinematics/cartesian/PointVar_0_1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <types/reg/drone/physics/kinematics/cartesian/Point_0_1.h>
#include <stdlib.h>
#include <string.h>
#undef infinite
#include <cmath>

static_assert( NUNAVUT_SUPPORT_LANGUAGE_OPTION_TARGET_ENDIANNESS == 1693710260,
"/home/alex/projects/107-systems/public_regulated_data_types/reg/drone/physics/kinematics/cartesian/PointVar.0.1.uavcan is trying to use a serialization library that was compiled with "
Expand Down Expand Up @@ -133,7 +135,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PointVar_0_1_seriali
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat0_ = obj->covariance_urt[0];
if (isfinite(_sat0_))
if (std::isfinite(_sat0_))
{
if (_sat0_ < ((float) -65504.0))
{
Expand All @@ -155,7 +157,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PointVar_0_1_seriali
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat1_ = obj->covariance_urt[1];
if (isfinite(_sat1_))
if (std::isfinite(_sat1_))
{
if (_sat1_ < ((float) -65504.0))
{
Expand All @@ -177,7 +179,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PointVar_0_1_seriali
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat2_ = obj->covariance_urt[2];
if (isfinite(_sat2_))
if (std::isfinite(_sat2_))
{
if (_sat2_ < ((float) -65504.0))
{
Expand All @@ -199,7 +201,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PointVar_0_1_seriali
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat3_ = obj->covariance_urt[3];
if (isfinite(_sat3_))
if (std::isfinite(_sat3_))
{
if (_sat3_ < ((float) -65504.0))
{
Expand All @@ -221,7 +223,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PointVar_0_1_seriali
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat4_ = obj->covariance_urt[4];
if (isfinite(_sat4_))
if (std::isfinite(_sat4_))
{
if (_sat4_ < ((float) -65504.0))
{
Expand All @@ -243,7 +245,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PointVar_0_1_seriali
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat5_ = obj->covariance_urt[5];
if (isfinite(_sat5_))
if (std::isfinite(_sat5_))
{
if (_sat5_ < ((float) -65504.0))
{
Expand Down
44 changes: 23 additions & 21 deletions src/types/reg/drone/physics/kinematics/cartesian/PoseVar_0_1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <types/reg/drone/physics/kinematics/cartesian/Pose_0_1.h>
#include <stdlib.h>
#include <string.h>
#undef infinite
#include <cmath>

static_assert( NUNAVUT_SUPPORT_LANGUAGE_OPTION_TARGET_ENDIANNESS == 1693710260,
"/home/alex/projects/107-systems/public_regulated_data_types/reg/drone/physics/kinematics/cartesian/PoseVar.0.1.uavcan is trying to use a serialization library that was compiled with "
Expand Down Expand Up @@ -133,7 +135,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat0_ = obj->covariance_urt[0];
if (isfinite(_sat0_))
if (std::isfinite(_sat0_))
{
if (_sat0_ < ((float) -65504.0))
{
Expand All @@ -155,7 +157,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat1_ = obj->covariance_urt[1];
if (isfinite(_sat1_))
if (std::isfinite(_sat1_))
{
if (_sat1_ < ((float) -65504.0))
{
Expand All @@ -177,7 +179,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat2_ = obj->covariance_urt[2];
if (isfinite(_sat2_))
if (std::isfinite(_sat2_))
{
if (_sat2_ < ((float) -65504.0))
{
Expand All @@ -199,7 +201,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat3_ = obj->covariance_urt[3];
if (isfinite(_sat3_))
if (std::isfinite(_sat3_))
{
if (_sat3_ < ((float) -65504.0))
{
Expand All @@ -221,7 +223,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat4_ = obj->covariance_urt[4];
if (isfinite(_sat4_))
if (std::isfinite(_sat4_))
{
if (_sat4_ < ((float) -65504.0))
{
Expand All @@ -243,7 +245,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat5_ = obj->covariance_urt[5];
if (isfinite(_sat5_))
if (std::isfinite(_sat5_))
{
if (_sat5_ < ((float) -65504.0))
{
Expand All @@ -265,7 +267,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat6_ = obj->covariance_urt[6];
if (isfinite(_sat6_))
if (std::isfinite(_sat6_))
{
if (_sat6_ < ((float) -65504.0))
{
Expand All @@ -287,7 +289,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat7_ = obj->covariance_urt[7];
if (isfinite(_sat7_))
if (std::isfinite(_sat7_))
{
if (_sat7_ < ((float) -65504.0))
{
Expand All @@ -309,7 +311,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat8_ = obj->covariance_urt[8];
if (isfinite(_sat8_))
if (std::isfinite(_sat8_))
{
if (_sat8_ < ((float) -65504.0))
{
Expand All @@ -331,7 +333,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat9_ = obj->covariance_urt[9];
if (isfinite(_sat9_))
if (std::isfinite(_sat9_))
{
if (_sat9_ < ((float) -65504.0))
{
Expand All @@ -353,7 +355,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat10_ = obj->covariance_urt[10];
if (isfinite(_sat10_))
if (std::isfinite(_sat10_))
{
if (_sat10_ < ((float) -65504.0))
{
Expand All @@ -375,7 +377,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat11_ = obj->covariance_urt[11];
if (isfinite(_sat11_))
if (std::isfinite(_sat11_))
{
if (_sat11_ < ((float) -65504.0))
{
Expand All @@ -397,7 +399,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat12_ = obj->covariance_urt[12];
if (isfinite(_sat12_))
if (std::isfinite(_sat12_))
{
if (_sat12_ < ((float) -65504.0))
{
Expand All @@ -419,7 +421,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat13_ = obj->covariance_urt[13];
if (isfinite(_sat13_))
if (std::isfinite(_sat13_))
{
if (_sat13_ < ((float) -65504.0))
{
Expand All @@ -441,7 +443,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat14_ = obj->covariance_urt[14];
if (isfinite(_sat14_))
if (std::isfinite(_sat14_))
{
if (_sat14_ < ((float) -65504.0))
{
Expand All @@ -463,7 +465,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat15_ = obj->covariance_urt[15];
if (isfinite(_sat15_))
if (std::isfinite(_sat15_))
{
if (_sat15_ < ((float) -65504.0))
{
Expand All @@ -485,7 +487,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat16_ = obj->covariance_urt[16];
if (isfinite(_sat16_))
if (std::isfinite(_sat16_))
{
if (_sat16_ < ((float) -65504.0))
{
Expand All @@ -507,7 +509,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat17_ = obj->covariance_urt[17];
if (isfinite(_sat17_))
if (std::isfinite(_sat17_))
{
if (_sat17_ < ((float) -65504.0))
{
Expand All @@ -529,7 +531,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat18_ = obj->covariance_urt[18];
if (isfinite(_sat18_))
if (std::isfinite(_sat18_))
{
if (_sat18_ < ((float) -65504.0))
{
Expand All @@ -551,7 +553,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat19_ = obj->covariance_urt[19];
if (isfinite(_sat19_))
if (std::isfinite(_sat19_))
{
if (_sat19_ < ((float) -65504.0))
{
Expand All @@ -573,7 +575,7 @@ static inline int8_t reg_drone_physics_kinematics_cartesian_PoseVar_0_1_serializ
NUNAVUT_ASSERT(offset_bits % 8U == 0U);
NUNAVUT_ASSERT((offset_bits + 16ULL) <= (capacity_bytes * 8U));
float _sat20_ = obj->covariance_urt[20];
if (isfinite(_sat20_))
if (std::isfinite(_sat20_))
{
if (_sat20_ < ((float) -65504.0))
{
Expand Down
Loading

0 comments on commit 7c4fde4

Please sign in to comment.