Applied printer-linter format

This commit is contained in:
nallath 2023-04-19 10:43:59 +00:00 committed by github-actions[bot]
parent fa5166d42a
commit d2f0ee4192
4 changed files with 317 additions and 496 deletions

View File

@ -1,21 +1,14 @@
{ {
"version":2, "version": 2,
"name":"WEEDO Base", "name": "WEEDO Base",
"inherits":"fdmprinter", "inherits": "fdmprinter",
"metadata":{ "metadata":
"author":"WEEDO", {
"manufacturer":"WEEDO", "visible": false,
"visible":false, "author": "WEEDO",
"file_formats":"text/x-gcode", "manufacturer": "WEEDO",
"machine_extruder_trains":{ "file_formats": "text/x-gcode",
"0":"weedo_base_extruder_0" "exclude_materials": [
},
"has_materials":true,
"has_variants":false,
"has_machine_quality":false,
"preferred_quality_type":"draft",
"preferred_material":"generic_pla_175",
"exclude_materials":[
"3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport", "3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue", "bestfilament_abs_skyblue",
@ -164,163 +157,74 @@
"xyzprinting_tpu", "xyzprinting_tpu",
"zyyx_pro_flex", "zyyx_pro_flex",
"zyyx_pro_pla" "zyyx_pro_pla"
] ],
"has_machine_quality": false,
"has_materials": true,
"has_variants": false,
"machine_extruder_trains": { "0": "weedo_base_extruder_0" },
"preferred_material": "generic_pla_175",
"preferred_quality_type": "draft"
}, },
"overrides":{ "overrides":
"material_bed_temp_wait":{ {
"default_value":false "adhesion_type": { "default_value": "raft" },
"default_material_bed_temperature": { "default_value": 35 },
"extruder_prime_pos_x":
{
"maximum_value": "machine_width",
"minimum_value": "0"
}, },
"material_print_temp_wait":{ "extruder_prime_pos_y":
"default_value":false {
"maximum_value": "machine_depth",
"minimum_value": "0"
}, },
"material_diameter":{ "infill_sparse_density": { "default_value": 10 },
"default_value":1.75 "machine_endstop_positive_direction_x": { "default_value": true },
}, "machine_endstop_positive_direction_y": { "default_value": true },
"machine_nozzle_size":{ "machine_endstop_positive_direction_z": { "default_value": false },
"default_value":0.4 "machine_feeder_wheel_diameter": { "default_value": 10.61 },
}, "machine_max_feedrate_e": { "default_value": 45 },
"machine_steps_per_mm_x":{ "machine_max_feedrate_x": { "default_value": 250 },
"default_value":94 "machine_max_feedrate_y": { "default_value": 250 },
}, "machine_max_feedrate_z": { "default_value": 10 },
"machine_steps_per_mm_y":{ "machine_nozzle_size": { "default_value": 0.4 },
"default_value":94 "machine_steps_per_mm_e": { "default_value": 96 },
}, "machine_steps_per_mm_x": { "default_value": 94 },
"machine_steps_per_mm_z":{ "machine_steps_per_mm_y": { "default_value": 94 },
"default_value":400 "machine_steps_per_mm_z": { "default_value": 400 },
}, "material_bed_temp_wait": { "default_value": false },
"machine_steps_per_mm_e":{ "material_diameter": { "default_value": 1.75 },
"default_value":96 "material_flow": { "default_value": 95 },
}, "material_print_temp_prepend": { "default_value": false },
"machine_max_feedrate_x":{ "material_print_temp_wait": { "default_value": false },
"default_value":250 "material_standby_temperature": { "minimum_value": "0" },
}, "prime_tower_min_volume": { "default_value": 10 },
"machine_max_feedrate_y":{ "prime_tower_size": { "default_value": 15 },
"default_value":250 "raft_airgap": { "default_value": 0.22 },
}, "raft_base_speed": { "value": 20 },
"machine_max_feedrate_z":{ "raft_interface_speed": { "value": 33 },
"default_value":10 "raft_margin": { "default_value": 8 },
}, "raft_surface_fan_speed": { "value": 100 },
"machine_max_feedrate_e":{ "raft_surface_speed": { "value": 40 },
"default_value":45 "retraction_amount": { "default_value": 1.5 },
}, "retraction_combing": { "value": "off" },
"machine_endstop_positive_direction_x":{ "retraction_speed": { "default_value": 28 },
"default_value":true "skirt_brim_speed": { "value": 26.0 },
}, "speed_layer_0": { "value": 26.0 },
"machine_endstop_positive_direction_y":{ "speed_prime_tower": { "value": "speed_support" },
"default_value":true "speed_print_layer_0": { "value": 26.0 },
}, "speed_support": { "value": "round(speed_print*0.82,1)" },
"machine_endstop_positive_direction_z":{ "speed_support_interface": { "value": "round(speed_support*0.689,1)" },
"default_value":false "speed_topbottom": { "value": "round(speed_print * 0.65,1)" },
}, "speed_travel": { "value": 105.0 },
"machine_feeder_wheel_diameter":{ "speed_travel_layer_0": { "value": 80.0 },
"default_value":10.61 "speed_wall": { "value": "max(5,round(speed_print / 2,1))" },
}, "speed_wall_0": { "value": "max(5,speed_wall-5)" },
"infill_sparse_density":{ "speed_wall_x": { "value": "speed_wall" },
"default_value":10 "support_angle": { "default_value": 60 },
}, "support_interface_pattern": { "default_value": "lines" },
"material_flow":{ "switch_extruder_retraction_amount": { "value": 16.5 },
"default_value":95 "switch_extruder_retraction_speeds": { "default_value": 28 }
},
"material_standby_temperature":{
"minimum_value":"0"
},
"material_print_temp_prepend":{
"default_value":false
},
"default_material_bed_temperature":{
"default_value":35
},
"speed_wall":{
"value":"max(5,round(speed_print / 2,1))"
},
"speed_wall_0":{
"value":"max(5,speed_wall-5)"
},
"speed_wall_x":{
"value":"speed_wall"
},
"speed_topbottom":{
"value":"round(speed_print * 0.65,1)"
},
"speed_support":{
"value":"round(speed_print*0.82,1)"
},
"speed_support_interface":{
"value":"round(speed_support*0.689,1)"
},
"speed_prime_tower":{
"value":"speed_support"
},
"speed_travel":{
"value":105.0
},
"speed_layer_0":{
"value":26.0
},
"speed_print_layer_0":{
"value":26.0
},
"speed_travel_layer_0":{
"value":80.0
},
"skirt_brim_speed":{
"value":26.0
},
"retraction_amount":{
"default_value":1.5
},
"retraction_speed":{
"default_value":28
},
"switch_extruder_retraction_amount":{
"value":16.5
},
"switch_extruder_retraction_speeds":{
"default_value":28
},
"retraction_combing":{
"value":"off"
},
"support_angle":{
"default_value":60
},
"support_interface_pattern":{
"default_value":"lines"
},
"adhesion_type":{
"default_value":"raft"
},
"raft_margin":{
"default_value":8
},
"raft_airgap":{
"default_value":0.22
},
"raft_surface_speed":{
"value":40
},
"raft_interface_speed":{
"value":33
},
"raft_base_speed":{
"value":20
},
"extruder_prime_pos_y":{
"minimum_value":"0",
"maximum_value":"machine_depth"
},
"extruder_prime_pos_x":{
"minimum_value":"0",
"maximum_value":"machine_width"
},
"prime_tower_size":{
"default_value":15
},
"prime_tower_min_volume":{
"default_value":10
},
"raft_surface_fan_speed":{
"value":100
}
} }
} }

View File

@ -1,87 +1,43 @@
{ {
"name":"WEEFUN TINA2", "version": 2,
"version":2, "name": "WEEFUN TINA2",
"inherits":"weedo_base", "inherits": "weedo_base",
"metadata":{ "metadata":
"visible":true, {
"author":"WEEFUN", "visible": true,
"manufacturer":"WEEFUN", "author": "WEEFUN",
"file_formats":"text/x-gcode", "manufacturer": "WEEFUN",
"platform_offset":[ "file_formats": "text/x-gcode",
"platform_offset": [
0, 0,
0, 0,
0 0
] ]
}, },
"overrides":{ "overrides":
"machine_extruder_count":{ {
"default_value":1 "machine_center_is_zero": { "default_value": false },
}, "machine_depth": { "default_value": 120 },
"machine_heated_bed":{ "machine_end_gcode": { "default_value": ";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" },
"default_value":false "machine_extruder_count": { "default_value": 1 },
}, "machine_heated_bed": { "default_value": false },
"machine_center_is_zero":{ "machine_height": { "default_value": 100 },
"default_value":false "machine_name": { "default_value": "WEEFUN TINA2" },
}, "machine_start_gcode": { "default_value": ";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" },
"machine_height":{ "machine_width": { "default_value": 100 },
"default_value":100 "retraction_amount": { "default_value": 3 },
}, "retraction_count_max": { "default_value": 10 },
"machine_depth":{ "retraction_speed": { "default_value": 35 },
"default_value":120 "speed_infill": { "value": 40.0 },
}, "speed_print_layer_0": { "value": 22.0 },
"machine_width":{ "speed_roofing": { "value": 25.0 },
"default_value":100 "speed_support_bottom": { "dvalue": 30.0 },
}, "speed_support_infill": { "value": 45.0 },
"machine_name":{ "speed_support_roof": { "value": 30.0 },
"default_value":"WEEFUN TINA2" "speed_topbottom": { "value": 30.0 },
}, "speed_travel_layer_0": { "value": 60 },
"machine_start_gcode":{ "speed_wall_0": { "value": 20.0 },
"default_value":";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" "speed_wall_x": { "value": 25.0 },
}, "support_xy_distance": { "default_value": 1.0 }
"machine_end_gcode":{
"default_value":";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30"
},
"retraction_amount":{
"default_value":3
},
"retraction_speed":{
"default_value":35
},
"support_xy_distance":{
"default_value":1.0
},
"retraction_count_max":{
"default_value":10
},
"speed_wall_0":{
"value":20.0
},
"speed_wall_x":{
"value":25.0
},
"speed_topbottom":{
"value":30.0
},
"speed_infill":{
"value":40.0
},
"speed_support_infill":{
"value":45.0
},
"speed_print_layer_0":{
"value":22.0
},
"speed_travel_layer_0":{
"value":60
},
"speed_support_roof":{
"value":30.0
},
"speed_support_bottom":{
"dvalue":30.0
},
"speed_roofing":{
"value":25.0
}
} }
} }

