Skip to content

M
MarlinKimbra
Commit 29c65bd3 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Fix Ultralcd.cpp

parent 4ff8a3a3
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 12 deletions
MarlinKimbra/ultralcd.cpp
View file @ 29c65bd3
...@@ -2283,18 +2283,18 @@ NexProgressBar jp3 = NexProgressBar(1, 11, "jp3"); ...@@ -2283,18 +2283,18 @@ NexProgressBar jp3 = NexProgressBar(1, 11, "jp3");
NexProgressBar jp4 = NexProgressBar(1, 14, "jp4"); NexProgressBar jp4 = NexProgressBar(1, 14, "jp4");
// Touch area // Touch area
NexHotspot homex = NexHotspot(1, 17, "homex", homePopCallback, &homex); NexHotspot homex = NexHotspot(1, 17, "homex");
NexHotspot homey = NexHotspot(1, 18, "homey", homePopCallback, &homey); NexHotspot homey = NexHotspot(1, 18, "homey");
NexHotspot homez = NexHotspot(1, 19, "homez", homePopCallback, &homez); NexHotspot homez = NexHotspot(1, 19, "homez");
NexHotspot home0 = NexHotspot(1, 20, "home0", homePopCallback, &home0); NexHotspot home0 = NexHotspot(1, 20, "home0");
NexHotspot hot0 = NexHotspot(1, 21, "hot0", hotPopCallback, &hot0); NexHotspot hot0 = NexHotspot(1, 21, "hot0");
NexHotspot hot1 = NexHotspot(1, 22, "hot1", hotPopCallback, &hot1); NexHotspot hot1 = NexHotspot(1, 22, "hot1");
NexHotspot hot2 = NexHotspot(1, 23, "hot2", hotPopCallback, &hot2); NexHotspot hot2 = NexHotspot(1, 23, "hot2");
NexHotspot hot3 = NexHotspot(1, 24, "hot3", hotPopCallback, &hot3); NexHotspot hot3 = NexHotspot(1, 24, "hot3");
NexHotspot hot4 = NexHotspot(1, 25, "hot4", hotPopCallback, &hot4); NexHotspot hot4 = NexHotspot(1, 25, "hot4");
NexHotspot m11 = NexHotspot(2, 14, "m11", sethotPopCallback, &m11); NexHotspot m11 = NexHotspot(2, 14, "m11");
NexHotspot tup = NexHotspot(2, 16, "tup", settempPopCallback, &tup); NexHotspot tup = NexHotspot(2, 16, "tup");
NexHotspot tdown = NexHotspot(2, 17, "tdown", settempPopCallback, &tdown); NexHotspot tdown = NexHotspot(2, 17, "tdown");
NexTouch *nexListenList[] = NexTouch *nexListenList[] =
{ {
...@@ -2394,6 +2394,18 @@ void lcd_init() { ...@@ -2394,6 +2394,18 @@ void lcd_init() {
} }
else { else {
ECHO_LM(DB, "Nextion LCD connected!"); 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 delay(SPLASH_SCREEN_DURATION); // wait to display the splash screen
sendCommand("page menu"); sendCommand("page menu");
lcd_setstatus(WELCOME_MSG); lcd_setstatus(WELCOME_MSG);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment