Apply static to Endstops class
This commit is contained in:
parent
7ba8f2dbc3
commit
26f866b908
@ -36,6 +36,34 @@
|
|||||||
|
|
||||||
Endstops endstops;
|
Endstops endstops;
|
||||||
|
|
||||||
|
// public:
|
||||||
|
|
||||||
|
bool Endstops::enabled = true,
|
||||||
|
Endstops::enabled_globally =
|
||||||
|
#if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
|
||||||
|
false
|
||||||
|
#else
|
||||||
|
true
|
||||||
|
#endif
|
||||||
|
;
|
||||||
|
volatile char Endstops::endstop_hit_bits; // use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT value
|
||||||
|
|
||||||
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
||||||
|
uint16_t
|
||||||
|
#else
|
||||||
|
byte
|
||||||
|
#endif
|
||||||
|
Endstops::current_endstop_bits = 0,
|
||||||
|
Endstops::old_endstop_bits = 0;
|
||||||
|
|
||||||
|
#if HAS_BED_PROBE
|
||||||
|
volatile bool Endstops::z_probe_enabled = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class and Instance Methods
|
||||||
|
*/
|
||||||
|
|
||||||
Endstops::Endstops() {
|
Endstops::Endstops() {
|
||||||
enable_globally(
|
enable_globally(
|
||||||
#if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
|
#if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
|
||||||
|
@ -33,25 +33,15 @@ class Endstops {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
volatile char endstop_hit_bits; // use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT value
|
static bool enabled, enabled_globally;
|
||||||
|
static volatile char endstop_hit_bits; // use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT value
|
||||||
|
|
||||||
#if ENABLED(Z_DUAL_ENDSTOPS)
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
||||||
uint16_t current_endstop_bits = 0,
|
static uint16_t
|
||||||
old_endstop_bits = 0;
|
|
||||||
#else
|
#else
|
||||||
byte current_endstop_bits = 0,
|
static byte
|
||||||
old_endstop_bits = 0;
|
|
||||||
#endif
|
#endif
|
||||||
|
current_endstop_bits, old_endstop_bits;
|
||||||
|
|
||||||
bool enabled = true;
|
|
||||||
bool enabled_globally =
|
|
||||||
#if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
|
|
||||||
false
|
|
||||||
#else
|
|
||||||
true
|
|
||||||
#endif
|
|
||||||
;
|
|
||||||
|
|
||||||
Endstops();
|
Endstops();
|
||||||
|
|
||||||
@ -63,40 +53,40 @@ class Endstops {
|
|||||||
/**
|
/**
|
||||||
* Update the endstops bits from the pins
|
* Update the endstops bits from the pins
|
||||||
*/
|
*/
|
||||||
void update();
|
static void update();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Print an error message reporting the position when the endstops were last hit.
|
* Print an error message reporting the position when the endstops were last hit.
|
||||||
*/
|
*/
|
||||||
void report_state(); //call from somewhere to create an serial error message with the locations the endstops where hit, in case they were triggered
|
static void report_state(); //call from somewhere to create an serial error message with the locations the endstops where hit, in case they were triggered
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Report endstop positions in response to M119
|
* Report endstop positions in response to M119
|
||||||
*/
|
*/
|
||||||
void M119();
|
static void M119();
|
||||||
|
|
||||||
// Enable / disable endstop checking globally
|
// Enable / disable endstop checking globally
|
||||||
FORCE_INLINE void enable_globally(bool onoff=true) { enabled_globally = enabled = onoff; }
|
static FORCE_INLINE void enable_globally(bool onoff=true) { enabled_globally = enabled = onoff; }
|
||||||
|
|
||||||
// Enable / disable endstop checking
|
// Enable / disable endstop checking
|
||||||
FORCE_INLINE void enable(bool onoff=true) { enabled = onoff; }
|
static FORCE_INLINE void enable(bool onoff=true) { enabled = onoff; }
|
||||||
|
|
||||||
// Disable / Enable endstops based on ENSTOPS_ONLY_FOR_HOMING and global enable
|
// Disable / Enable endstops based on ENSTOPS_ONLY_FOR_HOMING and global enable
|
||||||
FORCE_INLINE void not_homing() { enabled = enabled_globally; }
|
static FORCE_INLINE void not_homing() { enabled = enabled_globally; }
|
||||||
|
|
||||||
// Clear endstops (i.e., they were hit intentionally) to suppress the report
|
// Clear endstops (i.e., they were hit intentionally) to suppress the report
|
||||||
FORCE_INLINE void hit_on_purpose() { endstop_hit_bits = 0; }
|
static FORCE_INLINE void hit_on_purpose() { endstop_hit_bits = 0; }
|
||||||
|
|
||||||
// Enable / disable endstop z-probe checking
|
// Enable / disable endstop z-probe checking
|
||||||
#if HAS_BED_PROBE
|
#if HAS_BED_PROBE
|
||||||
volatile bool z_probe_enabled = false;
|
static volatile bool z_probe_enabled;
|
||||||
FORCE_INLINE void enable_z_probe(bool onoff=true) { z_probe_enabled = onoff; }
|
static FORCE_INLINE void enable_z_probe(bool onoff=true) { z_probe_enabled = onoff; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
#if ENABLED(Z_DUAL_ENDSTOPS)
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
||||||
void test_dual_z_endstops(EndstopEnum es1, EndstopEnum es2);
|
static void test_dual_z_endstops(EndstopEnum es1, EndstopEnum es2);
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user