Browse Source

Allow override of ENCODER_FEEDRATE_DEADZONE, lower default for Viki

Scott Lahteine 8 years ago
parent
commit
10ebf28ee3
1 changed files with 6 additions and 2 deletions
  1. 6
    2
      Marlin/ultralcd.cpp

+ 6
- 2
Marlin/ultralcd.cpp View File

189
     static void menu_action_sddirectory(const char* filename, char* longFilename);
189
     static void menu_action_sddirectory(const char* filename, char* longFilename);
190
   #endif
190
   #endif
191
 
191
 
192
-  #define ENCODER_FEEDRATE_DEADZONE 10
193
-
194
   #if DISABLED(LCD_I2C_VIKI)
192
   #if DISABLED(LCD_I2C_VIKI)
193
+    #ifndef ENCODER_FEEDRATE_DEADZONE
194
+      #define ENCODER_FEEDRATE_DEADZONE 10
195
+    #endif
195
     #ifndef ENCODER_STEPS_PER_MENU_ITEM
196
     #ifndef ENCODER_STEPS_PER_MENU_ITEM
196
       #define ENCODER_STEPS_PER_MENU_ITEM 5
197
       #define ENCODER_STEPS_PER_MENU_ITEM 5
197
     #endif
198
     #endif
199
       #define ENCODER_PULSES_PER_STEP 1
200
       #define ENCODER_PULSES_PER_STEP 1
200
     #endif
201
     #endif
201
   #else
202
   #else
203
+    #ifndef ENCODER_FEEDRATE_DEADZONE
204
+      #define ENCODER_FEEDRATE_DEADZONE 4
205
+    #endif
202
     #ifndef ENCODER_STEPS_PER_MENU_ITEM
206
     #ifndef ENCODER_STEPS_PER_MENU_ITEM
203
       #define ENCODER_STEPS_PER_MENU_ITEM 2 // VIKI LCD rotary encoder uses a different number of steps per rotation
207
       #define ENCODER_STEPS_PER_MENU_ITEM 2 // VIKI LCD rotary encoder uses a different number of steps per rotation
204
     #endif
208
     #endif

Loading…
Cancel
Save