Simplified SET_BIT, moved to endstops.cpp
This commit is contained in:
parent
eb18ae9003
commit
c251601916
|
@ -100,7 +100,6 @@
|
||||||
#define TEST(n,b) !!((n)&_BV(b))
|
#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 _BV32(b) (1UL << (b))
|
#define _BV32(b) (1UL << (b))
|
||||||
#define TEST32(n,b) !!((n)&_BV32(b))
|
#define TEST32(n,b) !!((n)&_BV32(b))
|
||||||
|
|
|
@ -317,6 +317,7 @@ void Endstops::update() {
|
||||||
#define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_## MINMAX ##_ENDSTOP_INVERTING
|
#define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_## MINMAX ##_ENDSTOP_INVERTING
|
||||||
#define _ENDSTOP_HIT(AXIS, MINMAX) SBI(endstop_hit_bits, _ENDSTOP(AXIS, MINMAX))
|
#define _ENDSTOP_HIT(AXIS, MINMAX) SBI(endstop_hit_bits, _ENDSTOP(AXIS, MINMAX))
|
||||||
|
|
||||||
|
#define SET_BIT(N,B,TF) do{ if (TF) SBI(N,B); else CBI(N,B); }while(0)
|
||||||
// UPDATE_ENDSTOP_BIT: set the current endstop bits for an endstop to its status
|
// UPDATE_ENDSTOP_BIT: set the current endstop bits for an endstop to its status
|
||||||
#define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT(current_endstop_bits, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
|
#define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT(current_endstop_bits, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
|
||||||
// COPY_BIT: copy the value of SRC_BIT to DST_BIT in DST
|
// COPY_BIT: copy the value of SRC_BIT to DST_BIT in DST
|
||||||
|
|
Loading…
Reference in a new issue