Bring some configs up to speed

2.0.x
Scott Lahteine 7 years ago
parent 813f9f3082
commit 5684beae90

@ -1708,6 +1708,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1726,6 +1726,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1854,6 +1854,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1714,6 +1714,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,12 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//
//#define SILVER_GATE_GLCD_CONTROLLER
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

@ -367,8 +367,8 @@
#define X_HOME_BUMP_MM 5
#define Y_HOME_BUMP_MM 5
#define Z_HOME_BUMP_MM 2
#define HOMING_BUMP_DIVISOR {2, 2, 4} // Re-Bump Speed Divisor (Divides the Homing Feedrate)
//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
// When G28 is called, this option will make Y home before X
//#define HOME_Y_BEFORE_X
@ -455,10 +455,9 @@
//#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
// Uncomment to enable an I2C based DIGIPOT like on the Azteeg X3 Pro
// Use an I2C based DIGIPOT (e.g., Azteeg X3 Pro)
//#define DIGIPOT_I2C
#if ENABLED(DIGIPOT_I2C) && !defined(DIGIPOT_I2C_ADDRESS_A) // Default to settings in pins_XXXX.h files
#if ENABLED(DIGIPOT_I2C) && !defined(DIGIPOT_I2C_ADDRESS_A)
/**
* Common slave addresses:
*
@ -696,7 +695,7 @@
#if ENABLED(BABYSTEPPING)
//#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_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
//#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
//#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.

@ -1706,6 +1706,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -527,13 +527,13 @@
#endif
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
const bool X_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Y_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Z_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
#define X_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Y_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
// Enable this feature if all enabled endstop pins are interrupt-capable.
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
@ -1706,6 +1706,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1694,6 +1694,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -20,6 +20,21 @@
*
*/
/**
* Configuration.h
*
* Basic settings such as:
*
* - Type of electronics
* - Type of temperature sensor
* - Printer geometry
* - Endstop configuration
* - LCD controller
* - Extra features
*
* Advanced settings can be found in Configuration_adv.h
*
*/
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 020000
@ -1692,6 +1707,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1694,6 +1694,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1705,6 +1705,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1717,6 +1717,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -100,12 +100,21 @@
/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
*
* :[0, 1, 2, 3, 4, 5, 6, 7]
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if available.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
* This setting determines the communication speed of the printer.
*
@ -932,7 +941,7 @@
/**
* Enable the G26 Mesh Validation Pattern tool.
*/
#define G26_MESH_VALIDATION // Enable G26 mesh validation
#define G26_MESH_VALIDATION
#if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
@ -1457,6 +1466,12 @@
// Enable one of the following options to specify your controller.
//
//
// Original RADDS LCD Display+Encoder+SDCardReader
// http://doku.radds.org/dokumentation/lcd-display/
//
//#define RADDS_DISPLAY
//
// ULTIMAKER Controller.
//
@ -1686,6 +1701,13 @@
//#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -406,7 +406,7 @@
// @section lcd
#if ENABLED(ULTIPANEL)
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 1*60} // Feedrates (mm/m) for manual moves along X, Y, Z, E from panel
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
#endif

