Patch M_PI in Marduino.h

2.0.x
Scott Lahteine 6 years ago
parent c6e6365e15
commit 44e4f853c8

@ -64,3 +64,7 @@
#define RST_JTAG 16 #define RST_JTAG 16
#define RST_SOFTWARE 32 #define RST_SOFTWARE 32
#define RST_BACKUP 64 #define RST_BACKUP 64
#ifndef M_PI
#define M_PI 3.14159265358979323846f
#endif

@ -84,10 +84,6 @@
#define SBI32(n,b) (n |= _BV32(b)) #define SBI32(n,b) (n |= _BV32(b))
#define CBI32(n,b) (n &= ~_BV32(b)) #define CBI32(n,b) (n &= ~_BV32(b))
// Macros for maths shortcuts
#undef M_PI
#define M_PI 3.14159265358979323846f
#define RADIANS(d) ((d)*float(M_PI)/180.0f) #define RADIANS(d) ((d)*float(M_PI)/180.0f)
#define DEGREES(r) ((r)*180.0f/float(M_PI)) #define DEGREES(r) ((r)*180.0f/float(M_PI))
#define HYPOT2(x,y) (sq(x)+sq(y)) #define HYPOT2(x,y) (sq(x)+sq(y))

Loading…
Cancel
Save