From 8e87ab0939eb2ac12b5d41e590da1494596577e3 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Sun, 24 Nov 2019 21:16:53 -0500
Subject: [PATCH] gcode: Remove support for "G4 S1" style commands
The S parameter is not a standard and was not commonly used. The P
parameter (delay specified in milliseconds) is the commonly accepted
g-code mechanism for dwelling.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
docs/Config_Changes.md | 4 ++++
klippy/gcode.py | 5 +----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md
index a3e7208b6..a6f5661fd 100644
--- a/docs/Config_Changes.md
+++ b/docs/Config_Changes.md
@@ -6,6 +6,10 @@ All dates in this document are approximate.
# Changes
+20191202: Support for the undocumented "S" parameter of the "G4"
+command has been removed. Replace any occurrences of S with the
+standard "P" parameter (the delay specified in milliseconds).
+
20191126: The USB names have changed on micro-controllers with native
USB support. They now use a unique chip id by default (where
available). If an "mcu" config section uses a "serial" setting that
diff --git a/klippy/gcode.py b/klippy/gcode.py
index 323d5527f..cd2fcd9e4 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -515,10 +515,7 @@ class GCodeParser:
self.move_with_transform(self.last_position, self.speed)
def cmd_G4(self, params):
# Dwell
- if 'S' in params:
- delay = self.get_float('S', params, minval=0.)
- else:
- delay = self.get_float('P', params, 0., minval=0.) / 1000.
+ delay = self.get_float('P', params, 0., minval=0.) / 1000.
self.toolhead.dwell(delay)
def cmd_G28(self, params):
# Move to origin