@ -1725,6 +1725,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -40,6 +40,17 @@
//=============================Thermal Settings ============================
//===========================================================================
//
// Hephestos 2 24V heated bed upgrade kit.
// https://store.bq.com/en/heated-bed-kit-hephestos2
//
//#define HEPHESTOS2_HEATED_BED_KIT
#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
#undef TEMP_SENSOR_BED
#define TEMP_SENSOR_BED 70
#define HEATER_BED_INVERTING true
#endif
#if DISABLED(PIDTEMPBED)
#define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control
#if ENABLED(BED_LIMIT_SWITCHING)
@ -640,6 +651,22 @@
// Swap the CW/CCW indicators in the graphics overlay
//#define OVERLAY_GFX_REVERSE
#if ENABLED(U8GLIB_ST7920)
/**
* ST7920-based LCDs can emulate a 16 x 4 character display using
* the ST7920 character-generator for very fast screen updates.
* Enable LIGHTWEIGHT_UI to use this special display mode.
*
* Since LIGHTWEIGHT_UI has limited space, the position and status
* message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
* length of time to display the status message before clearing.
*/
//#define LIGHTWEIGHT_UI
#if ENABLED(LIGHTWEIGHT_UI)
#define STATUS_EXPIRE_SECONDS 20
#endif
#endif
#endif // DOGLCD
// @section safety
@ -679,43 +706,25 @@
// @section extruder
/**
* Implementation of linear pressure control
* Linear Pressure Control v1.5
*
* Assumption: advance = k * (delta velocity)
* Assumption: advance [steps] = k * (delta velocity [steps/s])
* K=0 means advance disabled.
* See Marlin documentation for calibration instructions.
*/
//#define LIN_ADVANCE
#if ENABLED(LIN_ADVANCE)
#define LIN_ADVANCE_K 75
/**
* Some Slicers produce Gcode with randomly jumping extrusion widths occasionally.
* For example within a 0.4mm perimeter it may produce a single segment of 0.05mm width.
* While this is harmless for normal printing (the fluid nature of the filament will
* close this very, very tiny gap), it throws off the LIN_ADVANCE pressure adaption.
*
* For this case LIN_ADVANCE_E_D_RATIO can be used to set the extrusion:distance ratio
* to a fixed value. Note that using a fixed ratio will lead to wrong nozzle pressures
* if the slicer is using variable widths or layer heights within one print!
* NOTE: K values for LIN_ADVANCE 1.5 differ from earlier versions!
*
* This option sets the default E:D ratio at startup. Use `M900` to override this value.
* Set K around 0.22 for 3mm PLA Direct Drive with ~6.5cm between the drive gear and heatbreak.
* Larger K values will be needed for flexible filament and greater distances.
* If this algorithm produces a higher speed offset than the extruder can handle (compared to E jerk)
* print acceleration will be reduced during the affected moves to keep within the limit.
*
* Example: `M900 W0.4 H0.2 D1.75`, where:
* - W is the extrusion width in mm
* - H is the layer height in mm
* - D is the filament diameter in mm
*
* Example: `M900 R0.0458` to set the ratio directly.
*
* Set to 0 to auto-detect the ratio based on given Gcode G1 print moves.
*
* Slic3r (including Průša Control) produces Gcode compatible with the automatic mode.
* Cura (as of this writing) may produce Gcode incompatible with the automatic mode.
* See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
* Mention @Sebastianv650 on GitHub to alert the author of any issues.
*/
#define LIN_ADVANCE_E_D_RATIO 0 // The calculated ratio (or 0) according to the formula W * H / ((D / 2) ^ 2 * PI)
// Example: 0.4 * 0.2 / ((1.75 / 2) ^ 2 * PI) = 0.033260135
//#define LIN_ADVANCE
#if ENABLED(LIN_ADVANCE)
#define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed
//#define LA_DEBUG // If enabled, this will generate debug information output over USB.
#endif
// @section leveling

