Fixes for M3/M5 in laser mode (2.05RC2)

Author: dc42

src/GCodes/GCodeQueue.cpp

@@ -41,16 +41,19 @@ GCodeQueue::GCodeQueue() : freeItems(nullptr), queuedItems(nullptr)
 		case 'G':
 			{
 				const int code = gb.GetCommandNumber();
-				return code == 10 && gb.Seen('P');			// Set active/standby temperatures
+				return code == 10 && gb.Seen('P') && !gb.Seen('L') && (gb.Seen('R') || gb.Seen('S'));			// set active/standby temperatures
 			}
 
 		case 'M':
 			{
 				switch (gb.GetCommandNumber())
 				{
-				case 3:		// spindle control
+				case 3:		// spindle or laser control
+				case 5:		// spindle or laser control
+					// On laser devices we use these codes to set the default laser power for the next G1 command
+					return reprap.GetGCodes().GetMachineType() != MachineType::laser;
+
 				case 4:		// spindle control
-				case 5:		// spindle control
 				case 42:	// set IO pin
 				case 106:	// fan control
 				case 107:	// fan off

src/GCodes/GCodes2.cpp

@@ -430,15 +430,11 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply)
 				}
 				break;
 
-			case MachineType::laser:
-				{
-					const Pwm_t laserPwm = ConvertLaserPwm(gb.GetFValue());
-					platform.SetLaserPwm(laserPwm);
 #if SUPPORT_LASER
-					moveBuffer.laserPwmOrIoBits.laserPwm = laserPwm;
-#endif
-				}
+			case MachineType::laser:
+				moveBuffer.laserPwmOrIoBits.laserPwm = ConvertLaserPwm(gb.GetFValue());
 				break;
+#endif
 
 			default:
 #if SUPPORT_ROLAND
@@ -508,12 +504,11 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply)
 			}
 			break;
 
-		case MachineType::laser:
-			platform.SetLaserPwm(0);
 #if SUPPORT_LASER
+		case MachineType::laser:
 			moveBuffer.laserPwmOrIoBits.Clear();
-#endif
 			break;
+#endif
 
 		default:
 #if SUPPORT_ROLAND

src/Version.h

@@ -20,7 +20,7 @@
 #endif
 
 #ifndef DATE
-# define DATE "2019-12-05b1"
+# define DATE "2019-12-08b1"
 #endif
 
 #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d"