Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 21:38:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

setting.h updated

Browse Source
This commit is contained in:
Alden Hart
2017-02-09 09:35:01 -05:00
parent 7c34374c65
commit 544caa8b2f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/config_app.cpp
-1
View File
@@ -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 },
g2core/settings/settings_default.h
+4 -4
View File
@@ -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