@ -59,14 +59,14 @@
//============================= DELTA Printer ===============================
//===========================================================================
// For a Delta printer start with one of the configuration files in the
// example_configurations/delta directory and customize for your machine.
// config/examples/delta directory and customize for your machine.
//
//===========================================================================
//============================= SCARA Printer ===============================
//===========================================================================
// For a SCARA printer start with the configuration files in
// example_configurations/SCARA and customize for your machine.
// config/examples/SCARA and customize for your machine.
//
// @section info
@ -100,12 +100,21 @@
/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
*
* :[0, 1, 2, 3, 4, 5, 6, 7]
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if available.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
* This setting determines the communication speed of the printer.
*
@ -1014,6 +1023,9 @@
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
// as the Z-Height correction value.
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
@ -1457,6 +1469,12 @@
// Enable one of the following options to specify your controller.
//
//
// Original RADDS LCD Display+Encoder+SDCardReader
// http://doku.radds.org/dokumentation/lcd-display/
//
//#define RADDS_DISPLAY
//
// ULTIMAKER Controller.
//
@ -1686,6 +1704,13 @@
//#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1688,6 +1688,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1688,6 +1688,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1542,7 +1542,6 @@
//
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
//
// MakerLab Mini Panel with graphic
// controller and SD support - http://reprap.org/wiki/Mini_panel
@ -1714,6 +1713,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1721,6 +1721,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -245,6 +245,15 @@
// Enable this option to leave the PSU off at startup.
// Power to steppers and heaters will need to be turned on with M80.
//#define PS_DEFAULT_OFF
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
#if ENABLED(AUTO_POWER_CONTROL)
#define AUTO_POWER_FANS // Turn on PSU if fans need power
#define AUTO_POWER_E_FANS
#define AUTO_POWER_CONTROLLERFAN
#define POWER_TIMEOUT 30
#endif
#endif
// @section temperature
@ -1026,6 +1035,9 @@
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
// as the Z-Height correction value.
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
@ -1710,6 +1722,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -245,6 +245,15 @@
// Enable this option to leave the PSU off at startup.
// Power to steppers and heaters will need to be turned on with M80.
//#define PS_DEFAULT_OFF
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
#if ENABLED(AUTO_POWER_CONTROL)
#define AUTO_POWER_FANS // Turn on PSU if fans need power
#define AUTO_POWER_E_FANS
#define AUTO_POWER_CONTROLLERFAN
#define POWER_TIMEOUT 30
#endif
#endif
// @section temperature
@ -1025,6 +1034,9 @@
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
// as the Z-Height correction value.
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
@ -1709,6 +1721,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1710,6 +1710,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -952,7 +952,7 @@
/**
* Enable the G26 Mesh Validation Pattern tool.
*/
#define G26_MESH_VALIDATION // Enable G26 mesh validation
#define G26_MESH_VALIDATION
#if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
@ -1717,6 +1717,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1726,6 +1726,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1734,6 +1734,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1705,6 +1705,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1710,6 +1710,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1710,6 +1710,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -835,7 +835,7 @@
* - Use 'M211' to set software endstops on/off or report current state
*/
// Min software endstops curtail movement below minimum coordinate bounds
// Min software endstops constrain movement within minimum coordinate bounds
//#define MIN_SOFTWARE_ENDSTOPS
#if ENABLED(MIN_SOFTWARE_ENDSTOPS)
#define MIN_SOFTWARE_ENDSTOP_X
@ -1381,9 +1381,8 @@
* SD CARD: SPI SPEED
*
* Enable one of the following items for a slower SPI transfer speed.
* This may be required to resolve "volume init" errors or LCD issues.
* This may be required to resolve "volume init" errors.
*/
//#define SPI_SPEED SPI_HALF_SPEED
//#define SPI_SPEED SPI_QUARTER_SPEED
//#define SPI_SPEED SPI_EIGHTH_SPEED
@ -1482,7 +1481,6 @@
//
//#define ULTIPANEL
//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
@ -1642,7 +1640,6 @@
//
// SSD1306 OLED full graphics generic display
//
//#define U8GLIB_ST7920
//#define U8GLIB_SSD1306
//
@ -1673,12 +1670,43 @@
//
//#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
// http://reprap.org/wiki/MKS_MINI_12864
//
//#define MKS_MINI_12864
//
// Factory display for Creality CR-10
// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
//
// This is RAMPS-compatible using a single 10-pin connector.
// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
//
//#define CR10_STOCKDISPLAY
//
// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
// http://reprap.org/wiki/MKS_12864OLED
//
// Tiny, but very sharp OLED display
//
//#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1718,6 +1718,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1709,6 +1709,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1737,6 +1737,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -627,6 +627,9 @@
* printing performance versus fast display updates.
*/
#if ENABLED(DOGLCD)
// Show SD percentage next to the progress bar
//#define DOGM_SD_PERCENT
// Enable to save many cycles by drawing a hollow frame on the Info Screen
#define XYZ_HOLLOW_FRAME

@ -1762,6 +1762,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -100,12 +100,21 @@
/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
*
* :[0, 1, 2, 3, 4, 5, 6, 7]
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if available.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
* This setting determines the communication speed of the printer.
*
@ -355,7 +364,7 @@
#define PIDTEMP
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
#define PID_K1 0.95 // Smoothing factor within the PID
#define PID_K1 0.95 // Smoothing factor within any PID loop
#if ENABLED(PIDTEMP)
//#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
//#define PID_DEBUG // Sends debug data to the serial port.
@ -931,7 +940,7 @@
/**
* Enable the G26 Mesh Validation Pattern tool.
*/
#define G26_MESH_VALIDATION // Enable G26 mesh validation
#define G26_MESH_VALIDATION
#if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
@ -1456,6 +1465,12 @@
// Enable one of the following options to specify your controller.
//
//
// Original RADDS LCD Display+Encoder+SDCardReader
// http://doku.radds.org/dokumentation/lcd-display/
//
//#define RADDS_DISPLAY
//
// ULTIMAKER Controller.
//
@ -1685,6 +1700,13 @@
//#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1717,6 +1717,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -100,11 +100,20 @@
/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
*
* :[0, 1, 2, 3, 4, 5, 6, 7]
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT -1
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if available.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
* This setting determines the communication speed of the printer.