View File

@ -1,81 +1,41 @@
{ {
"name":"WEEFUN TINA2S", "version": 2,
"version":2, "name": "WEEFUN TINA2S",
"inherits":"weedo_base", "inherits": "weedo_base",
"metadata":{ "metadata":
"visible":true, {
"author":"WEEFUN", "visible": true,
"manufacturer":"WEEFUN", "author": "WEEFUN",
"file_formats":"text/x-gcode", "manufacturer": "WEEFUN",
"platform_offset":[ "file_formats": "text/x-gcode",
"platform_offset": [
0, 0,
0, 0,
0 0
] ]
}, },
"overrides":{ "overrides":
"machine_extruder_count":{ {
"default_value":1 "gantry_height": { "value": 20 },
}, "machine_center_is_zero": { "default_value": false },
"machine_heated_bed":{ "machine_depth": { "default_value": 120 },
"default_value":true "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" },
}, "machine_extruder_count": { "default_value": 1 },
"machine_center_is_zero":{ "machine_heated_bed": { "default_value": true },
"default_value":false "machine_height": { "default_value": 100 },
}, "machine_name": { "default_value": "WEEFUN TINA2S" },
"machine_height":{ "machine_start_gcode": { "default_value": ";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." },
"default_value":100 "machine_width": { "default_value": 100 },
}, "retraction_amount": { "default_value": 3 },
"machine_depth":{ "speed_infill": { "value": 40.0 },
"default_value":120 "speed_print_layer_0": { "value": 22.0 },
}, "speed_roofing": { "value": 25.0 },
"machine_width":{ "speed_support_bottom": { "dvalue": 30.0 },
"default_value":100 "speed_support_infill": { "value": 45.0 },
}, "speed_support_roof": { "value": 30.0 },
"gantry_height":{ "speed_topbottom": { "value": 30.0 },
"value":20 "speed_travel_layer_0": { "value": 60 },
}, "speed_wall_0": { "value": 20.0 },
"machine_name":{ "speed_wall_x": { "value": 25.0 }
"default_value":"WEEFUN TINA2S"
},
"machine_start_gcode":{
"default_value":";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..."
},
"machine_end_gcode":{
"default_value":";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete"
},
"retraction_amount":{
"default_value":3
},
"speed_wall_0":{
"value":20.0
},
"speed_wall_x":{
"value":25.0
},
"speed_topbottom":{
"value":30.0
},
"speed_infill":{
"value":40.0
},
"speed_support_infill":{
"value":45.0
},
"speed_print_layer_0":{
"value":22.0
},
"speed_travel_layer_0":{
"value":60
},
"speed_support_roof":{
"value":30.0
},
"speed_support_bottom":{
"dvalue":30.0
},
"speed_roofing":{
"value":25.0
}
} }
} }

View File

@ -2,12 +2,13 @@
"version": 2, "version": 2,
"name": "Extruder 1", "name": "Extruder 1",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "weedo_base", "machine": "weedo_base",
"position": "0" "position": "0"
}, },
"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 }