overworked ultralcd a bit

diff --git a/Marlin/cardreader.h b/Marlin/cardreader.h
index 44ebf0e2c1f4a014c62411b562cf6f0414ff9c34..18086e576873e6b118cf8a07ab7259a5ce0aba0e 100644 (file)
--- a/Marlin/cardreader.h
+++ b/Marlin/cardreader.h
@@ -35,6 +35,7 @@ public:
   inline int16_t get() {  sdpos = file.curPosition();return (int16_t)file.read();};
   inline void setIndex(long index) {sdpos = index;file.seekSet(index);};
   inline uint8_t percentDone(){if(!sdprinting) return 0; if(filesize) return sdpos*100/filesize; else return 0;};
+  inline char* getWorkDirName(){workDir.getFilename(filename);return filename;};
 
 public:
   bool saving;

diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index e6a16a408e5eb0a1a23905055478b1921be42ada..47396e4c176f801807013ac181e20b5730453394 100644 (file)
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -456,7 +456,7 @@ void MainMenu::showPrepare()
   switch(i)\r
   {\r
     case ItemP_exit:\r
-      MENUITEM(  lcdprintPGM(" Prepare")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
+      MENUITEM(  lcdprintPGM(" Main \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
       break;\r
     case ItemP_home:\r
       MENUITEM(  lcdprintPGM(" Auto Home")  ,  BLOCK;enquecommand("G28 X-105 Y-105 Z0");beepshort(); ) ;\r
@@ -493,7 +493,7 @@ void MainMenu::showTune()
   switch(i)\r
   {\r
   case ItemT_exit:\r
-      MENUITEM(  lcdprintPGM(" Tune")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
+      MENUITEM(  lcdprintPGM(" Main \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
       break;\r
   case ItemT_speed:\r
     {\r
@@ -673,7 +673,7 @@ void MainMenu::showControlTemp()
   switch(i)\r
   {\r
     case ItemCT_exit:\r
-      MENUITEM(  lcdprintPGM(" Temperature")  ,  BLOCK;status=Main_Control;beepshort(); ) ;\r
+      MENUITEM(  lcdprintPGM(" Control \003")  ,  BLOCK;status=Main_Control;beepshort(); ) ;\r
       break;\r
     case ItemCT_nozzle:\r
       {\r
@@ -915,7 +915,7 @@ void MainMenu::showControlMotion()
   switch(i)\r
   {\r
     case ItemCM_exit:\r
-      MENUITEM(  lcdprintPGM(" Motion")  ,  BLOCK;status=Main_Control;beepshort(); ) ;\r
+      MENUITEM(  lcdprintPGM(" Control \003")  ,  BLOCK;status=Main_Control;beepshort(); ) ;\r
       break;\r
     case ItemCM_acc:\r
     {\r
@@ -1230,7 +1230,7 @@ void MainMenu::showControl()
   switch(i)\r
   {\r
     case ItemC_exit:\r
-      MENUITEM(  lcdprintPGM(" Control     \x7E")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
+      MENUITEM(  lcdprintPGM(" Main        \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
       break;\r
     case ItemC_temp:\r
       MENUITEM(  lcdprintPGM(" Temperature \x7E")  ,  BLOCK;status=Sub_TempControl;beepshort(); ) ;\r
@@ -1317,7 +1317,7 @@ void MainMenu::showSD()
   switch(i)\r
   {\r
     case 0:\r
-      MENUITEM(  lcdprintPGM(" File")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
+      MENUITEM(  lcdprintPGM(" Main \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;\r
       break;\r
 //     case 1:\r
 //       {\r
@@ -1348,7 +1348,7 @@ void MainMenu::showSD()
 //         }\r
 //       }break;\r
     case 1:\r
-      MENUITEM(  lcdprintPGM(" ..")  ,  BLOCK;card.updir();enforceupdate=true;lineoffset=0;beepshort(); ) ;\r
+      MENUITEM(  lcd.print(" ");card.getWorkDirName();if(card.filename[0]=='/') lcdprintPGM("\004Refresh");else {lcd.print("\005");lcd.print(card.filename);lcd.print("/..");}  ,  BLOCK;card.updir();enforceupdate=true;lineoffset=0;beepshort(); ) ;\r
       \r
       break;\r
     default:\r
@@ -1435,10 +1435,10 @@ void MainMenu::showMainMenu()
     switch(line)\r
     { \r
       case ItemM_watch:\r
-        MENUITEM(  lcdprintPGM(" Watch")  ,  BLOCK;status=Main_Status;beepshort(); ) ;\r
+        MENUITEM(  lcdprintPGM(" Watch \003")  ,  BLOCK;status=Main_Status;beepshort(); ) ;\r
        break;\r
       case ItemM_prepare:\r
-        MENUITEM(  if(!tune) lcdprintPGM(" Prepare \x7E");else  lcdprintPGM(" Tune \x7E"); ,  BLOCK;status=Main_Prepare;beepshort(); ) ;\r
+        MENUITEM(  if(!tune) lcdprintPGM(" Prepare \x7E");else  lcdprintPGM(" Tune    \x7E"); ,  BLOCK;status=Main_Prepare;beepshort(); ) ;\r
       break;\r
        \r
       case ItemM_control:\r