Merge branch 'feature_marlin_bugfix_21992' of https://github.com/klac…

…k/marlin into feature_marlin_bugfix_21992 * 'feature_marlin_bugfix_21992' of https://github.com/klack/marlin: Comment platform.io Added Murdock Bug Fix #104 & #33
klack · Jul 14, 2021 · ac68fcf · ac68fcf
2 parents 4686c5e + 26941cf
commit ac68fcf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1204,7 +1204,7 @@
 
 // @section extruder
 
-#define DISABLE_E false             // Disable the extruder when not stepping
+// #define DISABLE_E false             // Disable the extruder when not stepping
 // #define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
 
 // @section machine

diff --git a/Marlin/Configuration_tenlog.h b/Marlin/Configuration_tenlog.h
@@ -16,7 +16,6 @@
 #define LIN_ADVANCE
 #define LIN_ADVANCE_K 0
 #define BABYSTEP_HOTEND_Z_OFFSET 
-
 #define Y_MIN_ENDSTOP_INVERTING false  
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false
 #define X2_HOME_DIR    1       // Set to 1. The second X-carriage always homes to the maximum endstop position
@@ -61,7 +60,6 @@
   // #define HOST_ACTION_COMMANDS
   // #define HOST_PROMPT_SUPPORT
   #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) }
-
 #elif ENABLED(MachineTLD5)
   #define verS1 "Tenlog TL-D5"
   #undef verS3
@@ -119,7 +117,11 @@
   #define INVERT_Y_DIR true
 	#define INVERT_Z_DIR false
 	#define INVERT_E0_DIR true
-	#define INVERT_E1_DIR false
+  #if ENABLED(TitanExtruder)
+    #define INVERT_E1_DIR true
+  #else
+    #define INVERT_E1_DIR false
+	#endif
 #elif ENABLED(Driver2209BTTSKRPRO)
   #define verS2 "2209BTTSKRPRO"
   #define DriverType TMC2209

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
@@ -445,7 +445,7 @@ void GcodeSuite::G28() {
       idex_set_parked();
 
       dual_x_carriage_mode = IDEX_saved_mode;
-      set_duplication_enabled(IDEX_saved_duplication_state);
+      //set_duplication_enabled(IDEX_saved_duplication_state); // 30/06/2021 Murdock Bug Fix #104 & #33
 
       TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(slow_homing));
     }

diff --git a/platformio.ini b/platformio.ini
@@ -70,7 +70,7 @@ default_envs =
   #TGCustom_2209_Titan
   #D3P_BTTSKRPRO_Driver2209BTTSKRPRO_OpticalY_BMG_EZabl
   #D3P_BTTSKRPRO_Driver2209BTTSKRPRO_OpticalY_BMG_BLTouch
-  D3P_OCTOPUS_Driver2209BTTSKRPRO_OpticalY_BMG_BLTouch
+  #D3P_OCTOPUS_Driver2209BTTSKRPRO_OpticalY_BMG_BLTouch
 include_dir  = Marlin
 extra_configs =
     ini/avr.ini