You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
957e966d2d
Previously the parameters set in M206 would only be used if a G82
command was sent with specific axis home values. This limits its
usefulness.
Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom. So as the first stage of this, make M206 affect every
home command. The values set using M206 are now added to the
configuration variables [XYZ]_HOME_POS.
This is achieved by replacing all uses of [XYZ]_HOME_POS in the code
by a new home_pos[] which includes the adjustment. We also have to
adjust the uses of [XYZ]_{MIN,MAX}_POS similarly - see below.
To allow axis_is_at_home to be written as a function taking an axis
index rather than a macro taking an axis letter, we provide
constant arrays in program memory containing the values of
[XYZ]_{MIN,MAX,HOME}_POS from the compiled-in configuration.
This is done with some helper macros to deal with the declaration
(XYZ_CONSTS_FROM_CONFIG) and definition of the inline function which
does the program memory access.
We also introduce the overloaded function read_pgm_any, whose
instances are produced with DEFINE_PGM_READ_ANY, which allows the
access functions to automatically produce the correct type.
The type- and pointer-massaging code in the access function boils
down, when compiled, to a simple program memory access.
A question arises: if the M206 offset is set, should this adjustment
to the home position shift or change the possible range of movement
permitted by the software endstops ?
The documentation in Configuration.h describes these limits as:
// Travel limits after homing
Since this is a file containing physical limits, and actual suggested
values for these configuration parameters appear to include a certain
amount of slop, I've taken the view that these should be regarded as
nominal physical distances from the limit switches, and that the
permissible travel should be unaffected by M206.
So for example with the (rather unrealistic)
#define X_HOME_DIR -1
#define X_MIN_POS -20
#define X_HOME_POS 0
#define X_MAX_POS 100
no matter the setting of M206 X, the machine would be permitted
to move from 20mm "beyond" the limit switch trigger point in
the negative X direction and 100mm away from the limit switch in
the positive X direction, for a total travel of 120mm.
With M206 X-10 that would be considered to correspond to X coordinates
-30 to +90. With M206 X+10 that would be considered to correspond to
X coordinates -10 to +110.
fixes #200 (in ErikZalm/Marlin).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
13 years ago | |
|---|---|---|
| .. | ||
| Gen7 | 13 years ago | |
| Sanguino | 13 years ago | |
| hardware/tools/avr/etc | 13 years ago | |
| COPYING | 14 years ago | |
| Configuration.h | 13 years ago | |
| Configuration_adv.h | 13 years ago | |
| EEPROMwrite.h | 13 years ago | |
| Makefile | 13 years ago | |
| Marlin.h | 13 years ago | |
| Marlin.pde | 13 years ago | |
| MarlinSerial.cpp | 13 years ago | |
| MarlinSerial.h | 13 years ago | |
| Sd2Card.cpp | 13 years ago | |
| Sd2Card.h | 13 years ago | |
| Sd2PinMap.h | 13 years ago | |
| SdBaseFile.cpp | 13 years ago | |
| SdBaseFile.h | 13 years ago | |
| SdFatConfig.h | 13 years ago | |
| SdFatStructs.h | 13 years ago | |
| SdFatUtil.cpp | 13 years ago | |
| SdFatUtil.h | 13 years ago | |
| SdFile.cpp | 13 years ago | |
| SdFile.h | 13 years ago | |
| SdInfo.h | 13 years ago | |
| SdVolume.cpp | 13 years ago | |
| SdVolume.h | 13 years ago | |
| cardreader.cpp | 13 years ago | |
| cardreader.h | 13 years ago | |
| createTemperatureLookup.py | 14 years ago | |
| create_speed_lookuptable.py | 13 years ago | |
| fastio.h | 13 years ago | |
| language.h | 13 years ago | |
| motion_control.cpp | 13 years ago | |
| motion_control.h | 13 years ago | |
| pins.h | 13 years ago | |
| planner.cpp | 13 years ago | |
| planner.h | 13 years ago | |
| speed_lookuptable.h | 13 years ago | |
| stepper.cpp | 13 years ago | |
| stepper.h | 13 years ago | |
| temperature.cpp | 13 years ago | |
| temperature.h | 13 years ago | |
| thermistortables.h | 13 years ago | |
| ultralcd.h | 13 years ago | |
| ultralcd.pde | 13 years ago | |
| watchdog.h | 13 years ago | |
| watchdog.pde | 13 years ago | |
| wiring.h | 13 years ago | |