From a6f4ee3b3f5d5885affbae3916f6af889d09bacd Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Sat, 17 Feb 2018 22:20:25 -0500
Subject: [PATCH] clean up gcode sender coordinate output

---
 js/kiri-serial.js   | 37 ++++++++++++++++++++++++++-----------
 web/kiri/index.html |  8 ++++----
 web/kiri/style.css  |  3 +++
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/js/kiri-serial.js b/js/kiri-serial.js
index b525f6d8..8f41a421 100644
--- a/js/kiri-serial.js
+++ b/js/kiri-serial.js
@@ -92,7 +92,10 @@ var gs_kiri_serial = exports;
             rpz = $('srzi'),
             wpx = $('saxi'),
             wpy = $('sayi'),
-            wpz = $('sazi');
+            wpz = $('sazi'),
+            WCO = {x:0, y:0, z:0},
+            WPOS = {x:0, y:0, z:0},
+            MPOS = {x:0, y:0, z:0};
 
         senderDialog = $('sender');
         senderStatus = $('sender-status');
@@ -201,19 +204,25 @@ var gs_kiri_serial = exports;
                     tv = dmt[1].split(",");
                     switch (tt) {
                         case 'MPos':
-                            rpx.value = tv[0];
-                            rpy.value = tv[1];
-                            rpz.value = tv[2];
+                            MPOS.x = parseFloat(tv[0]);
+                            MPOS.y = parseFloat(tv[1]);
+                            MPOS.z = parseFloat(tv[2]);
+                            WPOS.x = MPOS.x - WCO.x;
+                            WPOS.y = MPOS.y - WCO.y;
+                            WPOS.z = MPOS.z - WCO.z;
                             break;
-                        case 'MPos':
-                            wpx.value = tv[0];
-                            wpy.value = tv[1];
-                            wpz.value = tv[2];
+                        case 'WPos':
+                            WPOS.x = parseFloat(tv[0]);
+                            WPOS.y = parseFloat(tv[1]);
+                            WPOS.z = parseFloat(tv[2]);
+                            MPOS.x = WPOS.x + WCO.x;
+                            MPOS.y = WPOS.y + WCO.y;
+                            MPOS.z = WPOS.z + WCO.z;
                             break;
                         case 'WCO':
-                            wpx.value = tv[0];
-                            wpy.value = tv[1];
-                            wpz.value = tv[2];
+                            WCO.x = parseFloat(tv[0]);
+                            WCO.y = parseFloat(tv[1]);
+                            WCO.z = parseFloat(tv[2]);
                             break;
                         case 'FS':
                             break;
@@ -221,6 +230,12 @@ var gs_kiri_serial = exports;
                             break;
                     }
                 }
+                rpx.value = MPOS.x.toFixed(3);
+                rpy.value = MPOS.y.toFixed(3);
+                rpz.value = MPOS.z.toFixed(3);
+                wpx.value = WPOS.x.toFixed(3);
+                wpy.value = WPOS.y.toFixed(3);
+                wpz.value = WPOS.z.toFixed(3);
             } else
             if (dm.charAt(0) === '{') {
                 // tinyg status update
diff --git a/web/kiri/index.html b/web/kiri/index.html
index 54a2fe01..2653139c 100644
--- a/web/kiri/index.html
+++ b/web/kiri/index.html
@@ -103,10 +103,10 @@
                 <tr><th> <button id="sender-goto-zero">goto zero axis</button> </th></tr>
             </table>
         </div><div>
-            <table>
-                <tr><th><label>X</label> <input id="saxi" disabled="true" size="9" /> <input id="srxi" disabled="true" size="9" /></th></tr>
-                <tr><th><label>Y</label> <input id="sayi" disabled="true" size="9" /> <input id="sryi" disabled="true" size="9" /></th></tr>
-                <tr><th><label>Z</label> <input id="sazi" disabled="true" size="9" /> <input id="srzi" disabled="true" size="9" /></th></tr>
+            <table id="sender-coordinates">
+                <tr><th><label>X</label> <input id="saxi" disabled="true" size="8" /> <input id="srxi" disabled="true" size="8" /></th></tr>
+                <tr><th><label>Y</label> <input id="sayi" disabled="true" size="8" /> <input id="sryi" disabled="true" size="8" /></th></tr>
+                <tr><th><label>Z</label> <input id="sazi" disabled="true" size="8" /> <input id="srzi" disabled="true" size="8" /></th></tr>
             </table>
         </div>
         </div>
diff --git a/web/kiri/style.css b/web/kiri/style.css
index be1f1f79..8f9a0c15 100644
--- a/web/kiri/style.css
+++ b/web/kiri/style.css
@@ -293,6 +293,9 @@ input[type=range]::-moz-focus-outer {
 #sender-quick button {
     flex-grow: 1;
 }
+#sender-coordinates input {
+    text-align: right;
+}
 
 /** help dialog */