Define 'filelist' for dgus/origin

MarlinFirmware · May 2, 2021 · 1f72b4f · 1f72b4f
1 parent 50195ec
commit 1f72b4f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
@@ -24,29 +24,29 @@
 #include "../DGUSDisplayDef.h"
 
 enum DGUSLCD_Screens : uint8_t {
-  DGUSLCD_SCREEN_BOOT = 0,
-  DGUSLCD_SCREEN_MAIN = 10,
-  DGUSLCD_SCREEN_TEMPERATURE = 20,
-  DGUSLCD_SCREEN_STATUS = 30,
-  DGUSLCD_SCREEN_STATUS2 = 32,
-  DGUSLCD_SCREEN_MANUALMOVE = 40,
-  DGUSLCD_SCREEN_MANUALEXTRUDE=42,
-  DGUSLCD_SCREEN_FANANDFEEDRATE = 44,
-  DGUSLCD_SCREEN_FLOWRATES = 46,
-  DGUSLCD_SCREEN_SDFILELIST = 50,
+  DGUSLCD_SCREEN_BOOT                = 0,
+  DGUSLCD_SCREEN_MAIN                = 10,
+  DGUSLCD_SCREEN_TEMPERATURE         = 20,
+  DGUSLCD_SCREEN_STATUS              = 30,
+  DGUSLCD_SCREEN_STATUS2             = 32,
+  DGUSLCD_SCREEN_MANUALMOVE          = 40,
+  DGUSLCD_SCREEN_MANUALEXTRUDE       = 42,
+  DGUSLCD_SCREEN_FANANDFEEDRATE      = 44,
+  DGUSLCD_SCREEN_FLOWRATES           = 46,
+  DGUSLCD_SCREEN_SDFILELIST          = 50,
   DGUSLCD_SCREEN_SDPRINTMANIPULATION = 52,
-  DGUSLCD_SCREEN_POWER_LOSS = 100,
-  DGUSLCD_SCREEN_PREHEAT=120,
-  DGUSLCD_SCREEN_UTILITY=110,
-  DGUSLCD_SCREEN_FILAMENT_HEATING=146,
-  DGUSLCD_SCREEN_FILAMENT_LOADING=148,
-  DGUSLCD_SCREEN_FILAMENT_UNLOADING=158,
-  DGUSLCD_SCREEN_SDPRINTTUNE = 170,
-  DGUSLCD_SCREEN_CONFIRM = 240,
-  DGUSLCD_SCREEN_KILL = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
-  DGUSLCD_SCREEN_WAITING = 251,
-  DGUSLCD_SCREEN_POPUP = 252,  ///< special target, popup screen will also return this code to say "return to previous screen"
-  DGUSLDC_SCREEN_UNUSED = 255
+  DGUSLCD_SCREEN_POWER_LOSS          = 100,
+  DGUSLCD_SCREEN_PREHEAT             = 120,
+  DGUSLCD_SCREEN_UTILITY             = 110,
+  DGUSLCD_SCREEN_FILAMENT_HEATING    = 146,
+  DGUSLCD_SCREEN_FILAMENT_LOADING    = 148,
+  DGUSLCD_SCREEN_FILAMENT_UNLOADING  = 158,
+  DGUSLCD_SCREEN_SDPRINTTUNE         = 170,
+  DGUSLCD_SCREEN_CONFIRM             = 240,
+  DGUSLCD_SCREEN_KILL                = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
+  DGUSLCD_SCREEN_WAITING             = 251,
+  DGUSLCD_SCREEN_POPUP               = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
+  DGUSLDC_SCREEN_UNUSED              = 255
 };
 
 // Display Memory layout used (T5UID)

diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
@@ -42,6 +42,8 @@
 
 #if ENABLED(SDSUPPORT)
 
+  static ExtUI::FileList filelist;
+
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
     if (touched_nr > filelist.count()) return;