Add Exclude Objects to guide and update Filament

resources/profiles/QIDITechnology.ini

@@ -278,8 +278,8 @@ bottom_solid_layers = 5
 gap_fill_speed = 350
 infill_speed = 430
 layer_height = 0.12
-overhang_speed_0 = 20
+overhang_speed_0 = 10
-overhang_speed_1 = 20
+overhang_speed_1 = 10
 overhang_speed_2 = 30
 overhang_speed_3 = 60
 perimeter_speed = 350
@@ -292,8 +292,8 @@ bottom_solid_layers = 4
 gap_fill_speed = 300
 infill_speed = 330
 layer_height = 0.16
-overhang_speed_0 = 20
+overhang_speed_0 = 10
-overhang_speed_1 = 20
+overhang_speed_1 = 10
 overhang_speed_2 = 30
 overhang_speed_3 = 60
 solid_infill_speed = 270
@@ -515,7 +515,7 @@ enable_volume_fan = 40
 extrusion_multiplier = 0.95
 fan_below_layer_time = 30
 filament_colour = #FFC800
-filament_density = 1.02
+filament_density = 1.05
 filament_max_volumetric_speed = 22
 filament_type = ABS
 first_layer_bed_temperature = 90
@@ -562,7 +562,7 @@ enable_volume_fan = 40
 extrusion_multiplier = 0.92
 fan_below_layer_time = 35
 filament_colour = #F0E68C
-filament_density = 1.02
+filament_density = 1.07
 filament_max_volumetric_speed = 16
 filament_type = ABS
 first_layer_bed_temperature = 90
@@ -607,21 +607,16 @@ bed_temperature = 80
 bridge_fan_speed = 50
 disable_fan_first_layers = 3
 enable_auxiliary_fan = 0
-enable_dynamic_fan_speeds = 1
 extrusion_multiplier = 0.96
 fan_below_layer_time = 10
 filament_colour = #4F4F4F
 filament_density = 1.20
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 14
 filament_type = PAHT-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 310
 max_fan_speed = 40
 min_fan_speed = 20
-overhang_fan_speed_0 = 100
-overhang_fan_speed_1 = 100
-overhang_fan_speed_2 = 100
-overhang_fan_speed_3 = 100
 slowdown_below_layer_time = 5
 temperature = 310
 
@@ -637,7 +632,7 @@ extrusion_multiplier = 1
 fan_below_layer_time = 10
 filament_colour = #323232
 filament_density = 1.30
-filament_max_volumetric_speed = 14
+filament_max_volumetric_speed = 12
 filament_type = PET-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 320
@@ -685,18 +680,19 @@ filament_max_volumetric_speed = 22
 inherits = *common*
 advance_pressure = 0.03
 bed_temperature = 80
-bridge_fan_speed = 20
+bridge_fan_speed = 50
 enable_auxiliary_fan = 0
 extrusion_multiplier = 0.96
 filament_colour = #FFEBCD
 filament_density = 1.21
-filament_max_volumetric_speed = 3.5
+filament_max_volumetric_speed = 3
 filament_type = UltraPA
 first_layer_bed_temperature = 80
-first_layer_temperature = 300
+first_layer_temperature = 280
-max_fan_speed = 20
+max_fan_speed = 40
 min_fan_speed = 20
-temperature = 300
+slowdown_below_layer_time = 15
+temperature = 280
 
 # Generic filament preset
 [filament:*Generic ABS*]
@@ -760,7 +756,7 @@ enable_auxiliary_fan = 0
 extrusion_multiplier = 1
 filament_colour = #8000FF
 filament_density = 1.21
-filament_max_volumetric_speed = 6
+filament_max_volumetric_speed = 4
 filament_type = TPU
 filament_vendor = Generic
 first_layer_temperature = 230
@@ -1136,7 +1132,7 @@ before_layer_gcode = G92 E0
 between_objects_gcode = 
 chamber_fan = 1
 chamber_temperature = 0
-color_change_gcode = M600
+color_change_gcode = M0
 cooling_tube_length = 5
 cooling_tube_retraction = 91.5
 default_filament_profile = 

resources/web/data/text.js

