mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-27 13:56:24 +00:00
Modernize configs
This commit is contained in:
Scott Lahteine
parent
560d366b80
commit
09fa34a9e1
@ -601,7 +601,7 @@
|
||||
*/
|
||||
//#define BABYSTEPPING
|
||||
#if ENABLED(BABYSTEPPING)
|
||||
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
||||
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
||||
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
|
||||
#define BABYSTEP_MULTIPLICATOR 100 // Babysteps are very small. Increase for faster motion.
|
||||
//#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
|
||||
|
||||
@ -1106,57 +1106,46 @@
|
||||
//#define E4_IS_L6470
|
||||
|
||||
#define X_MICROSTEPS 16 // number of microsteps
|
||||
#define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be careful not to go too high
|
||||
#define X_OVERCURRENT 2000 // maxc current in mA. If the current goes over this value, the driver will switch off
|
||||
#define X_STALLCURRENT 1500 // current in mA where the driver will detect a stall
|
||||
|
||||
#define X2_MICROSTEPS 16
|
||||
#define X2_K_VAL 50
|
||||
#define X2_OVERCURRENT 2000
|
||||
#define X2_STALLCURRENT 1500
|
||||
|
||||
#define Y_MICROSTEPS 16
|
||||
#define Y_K_VAL 50
|
||||
#define Y_OVERCURRENT 2000
|
||||
#define Y_STALLCURRENT 1500
|
||||
|
||||
#define Y2_MICROSTEPS 16
|
||||
#define Y2_K_VAL 50
|
||||
#define Y2_OVERCURRENT 2000
|
||||
#define Y2_STALLCURRENT 1500
|
||||
|
||||
#define Z_MICROSTEPS 16
|
||||
#define Z_K_VAL 50
|
||||
#define Z_OVERCURRENT 2000
|
||||
#define Z_STALLCURRENT 1500
|
||||
|
||||
#define Z2_MICROSTEPS 16
|
||||
#define Z2_K_VAL 50
|
||||
#define Z2_OVERCURRENT 2000
|
||||
#define Z2_STALLCURRENT 1500
|
||||
|
||||
#define E0_MICROSTEPS 16
|
||||
#define E0_K_VAL 50
|
||||
#define E0_OVERCURRENT 2000
|
||||
#define E0_STALLCURRENT 1500
|
||||
|
||||
#define E1_MICROSTEPS 16
|
||||
#define E1_K_VAL 50
|
||||
#define E1_OVERCURRENT 2000
|
||||
#define E1_STALLCURRENT 1500
|
||||
|
||||
#define E2_MICROSTEPS 16
|
||||
#define E2_K_VAL 50
|
||||
#define E2_OVERCURRENT 2000
|
||||
#define E2_STALLCURRENT 1500
|
||||
|
||||
#define E3_MICROSTEPS 16
|
||||
#define E3_K_VAL 50
|
||||
#define E3_OVERCURRENT 2000
|
||||
#define E3_STALLCURRENT 1500
|
||||
|
||||
#define E4_MICROSTEPS 16
|
||||
#define E4_K_VAL 50
|
||||
#define E4_OVERCURRENT 2000
|
||||
#define E4_STALLCURRENT 1500
|
||||
|
||||
@ -1298,6 +1287,7 @@
|
||||
#if ENABLED(CUSTOM_USER_MENUS)
|
||||
#define USER_SCRIPT_DONE "M117 User Script Done"
|
||||
#define USER_SCRIPT_AUDIBLE_FEEDBACK
|
||||
//#define USER_SCRIPT_RETURN // Return to status screen after a script
|
||||
|
||||
#define USER_DESC_1 "Home & UBL Info"
|
||||
#define USER_GCODE_1 "G28\nG29 W"
|
||||
|
||||
@ -50,6 +50,9 @@
|
||||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#undef STAT_LED_RED_PIN
|
||||
#undef STAT_LED_BLUE_PIN
|
||||
|
||||
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
||||
|
||||
#undef DOGLCD_A0
|
||||
@ -59,8 +62,6 @@
|
||||
#define DOGLCD_CS 32
|
||||
#define BTN_ENC 12
|
||||
|
||||
#undef STAT_LED_RED_PIN
|
||||
#undef STAT_LED_BLUE_PIN
|
||||
#define STAT_LED_RED_PIN 64
|
||||
#define STAT_LED_BLUE_PIN 63
|
||||
|
||||
|
||||
@ -138,7 +138,7 @@
|
||||
#undef BEEPER_PIN
|
||||
#define BEEPER_PIN 12 // 33 isn't physically available to the LCD display
|
||||
#else
|
||||
#define STAT_LED_RED_PIN 32
|
||||
#define STAT_LED_RED_PIN 32
|
||||
#define STAT_LED_BLUE_PIN 35
|
||||
#endif
|
||||
|
||||
|
||||
@ -247,12 +247,11 @@
|
||||
#define DOGLCD_A0 59 // J3-8 & AUX-2
|
||||
#define DOGLCD_CS 63 // J5-3 & AUX-2
|
||||
|
||||
#ifdef ULTIPANEL
|
||||
|
||||
#define LCD_PINS_D5 71 // ENET_MDIO
|
||||
#define LCD_PINS_D6 73 // ENET_RX_ER
|
||||
#define LCD_PINS_D7 75 // ENET_RXD1
|
||||
#endif
|
||||
#ifdef ULTIPANEL
|
||||
#define LCD_PINS_D5 71 // ENET_MDIO
|
||||
#define LCD_PINS_D6 73 // ENET_RX_ER
|
||||
#define LCD_PINS_D7 75 // ENET_RXD1
|
||||
#endif
|
||||
|
||||
#if ENABLED(NEWPANEL)
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
@ -267,21 +266,21 @@
|
||||
//#define SHIFT_EN 41 // J5-4 & AUX-4
|
||||
#endif
|
||||
|
||||
#define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
|
||||
// When going up/down directory levels the SD card is
|
||||
// accessed but the garbage/lines are removed when the
|
||||
// LCD updates
|
||||
#define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
|
||||
// When going up/down directory levels the SD card is
|
||||
// accessed but the garbage/lines are removed when the
|
||||
// LCD updates
|
||||
|
||||
#define SDSORT_LIMIT 256 // Maximum number of sorted items (10-256). Costs 27 bytes each.
|
||||
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
|
||||
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
|
||||
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
|
||||
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
|
||||
#define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
|
||||
#define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
|
||||
#define SDSORT_LIMIT 256 // Maximum number of sorted items (10-256). Costs 27 bytes each.
|
||||
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
|
||||
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
|
||||
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
|
||||
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
|
||||
#define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
|
||||
#define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
|
||||
|
||||
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
||||
// #define LCD_SCREEN_ROT_180
|
||||
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
||||
// #define LCD_SCREEN_ROT_180
|
||||
|
||||
#undef BEEPER_PIN
|
||||
#define BEEPER_PIN 37 // may change if cable changes
|
||||
@ -309,12 +308,12 @@
|
||||
#define STAT_LED_BLUE_PIN 63 // may change if cable changes
|
||||
#define STAT_LED_RED_PIN 6 // may change if cable changes
|
||||
#endif
|
||||
|
||||
//#define MISO_PIN 50 // system defined J3-10 & AUX-3
|
||||
//#define MOSI_PIN 51 // system defined J3-10 & AUX-3
|
||||
//#define SCK_PIN 52 // system defined J3-9 & AUX-3
|
||||
//#define SS_PIN 53 // system defined J3-5 & AUX-3 - sometimes called SDSS
|
||||
|
||||
|
||||
#if ENABLED(MINIPANEL)
|
||||
// GLCD features
|
||||
//#define LCD_CONTRAST 190
|
||||
|
||||
Loading…
Reference in New Issue
Block a user