From 428a651877a0c02757dd97d044cde4851cbf67c1 Mon Sep 17 00:00:00 2001 From: Tim Hoogland Date: Fri, 18 Feb 2022 16:06:20 -0600 Subject: [PATCH] i3 Plus Only Firmware --- README.md | 47 +---- {ADVi3PPFiles => TH3DUF_R2}/ADVcallback.h | 0 {ADVi3PPFiles => TH3DUF_R2}/ADVcrtp.h | 0 {ADVi3PPFiles => TH3DUF_R2}/ADVstd.h | 0 {ADVi3PPFiles => TH3DUF_R2}/ADVstring.h | 0 {ADVi3PPFiles => TH3DUF_R2}/ADVunique_ptr.h | 0 TH3DUF_R2/Configuration.h | 56 +---- TH3DUF_R2/Configuration_adv.h | 115 +---------- TH3DUF_R2/Configuration_backend.h | 195 +----------------- {ADVi3PPFiles => TH3DUF_R2}/advi3pp.cpp | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp.h | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_.h | 0 .../advi3pp_bitmasks.h | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_defines.h | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_dgus.cpp | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_dgus.h | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_enums.h | 0 .../advi3pp_facade.cpp | 0 .../advi3pp_handlers.cpp | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_log.cpp | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_log.h | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_pages.h | 0 {ADVi3PPFiles => TH3DUF_R2}/advi3pp_stack.h | 0 .../advi3pp_versions.h | 0 24 files changed, 11 insertions(+), 402 deletions(-) rename {ADVi3PPFiles => TH3DUF_R2}/ADVcallback.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/ADVcrtp.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/ADVstd.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/ADVstring.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/ADVunique_ptr.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp.cpp (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_bitmasks.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_defines.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_dgus.cpp (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_dgus.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_enums.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_facade.cpp (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_handlers.cpp (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_log.cpp (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_log.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_pages.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_stack.h (100%) rename {ADVi3PPFiles => TH3DUF_R2}/advi3pp_versions.h (100%) diff --git a/README.md b/README.md index f9c2795..059c2ec 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,6 @@ -**[Unified 2](https://github.com/th3dstudio/UnifiedFirmware/releases) Firmware Migration Progress** - -As we move machines from using this Unified 1 to [Unified 2](https://github.com/th3dstudio/UnifiedFirmware/releases) we will remove the config options for those machines and place a note stating that they are now to use Unified 2 instead. - -If your machine is supported in [Unified 2](https://github.com/th3dstudio/UnifiedFirmware/releases) please use that instead of Unified 1. - -**Machines that have been migrated so far:** - -- Alfawise U10 -- Anet A2/A6/A8/A8 Plus/E10/E12/E16 -- AnyCubic Mega Zero V1/V2 -- Artillery AL-4 -- Artillery Sidewinder X1 -- CR-10 -- CR-10 Mini -- CR-10 S4 -- CR-10 S5 -- CR-10S -- CR-10S Mini -- CR-10S S4 -- CR-10S S5 -- CR-10 V2 -- CR-20 -- CR-X -- Creality Dual Extrusion Board Machines -- Ender 2 -- Ender 3 -- Ender 5 -- Ender 5 Plus -- Geeetech A10 V1 -- Geeetech A10 V2 -- Geeetech A20 -- Sovol SV01 -- Tevo Tornado -- Tevo Tarantula Pro -- Wanhao i3 - -**When will X printer be moved over?** - -The answer is when we have time. We prioritize the more popular machines over the ones that are more niche/unpopular. - -We have one person that does all the firmware work in addition to running the company. If you wish to have a machine moved over quicker you are welcome to help out by making the code yourself and making a pull request against the Unified 2 firmware github repo. - ---------- -**This firmware is maintained by TH3D. The goal is an easy to use firmware for 3D printers that we have added support for.** - -**The issues queue has been disabled as some people do not understand it's for firmware problems and not technical support.** +**This firmware is for the i3 Plus for use with TH3D upgrades.** ---------- diff --git a/ADVi3PPFiles/ADVcallback.h b/TH3DUF_R2/ADVcallback.h similarity index 100% rename from ADVi3PPFiles/ADVcallback.h rename to TH3DUF_R2/ADVcallback.h diff --git a/ADVi3PPFiles/ADVcrtp.h b/TH3DUF_R2/ADVcrtp.h similarity index 100% rename from ADVi3PPFiles/ADVcrtp.h rename to TH3DUF_R2/ADVcrtp.h diff --git a/ADVi3PPFiles/ADVstd.h b/TH3DUF_R2/ADVstd.h similarity index 100% rename from ADVi3PPFiles/ADVstd.h rename to TH3DUF_R2/ADVstd.h diff --git a/ADVi3PPFiles/ADVstring.h b/TH3DUF_R2/ADVstring.h similarity index 100% rename from ADVi3PPFiles/ADVstring.h rename to TH3DUF_R2/ADVstring.h diff --git a/ADVi3PPFiles/ADVunique_ptr.h b/TH3DUF_R2/ADVunique_ptr.h similarity index 100% rename from ADVi3PPFiles/ADVunique_ptr.h rename to TH3DUF_R2/ADVunique_ptr.h diff --git a/TH3DUF_R2/Configuration.h b/TH3DUF_R2/Configuration.h index fab7f5e..bd0f9a7 100644 --- a/TH3DUF_R2/Configuration.h +++ b/TH3DUF_R2/Configuration.h @@ -55,42 +55,6 @@ #define CONFIGURATION_H #define CONFIGURATION_H_VERSION 010109 -//=========================================================================== -//============================ TH3D Configuration =========================== -//=========================================================================== - -// ONLY UNCOMMENT THINGS IN ONE PRINTER SECTION!!! IF YOU HAVE MULTIPLE MACHINES FLASH THEM ONE AT A TIME. - -//=========================================================================== -// ************************* GEEETECH PRINTERS ************************* -//=========================================================================== - -//=========================================================================== -// 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 - -//Not being ported to Unified 2 at this time - -//=========================================================================== -// Geeetech A20M Options - Select 'Arduino Mega 2560' from Tools > Board -//=========================================================================== -//#define GEEETECH_A20M - -// EZABL Probe Mounts - uses the same mounts as the Geetech A10 V2 -//#define GEE_A10_V2_OEM -//#define CUSTOM_PROBE - -//Not being ported to Unified 2 at this time - -//=========================================================================== -// ************************* WANHAO PRINTERS ************************* -//=========================================================================== - //=========================================================================== // Wanhao i3 Plus Options - Select 'Arduino Mega 2560' from Tools > Board //=========================================================================== @@ -105,7 +69,7 @@ // How to Flash AVDi3++ LCD: https://community.advi3pp.com/t/how-to-flash/16 // Touchscreen Guide: https://community.advi3pp.com/t/lcd-touch-screen-guide/20 //=========================================================================== -//#define WANHAO_I3_PLUS +#define WANHAO_I3_PLUS // Uncomment to enable EZABL support - Probe Offsets are set from the LCD //#define WANHAO_I3_PLUS_EZABL @@ -117,22 +81,6 @@ //Not being ported to Unified 2 ever due to the LCD Screen Limits -//=========================================================================== -// Wanhao D6 Options - Select 'Arduino Mega 2560' from Tools > Board -//=========================================================================== -//#define WANHAO_D6 - -// If you are using our EZOut V2 (connects to ANALOG/J9 connector) filament sensor kit please follow the install guide -// and then uncomment the #define EZOUTV2_ENABLE line below. -// Do NOT ever connect our filament sensor without the supplied adapter board. -//#define EZOUTV2_ENABLE - -// EZABL Probe Mounts -//#define WANHAO_D6_OEM -//#define CUSTOM_PROBE - -//Not being ported to Unified 2 at this time - //=========================================================================== // ************************* END PRINTER SECTION ************************* //=========================================================================== @@ -359,7 +307,7 @@ #define LCD_LANGUAGE en -#define UNIFIED_VERSION "TH3D U1.R2.B5" +#define UNIFIED_VERSION "TH3D U1.R2.i3P" #include "Configuration_backend.h" #endif // CONFIGURATION_H diff --git a/TH3DUF_R2/Configuration_adv.h b/TH3DUF_R2/Configuration_adv.h index 5c4b96c..94de93f 100644 --- a/TH3DUF_R2/Configuration_adv.h +++ b/TH3DUF_R2/Configuration_adv.h @@ -24,28 +24,12 @@ #define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H_VERSION 010109 -#if ENABLED(SIDEWINDER_X1) - //DUAL Z STEPPER CONFIG - #define Z_DUAL_STEPPER_DRIVERS -#endif - #if ENABLED(BLTOUCH) #define BLTOUCH_DELAY 750 #define BLTOUCH_SET_5V_MODE #define BLTOUCH_FORCE_MODE_SET #endif // BLTOUCH -#if ENABLED(TH3D_RGB_STRIP) || ENABLED(SIDEWINDER_X1) - #define LED_CONTROL_MENU - #define LED_COLOR_PRESETS // Enable the Preset Color menu option - #define LED_USER_PRESET_RED 130 // User defined RED value - #define LED_USER_PRESET_GREEN 203 // User defined GREEN value - #define LED_USER_PRESET_BLUE 225 // User defined BLUE value - #define LED_USER_PRESET_WHITE 0 // User defined WHITE value - #define LED_USER_PRESET_BRIGHTNESS 255 // User defined intensity - #define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup -#endif - #if DISABLED(PIDTEMPBED) #define BED_CHECK_INTERVAL 500 #if ENABLED(BED_LIMIT_SWITCHING) @@ -59,7 +43,6 @@ #define WATCH_TEMP_PERIOD (HOTEND_THERMAL_PROTECTION_TIME / 2) // Seconds #define WATCH_TEMP_INCREASE 4 // Degrees Celsius #endif - #if ENABLED(THERMAL_PROTECTION_BED) #define THERMAL_PROTECTION_BED_PERIOD (BED_THERMAL_PROTECTION_TIME / 2) // Seconds @@ -71,101 +54,9 @@ #define TEMP_SENSOR_AD595_OFFSET 0.0 #define TEMP_SENSOR_AD595_GAIN 1.0 -#if ENABLED(TAZ5) - #define USE_CONTROLLER_FAN - #if ENABLED(USE_CONTROLLER_FAN) - #define CONTROLLER_FAN_PIN 2 - #define CONTROLLERFAN_SECS 60 - #define CONTROLLERFAN_SPEED 255 - #endif - #define FAN_KICKSTART_TIME 100 - #define FAN_MIN_PWM 70 - #define DIGIPOT_MOTOR_CURRENT { ((950 -750)/5+135), ((950 -750)/5+135), ((1275 -750)/5+135), ((750 -750)/5+135), ((750 -750)/5+135) } - #define DIGIPOT_I2C_NUM_CHANNELS 8 - #define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } -#endif - -#if ENABLED(WANHAO_D6) - #define CASE_LIGHT_ENABLE - #if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 8 - #define INVERT_CASE_LIGHT false - #define CASE_LIGHT_DEFAULT_ON true - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 - #define MENU_ITEM_CASE_LIGHT - #endif - - #define MOTOR_CURRENT_PWM_RANGE 2782 - #define PWM_MOTOR_CURRENT { 1200, 1200, 1000 } - #define DIGIPOT_I2C_NUM_CHANNELS 8 - #define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } - - #define ENCODER_RATE_MULTIPLIER - #define ENCODER_10X_STEPS_PER_SEC 75 - #define ENCODER_100X_STEPS_PER_SEC 160 - - #define CHDK_DELAY 50 - - #if ENABLED(DOGLCD) - #define USE_SMALL_INFOFONT - #endif - - #define I2C_SLAVE_ADDRESS 0 - -#endif - -#if ENABLED(TORNADO) || ENABLED(TARANTULA_PRO) || ENABLED(SIDEWINDER_X1) - #define E0_AUTO_FAN_PIN 7 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 - #if ENABLED(TORNADO_QUIET) || ENABLED(TARANTULA_PRO_QUIET) - #define EXTRUDER_AUTO_FAN_SPEED 190 - #else - #define EXTRUDER_AUTO_FAN_SPEED 255 - #endif - #if ENABLED(TIM_TORNADO) - #define USE_CONTROLLER_FAN - #if ENABLED(USE_CONTROLLER_FAN) - #define CONTROLLER_FAN_PIN 11 - #define CONTROLLERFAN_SECS 10 - #define CONTROLLERFAN_SPEED 255 - #endif - #endif -#else - #if ENABLED(I3MINI_FANCONTROL) - #define E0_AUTO_FAN_PIN 12 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 - #define EXTRUDER_AUTO_FAN_SPEED 255 - #elif ENABLED(TH3D_EZ300) - #define E0_AUTO_FAN_PIN 7 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 40 - #define EXTRUDER_AUTO_FAN_SPEED 255 - #elif ENABLED(MKS_PRINTER) && DISABLED(DUAL_HOTEND_DUAL_NOZZLES) - #define E0_AUTO_FAN_PIN 7 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 - #define EXTRUDER_AUTO_FAN_SPEED 255 - #elif ENABLED(ZONESTAR_Z5F) - #define E0_AUTO_FAN_PIN 6 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 - #define EXTRUDER_AUTO_FAN_SPEED 255 - #else - #define E0_AUTO_FAN_PIN -1 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 - #define EXTRUDER_AUTO_FAN_SPEED 255 - #endif -#endif -#if ENABLED(TH3D_EZ300) - #define USE_CONTROLLER_FAN - #define CONTROLLER_FAN_PIN 5 - #define CONTROLLERFAN_SECS 60 - #define CONTROLLERFAN_SPEED 145 -#endif - -#if ENABLED(DY_H9) - #define E0_AUTO_FAN_PIN 7 - #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 - #define EXTRUDER_AUTO_FAN_SPEED 255 -#endif - +#define E0_AUTO_FAN_PIN -1 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 #define E1_AUTO_FAN_PIN -1 #define E2_AUTO_FAN_PIN -1 #define E3_AUTO_FAN_PIN -1 diff --git a/TH3DUF_R2/Configuration_backend.h b/TH3DUF_R2/Configuration_backend.h index cd20b10..94020ba 100644 --- a/TH3DUF_R2/Configuration_backend.h +++ b/TH3DUF_R2/Configuration_backend.h @@ -18,11 +18,6 @@ #define Y_PROBE_OFFSET_FROM_EXTRUDER 0 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 #endif -#if ENABLED(WANHAO_D6_OEM) - #define X_PROBE_OFFSET_FROM_EXTRUDER 24 - #define Y_PROBE_OFFSET_FROM_EXTRUDER -16 - #define EZABL_ENABLE -#endif //Wanhao i3 Plus Settings #if ENABLED(WANHAO_I3_PLUS) @@ -98,156 +93,6 @@ #define PRINTER_ENABLED_CHECK #endif //end wanhao i3 plus -//Geeetech A10M/A20M Settings -#if ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) - #define GEEETECH_BED_TEMPSENSOR - - #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_GT2560_V3_0 - #endif - - #if ENABLED(GEEETECH_A10M) - #define REPRAP_DISCOUNT_SMART_CONTROLLER - #define LCD2004 - #define X_BED_SIZE 220 - #define Y_BED_SIZE 220 - #define Z_MAX_POS 260 - #endif - - #if ENABLED(GEEETECH_A20M) - #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #define X_BED_SIZE 250 - #define Y_BED_SIZE 250 - #define Z_MAX_POS 250 - #endif - - #define BAUDRATE 250000 - - #define X_MIN_ENDSTOP_INVERTING true - #define Y_MIN_ENDSTOP_INVERTING true - #define Z_MIN_ENDSTOP_INVERTING true - #define X_MAX_ENDSTOP_INVERTING true - #define Y_MAX_ENDSTOP_INVERTING true - #define Z_MAX_ENDSTOP_INVERTING true - #define Z_MIN_PROBE_ENDSTOP_INVERTING true - - #if ENABLED(CUSTOM_ESTEPS) - #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, CUSTOM_ESTEPS_VALUE } - #else - #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 340 } - #endif - - #define DEFAULT_MAX_FEEDRATE { 300, 300, 15, 50 } - #define DEFAULT_MAX_ACCELERATION { 2000, 2000, 500, 5000 } - - #define DEFAULT_ACCELERATION 750 - #define DEFAULT_RETRACT_ACCELERATION 1500 - #define DEFAULT_TRAVEL_ACCELERATION 750 - - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.0 - #define DEFAULT_ZJERK 0.4 - #define DEFAULT_EJERK 5.0 - - #define INVERT_X_DIR true - #define INVERT_Y_DIR true - #define INVERT_Z_DIR false - - #if ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) - #define DUAL_EXTRUDERS - #define INVERT_E1_DIR false - #define SINGLENOZZLE - #endif - - #if ENABLED(REVERSE_E_MOTOR_DIRECTION) - #define INVERT_E0_DIR true - #else - #define INVERT_E0_DIR false - #endif - - #if ENABLED(HOME_ADJUST) - #define X_MIN_POS X_HOME_ADJUST_LOCATION - #define Y_MIN_POS Y_HOME_ADJUST_LOCATION - #else - #define X_MIN_POS -7 - #define Y_MIN_POS -5 - #endif - - #define ENCODER_PULSES_PER_STEP 4 - #define ENCODER_STEPS_PER_MENU_ITEM 1 - - #define PRINTER_ENABLED_CHECK -#endif - -//Wanhao D6 Model Settings -#if ENABLED(WANHAO_D6) - #define BAUDRATE 250000 - - #define ULTIPANEL - #define U8GLIB_SSD1306 - #define LCD_WIDTH 22 - #define LCD_HEIGHT 5 - #define LCD_RESET_PIN 5 - #define PCA9632 - - #define DIRECT_DRIVE_PRINTER - - #define X_MIN_ENDSTOP_INVERTING true - #define Y_MIN_ENDSTOP_INVERTING true - #define Z_MIN_ENDSTOP_INVERTING true - #define X_MAX_ENDSTOP_INVERTING true - #define Y_MAX_ENDSTOP_INVERTING true - #define Z_MAX_ENDSTOP_INVERTING true - #define Z_MIN_PROBE_ENDSTOP_INVERTING true - - #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 99 } - - #define DEFAULT_MAX_FEEDRATE { 300, 300, 15, 50 } - - #define DEFAULT_MAX_ACCELERATION { 1500, 1500, 500, 5000 } - - #define DEFAULT_ACCELERATION 500 // X, Y, Z and E acceleration for printing moves - #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts - #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves - - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.0 - #define DEFAULT_ZJERK 0.3 - #define DEFAULT_EJERK 1.0 - - #define INVERT_X_DIR true - #define INVERT_Y_DIR false - #define INVERT_Z_DIR true - #define INVERT_E0_DIR true - - #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_ULTIMAIN_2 - #endif - - #if ENABLED(WANHAO_D6_5015) - #define X_BED_SIZE 175 - #else - #define X_BED_SIZE 200 - #endif - #define Y_BED_SIZE 200 - #define Z_MAX_POS 170 - - #if ENABLED(HOME_ADJUST) - #define X_MIN_POS X_HOME_ADJUST_LOCATION - #define Y_MIN_POS Y_HOME_ADJUST_LOCATION - #else - #define X_MIN_POS 0 - #define Y_MIN_POS 0 - #endif - - #define ENCODER_PULSES_PER_STEP 2 - #define ENCODER_STEPS_PER_MENU_ITEM 1 - #define REVERSE_ENCODER_DIRECTION - - #define PRINTER_ENABLED_CHECK - -#endif //end D6 - //Machine Check #if DISABLED(PRINTER_ENABLED_CHECK) #if DISABLED(TH3DINHOUSEMACHINE) @@ -301,11 +146,7 @@ #define SERIAL_PORT 0 -#if ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) - #define EXTRUDERS 2 -#else - #define EXTRUDERS 1 -#endif +#define EXTRUDERS 1 #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 @@ -555,9 +396,7 @@ #define DISABLE_E false #define DISABLE_INACTIVE_EXTRUDER true -#if DISABLED(DUAL_EXTRUDERS) - #define INVERT_E1_DIR false -#endif +#define INVERT_E1_DIR false #define INVERT_E2_DIR false #define INVERT_E3_DIR false #define INVERT_E4_DIR false @@ -586,24 +425,6 @@ #define MAX_SOFTWARE_ENDSTOP_Z #endif -#if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || ENABLED(GEEETECH_A20M) || ENABLED(GEEETECH_A10M) - #define FILAMENT_RUNOUT_SENSOR - #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) - #define FIL_RUNOUT_INVERTING false - #else - #define FIL_RUNOUT_INVERTING true - #endif - #if ENABLED(GEEETECH_A10M) || ENABLED(GEEETECH_A20M) - #define NUM_RUNOUT_SENSORS 2 - #else - #define NUM_RUNOUT_SENSORS 1 - #endif - #define FIL_RUNOUT_PULLUP - #define FILAMENT_RUNOUT_SCRIPT "M600" - #endif -#endif - #if ENABLED(MANUAL_MESH_LEVELING) && DISABLED(EZABL_ENABLE) && DISABLED(WANHAO_I3_PLUS) #define PROBE_MANUALLY #define LCD_BED_LEVELING @@ -638,15 +459,9 @@ #define NOZZLE_PARK_FEATURE #if ENABLED(NOZZLE_PARK_FEATURE) - #if ENABLED(WANHAO_I3) || ENABLED(WANHAO_D6) - #define NOZZLE_PARK_POINT { (X_MAX_POS - 15), 15, 10 } - #define NOZZLE_PARK_XY_FEEDRATE 100 - #define NOZZLE_PARK_Z_FEEDRATE 5 - #else - #define NOZZLE_PARK_POINT { 10, 10, 10 } - #define NOZZLE_PARK_XY_FEEDRATE 100 - #define NOZZLE_PARK_Z_FEEDRATE 5 - #endif + #define NOZZLE_PARK_POINT { 10, 10, 10 } + #define NOZZLE_PARK_XY_FEEDRATE 100 + #define NOZZLE_PARK_Z_FEEDRATE 5 #endif #define PRINTJOB_TIMER_AUTOSTART diff --git a/ADVi3PPFiles/advi3pp.cpp b/TH3DUF_R2/advi3pp.cpp similarity index 100% rename from ADVi3PPFiles/advi3pp.cpp rename to TH3DUF_R2/advi3pp.cpp diff --git a/ADVi3PPFiles/advi3pp.h b/TH3DUF_R2/advi3pp.h similarity index 100% rename from ADVi3PPFiles/advi3pp.h rename to TH3DUF_R2/advi3pp.h diff --git a/ADVi3PPFiles/advi3pp_.h b/TH3DUF_R2/advi3pp_.h similarity index 100% rename from ADVi3PPFiles/advi3pp_.h rename to TH3DUF_R2/advi3pp_.h diff --git a/ADVi3PPFiles/advi3pp_bitmasks.h b/TH3DUF_R2/advi3pp_bitmasks.h similarity index 100% rename from ADVi3PPFiles/advi3pp_bitmasks.h rename to TH3DUF_R2/advi3pp_bitmasks.h diff --git a/ADVi3PPFiles/advi3pp_defines.h b/TH3DUF_R2/advi3pp_defines.h similarity index 100% rename from ADVi3PPFiles/advi3pp_defines.h rename to TH3DUF_R2/advi3pp_defines.h diff --git a/ADVi3PPFiles/advi3pp_dgus.cpp b/TH3DUF_R2/advi3pp_dgus.cpp similarity index 100% rename from ADVi3PPFiles/advi3pp_dgus.cpp rename to TH3DUF_R2/advi3pp_dgus.cpp diff --git a/ADVi3PPFiles/advi3pp_dgus.h b/TH3DUF_R2/advi3pp_dgus.h similarity index 100% rename from ADVi3PPFiles/advi3pp_dgus.h rename to TH3DUF_R2/advi3pp_dgus.h diff --git a/ADVi3PPFiles/advi3pp_enums.h b/TH3DUF_R2/advi3pp_enums.h similarity index 100% rename from ADVi3PPFiles/advi3pp_enums.h rename to TH3DUF_R2/advi3pp_enums.h diff --git a/ADVi3PPFiles/advi3pp_facade.cpp b/TH3DUF_R2/advi3pp_facade.cpp similarity index 100% rename from ADVi3PPFiles/advi3pp_facade.cpp rename to TH3DUF_R2/advi3pp_facade.cpp diff --git a/ADVi3PPFiles/advi3pp_handlers.cpp b/TH3DUF_R2/advi3pp_handlers.cpp similarity index 100% rename from ADVi3PPFiles/advi3pp_handlers.cpp rename to TH3DUF_R2/advi3pp_handlers.cpp diff --git a/ADVi3PPFiles/advi3pp_log.cpp b/TH3DUF_R2/advi3pp_log.cpp similarity index 100% rename from ADVi3PPFiles/advi3pp_log.cpp rename to TH3DUF_R2/advi3pp_log.cpp diff --git a/ADVi3PPFiles/advi3pp_log.h b/TH3DUF_R2/advi3pp_log.h similarity index 100% rename from ADVi3PPFiles/advi3pp_log.h rename to TH3DUF_R2/advi3pp_log.h diff --git a/ADVi3PPFiles/advi3pp_pages.h b/TH3DUF_R2/advi3pp_pages.h similarity index 100% rename from ADVi3PPFiles/advi3pp_pages.h rename to TH3DUF_R2/advi3pp_pages.h diff --git a/ADVi3PPFiles/advi3pp_stack.h b/TH3DUF_R2/advi3pp_stack.h similarity index 100% rename from ADVi3PPFiles/advi3pp_stack.h rename to TH3DUF_R2/advi3pp_stack.h diff --git a/ADVi3PPFiles/advi3pp_versions.h b/TH3DUF_R2/advi3pp_versions.h similarity index 100% rename from ADVi3PPFiles/advi3pp_versions.h rename to TH3DUF_R2/advi3pp_versions.h