summaryrefslogtreecommitdiff
path: root/Tonokip_Firmware
diff options
context:
space:
mode:
Diffstat (limited to 'Tonokip_Firmware')
-rw-r--r--Tonokip_Firmware/Tonokip_Firmware.pde11
-rw-r--r--Tonokip_Firmware/configuration.h13
2 files changed, 17 insertions, 7 deletions
diff --git a/Tonokip_Firmware/Tonokip_Firmware.pde b/Tonokip_Firmware/Tonokip_Firmware.pde
index bf82ae3..ced29d9 100644
--- a/Tonokip_Firmware/Tonokip_Firmware.pde
+++ b/Tonokip_Firmware/Tonokip_Firmware.pde
@@ -277,6 +277,7 @@ void setup()
initsd();
#endif
+
}
@@ -1255,6 +1256,10 @@ inline void manage_heater()
previous_millis_heater = millis();
#ifdef HEATER_USES_THERMISTOR
current_raw = analogRead(TEMP_0_PIN);
+ #ifdef DEBUG_HEAT_MGMT
+ log_int("_HEAT_MGMT - analogRead(TEMP_0_PIN)", current_raw);
+ log_int("_HEAT_MGMT - NUMTEMPS", NUMTEMPS);
+ #endif
// When using thermistor, when the heater is colder than targer temp, we get a higher analog reading than target,
// this switches it up so that the reading appears lower than target for the control logic.
current_raw = 1023 - current_raw;
@@ -1317,7 +1322,11 @@ inline void manage_heater()
#ifdef BED_USES_THERMISTOR
- current_bed_raw = analogRead(TEMP_1_PIN);
+ current_bed_raw = analogRead(TEMP_1_PIN);
+ #ifdef DEBUG_HEAT_MGMT
+ log_int("_HEAT_MGMT - analogRead(TEMP_1_PIN)", current_bed_raw);
+ log_int("_HEAT_MGMT - BNUMTEMPS", BNUMTEMPS);
+ #endif
// If using thermistor, when the heater is colder than targer temp, we get a higher analog reading than target,
// this switches it up so that the reading appears lower than target for the control logic.
diff --git a/Tonokip_Firmware/configuration.h b/Tonokip_Firmware/configuration.h
index f2d23f0..d77b974 100644
--- a/Tonokip_Firmware/configuration.h
+++ b/Tonokip_Firmware/configuration.h
@@ -28,8 +28,8 @@
#ifdef RAMP_ACCELERATION
//X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
float max_start_speed_units_per_second[] = {25.0,25.0,0.2,10.0};
-long max_acceleration_units_per_sq_second[] = {3000,3000,50,10000}; // X, Y, Z and E max acceleration in mm/s^2 for printing moves or retracts
-long max_travel_acceleration_units_per_sq_second[] = {1500,1500,50}; // X, Y, Z max acceleration in mm/s^2 for travel moves
+long max_acceleration_units_per_sq_second[] = {1000,1000,50,10000}; // X, Y, Z and E max acceleration in mm/s^2 for printing moves or retracts
+long max_travel_acceleration_units_per_sq_second[] = {500,500,50}; // X, Y, Z max acceleration in mm/s^2 for travel moves
#endif
#ifdef EXP_ACCELERATION
float full_velocity_units = 10; // the units between minimum and G1 move feedrate
@@ -160,10 +160,11 @@ const int Z_MAX_LENGTH = 100;
//Uncomment the following line to enable debugging. You can better control debugging below the following line
//#define DEBUG
#ifdef DEBUG
- #define DEBUG_PREPARE_MOVE //Enable this to debug prepare_move() function
- #define DEBUG_BRESENHAM //Enable this to debug the Bresenham algorithm
- #define DEBUG_RAMP_ACCELERATION //Enable this to debug all constant acceleration info
- #define DEBUG_MOVE_TIME //Enable this to time each move and print the result
+ //#define DEBUG_PREPARE_MOVE //Enable this to debug prepare_move() function
+ //#define DEBUG_BRESENHAM //Enable this to debug the Bresenham algorithm
+ //#define DEBUG_RAMP_ACCELERATION //Enable this to debug all constant acceleration info
+ //#define DEBUG_MOVE_TIME //Enable this to time each move and print the result
+ //#define DEBUG_HEAT_MGMT
#endif
#endif