3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4277 from thinkyhead/rc_mks_13_viki2

Browse source 
Support for VIKI2 with MKS 1.3 / 1.4
This commit is contained in:
Scott Lahteine 2016-07-16 23:49:33 -07:00 • committed by GitHub
commit 9766e24504
3 changed files with 114 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Marlin/ultralcd.cpp
View file

@ -184,9 +184,10 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
static void menu_action_sddirectory(const char* filename, char* longFilename);
#endif
#define ENCODER_FEEDRATE_DEADZONE 10
#if DISABLED(LCD_I2C_VIKI)
#ifndef ENCODER_FEEDRATE_DEADZONE
#define ENCODER_FEEDRATE_DEADZONE 10
#endif
#ifndef ENCODER_STEPS_PER_MENU_ITEM
#define ENCODER_STEPS_PER_MENU_ITEM 5
#endif
@ -194,6 +195,9 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
#define ENCODER_PULSES_PER_STEP 1
#endif
#else
#ifndef ENCODER_FEEDRATE_DEADZONE
#define ENCODER_FEEDRATE_DEADZONE 4
#endif
#ifndef ENCODER_STEPS_PER_MENU_ITEM
#define ENCODER_STEPS_PER_MENU_ITEM 2 // VIKI LCD rotary encoder uses a different number of steps per rotation
#endif