瀏覽代碼

Define 'filelist' for dgus/origin

Scott Lahteine 4 年之前
父節點
當前提交
a95a21a353

+ 22
- 22
Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h 查看文件

24
 #include "../DGUSDisplayDef.h"
24
 #include "../DGUSDisplayDef.h"
25
 
25
 
26
 enum DGUSLCD_Screens : uint8_t {
26
 enum DGUSLCD_Screens : uint8_t {
27
-  DGUSLCD_SCREEN_BOOT = 0,
28
-  DGUSLCD_SCREEN_MAIN = 10,
29
-  DGUSLCD_SCREEN_TEMPERATURE = 20,
30
-  DGUSLCD_SCREEN_STATUS = 30,
31
-  DGUSLCD_SCREEN_STATUS2 = 32,
32
-  DGUSLCD_SCREEN_MANUALMOVE = 40,
33
-  DGUSLCD_SCREEN_MANUALEXTRUDE=42,
34
-  DGUSLCD_SCREEN_FANANDFEEDRATE = 44,
35
-  DGUSLCD_SCREEN_FLOWRATES = 46,
36
-  DGUSLCD_SCREEN_SDFILELIST = 50,
27
+  DGUSLCD_SCREEN_BOOT                = 0,
28
+  DGUSLCD_SCREEN_MAIN                = 10,
29
+  DGUSLCD_SCREEN_TEMPERATURE         = 20,
30
+  DGUSLCD_SCREEN_STATUS              = 30,
31
+  DGUSLCD_SCREEN_STATUS2             = 32,
32
+  DGUSLCD_SCREEN_MANUALMOVE          = 40,
33
+  DGUSLCD_SCREEN_MANUALEXTRUDE       = 42,
34
+  DGUSLCD_SCREEN_FANANDFEEDRATE      = 44,
35
+  DGUSLCD_SCREEN_FLOWRATES           = 46,
36
+  DGUSLCD_SCREEN_SDFILELIST          = 50,
37
   DGUSLCD_SCREEN_SDPRINTMANIPULATION = 52,
37
   DGUSLCD_SCREEN_SDPRINTMANIPULATION = 52,
38
-  DGUSLCD_SCREEN_POWER_LOSS = 100,
39
-  DGUSLCD_SCREEN_PREHEAT=120,
40
-  DGUSLCD_SCREEN_UTILITY=110,
41
-  DGUSLCD_SCREEN_FILAMENT_HEATING=146,
42
-  DGUSLCD_SCREEN_FILAMENT_LOADING=148,
43
-  DGUSLCD_SCREEN_FILAMENT_UNLOADING=158,
44
-  DGUSLCD_SCREEN_SDPRINTTUNE = 170,
45
-  DGUSLCD_SCREEN_CONFIRM = 240,
46
-  DGUSLCD_SCREEN_KILL = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
47
-  DGUSLCD_SCREEN_WAITING = 251,
48
-  DGUSLCD_SCREEN_POPUP = 252,  ///< special target, popup screen will also return this code to say "return to previous screen"
49
-  DGUSLDC_SCREEN_UNUSED = 255
38
+  DGUSLCD_SCREEN_POWER_LOSS          = 100,
39
+  DGUSLCD_SCREEN_PREHEAT             = 120,
40
+  DGUSLCD_SCREEN_UTILITY             = 110,
41
+  DGUSLCD_SCREEN_FILAMENT_HEATING    = 146,
42
+  DGUSLCD_SCREEN_FILAMENT_LOADING    = 148,
43
+  DGUSLCD_SCREEN_FILAMENT_UNLOADING  = 158,
44
+  DGUSLCD_SCREEN_SDPRINTTUNE         = 170,
45
+  DGUSLCD_SCREEN_CONFIRM             = 240,
46
+  DGUSLCD_SCREEN_KILL                = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
47
+  DGUSLCD_SCREEN_WAITING             = 251,
48
+  DGUSLCD_SCREEN_POPUP               = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
49
+  DGUSLDC_SCREEN_UNUSED              = 255
50
 };
50
 };
51
 
51
 
52
 // Display Memory layout used (T5UID)
52
 // Display Memory layout used (T5UID)

+ 2
- 0
Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp 查看文件

42
 
42
 
43
 #if ENABLED(SDSUPPORT)
43
 #if ENABLED(SDSUPPORT)
44
 
44
 
45
+  static ExtUI::FileList filelist;
46
+
45
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
47
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
46
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
48
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
47
     if (touched_nr > filelist.count()) return;
49
     if (touched_nr > filelist.count()) return;

Loading…
取消
儲存