summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Caruso <emanuele.caruso@gmail.com>2011-05-21 01:51:29 +0200
committerEmanuele Caruso <emanuele.caruso@gmail.com>2011-05-21 01:51:29 +0200
commita89f443eb2b635d67daaa01962561f452f7d8a80 (patch)
treea8aab7a31db1bea0a039471188a49a27a5bca459
parent181df1fe733aca5264c0f63425779c767b37e54e (diff)
Added options that allow to disable heating management during acceleration or during the whole move
-rw-r--r--Tonokip_Firmware/Tonokip_Firmware.pde16
-rw-r--r--Tonokip_Firmware/configuration.h6
2 files changed, 19 insertions, 3 deletions
diff --git a/Tonokip_Firmware/Tonokip_Firmware.pde b/Tonokip_Firmware/Tonokip_Firmware.pde
index bc65755..e708910 100644
--- a/Tonokip_Firmware/Tonokip_Firmware.pde
+++ b/Tonokip_Firmware/Tonokip_Firmware.pde
@@ -1090,9 +1090,19 @@ void linear_move(unsigned long axis_steps_remaining[]) // make linear move with
//move until no more steps remain
while(axis_steps_remaining[0] + axis_steps_remaining[1] + axis_steps_remaining[2] + axis_steps_remaining[3] > 0) {
- //If more that HEATER_CHECK_INTERVAL ms have passed since previous heating check, adjust temp
- manage_heater();
- manage_inactivity(2);
+ #ifdef DISABLE_CHECK_DURING_ACC
+ if(!accelerating && !decelerating) {
+ //If more that HEATER_CHECK_INTERVAL ms have passed since previous heating check, adjust temp
+ manage_heater();
+ }
+ #else
+ #ifdef DISABLE_CHECK_DURING_MOVE
+ {} //Do nothing
+ #else
+ //If more that HEATER_CHECK_INTERVAL ms have passed since previous heating check, adjust temp
+ manage_heater();
+ #endif
+ #endif
#ifdef RAMP_ACCELERATION
//If acceleration is enabled on this move and we are in the acceleration segment, calculate the current interval
if (acceleration_enabled && steps_done == 0) {
diff --git a/Tonokip_Firmware/configuration.h b/Tonokip_Firmware/configuration.h
index cea0740..55e9872 100644
--- a/Tonokip_Firmware/configuration.h
+++ b/Tonokip_Firmware/configuration.h
@@ -56,6 +56,12 @@ float min_constant_speed_units = 2; // the minimum units of an accelerated move
//How often should the heater check for new temp readings, in milliseconds
#define HEATER_CHECK_INTERVAL 50
#define BED_CHECK_INTERVAL 5000
+//Uncomment the following line to disable heat management during acceleration
+//#define DISABLE_CHECK_DURING_ACC
+#ifndef DISABLE_CHECK_DURING_ACC
+ //Uncomment the following line to disable heat management during the move
+ //#define DISABLE_CHECK_DURING_MOVE
+#endif
//Experimental temperature smoothing - only uncomment this if your temp readings are noisy
//#define SMOOTHING 1