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
badeaf3d
Commit
badeaf3d
authored
May 24, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix M600
parent
89caa423
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
Configuration_adv.h
MarlinKimbra/Configuration_adv.h
+1
-1
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+6
-10
No files found.
MarlinKimbra/Configuration_adv.h
View file @
badeaf3d
...
...
@@ -413,7 +413,7 @@ const unsigned int dropsegments = 5; // everything with less than this number of
// Add support for experimental filament exchange support M600; requires display
#ifdef ULTIPANEL
//
#define FILAMENTCHANGEENABLE
#define FILAMENTCHANGEENABLE
#ifdef FILAMENTCHANGEENABLE
#define FILAMENTCHANGE_XPOS 3
#define FILAMENTCHANGE_YPOS 3
...
...
MarlinKimbra/Marlin_main.cpp
View file @
badeaf3d
...
...
@@ -5663,20 +5663,16 @@ inline void gcode_M503() {
plan_set_e_position
(
current_position
[
E_AXIS
]);
// HOME X & Y & Z(only Delta)
gcode_G28
(
true
,
true
);
//gcode_G28(true,true); //Trovare un'altra soluzione
#ifdef DELTA
calculate_delta
(
lastpos
);
plan_buffer_line
(
delta
[
X_AXIS
],
delta
[
Y_AXIS
],
delta
[
Z_AXIS
],
target
[
E_AXIS
],
feedrate
/
60
,
active_extruder
,
active_driver
);
//move xyz back
plan_buffer_line
(
delta
[
X_AXIS
],
delta
[
Y_AXIS
],
delta
[
Z_AXIS
],
lastpos
[
E_AXIS
],
feedrate
/
60
,
active_extruder
,
active_driver
);
//final unretract
for
(
int8_t
i
=
0
;
i
<
NUM_AXIS
;
i
++
)
current_position
[
i
]
=
lastpos
[
i
];
sync_plan_position_delta
();
plan_buffer_line
(
delta
[
X_AXIS
],
delta
[
Y_AXIS
],
delta
[
Z_AXIS
],
target
[
E_AXIS
],
fr60
,
active_extruder
,
active_driver
);
//move xyz back
plan_buffer_line
(
delta
[
X_AXIS
],
delta
[
Y_AXIS
],
delta
[
Z_AXIS
],
lastpos
[
E_AXIS
],
fr60
,
active_extruder
,
active_driver
);
//final unretract
#else
plan_buffer_line
(
lastpos
[
X_AXIS
],
lastpos
[
Y_AXIS
],
target
[
Z_AXIS
],
target
[
E_AXIS
],
feedrate
/
60
,
active_extruder
,
active_driver
);
//move xy back
plan_buffer_line
(
lastpos
[
X_AXIS
],
lastpos
[
Y_AXIS
],
lastpos
[
Z_AXIS
],
target
[
E_AXIS
],
feedrate
/
60
,
active_extruder
,
active_driver
);
//move z back
plan_buffer_line
(
lastpos
[
X_AXIS
],
lastpos
[
Y_AXIS
],
lastpos
[
Z_AXIS
],
lastpos
[
E_AXIS
],
feedrate
/
60
,
active_extruder
,
active_driver
);
//final unretract
for
(
int8_t
i
=
0
;
i
<
NUM_AXIS
;
i
++
)
current_position
[
i
]
=
lastpos
[
i
];
sync_plan_position
();
plan_buffer_line
(
lastpos
[
X_AXIS
],
lastpos
[
Y_AXIS
],
target
[
Z_AXIS
],
target
[
E_AXIS
],
fr60
,
active_extruder
,
active_driver
);
//move xy back
plan_buffer_line
(
lastpos
[
X_AXIS
],
lastpos
[
Y_AXIS
],
lastpos
[
Z_AXIS
],
target
[
E_AXIS
],
fr60
,
active_extruder
,
active_driver
);
//move z back
plan_buffer_line
(
lastpos
[
X_AXIS
],
lastpos
[
Y_AXIS
],
lastpos
[
Z_AXIS
],
lastpos
[
E_AXIS
],
fr60
,
active_extruder
,
active_driver
);
//final unretract
#endif
#ifdef FILAMENT_RUNOUT_SENSOR
...
...
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