From f944abaf3ee707f17f272e613389356e0abfe88e Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Wed, 30 Oct 2019 14:14:01 -0500 Subject: [PATCH] Fix SPINDLE_DWELL_TIME to SPINDLE_SPINUP_DELAY in all settings --- g2core/settings/settings_Printrbot_Play.h | 2 +- g2core/settings/settings_Printrbot_Plus.h | 2 +- g2core/settings/settings_Printrbot_Simple_1403.h | 2 +- g2core/settings/settings_Printrbot_Simple_1608.h | 2 +- g2core/settings/settings_Ultimaker.h | 2 +- g2core/settings/settings_Ultimaker_2_Plus.h | 2 +- g2core/settings/settings_axidraw_v3.h | 2 +- g2core/settings/settings_drosmm_v1.h | 2 +- g2core/settings/settings_eggbot.h | 2 +- g2core/settings/settings_ender.h | 2 +- g2core/settings/settings_fourcable.h | 2 +- g2core/settings/settings_minimill.h | 2 +- g2core/settings/settings_othermill.h | 2 +- g2core/settings/settings_othermill_test.h | 4 ++-- g2core/settings/settings_probotixV90.h | 2 +- g2core/settings/settings_shapeoko2.h | 2 +- g2core/settings/settings_shapeoko2dualY.h | 2 +- g2core/settings/settings_shapeoko375_Dual.h | 2 +- g2core/settings/settings_shopbot_sbv300.h | 2 +- g2core/settings/settings_shopbot_test.h | 2 +- g2core/settings/settings_smw3d_r7.h | 2 +- g2core/settings/settings_synthetos_pendulum_v2.h | 2 +- g2core/settings/settings_test.h | 2 +- g2core/settings/settings_watercolorbot_v2.h | 2 +- g2core/settings/settings_xcarve_extended.h | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/g2core/settings/settings_Printrbot_Play.h b/g2core/settings/settings_Printrbot_Play.h index 0ddb44ad..5568f1bd 100644 --- a/g2core/settings/settings_Printrbot_Play.h +++ b/g2core/settings/settings_Printrbot_Play.h @@ -51,7 +51,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_Printrbot_Plus.h b/g2core/settings/settings_Printrbot_Plus.h index 4b3ff2c1..c7a43915 100644 --- a/g2core/settings/settings_Printrbot_Plus.h +++ b/g2core/settings/settings_Printrbot_Plus.h @@ -45,7 +45,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_Printrbot_Simple_1403.h b/g2core/settings/settings_Printrbot_Simple_1403.h index ce2f6cc0..77e6960d 100644 --- a/g2core/settings/settings_Printrbot_Simple_1403.h +++ b/g2core/settings/settings_Printrbot_Simple_1403.h @@ -45,7 +45,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_Printrbot_Simple_1608.h b/g2core/settings/settings_Printrbot_Simple_1608.h index 444971ae..ec324c45 100644 --- a/g2core/settings/settings_Printrbot_Simple_1608.h +++ b/g2core/settings/settings_Printrbot_Simple_1608.h @@ -49,7 +49,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_Ultimaker.h b/g2core/settings/settings_Ultimaker.h index 71604832..0ea1048b 100644 --- a/g2core/settings/settings_Ultimaker.h +++ b/g2core/settings/settings_Ultimaker.h @@ -49,7 +49,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_Ultimaker_2_Plus.h b/g2core/settings/settings_Ultimaker_2_Plus.h index 6d89b6a5..2afda516 100644 --- a/g2core/settings/settings_Ultimaker_2_Plus.h +++ b/g2core/settings/settings_Ultimaker_2_Plus.h @@ -51,7 +51,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_axidraw_v3.h b/g2core/settings/settings_axidraw_v3.h index f4795dd9..82066c28 100755 --- a/g2core/settings/settings_axidraw_v3.h +++ b/g2core/settings/settings_axidraw_v3.h @@ -45,7 +45,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_drosmm_v1.h b/g2core/settings/settings_drosmm_v1.h index a9445831..ea2f5ee3 100755 --- a/g2core/settings/settings_drosmm_v1.h +++ b/g2core/settings/settings_drosmm_v1.h @@ -45,7 +45,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_eggbot.h b/g2core/settings/settings_eggbot.h index 25303fdc..b091082d 100755 --- a/g2core/settings/settings_eggbot.h +++ b/g2core/settings/settings_eggbot.h @@ -43,7 +43,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_ender.h b/g2core/settings/settings_ender.h index 442236cf..3424e44c 100644 --- a/g2core/settings/settings_ender.h +++ b/g2core/settings/settings_ender.h @@ -51,7 +51,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_fourcable.h b/g2core/settings/settings_fourcable.h index 00ecc994..01e27832 100644 --- a/g2core/settings/settings_fourcable.h +++ b/g2core/settings/settings_fourcable.h @@ -48,7 +48,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_minimill.h b/g2core/settings/settings_minimill.h index d4d673b2..c269c8b7 100644 --- a/g2core/settings/settings_minimill.h +++ b/g2core/settings/settings_minimill.h @@ -43,7 +43,7 @@ #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true #define SPINDLE_SPINUP_DELAY 2.0 -#define SPINDLE_DWELL_TIME 1.5 // after unpausing and turning the spindle on, dwell for 1.5s +#define SPINDLE_SPINUP_DELAY 1.5 // after unpausing and turning the spindle on, dwell for 1.5s #define ESC_BOOT_TIME 5000 // how long the ESC takes to boot, in milliseconds #define ESC_LOCKOUT_TIME 900 // how long the interlock needs to be engaged before killing power... actually 1s, but be conservative diff --git a/g2core/settings/settings_othermill.h b/g2core/settings/settings_othermill.h index e7a2d9e5..a0bdf9ed 100644 --- a/g2core/settings/settings_othermill.h +++ b/g2core/settings/settings_othermill.h @@ -45,7 +45,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.5 // after unpausing and turning the spindle on, dwell for 1.5s +#define SPINDLE_SPINUP_DELAY 1.5 // after unpausing and turning the spindle on, dwell for 1.5s #define ESC_BOOT_TIME 5000 // how long the ESC takes to boot, in milliseconds #define ESC_LOCKOUT_TIME 900 // how long the interlock needs to be engaged before killing power... actually 1s, but be conservative diff --git a/g2core/settings/settings_othermill_test.h b/g2core/settings/settings_othermill_test.h index 8c66b58a..811e4b87 100644 --- a/g2core/settings/settings_othermill_test.h +++ b/g2core/settings/settings_othermill_test.h @@ -42,7 +42,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.5 // after unpausing and turning the spindle on, dwell for 1.5s +#define SPINDLE_SPINUP_DELAY 1.5 // after unpausing and turning the spindle on, dwell for 1.5s #define ESC_BOOT_TIME 5000 // how long the ESC takes to boot, in milliseconds #define ESC_LOCKOUT_TIME 900 // how long the interlock needs to be engaged before killing power... actually 1s, but be conservative @@ -332,4 +332,4 @@ #define P1_MAPPING_CUBIC_X2 -7.2900167282605129e-009 #define P1_MAPPING_CUBIC_X1 8.5854646785876479e-005 #define P1_MAPPING_CUBIC_X0 -2.1301489219406905e-001 -*/ \ No newline at end of file +*/ diff --git a/g2core/settings/settings_probotixV90.h b/g2core/settings/settings_probotixV90.h index 30ff9688..62de9256 100644 --- a/g2core/settings/settings_probotixV90.h +++ b/g2core/settings/settings_probotixV90.h @@ -45,7 +45,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.5 // after unpausing and turning the spindle on, dwell for 1.5s +#define SPINDLE_SPINUP_DELAY 1.5 // after unpausing and turning the spindle on, dwell for 1.5s //#define ESC_BOOT_TIME 5000 // how long the ESC takes to boot, in milliseconds //#define ESC_LOCKOUT_TIME 900 // how long the interlock needs to be engaged before killing power... actually 1s, but be conservative diff --git a/g2core/settings/settings_shapeoko2.h b/g2core/settings/settings_shapeoko2.h index 1590195c..11e00258 100644 --- a/g2core/settings/settings_shapeoko2.h +++ b/g2core/settings/settings_shapeoko2.h @@ -46,7 +46,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_shapeoko2dualY.h b/g2core/settings/settings_shapeoko2dualY.h index 3f518c4c..30e101a6 100644 --- a/g2core/settings/settings_shapeoko2dualY.h +++ b/g2core/settings/settings_shapeoko2dualY.h @@ -46,7 +46,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_shapeoko375_Dual.h b/g2core/settings/settings_shapeoko375_Dual.h index 7a5ac7dc..4723e77e 100644 --- a/g2core/settings/settings_shapeoko375_Dual.h +++ b/g2core/settings/settings_shapeoko375_Dual.h @@ -54,7 +54,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_shopbot_sbv300.h b/g2core/settings/settings_shopbot_sbv300.h index ff6f5257..ca72db54 100644 --- a/g2core/settings/settings_shopbot_sbv300.h +++ b/g2core/settings/settings_shopbot_sbv300.h @@ -48,7 +48,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_shopbot_test.h b/g2core/settings/settings_shopbot_test.h index 95630c53..e66f021a 100644 --- a/g2core/settings/settings_shopbot_test.h +++ b/g2core/settings/settings_shopbot_test.h @@ -49,7 +49,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_smw3d_r7.h b/g2core/settings/settings_smw3d_r7.h index 6840275f..a39b700f 100644 --- a/g2core/settings/settings_smw3d_r7.h +++ b/g2core/settings/settings_smw3d_r7.h @@ -46,7 +46,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_synthetos_pendulum_v2.h b/g2core/settings/settings_synthetos_pendulum_v2.h index d5a77e6a..036a299b 100644 --- a/g2core/settings/settings_synthetos_pendulum_v2.h +++ b/g2core/settings/settings_synthetos_pendulum_v2.h @@ -46,7 +46,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_test.h b/g2core/settings/settings_test.h index f7f436e6..cc114427 100644 --- a/g2core/settings/settings_test.h +++ b/g2core/settings/settings_test.h @@ -42,7 +42,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_watercolorbot_v2.h b/g2core/settings/settings_watercolorbot_v2.h index d9821f4d..f1e19f9b 100755 --- a/g2core/settings/settings_watercolorbot_v2.h +++ b/g2core/settings/settings_watercolorbot_v2.h @@ -43,7 +43,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high diff --git a/g2core/settings/settings_xcarve_extended.h b/g2core/settings/settings_xcarve_extended.h index f61822be..eaf0eb91 100644 --- a/g2core/settings/settings_xcarve_extended.h +++ b/g2core/settings/settings_xcarve_extended.h @@ -54,7 +54,7 @@ #define SPINDLE_ENABLE_POLARITY 1 // 0=active low, 1=active high #define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high #define SPINDLE_PAUSE_ON_HOLD true -#define SPINDLE_DWELL_TIME 1.0 +#define SPINDLE_SPINUP_DELAY 1.0 #define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high #define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high