From 352e0df7d800b033ce24ad1022461f5d1908da93 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Thu, 14 Mar 2019 14:44:18 -0400 Subject: cleanup, display screen abstraction --- arduino/cores/nRF5/Arduino.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arduino/cores/nRF5/Arduino.h') 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) -- cgit v1.2.3