cleanup, display screen abstraction

3 files changed, 6 insertions, 12 deletions

diff --git a/arduino/cores/nRF5/Arduino.h b/arduino/cores/nRF5/Arduino.h
index fb06853..b77a872 100755
--- a/arduino/cores/nRF5/Arduino.h
+++ b/arduino/cores/nRF5/Arduino.h
@@ -86,6 +86,7 @@ uint32_t setLoopStacksize(void);
 #include "wiring_shift.h"
 #include "WInterrupts.h"
 
+#ifndef __cplusplus
 // undefine stdlib's abs if encountered
 #ifdef abs
 #undef abs
@@ -94,6 +95,8 @@ uint32_t setLoopStacksize(void);
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
 #define abs(x) ((x)>0?(x):-(x))
+#endif // __cplusplus
+
 #define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
 #define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
 #define radians(deg) ((deg)*DEG_TO_RAD)
diff --git a/arduino/cores/nRF5/common_func.h b/arduino/cores/nRF5/common_func.h
index 6862dab..081426e 100755
--- a/arduino/cores/nRF5/common_func.h
+++ b/arduino/cores/nRF5/common_func.h
@@ -52,17 +52,8 @@
 #define __swap32(x)    __REV(x)                   ///< built-in function to swap Endian of 32-bit number
 #define __swap16(u16)  ((uint16_t) __REV16(u16))  ///< built-in function to swap Endian of 16-bit number
 
-#ifndef __cplusplus
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif // max
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif // min
-#endif // __cplusplus
-
-#define maxof(a,b) max(a, b)
-#define minof(a,b) min(a, b)
+#define maxof(a, b) ((a) > (b) ? (a) : (b))
+#define minof(a, b) ((a) < (b) ? (a) : (b))
 
 /*------------------------------------------------------------------*/
 /* Count number of arguments of __VA_ARGS__
diff --git a/arduino/libraries/Bluefruit52Lib/src/utility/bonding.cpp b/arduino/libraries/Bluefruit52Lib/src/utility/bonding.cpp
index e9f9289..02908c2 100755
--- a/arduino/libraries/Bluefruit52Lib/src/utility/bonding.cpp
+++ b/arduino/libraries/Bluefruit52Lib/src/utility/bonding.cpp
@@ -56,7 +56,7 @@
  * Each field has an 1-byte preceding length
  *------------------------------------------------------------------*/
 #define SVC_CONTEXT_FLAG      (BLE_GATTS_SYS_ATTR_FLAG_SYS_SRVCS | BLE_GATTS_SYS_ATTR_FLAG_USR_SRVCS)
-#define BOND_FNAME_LEN        max(sizeof(BOND_FNAME_PRPH), sizeof(BOND_FNAME_CNTR))
+#define BOND_FNAME_LEN        std::max(sizeof(BOND_FNAME_PRPH), sizeof(BOND_FNAME_CNTR))
 
 static void get_fname (char* fname, uint8_t role, uint16_t ediv)
 {