Merge upstream changes from Marlin 2.1.2.2
This commit is contained in:
@@ -384,7 +384,7 @@
|
||||
</td>
|
||||
<td width="33%">
|
||||
<div class="card ml-1">
|
||||
<div class="card-header py-0 px-1 bg-info text-light card-header-description">GCode Lines</div>
|
||||
<div class="card-header py-0 px-1 bg-info text-light card-header-description">G-Code Lines</div>
|
||||
<div id="div-upload-fproc" class="card-body py-0 px-1 card-header-description text-center">-</div>
|
||||
</div>
|
||||
</td>
|
||||
@@ -466,11 +466,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<div id="checksum-gcommand-div" class="collapse m-0 pr-1 text-right">
|
||||
<span class="field-description mr-1">GCode checksum value:</span>
|
||||
<span class="field-description mr-1">G-Code checksum value:</span>
|
||||
<span class="h5"><span class="badge badge-secondary" id="checksum-gcommand-value" style="width:100px;"> </span></span>
|
||||
</div>
|
||||
<div id="checksum-gcommand-div" class="input-group input-group-sm collapse my-1">
|
||||
<input type="text" class="form-control" aria-describedby="checksum-gcommand-value" placeholder="GCode checksum value" readonly/>
|
||||
<input type="text" class="form-control" aria-describedby="checksum-gcommand-value" placeholder="G-Code checksum value" readonly/>
|
||||
<div class="input-group-append text-center"><span class="input-group-text" id="checksum-gcommand-value" style="width:100px;"></span></div>
|
||||
</div>
|
||||
<label for="btn-gcommand" class="mb-0 field-labels">Console output:</label>
|
||||
|
Reference in New Issue
Block a user