@@ -566,6 +566,7 @@ function onOpen() {
566
566
zOutput.format(1 );
567
567
else
568
568
zOutput.format(0 );
569
+ // writeComment("onOpen end");
569
570
}
570
571
571
572
function onComment (message) {
@@ -613,7 +614,9 @@ function onSection() {
613
614
var sectionId = getCurrentSectionId(); // what is the number of this operation (starts from 0)
614
615
var section = getSection(sectionId); // what is the section-object for this operation
615
616
var tool = section.getTool();
617
+ writeln("");
616
618
//writeComment("Section : " + (sectionId + 1));
619
+ var maxfeedrate = section.getMaximumFeedrate();
617
620
618
621
if (!isFirstSection() && properties.generateMultiple && (tool.number != getPreviousSection().getTool().number)) {
619
622
sequenceNumber ++;
@@ -755,10 +758,15 @@ function onSection() {
755
758
756
759
// Rapid move to initial position, first XY, then Z
757
760
var initialPosition = getFramePosition(currentSection.getInitialPosition());
758
- writeBlock(gAbsIncModal.format(90 ), gMotionModal.format(0 ), xOutput.format(initialPosition.x), yOutput.format(initialPosition.y));
761
+ if (isLaser)
762
+ f = feedOutput.format(maxfeedrate);
763
+ else
764
+ f = " " ;
765
+ writeBlock(gAbsIncModal.format(90 ), gMotionModal.format(0 ), xOutput.format(initialPosition.x), yOutput.format(initialPosition.y), f);
759
766
if (isLaser && properties.UseZ)
760
767
writeBlock(gMotionModal.format(0 ), zOutput.format(0 ));
761
768
isNewfile = false;
769
+ // writeComment("onSection end");
762
770
}
763
771
764
772
function onDwell (seconds) {
@@ -840,7 +848,7 @@ function onLinear(_x, _y, _z, feed) {
840
848
var s = sOutput.format(power);
841
849
writeBlock(gMotionModal.format(1), x, y, z, f, s);
842
850
} else {
843
- // this is the new process when do dont have onRapid but GRBL requires G0 moves for noncutting laser moves
851
+ // this is the new process when we dont have onRapid but GRBL requires G0 moves for noncutting laser moves
844
852
var z = properties.UseZ ? zOutput.format(0) : "";
845
853
var s = sOutput.format(power);
846
854
if (powerOn)
0 commit comments