Fix up Fysetc configs, pins. Fix menu type float5
. (#15157)
This commit is contained in:
parent
293b890940
commit
8e044ea898
12 changed files with 99 additions and 74 deletions
|
@ -57,7 +57,7 @@ DECLARE_MENU_EDIT_TYPE(uint16_t, uint16_5, ui16tostr5, 0.01 ); // 123
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float3, ftostr3, 1 ); // 123 right-justified
|
DECLARE_MENU_EDIT_TYPE(float, float3, ftostr3, 1 ); // 123 right-justified
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float52, ftostr42_52, 100 ); // _2.34, 12.34, -2.34 or 123.45, -23.45
|
DECLARE_MENU_EDIT_TYPE(float, float52, ftostr42_52, 100 ); // _2.34, 12.34, -2.34 or 123.45, -23.45
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000 ); // 1.234
|
DECLARE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000 ); // 1.234
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 0.01f ); // 12345 right-justified
|
DECLARE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 1 ); // 12345 right-justified
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float5_25, ftostr5rj, 0.04f ); // 12345 right-justified (25 increment)
|
DECLARE_MENU_EDIT_TYPE(float, float5_25, ftostr5rj, 0.04f ); // 12345 right-justified (25 increment)
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float51, ftostr51rj, 10 ); // 1234.5 right-justified
|
DECLARE_MENU_EDIT_TYPE(float, float51, ftostr51rj, 10 ); // 1234.5 right-justified
|
||||||
DECLARE_MENU_EDIT_TYPE(float, float51sign, ftostr51sign, 10 ); // +1234.5
|
DECLARE_MENU_EDIT_TYPE(float, float51sign, ftostr51sign, 10 ); // +1234.5
|
||||||
|
|
|
@ -35,6 +35,14 @@
|
||||||
// Ignore temp readings during development.
|
// Ignore temp readings during development.
|
||||||
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
|
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
|
||||||
|
|
||||||
|
//
|
||||||
|
// Flash EEPROM Emulation
|
||||||
|
//
|
||||||
|
#define FLASH_EEPROM_EMULATION
|
||||||
|
#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
|
||||||
|
#define EEPROM_START_ADDRESS uint32(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE)
|
||||||
|
#undef E2END
|
||||||
|
#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
|
||||||
//
|
//
|
||||||
// Limit Switches
|
// Limit Switches
|
||||||
//
|
//
|
||||||
|
|
|
@ -641,9 +641,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
||||||
#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define X_MIN_ENDSTOP_INVERTING true // 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 Y_MIN_ENDSTOP_INVERTING true // 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 Z_MIN_ENDSTOP_INVERTING true // 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 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 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_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||||
|
@ -721,7 +721,7 @@
|
||||||
* Override with M92
|
* Override with M92
|
||||||
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 93 }
|
#define DEFAULT_AXIS_STEPS_PER_UNIT { 640, 640, 3200, 800 }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Max Feed Rate (mm/s)
|
* Default Max Feed Rate (mm/s)
|
||||||
|
@ -989,10 +989,10 @@
|
||||||
|
|
||||||
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
|
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
|
||||||
// :{ 0:'Low', 1:'High' }
|
// :{ 0:'Low', 1:'High' }
|
||||||
#define X_ENABLE_ON 0
|
#define X_ENABLE_ON 1
|
||||||
#define Y_ENABLE_ON 0
|
#define Y_ENABLE_ON 1
|
||||||
#define Z_ENABLE_ON 0
|
#define Z_ENABLE_ON 1
|
||||||
#define E_ENABLE_ON 0 // For all extruders
|
#define E_ENABLE_ON 1 // For all extruders
|
||||||
|
|
||||||
// Disables axis stepper immediately when it's not being used.
|
// Disables axis stepper immediately when it's not being used.
|
||||||
// WARNING: When motors turn off there is a chance of losing position accuracy!
|
// WARNING: When motors turn off there is a chance of losing position accuracy!
|
||||||
|
|
|
@ -165,13 +165,13 @@
|
||||||
* Thermal Protection parameters for the bed are just as above for hotends.
|
* Thermal Protection parameters for the bed are just as above for hotends.
|
||||||
*/
|
*/
|
||||||
#if ENABLED(THERMAL_PROTECTION_BED)
|
#if ENABLED(THERMAL_PROTECTION_BED)
|
||||||
#define THERMAL_PROTECTION_BED_PERIOD 60 // Seconds
|
#define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds
|
||||||
#define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
|
#define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* As described above, except for the bed (M140/M190/M303).
|
* As described above, except for the bed (M140/M190/M303).
|
||||||
*/
|
*/
|
||||||
#define WATCH_BED_TEMP_PERIOD 100 // Seconds
|
#define WATCH_BED_TEMP_PERIOD 60 // Seconds
|
||||||
#define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
|
#define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -924,7 +924,7 @@
|
||||||
|
|
||||||
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
|
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
|
||||||
|
|
||||||
#define EVENT_GCODE_SD_STOP "M21" // G-code to run on Stop Print (e.g., "G28XY" or "G27")
|
#define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27")
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Continue after Power-Loss (Creality3D)
|
* Continue after Power-Loss (Creality3D)
|
||||||
|
@ -1860,13 +1860,13 @@
|
||||||
* on the same serial port, either here or in your board's pins file.
|
* on the same serial port, either here or in your board's pins file.
|
||||||
*/
|
*/
|
||||||
#define X_SLAVE_ADDRESS 0
|
#define X_SLAVE_ADDRESS 0
|
||||||
#define Y_SLAVE_ADDRESS 1
|
#define Y_SLAVE_ADDRESS 0
|
||||||
#define Z_SLAVE_ADDRESS 2
|
#define Z_SLAVE_ADDRESS 0
|
||||||
#define X2_SLAVE_ADDRESS 0
|
#define X2_SLAVE_ADDRESS 0
|
||||||
#define Y2_SLAVE_ADDRESS 0
|
#define Y2_SLAVE_ADDRESS 0
|
||||||
#define Z2_SLAVE_ADDRESS 0
|
#define Z2_SLAVE_ADDRESS 0
|
||||||
#define Z3_SLAVE_ADDRESS 0
|
#define Z3_SLAVE_ADDRESS 0
|
||||||
#define E0_SLAVE_ADDRESS 3
|
#define E0_SLAVE_ADDRESS 0
|
||||||
#define E1_SLAVE_ADDRESS 0
|
#define E1_SLAVE_ADDRESS 0
|
||||||
#define E2_SLAVE_ADDRESS 0
|
#define E2_SLAVE_ADDRESS 0
|
||||||
#define E3_SLAVE_ADDRESS 0
|
#define E3_SLAVE_ADDRESS 0
|
||||||
|
|
|
@ -338,7 +338,6 @@
|
||||||
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature
|
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature
|
||||||
#define POWER_TIMEOUT 30
|
#define POWER_TIMEOUT 30
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
@ -2096,7 +2095,7 @@
|
||||||
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
||||||
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
||||||
// is too low, you should also increment SOFT_PWM_SCALE.
|
// is too low, you should also increment SOFT_PWM_SCALE.
|
||||||
//#define FAN_SOFT_PWM
|
#define FAN_SOFT_PWM
|
||||||
|
|
||||||
// Incrementing this by 1 will double the software PWM frequency,
|
// Incrementing this by 1 will double the software PWM frequency,
|
||||||
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
||||||
|
|
|
@ -1904,7 +1904,7 @@
|
||||||
* Define you own with
|
* Define you own with
|
||||||
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
||||||
*/
|
*/
|
||||||
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V
|
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Monitor Trinamic drivers for error conditions,
|
* Monitor Trinamic drivers for error conditions,
|
||||||
|
|
|
@ -2095,7 +2095,7 @@
|
||||||
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
||||||
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
||||||
// is too low, you should also increment SOFT_PWM_SCALE.
|
// is too low, you should also increment SOFT_PWM_SCALE.
|
||||||
//#define FAN_SOFT_PWM
|
#define FAN_SOFT_PWM
|
||||||
|
|
||||||
// Incrementing this by 1 will double the software PWM frequency,
|
// Incrementing this by 1 will double the software PWM frequency,
|
||||||
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
||||||
|
|
|
@ -1903,7 +1903,7 @@
|
||||||
* Define you own with
|
* Define you own with
|
||||||
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
||||||
*/
|
*/
|
||||||
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V
|
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Monitor Trinamic drivers for error conditions,
|
* Monitor Trinamic drivers for error conditions,
|
||||||
|
|
|
@ -127,18 +127,16 @@
|
||||||
// Enable the Bluetooth serial interface on AT90USB devices
|
// Enable the Bluetooth serial interface on AT90USB devices
|
||||||
//#define BLUETOOTH
|
//#define BLUETOOTH
|
||||||
|
|
||||||
// The following define selects which electronics board you have.
|
// Choose the name from boards.h that matches your setup
|
||||||
// Please choose the name from boards.h that matches your setup
|
|
||||||
#ifndef MOTHERBOARD
|
#ifndef MOTHERBOARD
|
||||||
#define MOTHERBOARD BOARD_FYSETC_CHEETAH
|
#define MOTHERBOARD BOARD_FYSETC_CHEETAH
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Optional custom name for your RepStrap or other custom machine
|
// Name displayed in the LCD "Ready" message and Info menu
|
||||||
// Displayed in the LCD "Ready" message
|
|
||||||
//#define CUSTOM_MACHINE_NAME "3D Printer"
|
//#define CUSTOM_MACHINE_NAME "3D Printer"
|
||||||
|
|
||||||
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
|
// Printer's unique ID, used by some programs to differentiate between machines.
|
||||||
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
|
// Choose your own or use a service like http://www.uuidgenerator.net/version4
|
||||||
//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
|
//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
|
||||||
|
|
||||||
// @section extruder
|
// @section extruder
|
||||||
|
@ -256,7 +254,16 @@
|
||||||
*/
|
*/
|
||||||
//#define MAGNETIC_SWITCHING_TOOLHEAD
|
//#define MAGNETIC_SWITCHING_TOOLHEAD
|
||||||
|
|
||||||
#if EITHER(SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD)
|
/**
|
||||||
|
* Electromagnetic Switching Toolhead
|
||||||
|
*
|
||||||
|
* Parking for CoreXY / HBot kinematics.
|
||||||
|
* Toolheads are parked at one edge and held with an electromagnet.
|
||||||
|
* Supports more than 2 Toolheads. See https://youtu.be/JolbsAKTKf4
|
||||||
|
*/
|
||||||
|
//#define ELECTROMAGNETIC_SWITCHING_TOOLHEAD
|
||||||
|
|
||||||
|
#if ANY(SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
|
||||||
#define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
|
#define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
|
||||||
#define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
|
#define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
|
||||||
#define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
|
#define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
|
||||||
|
@ -308,20 +315,18 @@
|
||||||
// @section machine
|
// @section machine
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
|
* Power Supply Control
|
||||||
*
|
*
|
||||||
* 0 = No Power Switch
|
* Enable and connect the power supply to the PS_ON_PIN.
|
||||||
* 1 = ATX
|
* Specify whether the power supply is active HIGH or active LOW.
|
||||||
* 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
|
|
||||||
*
|
|
||||||
* :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' }
|
|
||||||
*/
|
*/
|
||||||
#define POWER_SUPPLY 0
|
//#define PSU_CONTROL
|
||||||
|
//#define PSU_NAME "Power Supply"
|
||||||
|
|
||||||
#if POWER_SUPPLY > 0
|
#if ENABLED(PSU_CONTROL)
|
||||||
// Enable this option to leave the PSU off at startup.
|
#define PSU_ACTIVE_HIGH false // Set 'false' for ATX (1), 'true' for X-Box (2)
|
||||||
// Power to steppers and heaters will need to be turned on with M80.
|
|
||||||
//#define PS_DEFAULT_OFF
|
//#define PS_DEFAULT_OFF // Keep power off until enabled directly with M80
|
||||||
|
|
||||||
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
|
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
|
||||||
#if ENABLED(AUTO_POWER_CONTROL)
|
#if ENABLED(AUTO_POWER_CONTROL)
|
||||||
|
@ -333,7 +338,6 @@
|
||||||
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature
|
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature
|
||||||
#define POWER_TIMEOUT 30
|
#define POWER_TIMEOUT 30
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// @section temperature
|
// @section temperature
|
||||||
|
@ -359,6 +363,7 @@
|
||||||
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
|
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
|
||||||
* 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
|
* 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
|
||||||
* 501 : 100K Zonestar (Tronxy X3A) Thermistor
|
* 501 : 100K Zonestar (Tronxy X3A) Thermistor
|
||||||
|
* 512 : 100k RPW-Ultra hotend thermistor (4.7k pullup)
|
||||||
* 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
|
* 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
|
||||||
* 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
|
* 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
|
||||||
* 71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
|
* 71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
|
||||||
|
@ -396,7 +401,7 @@
|
||||||
* 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
|
* 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
|
||||||
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
|
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
|
||||||
*
|
*
|
||||||
* :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"Pt100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
|
* :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '512':"100k RPW-Ultra hotend thermistor", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"Pt100 (Ultimainboard V2.x)", '201':"Pt100 (Overlord)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
|
||||||
*/
|
*/
|
||||||
#define TEMP_SENSOR_0 1
|
#define TEMP_SENSOR_0 1
|
||||||
#define TEMP_SENSOR_1 0
|
#define TEMP_SENSOR_1 0
|
||||||
|
@ -1529,8 +1534,11 @@
|
||||||
// Middle point of circle
|
// Middle point of circle
|
||||||
#define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT
|
#define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT
|
||||||
|
|
||||||
// Moves the nozzle to the initial position
|
// Move the nozzle to the initial position after cleaning
|
||||||
#define NOZZLE_CLEAN_GOBACK
|
#define NOZZLE_CLEAN_GOBACK
|
||||||
|
|
||||||
|
// Enable for a purge/clean station that's always at the gantry height (thus no Z move)
|
||||||
|
//#define NOZZLE_CLEAN_NO_Z
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1922,31 +1930,12 @@
|
||||||
//
|
//
|
||||||
//#define LCD_FOR_MELZI
|
//#define LCD_FOR_MELZI
|
||||||
|
|
||||||
//
|
|
||||||
// SSD1306 OLED full graphics generic display
|
|
||||||
//
|
|
||||||
//#define U8GLIB_SSD1306
|
|
||||||
|
|
||||||
//
|
|
||||||
// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
|
|
||||||
//
|
|
||||||
//#define SAV_3DGLCD
|
|
||||||
#if ENABLED(SAV_3DGLCD)
|
|
||||||
//#define U8GLIB_SSD1306
|
|
||||||
#define U8GLIB_SH1106
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
|
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
|
||||||
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
|
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
|
||||||
//
|
//
|
||||||
//#define ULTI_CONTROLLER
|
//#define ULTI_CONTROLLER
|
||||||
|
|
||||||
//
|
|
||||||
// TinyBoy2 128x64 OLED / Encoder Panel
|
|
||||||
//
|
|
||||||
//#define OLED_PANEL_TINYBOY2
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// MKS MINI12864 with graphic controller and SD support
|
// MKS MINI12864 with graphic controller and SD support
|
||||||
// https://reprap.org/wiki/MKS_MINI_12864
|
// https://reprap.org/wiki/MKS_MINI_12864
|
||||||
|
@ -1980,15 +1969,6 @@
|
||||||
//
|
//
|
||||||
//#define ANET_FULL_GRAPHICS_LCD
|
//#define ANET_FULL_GRAPHICS_LCD
|
||||||
|
|
||||||
//
|
|
||||||
// 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
|
// 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
|
// 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
|
||||||
|
@ -2001,6 +1981,43 @@
|
||||||
//
|
//
|
||||||
//#define SILVER_GATE_GLCD_CONTROLLER
|
//#define SILVER_GATE_GLCD_CONTROLLER
|
||||||
|
|
||||||
|
//=============================================================================
|
||||||
|
//============================== OLED Displays ==============================
|
||||||
|
//=============================================================================
|
||||||
|
|
||||||
|
//
|
||||||
|
// SSD1306 OLED full graphics generic display
|
||||||
|
//
|
||||||
|
//#define U8GLIB_SSD1306
|
||||||
|
|
||||||
|
//
|
||||||
|
// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
|
||||||
|
//
|
||||||
|
//#define SAV_3DGLCD
|
||||||
|
#if ENABLED(SAV_3DGLCD)
|
||||||
|
#define U8GLIB_SSD1306
|
||||||
|
//#define U8GLIB_SH1106
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//
|
||||||
|
// TinyBoy2 128x64 OLED / Encoder Panel
|
||||||
|
//
|
||||||
|
//#define OLED_PANEL_TINYBOY2
|
||||||
|
|
||||||
|
//
|
||||||
|
// 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
|
||||||
|
|
||||||
|
//
|
||||||
|
// Einstart S OLED SSD1306
|
||||||
|
//
|
||||||
|
//#define U8GLIB_SH1106_EINSTART
|
||||||
|
|
||||||
//
|
//
|
||||||
// Overlord OLED display/controller with i2c buzzer and LEDs
|
// Overlord OLED display/controller with i2c buzzer and LEDs
|
||||||
//
|
//
|
||||||
|
@ -2078,7 +2095,7 @@
|
||||||
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
||||||
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
||||||
// is too low, you should also increment SOFT_PWM_SCALE.
|
// is too low, you should also increment SOFT_PWM_SCALE.
|
||||||
//#define FAN_SOFT_PWM
|
#define FAN_SOFT_PWM
|
||||||
|
|
||||||
// Incrementing this by 1 will double the software PWM frequency,
|
// Incrementing this by 1 will double the software PWM frequency,
|
||||||
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
||||||
|
|
|
@ -651,6 +651,7 @@
|
||||||
|
|
||||||
#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
|
#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
|
||||||
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates 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 SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
|
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
|
||||||
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
|
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
|
||||||
|
@ -1903,7 +1904,7 @@
|
||||||
* Define you own with
|
* Define you own with
|
||||||
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
||||||
*/
|
*/
|
||||||
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V
|
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Monitor Trinamic drivers for error conditions,
|
* Monitor Trinamic drivers for error conditions,
|
||||||
|
|
|
@ -2095,7 +2095,7 @@
|
||||||
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
||||||
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
||||||
// is too low, you should also increment SOFT_PWM_SCALE.
|
// is too low, you should also increment SOFT_PWM_SCALE.
|
||||||
//#define FAN_SOFT_PWM
|
#define FAN_SOFT_PWM
|
||||||
|
|
||||||
// Incrementing this by 1 will double the software PWM frequency,
|
// Incrementing this by 1 will double the software PWM frequency,
|
||||||
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
||||||
|
|
|
@ -1903,7 +1903,7 @@
|
||||||
* Define you own with
|
* Define you own with
|
||||||
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
|
||||||
*/
|
*/
|
||||||
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V
|
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Monitor Trinamic drivers for error conditions,
|
* Monitor Trinamic drivers for error conditions,
|
||||||
|
|
Reference in a new issue