Use spaces instead of tabs

Yeah, or remove extraneous tabs at the end of a line.
This commit is contained in:
Ghostkeeper 2019-02-11 08:53:42 +01:00
parent 93ff63ce6f
commit d2e1c47029
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
4 changed files with 96 additions and 96 deletions

View File

@ -567,8 +567,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
if material_guid: if material_guid:
material_group_list = material_manager.getMaterialGroupListByGUID(material_guid) material_group_list = material_manager.getMaterialGroupListByGUID(material_guid)
# This can happen if the connected machine has no material in one or more extruders (if GUID is empty), or the # This can happen if the connected machine has no material in one or more extruders (if GUID is empty), or the
# material is unknown to Cura, so we should return an "empty" or "unknown" material model. # material is unknown to Cura, so we should return an "empty" or "unknown" material model.
if material_group_list is None: if material_group_list is None:
material_name = i18n_catalog.i18nc("@label:material", "Empty") if len(material_data.get("guid", "")) == 0 \ material_name = i18n_catalog.i18nc("@label:material", "Empty") if len(material_data.get("guid", "")) == 0 \
else i18n_catalog.i18nc("@label:material", "Unknown") else i18n_catalog.i18nc("@label:material", "Unknown")

View File

@ -1,92 +1,92 @@
{ {
"id": "BIBO2 dual", "id": "BIBO2 dual",
"version": 2, "version": 2,
"name": "BIBO2 dual", "name": "BIBO2 dual",
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "na", "author": "na",
"manufacturer": "BIBO", "manufacturer": "BIBO",
"category": "Other", "category": "Other",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"has_materials": true, "has_materials": true,
"machine_extruder_trains": { "machine_extruder_trains": {
"0": "bibo2_dual_extruder_0", "0": "bibo2_dual_extruder_0",
"1": "bibo2_dual_extruder_1" "1": "bibo2_dual_extruder_1"
}, },
"first_start_actions": [ "first_start_actions": [
"MachineSettingsAction" "MachineSettingsAction"
] ]
}, },
"overrides": { "overrides": {
"machine_name": { "machine_name": {
"default_value": "BIBO2 dual" "default_value": "BIBO2 dual"
}, },
"machine_width": { "machine_width": {
"default_value": 214 "default_value": 214
}, },
"machine_height": { "machine_height": {
"default_value": 160 "default_value": 160
}, },
"machine_depth": { "machine_depth": {
"default_value": 186 "default_value": 186
}, },
"machine_center_is_zero": { "machine_center_is_zero": {
"default_value": true "default_value": true
}, },
"machine_heated_bed": { "machine_heated_bed": {
"default_value": true "default_value": true
}, },
"machine_nozzle_heat_up_speed": { "machine_nozzle_heat_up_speed": {
"default_value": 2 "default_value": 2
}, },
"machine_nozzle_cool_down_speed": { "machine_nozzle_cool_down_speed": {
"default_value": 2 "default_value": 2
}, },
"machine_head_with_fans_polygon": { "machine_head_with_fans_polygon": {
"default_value": [ "default_value": [
[ [
-68.18, -68.18,
64.63 64.63
], ],
[ [
-68.18, -68.18,
-47.38 -47.38
], ],
[ [
35.18, 35.18,
64.63 64.63
], ],
[ [
35.18, 35.18,
-47.38 -47.38
] ]
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 12 "default_value": 12
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"
}, },
"machine_start_gcode": { "machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 15mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nM117 BIBO Printing..." "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 15mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nM117 BIBO Printing..."
}, },
"machine_end_gcode": { "machine_end_gcode": {
"default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-2 X-20 Y-20 F300 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" "default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-2 X-20 Y-20 F300 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
}, },
"machine_extruder_count": { "machine_extruder_count": {
"default_value": 2 "default_value": 2
}, },
"prime_tower_position_x": { "prime_tower_position_x": {
"default_value": 50 "default_value": 50
}, },
"prime_tower_position_y": { "prime_tower_position_y": {
"default_value": 50 "default_value": 50
} }
} }
} }

View File

@ -14,8 +14,8 @@
"has_machine_quality": false, "has_machine_quality": false,
"preferred_quality_type": "draft", "preferred_quality_type": "draft",
"machine_extruder_trains": { "machine_extruder_trains": {
"0": "cr-x_extruder_0", "0": "cr-x_extruder_0",
"1": "cr-x_extruder_1" "1": "cr-x_extruder_1"
} }
}, },
@ -43,8 +43,8 @@
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" },
"machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" }, "machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" },
"material_print_temperature": { "default_value": 200 }, "material_print_temperature": { "default_value": 200 },
"wall_thickness": { "default_value": 1 }, "wall_thickness": { "default_value": 1 },
"top_bottom_thickness": { "default_value": 1 }, "top_bottom_thickness": { "default_value": 1 },
"bottom_thickness": { "default_value": 1 } "bottom_thickness": { "default_value": 1 }
} }

View File

@ -9,7 +9,7 @@
}, },
"overrides": { "overrides": {
"extruder_nr": { "default_value": 0 }, "extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 } "material_diameter": { "default_value": 1.75 }
} }