0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simple bool in soft_endstops_t

Browse source
This commit is contained in:
Scott Lahteine 2020-10-13 14:54:56 -05:00
parent 2132efa981
commit 733eb127e9
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/module/motion.cpp
View file

@ -536,9 +536,9 @@ void restore_feedrate_and_scaling() {
// Software Endstops are based on the configured limits. // Software Endstops are based on the configured limits.
soft_endstops_t soft_endstop = { soft_endstops_t soft_endstop = {
true, false,
{ X_MIN_POS, Y_MIN_POS, Z_MIN_POS }, { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
{ X_MAX_POS, Y_MAX_POS, Z_MAX_POS }, { X_MAX_POS, Y_MAX_POS, Z_MAX_POS }
{ true, false }
}; };
/** /**

8
Marlin/src/module/motion.h
View file

@ -151,12 +151,10 @@ inline float home_bump_mm(const AxisEnum axis) {
#if HAS_SOFTWARE_ENDSTOPS #if HAS_SOFTWARE_ENDSTOPS
typedef struct { typedef struct {
xyz_pos_t min, max; bool _enabled, _loose;
struct {
bool _enabled:1;
bool _loose:1;
};
bool enabled() { return _enabled && !_loose; } bool enabled() { return _enabled && !_loose; }
xyz_pos_t min, max;
void get_manual_axis_limits(const AxisEnum axis, float &amin, float &amax) { void get_manual_axis_limits(const AxisEnum axis, float &amin, float &amax) {
amin = -100000; amax = 100000; // "No limits" amin = -100000; amax = 100000; // "No limits"
#if HAS_SOFTWARE_ENDSTOPS #if HAS_SOFTWARE_ENDSTOPS