Bring default Configuration.h up to date

This commit is contained in:
Scott Lahteine
2018-07-03 18:08:26 -05:00
parent 0702c78e62
commit 559e935785

View File

@@ -438,15 +438,20 @@
// @section extruder // @section extruder
// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP. /**
// It also enables the M302 command to set the minimum extrusion temperature * Prevent extrusion if the temperature is below EXTRUDE_MINTEMP.
// or to allow moving the extruder regardless of the hotend temperature. * Add M302 to set the minimum extrusion temperature and/or turn
// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** * cold extrusion prevention on and off.
*
* *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
*/
#define PREVENT_COLD_EXTRUSION #define PREVENT_COLD_EXTRUSION
#define EXTRUDE_MINTEMP 170 #define EXTRUDE_MINTEMP 170
// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH. /**
// Note that for Bowden Extruders a too-small value here may prevent loading. * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH.
* Note: For Bowden Extruders make this large enough to allow load/unload.
*/
#define PREVENT_LENGTHY_EXTRUDE #define PREVENT_LENGTHY_EXTRUDE
#define EXTRUDE_MAXLENGTH 200 #define EXTRUDE_MAXLENGTH 200
@@ -1378,19 +1383,6 @@
*/ */
#define DISPLAY_CHARSET_HD44780 JAPANESE #define DISPLAY_CHARSET_HD44780 JAPANESE
/**
* LCD TYPE
*
* Enable ULTRA_LCD for a 16x2, 16x4, 20x2, or 20x4 character-based LCD.
* Enable DOGLCD for a 128x64 (ST7565R) Full Graphical Display.
* (These options will be enabled automatically for most displays.)
*
* IMPORTANT: The U8glib library is required for Full Graphic Display!
* https://github.com/olikraus/U8glib_Arduino
*/
//#define ULTRA_LCD // Character based
//#define DOGLCD // Full graphics display
/** /**
* SD CARD * SD CARD
* *
@@ -1490,12 +1482,18 @@
//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
//#define LCD_FEEDBACK_FREQUENCY_HZ 5000 //#define LCD_FEEDBACK_FREQUENCY_HZ 5000
//=============================================================================
//======================== LCD / Controller Selection =========================
//======================== (Character-based LCDs) =========================
//=============================================================================
// //
// CONTROLLER TYPE: Standard // RepRapDiscount Smart Controller.
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
// //
// Marlin supports a wide variety of controllers. // Note: Usually sold with a white PCB.
// Enable one of the following options to specify your controller.
// //
//#define REPRAP_DISCOUNT_SMART_CONTROLLER
// //
// ULTIMAKER Controller. // ULTIMAKER Controller.
@@ -1513,40 +1511,6 @@
// //
//#define PANEL_ONE //#define PANEL_ONE
//
// MaKr3d Makr-Panel with graphic controller and SD support.
// http://reprap.org/wiki/MaKr3d_MaKrPanel
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD
// http://panucatt.com
//
//#define VIKI2
//#define miniVIKI
//
// Adafruit ST7565 Full Graphic Controller.
// https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
//
//#define ELB_FULL_GRAPHIC_CONTROLLER
//
// RepRapDiscount Smart Controller.
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
//
// Note: Usually sold with a white PCB.
//
//#define REPRAP_DISCOUNT_SMART_CONTROLLER
// //
// GADGETS3D G3D LCD/SD Controller // GADGETS3D G3D LCD/SD Controller
// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
@@ -1555,28 +1519,6 @@
// //
//#define G3D_PANEL //#define G3D_PANEL
//
// RepRapDiscount FULL GRAPHIC Smart Controller
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
//
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
//
// MakerLab Mini Panel with graphic
// controller and SD support - http://reprap.org/wiki/Mini_panel
//
//#define MINIPANEL
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
//
// REPRAPWORLD_KEYPAD_MOVE_STEP sets how much should the robot move when a key
// is pressed, a value of 10.0 means 10mm per click.
//
//#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0
// http://www.inventapart.com/ // http://www.inventapart.com/
@@ -1584,39 +1526,28 @@
//#define RIGIDBOT_PANEL //#define RIGIDBOT_PANEL
// //
// BQ LCD Smart Controller shipped by // Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
// default with the BQ Hephestos 2 and Witbox 2. // https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
// //
//#define BQ_LCD_SMART_CONTROLLER //#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
// //
// Cartesio UI // ANET and Tronxy 20x4 Controller
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//
//#define CARTESIO_UI
//
// ANET and Tronxy Controller supported displays.
// //
//#define ZONESTAR_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin. //#define ZONESTAR_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference // This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up. // which scrambles the display. Pressing any button clears it up.
// This is a LCD2004 display with 5 analog buttons. // This is a LCD2004 display with 5 analog buttons.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6 //
// A clone of the RepRapDiscount full graphics display but with // Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD.
// different pins/wiring (see pins_ANET_10.h). //
//#define ULTRA_LCD
// //=============================================================================
// LCD for Melzi Card with Graphical LCD //======================== LCD / Controller Selection =========================
// //===================== (I2C and Shift-Register LCDs) =====================
//#define LCD_FOR_MELZI //=============================================================================
//
// LCD for Malyan M200 printers.
// This requires SDSUPPORT to be enabled
//
//#define MALYAN_LCD
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
@@ -1663,6 +1594,83 @@
// //
//#define LCD_I2C_VIKI //#define LCD_I2C_VIKI
//
// CONTROLLER TYPE: Shift register panels
//
//
// 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH
// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
//
//#define SAV_3DLCD
//=============================================================================
//======================= LCD / Controller Selection =======================
//========================= (Graphical LCDs) ========================
//=============================================================================
//
// CONTROLLER TYPE: Graphical 128x64 (DOGM)
//
// IMPORTANT: The U8glib library is required for Graphical Display!
// https://github.com/olikraus/U8glib_Arduino
//
//
// RepRapDiscount FULL GRAPHIC Smart Controller
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
//
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD
// http://panucatt.com
//
//#define VIKI2
//#define miniVIKI
//
// MakerLab Mini Panel with graphic
// controller and SD support - http://reprap.org/wiki/Mini_panel
//
//#define MINIPANEL
//
// MaKr3d Makr-Panel with graphic controller and SD support.
// http://reprap.org/wiki/MaKr3d_MaKrPanel
//
//#define MAKRPANEL
//
// Adafruit ST7565 Full Graphic Controller.
// https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
//
//#define ELB_FULL_GRAPHIC_CONTROLLER
//
// BQ LCD Smart Controller shipped by
// default with the BQ Hephestos 2 and Witbox 2.
//
//#define BQ_LCD_SMART_CONTROLLER
//
// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//
//#define CARTESIO_UI
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// SSD1306 OLED full graphics generic display // SSD1306 OLED full graphics generic display
// //
@@ -1683,25 +1691,11 @@
// //
//#define ULTI_CONTROLLER //#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//
// 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH
// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
//
//#define SAV_3DLCD
// //
// TinyBoy2 128x64 OLED / Encoder Panel // TinyBoy2 128x64 OLED / Encoder Panel
// //
//#define OLED_PANEL_TINYBOY2 //#define OLED_PANEL_TINYBOY2
//
// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
//
//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
// //
// MKS MINI12864 with graphic controller and SD support // MKS MINI12864 with graphic controller and SD support
// http://reprap.org/wiki/MKS_MINI_12864 // http://reprap.org/wiki/MKS_MINI_12864
@@ -1717,6 +1711,13 @@
// //
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
//
// ANET and Tronxy Graphical Controller
//
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER // MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
// http://reprap.org/wiki/MKS_12864OLED // http://reprap.org/wiki/MKS_12864OLED
@@ -1732,6 +1733,34 @@
// //
//#define SILVER_GATE_GLCD_CONTROLLER //#define SILVER_GATE_GLCD_CONTROLLER
//=============================================================================
//============================ Other Controllers ============================
//=============================================================================
//
// CONTROLLER TYPE: Standalone / Serial
//
//
// LCD for Malyan M200 printers.
// This requires SDSUPPORT to be enabled
//
//#define MALYAN_LCD
//
// CONTROLLER TYPE: Keypad / Add-on
//
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
//
// REPRAPWORLD_KEYPAD_MOVE_STEP sets how much should the robot move when a key
// is pressed, a value of 10.0 means 10mm per click.
//
//#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================