Fix bug

fix bug: ABS preheat & PLA preheat doesn't work.
tenlog · Dec 14, 2019 · f4b1a4e · f4b1a4e
1 parent 00fdea2
commit f4b1a4e
Show file tree

Hide file tree

Showing 19 changed files with 56,965 additions and 57,484 deletions.
diff --git a/HexFile/Touch_D2P.hex b/HexFile/Touch_D2P.hex
diff --git a/HexFile/Touch_D2P_PLR.hex b/HexFile/Touch_D2P_PLR.hex
diff --git a/HexFile/Touch_D3P.hex b/HexFile/Touch_D3P.hex
diff --git a/HexFile/Touch_D3P_PLR.hex b/HexFile/Touch_D3P_PLR.hex
diff --git a/HexFile/Touch_D3S.hex b/HexFile/Touch_D3S.hex
diff --git a/HexFile/Touch_D4P.hex b/HexFile/Touch_D4P.hex
diff --git a/HexFile/Touch_D4P_PLR.hex b/HexFile/Touch_D4P_PLR.hex
diff --git a/HexFile/Touch_D5P.hex b/HexFile/Touch_D5P.hex
diff --git a/HexFile/Touch_D5P_PLR.hex b/HexFile/Touch_D5P_PLR.hex
diff --git a/HexFile/Touch_D6P.hex b/HexFile/Touch_D6P.hex
diff --git a/HexFile/Touch_D6P_PLR.hex b/HexFile/Touch_D6P_PLR.hex
diff --git a/Marlin/ConfigurationStore.cpp b/Marlin/ConfigurationStore.cpp
@@ -133,10 +133,16 @@ void Config_StoreSettings()
     EEPROM_WRITE_VAR(i,max_e_jerk);
     EEPROM_WRITE_VAR(i,add_homeing);
 
-#ifndef ULTIPANEL
-    int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP, plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP, plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
-    int absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP, absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP, absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
-#endif
+	/*
+//#ifndef ULTIPANEL
+    int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP;
+	int	plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP; 
+	int	plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
+    int absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP;
+	int absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP;
+	int absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
+//#endif
+	*/
     EEPROM_WRITE_VAR(i,plaPreheatHotendTemp);
     EEPROM_WRITE_VAR(i,plaPreheatHPBTemp);
     EEPROM_WRITE_VAR(i,plaPreheatFanSpeed);
@@ -313,10 +319,13 @@ void Config_RetrieveSettings()
         EEPROM_READ_VAR(i,max_z_jerk);
         EEPROM_READ_VAR(i,max_e_jerk);
         EEPROM_READ_VAR(i,add_homeing);
-#ifndef ULTIPANEL
+		/*
+//#ifndef ULTIPANEL
+		
         int plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed;
         int absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed;
-#endif
+//#endif
+		*/
         EEPROM_READ_VAR(i,plaPreheatHotendTemp);
         EEPROM_READ_VAR(i,plaPreheatHPBTemp);
         EEPROM_READ_VAR(i,plaPreheatFanSpeed);

diff --git a/Marlin/Configuration_xy.h b/Marlin/Configuration_xy.h
@@ -317,12 +317,12 @@
 
 //// MOVEMENT SETTINGS
 #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
-#define HOMING_FEEDRATE {3000, 3000, 400, 0}  // set the homing speeds (mm/min)
+#define HOMING_FEEDRATE {6000, 7000, 600, 0}  // set the homing speeds (mm/min) 3000 3000 400
 
 // default settings
 
-#define DEFAULT_MAX_FEEDRATE          {80, 80, 3, 25}    // (mm/pul)
-#define DEFAULT_MAX_ACCELERATION      {500,500,100,1000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
+#define DEFAULT_MAX_FEEDRATE          {160, 160, 6, 50}    // (mm/pul) 80 80 3 25
+#define DEFAULT_MAX_ACCELERATION      {500, 500, 100, 1000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
 
 #define DEFAULT_ACCELERATION          500    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  500   // X, Y, Z and E max acceleration in mm/s^2 for retracts

diff --git a/Marlin/Configuration_zyf.h b/Marlin/Configuration_zyf.h
@@ -12,12 +12,12 @@
 //Raise up z when Pause;		//By ZYF
 #define PAUSE_RAISE_Z
 
-//#define MODEL_D2P 
+#define MODEL_D2P 
 //#define MODEL_D3P 
 //#define MODEL_D3S 
 //#define MODEL_D4P 
 //#define MODEL_D5P 
-#define MODEL_D6P 
+//#define MODEL_D6P 
 
 #define X_NOZZLE_WIDTH 50		//By ZYF 
 #define DUAL_X_CARRIAGE			//By Zyf
@@ -44,11 +44,11 @@ const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
 
 #define ZYF_DUAL_Z
 #ifdef ZYF_DUAL_Z
-	#define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
-	const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.	LOW
+	#define INVERT_Y_DIR false   
+	const bool Z_ENDSTOPS_INVERTING = true;
 #else
-	#define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
-	const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. HIGH
+	#define INVERT_Y_DIR true  
+	const bool Z_ENDSTOPS_INVERTING = false;
 #endif
 
 #ifdef POWER_LOSS_RECOVERY
@@ -101,7 +101,7 @@ const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
 
 #ifdef ZYF_SIZE_220
     #define DEFAULT_DUPLICATION_X_OFFSET 115
-    #define X_MAX_POS 225.0
+    #define X_MAX_POS 220.0
     #define Y_MAX_POS 225.0
     #ifdef P2P1
         #define Z_MAX_POS 260.0