Remove buttons

Deltaprintr · Dec 19, 2017 · 301ff7d · 301ff7d
1 parent f100f84
commit 301ff7d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/src/modules/utils/.DS_Store b/src/modules/utils/.DS_Store
diff --git a/src/modules/utils/panel/.DS_Store b/src/modules/utils/panel/.DS_Store
diff --git a/src/modules/utils/panel/screens/3dprinter/MainMenuScreen.cpp b/src/modules/utils/panel/screens/3dprinter/MainMenuScreen.cpp
@@ -100,7 +100,7 @@ void MainMenuScreen::setupConfigureScreen()
 void MainMenuScreen::on_enter()
 {
     THEPANEL->enter_menu_mode();
-    THEPANEL->setup_menu(7);
+    THEPANEL->setup_menu(9);
     this->refresh_menu();
 }
 
@@ -117,13 +117,15 @@ void MainMenuScreen::on_refresh()
 void MainMenuScreen::display_menu_line(uint16_t line)
 {
     switch ( line ) {
-        case 0: THEPANEL->lcd->printf("Watch"); break;
-        case 1: if(THEKERNEL->is_halted()) THEPANEL->lcd->printf("Clear HALT"); else THEPANEL->lcd->printf(THEPANEL->is_playing() ? "Abort" : "Play"); break;
+        case 0: THEPANEL->lcd->printf("Info Screen"); break;
+        case 1: if(THEKERNEL->is_halted()) THEPANEL->lcd->printf("Clear HALT"); else THEPANEL->lcd->printf(THEPANEL->is_playing() ? "Abort Print" : "Print from SD Card"); break;
         case 2: THEPANEL->lcd->printf("Jog"); break;
         case 3: THEPANEL->lcd->printf("Prepare"); break;
-        case 4: THEPANEL->lcd->printf("Custom"); break;
-        case 5: THEPANEL->lcd->printf("Configure"); break;
-        case 6: THEPANEL->lcd->printf("Probe"); break;
+        case 4: THEPANEL->lcd->printf("Load filament"); break;
+        case 5: THEPANEL->lcd->printf("Unload filament"); break;
+        case 6: THEPANEL->lcd->printf("Custom"); break;
+        case 7: THEPANEL->lcd->printf("Settings"); break;
+        case 8: THEPANEL->lcd->printf("Calibration"); break;
     }
 }
 
@@ -140,6 +142,8 @@ void MainMenuScreen::clicked_menu_entry(uint16_t line)
         case 2: THEPANEL->enter_screen(this->jog_screen     ); break;
         case 3: THEPANEL->enter_screen(this->prepare_screen ); break;
         case 4: THEPANEL->enter_screen(THEPANEL->custom_screen ); break;
+        case 3: THEPANEL->enter_screen(this->load_filament_screen ); break;
+        case 3: THEPANEL->enter_screen(this->unload_filament_screen ); break;
         case 5: setupConfigureScreen(); break;
         case 6: THEPANEL->enter_screen((new ProbeScreen())->set_parent(this)); break;
     }
@@ -151,4 +155,3 @@ void MainMenuScreen::abort_playing()
     send_command("abort");
     THEPANEL->enter_screen(this->watch_screen);
 }
-
diff --git a/src/modules/utils/panel/screens/3dprinter/PrepareScreen.cpp b/src/modules/utils/panel/screens/3dprinter/PrepareScreen.cpp
@@ -39,7 +39,7 @@ void PrepareScreen::on_enter()
 {
     THEPANEL->enter_menu_mode();
     // if no heaters or extruder then don't show related menu items
-    THEPANEL->setup_menu((this->extruder_screen != nullptr) ? 9 : 5);
+    THEPANEL->setup_menu((this->extruder_screen != nullptr) ? 7 : 5);
     this->refresh_menu();
 }
 
@@ -58,14 +58,14 @@ void PrepareScreen::display_menu_line(uint16_t line)
     switch ( line ) {
         case 0: THEPANEL->lcd->printf("Back"           ); break;
         case 1: THEPANEL->lcd->printf("Home All Axes"  ); break;
-        case 2: THEPANEL->lcd->printf("Set X0Y0"       ); break;
-        case 3: THEPANEL->lcd->printf("Set Z0"         ); break;
-        case 4: THEPANEL->lcd->printf("Motors off"     ); break;
+        //case 2: THEPANEL->lcd->printf("Set X0Y0"       ); break;
+        //case 3: THEPANEL->lcd->printf("Set Z0"         ); break;
+        case 2: THEPANEL->lcd->printf("Motors off"     ); break;
         // these won't be accessed if no heaters or extruders
-        case 5: THEPANEL->lcd->printf("Pre Heat"       ); break;
-        case 6: THEPANEL->lcd->printf("Cool Down"      ); break;
-        case 7: THEPANEL->lcd->printf("Extruder..."    ); break;
-        case 8: THEPANEL->lcd->printf("Set Temperature"); break;
+        case 3: THEPANEL->lcd->printf("Pre Heat"       ); break;
+        case 4: THEPANEL->lcd->printf("Cool Down"      ); break;
+        case 5: THEPANEL->lcd->printf("Extruder..."    ); break;
+        case 6: THEPANEL->lcd->printf("Set Temperature"); break;
     }
 }
 
@@ -74,13 +74,13 @@ void PrepareScreen::clicked_menu_entry(uint16_t line)
     switch ( line ) {
         case 0: THEPANEL->enter_screen(this->parent); break;
         case 1: send_command("G28"); break;
-        case 2: send_command("G92 X0 Y0"); break;
-        case 3: send_command("G92 Z0"); break;
-        case 4: send_command("M84"); break;
-        case 5: this->preheat(); break;
-        case 6: this->cooldown(); break;
-        case 7: THEPANEL->enter_screen(this->extruder_screen); break;
-        case 8: setup_temperature_screen(); break;
+        //case 2: send_command("G92 X0 Y0"); break;
+        //case 3: send_command("G92 Z0"); break;
+        case 2: send_command("M84"); break;
+        case 3: this->preheat(); break;
+        case 4: this->cooldown(); break;
+        case 5: THEPANEL->enter_screen(this->extruder_screen); break;
+        case 6: setup_temperature_screen(); break;
     }
 }
 

diff --git a/src/modules/utils/panel/screens/3dprinter/WatchScreen.cpp b/src/modules/utils/panel/screens/3dprinter/WatchScreen.cpp
@@ -275,7 +275,7 @@ const char *WatchScreen::get_status()
         return THEPANEL->getMessage().c_str();
 
     if (THEKERNEL->is_halted())
-        return "HALTED Reset or M999";
+        return "Printer HALTED. Reset power.";
 
     if (THEPANEL->is_suspended())
         return "Suspended";
@@ -288,7 +288,7 @@ const char *WatchScreen::get_status()
 
     const char *ip = get_network();
     if (ip == NULL) {
-        return "Smoothie ready";
+        return "Delta Go ready";
     } else {
         return ip;
     }