AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up gcode sender coordinate output

Browse source
This commit is contained in:
Stewart Allen 2018-02-17 22:20:25 -05:00
commit a6f4ee3b3f
3 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
js/kiri-serial.js
View file

@ -92,7 +92,10 @@ var gs_kiri_serial = exports;
rpz = $('srzi'), rpz = $('srzi'),
wpx = $('saxi'), wpx = $('saxi'),
wpy = $('sayi'), 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'); senderDialog = $('sender');
senderStatus = $('sender-status'); senderStatus = $('sender-status');
@ -201,19 +204,25 @@ var gs_kiri_serial = exports;
tv = dmt[1].split(","); tv = dmt[1].split(",");
switch (tt) { switch (tt) {
case 'MPos': case 'MPos':
rpx.value = tv[0]; MPOS.x = parseFloat(tv[0]);
rpy.value = tv[1]; MPOS.y = parseFloat(tv[1]);
rpz.value = tv[2]; MPOS.z = parseFloat(tv[2]);
WPOS.x = MPOS.x - WCO.x;
WPOS.y = MPOS.y - WCO.y;
WPOS.z = MPOS.z - WCO.z;
break; break;
case 'MPos': case 'WPos':
wpx.value = tv[0]; WPOS.x = parseFloat(tv[0]);
wpy.value = tv[1]; WPOS.y = parseFloat(tv[1]);
wpz.value = tv[2]; WPOS.z = parseFloat(tv[2]);
MPOS.x = WPOS.x + WCO.x;
MPOS.y = WPOS.y + WCO.y;
MPOS.z = WPOS.z + WCO.z;
break; break;
case 'WCO': case 'WCO':
wpx.value = tv[0]; WCO.x = parseFloat(tv[0]);
wpy.value = tv[1]; WCO.y = parseFloat(tv[1]);
wpz.value = tv[2]; WCO.z = parseFloat(tv[2]);
break; break;
case 'FS': case 'FS':
break; break;
@ -221,6 +230,12 @@ var gs_kiri_serial = exports;
break; 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 } else
if (dm.charAt(0) === '{') { if (dm.charAt(0) === '{') {
// tinyg status update // tinyg status update

8
web/kiri/index.html
View file

@ -103,10 +103,10 @@
<tr><th> <button id="sender-goto-zero">goto zero axis</button> </th></tr> <tr><th> <button id="sender-goto-zero">goto zero axis</button> </th></tr>
</table> </table>
</div><div> </div><div>
<table> <table id="sender-coordinates">
<tr><th><label>X</label> <input id="saxi" disabled="true" size="9" /> <input id="srxi" disabled="true" size="9" /></th></tr> <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="9" /> <input id="sryi" disabled="true" size="9" /></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="9" /> <input id="srzi" disabled="true" size="9" /></th></tr> <tr><th><label>Z</label> <input id="sazi" disabled="true" size="8" /> <input id="srzi" disabled="true" size="8" /></th></tr>
</table> </table>
</div> </div>
</div> </div>

3
web/kiri/style.css
View file

@ -293,6 +293,9 @@ input[type=range]::-moz-focus-outer {
#sender-quick button { #sender-quick button {
flex-grow: 1; flex-grow: 1;
} }
#sender-coordinates input {
text-align: right;
}
/** help dialog */ /** help dialog */