Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master

6 files changed, 476 insertions, 0 deletions

diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json
new file mode 100644
index 0000000000..1527e09529
--- /dev/null
+++ b/resources/definitions/mixware_hyper_s.def.json
@@ -0,0 +1,383 @@
+{
+    "name": "Hyper S",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Mixware",
+        "manufacturer": "Mixware",
+        "category": "Mixware",
+        "file_formats": "text/x-gcode",
+        "platform": "hyper_s_platform.stl",
+        "has_materials": true,
+        "preferred_material": "*hyper_s_pla*",
+        "preferred_quality": "*extra*",
+        "machine_extruder_trains": {
+            "0": "hyper_s_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_name": {
+            "default_value": "Hyper S"
+        },
+        "machine_start_gcode": {
+            "default_value": "M140 S{material_bed_temperature} ; Heat bed\nM109 S{material_print_temperature} ; Heat nozzle\nM190 S{material_bed_temperature} ; Wait for bed heating\nG28 ; home all axes\nM117 Purge extruder\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface\nG1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X0.1 Y100.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X0.4 Y100.0 Z0.3 F5000.0 ; move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface"
+        },
+        "machine_end_gcode": {
+            "default_value": "G91; relative positioning\nG1 Z1.0 F3000 ; move z up little to prevent scratching of print\nG90; absolute positioning\nG1 X0 Y200 F1000 ; prepare for part removal\nM104 S0; turn off extruder\nM140 S0 ; turn off bed\nG1 X0 Y220 F1000 ; prepare for part removal\nM84 ; disable motors\nM106 S0 ; turn off fan"
+        },
+        "machine_width": {
+            "default_value": 300
+        },
+        "machine_depth": {
+            "default_value": 300
+        },
+        "machine_height": {
+            "default_value": 400
+        },
+        "raft_margin": {
+            "default_value": 3,
+            "minimum_value_warning": "0.01"
+        },
+        "raft_airgap": {
+            "default_value": 0.24
+        },
+        "brim_width": {
+            "default_value": 3
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "top_bottom_pattern": {
+            "default_value": "zigzag"
+        },
+        "ironing_line_spacing": {
+            "default_value": 0.4
+        },
+        "ironing_pattern": {
+            "default_value": "concentric"
+        },
+        "skin_no_small_gaps_heuristic": {
+            "default_value": false
+        },
+        "retraction_hop_enabled": {
+            "default_value": false
+        },
+        "support_enable": {
+            "default_value": true
+        },
+        "support_type": {
+            "default_value": "buildplate"
+        },
+        "support_angle": {
+            "default_value": 60
+        },
+        "support_pattern": {
+            "default_value": "zigzag"
+        },
+        "support_infill_rate": {
+            "default_value": "15"
+        },
+        "gantry_height": {
+            "default_value": 25
+        },
+        "machine_max_feedrate_x": {
+            "default_value": 500
+        },
+        "machine_max_feedrate_y": {
+            "default_value": 500
+        },
+        "machine_max_feedrate_z": {
+            "default_value": 10
+        },
+        "machine_max_feedrate_e": {
+            "default_value": 50
+        },
+        "machine_max_acceleration_x": {
+            "default_value": 500
+        },
+        "machine_max_acceleration_y": {
+            "default_value": 500
+        },
+        "machine_max_acceleration_z": {
+            "default_value": 100
+        },
+        "machine_max_acceleration_e": {
+            "default_value": 500
+        },
+        "machine_acceleration": {
+            "default_value": 500
+        },
+        "machine_max_jerk_xy": {
+            "default_value": 10
+        },
+        "machine_max_jerk_z": {
+            "default_value": 0.4
+        },
+        "machine_max_jerk_e": {
+            "default_value": 5
+        },
+        "acceleration_print": {
+            "default_value": 1000
+        },
+        "jerk_print": {
+            "default_value": 10
+        },
+        "acceleration_enabled": {
+            "default_value": false
+        },
+        "jerk_enabled": {
+            "default_value": false
+        },
+        "speed_print": {
+            "default_value": 40.0
+        },
+        "optimize_wall_printing_order": {
+            "default_value": "True"
+        },
+        "z_seam_type": {
+            "default_value": "shortest"
+        },
+        "infill_before_walls": {
+            "default_value": false
+        },
+        "infill_sparse_density": {
+            "default_value": 15
+        },
+        "infill_before_walls": {
+            "default_value": false
+        },
+        "fill_perimeter_gaps": {
+            "default_value": "everywhere"
+        },
+        "fill_outline_gaps": {
+            "default_value": false
+        },
+        "filter_out_tiny_gaps": {
+            "default_value": false
+        },
+        "retraction_hop": {
+            "default_value": 0.2
+        },
+        "travel_avoid_other_parts": {
+            "default_value": false
+        },
+        "travel_retract_before_outer_wall": {
+            "default_value": true
+        },
+        "retraction_amount": {
+            "default_value": 2
+        },
+        "retraction_enable": {
+            "default_value": true
+        },
+        "retraction_count_max": {
+            "default_value": 100
+        },
+        "cool_fan_enabled": {
+            "default_value": true
+        },
+        "cool_min_layer_time": {
+            "default_value": 10
+        },
+        "skirt_gap": {
+            "default_value": 8.0
+        },
+        "skirt_line_count": {
+            "default_value": 3
+        },
+        "adaptive_layer_height_variation": {
+            "default_value": 0.04
+        },
+        "adaptive_layer_height_variation_step": {
+            "default_value": 0.04
+        },
+        "support_use_towers": {
+            "default_value": false
+        },
+        "support_interface_enable": {
+            "default_value": true
+        },
+        "support_interface_density": {
+            "default_value": 33.333
+        },
+        "support_interface_pattern": {
+            "default_value": "grid"
+        },
+        "support_interface_skip_height": {
+            "default_value": 0.24
+        },
+        "top_bottom_thickness": {
+            "default_value": 0.8
+        },
+        "material_flow": {
+            "default_value": 100
+        },
+        "material_print_temperature": {
+            "maximum_value_warning": "330"
+        },
+        "acceleration_roofing": {
+            "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0"
+        },
+        "retraction_speed": {
+            "default_value": 40,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": "200"
+        },
+        "retraction_retract_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": "200"
+        },
+        "retraction_prime_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": "200"
+        },
+        "speed_layer_0": {
+            "value": "speed_print / 2"
+        },
+        "acceleration_travel_layer_0": {
+            "value": "acceleration_travel"
+        },
+        "jerk_travel": {
+            "value": "jerk_print"
+        },
+        "jerk_travel_layer_0": {
+            "value": "jerk_travel"
+        },
+        "skirt_brim_speed": {
+            "value": "speed_layer_0"
+        },
+        "speed_infill": {
+            "value": "speed_print"
+        },
+        "speed_wall": {
+            "value": "speed_print / 2"
+        },
+        "speed_wall_0": {
+            "value": "speed_wall"
+        },
+        "speed_wall_x": {
+            "value": "speed_wall"
+        },
+        "speed_topbottom": {
+            "value": "speed_print / 2"
+        },
+        "speed_roofing": {
+            "value": "speed_topbottom"
+        },
+        "speed_travel": {
+            "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5"
+        },
+        "speed_print_layer_0": {
+            "value": "speed_layer_0"
+        },
+        "speed_travel_layer_0": {
+            "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5"
+        },
+        "speed_prime_tower": {
+            "value": "speed_topbottom"
+        },
+        "speed_support": {
+            "value": "speed_wall_0"
+        },
+        "speed_support_interface": {
+            "value": "speed_topbottom"
+        },
+        "material_initial_print_temperature": {
+            "value": "material_print_temperature"
+        },
+        "material_final_print_temperature": {
+            "value": "material_print_temperature"
+        },
+        "cool_fan_full_at_height": {
+            "value": "layer_height_0 + 2 * layer_height"
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "meshfix_maximum_travel_resolution": {
+            "value": "meshfix_maximum_resolution"
+        },
+        "support_xy_distance": {
+            "value": "wall_line_width_0 * 2"
+        },
+        "support_xy_distance_overhang": {
+            "value": "wall_line_width_0"
+        },
+        "support_z_distance": {
+            "value": "layer_height if layer_height >= 0.16 else layer_height * 2"
+        },
+        "support_xy_overrides_z": {
+            "default_value": "xy_overrides_z"
+        },
+        "support_interface_height": {
+            "value": "layer_height * 4"
+        },
+        "wall_thickness": {
+            "value": "line_width * 2"
+        },
+        "acceleration_travel": {
+            "default_value": 1000
+        },
+        "line_width": { 
+            "default_value": "0.4" 
+        },
+        "speed_z_hop": { 
+            "default_value": 5 
+        },
+        "retraction_combing_max_distance": { 
+            "default_value": 30 
+        },
+        "travel_avoid_supports": { 
+            "default_value": true 
+        },
+        "brim_replaces_support": { 
+            "default_value": false 
+        },
+        "support_brim_width": { 
+            "default_value": 4 
+        },
+        "minimum_support_area": { 
+            "default_value": 2 
+        },
+        "minimum_interface_area": { 
+            "default_value": 10 
+        },
+        
+        
+        "support_wall_count": { 
+            "value": 1 
+        },
+        "support_brim_enable": { 
+            "value": false 
+        },
+        "retraction_combing": {
+            "value": "all"
+        },
+        "retraction_extrusion_window": {
+            "value": 10,
+            "maximum_value_warning": "20"
+        },
+        "retraction_min_travel": {
+            "value": 1.5
+        },
+        "infill_wipe_dist": {
+            "value": 0.0
+        },
+        "skin_overlap": {
+            "value": 10.0
+        },
+        "infill_overlap": {
+            "value": 30.0
+        },
+        "travel_compensate_overlapping_walls_0_enabled": {
+            "value": "False"
+        },
+        "wall_0_wipe_dist": {
+            "value": 0.0
+        }
+    }
+}
diff --git a/resources/extruders/mixware_hyper_s_extruder_0.def.json b/resources/extruders/mixware_hyper_s_extruder_0.def.json
new file mode 100644
index 0000000000..09971ee688
--- /dev/null
+++ b/resources/extruders/mixware_hyper_s_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mixware_hyper_s",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/meshes/mixware_hyper_s_platform.stl b/resources/meshes/mixware_hyper_s_platform.stl
new file mode 100644
index 0000000000..a1cff2b92e
--- /dev/null
+++ b/resources/meshes/mixware_hyper_s_platform.stl
diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg
new file mode 100644
index 0000000000..b6eec89c73
--- /dev/null
+++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Draft
+definition = mixware_hyper_s
+
+[metadata]
+type = quality
+quality_type = draft
+global_quality = True
+setting_version = 18
+
+[values]
+layer_height = 0.15
+retraction_combing = all
+retraction_extrusion_window = 10
+retraction_min_travel = 1.5
+infill_wipe_dist = 0.0
+skin_overlap = 10.0
+infill_overlap = 30.0
+travel_compensate_overlapping_walls_0_enabled = false
+wall_0_wipe_dist = 0.0
+support_wall_count = 1
+support_brim_enable = false
+infill_before_walls = false
+acceleration_enabled = false
+support_enable = true
diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg
new file mode 100644
index 0000000000..751c5629f7
--- /dev/null
+++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Coarse
+definition = mixware_hyper_s
+
+[metadata]
+type = quality
+quality_type = coarse
+setting_version = 18
+global_quality = True
+
+[values]
+layer_height = 0.2
+retraction_combing = all
+retraction_extrusion_window = 10
+retraction_min_travel = 1.5
+infill_wipe_dist = 0.0
+skin_overlap = 10.0
+infill_overlap = 30.0
+travel_compensate_overlapping_walls_0_enabled = false
+wall_0_wipe_dist = 0.0
+support_wall_count = 1
+support_brim_enable = false
+infill_before_walls = false
+acceleration_enabled = false
+support_enable = true
diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg
new file mode 100644
index 0000000000..d4d3937e40
--- /dev/null
+++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Fine
+definition = mixware_hyper_s
+
+[metadata]
+setting_version = 18
+type = quality
+quality_type = normal
+global_quality = True
+
+[values]
+layer_height = 0.1
+retraction_combing = all
+retraction_extrusion_window = 10
+retraction_min_travel = 1.5
+infill_wipe_dist = 0.0
+skin_overlap = 10.0
+infill_overlap = 30.0
+travel_compensate_overlapping_walls_0_enabled = false
+wall_0_wipe_dist = 0.0
+support_wall_count = 1
+support_brim_enable = false
+infill_before_walls = false
+acceleration_enabled = false
+support_enable = true