MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add / use 32-bit wide bit macros

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-01 21:46:10 -06:00
parent b0f148f7db
commit 31920a5285
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/MarlinSPI.h
View File

@ -48,7 +48,7 @@ class SPI<MISO_PIN, MOSI_PIN, SCK_PIN> {
} }
FORCE_INLINE static uint8_t receive() { FORCE_INLINE static uint8_t receive() {
SPDR = 0; SPDR = 0;
for (;!TEST(SPSR, SPIF);); while (!TEST(SPSR, SPIF)) { /* nada */ }
return SPDR; return SPDR;
} }

4
Marlin/gcode.h
View File

@ -136,7 +136,7 @@ public:
static bool seen(const char c) { static bool seen(const char c) {
const uint8_t ind = LETTER_BIT(c); const uint8_t ind = LETTER_BIT(c);
if (ind >= COUNT(param)) return false; // Only A-Z if (ind >= COUNT(param)) return false; // Only A-Z
const bool b = TEST(codebits, ind); const bool b = TEST32(codebits, ind);
if (b) { if (b) {
#if ENABLED(DEBUG_GCODE_PARSER) #if ENABLED(DEBUG_GCODE_PARSER)
if (codenum == 800) { if (codenum == 800) {
@ -151,7 +151,7 @@ public:
static bool seen_any() { return !!codebits; } static bool seen_any() { return !!codebits; }
#define SEEN_TEST(L) TEST(codebits, LETTER_BIT(L)) #define SEEN_TEST(L) TEST32(codebits, LETTER_BIT(L))
#else // !FASTER_GCODE_PARSER #else // !FASTER_GCODE_PARSER

11
Marlin/macros.h
View File

@ -101,13 +101,18 @@
#define STRINGIFY(M) STRINGIFY_(M) #define STRINGIFY(M) STRINGIFY_(M)
// Macros for bit masks // Macros for bit masks
#undef _BV // Marlin needs 32-bit unsigned! #undef _BV
#define _BV(b) (1UL << (b)) #define _BV(b) (1<<(b))
#define TEST(n,b) (((n)&_BV(b))!=0) #define TEST(n,b) !!((n)&_BV(b))
#define SBI(n,b) (n |= _BV(b)) #define SBI(n,b) (n |= _BV(b))
#define CBI(n,b) (n &= ~_BV(b)) #define CBI(n,b) (n &= ~_BV(b))
#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (_BV(b)) #define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (_BV(b))
#define _BV32(b) (1UL << (b))
#define TEST32(n,b) !!((n)&_BV32(b))
#define SBI32(n,b) (n |= _BV32(b))
#define CBI32(n,b) (n &= ~_BV32(b))
// Macro to check that a number if a power if 2 // Macro to check that a number if a power if 2
#define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1))) #define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1)))