Browse Source

Tweak encoderPosition non-zero test

Scott Lahteine 8 years ago
parent
commit
165e73794a
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      Marlin/ultralcd.cpp

+ 4
- 4
Marlin/ultralcd.cpp View File

@@ -553,7 +553,7 @@ void lcd_set_home_offsets() {
553 553
 
554 554
   static void _lcd_babystep(const int axis, const char* msg) {
555 555
     ENCODER_DIRECTION_NORMAL();
556
-    if (encoderPosition != 0) {
556
+    if (encoderPosition) {
557 557
       int distance =  (int)encoderPosition * BABYSTEP_MULTIPLICATOR;
558 558
       encoderPosition = 0;
559 559
       lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
@@ -1124,7 +1124,7 @@ float move_menu_scale;
1124 1124
 
1125 1125
 static void _lcd_move(const char* name, AxisEnum axis, float min, float max) {
1126 1126
   ENCODER_DIRECTION_NORMAL();
1127
-  if ((encoderPosition != 0) && (movesplanned() <= 3)) {
1127
+  if (encoderPosition && movesplanned() <= 3) {
1128 1128
     refresh_cmd_timeout();
1129 1129
     current_position[axis] += float((int)encoderPosition) * move_menu_scale;
1130 1130
     if (min_software_endstops) NOLESS(current_position[axis], min);
@@ -1156,7 +1156,7 @@ static void lcd_move_e(
1156 1156
     unsigned short original_active_extruder = active_extruder;
1157 1157
     active_extruder = e;
1158 1158
   #endif
1159
-  if ((encoderPosition != 0) && (movesplanned() <= 3)) {
1159
+  if (encoderPosition && movesplanned() <= 3) {
1160 1160
     current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
1161 1161
     encoderPosition = 0;
1162 1162
     line_to_current(E_AXIS);
@@ -1641,7 +1641,7 @@ static void lcd_control_volumetric_menu() {
1641 1641
 #if ENABLED(HAS_LCD_CONTRAST)
1642 1642
   static void lcd_set_contrast() {
1643 1643
     ENCODER_DIRECTION_NORMAL();
1644
-    if (encoderPosition != 0) {
1644
+    if (encoderPosition) {
1645 1645
       #if ENABLED(U8GLIB_LM6059_AF)
1646 1646
         lcd_contrast += encoderPosition;
1647 1647
         lcd_contrast &= 0xFF;

Loading…
Cancel
Save