Browse Source

Define lcd_move_[xyz] ahead of lcd_move_menu_axis

Scott Lahteine 10 years ago
parent
commit
fb4cefc91d
1 changed files with 13 additions and 13 deletions
  1. 13
    13
      Marlin/ultralcd.cpp

+ 13
- 13
Marlin/ultralcd.cpp View File

666
   #endif
666
   #endif
667
 }
667
 }
668
 
668
 
669
-float move_menu_scale;
670
-static void lcd_move_menu_axis() {
671
-  START_MENU();
672
-  MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
673
-  MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x);
674
-  MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
675
-  if (move_menu_scale < 10.0) {
676
-    MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
677
-    MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
678
-  }
679
-  END_MENU();
680
-}
681
-
682
 static void _lcd_move(const char *name, int axis, int min, int max) {
669
 static void _lcd_move(const char *name, int axis, int min, int max) {
683
   if (encoderPosition != 0) {
670
   if (encoderPosition != 0) {
684
     refresh_cmd_timeout();
671
     refresh_cmd_timeout();
696
 static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
683
 static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
697
 static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
684
 static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
698
 
685
 
686
+float move_menu_scale;
687
+static void lcd_move_menu_axis() {
688
+  START_MENU();
689
+  MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
690
+  MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x);
691
+  MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
692
+  if (move_menu_scale < 10.0) {
693
+    MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
694
+    MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
695
+  }
696
+  END_MENU();
697
+}
698
+
699
 static void lcd_move_e() {
699
 static void lcd_move_e() {
700
   if (encoderPosition != 0) {
700
   if (encoderPosition != 0) {
701
     current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
701
     current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;

Loading…
Cancel
Save