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

Remove I2CPEM workspace offset

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-04 14:59:42 -05:00
parent 5fefa200ba
commit 64f077fd2a
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/I2CPositionEncoder.h
View File

@ -127,10 +127,7 @@
invert = false, invert = false,
ec = true; ec = true;
float axisOffset = 0; int32_t zeroOffset = 0,
int32_t axisOffsetTicks = 0,
zeroOffset = 0,
lastPosition = 0, lastPosition = 0,
position; position;
@ -168,7 +165,7 @@
} }
FORCE_INLINE float get_position_mm() { return mm_from_count(get_position()); } FORCE_INLINE float get_position_mm() { return mm_from_count(get_position()); }
FORCE_INLINE int32_t get_position() { return get_raw_count() - zeroOffset - axisOffsetTicks; } FORCE_INLINE int32_t get_position() { return get_raw_count() - zeroOffset; }
int32_t get_axis_error_steps(const bool report); int32_t get_axis_error_steps(const bool report);
float get_axis_error_mm(const bool report); float get_axis_error_mm(const bool report);
@ -219,16 +216,6 @@
FORCE_INLINE int get_stepper_ticks() { return stepperTicks; } FORCE_INLINE int get_stepper_ticks() { return stepperTicks; }
FORCE_INLINE void set_stepper_ticks(const int ticks) { stepperTicks = ticks; } FORCE_INLINE void set_stepper_ticks(const int ticks) { stepperTicks = ticks; }
FORCE_INLINE float get_axis_offset() { return axisOffset; }
FORCE_INLINE void set_axis_offset(const float newOffset) {
axisOffset = newOffset;
axisOffsetTicks = int32_t(axisOffset * get_encoder_ticks_mm());
}
FORCE_INLINE void set_current_position(const float newPositionMm) {
set_axis_offset(get_position_mm() - newPositionMm + axisOffset);
}
}; };
class I2CPositionEncodersMgr { class I2CPositionEncodersMgr {

5
Marlin/Marlin_main.cpp
View File

@ -6219,11 +6219,6 @@ inline void gcode_G92() {
#if HAS_POSITION_SHIFT #if HAS_POSITION_SHIFT
position_shift[i] += v - p; // Offset the coordinate space position_shift[i] += v - p; // Offset the coordinate space
update_software_endstops((AxisEnum)i); update_software_endstops((AxisEnum)i);
#if ENABLED(I2C_POSITION_ENCODERS)
I2CPEM.encoders[I2CPEM.idx_from_axis((AxisEnum)i)].set_axis_offset(position_shift[i]);
#endif
#endif #endif
} }
#endif #endif