Do not display -1mm when printing from sd
parent
4509eab816
commit
9963c523c0
|
@ -201,7 +201,7 @@ class Printer():
|
||||||
if self._comm.isPrinting():
|
if self._comm.isPrinting():
|
||||||
return
|
return
|
||||||
|
|
||||||
self._setCurrentZ(-1)
|
self._setCurrentZ(None)
|
||||||
if self._sdFile is not None:
|
if self._sdFile is not None:
|
||||||
# we are working in sd mode
|
# we are working in sd mode
|
||||||
self._sdPrinting = True
|
self._sdPrinting = True
|
||||||
|
|
|
@ -231,6 +231,11 @@ function PrinterStateViewModel(loginStateViewModel) {
|
||||||
var currentLine = self.currentLine() ? self.currentLine() : "-";
|
var currentLine = self.currentLine() ? self.currentLine() : "-";
|
||||||
return currentLine + " / " + self.totalLines();
|
return currentLine + " / " + self.totalLines();
|
||||||
});
|
});
|
||||||
|
self.heightString = ko.computed(function() {
|
||||||
|
if (!self.currentHeight())
|
||||||
|
return "-";
|
||||||
|
return self.currentHeight();
|
||||||
|
})
|
||||||
self.progressString = ko.computed(function() {
|
self.progressString = ko.computed(function() {
|
||||||
if (!self.progress())
|
if (!self.progress())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
Filament: <strong data-bind="text: filament"></strong><br>
|
Filament: <strong data-bind="text: filament"></strong><br>
|
||||||
Estimated Print Time: <strong data-bind="text: estimatedPrintTime"></strong><br>
|
Estimated Print Time: <strong data-bind="text: estimatedPrintTime"></strong><br>
|
||||||
Line: <strong data-bind="text: lineString"></strong><br>
|
Line: <strong data-bind="text: lineString"></strong><br>
|
||||||
Height: <strong data-bind="text: currentHeight"></strong><br>
|
Height: <strong data-bind="text: heightString"></strong><br>
|
||||||
Print Time: <strong data-bind="text: printTime"></strong><br>
|
Print Time: <strong data-bind="text: printTime"></strong><br>
|
||||||
Print Time Left: <strong data-bind="text: printTimeLeft"></strong><br>
|
Print Time Left: <strong data-bind="text: printTimeLeft"></strong><br>
|
||||||
|
|
||||||
|
|
|
@ -358,7 +358,7 @@ class MachineCom(object):
|
||||||
self._commandQueue = queue.Queue()
|
self._commandQueue = queue.Queue()
|
||||||
self._logQueue = queue.Queue(256)
|
self._logQueue = queue.Queue(256)
|
||||||
self._feedRateModifier = {}
|
self._feedRateModifier = {}
|
||||||
self._currentZ = -1
|
self._currentZ = None
|
||||||
self._heatupWaitStartTime = 0
|
self._heatupWaitStartTime = 0
|
||||||
self._heatupWaitTimeLost = 0.0
|
self._heatupWaitTimeLost = 0.0
|
||||||
self._printStartTime = None
|
self._printStartTime = None
|
||||||
|
|
Loading…
Reference in New Issue