Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
5fddb592
Commit
5fddb592
authored
9 years ago
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update M600
parent
0ea78b32
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
8 deletions
+17
-8
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+12
-5
language.h
MarlinKimbra/language.h
+2
-2
language_en.h
MarlinKimbra/language_en.h
+1
-0
language_it.h
MarlinKimbra/language_it.h
+1
-0
stepper.cpp
MarlinKimbra/stepper.cpp
+1
-1
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
5fddb592
...
...
@@ -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
];
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/language.h
View file @
5fddb592
...
...
@@ -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 "http
s://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 "V
1; Sprinter/grbl mashup for gen6
"
#define BUILD_VERSION "V
4; MarlinKimbra for 4 extruder
"
#endif
#ifndef MACHINE_UUID
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/language_en.h
View file @
5fddb592
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/language_it.h
View file @
5fddb592
...
...
@@ -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."
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/stepper.cpp
View file @
5fddb592
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment