Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MK/module/nextion/Nextion_lcd.cpp

@@ -27,33 +27,51 @@
   NexPage Psetup        = NexPage(5, 0, "setup");
   NexPage Pmove         = NexPage(6, 0, "move");
 
-  // Text
+  // Page 0 Start
+  NexTimer startimer    = NexTimer(0,  1, "tm0");  
+
+  // Page 1 Info
   NexText Hotend0       = NexText(1,  2,  "t0");
   NexText Hotend1       = NexText(1,  4,  "t1");
   NexText Hotend21      = NexText(1,  5,  "h2");
   NexText Hotend2       = NexText(1,  6,  "t2");
   NexText LedStatus     = NexText(1,  7,  "t4");
   NexText LedCoord      = NexText(1,  8,  "t5");
-  NexText set0          = NexText(2,  2,  "set0");
-  NexText sdrow0        = NexText(4,  3,  "t0");
-  NexText sdrow1        = NexText(4,  4,  "t1");
-  NexText sdrow2        = NexText(4,  5,  "t2");
-  NexText sdrow3        = NexText(4,  6,  "t3");
-  NexText sdrow4        = NexText(4,  7,  "t4");
-  NexText sdrow5        = NexText(4,  8,  "t5");
-  NexText sdfolder      = NexText(4, 23,  "sdfolder");
-
-  // Picture
   NexPicture Menu       = NexPicture(1,  9, "p0");
   NexPicture MSD        = NexPicture(1, 10, "p1");
   NexPicture MSetup     = NexPicture(1, 11, "p2");
   NexPicture Hend0      = NexPicture(1, 12, "p3");
+  NexHotspot hot0       = NexHotspot(1, 13, "hot0");
   NexPicture Hend1      = NexPicture(1, 14, "p4");
+  NexHotspot hot1       = NexHotspot(1, 15, "hot1");
   NexPicture Hend2      = NexPicture(1, 16, "p5");
+  NexHotspot hot2       = NexHotspot(1, 17, "hot2");
   NexPicture Fanpic     = NexPicture(1, 18, "p6");
+  NexVar Hotend         = NexVar(1, 19, "he");
+  NexVar Bed            = NexVar(1, 20, "bed");
+  NexTimer fantimer     = NexTimer(1, 22, "tm0");
+  NexProgressBar sdbar  = NexProgressBar(1, 23, "j0");
   NexPicture NPlay      = NexPicture(1, 24, "p7");
   NexPicture NStop      = NexPicture(1, 25, "p8");
+
+  // Page 2 Temp
+  NexText set0          = NexText(2,  2,  "set0");
+  NexHotspot m11        = NexHotspot(2, 14, "m11");
+  NexHotspot tup        = NexHotspot(2, 15, "tup");
+  NexHotspot tdown      = NexHotspot(2, 16, "tdown");
+  NexVar set1           = NexVar(2, 17, "set1");
+
+  // Page 3 Menu
   NexPicture Exit1      = NexPicture(3,  4, "p3");
+
+  // Page 4 SDCard
+  NexSlider sdlist      = NexSlider(4, 1,   "h0");
+  NexText sdrow0        = NexText(4,  3,  "t0");
+  NexText sdrow1        = NexText(4,  4,  "t1");
+  NexText sdrow2        = NexText(4,  5,  "t2");
+  NexText sdrow3        = NexText(4,  6,  "t3");
+  NexText sdrow4        = NexText(4,  7,  "t4");
+  NexText sdrow5        = NexText(4,  8,  "t5");
   NexPicture Folder0    = NexPicture(4,  9, "p0");
   NexPicture Folder1    = NexPicture(4, 10, "p1");
   NexPicture Folder2    = NexPicture(4, 11, "p2");
@@ -62,7 +80,14 @@
   NexPicture Folder5    = NexPicture(4, 14, "p5");
   NexPicture Folderup   = NexPicture(4, 15, "p6");
   NexPicture Exit2      = NexPicture(4, 16, "p7");
+  NexText sdfolder      = NexText(4, 17,  "sdfolder");
+  NexHotspot ScrollUp   = NexHotspot(4, 21, "m0");
+  NexHotspot ScrollDown = NexHotspot(4, 22, "m1");
+
+  // Page 5 Setup
   NexPicture Exit3      = NexPicture(5,  4, "p3");
