From 5914d9d7def75080f97542b7e5fef8e4be05c4ce Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 9 Apr 2015 20:21:30 -0700
Subject: [PATCH] Shuffling declarations..
---
Marlin/ultralcd.cpp | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index e3b7d2ef8f..62440a3cdf 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -685,6 +685,16 @@ static void _lcd_move(const char *name, int axis, int min, int max) {
static void lcd_move_x() { _lcd_move(PSTR("X"), X_AXIS, X_MIN_POS, X_MAX_POS); }
static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
+static void lcd_move_e() {
+ if (encoderPosition != 0) {
+ current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
+ encoderPosition = 0;
+ line_to_current();
+ lcdDrawUpdate = 1;
+ }
+ if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("Extruder"), ftostr31(current_position[E_AXIS]));
+ if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
+}
static void lcd_move_menu_axis() {
START_MENU();
@@ -698,17 +708,6 @@ static void lcd_move_menu_axis() {
END_MENU();
}
-static void lcd_move_e() {
- if (encoderPosition != 0) {
- current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
- encoderPosition = 0;
- line_to_current();
- lcdDrawUpdate = 1;
- }
- if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("Extruder"), ftostr31(current_position[E_AXIS]));
- if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
-}
-
static void lcd_move_menu_10mm() {
move_menu_scale = 10.0;
lcd_move_menu_axis();
--
GitLab