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
636c8542
Commit
636c8542
authored
Jan 12, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Nextion Firmware v0_6_2
parent
e16d723c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
marlinkimbra_v0_6_2.HMI
MarlinKimbra/Nextion FW/marlinkimbra_v0_6_2.HMI
+0
-0
marlinkimbra_v0_6_2.tft
MarlinKimbra/Nextion FW/marlinkimbra_v0_6_2.tft
+0
-0
nextion_lcd.cpp
MarlinKimbra/module/nextion_lcd.cpp
+9
-3
No files found.
MarlinKimbra/Nextion FW/marlinkimbra_v0_6_
0
.HMI
→
MarlinKimbra/Nextion FW/marlinkimbra_v0_6_
2
.HMI
View file @
636c8542
No preview for this file type
MarlinKimbra/Nextion FW/marlinkimbra_v0_6_
0
.tft
→
MarlinKimbra/Nextion FW/marlinkimbra_v0_6_
2
.tft
View file @
636c8542
No preview for this file type
MarlinKimbra/module/nextion_lcd.cpp
View file @
636c8542
...
@@ -98,6 +98,8 @@
...
@@ -98,6 +98,8 @@
NexHotspot
m11
=
NexHotspot
(
2
,
14
,
"m11"
);
NexHotspot
m11
=
NexHotspot
(
2
,
14
,
"m11"
);
NexHotspot
tup
=
NexHotspot
(
2
,
16
,
"tup"
);
NexHotspot
tup
=
NexHotspot
(
2
,
16
,
"tup"
);
NexHotspot
tdown
=
NexHotspot
(
2
,
17
,
"tdown"
);
NexHotspot
tdown
=
NexHotspot
(
2
,
17
,
"tdown"
);
NexHotspot
ScrollUp
=
NexHotspot
(
4
,
27
,
"m0"
);
NexHotspot
ScrollDown
=
NexHotspot
(
4
,
28
,
"m1"
);
// Timer
// Timer
NexTimer
startimer
=
NexTimer
(
0
,
1
,
"tm0"
);
NexTimer
startimer
=
NexTimer
(
0
,
1
,
"tm0"
);
...
@@ -131,6 +133,8 @@
...
@@ -131,6 +133,8 @@
&
tup
,
&
tup
,
&
tdown
,
&
tdown
,
&
sdlist
,
&
sdlist
,
&
ScrollUp
,
&
ScrollDown
,
&
sdrow0
,
&
sdrow0
,
&
sdrow1
,
&
sdrow1
,
&
sdrow2
,
&
sdrow2
,
...
@@ -495,6 +499,8 @@
...
@@ -495,6 +499,8 @@
#if ENABLED(SDSUPPORT)
#if ENABLED(SDSUPPORT)
MSD
.
attachPop
(
setpagePopCallback
,
&
MSD
);
MSD
.
attachPop
(
setpagePopCallback
,
&
MSD
);
sdlist
.
attachPop
(
sdlistPopCallback
);
sdlist
.
attachPop
(
sdlistPopCallback
);
ScrollUp
.
attachPop
(
sdlistPopCallback
);
ScrollDown
.
attachPop
(
sdlistPopCallback
);
Exit2
.
attachPop
(
ExitPopCallback
);
Exit2
.
attachPop
(
ExitPopCallback
);
NPlay
.
attachPop
(
PlayPausePopCallback
);
NPlay
.
attachPop
(
PlayPausePopCallback
);
NStop
.
attachPop
(
StopPopCallback
);
NStop
.
attachPop
(
StopPopCallback
);
...
@@ -661,17 +667,17 @@
...
@@ -661,17 +667,17 @@
#if ENABLED(NEXTION_GFX)
#if ENABLED(NEXTION_GFX)
void
gfx_clear
(
float
x
,
float
y
,
float
z
)
{
void
gfx_clear
(
float
x
,
float
y
,
float
z
)
{
if
(
PageInfo
)
if
(
PageInfo
&&
(
Printing
||
IS_SD_PRINTING
)
)
gfx
.
clear
(
x
,
y
,
z
);
gfx
.
clear
(
x
,
y
,
z
);
}
}
void
gfx_cursor_to
(
float
x
,
float
y
,
float
z
)
{
void
gfx_cursor_to
(
float
x
,
float
y
,
float
z
)
{
if
(
PageInfo
)
if
(
PageInfo
&&
(
Printing
||
IS_SD_PRINTING
)
)
gfx
.
cursor_to
(
x
,
y
,
z
);
gfx
.
cursor_to
(
x
,
y
,
z
);
}
}
void
gfx_line_to
(
float
x
,
float
y
,
float
z
){
void
gfx_line_to
(
float
x
,
float
y
,
float
z
){
if
(
PageInfo
)
if
(
PageInfo
&&
(
Printing
||
IS_SD_PRINTING
)
)
gfx
.
line_to
(
VC_TOOL
,
x
,
y
,
z
);
gfx
.
line_to
(
VC_TOOL
,
x
,
y
,
z
);
}
}
#endif
#endif
...
...
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