Commit 636c8542 authored by MagoKimbra's avatar MagoKimbra

Update Nextion Firmware v0_6_2

parent e16d723c
...@@ -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
......
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