From 124a3e6da8514358872763a7ce672cf2fb4c98f5 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 11 Dec 2017 16:17:36 +0100 Subject: [PATCH] Stealth mode limits + END_FILE_SECTION=10000 --- Firmware/Configuration_prusa.h | 10 +++++----- Firmware/planner.cpp | 11 ++++------- Firmware/ultralcd.cpp | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h index 911991a4..bbebe469 100644 --- a/Firmware/Configuration_prusa.h +++ b/Firmware/Configuration_prusa.h @@ -75,14 +75,14 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) //Silent mode limits -#define SILENT_MAX_ACCEL_X 800 // X-axis max acceleration in silent mode in mm/s^2 -#define SILENT_MAX_ACCEL_Y 800 // Y-axis max axxeleration in silent mode in mm/s^2 +#define SILENT_MAX_ACCEL_X 900 // X-axis max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_ACCEL_Y 900 // Y-axis max axxeleration in silent mode in mm/s^2 #define SILENT_MAX_ACCEL_X_ST (100*SILENT_MAX_ACCEL_X) // X max accel in steps/s^2 #define SILENT_MAX_ACCEL_Y_ST (100*SILENT_MAX_ACCEL_Y) // Y max accel in steps/s^2 -#define SILENT_MAX_FEEDRATE 80 //because mode switched to normal for homming in mm/s, this value limits also homing, it should be greater (80mm/s=4800mm/min>2700mm/min) +#define SILENT_MAX_FEEDRATE 120 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (120mm/s=7200mm/min>2700mm/min) -//cannot compile (ultralcd.cpp, line 6165), please FIX -#define END_FILE_SECTION 0 +//number of bytes from end of the file to start check +#define END_FILE_SECTION 10000 #define Z_AXIS_ALWAYS_ON 1 diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 74933484..a5fa0261 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -1043,13 +1043,10 @@ Having the real displacement of the head, we can calculate the total movement le if(((float)block->acceleration_st * (float)block->steps_y / (float)block->step_event_count) > SILENT_MAX_ACCEL_Y_ST) block->acceleration_st = SILENT_MAX_ACCEL_Y_ST; } - else - { - if(((float)block->acceleration_st * (float)block->steps_x / (float)block->step_event_count) > axis_steps_per_sqr_second[X_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; - if(((float)block->acceleration_st * (float)block->steps_y / (float)block->step_event_count) > axis_steps_per_sqr_second[Y_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; - } + if(((float)block->acceleration_st * (float)block->steps_x / (float)block->step_event_count) > axis_steps_per_sqr_second[X_AXIS]) + block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; + if(((float)block->acceleration_st * (float)block->steps_y / (float)block->step_event_count) > axis_steps_per_sqr_second[Y_AXIS]) + block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; if(((float)block->acceleration_st * (float)block->steps_e / (float)block->step_event_count) > axis_steps_per_sqr_second[E_AXIS]) block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; if(((float)block->acceleration_st * (float)block->steps_z / (float)block->step_event_count ) > axis_steps_per_sqr_second[Z_AXIS]) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d37f42a4..d17fbd93 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1548,8 +1548,8 @@ static void lcd_menu_fails_stats() } extern uint16_t SP_min; -extern char* __malloc_heap_start; -extern char* __malloc_heap_end; +extern char* __malloc_heap_start; +extern char* __malloc_heap_end; static void lcd_menu_debug() {