Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup

Conflicts: Marlin/Marlin_main.cpp
2015-04-01 10:31:02 -05:00
parent a508d835db 443468df8d
commit 745d9fe1a4
5 changed files with 389 additions and 323 deletions
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -29,6 +29,8 @@

 #define BIT(b) (1<<(b))
 #define TEST(n,b) (((n)&BIT(b))!=0)
+#define RADIANS(d) ((d)*M_PI/180.0)
+#define DEGREES(r) ((d)*180.0/M_PI)

 // Arduino < 1.0.0 does not define this, so we need to do it ourselves
 #ifndef analogInputToDigitalPin