Quellcode durchsuchen

Readability of MENU_MULTIPLIER_ITEM

Last commit before bed.
Scott Lahteine vor 9 Jahren
Ursprung
Commit
a8939eec28
1 geänderte Dateien mit 16 neuen und 15 gelöschten Zeilen
  1. 16
    15
      Marlin/ultralcd.cpp

+ 16
- 15
Marlin/ultralcd.cpp Datei anzeigen

@@ -150,22 +150,23 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
150 150
 #ifdef ENCODER_RATE_MULTIPLIER
151 151
 #define MENU_MULTIPLIER_ITEM(type, label, args...) do { \
152 152
     if (_menuItemNr == _lineNr) { \
153
-        if (lcdDrawUpdate) { \
154
-            const char* _label_pstr = PSTR(label); \
155
-            if ((encoderPosition / ENCODER_STEPS_PER_MENU_ITEM) == _menuItemNr) { \
156
-                lcd_implementation_drawmenu_ ## type ## _selected (_drawLineNr, _label_pstr , ## args ); \
157
-                              }else{\
158
-                lcd_implementation_drawmenu_ ## type (_drawLineNr, _label_pstr , ## args ); \
159
-                              }\
160
-                    }\
161
-        if (wasClicked && (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM) == _menuItemNr) {\
162
-            lcd_quick_feedback(); \
163
-      encoderRateMultiplierEnabled = true; \
164
-      lastEncoderMovementMillis = 0; \
165
-            menu_action_ ## type ( args ); \
166
-            return;\
167
-                }\
153
+      if (lcdDrawUpdate) { \
154
+        const char* _label_pstr = PSTR(label); \
155
+        if ((encoderPosition / ENCODER_STEPS_PER_MENU_ITEM) == _menuItemNr) { \
156
+          lcd_implementation_drawmenu_ ## type ## _selected (_drawLineNr, _label_pstr , ## args ); \
157
+        }
158
+        else {\
159
+          lcd_implementation_drawmenu_ ## type (_drawLineNr, _label_pstr , ## args ); \
168 160
         }\
161
+      }\
162
+      if (wasClicked && (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM) == _menuItemNr) {\
163
+        lcd_quick_feedback(); \
164
+        encoderRateMultiplierEnabled = true; \
165
+        lastEncoderMovementMillis = 0; \
166
+        menu_action_ ## type ( args ); \
167
+        return;\
168
+      }\
169
+    }\
169 170
     _menuItemNr++;\
170 171
 } while(0)
171 172
 #endif

Laden…
Abbrechen
Speichern