Compare commits

...

6 Commits

Author SHA1 Message Date
3d-gussner 5356d98611 Bump up FW build nr 2020-06-22 10:00:39 +02:00
3d-gussner c7ab6fddaa Merge remote-tracking branch 'wavexx/la15_acc_fixes' into MK3_la15_acc_test
Merge https://github.com/wavexx/Prusa-Firmware/tree/la15_acc_fixes
fix merge issues
Update Configuration.h build nr
2020-06-22 09:57:10 +02:00
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
3 changed files with 5 additions and 5 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 3464
// 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_t/fix+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

@ -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