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
ff830865
Commit
ff830865
authored
May 06, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
128f956d
b1f907a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
Configuration_Store.cpp
MK/Configuration_Store.cpp
+2
-2
ultralcd.cpp
MK/module/lcd/ultralcd.cpp
+11
-4
ultralcd.h
MK/module/lcd/ultralcd.h
+1
-1
No files found.
MK/Configuration_Store.cpp
View file @
ff830865
...
@@ -644,8 +644,8 @@ void Config_ResetDefault() {
...
@@ -644,8 +644,8 @@ void Config_ResetDefault() {
ECHO_LM
(
CFG
,
"Maximum feedrates (mm/s):"
);
ECHO_LM
(
CFG
,
"Maximum feedrates (mm/s):"
);
}
}
ECHO_SMV
(
CFG
,
" M203 X"
,
max_feedrate
[
X_AXIS
]);
ECHO_SMV
(
CFG
,
" M203 X"
,
max_feedrate
[
X_AXIS
]);
ECHO_MV
(
" Y"
,
max_feedrate
[
Y_AXIS
]
);
ECHO_MV
(
" Y"
,
max_feedrate
[
Y_AXIS
]
);
ECHO_MV
(
" Z"
,
max_feedrate
[
Z_AXIS
]
);
ECHO_MV
(
" Z"
,
max_feedrate
[
Z_AXIS
]
);
ECHO_EMV
(
" E"
,
max_feedrate
[
E_AXIS
]);
ECHO_EMV
(
" E"
,
max_feedrate
[
E_AXIS
]);
#if EXTRUDERS > 1
#if EXTRUDERS > 1
for
(
short
i
=
1
;
i
<
EXTRUDERS
;
i
++
)
{
for
(
short
i
=
1
;
i
<
EXTRUDERS
;
i
++
)
{
...
...
MK/module/lcd/ultralcd.cpp
View file @
ff830865
...
@@ -2542,10 +2542,17 @@ char* ftostr32sp(const float& x) {
...
@@ -2542,10 +2542,17 @@ char* ftostr32sp(const float& x) {
return
conv
;
return
conv
;
}
}
// Convert int to lj string with +123.0 format
// Convert signed int to lj string with +012 / -012 format
char
*
itostr31
(
const
int
&
x
)
{
char
*
itostr3sign
(
const
int
&
x
)
{
conv
[
0
]
=
x
>=
0
?
'+'
:
'-'
;
int
xx
;
int
xx
=
abs
(
x
);
if
(
x
>=
0
)
{
conv
[
0
]
=
'+'
;
xx
=
x
;
}
else
{
conv
[
0
]
=
'-'
;
xx
=
-
x
;
}
conv
[
1
]
=
(
xx
/
100
)
%
10
+
'0'
;
conv
[
1
]
=
(
xx
/
100
)
%
10
+
'0'
;
conv
[
2
]
=
(
xx
/
10
)
%
10
+
'0'
;
conv
[
2
]
=
(
xx
/
10
)
%
10
+
'0'
;
conv
[
3
]
=
xx
%
10
+
'0'
;
conv
[
3
]
=
xx
%
10
+
'0'
;
...
...
MK/module/lcd/ultralcd.h
View file @
ff830865
...
@@ -163,7 +163,7 @@
...
@@ -163,7 +163,7 @@
#endif // NEWPANEL
#endif // NEWPANEL
char
*
itostr2
(
const
uint8_t
&
x
);
char
*
itostr2
(
const
uint8_t
&
x
);
char
*
itostr3
1
(
const
int
&
x
x
);
char
*
itostr3
sign
(
const
int
&
x
);
char
*
itostr3
(
const
int
&
xx
);
char
*
itostr3
(
const
int
&
xx
);
char
*
itostr3left
(
const
int
&
xx
);
char
*
itostr3left
(
const
int
&
xx
);
char
*
itostr4
(
const
int
&
xx
);
char
*
itostr4
(
const
int
&
xx
);
...
...
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