Compare commits

...

4 Commits

Author SHA1 Message Date
3d-gussner 9c97d00bbe Change commit and FW version
Set it to BETA so user will have to confirm on LCD after start up.
2020-06-19 15:36:18 +02:00
3d-gussner 72276826a2 Fix belt test errors
by using higher currents
2020-06-19 15:31:37 +02:00
3d-gussner 70bea8225f Merge remote-tracking branch 'wavexx/la15_acc_test' into MK3_la15_acc_test 2020-06-19 15:27:48 +02:00
Yuri D'Elia d082f5d9a7 Avoid cumulative error in segments without cruising
When calculating the compression steps, compute the actual target speed
of the trapezoid, since up to e_steps (+/- 1 normally) can be
accumulated in excess for each acceleration phase.

This is not for production: a lot of calculations are redundand and
could work directly in steps/s^2.
2020-06-18 18:15:45 +02:00
4 changed files with 18 additions and 8 deletions

View File

@ -16,8 +16,8 @@ extern uint16_t nPrinterType;
extern PGM_P sPrinterName;
// Firmware version
#define FW_VERSION "3.9.0"
#define FW_COMMIT_NR 3421
#define FW_VERSION "3.9.1-BETA"
#define FW_COMMIT_NR 3459
// FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol.
#define FW_DEV_VERSION FW_VERSION_UNKNOWN
@ -70,7 +70,7 @@ extern PGM_P sPrinterName;
//#define STRING_VERSION "1.0.2"
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
#define STRING_CONFIG_H_AUTHOR "(FW390+LA_acc_/belt fix)" // Who made the changes.
// SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins.

View File

@ -226,11 +226,14 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit
// Size of Plateau of Nominal Rate.
uint32_t plateau_steps = 0;
float max_speed;
// Is the Plateau of Nominal Rate smaller than nothing? That means no cruising, and we will
// have to use intersection_distance() to calculate when to abort acceleration and start braking
// in order to reach the final_rate exactly at the end of this block.
if (accel_decel_steps < block->step_event_count.wide) {
plateau_steps = block->step_event_count.wide - accel_decel_steps;
max_speed = block->nominal_speed;
} else {
uint32_t acceleration_x4 = acceleration << 2;
// Avoid negative numbers
@ -263,12 +266,18 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit
decelerate_steps = block->step_event_count.wide;
accelerate_steps = block->step_event_count.wide - decelerate_steps;
}
// TODO: not for production
float dist = intersection_distance(entry_speed, exit_speed, block->acceleration, block->millimeters);
max_speed = sqrt(2 * block->acceleration * dist + entry_speed*entry_speed);
}
#ifdef LIN_ADVANCE
uint16_t final_adv_steps = 0;
uint16_t max_adv_steps = 0;
if (block->use_advance_lead) {
final_adv_steps = exit_speed * block->adv_comp;
max_adv_steps = max_speed * block->adv_comp;
}
#endif
@ -284,6 +293,7 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit
block->final_rate = final_rate;
#ifdef LIN_ADVANCE
block->final_adv_steps = final_adv_steps;
block->max_adv_steps = max_adv_steps;
#endif
}
CRITICAL_SECTION_END;
@ -1169,13 +1179,13 @@ Having the real displacement of the head, we can calculate the total movement le
block->advance_step_loops = 1;
}
#ifdef LA_DEBUG
if (block->advance_step_loops > 2)
#if 1
if (block->advance_step_loops != 1)
// @wavexx: we should really check for the difference between step_loops and
// advance_step_loops instead. A difference of more than 1 will lead
// to uneven speed and *should* be adjusted here by furthermore
// reducing the speed.
SERIAL_ECHOLNPGM("LA: More than 2 steps per eISR loop executed.");
SERIAL_ECHOLNPGM("LA: More than 1 steps per eISR loop executed.");
#endif
}
#endif

View File

@ -265,7 +265,7 @@
//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only)
#define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes
#define TMC2130_CURRENTS_R {16, 20, 35, 30} // default running currents for all axes
#define TMC2130_CURRENTS_R_HOME {8, 10, 20, 18} // homing running currents for all axes
#define TMC2130_CURRENTS_R_HOME {12, 15, 20, 18} // homing running currents for all axes
// #define TMC2130_UNLOAD_CURRENT_R 12 // lower current for M600 to protect filament sensor - Unused
#define TMC2130_STEALTH_Z

View File

@ -267,7 +267,7 @@
//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only)
#define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes
#define TMC2130_CURRENTS_R {16, 20, 35, 30} // default running currents for all axes
#define TMC2130_CURRENTS_R_HOME {8, 10, 20, 18} // homing running currents for all axes
#define TMC2130_CURRENTS_R_HOME {12, 15, 20, 18} // homing running currents for all axes
// #define TMC2130_UNLOAD_CURRENT_R 12 // lower current for M600 to protect filament sensor - Unused
#define TMC2130_STEALTH_Z