From 544caa8b2f018e8b4068c1035e9eea67d0f51a00 Mon Sep 17 00:00:00 2001 From: Alden Hart Date: Thu, 9 Feb 2017 09:35:01 -0500 Subject: [PATCH] setting.h updated --- g2core/config_app.cpp | 1 - g2core/settings/settings_default.h | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/g2core/config_app.cpp b/g2core/config_app.cpp index 1be4d7bc..dff499ae 100644 --- a/g2core/config_app.cpp +++ b/g2core/config_app.cpp @@ -658,7 +658,6 @@ const cfgItem_t cfgArray[] = { { "sp","spmo", _fip, 0, sp_print_spmo, sp_get_spmo, sp_set_spmo, (float *)&cs.null, SPINDLE_MODE }, { "sp","spph", _fip, 0, sp_print_spph, sp_get_spph, sp_set_spph, (float *)&cs.null, SPINDLE_PAUSE_ON_HOLD }, { "sp","spde", _fip, 2, sp_print_spde, sp_get_spde, sp_set_spde, (float *)&cs.null, SPINDLE_SPINUP_DELAY }, - //{ "sp","spdn", _fip, 2, sp_print_spdn, sp_get_spdn, sp_set_spdn, (float *)&cs.null, SPINDLE_SPINDOWN_DELAY }, { "sp","spsn", _fip, 2, sp_print_spsn, sp_get_spsn, sp_set_spsn, (float *)&cs.null, SPINDLE_SPEED_MIN}, { "sp","spsm", _fip, 2, sp_print_spsm, sp_get_spsm, sp_set_spsm, (float *)&cs.null, SPINDLE_SPEED_MAX}, { "sp","spep", _fip, 0, sp_print_spep, sp_get_spep, sp_set_spep, (float *)&cs.null, SPINDLE_ENABLE_POLARITY }, diff --git a/g2core/settings/settings_default.h b/g2core/settings/settings_default.h index 5806a35d..c33132e7 100644 --- a/g2core/settings/settings_default.h +++ b/g2core/settings/settings_default.h @@ -101,10 +101,6 @@ #define SPINDLE_SPINUP_DELAY 0 // {spde: #endif -#ifndef SPINDLE_SPINDOWN_DELAY -#define SPINDLE_SPINDOWN_DELAY 0 // {spdn: -#endif - #ifndef SPINDLE_DWELL_MAX #define SPINDLE_DWELL_MAX 10000000.0 // maximum allowable dwell time. May be overridden in settings files #endif @@ -129,6 +125,10 @@ #define COOLANT_PAUSE_ON_HOLD true // {coph: #endif +#ifndef FEEDHOLD_Z_LIFT +#define FEEDHOLD_Z_LIFT 0 // {zl: mm to lift Z on feedhold +#endif + #ifndef PROBE_REPORT_ENABLE #define PROBE_REPORT_ENABLE true // {prbr: #endif