GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 18:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	resources/definitions/hms434.def.json -> We both fixed the gantry height value vs. default_value problem.
This commit is contained in:
Ghostkeeper 2019-05-13 15:11:32 +02:00
commit 3a6534a3a4
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/definitions/hms434.def.json
View File

@ -15,7 +15,7 @@
"has_variants": true,
"variants_name": "Tool",
"preferred_variant_name": "0.8mm TP extruder",
"preferred_variant_name": "0.4mm TP extruder",
"has_machine_quality": true,
"preferred_quality_type": "normal",
@ -39,7 +39,7 @@
},
"overrides": {
"machine_extruder_count": {"default_value": 1 },
"machine_extruder_count": {"default_value": 2 },
"material_diameter": {"default_value": 1.75 },
"machine_heated_bed": {"default_value": true },
"machine_center_is_zero": {"default_value": false },
@ -56,7 +56,7 @@
"prime_tower_position_y": {"value": 70 },
"prime_blob_enable": {"default_value": false },
"machine_max_feedrate_z": {"default_value": 1200 },
"machine_start_gcode": {"default_value": "\n;Neither HMS434 nor any of HMS434 Subsidiaries has any liabilities or gives any warrenties on this .gcode file,\n\n;or on any or all objects made with this .gcode file \nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\n\nG1 X-71 F9000;go to wipe point\nG1 Y-100 F9000\nG1 Z0 F900\n\nG1 Z0.2 F900\n\nG1 Y-65 F12000\nG1 X50 Y0 F9000\nM117 HMS434 Printing ...\n\n" },
"machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file. \nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\n\nG1 X-71 F9000;go to wipe point\nG1 Y-100 F9000\nG1 Z0 F900\n\nG1 Z0.2 F900\n\nG1 Y-65 F12000\nG1 X50 Y0 F9000\nM117 HMS434 Printing ...\n\n" },
"machine_end_gcode": {"default_value": "" },
"retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" },
@ -127,7 +127,7 @@
"cool_fan_enabled": {"value": true},
"cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"},
"cool_min_layer_time": {"value": 20},
"cool_min_speed": {"value": "speed_wall_x"},
"cool_min_speed": {"value": "10"},
"cool_lift_head": {"value": false},
"support_z_distance": {"value": 0},
@ -141,6 +141,8 @@
"skirt_gap": {"value": 1},
"skirt_brim_minimal_length": {"value": 50},
"prime_tower_enable": {"value": false},
"coasting_enable": {"value": true},
"coasting_volume": {"value": 0.1},
"coasting_min_volume": {"value": 0.17},

2
resources/extruders/hms434_tool_2.def.json
View File

@ -13,7 +13,7 @@
"default_value": 1,
"maximum_value": "8"
},
"machine_nozzle_offset_x": { "default_value": 20.0 },
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {