diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-06-28 14:59:22 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-06-28 14:59:22 +0300 |
| commit | 7bbdec319e0b0be2a8c282b0df90ebca59cded14 (patch) | |
| tree | 4a7f5219b6e7e460ab0751b85b08bba73a1c1486 /src/PrintMonitor/PrintMonitor.cpp | |
| parent | aa4b6c919514407a8b836618185541e1abf429b0 (diff) | |
Removed job.file.firstLayerHeight and job.file.numLayers from the OM
Diffstat (limited to 'src/PrintMonitor/PrintMonitor.cpp')
| -rw-r--r-- | src/PrintMonitor/PrintMonitor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/PrintMonitor/PrintMonitor.cpp b/src/PrintMonitor/PrintMonitor.cpp index 4cf8f2ed..925897fd 100644 --- a/src/PrintMonitor/PrintMonitor.cpp +++ b/src/PrintMonitor/PrintMonitor.cpp @@ -71,12 +71,10 @@ constexpr ObjectModelTableEntry PrintMonitor::objectModelTable[] = // 1. ParsedFileInfo members { "filament", OBJECT_MODEL_FUNC_NOSELF(&filamentArrayDescriptor), ObjectModelEntryFlags::none }, { "fileName", OBJECT_MODEL_FUNC_IF(self->IsPrinting(), self->filenameBeingPrinted.c_str()), ObjectModelEntryFlags::none }, - { "firstLayerHeight", OBJECT_MODEL_FUNC(self->printingFileInfo.firstLayerHeight, 2), ObjectModelEntryFlags::none }, { "generatedBy", OBJECT_MODEL_FUNC_IF(!self->printingFileInfo.generatedBy.IsEmpty(), self->printingFileInfo.generatedBy.c_str()), ObjectModelEntryFlags::none }, { "height", OBJECT_MODEL_FUNC(self->printingFileInfo.objectHeight, 2), ObjectModelEntryFlags::none }, { "lastModified", OBJECT_MODEL_FUNC(DateTime(self->printingFileInfo.lastModifiedTime)), ObjectModelEntryFlags::none }, { "layerHeight", OBJECT_MODEL_FUNC(self->printingFileInfo.layerHeight, 2), ObjectModelEntryFlags::none }, - { "numLayers", OBJECT_MODEL_FUNC((int32_t)self->printingFileInfo.GetNumLayers()), ObjectModelEntryFlags::none }, { "printTime", OBJECT_MODEL_FUNC_IF(self->printingFileInfo.printTime != 0, (int32_t)self->printingFileInfo.printTime), ObjectModelEntryFlags::none }, { "simulatedTime", OBJECT_MODEL_FUNC_IF(self->printingFileInfo.simulatedTime != 0, (int32_t)self->printingFileInfo.simulatedTime), ObjectModelEntryFlags::none }, { "size", OBJECT_MODEL_FUNC((uint64_t)self->printingFileInfo.fileSize), ObjectModelEntryFlags::none }, @@ -88,7 +86,7 @@ constexpr ObjectModelTableEntry PrintMonitor::objectModelTable[] = { "slicer", OBJECT_MODEL_FUNC(self->EstimateTimeLeftAsExpression(slicerBased)), ObjectModelEntryFlags::live }, }; -constexpr uint8_t PrintMonitor::objectModelTableDescriptor[] = { 3, 12 + TRACK_OBJECT_NAMES, 11, 4 }; +constexpr uint8_t PrintMonitor::objectModelTableDescriptor[] = { 3, 12 + TRACK_OBJECT_NAMES, 9, 4 }; DEFINE_GET_OBJECT_MODEL_TABLE(PrintMonitor) |