From deaa70c2ccf5a36dfea39f28e3aff64ae59d409d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 10 Nov 2017 04:32:03 -0600
Subject: [PATCH] Update macros for parity with 2.0.x

---
 Marlin/Marlin.h | 2 --
 Marlin/macros.h | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 1c4d97bbc..67ed6c8a5 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -212,8 +212,6 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
  */
 extern int16_t feedrate_percentage;
 
-#define MMM_TO_MMS(MM_M) ((MM_M)/60.0)
-#define MMS_TO_MMM(MM_S) ((MM_S)*60.0)
 #define MMS_SCALED(MM_S) ((MM_S)*feedrate_percentage*0.01)
 
 extern bool axis_relative_modes[];
diff --git a/Marlin/macros.h b/Marlin/macros.h
index 523dcaded..253ba6011 100644
--- a/Marlin/macros.h
+++ b/Marlin/macros.h
@@ -117,7 +117,11 @@
 #define DEGREES(r) ((r)*180.0/M_PI)
 #define HYPOT2(x,y) (sq(x)+sq(y))
 
+#define CIRCLE_AREA(R) (M_PI * sq(R))
+#define CIRCLE_CIRC(R) (2.0 * M_PI * (R))
+
 #define SIGN(a) ((a>0)-(a<0))
+#define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1)))
 
 // Macros to contrain values
 #define NOLESS(v,n) do{ if (v < n) v = n; }while(0)
@@ -184,6 +188,9 @@
 #define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
 #define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
 
+#define MMM_TO_MMS(MM_M) ((MM_M)/60.0)
+#define MMS_TO_MMM(MM_S) ((MM_S)*60.0)
+
 #define NOOP do{} while(0)
 
 #define CEILING(x,y) (((x) + (y) - 1) / (y))