diff --git a/resources/definitions/biqu_hurakan.def.json b/resources/definitions/biqu_hurakan.def.json index 74506229a3..b8d44f13a4 100755 --- a/resources/definitions/biqu_hurakan.def.json +++ b/resources/definitions/biqu_hurakan.def.json @@ -1,66 +1,65 @@ { - "name": "Biqu Hurakan", "version": 2, + "name": "Biqu Hurakan", "inherits": "biqu_base", - "metadata": { - "quality_definition": "biqu_base", + "metadata": + { "visible": true, - "has_machine_materials": true, "platform": "BIQU_Hurakan_bed.stl", + "has_machine_materials": true, "platform_offset": [ 0, 0, 0.01 - ] + ], + "quality_definition": "biqu_base" }, - "overrides": { - "top_thickness": { "value": 1.0 }, + "overrides": + { + "acceleration_print": { "value": 3000 }, + "acceleration_travel": { "value": 3000 }, "coasting_enable": { "value": false }, - "retraction_amount": { "value": 3.0 }, - "retraction_speed": { "value": 45 }, - "retraction_extrusion_window": { "value": 3.0 }, - "retract_at_layer_change": { "value": true }, - "support_enable": { "value": false }, - "support_structure": { "value": "'normal'" }, - "support_type": { "value": "'buildplate'" }, - "support_angle": { "value": 45 }, - "support_infill_rate": { "value": 20 }, - "infill_overlap": { "value": 15.0 }, - "skin_overlap": { "value": 15.0 }, "fill_outline_gaps": { "value": true }, - "roofing_layer_count": { "value": 2 }, - "xy_offset_layer_0": { "value": -0.1 }, - "speed_print": { "value": 120 }, - "speed_travel": { "value": 200 }, - "speed_layer_0": { "value": 25 }, - "speed_wall_0": { "value": 60 }, - "speed_wall_x": { "value": 75 }, - "machine_name": { "default_value": "Biqu Hurakan" }, - "machine_width": { "value": 235 }, + "gantry_height": { "value": 35 }, + "infill_overlap": { "value": 15.0 }, + "jerk_print": { "value": 12 }, + "machine_acceleration": { "value": 3000 }, "machine_depth": { "value": 235 }, - "machine_height": { "value": 270 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": ";BIQU Hurakan end code. More complex. Such wow. Klipper4Life.\r\n\r\nEND_PRINT" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-31, -35.3], [-31, 25.5], [31, 25.5], [31, -35.5] ] }, + "machine_height": { "value": 270 }, + "machine_max_acceleration_e": { "value": 10000 }, "machine_max_acceleration_x": { "value": 3000 }, "machine_max_acceleration_y": { "value": 3000 }, "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 10000 }, - "machine_acceleration": { "value": 3000 }, - "acceleration_print": { "value": 3000 }, - "acceleration_travel": { "value": 3000 }, - "jerk_print": { "value": 12 }, - "machine_start_gcode": { - "default_value": ";BIQU Hurakan start code. Much complex. Very wow. Klipper FTW.\r\n\r\nSTART_PRINT BED_TEMP={material_bed_temperature_layer_0} EXTRUDER_TEMP={material_print_temperature_layer_0}\r\n\r\n; Note: This start\/end code is designed to work\r\n; with the stock cfg files provided with the \r\n; BIQU Hurakan. If you alter the macros in the \r\n; cfg files then you may also need to alter this code.\r\n\r\n; Another note: This profile will get you \r\n; part of the way to good prints.\r\n; You still need to tweak settings for each \r\n; different filament that you use.\r\n; Settings such as retraction distance\/speed, \r\n; flow, pressure advance, bed\/nozzle temperatures\r\n; and others may need to be adjusted.\r\n; Use https:\/\/teachingtechyt.github.io\/calibration.html to calibrate.\r\n; Also see https:\/\/www.youtube.com\/watch?v=Ae2G7hl_pZc\r\n; for some good tips." - }, - "machine_end_gcode": { - "default_value": ";BIQU Hurakan end code. More complex. Such wow. Klipper4Life.\r\n\r\nEND_PRINT" - }, - - "gantry_height": { "value": 35 } + "machine_name": { "default_value": "Biqu Hurakan" }, + "machine_start_gcode": { "default_value": ";BIQU Hurakan start code. Much complex. Very wow. Klipper FTW.\r\n\r\nSTART_PRINT BED_TEMP={material_bed_temperature_layer_0} EXTRUDER_TEMP={material_print_temperature_layer_0}\r\n\r\n; Note: This start/end code is designed to work\r\n; with the stock cfg files provided with the \r\n; BIQU Hurakan. If you alter the macros in the \r\n; cfg files then you may also need to alter this code.\r\n\r\n; Another note: This profile will get you \r\n; part of the way to good prints.\r\n; You still need to tweak settings for each \r\n; different filament that you use.\r\n; Settings such as retraction distance/speed, \r\n; flow, pressure advance, bed/nozzle temperatures\r\n; and others may need to be adjusted.\r\n; Use https://teachingtechyt.github.io/calibration.html to calibrate.\r\n; Also see https://www.youtube.com/watch?v=Ae2G7hl_pZc\r\n; for some good tips." }, + "machine_width": { "value": 235 }, + "retract_at_layer_change": { "value": true }, + "retraction_amount": { "value": 3.0 }, + "retraction_extrusion_window": { "value": 3.0 }, + "retraction_speed": { "value": 45 }, + "roofing_layer_count": { "value": 2 }, + "skin_overlap": { "value": 15.0 }, + "speed_layer_0": { "value": 25 }, + "speed_print": { "value": 120 }, + "speed_travel": { "value": 200 }, + "speed_wall_0": { "value": 60 }, + "speed_wall_x": { "value": 75 }, + "support_angle": { "value": 45 }, + "support_enable": { "value": false }, + "support_infill_rate": { "value": 20 }, + "support_structure": { "value": "'normal'" }, + "support_type": { "value": "'buildplate'" }, + "top_thickness": { "value": 1.0 }, + "xy_offset_layer_0": { "value": -0.1 } } -} +} \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg index 153e2faa68..60afe43d91 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu_175 variant = 0.3mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg index 7c7fe21223..893313c584 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu_175 variant = 0.3mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg index 2e0c2e1d66..4065f3d48a 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu_175 variant = 0.3mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg index a4ef99e939..efdce46802 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu_175 variant = 0.4mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg index 3d60e46d92..8241e184e0 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu_175 variant = 0.4mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg index 1f03ff9724..5bc71a8a56 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu_175 variant = 0.4mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg index 8e05494ac1..a2e895e469 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu_175 variant = 0.5mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg index bb13292519..3c59dd4e28 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu_175 variant = 0.5mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg index afaf4b262c..3ed4082eb7 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu_175 variant = 0.5mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg index 2d2395b118..7006cb1be5 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu_175 variant = 0.6mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg index cd015ba47f..b364331eb1 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu_175 variant = 0.8mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg index e5273105a0..7b32ce4369 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu_175 variant = 1.0mm Nozzle [values] +speed_print = 30 -speed_print = 30 \ No newline at end of file diff --git a/resources/variants/biqu_hurakan_0.2.inst.cfg b/resources/variants/biqu_hurakan_0.2.inst.cfg index 0376c8e756..0a9e1f0cda 100755 --- a/resources/variants/biqu_hurakan_0.2.inst.cfg +++ b/resources/variants/biqu_hurakan_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_hurakan name = 0.2mm Nozzle version = 4 -definition = biqu_hurakan [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/biqu_hurakan_0.3.inst.cfg b/resources/variants/biqu_hurakan_0.3.inst.cfg index db16f4364a..3a02cd543b 100755 --- a/resources/variants/biqu_hurakan_0.3.inst.cfg +++ b/resources/variants/biqu_hurakan_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_hurakan name = 0.3mm Nozzle version = 4 -definition = biqu_hurakan [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/biqu_hurakan_0.4.inst.cfg b/resources/variants/biqu_hurakan_0.4.inst.cfg index 292f28c5fe..b5d03ec754 100755 --- a/resources/variants/biqu_hurakan_0.4.inst.cfg +++ b/resources/variants/biqu_hurakan_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_hurakan name = 0.4mm Nozzle version = 4 -definition = biqu_hurakan [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/biqu_hurakan_0.5.inst.cfg b/resources/variants/biqu_hurakan_0.5.inst.cfg index 8aa780031f..39e77e2308 100755 --- a/resources/variants/biqu_hurakan_0.5.inst.cfg +++ b/resources/variants/biqu_hurakan_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_hurakan name = 0.5mm Nozzle version = 4 -definition = biqu_hurakan [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/biqu_hurakan_0.6.inst.cfg b/resources/variants/biqu_hurakan_0.6.inst.cfg index 7976976712..77f184dcaa 100755 --- a/resources/variants/biqu_hurakan_0.6.inst.cfg +++ b/resources/variants/biqu_hurakan_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_hurakan name = 0.6mm Nozzle version = 4 -definition = biqu_hurakan [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/biqu_hurakan_0.8.inst.cfg b/resources/variants/biqu_hurakan_0.8.inst.cfg index 76278c0f86..19a440f23b 100755 --- a/resources/variants/biqu_hurakan_0.8.inst.cfg +++ b/resources/variants/biqu_hurakan_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_hurakan name = 0.8mm Nozzle version = 4 -definition = biqu_hurakan [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +