diff --git a/g2core/config_app.cpp b/g2core/config_app.cpp index a5ddd85e..817409c7 100644 --- a/g2core/config_app.cpp +++ b/g2core/config_app.cpp @@ -1018,7 +1018,7 @@ const cfgItem_t cfgArray[] = { { "fxa","fxa4y",_fipc, 3, tx_print_nul, get_flt, set_flt, &cfg.fx_coords_a[3][1], 0 }, // Spindle functions - { "sp","spmo", _iip, 0, sp_print_spmo, sp_get_spmo, sp_set_spmo, nullptr, SPINDLE_MODE }, + { "sp","spmo", _i0, 0, sp_print_spmo, get_nul, set_nul, nullptr, 0 }, // keeping this key around, but it returns null and does nothing { "sp","spph", _bip, 0, sp_print_spph, sp_get_spph, sp_set_spph, nullptr, SPINDLE_PAUSE_ON_HOLD }, { "sp","spde", _fip, 2, sp_print_spde, sp_get_spde, sp_set_spde, nullptr, SPINDLE_SPINUP_DELAY }, { "sp","spsn", _fip, 2, sp_print_spsn, sp_get_spsn, sp_set_spsn, nullptr, SPINDLE_SPEED_MIN}, diff --git a/g2core/spindle.cpp b/g2core/spindle.cpp index 89496d8b..2b10bd53 100644 --- a/g2core/spindle.cpp +++ b/g2core/spindle.cpp @@ -528,9 +528,6 @@ void spindle_end_override(const float ramp_time) **** Spindle Settings ****************************************************************** ****************************************************************************************/ -stat_t sp_get_spmo(nvObj_t *nv) { return(get_integer(nv, spindle.mode)); } -stat_t sp_set_spmo(nvObj_t *nv) { return(set_integer(nv, (uint8_t &)spindle.mode, SPINDLE_DISABLED, SPINDLE_MODE_MAX)); } - stat_t sp_get_spep(nvObj_t *nv) { return(get_integer(nv, spindle.enable_polarity)); } stat_t sp_set_spep(nvObj_t *nv) { stat_t status = set_integer(nv, (uint8_t &)spindle.enable_polarity, 0, 1); diff --git a/g2core/spindle.h b/g2core/spindle.h index 9b963d01..e198ee36 100644 --- a/g2core/spindle.h +++ b/g2core/spindle.h @@ -80,7 +80,6 @@ typedef enum { // electronic speed controller for some spindles typedef struct spSpindle { - spMode mode; // {spm:} spindle operating mode spControl state; // {spc:} OFF, ON, PAUSE, RESUME, WAIT spControl direction; // 1=CW, 2=CCW (subset of above state) @@ -121,8 +120,6 @@ stat_t spindle_override_control(const float P_word, const bool P_flag); // M51 void spindle_start_override(const float ramp_time, const float override_factor); void spindle_end_override(const float ramp_time); -stat_t sp_get_spmo(nvObj_t *nv); -stat_t sp_set_spmo(nvObj_t *nv); stat_t sp_get_spep(nvObj_t *nv); stat_t sp_set_spep(nvObj_t *nv); stat_t sp_get_spdp(nvObj_t *nv);