From 98096d47f26d6ef71f57b66874d363a4f3ce37a2 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Tue, 14 May 2019 02:15:53 -0500 Subject: [PATCH] A10M Support --- TH3DUF_R2/Configuration.h | 9 +++++++++ TH3DUF_R2/Configuration_backend.h | 16 ++++++++-------- TH3DUF_R2/pins_GT2560_V3.0.h | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/TH3DUF_R2/Configuration.h b/TH3DUF_R2/Configuration.h index 112d6fb..b0186bc 100644 --- a/TH3DUF_R2/Configuration.h +++ b/TH3DUF_R2/Configuration.h @@ -427,6 +427,15 @@ //#define GEE_A10_V2_OEM //#define CUSTOM_PROBE +//=========================================================================== +// Geeetech A10M Options - Select 'Arduino Mega 2560' from Tools > Board +//=========================================================================== +//#define GEEETECH_A10M + +// EZABL Probe Mounts - uses the same mounts as the Geetech A10 V2 +//#define GEE_A10_V2_OEM +//#define CUSTOM_PROBE + //=========================================================================== // Geeetech A20 Options - Select 'Arduino Mega 2560' from Tools > Board //=========================================================================== diff --git a/TH3DUF_R2/Configuration_backend.h b/TH3DUF_R2/Configuration_backend.h index c481e43..c8c95a5 100644 --- a/TH3DUF_R2/Configuration_backend.h +++ b/TH3DUF_R2/Configuration_backend.h @@ -846,7 +846,7 @@ #endif //Geeetech A10/A10M/A20/A20M Settings -#if ENABLED(GEEETECH_A10_V1) || ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A20) || ENABLED(GEEETECH_A20M) +#if ENABLED(GEEETECH_A10_V1) || ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A20) || ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #define GEEETECH_BED_TEMPSENSOR #if ENABLED(GEEETECH_A10_V1) @@ -855,13 +855,13 @@ #endif #endif - #if ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A20) || ENABLED(GEEETECH_A20M) + #if ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A20) || ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #ifndef MOTHERBOARD #define MOTHERBOARD BOARD_GT2560_V3_0 #endif #endif - #if ENABLED(GEEETECH_A10_V1) || ENABLED(GEEETECH_A10_V2) + #if ENABLED(GEEETECH_A10_V1) || ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A10M) #define REPRAP_DISCOUNT_SMART_CONTROLLER #define LCD2004 #define X_BED_SIZE 220 @@ -892,7 +892,7 @@ #if ENABLED(CUSTOM_ESTEPS) #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, CUSTOM_ESTEPS_VALUE } #else - #if ENABLED(GEEETECH_A20M) + #if ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 340 } #else #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95 } @@ -916,13 +916,13 @@ #define INVERT_Y_DIR true #define INVERT_Z_DIR false - #if ENABLED(GEEETECH_A20M) + #if ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #define DUAL_EXTRUDERS #define INVERT_E1_DIR false #define SINGLENOZZLE #endif - #if ENABLED(TITAN_EXTRUDER) || ENABLED(GEEETECH_A20M) + #if ENABLED(TITAN_EXTRUDER) || ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #define INVERT_E0_DIR false #else #define INVERT_E0_DIR true @@ -2109,7 +2109,7 @@ #define SERIAL_PORT 0 -#if ENABLED(CR10SDUALEBOARD) || ENABLED(TIM_AM8) || (ENABLED(MKS_PRINTER) && ENABLED(DUAL_EXTRUDER_SINGLE_HOTEND)) || (ENABLED(MKS_PRINTER) && ENABLED(DUAL_HOTEND_DUAL_NOZZLES)) || ENABLED(GEEETECH_A20M) +#if ENABLED(CR10SDUALEBOARD) || ENABLED(TIM_AM8) || (ENABLED(MKS_PRINTER) && ENABLED(DUAL_EXTRUDER_SINGLE_HOTEND)) || (ENABLED(MKS_PRINTER) && ENABLED(DUAL_HOTEND_DUAL_NOZZLES)) || ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #define EXTRUDERS 2 #else #define EXTRUDERS 1 @@ -2435,7 +2435,7 @@ #define MAX_SOFTWARE_ENDSTOP_Z #endif -#if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || (ENABLED(CR10S) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_MINI) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S4) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S5) && DISABLED(CR10S_NOFILAMENTSENSOR)) || ENABLED(ALFAWISE_U10) || ENABLED(ADIM_GANTRY_I3_PLUS) || ENABLED(ENDER4_FIL) || ENABLED(COPYMASTER3D_300) || ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A20) || ENABLED(GEEETECH_A20M) +#if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || (ENABLED(CR10S) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_MINI) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S4) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S5) && DISABLED(CR10S_NOFILAMENTSENSOR)) || ENABLED(ALFAWISE_U10) || ENABLED(ADIM_GANTRY_I3_PLUS) || ENABLED(ENDER4_FIL) || ENABLED(COPYMASTER3D_300) || ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A20) || ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) #define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || ENABLED(ADIM_GANTRY_I3_PLUS) diff --git a/TH3DUF_R2/pins_GT2560_V3.0.h b/TH3DUF_R2/pins_GT2560_V3.0.h index e559ad0..65d1d18 100644 --- a/TH3DUF_R2/pins_GT2560_V3.0.h +++ b/TH3DUF_R2/pins_GT2560_V3.0.h @@ -123,7 +123,7 @@ // // LCD / Controller // -#if ENABLED(GEEETECH_A10_V2) +#if ENABLED(GEEETECH_A10_V2) || ENABLED(GEEETECH_A10M) #define BEEPER_PIN 18 #define LCD_PINS_RS 20