Merge pull request MarlinFirmware#4250 from 3d-gussner/MK3_3130_REVO_…

…HF_60W Add REVO High Flow 60W variant
drewmoseley · Jun 28, 2023 · d6c9247 · d6c9247
2 parents 5dc6ccb + 2755798
commit d6c9247
Show file tree

Hide file tree

Showing 5 changed files with 1,375 additions and 2 deletions.
diff --git a/.github/travis/legacy-build.sh b/.github/travis/legacy-build.sh
@@ -23,4 +23,8 @@ cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h Firmware/Configuration_prusa
 bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO variant failed" && false; }
 cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h
 bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO variant failed" && false; }
+cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W variant failed" && false; }
+cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO_HF_60W variant failed" && false; }
 rm Firmware/Configuration_prusa.h
diff --git a/Firmware/temp_model/e3d_REVO.h b/Firmware/temp_model/e3d_REVO.h
@@ -12,8 +12,8 @@
 #define TEMP_MODEL_E3D_REVO_fS 0.15    // sim. 1st order IIR filter factor (f=100/27)
 #define TEMP_MODEL_E3D_REVO_LAG 270    // sim. response lag (ms, 0-2160)
 
-#define TEMP_MODEL_E3D_REVO_W 1.2      // Default warning threshold (K/s)
-#define TEMP_MODEL_E3D_REVO_E 1.74     // Default error threshold (K/s)
+#define TEMP_MODEL_E3D_REVO_W 0.85     // Default warning threshold (K/s)
+#define TEMP_MODEL_E3D_REVO_E 1.23     // Default error threshold (K/s)
 
 // fall-back resistance vector (R0-15)
 #define TEMP_MODEL_E3D_REVO_Rv {TEMP_MODEL_E3D_REVO_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4}
diff --git a/Firmware/temp_model/e3d_REVO_HF_60W.h b/Firmware/temp_model/e3d_REVO_HF_60W.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#define TEMP_MODEL_E3D_REVO_HF_60W_VER 1      // model parameters version
+
+#define TEMP_MODEL_E3D_REVO_HF_60W_P 60.      // heater power (W)
+#define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014  // linear temperature coefficient (W/K/power)
+#define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05     // linear temperature intercept (W/power)
+
+#define TEMP_MODEL_E3D_REVO_HF_60W_C 9.10     // initial guess for heatblock capacitance (J/K)
+#define TEMP_MODEL_E3D_REVO_HF_60W_R 30.6     // initial guess for heatblock resistance (K/W)
+
+#define TEMP_MODEL_E3D_REVO_HF_60W_fS 0.15    // sim. 1st order IIR filter factor (f=100/27)
+#define TEMP_MODEL_E3D_REVO_HF_60W_LAG 270    // sim. response lag (ms, 0-2160)
+
+#define TEMP_MODEL_E3D_REVO_HF_60W_W 0.85     // Default warning threshold (K/s)
+#define TEMP_MODEL_E3D_REVO_HF_60W_E 1.23     // Default error threshold (K/s)
+
+// fall-back resistance vector (R0-15)
+#define TEMP_MODEL_E3D_REVO_HF_60W_Rv {TEMP_MODEL_E3D_REVO_HF_60W_R, 29.0, 27.5, 24.5, 23.4, 22.3, 21.2, 20.2, 19.8, 19.4, 19.0, 18.6, 18.3, 18.1, 17.9, 17.7}