Skip to content

Commit

Permalink
Merge commit '7216e9ef71ef724659f6e3b97652bf5941f60bc0' into V1.beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
flyfisher604 committed Feb 11, 2021
2 parents 83bd1cb + 7216e9e commit a12e397
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion MPCNC.cps
Original file line number Diff line number Diff line change
Expand Up @@ -1493,15 +1493,18 @@ function spindleOff() {
}

function laserOn(power) {
var laser_pwm = power / 100 * 255;
// Firmware is Grbl
if (fw == eFirmware.GRBL) {
var laser_pwm = power * 10;
writeBlock(mFormat.format(properties.cutterGrblMode), sFormat.format(laser_pwm));
}

// Default firmware
else {
var laser_pwm = power / 100 * 255;
switch (properties.cutterMarlinMode) {
case 106:
writeBlock(mFormat.format(106), sFormat.format(laser_pwm));
Expand Down

0 comments on commit a12e397

Please sign in to comment.