+
+  // Page 6 Move
   NexPicture XYHome     = NexPicture(6,  5, "p4");
   NexPicture XYUp       = NexPicture(6,  6, "p5");
   NexPicture XYRight    = NexPicture(6,  7, "p6");
@@ -71,39 +96,6 @@
   NexPicture ZHome      = NexPicture(6, 10, "p9");
   NexPicture ZUp        = NexPicture(6, 11, "p10");
   NexPicture ZDown      = NexPicture(6, 12, "p11");
-
-  // Progress Bar
-  NexProgressBar sdbar  = NexProgressBar(1, 23, "j0");
-
-  // Slider
-  NexSlider sdlist      = NexSlider(4, 1,   "h0");
-
-  // Wafeform
-
-  // Touch area
-  NexHotspot hot0       = NexHotspot(1, 13, "hot0");
-  NexHotspot hot1       = NexHotspot(1, 15, "hot1");
-  NexHotspot hot2       = NexHotspot(1, 17, "hot2");
-  NexHotspot m11        = NexHotspot(2, 14, "m11");
-  NexHotspot tup        = NexHotspot(2, 16, "tup");
-  NexHotspot tdown      = NexHotspot(2, 17, "tdown");
-  NexHotspot ScrollUp   = NexHotspot(4, 27, "m0");
-  NexHotspot ScrollDown = NexHotspot(4, 28, "m1");
-
-  // Timer
-  NexTimer startimer    = NexTimer(0,  1, "tm0");
-  NexTimer fantimer     = NexTimer(1, 22, "tm0");
-
-  // Variable
-  NexVar Hotend         = NexVar(1, 19, "he");
-  NexVar Bed            = NexVar(1, 20, "bed");
-  NexVar set1           = NexVar(2, 17, "set1");
-  NexVar filename0      = NexVar(4, 19, "va0");
-  NexVar filename1      = NexVar(4, 20, "va1");
-  NexVar filename2      = NexVar(4, 21, "va2");
-  NexVar filename3      = NexVar(4, 22, "va3");
-  NexVar filename4      = NexVar(4, 23, "va4");
-  NexVar filename5      = NexVar(4, 24, "va5");
   NexVar movecmd        = NexVar(6, 18, "vacmd");
 
   NexTouch *nex_listen_list[] =
@@ -175,17 +167,6 @@
     NULL
   };
 
-  NexVar *filename_list[] =
-  {
-    &filename0,
-    &filename1,
-    &filename2,
-    &filename3,
-    &filename4,
-    &filename5,
-    NULL
-  };
-
   void setpageInfo() {
     Pinfo.show();
 
@@ -225,7 +206,6 @@
         row_list[row]->attachPop(sdfilePopCallback, row_list[row]);
       }
       row_list[row]->setText(filename);
-      filename_list[row]->setText(filename);
     }
 
     static void setrowsdcard(uint32_t number = 0) {
@@ -302,17 +282,17 @@
       memset(buffer, 0, sizeof(buffer));
 
       if (ptr == &sdrow0)
-        filename0.getText(buffer, sizeof(buffer));
+        sdrow0.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow1)
-        filename1.getText(buffer, sizeof(buffer));
+        sdrow1.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow2)
-        filename2.getText(buffer, sizeof(buffer));
+        sdrow2.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow3)
-        filename3.getText(buffer, sizeof(buffer));
+        sdrow3.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow4)
-        filename4.getText(buffer, sizeof(buffer));
+        sdrow4.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow5)
-        filename5.getText(buffer, sizeof(buffer));
+        sdrow5.getText(buffer, sizeof(buffer));
 
       menu_action_sdfile(buffer);
     }
@@ -321,17 +301,17 @@
       memset(buffer, 0, sizeof(buffer));
 
       if (ptr == &sdrow0)
-        filename0.getText(buffer, sizeof(buffer));
+        sdrow0.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow1)
-        filename1.getText(buffer, sizeof(buffer));
+        sdrow1.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow2)
-        filename2.getText(buffer, sizeof(buffer));
+        sdrow2.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow3)
-        filename3.getText(buffer, sizeof(buffer));
+        sdrow3.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow4)
-        filename4.getText(buffer, sizeof(buffer));
+        sdrow4.getText(buffer, sizeof(buffer));
       else if (ptr == &sdrow5)
-        filename5.getText(buffer, sizeof(buffer));
+        sdrow5.getText(buffer, sizeof(buffer));
 
       menu_action_sddirectory(buffer);
     }