i3 Plus Only Firmware

th3dstudio · Feb 18, 2022 · 428a651 · 428a651
1 parent 7f12bb2
commit 428a651
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 402 deletions.
diff --git 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 → TH3DUF_R2/ADVcallback.h b/ADVi3PPFiles/ADVcallback.h → TH3DUF_R2/ADVcallback.h
diff --git a/ADVi3PPFiles/ADVcrtp.h → TH3DUF_R2/ADVcrtp.h b/ADVi3PPFiles/ADVcrtp.h → TH3DUF_R2/ADVcrtp.h
diff --git a/ADVi3PPFiles/ADVstd.h → TH3DUF_R2/ADVstd.h b/ADVi3PPFiles/ADVstd.h → TH3DUF_R2/ADVstd.h
diff --git a/ADVi3PPFiles/ADVstring.h → TH3DUF_R2/ADVstring.h b/ADVi3PPFiles/ADVstring.h → TH3DUF_R2/ADVstring.h
diff --git a/ADVi3PPFiles/ADVunique_ptr.h → TH3DUF_R2/ADVunique_ptr.h b/ADVi3PPFiles/ADVunique_ptr.h → TH3DUF_R2/ADVunique_ptr.h
diff --git 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
@@ -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