Merge pull request #255 from wolfmanjm/upstreamedge

[clinton/Smoothieware.git] / src / modules / utils / panel / screens / WatchScreen.cpp

diff --git a/src/modules/utils/panel/screens/WatchScreen.cpp b/src/modules/utils/panel/screens/WatchScreen.cpp
index e1371da..9a66d52 100644 (file)
--- a/src/modules/utils/panel/screens/WatchScreen.cpp
+++ b/src/modules/utils/panel/screens/WatchScreen.cpp
@@ -196,6 +196,8 @@ void WatchScreen::get_sd_play_info(){
         struct pad_progress p=  *static_cast<struct pad_progress*>(returned_data);
         this->elapsed_time= p.elapsed_secs;
         this->sd_pcnt_played= p.percent_complete;
+        this->panel->set_playing_file(p.filename);
+
     }else{
         this->elapsed_time= 0;
         this->sd_pcnt_played= 0;
@@ -207,7 +209,7 @@ void WatchScreen::display_menu_line(uint16_t line){
     switch( line ){
         case 0: this->panel->lcd->printf("H%03d/%03dc B%03d/%03dc", this->hotendtemp, this->hotendtarget, this->bedtemp, this->bedtarget); break;
         case 1: this->panel->lcd->printf("X%4d Y%4d Z%7.2f", (int)round(this->pos[0]), (int)round(this->pos[1]), this->pos[2]); break;
-        case 2: this->panel->lcd->printf("%3d%% %2d:%02d %3d%% sd", this->current_speed, this->elapsed_time/60, this->elapsed_time%60, this->sd_pcnt_played); break;
+        case 2: this->panel->lcd->printf("%3d%% %2lu:%02lu %3u%% sd", this->current_speed, this->elapsed_time/60, this->elapsed_time%60, this->sd_pcnt_played); break;
         case 3: this->panel->lcd->printf("%19s", this->get_status()); break;
     }
 }