From c359f01fb3ceb7a07124a7f7c0327c91bd5439fe Mon Sep 17 00:00:00 2001
From: Fabrice Salvaire <fabrice.salvaire@orange.fr>
Date: Mon, 24 Dec 2018 03:45:00 +0100
Subject: [PATCH] fixed rs274-word-starting-letter.yaml

---
 .../Gcode/Rs274/data/make-yaml.py             | 19 ++++---------
 .../data/rs274-word-starting-letter.yaml      | 28 +++++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/PythonicGcodeMachine/Gcode/Rs274/data/make-yaml.py b/PythonicGcodeMachine/Gcode/Rs274/data/make-yaml.py
index 57d34c8..3c6659d 100755
--- a/PythonicGcodeMachine/Gcode/Rs274/data/make-yaml.py
+++ b/PythonicGcodeMachine/Gcode/Rs274/data/make-yaml.py
@@ -297,23 +297,16 @@ tool radius compensation number
 feedrate
 general function (see Table 5)
 tool length offset index
-X-axis offset for arcs
-X offset in G87 canned cycle
-Y-axis offset for arcs
-Y offset in G87 canned cycle
-Z-axis offset for arcs
-Z offset in G87 canned cycle
-number of repetitions in canned cycles
-key used with G10
+X-axis offset for arcs / X offset in G87 canned cycle
+Y-axis offset for arcs / Y offset in G87 canned cycle
+Z-axis offset for arcs / Z offset in G87 canned cycle
+number of repetitions in canned cycles / key used with G10
 miscellaneous function (see Table 7)
 line number
-dwell time in canned cycles
-dwell time with G4
-key used with G10
+dwell time in canned cycles / dwell time with G4 / key used with G10
 feed increment in G83 canned cycle
 arc radius
-canned cycle plane
-spindle speed
+canned cycle plane / spindle speed
 tool selection
 X-axis of machine
 Y-axis of machine
diff --git a/PythonicGcodeMachine/Gcode/Rs274/data/rs274-word-starting-letter.yaml b/PythonicGcodeMachine/Gcode/Rs274/data/rs274-word-starting-letter.yaml
index 9a0f94a..7fa19df 100644
--- a/PythonicGcodeMachine/Gcode/Rs274/data/rs274-word-starting-letter.yaml
+++ b/PythonicGcodeMachine/Gcode/Rs274/data/rs274-word-starting-letter.yaml
@@ -13,30 +13,30 @@ G:
 H:
   meaning: tool length offset index
 I:
-  meaning: X-axis offset for arcs
+  meaning: X-axis offset for arcs / X offset in G87 canned cycle
 J:
-  meaning: X offset in G87 canned cycle
+  meaning: Y-axis offset for arcs / Y offset in G87 canned cycle
 K:
-  meaning: Y-axis offset for arcs
+  meaning: Z-axis offset for arcs / Z offset in G87 canned cycle
 L:
-  meaning: Y offset in G87 canned cycle
+  meaning: number of repetitions in canned cycles / key used with G10
 M:
-  meaning: Z-axis offset for arcs
+  meaning: miscellaneous function (see Table 7)
 N:
-  meaning: Z offset in G87 canned cycle
+  meaning: line number
 P:
-  meaning: number of repetitions in canned cycles
+  meaning: dwell time in canned cycles / dwell time with G4 / key used with G10
 Q:
-  meaning: key used with G10
+  meaning: feed increment in G83 canned cycle
 R:
-  meaning: miscellaneous function (see Table 7)
+  meaning: arc radius
 S:
-  meaning: line number
+  meaning: canned cycle plane / spindle speed
 T:
-  meaning: dwell time in canned cycles
+  meaning: tool selection
 X:
-  meaning: dwell time with G4
+  meaning: X-axis of machine
 Y:
-  meaning: key used with G10
+  meaning: Y-axis of machine
 Z:
-  meaning: feed increment in G83 canned cycle
+  meaning: Z-axis of machine
-- 
GitLab