Browse Source

Shuffling declarations..

Scott Lahteine 10 years ago
parent
commit
5914d9d7de
1 changed files with 10 additions and 11 deletions
  1. 10
    11
      Marlin/ultralcd.cpp

+ 10
- 11
Marlin/ultralcd.cpp View File

685
 static void lcd_move_x() { _lcd_move(PSTR("X"), X_AXIS, X_MIN_POS, X_MAX_POS); }
685
 static void lcd_move_x() { _lcd_move(PSTR("X"), X_AXIS, X_MIN_POS, X_MAX_POS); }
686
 static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
686
 static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
687
 static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
687
 static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
688
+static void lcd_move_e() {
689
+  if (encoderPosition != 0) {
690
+    current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
691
+    encoderPosition = 0;
692
+    line_to_current();
693
+    lcdDrawUpdate = 1;
694
+  }
695
+  if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("Extruder"), ftostr31(current_position[E_AXIS]));
696
+  if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
697
+}
688
 
698
 
689
 static void lcd_move_menu_axis() {
699
 static void lcd_move_menu_axis() {
690
   START_MENU();
700
   START_MENU();
698
   END_MENU();
708
   END_MENU();
699
 }
709
 }
700
 
710
 
701
-static void lcd_move_e() {
702
-  if (encoderPosition != 0) {
703
-    current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
704
-    encoderPosition = 0;
705
-    line_to_current();
706
-    lcdDrawUpdate = 1;
707
-  }
708
-  if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("Extruder"), ftostr31(current_position[E_AXIS]));
709
-  if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
710
-}
711
-
712
 static void lcd_move_menu_10mm() {
711
 static void lcd_move_menu_10mm() {
713
   move_menu_scale = 10.0;
712
   move_menu_scale = 10.0;
714
   lcd_move_menu_axis();
713
   lcd_move_menu_axis();

Loading…
Cancel
Save