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

remove serial sender. blur input on slice selection

Browse source
This commit is contained in:
Stewart Allen 2019-03-30 13:45:57 -04:00
commit 4b45a31a84
9 changed files with 17 additions and 890 deletions
Download patch file Download diff file Expand all files Collapse all files

97
web/kiri/index.html
View file

@ -33,103 +33,6 @@
<div id="control-left" class="control"><div id="assets"></div></div>
<!-- right control menu -->
<div id="control-right" class="control"><div id="control"></div></div>
<!-- SPJS gcode sender -->
<div id="sender">
<div id="sender-bar">
<button id="sender-spjs">?</button>
<button id="sender-close">X</button>
</div>
<span>direct device control</span>
<div class="sender-sel">
<table>
<tr>
<th colspan="2" class="flow-row">
<input class="flow-grow" id="sender-host" size="30" spellcheck="false" placeholder="host:port of SPJS server" />
</th>
<td> <button id="sender-connect">connect</button> </td>
</tr>
<tr>
<th class="flow-row">
<select class="flow-grow" id="sender-port" disabled="true"><option>select port</option></select> &nbsp;
<select id="sender-mode" disabled="true">
<option id="mode-option">set mode</option>
<option value="grbl">grbl</option>
<option value="tinyg">tinyg</option>
</select>
</th>
<td> <button id="sender-port-close">close</button> </td>
</tr>
</table>
</div>
<div class="sender-sel"> <div id="sender-log"></div> </div>
<div class="sender-sel" id="sender-cc">
<table>
<tr>
<th>
<label>status</label>
<input id="sender-status" size="5" disabled="true" />
<label>send</label>
<input id="sender-command" size="30" />
</th>
</tr>
<tr>
<th class="flow-row" id="sender-quick">
<button id="sender-ctrlx">soft reset</button> &nbsp;
<button id="sender-hold">feed hold</button> &nbsp;
<button id="sender-resume">feed resume</button>
</td>
</tr>
</table>
</div>
<div class="sender-sel flow-row flow-space-between" id="sender-pad">
<div>
<table>
<tr><th>
<button id="sjx-">X-</button>
<button id="sjx+">X+</button>
</th></tr>
<tr><th>
<button id="sjy-">Y-</button>
<button id="sjy+">Y+</button>
</th></tr>
<tr><th>
<button id="sjz-">Z-</button>
<button id="sjz+">Z+</button>
</th></tr>
</table>
</div><div>
<table>
<tr><th> <label>jog</label><input id="sender-jog" size="4" value="1" title="jog distance in mm" /><label>mm</label> </th></tr>
<tr><th> <button id="sender-set-zero">zero out axes</button> </th></tr>
<tr><th> <button id="sender-goto-zero">goto zero axis</button> </th></tr>
</table>
</div><div>
<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>
<div class="sender-sel" id="sender-control">
<table>
<tr><td>
<label>gcode control</label>
<div id="sender-control-buttons">
<button id="sender-gc-send">send</button>
<button id="sender-gc-pause">pause</button>
<button id="sender-gc-abort">abort</button>
: <button id="sender-gc-runbox">runbox</button>
</div>
</td></tr>
<tr><td class="flow-row flow-space-between">
<div><label>queue</label><input id="sender-gc-queue" disabled="true" size="9" /> </div>
<div><label>sent</label><input id="sender-gc-sent" disabled="true" size="9" /> </div>
<div><label>total</label><input id="sender-gc-lines" disabled="true" size="9" /> </div>
</td></tr>
</table>
</div>
</div>
<!-- all modal dialogs -->
<div id="modal">
<div id="help"></div>

1
web/kiri/output-gcode.html
View file

@ -22,7 +22,6 @@
<div class="print-sel print-gcode flex frow">
<span><label>gcode</label></span>
<button id="print-download" class="fgro">download</button>
<button id="print-serial" class="fgro">use gcode sender</button>
</div>
<div class="print-sel flex frow" id="send-to-octoprint">

103
web/kiri/style.css
View file

@ -235,112 +235,9 @@ select {
background-color: rgba(255,255,255,0.5);
}
/** sender dialog */
#sender {
position: absolute;
text-align: center;
top: 5px;
right: 0px;
color: b;acl;
border: 3px solid #ddd;
border-radius: 3px;
background-color: rgba(255,255,255,0.75);
padding: 10px;
display: none;
}
#sender-bar {
border: 0 !important;
margin: 2px 2px 0 0 !important;
padding: 0 !important;
position: absolute;
z-index: 200;
right: 3px;
top: 3px;
}
#sender-bar button {
margin: 0;
}
#sender > div {
border: 1px solid #888;
border-radius: 5px;
padding: 2px;
margin: 6px 0 6px 0;
}
#sender .sender-sel:hover {
border: 1px solid yellow;
border-radius: 5px;
}
#sender table {
width: 100%;
}
#sender th {
text-align: left;
}
#sender td {
text-align: right;
}
#sender input[disabled] {
background-color: #bbb;
border-color: #ccc;
color: black;
}
#v a {
color: #8ae;
}
#sender a:hover {
color: #fff;
background-color: #888;
}
#sender-log {
width: 100%;
height: 100px;
padding: 5px;
overflow: auto;
text-align: left;
font-size: 11px;
max-width: 100em;
}
#sender-set-zero, #sender-goto-zero, #sender-connect, #sender-port-close {
width: 100%;
}
#sender-jog {
flex-grow: 1;
}
#sender label {
color: #ddd;
background-color: #555;
border: 1px solid #aaa;
padding-top: 1px;
padding-left: 3px;
padding-right: 3px;
padding-bottom: 1px;
}
#sender span {
font-weight: normal;
}
#sender-control td {
text-align: justify;
}
#sender-control input {
margin-left: 2px;
}
#sender-control-buttons {
float:right;
}
#sender-status {
text-align: center;
xbackground-color: #555 !important;
xborder: 1px solid black !important;
xmargin: 2px 2px 2px 0;
xpadding: 2px 2px 2px 0;
}
#sender-quick button {
flex-grow: 1;
}
#sender-coordinates input {
text-align: right;
}
/** help dialog */