From d9e2acd1b225cb127e70a910e814215d2fcafa9e Mon Sep 17 00:00:00 2001 From: Scott Lahteine <github@thinkyhead.com> Date: Wed, 21 Feb 2018 19:54:21 -0600 Subject: [PATCH] Configs parity with 2.0.x --- Marlin/example_configurations/Creality/CR-10S/Configuration.h | 1 + Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h | 3 --- Marlin/example_configurations/Creality/Ender/Configuration.h | 1 + Marlin/example_configurations/Creality/Ender/_Statusscreen.h | 3 --- Marlin/example_configurations/Tronxy/X1/Configuration.h | 1 + .../example_configurations/delta/FLSUN/kossel/Configuration.h | 1 + 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Marlin/example_configurations/Creality/CR-10S/Configuration.h b/Marlin/example_configurations/Creality/CR-10S/Configuration.h index fbac9682fc3..5fb7835639f 100644 --- a/Marlin/example_configurations/Creality/CR-10S/Configuration.h +++ b/Marlin/example_configurations/Creality/CR-10S/Configuration.h @@ -276,6 +276,7 @@ * 11 : 100k beta 3950 1% thermistor (4.7k pullup) * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" + * 15 : 100k thermistor calibration for JGAurora A5 hotend * 20 : the PT100 circuit found in the Ultimainboard V2.x * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design diff --git a/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h b/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h index 87db9f9d36b..c956a55a710 100644 --- a/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h +++ b/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h @@ -29,9 +29,6 @@ * Use the Marlin Bitmap Converter to make your own: * http://marlinfw.org/tools/u8glib/converter.html */ -#include "MarlinConfig.h" - -//============================================ #define STATUS_SCREENWIDTH 128 diff --git a/Marlin/example_configurations/Creality/Ender/Configuration.h b/Marlin/example_configurations/Creality/Ender/Configuration.h index 33585a095f8..7baa1760f35 100644 --- a/Marlin/example_configurations/Creality/Ender/Configuration.h +++ b/Marlin/example_configurations/Creality/Ender/Configuration.h @@ -276,6 +276,7 @@ * 11 : 100k beta 3950 1% thermistor (4.7k pullup) * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" + * 15 : 100k thermistor calibration for JGAurora A5 hotend * 20 : the PT100 circuit found in the Ultimainboard V2.x * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design diff --git a/Marlin/example_configurations/Creality/Ender/_Statusscreen.h b/Marlin/example_configurations/Creality/Ender/_Statusscreen.h index 8c61f7d0d3d..fd269c4b913 100644 --- a/Marlin/example_configurations/Creality/Ender/_Statusscreen.h +++ b/Marlin/example_configurations/Creality/Ender/_Statusscreen.h @@ -29,9 +29,6 @@ * Use the Marlin Bitmap Converter to make your own: * http://marlinfw.org/tools/u8glib/converter.html */ -#include "MarlinConfig.h" - -//============================================ #define STATUS_SCREENWIDTH 128 #define STATUS_SCREEN_HOTEND_TEXT_X(E) (38 + (E) * 20) diff --git a/Marlin/example_configurations/Tronxy/X1/Configuration.h b/Marlin/example_configurations/Tronxy/X1/Configuration.h index 0a624e2fab1..0792fbd95a6 100644 --- a/Marlin/example_configurations/Tronxy/X1/Configuration.h +++ b/Marlin/example_configurations/Tronxy/X1/Configuration.h @@ -276,6 +276,7 @@ * 11 : 100k beta 3950 1% thermistor (4.7k pullup) * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" + * 15 : 100k thermistor calibration for JGAurora A5 hotend * 20 : the PT100 circuit found in the Ultimainboard V2.x * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design diff --git a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h index 1f29b226242..3a57ba856c2 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h @@ -276,6 +276,7 @@ * 11 : 100k beta 3950 1% thermistor (4.7k pullup) * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" + * 15 : 100k thermistor calibration for JGAurora A5 hotend * 20 : the PT100 circuit found in the Ultimainboard V2.x * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design