@@ -17,6 +17,7 @@ var LangText={
 		"t15": "Flow Rate Calibration",
 		"t16": "Calibration",
 		"t17": "Pressure Advance",
+		"t18": "Exclude Objects",
 
 		"l0": "Learn more:",
 		"l1": "You can download the 3D model from the following link.",
@@ -59,6 +60,8 @@ var LangText={
 		"l39": "PA Tower",
 		"l40": "The pressure advance value will be changed every 5mm the PA tower rises. Please measure the height of the best area of the model, and then calculate the corresponding pressure advance value based on the set step value, then input it into the software and save it.",
 		"l41": "4.PA calibration does not work with PETG.",
+		"l42": "When multiple models are printed at the same time, you can stop printing a model in the middle of printing.",
+		"l43": "Note: Models with the same file name are treated as the same object.",
 	},
 	"zh_CN": {
 		"t1": "用户指南",
@@ -78,6 +81,7 @@ var LangText={
 		"t15": "流量校准",
 		"t16": "校准",
 		"t17": "压力提前",
+		"t18": "排除对象",
 
 		"l0": "了解更多：",
 		"l1": "您可以从以下链接下载3D模型。",
@@ -120,6 +124,8 @@ var LangText={
 		"l39": "PA 塔",
 		"l40": "PA 塔每升高5mm会更改一次压力提前值，请测量出模型最佳区域的高度，再根据设定的步进值计算出其对应的压力提前值，然后输入到软件中并保存。",
 		"l41": "4.PA校准不适用于PETG。",
+		"l42": "当多个模型同时打印时，你可以在打印中途停止某个模型的打印。",
+		"l43": "注：相同文件名的模型会被视为同一对象。",
 	},
 	"ja": {
 		"t1": "ユーザーガイド",
@@ -139,6 +145,7 @@ var LangText={
 		"t15": "流量校正",
 		"t16": "較正",
 		"t17": "圧力前進",
+		"t18": "対象をはずします",
 
 		"l0": "もっと詳しく知る:",
 		"l1": "3Dモデルは以下のWebサイトからダウンロードできます。",
@@ -181,6 +188,8 @@ var LangText={
 		"l39": "PAタワー",
 		"l40": "PAタワーが上昇する5mmごとに圧力アドバンス値が変更されますので、モデルの最適領域の高さを測定し、設定されたステップ値に基づいて対応する圧力アドバンス値を計算し、それをソフトウェアに入力して、それを保存。",
 		"l41": "4.PA キャリブレーションは PETG では機能しません。",
+		"l42": "複数のモデルが同時に印刷されている場合は、あるモデルの印刷を途中でやめることができます。",
+		"l43": "注:同じファイル名のモデルは、同じ対象として扱われます。",
 	},
 	"fr": {
 		"t1": "Guide de l'utilisateur",
@@ -200,6 +209,7 @@ var LangText={
 		"t15": "Étalonnage du débit",
 		"t16": "Étalonnage",
 		"t17": "Avance de pression",
+		"t18": "Exclure des objets",
 
 		"l0": "Apprendre encore plus:",
 		"l1": "Vous pouvez télécharger des modèles 3D à partir des sites Web suivants.",
@@ -242,6 +252,8 @@ var LangText={
 		"l39": "La tour PA",
 		"l40": "La valeur d'avance de pression sera modifiée tous les 5 mm d'élévation de la tour PA. Veuillez mesurer la hauteur de la meilleure zone du modèle, puis calculer la valeur d'avance de pression correspondante en fonction de la valeur de pas définie, puis la saisir dans le logiciel et l'enregistrer.",
 		"l41": "4.L'étalonnage PA ne fonctionne pas avec le PETG.",
+		"l42": "Lorsque plusieurs modèles sont imprimés en même temps, vous pouvez arrêter l’impression d’un modèle au milieu de l’impression.",
+		"l43": "Note: les modèles avec le même nom de fichier sont traités comme le même objet.",
 	},
 	"de": {
 		"t1": "Benutzerhandbuch",
@@ -261,6 +273,7 @@ var LangText={
 		"t15": "Kalibrierung der Durchflussrate",
 		"t16": "Kalibrierung",
 		"t17": "Druckvorschub",
+		"t18": "Subjekt wird eliminiert",
 
 		"l0": "Erfahren Sie mehr:",
 		"l1": "Sie können 3D-Modelle von den folgenden Websites herunterladen.",
@@ -303,6 +316,8 @@ var LangText={
 		"l39": "PA-Turm",
 		"l40": "Der Druckvorschubwert wird alle 5 mm geändert, wenn der PA-Turm ansteigt. Bitte messen Sie die Höhe des besten Bereichs des Modells und berechnen Sie dann den entsprechenden Druckvorschubwert basierend auf dem eingestellten Schrittwert, geben Sie ihn dann in die Software ein und speichern Sie ihn.",
 		"l41": "4.Die PA-Kalibrierung funktioniert nicht mit PETG.",
+		"l42": "Wenn sie mehrere modelle gleichzeitig drucken, können sie den druckvorgang beenden.",
+		"l43": "Anmerkung: ein modell mit dem gleichen namen wird als gleiches objekt betrachtet.",
 	},
 	"be": {
 		"t1": "Кіраўніцтва карыстальніка",
@@ -322,6 +337,7 @@ var LangText={
 		"t15": "Каліброўка хуткасці патоку",
 		"t16": "Каліброўка",
 		"t17": "Увеличение давления",
+		"t18": "Исключить объекты из списка",
 
 		"l0": "даведацца больш:",
 		"l1": "Вы можаце загрузіць 3D-мадэлі з наступных сайтаў.",
@@ -364,6 +380,8 @@ var LangText={
 		"l39": "ПА Тауэр",
 		"l40": "Значение опережения давления будет меняться каждые 5 мм подъема башни PA. Измерьте высоту лучшей области модели, а затем рассчитайте соответствующее значение опережения давления на основе установленного значения шага, затем введите его в программное обеспечение и сохраните.",
 		"l41": "4.Калибровка PA не работает с PETG.",
+		"l42": "Когда одновременно печатаются несколько моделей, можно прекратить печатание модели в процессе печати.",
+		"l43": "Примечание: модели с одним и тем же именем файла рассматриваются как Один и тот же объект.",
 	},
 };
 

resources/web/guide/index.html

@@ -57,6 +57,10 @@
 						<div class="MenuBtnIcon"><img src="img/MenuBtnIcon.svg"/></div>
 						<div class="trans" tid="t14"></div>
 					</li>
+					<li menu="ExcludeObjects" class="MenuBtn" onClick="GotoMenu('ExcludeObjects')">
+						<div class="MenuBtnIcon"><img src="img/MenuBtnIcon.svg"/></div>
+						<div class="trans" tid="t18"></div>
+					</li>
 					<li menu="ModelDownload" class="MenuBtn" onClick="GotoMenu('ModelDownload')">
 						<div class="MenuBtnIcon"><img src="img/MenuBtnIcon.svg"/></div>
 						<div class="trans" tid="t13"></div>
@@ -154,6 +158,10 @@
 				<div class="AutozoomImage"><img src="img/AdaptiveMeshingThumbnail.png"/></div>
 				<div class="ThumbnailTitle trans" tid="t14"></div>
 			</div>
+			<div class="Thumbnail" onClick="GotoMenu('ExcludeObjects')">
+				<div class="AutozoomImage"><img src="img/ExcludeObjects.gif"/></div>
+				<div class="ThumbnailTitle trans" tid="t18"></div>
+			</div>
 			<div class="Thumbnail" onClick="GotoMenu('ModelDownload')">
 				<div class="AutozoomImage"><img src="img/DownloadModel.png"/></div>
 				<div class="ThumbnailTitle trans" tid="t13"></div>
@@ -217,6 +225,13 @@
 			<div class="IntroduceText">https://github.com/kyleisah/Klipper-Adaptive-Meshing-Purging#key-features</div>
 		</div>
 
+		<div class="IntroduceBoard" board="ExcludeObjects">
+			<div class="IntroduceTitle trans" tid="t18"></div>
+			<div class="IntroduceText trans" tid="l42"></div>
+			<div class="IntroduceText trans" tid="l43"></div>
+			<div class="AutozoomImage"><img src="img/ExcludeObjects.gif"/></div>
+		</div>
+
 		<div class="IntroduceBoard" board="ModelDownload">
 			<div class="IntroduceTitle trans" tid="t13"></div>
 			<div class="IntroduceTextBold trans" tid="l1"></div>
@@ -314,36 +329,20 @@
 					</thead>
 					<tbody>
 						<tr v-for="(item, index) in 1" :key="index">
-							<td>ToughPETG</td>
+							<td>ABS Odorless</td>
-							<td>≤20％</td>
-							<td>/</td>
-							<td>+++</td>
-							<td>++</td>
-							<td>+++</td>
-							<td>78℃</td>
-							<td>73℃</td>
-							<td>40.3±0.6</td>
-							<td>1780±80</td>
-							<td>4.0±0.2</td>
-							<td>62.8±0.4</td>
-							<td>1919±54</td>
-							<td>13.9±2.3</td>
-						</tr>
-						<tr v-for="(item, index) in 1" :key="index">
-							<td>UltraABS-GF25</td>
 							<td>≤30％</td>
 							<td>/</td>
-							<td>+++</td>
+							<td>++</td>
 							<td>+</td>
 							<td>+++</td>
-							<td>97℃</td>
+							<td>92℃</td>
-							<td>93℃</td>
+							<td>86℃</td>
-							<td>48.48 ± 0.61</td>
+							<td>41.65 ± 0.27</td>
-							<td>3752.13 ± 68.39</td>
+							<td>2351.00 ± 92.00</td>
-							<td>2.10 ± 0.10</td>
+							<td>7.95 ± 4.53</td>
-							<td>78.80 ± 1.26</td>
+							<td>67.81 ± 0.54</td>
-							<td>3531.71 ± 75.79</td>
+							<td>2400.00 ± 79.69</td>
-							<td>8.91 ± 0.63</td>
+							<td>20.03 ± 1.32</td>
 						</tr>
 						<tr v-for="(item, index) in 1" :key="index">
 							<td>ABS Rapido</td>
@@ -361,6 +360,38 @@
 							<td>77.5 ± 2.5</td>
 							<td>20 ± 2</td>
 						</tr>
+						<tr v-for="(item, index) in 1" :key="index">
+							<td>ABS-GF25</td>
+							<td>≤30％</td>
+							<td>/</td>
+							<td>+++</td>
+							<td>+</td>
+							<td>+++</td>
+							<td>97℃</td>
+							<td>93℃</td>
+							<td>48.48 ± 0.61</td>
+							<td>3752.13 ± 68.39</td>
+							<td>2.10 ± 0.10</td>
+							<td>78.80 ± 1.26</td>
+							<td>3531.71 ± 75.79</td>
+							<td>8.91 ± 0.63</td>
+						</tr>
+						<tr v-for="(item, index) in 1" :key="index">
+							<td>ASA</td>
+							<td>≤30％</td>
+							<td>/</td>
+							<td>+++</td>
+							<td>+</td>
+							<td>+++</td>
+							<td>94℃</td>
+							<td>86℃</td>
+							<td>38.50 ± 1.60</td>
+							<td>2317.00 ± 246.00</td>
+							<td>5.20 ± 1.40</td>
+							<td>64.49 ± 1.30</td>
+							<td>2399.00 ± 147.00</td>
+							<td>12.90 ± 0.90</td>
+						</tr>
 						<tr v-for="(item, index) in 1" :key="index">
 							<td>PA12-CF</td>
 							<td>≤15％</td>
@@ -378,7 +409,7 @@
 							<td>6.11 ± 1.45</td>
 						</tr>
 						<tr v-for="(item, index) in 1" :key="index">
-							<td>PATH-CF</td>
+							<td>PAHT-CF</td>
 							<td>≤15％</td>
 							<td>80-100℃</td>
 							<td>++</td>
@@ -409,6 +440,22 @@
 							<td>5313.21 ± 197.89</td>
 							<td>5.57 ± 0.58</td>
 						</tr>
+						<tr v-for="(item, index) in 1" :key="index">
+							<td>PETG-Tough</td>
+							<td>≤20％</td>
+							<td>/</td>
+							<td>+++</td>
+							<td>++</td>
+							<td>+++</td>
+							<td>78℃</td>
+							<td>73℃</td>
+							<td>40.3±0.6</td>
+							<td>1780±80</td>
+							<td>4.0±0.2</td>
+							<td>62.8±0.4</td>
+							<td>1919±54</td>
+							<td>13.9±2.3</td>
+						</tr>
 						<tr v-for="(item, index) in 1" :key="index">
 							<td>PLA Rapido</td>
 							<td>≤30％</td>