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

Merge pull request #7816 from thinkyhead/bf2_inhibit_option

Browse Source 
[2.0.x] Option to disallow motion before homing
This commit is contained in:
Scott Lahteine 2017-10-01 22:52:54 -05:00 committed by GitHub
commit f3677e077c
44 changed files with 127 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/default/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View File

@ -780,6 +780,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Anet/A6/Configuration.h
View File

@ -844,6 +844,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Anet/A8/Configuration.h
View File

@ -766,6 +766,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View File

@ -751,6 +751,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View File

@ -751,6 +751,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Cartesio/Configuration.h
View File

@ -759,6 +759,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View File

@ -770,6 +770,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 5 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Felix/Configuration.h
View File

@ -742,6 +742,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Felix/DUAL/Configuration.h
View File

@ -742,6 +742,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View File

@ -775,6 +775,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View File

@ -764,6 +764,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Malyan/M150/Configuration.h
View File

@ -784,6 +784,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/RigidBot/Configuration.h
View File

@ -758,6 +758,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/SCARA/Configuration.h
View File

@ -772,6 +772,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/TinyBoy2/Configuration.h
View File

@ -811,6 +811,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Velleman/K8400/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View File

@ -760,6 +760,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/delta/generic/Configuration.h
View File

@ -871,6 +871,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View File

@ -874,6 +874,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 15 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View File

@ -874,6 +874,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View File

@ -883,6 +883,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/makibox/Configuration.h
View File

@ -763,6 +763,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View File

@ -746,6 +746,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View File

@ -755,6 +755,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/config/examples/wt150/Configuration.h
View File

@ -765,6 +765,8 @@
// @section homing
//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
// Be sure you have this distance over your Z_MAX_POS in case.

2
Marlin/src/gcode/bedlevel/G42.cpp
View File

