MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply some tweaks based on 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine 2017-10-09 16:28:33 -05:00
parent ae256576e1
commit 067622fcc6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Conditionals_LCD.h
View File

@ -206,6 +206,9 @@
#ifndef ENCODER_STEPS_PER_MENU_ITEM #ifndef ENCODER_STEPS_PER_MENU_ITEM
#define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM #define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM
#endif #endif
#ifndef ENCODER_FEEDRATE_DEADZONE
#define ENCODER_FEEDRATE_DEADZONE 6
#endif
// Shift register panels // Shift register panels
// --------------------- // ---------------------

5
Marlin/pins_AZTEEG_X3.h
View File

@ -50,6 +50,9 @@
// //
// LCD / Controller // LCD / Controller
// //
#undef STAT_LED_RED_PIN
#undef STAT_LED_BLUE_PIN
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#undef DOGLCD_A0 #undef DOGLCD_A0
@ -59,8 +62,6 @@
#define DOGLCD_CS 32 #define DOGLCD_CS 32
#define BTN_ENC 12 #define BTN_ENC 12
#undef STAT_LED_RED_PIN
#undef STAT_LED_BLUE_PIN
#define STAT_LED_RED_PIN 64 #define STAT_LED_RED_PIN 64
#define STAT_LED_BLUE_PIN 63 #define STAT_LED_BLUE_PIN 63