josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚡LA1.0 compatibility improvements

This commit is contained in:
Alex Voinea 2020-04-20 13:02:27 +03:00
parent 8ef87d76ef
commit f22fb2770b
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -2072,9 +2072,10 @@ inline void gcode_M900() {
SERIAL_ECHOLNPGM("K out of allowed range!"); SERIAL_ECHOLNPGM("K out of allowed range!");
#else #else
if (newK == 0) if (newK == 0)
{
extruder_advance_K = 0; extruder_advance_K = 0;
else if (newK == -1)
la10c_reset(); la10c_reset();
}
else else
{ {
newK = la10c_value(newK); newK = la10c_value(newK);
@ -4864,11 +4865,6 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
case_G80: case_G80:
{ {
mesh_bed_leveling_flag = true; mesh_bed_leveling_flag = true;
#ifndef LA_NOCOMPAT
// When printing via USB there's no clear boundary between prints. Abuse MBL to indicate
// the beginning of a new print, allowing a new autodetected setting just after G80.
la10c_reset();
#endif
#ifndef PINDA_THERMISTOR #ifndef PINDA_THERMISTOR
static bool run = false; // thermistor-less PINDA temperature compensation is running static bool run = false; // thermistor-less PINDA temperature compensation is running
#endif // ndef PINDA_THERMISTOR #endif // ndef PINDA_THERMISTOR

8
Firmware/ultralcd.cpp
View File

@ -39,6 +39,10 @@
#include "tmc2130.h" #include "tmc2130.h"
#endif //TMC2130 #endif //TMC2130
#ifndef LA_NOCOMPAT
#include "la10compat.h"
#endif
#include "sound.h" #include "sound.h"
#include "mmu.h" #include "mmu.h"
@ -7352,6 +7356,10 @@ void lcd_print_stop()
current_position[Z_AXIS] += 10; //lift Z. current_position[Z_AXIS] += 10; //lift Z.
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60, active_extruder); plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60, active_extruder);
#ifndef LA_NOCOMPAT
la10c_reset(); //reset LA1.0 conversion lock
#endif
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) //if axis are homed, move to parked position. if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) //if axis are homed, move to parked position.
{ {
current_position[X_AXIS] = X_CANCEL_POS; current_position[X_AXIS] = X_CANCEL_POS;