Updated start/end code with correct style comments (not evil comments)

diff --git a/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode b/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
index 64fe937ca3d7d57fe161e234e7ecfb1c32194f88..912ed447a94fb055879e6e391ed3ba418cb72194 100644 (file)
--- a/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
+++ b/SkeinPyPy_NewUI/skeinforge_application/alterations/end.gcode
@@ -1,9 +1,8 @@
-(start of end.gcode)
-M104 S0                (extruder heat off)
-M106                   (fan on)
-G91                    (relative positioning)
-G1 Z+10 E-5 F400       (move Z up a bit and retract filament by 5mm)
-G28 X0 Y0              (move X/Y to min endstops, so the head is out of the way)
-M84                    (steppers off)
-G90                    (absolute positioning)
-(end of end.gcode)
+M104 S0                ;extruder heat off
+M106                   ;fan on
+G91                    ;relative positioning
+G1 Z+10 E-5 F400       ;move Z up a bit and retract filament by 5mm
+G28 X0 Y0              ;move X/Y to min endstops, so the head is out of the way
+M84                    ;steppers off
+G90                    ;absolute positioning
+

diff --git a/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode b/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
index 4c30955001ed5b519e541e80e62433b6f4a28868..1ccaadc29694c286125f2fc9e7d68542c89f5452 100644 (file)
--- a/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
+++ b/SkeinPyPy_NewUI/skeinforge_application/alterations/start.gcode
@@ -1,29 +1,24 @@
-(start of start.txt)
-G21        (metric values)
-G21
-G21        (all the extra G21 commands are comments - skeinforge eats lines without a gcode)
-G21
-G90        (absolute positioning)
-G21
-G28 X0 Y0  (move X/Y to min endstops)
-G28 Z0     (move Z to min endstops)
-G21
-G21        ( if your prints start too high, try changing the Z0.0 below )
-G21        ( to Z1.0 - the number after the Z is the actual, physical )
-G21        ( height of the nozzle in mm. This can take some messing around )
-G21        ( with to get just right... )
-G21
-G92 X0 Y0 Z0 E0 (reset software position to front/left/z=0.0)
-G21
-G1 Z15.0 F400  (move the platform down 15mm)
-G92 E0         (zero the extruded length)
-G21
-G1 F75 E5     (extrude 5mm of feed stock)
-G1 F75 E3.5   (reverse feed stock by 1.5mm)
-G92 E0         (zero the extruded length again)
-G21
-M1             (Clean the nozzle then press YES to continue...)
-G21
-G1 X100 Y100 F3500 (go to the middle of the platform)
-G1 Z0.0 F400   (back to Z=0 and start the print!)
-(end of start.txt)
+G21        ;metric values
+G90        ;absolute positioning
+G21
+G28 X0 Y0  ;move X/Y to min endstops
+G28 Z0     ;move Z to min endstops
+
+; if your prints start too high, try changing the Z0.0 below
+; to Z1.0 - the number after the Z is the actual, physical
+; height of the nozzle in mm. This can take some messing around
+; with to get just right... 
+G92 X0 Y0 Z0 E0 ;reset software position to front/left/z=0.0
+G21
+G1 Z15.0 F400  ;move the platform down 15mm
+G92 E0         ;zero the extruded length
+G21
+G1 F75 E5     ;extrude 5mm of feed stock
+G1 F75 E3.5   ;reverse feed stock by 1.5mm
+G92 E0         ;zero the extruded length again
+G21
+M1             ;Clean the nozzle then press YES to continue...
+G21
+G1 X100 Y100 F3500 ;go to the middle of the platform
+G1 Z0.0 F400   ;back to Z=0 and start the print!
+

diff --git a/build.sh b/build.sh
index 55086cb510e7f506318fd887cceab3b692576540..8ff80b14f026e751f3af94a2029bad192c0771bb 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ BUILD_TARGET=win32
 ##Do we need to create the final archive
 ARCHIVE_FOR_DISTRIBUTION=1
 ##Which version name are we appending to the final archive
-BUILD_NAME=NewUI-Beta1
+BUILD_NAME=NewUI-Beta2
 TARGET_DIR=${BUILD_TARGET}-SkeinPyPy-${BUILD_NAME}
 
 ##Which versions of external programs to use