Commit 5fddb592 authored by MagoKimbra's avatar MagoKimbra

Update M600

parent 0ea78b32
......@@ -5565,17 +5565,24 @@ inline void gcode_M503() {
/**
* M600: Pause for filament change
*
* E[mm] - Retract the filament this far (negative value)
* Z[mm] - Move the Z axis by this distance
* X[mm] - Move to this X position, with Y
* Y[mm] - Move to this Y position, with X
* L[mm] - Retract distance for removal (manual reload)
* E[distance] - Retract the filament this far (negative value)
* Z[distance] - Move the Z axis by this distance
* X[position] - Move to this X position, with Y
* Y[position] - Move to this Y position, with X
* L[distance] - Retract distance for removal (manual reload)
*
* Default values are used for omitted arguments.
*
*/
inline void gcode_M600() {
if (degHotend(active_extruder) < extrude_min_temp) {
ECHO_LM(ER, MSG_TOO_COLD_FOR_M600);
return;
}
float lastpos[NUM_AXIS], target[NUM_AXIS], fr60 = feedrate / 60;
filament_changing = true;
for (int i = 0; i < NUM_AXIS; i++)
target[i] = lastpos[i] = current_position[i];
......
......@@ -33,7 +33,7 @@
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#define MACHINE_NAME "Ultimaker"
#define FIRMWARE_URL "http://firmware.ultimaker.com"
#define FIRMWARE_URL "https://github.com/Ultimaker/Marlin"
#elif MB(RUMBA)
#define MACHINE_NAME "Rumba"
#elif MB(3DRAG)
......@@ -65,7 +65,7 @@
#endif
#ifndef BUILD_VERSION
#define BUILD_VERSION "V1; Sprinter/grbl mashup for gen6"
#define BUILD_VERSION "V4; MarlinKimbra for 4 extruder"
#endif
#ifndef MACHINE_UUID
......
......@@ -47,6 +47,7 @@
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_M600 "M600 Hotend too cold to change filament"
#define MSG_COOLDOWN "Cooldown"
#define MSG_SWITCH_PS_ON "Switch power on"
#define MSG_SWITCH_PS_OFF "Switch power off"
......
......@@ -47,6 +47,7 @@
#define MSG_PREHEAT_GUM_ALL "Preri. GOMMA Tutto"
#define MSG_PREHEAT_GUM_BEDONLY "Preri. GOMMA Piatto"
#define MSG_PREHEAT_GUM_SETTINGS "Config. prer. GOMMA"
#define MSG_TOO_COLD_FOR_M600 "M600 Hotend troppo freddo per il cambio filo"
#define MSG_COOLDOWN "Raffredda"
#define MSG_SWITCH_PS_ON "Accendi aliment."
#define MSG_SWITCH_PS_OFF "Spegni aliment."
......
......@@ -509,7 +509,7 @@ ISR(TIMER1_COMPA_vect) {
#else
byte
#endif
current_endstop_bits;
current_endstop_bits = 0;
#ifdef COREXY
// Head direction in -X axis for CoreXY bots.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment