Enumerate hotends for display in panel temperature settings

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

diff --git a/src/modules/utils/panel/screens/ExtruderScreen.cpp b/src/modules/utils/panel/screens/ExtruderScreen.cpp
index 084d1f7..9801913 100644 (file)
--- a/src/modules/utils/panel/screens/ExtruderScreen.cpp
+++ b/src/modules/utils/panel/screens/ExtruderScreen.cpp
@@ -17,47 +17,49 @@
 using namespace std;
 
 
-ExtruderScreen::ExtruderScreen(){
+ExtruderScreen::ExtruderScreen()
+{
 }
 
-void ExtruderScreen::on_enter(){
-    this->panel->enter_menu_mode();
-    this->panel->setup_menu(3);  // 3 menu items, 4 lines
-    this->refresh_screen();
+void ExtruderScreen::on_enter()
+{
+    THEPANEL->enter_menu_mode();
+    THEPANEL->setup_menu(3);
+    this->refresh_menu();
 }
 
-void ExtruderScreen::on_refresh(){
-    if( this->panel->menu_change() ){
-        this->refresh_screen();
+void ExtruderScreen::on_refresh()
+{
+    if ( THEPANEL->menu_change() ) {
+        this->refresh_menu();
     }
-    if( this->panel->click() ){
-        this->clicked_menu_entry(this->panel->get_menu_current_line());
+    if ( THEPANEL->click() ) {
+        this->clicked_menu_entry(THEPANEL->get_menu_current_line());
     }
 }
 
-void ExtruderScreen::refresh_screen(){
-    this->refresh_menu();
-}
-
-void ExtruderScreen::display_menu_line(uint16_t line){
-    switch( line ){
-        case 0: this->panel->lcd->printf("Back");  break;
-        case 1: this->panel->lcd->printf("Extrude 5mm"); break;
-        case 2: this->panel->lcd->printf("Retract 5mm");  break;
+void ExtruderScreen::display_menu_line(uint16_t line)
+{
+    switch ( line ) {
+        case 0: THEPANEL->lcd->printf("Back");  break;
+        case 1: THEPANEL->lcd->printf("Extrude 5mm"); break;
+        case 2: THEPANEL->lcd->printf("Retract 5mm");  break;
     }
 }
 
-void ExtruderScreen::clicked_menu_entry(uint16_t line){
-    switch( line ){
-        case 0: this->panel->enter_screen(this->parent); return;
-        case 1: command= "G91\nG1 E5\nG90"; break;
-        case 2: command= "G91\nG1 E-5\nG90"; break;
+void ExtruderScreen::clicked_menu_entry(uint16_t line)
+{
+    switch ( line ) {
+        case 0: THEPANEL->enter_screen(this->parent); return;
+        case 1: command = "G91\nG1 E5 F100\nG90"; break;
+        case 2: command = "G91\nG1 E-5 F100\nG90"; break;
     }
 }
 
 // queuing commands needs to be done from main loop
-void ExtruderScreen::on_main_loop() {
-    if(this->command.empty()) return;
+void ExtruderScreen::on_main_loop()
+{
+    if (this->command.empty()) return;
     send_command(this->command.c_str());
     this->command.clear();
 }