From 7bf97004269e91e4055942139c3c6d763da92825 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 3 Nov 2019 10:30:00 -0500
Subject: [PATCH] NuttX: math.h drop extra math defines carried in PX4
 defines.h

---
 .../include/px4_platform_common/defines.h     |  4 +--
 platforms/nuttx/NuttX/math.h                  | 34 ++-----------------
 src/drivers/telemetry/hott/messages.cpp       |  1 +
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/platforms/common/include/px4_platform_common/defines.h b/platforms/common/include/px4_platform_common/defines.h
index 6247fa3d23..f94dafe191 100644
--- a/platforms/common/include/px4_platform_common/defines.h
+++ b/platforms/common/include/px4_platform_common/defines.h
@@ -178,6 +178,8 @@ __END_DECLS
 #define ERROR -1
 #define MAX_RAND 32767
 
+#endif // defined(__PX4_POSIX)
+
 /* Math macro's for float literals. Do not use M_PI et al as they aren't
  * defined (neither C nor the C++ standard define math constants) */
 #define M_E_F			2.71828183f
@@ -207,5 +209,3 @@ __END_DECLS
 
 #define M_DEG_TO_RAD 		0.017453292519943295
 #define M_RAD_TO_DEG 		57.295779513082323
-
-#endif // defined(__PX4_POSIX)
diff --git a/platforms/nuttx/NuttX/math.h b/platforms/nuttx/NuttX/math.h
index 9e888a6502..312516ef88 100644
--- a/platforms/nuttx/NuttX/math.h
+++ b/platforms/nuttx/NuttX/math.h
@@ -503,18 +503,16 @@ extern int matherr (struct exception *e);
 #define M_LN2		_M_LN2
 #define M_LN10		2.30258509299404568402
 #define M_PI		3.14159265358979323846
-#define M_TWOPI         (M_PI * 2.0)
 #define M_PI_2		1.57079632679489661923
 #define M_PI_4		0.78539816339744830962
-#define M_3PI_4		2.3561944901923448370E0
-#define M_SQRTPI        1.77245385090551602792981
 #define M_1_PI		0.31830988618379067154
 #define M_2_PI		0.63661977236758134308
 #define M_2_SQRTPI	1.12837916709551257390
-#define M_DEG_TO_RAD 	0.01745329251994
-#define M_RAD_TO_DEG 	57.2957795130823
 #define M_SQRT2		1.41421356237309504880
 #define M_SQRT1_2	0.70710678118654752440
+#define M_TWOPI         (M_PI * 2.0)
+#define M_3PI_4		2.3561944901923448370E0
+#define M_SQRTPI        1.77245385090551602792981
 #define M_LN2LO         1.9082149292705877000E-10
 #define M_LN2HI         6.9314718036912381649E-1
 #define M_SQRT3	1.73205080756887719000
@@ -522,32 +520,6 @@ extern int matherr (struct exception *e);
 #define M_LOG2_E        _M_LN2
 #define M_INVLN2        1.4426950408889633870E0  /* 1 / log(2) */
 
-
-#define M_E_F			2.7182818284590452354f
-#define M_LOG2E_F		1.4426950408889634074f
-#define M_LOG10E_F		0.43429448190325182765f
-#define M_LN2_F			_M_LN2_F
-#define M_LN10_F		2.30258509299404568402f
-#define M_PI_F			3.14159265358979323846f
-#define M_TWOPI_F       (M_PI_F * 2.0f)
-#define M_PI_2_F		1.57079632679489661923f
-#define M_PI_4_F		0.78539816339744830962f
-#define M_3PI_4_F		2.3561944901923448370E0f
-#define M_SQRTPI_F      1.77245385090551602792981f
-#define M_1_PI_F		0.31830988618379067154f
-#define M_2_PI_F		0.63661977236758134308f
-#define M_2_SQRTPI_F	1.12837916709551257390f
-#define M_DEG_TO_RAD_F 	0.01745329251994f
-#define M_RAD_TO_DEG_F 	57.2957795130823f
-#define M_SQRT2_F		1.41421356237309504880f
-#define M_SQRT1_2_F		0.70710678118654752440f
-#define M_LN2LO_F       1.9082149292705877000E-10f
-#define M_LN2HI_F       6.9314718036912381649E-1f
-#define M_SQRT3_F		1.73205080756887719000f
-#define M_IVLN10_F      0.43429448190325182765f /* 1 / log(10) */
-#define M_LOG2_E_F      _M_LN2_F
-#define M_INVLN2_F      1.4426950408889633870E0f  /* 1 / log(2) */
-
 /* Global control over fdlibm error handling.  */
 
 enum __fdlibm_version
diff --git a/src/drivers/telemetry/hott/messages.cpp b/src/drivers/telemetry/hott/messages.cpp
index edee553d82..67b7c52d5c 100644
--- a/src/drivers/telemetry/hott/messages.cpp
+++ b/src/drivers/telemetry/hott/messages.cpp
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <lib/ecl/geo/geo.h>
 #include <unistd.h>
+#include <px4_platform_common/defines.h>
 #include <uORB/topics/airspeed.h>
 #include <uORB/topics/battery_status.h>
 #include <uORB/topics/esc_status.h>