From 0caccc4991dcc7ebd8a44050072f07d9fff80d34 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sat, 21 Nov 2020 15:04:38 -0500 Subject: [PATCH] Updated for new formbat screen supplier and linear rail kits --- Marlin/Configuration.h | 37 +++++++++++++++----- Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h | 12 +++++++ Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h | 12 +++++++ 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index e90460e92f..fe19ab5e89 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -47,7 +47,13 @@ #define BED_AC //#define HotendAllMetal -//#define HotendMosquito +//#define HotendMosquito // High Tenp Slice Thermistor +//#define HotendSemitec //E3D or SLice 300C Thermistor +//#define HotendSlicePT1000 +//#define HotendCreality + +//#define HighPoweredHeater +//#define ExtruderDDX //DDX kit with Linear Rail //#define ExtruderBMG /** @@ -524,12 +530,15 @@ * 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. */ + #if ENABLED(HotendMosquito) #define TEMP_SENSOR_0 67 -#elif ENABLED(RAPTOR2) - #define TEMP_SENSOR_0 61 -#elif ENABLED(E3DHemeraExtruder) +#elif ANY(E3DHemeraExtruder, HotendSemitec) #define TEMP_SENSOR_0 5 +#elif ENABLED(HotendSlicePT1000) + #define TEMP_SENSOR_0 1047 +#elif ENABLED(RAPTOR2) && DISABLED(HotendCreality) + #define TEMP_SENSOR_0 61 #else #define TEMP_SENSOR_0 1 #endif @@ -586,9 +595,11 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) -#if ENABLED(HotendMosquito) + + +#if ANY(HotendMosquito, HotendSlicePT1000) #define HEATER_0_MAXTEMP 450 -#elif ENABLED(RAPTOR2) +#elif ENABLED(RAPTOR2) && NONE(HotendCreality, HotendSemitec, E3DHemeraExtruder) #define HEATER_0_MAXTEMP 345 #else #define HEATER_0_MAXTEMP 305 @@ -937,6 +948,12 @@ #else #define E_STEPSMM 818 #endif +#elif ANY(ExtruderBMG, ExtruderDDX) + #if ANY(E_2208, E_4988, E_2209_Uart) + #define E_STEPSMM 415 + #else + #define E_STEPSMM 830 + #endif #else #if ANY(E_2208, E_4988, E_2209_Uart) #define E_STEPSMM 96 @@ -1387,14 +1404,18 @@ #else #define X_BED_SIZE 400 #endif -#define Y_BED_SIZE 400 +#if ENABLED(ExtruderDDX) + #define Y_BED_SIZE 380 +#else + #define Y_BED_SIZE 400 +#endif // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 #define Y_MIN_POS 0 #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE -#define Y_MAX_POS Y_BED_SIZE +#define Y_MAX_POS 400 #if(ENABLED(tallVersion)) #define Z_MAX_POS 700 #else diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h index 843eadb432..1e836b37b8 100644 --- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h +++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h @@ -66,3 +66,15 @@ #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENA_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN) #error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin." #endif + +#if HAS_MARLINUI_U8GLIB + #ifndef BOARD_ST7920_DELAY_1 + #define BOARD_ST7920_DELAY_1 DELAY_NS(125) + #endif + #ifndef BOARD_ST7920_DELAY_2 + #define BOARD_ST7920_DELAY_2 DELAY_NS(125) + #endif + #ifndef BOARD_ST7920_DELAY_3 + #define BOARD_ST7920_DELAY_3 DELAY_NS(125) + #endif +#endif diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h index a97b0d2d12..6046b793fe 100644 --- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h +++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h @@ -173,3 +173,15 @@ #define BEEPER_PIN 37 #endif #endif + +#if HAS_MARLINUI_U8GLIB + #ifndef BOARD_ST7920_DELAY_1 + #define BOARD_ST7920_DELAY_1 DELAY_NS(125) + #endif + #ifndef BOARD_ST7920_DELAY_2 + #define BOARD_ST7920_DELAY_2 DELAY_NS(125) + #endif + #ifndef BOARD_ST7920_DELAY_3 + #define BOARD_ST7920_DELAY_3 DELAY_NS(125) + #endif +#endif \ No newline at end of file