diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json index 5b76404a6d..45072df1b1 100644 --- a/resources/definitions/trimaker_cosmosII.def.json +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -17,19 +17,19 @@ "has_materials": true, "machine_extruder_trains": {"0": "trimaker_cosmosII_extruder"}, "exclude_materials": [ - "chromatik_pla", + "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_absx", "emotiontech_asax", "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", "emotiontech_tpu98a", "eSUN_PETG_Black", "eSUN_PETG_Grey", @@ -46,37 +46,37 @@ "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs_175", + "generic_abs_175", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", - "generic_cpe_175", + "generic_cpe_175", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", - "generic_hips_175", + "generic_hips_175", "generic_nylon", - "generic_nylon_175", + "generic_nylon_175", "generic_pc", - "generic_pc_175", + "generic_pc_175", "generic_petg", - "generic_petg_175", + "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", - "generic_pva_175", + "generic_pva_175", "generic_tough_pla", "generic_tpu", - "generic_tpu_175", + "generic_tpu_175", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", @@ -185,14 +185,14 @@ "support_pattern": {"default_value": "zigzag"}, "support_z_distance": {"default_value": 0.17}, "support_xy_distance": {"default_value": 0.7}, - "adhesion_type": {"default_value": "skirt"}, + "adhesion_type": {"default_value": "skirt"}, "gantry_height": {"value": 2}, "machine_start_gcode": {"default_value": ";Start GCode - Cosmos II - 3.x.x_SEGcTK_1.1\n M104 S120; Comienzo a calentar extrusor\n G21; Unidades en mm\n G90; absolute positioning\n M82; set extruder to absolute mode\n M107; Apagar FAN\n G28; Home\n M190 S{material_bed_temperature_layer_0}\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n M109 S{material_print_temperature}\n M900 K0.04\n G1 F200 Z10\n G92 E0; Defino cero en la posición del actual del extrusor\n G1 F200 X0.5 Y0.5 Z0.300; Posiciono antes de hacer una línea\n G1 F900 X0.5 Y51.5 E2.56436; Hago una línea\n "}, "machine_end_gcode": {"default_value": ";CODIGO FINAL\n M107; Fan off\n G90; Set to absolute positioning\n G1 X0 Y0 Z201; Get extruder out of way\n G92 E0; Reset extruder position\n G1 E-1; Reduce filament pressure\n G92 E0; Reset extruder position again\n M140 S0; Disable heated bed\n M104 S0; Disable extruder\n M84; Turn steppers off"}, "machine_heated_bed": {"default_value": true}, "material_diameter": {"default_value": 1.75}, - "machine_center_is_zero": {"default_value": false} + "machine_center_is_zero": {"default_value": false} } } diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index 3149e35dd1..46e57f96e5 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -17,19 +17,19 @@ "has_materials": true, "machine_extruder_trains": {"0": "trimaker_nebula_extruder"}, "exclude_materials": [ - "chromatik_pla", + "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_absx", "emotiontech_asax", "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", "emotiontech_tpu98a", "eSUN_PETG_Black", "eSUN_PETG_Grey", @@ -46,37 +46,37 @@ "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs_175", + "generic_abs_175", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", - "generic_cpe_175", + "generic_cpe_175", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", - "generic_hips_175", + "generic_hips_175", "generic_nylon", - "generic_nylon_175", + "generic_nylon_175", "generic_pc", - "generic_pc_175", + "generic_pc_175", "generic_petg", - "generic_petg_175", + "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", - "generic_pva_175", + "generic_pva_175", "generic_tough_pla", "generic_tpu", - "generic_tpu_175", + "generic_tpu_175", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", @@ -167,7 +167,7 @@ "top_bottom_thickness": {"value": "layer_height * 6"}, "infill_sparse_density": {"default_value": 25}, "infill_pattern": {"value": "'grid'"}, - "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, + "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, "default_material_bed_temperature": {"default_value": 60}, "default_material_print_temperature": {"default_value": 200}, "speed_print": {"default_value": 45}, @@ -185,14 +185,14 @@ "support_pattern": {"default_value": "zigzag"}, "support_z_distance": {"default_value": 0.17}, "support_xy_distance": {"default_value": 0.7}, - "adhesion_type": {"default_value": "skirt"}, + "adhesion_type": {"default_value": "skirt"}, "gantry_height": {"value": 2}, "machine_start_gcode": {"default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0}; Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n"}, "machine_end_gcode": {"default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n"}, "machine_heated_bed": {"default_value": true}, "material_diameter": {"default_value": 1.75}, - "machine_center_is_zero": {"default_value": false} + "machine_center_is_zero": {"default_value": false} } }