@ -33,7 +33,7 @@
* G42: Move X & Y axes to mesh coordinates (I & J)
*/
void GcodeSuite::G42() {
if (IsRunning()) {
if (MOTION_CONDITIONS) {
const bool hasI = parser.seenval('I');
const int8_t ix = hasI ? parser.value_int() : 0;
const bool hasJ = parser.seenval('J');

2
Marlin/src/gcode/motion/G0_G1.cpp
View File

@ -41,7 +41,7 @@ void GcodeSuite::G0_G1(
bool fast_move/*=false*/
#endif
) {
if (IsRunning()) {
if (MOTION_CONDITIONS) {
get_destination_from_command(); // For X Y Z E F
#if ENABLED(FWRETRACT)

2
Marlin/src/gcode/motion/G2_G3.cpp
View File

@ -211,7 +211,7 @@ void plan_arc(
* G3 X20 Y12 R14 ; CCW circle with r=14 ending at X20 Y12
*/
void GcodeSuite::G2_G3(const bool clockwise) {
if (IsRunning()) {
if (MOTION_CONDITIONS) {
#if ENABLED(SF_ARC_FIX)
const bool relative_mode_backup = relative_mode;

2
Marlin/src/gcode/motion/G5.cpp
View File

@ -50,7 +50,7 @@ void plan_cubic_move(const float offset[4]) {
* G5: Cubic B-spline
*/
void GcodeSuite::G5() {
if (IsRunning()) {
if (MOTION_CONDITIONS) {
#if ENABLED(CNC_WORKSPACE_PLANES)
if (workspace_plane != PLANE_XY) {

2
Marlin/src/inc/SPI.h
View File

@ -1,7 +1,7 @@
#include <stdint.h>
#if !defined(SPI_FULL_SPEED)
#ifndef SPI_FULL_SPEED
/**
* SPI speed where 0 <= index <= 6

2
Marlin/src/inc/SanityCheck.h
View File

@ -632,7 +632,7 @@ static_assert(1 >= 0
/**
* Make sure Z raise values are set
*/
#if !defined(Z_CLEARANCE_DEPLOY_PROBE)
#ifndef Z_CLEARANCE_DEPLOY_PROBE
#error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration."
#elif !defined(Z_CLEARANCE_BETWEEN_PROBES)
#error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration."

10
Marlin/src/lcd/ultralcd.cpp
View File

@ -2928,8 +2928,12 @@ void kill_screen(const char* lcd_msg) {
*
*/
#if IS_KINEMATIC
#if IS_KINEMATIC || ENABLED(NO_MOTION_BEFORE_HOMING)
#define _MOVE_XYZ_ALLOWED (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
#else
#define _MOVE_XYZ_ALLOWED true
#endif
#if ENABLED(DELTA)
#define _MOVE_XY_ALLOWED (current_position[Z_AXIS] <= delta_clip_start_height)
void lcd_lower_z_to_clip_height() {
@ -2939,10 +2943,6 @@ void kill_screen(const char* lcd_msg) {
#else
#define _MOVE_XY_ALLOWED true
#endif
#else
#define _MOVE_XYZ_ALLOWED true
#define _MOVE_XY_ALLOWED true
#endif
void lcd_move_menu() {
START_MENU();

6
Marlin/src/module/motion.cpp
View File

@ -51,7 +51,7 @@
#include "../feature/bedlevel/bedlevel.h"
#endif
#if NEED_UNHOMED_ERR && ENABLED(ULTRA_LCD)
#if HAS_AXIS_UNHOMED_ERR && ENABLED(ULTRA_LCD)
#include "../lcd/ultralcd.h"
#endif
@ -820,7 +820,7 @@ void prepare_move_to_destination() {
set_current_to_destination();
}
#if NEED_UNHOMED_ERR
#if HAS_AXIS_UNHOMED_ERR
bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
#if ENABLED(HOME_AFTER_DEACTIVATE)
@ -848,7 +848,7 @@ void prepare_move_to_destination() {
return false;
}
#endif
#endif // HAS_AXIS_UNHOMED_ERR
/**
* The homing feedrate may vary

18
Marlin/src/module/motion.h
View File

@ -167,12 +167,26 @@ void clean_up_after_endstop_or_probe_move();
// Homing
//
#define NEED_UNHOMED_ERR (HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION))
#define HAS_AXIS_UNHOMED_ERR ( \
ENABLED(Z_PROBE_ALLEN_KEY) \
|| ENABLED(Z_PROBE_SLED) \
|| HAS_PROBING_PROCEDURE \
|| HOTENDS > 1 \
|| ENABLED(NOZZLE_CLEAN_FEATURE) \
|| ENABLED(NOZZLE_PARK_FEATURE) \
|| (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)) \
) || ENABLED(NO_MOTION_BEFORE_HOMING)
#if NEED_UNHOMED_ERR
#if HAS_AXIS_UNHOMED_ERR
bool axis_unhomed_error(const bool x=true, const bool y=true, const bool z=true);
#endif
#if ENABLED(NO_MOTION_BEFORE_HOMING)
#define MOTION_CONDITIONS (IsRunning() && !axis_unhomed_error())
#else
#define MOTION_CONDITIONS IsRunning()
#endif
void set_axis_is_at_home(const AxisEnum axis);
void homeaxis(const AxisEnum axis);

2
Marlin/src/module/probe.cpp
View File

@ -276,7 +276,7 @@ inline void do_probe_raise(const float z_raise) {
#endif
}
#endif
#endif // Z_PROBE_ALLEN_KEY
#if ENABLED(PROBING_FANS_OFF)

4
Marlin/src/module/stepper.cpp
View File

@ -323,7 +323,7 @@ void Stepper::isr() {
HAL_TIMER_TYPE ocr_val;
#if defined(CPU_32_BIT)
#ifdef CPU_32_BIT
#define ENDSTOP_NOMINAL_OCR_VAL 1500 * HAL_TICKS_PER_US // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
#define OCR_VAL_TOLERANCE 500 * HAL_TICKS_PER_US // First max delay is 2.0ms, last min delay is 0.5ms, all others 1.5ms
#else
@ -335,7 +335,7 @@ void Stepper::isr() {
// Disable Timer0 ISRs and enable global ISR again to capture UART events (incoming chars)
DISABLE_TEMPERATURE_INTERRUPT(); // Temperature ISR
DISABLE_STEPPER_DRIVER_INTERRUPT();
#if !defined(CPU_32_BIT)
#ifndef CPU_32_BIT
sei();
#endif
#endif

2
Marlin/src/pins/pins_ANET_10.h
View File

@ -88,7 +88,7 @@
* Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
*/
#if !defined(__AVR_ATmega1284P__)
#ifndef __AVR_ATmega1284P__
#error "Oops! Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif

17
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

@ -66,7 +66,7 @@
#define Y_MAX_PIN 15 //10k pullup to 3.3V, 1K series
#define Z_MIN_PIN 18 //10k pullup to 3.3V, 1K series
#define Z_MAX_PIN 19 //10k pullup to 3.3V, 1K series
//#define Z_probe_pin 1 // AUX-1
//#define Z_PROBE_PIN 1 // AUX-1
//
@ -267,23 +267,18 @@
//#define SHIFT_EN 41 // J5-4 & AUX-4
#endif
#if ENABLED(SDSUPPORT)
#define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
// When going up/down directory levels the SD card is
// accessed but the garbage/lines are removed when the
// LCD updates
// SD Card Sorting options
#if ENABLED(SDCARD_SORT_ALPHA)
#define SDSORT_LIMIT 255 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define SDSORT_LIMIT 256 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
#define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
#define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
#endif
#endif
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
// #define LCD_SCREEN_ROT_180
@ -307,7 +302,7 @@
#undef LCD_PINS_D5 //59 // J3-8 & AUX-2
#define DOGLCD_A0 59 // J3-8 & AUX-2
#undef LCD_PINS_D6 //63 // J5-3 & AUX-2
#undef LCD_PINS_D7 //6 // (SERVO1) J5-1 & SERVO connector
#undef LCD_PINS_D7 // 6 // (SERVO1) J5-1 & SERVO connector
#define DOGLCD_SCK SCK_PIN
#define DOGLCD_MOSI MOSI_PIN
@ -335,9 +330,9 @@
// Ethernet pins
//
#ifndef ULTIPANEL
#define ENET_MDIO 71 // J12-4
#define ENET_RX_ER 73 // J12-6
#define ENET_RXD1 75 // J12-8
#define ENET_MDIO 71 // J12-4
#define ENET_RX_ER 73 // J12-6
#define ENET_RXD1 75 // J12-8
#endif
#define ENET_MOC 70 // J12-3
#define REF_CLK 72 // J12-5

10
frameworks/CMSIS/LPC1768/include/lpc_types.h
View File

@ -134,7 +134,7 @@ typedef int32_t(*PFI)();
/* NULL pointer */
#ifndef NULL
#define NULL ((void*) 0)
#define NULL ((void*) 0)
#endif
/* Number of elements in an array */
@ -145,11 +145,11 @@ typedef int32_t(*PFI)();
/* External data/function define */
#define EXTERN extern
#if !defined(MAX)
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
#if !defined(MIN)
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
/**