From 1f38488c27a7e7bb4e755f44aa94bd86edc10119 Mon Sep 17 00:00:00 2001 From: QIDI TECH <893239786@qq.com> Date: Sat, 28 Sep 2024 16:15:29 +0800 Subject: [PATCH] fix some bug --- resources/profiles/QIDITechnology.ini | 52 +++++++++++-------- .../profiles/QIDITechnology/X-Plus 4.svg | 31 ++++++----- resources/web/guide/filament_table.html | 30 +++++------ resources/web/guide/index.html | 8 ++- 4 files changed, 66 insertions(+), 55 deletions(-) diff --git a/resources/profiles/QIDITechnology.ini b/resources/profiles/QIDITechnology.ini index 0159d72..5c1da64 100644 --- a/resources/profiles/QIDITechnology.ini +++ b/resources/profiles/QIDITechnology.ini @@ -21,7 +21,7 @@ technology = FFF family = X 4 bed_model = X-Plus 4_bed.stl bed_texture = X-Plus 4.svg -default_materials = QIDI ABS Odorless @X-Plus 4 0.4 nozzle; QIDI ABS Rapido @X-Plus 4 0.4 nozzle; QIDI PLA Rapido @X-Plus 4 0.4 nozzle; QIDI PLA Rapido Matte @X-Plus 4 0.4 nozzle; QIDI PLA-CF @X-Plus 4 0.4 nozzle; Generic ABS @X-Plus 4 0.4 nozzle; Generic PLA @X-Plus 4 0.4 nozzle +default_materials = QIDI ABS Odorless @X-Plus 4 0.4 nozzle; QIDI ABS Rapido @X-Plus 4 0.4 nozzle; QIDI PLA Rapido @X-Plus 4 0.4 nozzle; QIDI PLA Rapido Matte @X-Plus 4 0.4 nozzle; QIDI PLA-CF @X-Plus 4 0.4 nozzle; Generic ABS @X-Plus 4 0.4 nozzle; Generic PLA @X-Plus 4 0.4 nozzle; QIDI PLA Rapido Silk @X-Plus 4 0.4 nozzle; Generic PLA Silk @X-Plus 4 0.4 nozzle [printer_model:Q1 Pro] name = Q1 Pro @@ -30,7 +30,7 @@ technology = FFF family = Q bed_model = Q1 Pro_bed.stl bed_texture = Q1 Pro.svg -default_materials = QIDI ABS Odorless @Q1 Pro 0.4 nozzle; QIDI ABS Rapido @Q1 Pro 0.4 nozzle; QIDI PLA Rapido @Q1 Pro 0.4 nozzle; QIDI PLA Rapido Matte @Q1 Pro 0.4 nozzle; QIDI PLA-CF @Q1 Pro 0.4 nozzle; Generic ABS @Q1 Pro 0.4 nozzle; Generic PLA @Q1 Pro 0.4 nozzle +default_materials = QIDI ABS Odorless @Q1 Pro 0.4 nozzle; QIDI ABS Rapido @Q1 Pro 0.4 nozzle; QIDI PLA Rapido @Q1 Pro 0.4 nozzle; QIDI PLA Rapido Matte @Q1 Pro 0.4 nozzle; QIDI PLA-CF @Q1 Pro 0.4 nozzle; Generic ABS @Q1 Pro 0.4 nozzle; Generic PLA @Q1 Pro 0.4 nozzle; QIDI PLA Rapido Silk @Q1 Pro 0.4 nozzle; Generic PLA Silk @Q1 Pro 0.4 nozzle [printer_model:X-MAX 3] name = X-MAX 3 @@ -39,7 +39,7 @@ technology = FFF family = X 3 bed_model = X-MAX 3_bed.stl bed_texture = X-MAX 3.svg -default_materials = QIDI ABS Odorless @X-MAX 3 0.4 nozzle; QIDI ABS Rapido @X-MAX 3 0.4 nozzle; QIDI PLA Rapido @X-MAX 3 0.4 nozzle; QIDI PLA Rapido Matte @X-MAX 3 0.4 nozzle; QIDI PLA-CF @X-MAX 3 0.4 nozzle; Generic ABS @X-MAX 3 0.4 nozzle; Generic PLA @X-MAX 3 0.4 nozzle +default_materials = QIDI ABS Odorless @X-MAX 3 0.4 nozzle; QIDI ABS Rapido @X-MAX 3 0.4 nozzle; QIDI PLA Rapido @X-MAX 3 0.4 nozzle; QIDI PLA Rapido Matte @X-MAX 3 0.4 nozzle; QIDI PLA-CF @X-MAX 3 0.4 nozzle; Generic ABS @X-MAX 3 0.4 nozzle; Generic PLA @X-MAX 3 0.4 nozzle; QIDI PLA Rapido Silk @X-MAX 3 0.4 nozzle; Generic PLA Silk @X-MAX 3 0.4 nozzle [printer_model:X-Plus 3] name = X-Plus 3 @@ -48,7 +48,7 @@ technology = FFF family = X 3 bed_model = X-Plus 3_bed.stl bed_texture = X-Plus 3.svg -default_materials = QIDI ABS Odorless @X-Plus 3 0.4 nozzle; QIDI ABS Rapido @X-Plus 3 0.4 nozzle; QIDI PLA Rapido @X-Plus 3 0.4 nozzle; QIDI PLA Rapido Matte @X-Plus 3 0.4 nozzle; QIDI PLA-CF @X-Plus 3 0.4 nozzle; Generic ABS @X-Plus 3 0.4 nozzle; Generic PLA @X-Plus 3 0.4 nozzle +default_materials = QIDI ABS Odorless @X-Plus 3 0.4 nozzle; QIDI ABS Rapido @X-Plus 3 0.4 nozzle; QIDI PLA Rapido @X-Plus 3 0.4 nozzle; QIDI PLA Rapido Matte @X-Plus 3 0.4 nozzle; QIDI PLA-CF @X-Plus 3 0.4 nozzle; Generic ABS @X-Plus 3 0.4 nozzle; Generic PLA @X-Plus 3 0.4 nozzle; QIDI PLA Rapido Silk @X-Plus 3 0.4 nozzle; Generic PLA Silk @X-Plus 3 0.4 nozzle [printer_model:X-smart 3] name = X-smart 3 @@ -57,7 +57,7 @@ technology = FFF family = X 3 bed_model = X-smart 3_bed.stl bed_texture = X-smart 3.svg -default_materials = QIDI ABS Odorless @X-smart 3 0.4 nozzle;QIDI ABS Rapido @X-smart 3 0.4 nozzle; QIDI PLA Rapido @X-smart 3 0.4 nozzle; QIDI PLA Rapido Matte @X-smart 3 0.4 nozzle; QIDI PLA-CF @X-smart 3 0.4 nozzle; Generic ABS @X-smart 3 0.4 nozzle; Generic PLA @X-smart 3 0.4 nozzle +default_materials = QIDI ABS Odorless @X-smart 3 0.4 nozzle;QIDI ABS Rapido @X-smart 3 0.4 nozzle; QIDI PLA Rapido @X-smart 3 0.4 nozzle; QIDI PLA Rapido Matte @X-smart 3 0.4 nozzle; QIDI PLA-CF @X-smart 3 0.4 nozzle; Generic ABS @X-smart 3 0.4 nozzle; Generic PLA @X-smart 3 0.4 nozzle; QIDI PLA Rapido Silk @X-smart 3 0.4 nozzle; Generic PLA Silk @X-smart 3 0.4 nozzle # All presets starting with asterisk, for example *common*, are intermediate and they will # not make it into the user interface. @@ -719,7 +719,7 @@ compatible_prints_condition = cooling = 1 disable_fan_first_layers = 1 disable_rapid_cooling_fan_first_layers = 3 -dont_slow_down_outer_wall = 1 +dont_slow_down_outer_wall = 0 enable_advance_pressure = 1 enable_auxiliary_fan = 100 enable_auxiliary_fan_unseal = 0 @@ -850,7 +850,7 @@ enable_dynamic_fan_speeds = 1 enable_volume_fan = 0 extrusion_multiplier = 0.95 filament_colour = #FFC800 -filament_density = 1.05 +filament_density = 1.06 filament_max_volumetric_speed = 22 filament_type = ABS first_layer_bed_temperature = 90 @@ -1070,20 +1070,24 @@ filament_max_volumetric_speed = 21 [filament:*QIDI PLA Rapido Metal*] inherits = *common* +filament_density = 1.20 [filament:*QIDI PLA Rapido Silk*] inherits = *common* -bed_temperature = 60 +bed_temperature = 55 +enable_auxiliary_fan = 0 filament_colour = #80FFFF -filament_density = 1.20 +filament_density = 1.24 filament_max_volumetric_speed = 7.5 filament_retract_length = 0.5 -first_layer_bed_temperature = 60 -first_layer_temperature = 220 +first_layer_bed_temperature = 55 +first_layer_temperature = 230 +temperature = 230 [filament:*QIDI PLA-CF*] inherits = *common* advance_pressure = 0.02 +enable_auxiliary_fan = 0 extrusion_multiplier = 0.96 filament_colour = #27408B filament_density = 1.25 @@ -1102,7 +1106,7 @@ enable_auxiliary_fan = 0 extrusion_multiplier = 0.97 fan_below_layer_time = 5 filament_colour = #4F4F4F -filament_density = 1.26 +filament_density = 1.3 filament_max_volumetric_speed = 6 filament_type = PPS-CF first_layer_bed_temperature = 110 @@ -1119,7 +1123,7 @@ advance_pressure = 0.1 enable_auxiliary_fan = 0 extrusion_multiplier = 1 filament_colour = #8000FF -filament_density = 1.21 +filament_density = 1.15 filament_max_volumetric_speed = 4 filament_type = TPU filament_vendor = Generic @@ -1194,6 +1198,7 @@ temperature = 250 [filament:*Generic PLA*] inherits = *common* +enable_auxiliary_fan = 0 filament_colour = #0000FF filament_density = 1.20 filament_max_volumetric_speed = 14 @@ -1203,6 +1208,7 @@ filament_vendor = Generic inherits = *common* advance_pressure = 0.024 bed_temperature = 55 +enable_auxiliary_fan = 0 filament_colour = #80FFFF filament_density = 1.20 filament_max_volumetric_speed = 7.5 @@ -1394,8 +1400,8 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0] [filament:QIDI PLA Rapido Silk @X-Plus 4 0.4 nozzle] inherits = *QIDI PLA Rapido Silk* advance_pressure = 0.034 -first_layer_temperature = 210 -temperature = 210 +first_layer_temperature = 220 +temperature = 220 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4 [filament:QIDI PLA-CF @X-Plus 4 0.4 nozzle] @@ -1541,8 +1547,8 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0] [filament:QIDI PLA Rapido Silk @X-Plus 4 0.6 nozzle] inherits = *QIDI PLA Rapido Silk* advance_pressure = 0.021 -first_layer_temperature = 210 -temperature = 210 +first_layer_temperature = 220 +temperature = 220 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6 [filament:QIDI PLA-CF @X-Plus 4 0.6 nozzle] @@ -1913,8 +1919,8 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]== [filament:QIDI PLA Rapido Silk @Q1 Pro 0.4 nozzle] inherits = *QIDI PLA Rapido Silk* advance_pressure = 0.034 -first_layer_temperature = 210 -temperature = 210 +first_layer_temperature = 220 +temperature = 220 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4 [filament:QIDI PLA-CF @Q1 Pro 0.4 nozzle] @@ -2061,8 +2067,8 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]== [filament:QIDI PLA Rapido Silk @Q1 Pro 0.6 nozzle] inherits = *QIDI PLA Rapido Silk* advance_pressure = 0.024 -first_layer_temperature = 210 -temperature = 210 +first_layer_temperature = 220 +temperature = 220 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6 [filament:QIDI PLA-CF @Q1 Pro 0.6 nozzle] @@ -3597,7 +3603,7 @@ inherits = *common* printer_model = X-Plus 4 autoemit_temperature_commands = 0 auxiliary_fan = 1 -bed_exclude_area = 0x0,0x0,0x300,0x305,50x305,50x300,0x300,0x0,0x0,293x0,293x10,305x10,305x0,293x0,0x0 +bed_exclude_area = 0x0,0x0,0x302,0x305,35x302,35x302,0x302,0x0,0x0,293x0,293x20,305x20,305x0,293x0,0x0 bed_shape = 0x0,305x0,305x305,0x305 before_layer_gcode = ;TIMELAPSE_TAKE_FRAME chamber_temperature = 1 @@ -3605,7 +3611,7 @@ layer_gcode = G92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1} machine_max_feedrate_z = 20 max_print_height = 280 retract_lift_below = 279 -start_gcode = PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[volume_temperature]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[first_layer_bed_temperature]\nM104 S[first_layer_temperature]\nM141 S[volume_temperature]\nG4 P3000\n{position[0] = max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0)}\n{position[1] = max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85), 0)}\n{position[2] = 0.5 * first_layer_height * nozzle_diameter[0]}\n{if position[0] <= 50 and position[1] >= 215} {position[1] = 215} {endif}\n{if position[0] >= 208 and position[1] <= 10} {position[0] = 208} {endif}\nG0 X{position[0]} Y{position[1]} Z5 F6000\nG0 Z[first_layer_height] F600\nG1 E3 F1800\nG1 X{position[0] + 85} E{85 * position[2]} F3000\nG1 Y{position[1] + 2} E{2 * position[2]}\nG1 X{position[0]} E{85 * position[2]}\nG1 Y{position[1] + 85} E{83 * position[2]}\nG1 X{position[0] + 2} E{2 * position[2]}\nG1 Y{position[1] + 3} E{82 * position[2]}\nG1 X{position[0] + 3} Z0\nG1 X{position[0] + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1\n +start_gcode = PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[volume_temperature]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[first_layer_bed_temperature]\nM104 S[first_layer_temperature]\nM141 S[volume_temperature]\nG4 P3000\n{position[0] = max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0)}\n{position[1] = max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85), 0)}\n{position[2] = 0.5 * first_layer_height * nozzle_diameter[0]}\n{if position[0] <= 35 and position[1] >= 217} {position[1] = 217} {endif}\n{if position[0] >= 208 and position[1] <= 20} {position[0] = 208} {endif}\nG0 X{position[0]} Y{position[1]} Z5 F6000\nG0 Z[first_layer_height] F600\nG1 E3 F1800\nG1 X{position[0] + 85} E{85 * position[2]} F3000\nG1 Y{position[1] + 2} E{2 * position[2]}\nG1 X{position[0]} E{85 * position[2]}\nG1 Y{position[1] + 85} E{83 * position[2]}\nG1 X{position[0] + 2} E{2 * position[2]}\nG1 Y{position[1] + 3} E{82 * position[2]}\nG1 X{position[0] + 3} Z0\nG1 X{position[0] + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1\n thumbnails = 272x272/PNG, 96x96/PNG wipe_device = 1 diff --git a/resources/profiles/QIDITechnology/X-Plus 4.svg b/resources/profiles/QIDITechnology/X-Plus 4.svg index 17de918..f61b53b 100644 --- a/resources/profiles/QIDITechnology/X-Plus 4.svg +++ b/resources/profiles/QIDITechnology/X-Plus 4.svg @@ -1,10 +1,9 @@ + x="0px" y="0px" viewBox="0 0 864.6 864.6" enable-background="new 0 0 864.6 864.6" xml:space="preserve"> - + @@ -32,20 +31,20 @@ - - - - - - - + + + + + + + - - - - - + + + + + @@ -70,5 +69,5 @@ - + diff --git a/resources/web/guide/filament_table.html b/resources/web/guide/filament_table.html index dbea76a..984f21f 100644 --- a/resources/web/guide/filament_table.html +++ b/resources/web/guide/filament_table.html @@ -360,7 +360,7 @@ "Anneal": "退火", "Compare filaments": "比较耗材:" }, - fr_FR: { + fr: { "Water resistance": "Propriétés imperméables", "Corrosion resistance": "Résistance à la corrosion", "Creep resistance": "Résistance au fluage", @@ -385,7 +385,7 @@ "Anneal": "Anneal", "Compare filaments": "Comparer les filaments:" }, - cs_CZ: { + cs: { "Water resistance": "Vododolnost", "Corrosion resistance": "odolnost proti korozi", "Creep resistance": "Odolnost proti plazování", @@ -410,7 +410,7 @@ "Anneal": "Rozšíření", "Compare filaments": "Porovnat vlákna:" }, - de_DE: { + de: { "Water resistance": "Wasserbeständigkeit", "Corrosion resistance": "Korrosionsbeständigkeit", "Creep resistance": "Kriechfestigkeit", @@ -435,7 +435,7 @@ "Anneal": "Anneal", "Compare filaments": "Filamente vergleichen:" }, - es_ES: { + es: { "Water resistance": "Propiedades impermeables", "Corrosion resistance": "Resistencia a la corrosión", "Creep resistance": "Resistencia al arrastre", @@ -460,7 +460,7 @@ "Anneal": "Anneal", "Compare filaments": "Filamentos comparativos:" }, - hu_HU: { + hu: { "Water resistance": "Vízállóság", "Corrosion resistance": "Korrózióállóság", "Creep resistance": "Mászásállóság", @@ -485,7 +485,7 @@ "Anneal": "Melléklet", "Compare filaments": "Szálak összehasonlítása:" }, - it_IT: { + it: { "Water resistance": "Resistenza all'acqua", "Corrosion resistance": "Resistenza alla corrosione", "Creep resistance": "Resistenza al creep", @@ -510,7 +510,7 @@ "Anneal": "Allegato", "Compare filaments": "Confronta filamenti:" }, - ja_JP: { + ja: { "Water resistance": "防水性", "Corrosion resistance": "たいふしょくせい", "Creep resistance": "クリープ抵抗", @@ -535,7 +535,7 @@ "Anneal": "Anneal", "Compare filaments": "ひかくフィラメント:" }, - ko_KR: { + ko: { "Water resistance": "방수 성능", "Corrosion resistance": "내부식성", "Creep resistance": "내연성", @@ -560,7 +560,7 @@ "Anneal": "Anneal", "Compare filaments": "비교적 긴 실:" }, - nl_NL: { + nl: { "Water resistance": "Waterbestendigheid", "Corrosion resistance": "Corrosiebestendigheid", "Creep resistance": "Krijpweerstand", @@ -585,7 +585,7 @@ "Anneal": "Anneal", "Compare filaments": "Filamenten vergelijken:" }, - pl_PL: { + pl: { "Water resistance": "Wodoodporność", "Corrosion resistance": "Odporność na korozję", "Creep resistance": "Odporność na pełzanie", @@ -610,7 +610,7 @@ "Anneal": "Wyżej", "Compare filaments": "Porównaj filamenty:" }, - ru_RU: { + ru: { "Water resistance": "Resistência à água", "Corrosion resistance": "Resistência à corrosão", "Creep resistance": "Resistência ao arrasto", @@ -635,7 +635,7 @@ "Anneal": "Anexo", "Compare filaments": "Более длинный шелк:" }, - sv_SE: { + sv: { "Water resistance": "Vattentålighet", "Corrosion resistance": "Korrosionsbeständighet", "Creep resistance": "Krypbeständighet", @@ -660,7 +660,7 @@ "Anneal": "Bilaga", "Compare filaments": "Jämför glödtrådar:" }, - tr_TR: { + tr: { "Water resistance": "Su dirençliği", "Corrosion resistance": "Korozyon dirençliği", "Creep resistance": "Krep dirençliği", @@ -685,7 +685,7 @@ "Anneal": "Annealfrance. kgm", "Compare filaments": "Kıyafetleri karşılaştır:" }, - uk_UA: { + uk: { "Water resistance": "Отпор води", "Corrosion resistance": "Вірність корозії", "Creep resistance": "Опорність групи", @@ -710,7 +710,7 @@ "Anneal": "Анналstar name", "Compare filaments": "Порівняти гілки:" }, - pt_BR: { + pt: { "Water resistance": "Resistência à água", "Corrosion resistance": "Resistência à corrosão", "Creep resistance": "Resistência ao arrasto", diff --git a/resources/web/guide/index.html b/resources/web/guide/index.html index 7d1adef..f28afb6 100644 --- a/resources/web/guide/index.html +++ b/resources/web/guide/index.html @@ -363,11 +363,17 @@
- +
https://qidi3d.com/collections/filaments
+