diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 6f40abfbee..6cdbc198a5 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -32,13 +32,6 @@ "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", @@ -47,24 +40,6 @@ "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", @@ -76,6 +51,13 @@ "polymax_pla", "polyplus_pla", "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", "structur3d_dap100silicone", "tizyx_abs", "tizyx_flex", @@ -146,8 +128,8 @@ }, "overrides": { "machine_name": {"default_value": "UNI Base Printer"}, - "machine_start_gcode": {"default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG92 E0 ;zero the extruded length\nG1 F5000 ;set speed\nG1 Z15 F5000 ;move to start position Y\nM117 Printing..."}, - "machine_end_gcode": {"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nG91 ;relative positioning\nG1 E-4 F300 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F5000 ;move Z up a bit and retract filament even more\nG28 Z0 ;move bed down\nG28 X0 Y0 ;move X/Y to min endstops so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM107 ;switch off cooling fan"}, + "machine_start_gcode": {"default_value": ";Sliced at: {day} {date} {time}\nG21\nG90\nM82\nM220 S100\nM221 S100\nG28\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\nG1 F600 Z15\nG92 E0\nG1 F300 E10\nM117 Printing...\n;\n"}, + "machine_end_gcode": {"default_value": "G91\nG1 E-1 F600\nG1 Z+1 E-3 X-20 Y-20 F4800\nM104 S0\nM106 S0\nM140 S0\nM220 S100\nM221 S100\nG28\nG90\nM84\n;\n"}, "machine_heated_bed": {"default_value": true}, "material_diameter": {"default_value": 1.75}, "machine_shape": {"default_value": "rectangular"}, diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index 138e2ee183..c2b67039ea 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -11,8 +11,8 @@ }, "overrides": { "machine_name": {"default_value": "uni_mini"}, - "machine_width": {"default_value": 180}, - "machine_depth": {"default_value": 180}, + "machine_width": {"default_value": 160}, + "machine_depth": {"default_value": 160}, "machine_height": {"default_value": 175} } } diff --git a/resources/extruders/uni_extruder_1st.def.json b/resources/extruders/uni_extruder_1st.def.json index 5f6b819599..d11fc9d60d 100644 --- a/resources/extruders/uni_extruder_1st.def.json +++ b/resources/extruders/uni_extruder_1st.def.json @@ -15,11 +15,11 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "T0 ;switch to extruder 1\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}\n;" + "default_value": ";T0 ;switch to extruder 1\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;\n" }, "machine_extruder_end_code": { - "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X5 Y5 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90 ;absolute coordinate\n;" + "default_value": ";G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;\n" } } } diff --git a/resources/extruders/uni_extruder_2nd.def.json b/resources/extruders/uni_extruder_2nd.def.json index 7b92b2f987..2fc2f054ab 100644 --- a/resources/extruders/uni_extruder_2nd.def.json +++ b/resources/extruders/uni_extruder_2nd.def.json @@ -11,15 +11,15 @@ "extruder_nr": { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 17.7 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "T1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}\n;" + "default_value": ";T1 ;switch to extruder 2\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;\n" }, "machine_extruder_end_code": { - "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X5 Y5 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90 ;absolute coordinate\n;" + "default_value": ";G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;\n" } } }