From 751785fc97475ca35f54e776bc8e6e4348d1aaa3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 10 Mar 2018 21:40:45 -0600
Subject: [PATCH] Followup to recent patches
- `M666` is static, not inline
- Disambiguate some stepper macros
---
.travis.yml | 4 +--
Marlin/src/gcode/calibrate/M666.cpp | 2 +-
Marlin/src/gcode/temperature/M105.cpp | 2 +-
Marlin/src/module/stepper.cpp | 39 ++++++++++++++-------------
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 54852855c5..9313b9fdb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -429,11 +429,11 @@ script:
- pins_set RAMPS X_MAX_PIN -1
- opt_add_adv Z2_MAX_PIN 2
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
-
+
#############################
# DUE default config test
#############################
-
+
- export TEST_PLATFORM="-e DUE"
- restore_configs
- opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index a8edb793ea..1cad2d0181 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -67,7 +67,7 @@
* M666: Set Dual Endstops offsets for X, Y, and/or Z.
* With no parameters report current offsets.
*/
- inline void GcodeSuite::M666() {
+ void GcodeSuite::M666() {
bool report = true;
#if ENABLED(X_DUAL_ENDSTOPS)
if (parser.seen('X')) {
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temperature/M105.cpp
index 2c569e2888..4216c417e7 100644
--- a/Marlin/src/gcode/temperature/M105.cpp
+++ b/Marlin/src/gcode/temperature/M105.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M105() {
port
#endif
);
- #else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED
+ #else // !HAS_TEMP_SENSOR
SERIAL_ERROR_START_P(port);
SERIAL_ERRORLNPGM_P(port, MSG_ERR_NO_THERMISTORS);
#endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b5f69e5b3f..30ae0f4f39 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -157,20 +157,20 @@ volatile long Stepper::endstops_trigsteps[XYZ];
#define LOCKED_X2_MOTOR locked_x2_motor
#define LOCKED_Y2_MOTOR locked_y2_motor
#define LOCKED_Z2_MOTOR locked_z2_motor
- #define DUAL_ENDSTOP_APPLY_STEP(AXIS,v) \
- if (performing_homing) { \
- if (AXIS##_HOME_DIR < 0) { \
- if (!(TEST(endstops.old_endstop_bits, AXIS##_MIN) && (count_direction[AXIS##_AXIS] < 0)) && !LOCKED_##AXIS##_MOTOR) AXIS##_STEP_WRITE(v); \
- if (!(TEST(endstops.old_endstop_bits, AXIS##2_MIN) && (count_direction[AXIS##_AXIS] < 0)) && !LOCKED_##AXIS##2_MOTOR) AXIS##2_STEP_WRITE(v); \
- } \
- else { \
- if (!(TEST(endstops.old_endstop_bits, AXIS##_MAX) && (count_direction[AXIS##_AXIS] > 0)) && !LOCKED_##AXIS##_MOTOR) AXIS##_STEP_WRITE(v); \
- if (!(TEST(endstops.old_endstop_bits, AXIS##2_MAX) && (count_direction[AXIS##_AXIS] > 0)) && !LOCKED_##AXIS##2_MOTOR) AXIS##2_STEP_WRITE(v); \
- } \
- } \
- else { \
- AXIS##_STEP_WRITE(v); \
- AXIS##2_STEP_WRITE(v); \
+ #define DUAL_ENDSTOP_APPLY_STEP(AXIS,v) \
+ if (performing_homing) { \
+ if (AXIS##_HOME_DIR < 0) { \
+ if (!(TEST(endstops.old_endstop_bits, AXIS##_MIN) && count_direction[AXIS##_AXIS] < 0) && !LOCKED_##AXIS##_MOTOR) AXIS##_STEP_WRITE(v); \
+ if (!(TEST(endstops.old_endstop_bits, AXIS##2_MIN) && count_direction[AXIS##_AXIS] < 0) && !LOCKED_##AXIS##2_MOTOR) AXIS##2_STEP_WRITE(v); \
+ } \
+ else { \
+ if (!(TEST(endstops.old_endstop_bits, AXIS##_MAX) && count_direction[AXIS##_AXIS] > 0) && !LOCKED_##AXIS##_MOTOR) AXIS##_STEP_WRITE(v); \
+ if (!(TEST(endstops.old_endstop_bits, AXIS##2_MAX) && count_direction[AXIS##_AXIS] > 0) && !LOCKED_##AXIS##2_MOTOR) AXIS##2_STEP_WRITE(v); \
+ } \
+ } \
+ else { \
+ AXIS##_STEP_WRITE(v); \
+ AXIS##2_STEP_WRITE(v); \
}
#endif
@@ -231,8 +231,6 @@ volatile long Stepper::endstops_trigsteps[XYZ];
#define E_APPLY_STEP(v,Q) E_STEP_WRITE(v)
#endif
-
-
/**
* __________________________
* /| |\ _________________ ^
@@ -452,13 +450,16 @@ void Stepper::isr() {
// Advance the Bresenham counter; start a pulse if the axis needs a step
#define PULSE_START(AXIS) do{ \
_COUNTER(AXIS) += current_block->steps[_AXIS(AXIS)]; \
- if (_COUNTER(AXIS) > 0) _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), 0); }while(0)
+ if (_COUNTER(AXIS) > 0) { _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), 0); } \
+ }while(0)
// Advance the Bresenham counter; start a pulse if the axis needs a step
- #define STEP_TICK(AXIS) \
+ #define STEP_TICK(AXIS) do { \
if (_COUNTER(AXIS) > 0) { \
_COUNTER(AXIS) -= current_block->step_event_count; \
- count_position[_AXIS(AXIS)] += count_direction[_AXIS(AXIS)]; }
+ count_position[_AXIS(AXIS)] += count_direction[_AXIS(AXIS)]; \
+ } \
+ }while(0)
// Stop an active pulse, if any
#define PULSE_STOP(AXIS) _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS), 0)
--
GitLab