From 0bcb64403c71e7443c9de6822e725add08d3e7c1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 30 Aug 2019 16:09:57 -0500 Subject: [PATCH] Revert _BV testing commit This reverts commit 9223261ea93fc7dcb525325778ff302e611d1ea5. --- Marlin/src/core/macros.h | 2 ++ Marlin/src/core/utility.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h index 68943afed5..ce72247c5d 100644 --- a/Marlin/src/core/macros.h +++ b/Marlin/src/core/macros.h @@ -61,6 +61,8 @@ #define L(CODE) CODE ":\n\t" // Macros for bit masks +#undef _BV +#define _BV(n) (1<<(n)) #define TEST(n,b) !!((n)&_BV(b)) #define SET_BIT_TO(N,B,TF) do{ if (TF) SBI(N,B); else CBI(N,B); }while(0) diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h index c8614925eb..63597fd413 100644 --- a/Marlin/src/core/utility.h +++ b/Marlin/src/core/utility.h @@ -22,7 +22,6 @@ #pragma once #include "../inc/MarlinConfigPre.h" -#include "../HAL/shared/Marduino.h" constexpr char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };