diff options
author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-03 21:16:16 +0300 |
---|---|---|
committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-03 21:16:16 +0300 |
commit | fe5ccd83372d148b1519dd27dbb89ef11dedb1cf (patch) | |
tree | cd6feca1604b7b9d9f33d787b4ca413c3bec61cf | |
parent | 368e3d98cc195ee48b80672fe6074fe7f5d55a40 (diff) | |
parent | 633210b261b5c4377ade94f35e3d226667925cc5 (diff) |
Merge tag '15.01-RC2' into upstream
-rw-r--r-- | Cura/util/sliceEngine.py | 4 | ||||
-rwxr-xr-x | package.sh | 8 | ||||
-rw-r--r-- | resources/machine_profiles/RigidBot.ini | 255 |
3 files changed, 255 insertions, 12 deletions
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py index e19b1a7413..73d0189416 100644 --- a/Cura/util/sliceEngine.py +++ b/Cura/util/sliceEngine.py @@ -265,6 +265,7 @@ class Engine(object): def cleanup(self): self.abortEngine() + self.wait() self._serversocket.close() def abortEngine(self): @@ -273,9 +274,6 @@ class Engine(object): self._process.terminate() except: pass - if self._thread is not None: - self._thread.join() - self._thread = None def wait(self): if self._thread is not None: diff --git a/package.sh b/package.sh index 72557fc6bc..17a06cdb7d 100755 --- a/package.sh +++ b/package.sh @@ -19,7 +19,7 @@ BUILD_TARGET=${1:-none} ##Do we need to create the final archive ARCHIVE_FOR_DISTRIBUTION=1 ##Which version name are we appending to the final archive -export BUILD_NAME=15.01-RC1 +export BUILD_NAME=15.01-RC2 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET} ##Revision @@ -114,8 +114,8 @@ cd "$SCRIPT_DIR" checkTool git "git: http://git-scm.com/" checkTool curl "curl: http://curl.haxx.se/" -checkTool avr-gcc "avr-gcc: http://winavr.sourceforge.net/ " if [ $BUILD_TARGET = "win32" ]; then + checkTool avr-gcc "avr-gcc: http://winavr.sourceforge.net/ " #Check if we have 7zip, needed to extract and packup a bunch of packages for windows. checkTool 7z "7zip: http://www.7-zip.org/" checkTool $MAKE "mingw: http://www.mingw.org/" @@ -158,8 +158,8 @@ $MAKE -j 3 HARDWARE_MOTHERBOARD=7 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VE git checkout Marlin_UM_Original_Plus $MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_UltimakerMarlin_Plus_250000 DEFINES="'VERSION_BASE=\"Ultimaker+:_${BUILD_NAME}\"' 'VERSION_PROFILE=\"250000_single\"' BAUDRATE=250000 TEMP_SENSOR_1=0 EXTRUDERS=1" $MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_UltimakerMarlin_Plus_115200 DEFINES="'VERSION_BASE=\"Ultimaker+:_${BUILD_NAME}\"' 'VERSION_PROFILE=\"115200_single\"' BAUDRATE=115200 TEMP_SENSOR_1=0 EXTRUDERS=1" -$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_UltimakerMarlin_Plus_Dual_250000 DEFINES="'VERSION_BASE=\"Ultimaker+:_${BUILD_NAME}\"' 'VERSION_PROFILE=\"250000_dual\"' BAUDRATE=250000 TEMP_SENSOR_1=-1 EXTRUDERS=2" -$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_UltimakerMarlin_Plus_Dual_115200 DEFINES="'VERSION_BASE=\"Ultimaker+:_${BUILD_NAME}\"' 'VERSION_PROFILE=\"115200_dual\"' BAUDRATE=115200 TEMP_SENSOR_1=-1 EXTRUDERS=2" +$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_UltimakerMarlin_Plus_Dual_250000 DEFINES="'VERSION_BASE=\"Ultimaker+:_${BUILD_NAME}\"' 'VERSION_PROFILE=\"250000_dual\"' BAUDRATE=250000 TEMP_SENSOR_1=20 EXTRUDERS=2" +$MAKE -j 3 HARDWARE_MOTHERBOARD=72 ARDUINO_INSTALL_DIR=${ARDUINO_PATH} ARDUINO_VERSION=${ARDUINO_VERSION} BUILD_DIR=_UltimakerMarlin_Plus_Dual_115200 DEFINES="'VERSION_BASE=\"Ultimaker+:_${BUILD_NAME}\"' 'VERSION_PROFILE=\"115200_dual\"' BAUDRATE=115200 TEMP_SENSOR_1=20 EXTRUDERS=2" cd - gitClone git@github.com:Ultimaker/Ultimaker2Marlin.git _Ultimaker2Marlin diff --git a/resources/machine_profiles/RigidBot.ini b/resources/machine_profiles/RigidBot.ini index c1cf864d96..9be89a821b 100644 --- a/resources/machine_profiles/RigidBot.ini +++ b/resources/machine_profiles/RigidBot.ini @@ -10,9 +10,254 @@ gcode_flavor = RepRap (Marlin/Sprinter) extruder_amount = 1 [profile] -filament_diameter = 1.75 +layer_height = 0.20 +wall_thickness = 0.8 +retraction_enable = True +solid_layer_thickness = 0.6 +fill_density = 15 nozzle_size = 0.4 -layer_height = 0.2 -print_speed = 50 -print_temperature = 240 -travel_speed = 150 +print_speed = 60 +print_temperature = 195 +print_temperature2 = 0 +print_temperature3 = 0 +print_temperature4 = 0 +print_bed_temperature = 60 +support = None +platform_adhesion = None +support_dual_extrusion = Both +wipe_tower = False +wipe_tower_volume = 15 +ooze_shield = False +filament_diameter = 1.75 +filament_diameter2 = 0 +filament_diameter3 = 0 +filament_diameter4 = 0 +filament_flow = 100 +retraction_speed = 50.0 +retraction_amount = 0.8 +retraction_dual_amount = 16.5 +retraction_min_travel = 1.5 +retraction_combing = True +retraction_minimal_extrusion = 0.02 +retraction_hop = 0.075 +bottom_thickness = 0.30 +layer0_width_factor = 100 +object_sink = 0.0 +overlap_dual = 0.15 +travel_speed = 150.0 +bottom_layer_speed = 15 +infill_speed = 0 +inset0_speed = 30 +insetx_speed = 0 +cool_min_layer_time = 5 +fan_enabled = True +skirt_line_count = 3 +skirt_gap = 4.0 +skirt_minimal_length = 200.0 +fan_full_height = 0.5 +fan_speed = 100 +fan_speed_max = 100 +cool_min_feedrate = 10 +cool_head_lift = False +solid_top = True +solid_bottom = True +fill_overlap = 10 +support_type = Lines +support_angle = 60 +support_fill_rate = 15 +support_xy_distance = 0.7 +support_z_distance = 0.15 +spiralize = False +simple_mode = False +brim_line_count = 20 +raft_margin = 5.0 +raft_line_spacing = 3.0 +raft_base_thickness = 0.3 +raft_base_linewidth = 1.0 +raft_interface_thickness = 0.27 +raft_interface_linewidth = 0.4 +raft_airgap = 0.22 +raft_surface_layers = 2 +fix_horrible_union_all_type_a = True +fix_horrible_union_all_type_b = False +fix_horrible_use_open_bits = False +fix_horrible_extensive_stitching = False +plugin_config = +object_center_x = -1 +object_center_y = -1 + +[alterations] +start.gcode = ;Sliced at: {day} {date} {time} + ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} + ;Print time: {print_time} + ;Filament used: {filament_amount}m {filament_weight}g + ;Filament cost: {filament_cost} + ;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line + ;M109 S{print_temperature} ;Uncomment to add your own temperature line + G21 ;metric values + G90 ;absolute positioning + M82 ;set extruder to absolute mode + M107 ;start with the fan off + G28 X0 Y0 ;move X/Y to min endstops + G28 Z0 ;move Z to min endstops + M205 X8 ;X/Y Jerk settings + G1 Z15.0 F{travel_speed} ;move the platform down 15mm + G92 E0 ;zero the extruded length + G1 F200 E7 ;extrude 3mm of feed stock + G92 E0 ;zero the extruded length again + G1 F{travel_speed} + ;Put printing message on LCD screen + M117 Rigibot Printing... +end.gcode = ;End GCode + M104 S0 ;extruder heater off + M140 S0 ;heated bed heater off (if you have it) + G91 ;relative positioning + G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure + G1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more + G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way + G1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward + M84 ;steppers off + G90 ;absolute positioning + ;{profile_string} +start2.gcode = ;Sliced at: {day} {date} {time} + ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} + ;Print time: {print_time} + ;Filament used: {filament_amount}m {filament_weight}g + ;Filament cost: {filament_cost} + ;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line + ;M104 S{print_temperature} ;Uncomment to add your own temperature line + ;M109 T1 S{print_temperature2} ;Uncomment to add your own temperature line + ;M109 T0 S{print_temperature} ;Uncomment to add your own temperature line + G21 ;metric values + G90 ;absolute positioning + M107 ;start with the fan off + G28 X0 Y0 ;move X/Y to min endstops + G28 Z0 ;move Z to min endstops + G1 Z15.0 F{travel_speed} ;move the platform down 15mm + T1 ;Switch to the 2nd extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F200 E-{retraction_dual_amount} + T0 ;Switch to the first extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F{travel_speed} + ;Put printing message on LCD screen + M117 Printing... +end2.gcode = ;End GCode + M104 T0 S0 ;extruder heater off + M104 T1 S0 ;extruder heater off + M140 S0 ;heated bed heater off (if you have it) + G91 ;relative positioning + G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure + G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more + G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way + M84 ;steppers off + G90 ;absolute positioning + ;{profile_string} +start3.gcode = ;Sliced at: {day} {date} {time} + ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} + ;Print time: {print_time} + ;Filament used: {filament_amount}m {filament_weight}g + ;Filament cost: {filament_cost} + ;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line + ;M104 S{print_temperature} ;Uncomment to add your own temperature line + ;M109 T1 S{print_temperature2} ;Uncomment to add your own temperature line + ;M109 T0 S{print_temperature} ;Uncomment to add your own temperature line + G21 ;metric values + G90 ;absolute positioning + M107 ;start with the fan off + G28 X0 Y0 ;move X/Y to min endstops + G28 Z0 ;move Z to min endstops + G1 Z15.0 F{travel_speed} ;move the platform down 15mm + T2 ;Switch to the 2nd extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F200 E-{retraction_dual_amount} + T1 ;Switch to the 2nd extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F200 E-{retraction_dual_amount} + T0 ;Switch to the first extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F{travel_speed} + ;Put printing message on LCD screen + M117 Printing... +end3.gcode = ;End GCode + M104 T0 S0 ;extruder heater off + M104 T1 S0 ;extruder heater off + M104 T2 S0 ;extruder heater off + M140 S0 ;heated bed heater off (if you have it) + G91 ;relative positioning + G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure + G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more + G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way + M84 ;steppers off + G90 ;absolute positioning + ;{profile_string} +start4.gcode = ;Sliced at: {day} {date} {time} + ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} + ;Print time: {print_time} + ;Filament used: {filament_amount}m {filament_weight}g + ;Filament cost: {filament_cost} + ;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line + ;M104 S{print_temperature} ;Uncomment to add your own temperature line + ;M109 T2 S{print_temperature2} ;Uncomment to add your own temperature line + ;M109 T1 S{print_temperature2} ;Uncomment to add your own temperature line + ;M109 T0 S{print_temperature} ;Uncomment to add your own temperature line + G21 ;metric values + G90 ;absolute positioning + M107 ;start with the fan off + G28 X0 Y0 ;move X/Y to min endstops + G28 Z0 ;move Z to min endstops + G1 Z15.0 F{travel_speed} ;move the platform down 15mm + T3 ;Switch to the 4th extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F200 E-{retraction_dual_amount} + T2 ;Switch to the 3th extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F200 E-{retraction_dual_amount} + T1 ;Switch to the 2nd extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F200 E-{retraction_dual_amount} + T0 ;Switch to the first extruder + G92 E0 ;zero the extruded length + G1 F200 E10 ;extrude 10mm of feed stock + G92 E0 ;zero the extruded length again + G1 F{travel_speed} + ;Put printing message on LCD screen + M117 Printing... +end4.gcode = ;End GCode + M104 T0 S0 ;extruder heater off + M104 T1 S0 ;extruder heater off + M104 T2 S0 ;extruder heater off + M104 T3 S0 ;extruder heater off + M140 S0 ;heated bed heater off (if you have it) + G91 ;relative positioning + G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure + G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more + G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way + M84 ;steppers off + G90 ;absolute positioning + ;{profile_string} +support_start.gcode = +support_end.gcode = +cool_start.gcode = +cool_end.gcode = +replace.csv = +preswitchextruder.gcode = ;Switch between the current extruder and the next extruder, when printing with multiple extruders. + ;This code is added before the T(n) +postswitchextruder.gcode = ;Switch between the current extruder and the next extruder, when printing with multiple extruders. + ;This code is added after the T(n) |