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
29c65bd3
Commit
29c65bd3
authored
Aug 16, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Ultralcd.cpp
parent
4ff8a3a3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
12 deletions
+24
-12
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+24
-12
No files found.
MarlinKimbra/ultralcd.cpp
View file @
29c65bd3
...
...
@@ -2283,18 +2283,18 @@ NexProgressBar jp3 = NexProgressBar(1, 11, "jp3");
NexProgressBar
jp4
=
NexProgressBar
(
1
,
14
,
"jp4"
);
// Touch area
NexHotspot
homex
=
NexHotspot
(
1
,
17
,
"homex"
,
homePopCallback
,
&
homex
);
NexHotspot
homey
=
NexHotspot
(
1
,
18
,
"homey"
,
homePopCallback
,
&
homey
);
NexHotspot
homez
=
NexHotspot
(
1
,
19
,
"homez"
,
homePopCallback
,
&
homez
);
NexHotspot
home0
=
NexHotspot
(
1
,
20
,
"home0"
,
homePopCallback
,
&
home0
);
NexHotspot
hot0
=
NexHotspot
(
1
,
21
,
"hot0"
,
hotPopCallback
,
&
hot0
);
NexHotspot
hot1
=
NexHotspot
(
1
,
22
,
"hot1"
,
hotPopCallback
,
&
hot1
);
NexHotspot
hot2
=
NexHotspot
(
1
,
23
,
"hot2"
,
hotPopCallback
,
&
hot2
);
NexHotspot
hot3
=
NexHotspot
(
1
,
24
,
"hot3"
,
hotPopCallback
,
&
hot3
);
NexHotspot
hot4
=
NexHotspot
(
1
,
25
,
"hot4"
,
hotPopCallback
,
&
hot4
);
NexHotspot
m11
=
NexHotspot
(
2
,
14
,
"m11"
,
sethotPopCallback
,
&
m11
);
NexHotspot
tup
=
NexHotspot
(
2
,
16
,
"tup"
,
settempPopCallback
,
&
tup
);
NexHotspot
tdown
=
NexHotspot
(
2
,
17
,
"tdown"
,
settempPopCallback
,
&
tdown
);
NexHotspot
homex
=
NexHotspot
(
1
,
17
,
"homex"
);
NexHotspot
homey
=
NexHotspot
(
1
,
18
,
"homey"
);
NexHotspot
homez
=
NexHotspot
(
1
,
19
,
"homez"
);
NexHotspot
home0
=
NexHotspot
(
1
,
20
,
"home0"
);
NexHotspot
hot0
=
NexHotspot
(
1
,
21
,
"hot0"
);
NexHotspot
hot1
=
NexHotspot
(
1
,
22
,
"hot1"
);
NexHotspot
hot2
=
NexHotspot
(
1
,
23
,
"hot2"
);
NexHotspot
hot3
=
NexHotspot
(
1
,
24
,
"hot3"
);
NexHotspot
hot4
=
NexHotspot
(
1
,
25
,
"hot4"
);
NexHotspot
m11
=
NexHotspot
(
2
,
14
,
"m11"
);
NexHotspot
tup
=
NexHotspot
(
2
,
16
,
"tup"
);
NexHotspot
tdown
=
NexHotspot
(
2
,
17
,
"tdown"
);
NexTouch
*
nexListenList
[]
=
{
...
...
@@ -2394,6 +2394,18 @@ void lcd_init() {
}
else
{
ECHO_LM
(
DB
,
"Nextion LCD connected!"
);
homex
.
attachPop
(
homePopCallback
,
&
homex
);
homey
.
attachPop
(
homePopCallback
,
&
homey
);
homez
.
attachPop
(
homePopCallback
,
&
homez
);
home0
.
attachPop
(
homePopCallback
,
&
home0
);
hot0
.
attachPop
(
hotPopCallback
,
&
hot0
);
hot1
.
attachPop
(
hotPopCallback
,
&
hot1
);
hot2
.
attachPop
(
hotPopCallback
,
&
hot2
);
hot3
.
attachPop
(
hotPopCallback
,
&
hot3
);
hot4
.
attachPop
(
hotPopCallback
,
&
hot4
);
m11
.
attachPop
(
sethotPopCallback
,
&
m11
);
tup
.
attachPop
(
settempPopCallback
,
&
tup
);
tdown
.
attachPop
(
settempPopCallback
,
&
tdown
);
delay
(
SPLASH_SCREEN_DURATION
);
// wait to display the splash screen
sendCommand
(
"page menu"
);
lcd_setstatus
(
WELCOME_MSG
);
...
...
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