Add C++ template versions of C macros

Keating950 · Keating950 · commit 57dec209f2ab · 2021-02-05T10:26:38.000-05:00
diff --git a/api/Common.h b/api/Common.h
@@ -37,20 +37,82 @@ typedef enum {
 #define SERIAL      0x0
 #define DISPLAY     0x1
 
-#ifndef constrain
-#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#ifdef __cplusplus
+} // extern "C"
 #endif
 
-#ifndef radians
-#define radians(deg) ((deg)*DEG_TO_RAD)
-#endif
+#ifdef __cplusplus
+
+  template<class T, class L> 
+  auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (b < a) ? b : a;
+  }
+
+  template<class T, class L> 
+  auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (a < b) ? b : a;
+  }
+
+
+  template<class T, class U, class V> 
+  auto constrain(const T& amt, const U& low, const V& high) -> decltype((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+  {
+      return (amt)<(low)?(low):((amt)>(high)?(high):(amt));
+  }
+  
+  template<class T> 
+  auto radians(const T& deg) -> decltype(deg * DEG_TO_RAD)
+  {
+      return deg * DEG_TO_RAD;
+  }
+
+  template<class T> 
+  auto degrees(const T& rad) -> decltype(rad * RAD_TO_DEG)
+  {
+      return rad * RAD_TO_DEG;
+  }
 
-#ifndef degrees
-#define degrees(rad) ((rad)*RAD_TO_DEG)
+  template<class T> 
+  auto sq(const T& x) -> decltype(x*x)
+  {
+      return x*x;
+  }
+#else
+  #ifndef constrain
+  #define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+  #endif
+  
+  #ifndef radians
+  #define radians(deg) ((deg)*DEG_TO_RAD)
+  #endif
+  
+  #ifndef degrees
+  #define degrees(rad) ((rad)*RAD_TO_DEG)
+  #endif
+  
+  #ifndef sq
+  #define sq(x) ((x)*(x))
+  #endif
+
+  #ifndef min
+  #define min(a,b) \
+     ({ __typeof__ (a) _a = (a); \
+         __typeof__ (b) _b = (b); \
+       _a < _b ? _a : _b; })
+  #endif
+
+  #ifndef max
+  #define max(a,b) \
+     ({ __typeof__ (a) _a = (a); \
+         __typeof__ (b) _b = (b); \
+       _a > _b ? _a : _b; })
+  #endif
 #endif
 
-#ifndef sq
-#define sq(x) ((x)*(x))
+#ifdef __cplusplus
+extern "C"{
 #endif
 
 typedef void (*voidFuncPtr)(void);
@@ -119,32 +181,6 @@ void loop(void);
 } // extern "C"
 #endif
 
-#ifdef __cplusplus
-  template<class T, class L> 
-  auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
-  {
-    return (b < a) ? b : a;
-  }
-
-  template<class T, class L> 
-  auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
-  {
-    return (a < b) ? b : a;
-  }
-#else
-#ifndef min
-#define min(a,b) \
-   ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a < _b ? _a : _b; })
-#endif
-#ifndef max
-#define max(a,b) \
-   ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a > _b ? _a : _b; })
-#endif
-#endif
 
 #ifdef __cplusplus
 
