Переглянути джерело

Fix compilation errors when encoder multiplier is disabled

wgm4321 9 роки тому
джерело
коміт
b8e79dce89
2 змінених файлів з 3 додано та 3 видалено
  1. 1
    1
      Marlin/Configuration_adv.h
  2. 2
    2
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Configuration_adv.h Переглянути файл

@@ -287,7 +287,7 @@
287 287
 #define ENCODER_RATE_MULTIPLIER	 		// If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly
288 288
 #define ENCODER_10X_STEPS_PER_SEC 75	// If the encoder steps per sec exceed this value, multiple the steps moved by ten to quickly advance the value
289 289
 #define ENCODER_100X_STEPS_PER_SEC 160  // If the encoder steps per sec exceed this value, multiple the steps moved by 100 to really quickly advance the value
290
-#define ENCODER_RATE_MULTIPLIER_DEBUG   // If defined, output the encoder steps per second value
290
+//#define ENCODER_RATE_MULTIPLIER_DEBUG   // If defined, output the encoder steps per second value
291 291
 
292 292
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
293 293
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again

+ 2
- 2
Marlin/ultralcd.cpp Переглянути файл

@@ -176,8 +176,8 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
176 176
 #define MENU_MULTIPLIER_ITEM_EDIT(type, label, args...) MENU_MULTIPLIER_ITEM(setting_edit_ ## type, label, PSTR(label) , ## args )
177 177
 #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, args...) MENU_MULTIPLIER_ITEM(setting_edit_callback_ ## type, label, PSTR(label) , ## args )
178 178
 #else
179
-#define MENU_ITEM_EDIT(type, label, args...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label) , ## args )
180
-#define MENU_ITEM_EDIT_CALLBACK(type, label, args...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label) , ## args )
179
+#define MENU_MULTIPLIER_ITEM_EDIT(type, label, args...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label) , ## args )
180
+#define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, args...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label) , ## args )
181 181
 #endif
182 182
 #define END_MENU() \
183 183
     if (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM >= _menuItemNr) encoderPosition = _menuItemNr * ENCODER_STEPS_PER_MENU_ITEM - 1; \

Завантаження…
Відмінити
Зберегти