AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change G4 to use seconds S instead of millis P to be compatible with GRBL and LinuxCNC

Browse source
This commit is contained in:
Stewart Allen 2020-02-05 17:41:29 -05:00
commit 821bca22e3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/kiri-driver-cam.js
View file

@ -1388,7 +1388,7 @@ var gs_kiri_cam = exports;
stripComments = gcodes.gcodeStrip || false, stripComments = gcodes.gcodeStrip || false,
cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ], cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ],
cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ], cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ],
cmdDwell = gcodes.gcodeDwell || [ "G4 P{time}" ], cmdDwell = gcodes.gcodeDwell || [ "G4 S{time}" ],
bounds = widget.getCamBounds(settings), bounds = widget.getCamBounds(settings),
bed = settings.device, bed = settings.device,
spro = settings.process, spro = settings.process,
@ -1478,7 +1478,7 @@ var gs_kiri_cam = exports;
// out.speed = time to dwell in ms // out.speed = time to dwell in ms
if (!newpos) { if (!newpos) {
time += out.speed; time += out.speed;
consts.time = out.speed; consts.time = out.speed / 1000;
filterEmit(cmdDwell, consts); filterEmit(cmdDwell, consts);
return; return;
} }

2
js/kiri.js
View file

@ -262,7 +262,7 @@ self.kiri.license = exports.LICENSE;
gcodeFan: "", // FDM fan command gcodeFan: "", // FDM fan command
gcodeTrack: "", // FDM progress command gcodeTrack: "", // FDM progress command
gcodeLayer: "", // FDM layer output gcodeLayer: "", // FDM layer output
gcodeDwell: ["G4 P{time}"], // CAM dwell script gcodeDwell: ["G4 S{time}"], // CAM dwell script
gcodeChange: ["M6 T{tool}"], // CAM tool change script gcodeChange: ["M6 T{tool}"], // CAM tool change script
gcodeSpindle: ["M3 S{speed}"], // CAM spindle speed gcodeSpindle: ["M3 S{speed}"], // CAM spindle speed
gcodeFExt: "", // CAM file extension gcodeFExt: "", // CAM file extension