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
074ff436
Commit
074ff436
authored
9 years ago
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into k40_noflow_nocooler
parents
0aafdca7
18664abd
Pipeline
#87
skipped
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
652 additions
and
645 deletions
+652
-645
Configuration_Store.cpp
MK/Configuration_Store.cpp
+1
-0
MK.ino
MK/MK.ino
+2
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+649
-644
No files found.
MK/Configuration_Store.cpp
View file @
074ff436
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
* either sets a Sane Default, or results in No Change to the existing value.
* either sets a Sane Default, or results in No Change to the existing value.
*
*
*/
*/
#include "base.h"
#include "base.h"
#define EEPROM_VERSION "MKV429"
#define EEPROM_VERSION "MKV429"
...
...
This diff is collapsed.
Click to expand it.
MK/MK.ino
View file @
074ff436
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
* "G" Codes
* "G" Codes
*
*
* G0 -> G1 except for laser where G0 is "move without firing"
* G0 -> G1 except for laser where G0 is "move without firing"
* G1 - Coordinated Movement X Y Z E, for laser move by firing
* G1 - Coordinated Movement X Y Z E
F(feedrate) P(Purge)
, for laser move by firing
* G2 - CW ARC
* G2 - CW ARC
* G3 - CCW ARC
* G3 - CCW ARC
* G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
* G4 - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
...
@@ -209,6 +209,7 @@
...
@@ -209,6 +209,7 @@
*/
*/
#include "base.h"
#include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
#include <Wire.h>
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
MK/module/MK_Main.cpp
View file @
074ff436
...
@@ -1870,6 +1870,8 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
...
@@ -1870,6 +1870,8 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
delta_tower3_y
=
(
delta_radius
+
tower_adj
[
5
])
*
sin
((
90
+
tower_adj
[
2
])
*
M_PI
/
180
);
delta_tower3_y
=
(
delta_radius
+
tower_adj
[
5
])
*
sin
((
90
+
tower_adj
[
2
])
*
M_PI
/
180
);
}
}
#if ENABLED(Z_PROBE_ENDSTOP)
bool
Equal_AB
(
const
float
A
,
const
float
B
,
const
float
prec
=
ac_prec
)
{
bool
Equal_AB
(
const
float
A
,
const
float
B
,
const
float
prec
=
ac_prec
)
{
if
(
abs
(
A
-
B
)
<=
prec
)
return
true
;
if
(
abs
(
A
-
B
)
<=
prec
)
return
true
;
return
false
;
return
false
;
...
@@ -1920,16 +1922,6 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
...
@@ -1920,16 +1922,6 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
}
}
}
}
// Reset calibration results to zero.
static
void
reset_bed_level
()
{
if
(
DEBUGGING
(
INFO
))
ECHO_LM
(
INFO
,
"reset_bed_level"
);
for
(
int
y
=
0
;
y
<
AUTO_BED_LEVELING_GRID_POINTS
;
y
++
)
{
for
(
int
x
=
0
;
x
<
AUTO_BED_LEVELING_GRID_POINTS
;
x
++
)
{
bed_level
[
x
][
y
]
=
0.0
;
}
}
}
static
void
deploy_z_probe
()
{
static
void
deploy_z_probe
()
{
if
(
DEBUGGING
(
INFO
))
DEBUG_POS
(
"deploy_z_probe"
,
current_position
);
if
(
DEBUGGING
(
INFO
))
DEBUG_POS
(
"deploy_z_probe"
,
current_position
);
...
@@ -2638,6 +2630,18 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
...
@@ -2638,6 +2630,18 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
ECHO_E
;
ECHO_E
;
}
}
#endif
// Reset calibration results to zero.
static
void
reset_bed_level
()
{
if
(
DEBUGGING
(
INFO
))
ECHO_LM
(
INFO
,
"reset_bed_level"
);
for
(
int
y
=
0
;
y
<
AUTO_BED_LEVELING_GRID_POINTS
;
y
++
)
{
for
(
int
x
=
0
;
x
<
AUTO_BED_LEVELING_GRID_POINTS
;
x
++
)
{
bed_level
[
x
][
y
]
=
0.0
;
}
}
}
static
void
home_delta_axis
()
{
static
void
home_delta_axis
()
{
set_destination_to_current
();
set_destination_to_current
();
...
@@ -5626,6 +5630,7 @@ inline void gcode_M81() {
...
@@ -5626,6 +5630,7 @@ inline void gcode_M81() {
laser_peripherals_off
();
laser_peripherals_off
();
#endif
#endif
#endif
#endif
delay_ms
(
1000
);
// Wait 1 second before switching off
delay_ms
(
1000
);
// Wait 1 second before switching off
#if HAS(SUICIDE)
#if HAS(SUICIDE)
...
...
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