@ -1739,6 +1739,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1465,6 +1465,12 @@
// Enable one of the following options to specify your controller.
//
//
// Original RADDS LCD Display+Encoder+SDCardReader
// http://doku.radds.org/dokumentation/lcd-display/
//
//#define RADDS_DISPLAY
//
// ULTIMAKER Controller.
//
@ -1700,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -106,6 +106,15 @@
*/
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if available.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
* This setting determines the communication speed of the printer.
*
@ -1020,6 +1029,9 @@
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
// as the Z-Height correction value.
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
@ -1086,6 +1098,63 @@
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// @section calibrate
/**
* Bed Skew Compensation
*
* This feature corrects for misalignment in the XYZ axes.
*
* Take the following steps to get the bed skew in the XY plane:
* 1. Print a test square (e.g., https://www.thingiverse.com/thing:2563185)
* 2. For XY_DIAG_AC measure the diagonal A to C
* 3. For XY_DIAG_BD measure the diagonal B to D
* 4. For XY_SIDE_AD measure the edge A to D
*
* Marlin automatically computes skew factors from these measurements.
* Skew factors may also be computed and set manually:
*
* - Compute AB : SQRT(2*AC*AC+2*BD*BD-4*AD*AD)/2
* - XY_SKEW_FACTOR : TAN(PI/2-ACOS((AC*AC-AB*AB-AD*AD)/(2*AB*AD)))
*
* If desired, follow the same procedure for XZ and YZ.
* Use these diagrams for reference:
*
* Y Z Z
* ^ B-------C ^ B-------C ^ B-------C
* | / / | / / | / /
* | / / | / / | / /
* | A-------D | A-------D | A-------D
* +-------------->X +-------------->X +-------------->Y
* XY_SKEW_FACTOR XZ_SKEW_FACTOR YZ_SKEW_FACTOR
*/
//#define SKEW_CORRECTION
#if ENABLED(SKEW_CORRECTION)
// Input all length measurements here:
#define XY_DIAG_AC 282.8427124746
#define XY_DIAG_BD 282.8427124746
#define XY_SIDE_AD 200
// Or, set the default skew factors directly here
// to override the above measurements:
#define XY_SKEW_FACTOR 0.0
//#define SKEW_CORRECTION_FOR_Z
#if ENABLED(SKEW_CORRECTION_FOR_Z)
#define XZ_DIAG_AC 282.8427124746
#define XZ_DIAG_BD 282.8427124746
#define YZ_DIAG_AC 282.8427124746
#define YZ_DIAG_BD 282.8427124746
#define YZ_SIDE_AD 200
#define XZ_SKEW_FACTOR 0.0
#define YZ_SKEW_FACTOR 0.0
#endif
// Enable this option for M852 to set skew at runtime
//#define SKEW_CORRECTION_GCODE
#endif
//=============================================================================
//============================= Additional Features ===========================
//=============================================================================
@ -1650,6 +1719,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1706,6 +1706,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1840,6 +1840,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -100,12 +100,21 @@
/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
*
* :[0, 1, 2, 3, 4, 5, 6, 7]
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT 0
/**
* Select a secondary serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port -1 is the USB emulated serial port, if available.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT_2 -1
/**
* This setting determines the communication speed of the printer.
*
@ -1590,6 +1599,12 @@
// Enable one of the following options to specify your controller.
//
//
// Original RADDS LCD Display+Encoder+SDCardReader
// http://doku.radds.org/dokumentation/lcd-display/
//
//#define RADDS_DISPLAY
//
// ULTIMAKER Controller.
//
@ -1819,6 +1834,13 @@
//#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1838,6 +1838,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1,4 +1,4 @@
/**
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
@ -447,7 +447,6 @@
#define DEFAULT_bedKi 7.1
#define DEFAULT_bedKd 488.31
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED
@ -1843,6 +1842,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1827,6 +1827,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1830,6 +1830,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1830,6 +1830,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1839,6 +1839,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1720,6 +1720,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1709,6 +1709,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1707,6 +1707,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1701,6 +1701,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

@ -1711,6 +1711,7 @@
//
//#define AZSMZ_12864
//
// Silvergate GLCD controller
// http://github.com/android444/Silvergate
//

Loading…
Cancel
Save