From 9223261ea93fc7dcb525325778ff302e611d1ea5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 29 Aug 2019 17:50:16 -0500 Subject: [PATCH] Only define _BV in Marduino.h --- Marlin/src/core/macros.h | 2 -- Marlin/src/core/utility.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h index ce72247c5..68943afed 100644 --- a/Marlin/src/core/macros.h +++ b/Marlin/src/core/macros.h @@ -61,8 +61,6 @@ #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 63597fd41..c8614925e 100644 --- a/Marlin/src/core/utility.h +++ b/Marlin/src/core/utility.h @@ -22,6 +22,7 @@ #pragma once #include "../inc/MarlinConfigPre.h" +#include "../HAL/shared/Marduino.h" constexpr char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };