diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-03-12 16:31:33 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-03-12 16:31:33 +0300 |
| commit | 3df16afdb0bcadd8a702f1849c994f14f14c48dc (patch) | |
| tree | 9c596ab8d9926ae7ecc6159151ace816d254e53b | |
| parent | 249c59aab3c7ab38539764ebbf5c56349f27c6f0 (diff) | |
Move and PrintMonitor object model changes
move.extruders is now live
Added job.firstLayerDuration
| -rw-r--r-- | src/Movement/Move.cpp | 2 | ||||
| -rw-r--r-- | src/PrintMonitor.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Movement/Move.cpp b/src/Movement/Move.cpp index 641b9c13..007bcb70 100644 --- a/src/Movement/Move.cpp +++ b/src/Movement/Move.cpp @@ -78,7 +78,7 @@ constexpr ObjectModelTableEntry Move::objectModelTable[] = { "compensation", OBJECT_MODEL_FUNC(self, 7), ObjectModelEntryFlags::none }, { "currentMove", OBJECT_MODEL_FUNC(self, 3), ObjectModelEntryFlags::live }, { "daa", OBJECT_MODEL_FUNC(self, 1), ObjectModelEntryFlags::none }, - { "extruders", OBJECT_MODEL_FUNC_NOSELF(&extrudersArrayDescriptor), ObjectModelEntryFlags::none }, + { "extruders", OBJECT_MODEL_FUNC_NOSELF(&extrudersArrayDescriptor), ObjectModelEntryFlags::live }, { "idle", OBJECT_MODEL_FUNC(self, 2), ObjectModelEntryFlags::none }, { "kinematics", OBJECT_MODEL_FUNC(self->kinematics), ObjectModelEntryFlags::none }, { "printingAcceleration", OBJECT_MODEL_FUNC(self->maxPrintingAcceleration, 1), ObjectModelEntryFlags::none }, diff --git a/src/PrintMonitor.cpp b/src/PrintMonitor.cpp index e55c1e06..b808f511 100644 --- a/src/PrintMonitor.cpp +++ b/src/PrintMonitor.cpp @@ -51,6 +51,7 @@ constexpr ObjectModelTableEntry PrintMonitor::objectModelTable[] = { "duration", OBJECT_MODEL_FUNC_IF(self->IsPrinting(), self->GetPrintDuration(), 1), ObjectModelEntryFlags::live }, { "file", OBJECT_MODEL_FUNC(self, 1), ObjectModelEntryFlags::none }, { "filePosition", OBJECT_MODEL_FUNC_NOSELF(reprap.GetGCodes().GetFilePosition(), 0), ObjectModelEntryFlags::live }, + { "firstLayerDuration", OBJECT_MODEL_FUNC_IF(self->IsPrinting(), self->GetFirstLayerDuration()), ObjectModelEntryFlags::none }, { "lastFileName", OBJECT_MODEL_FUNC_IF(!self->filenameBeingPrinted.IsEmpty(), self->filenameBeingPrinted.c_str()), ObjectModelEntryFlags::none }, // TODO Add enum about the last file print here (to replace lastFileAborted, lastFileCancelled, lastFileSimulated) { "layer", OBJECT_MODEL_FUNC_IF(self->IsPrinting(), (int32_t)self->currentLayer), ObjectModelEntryFlags::none }, @@ -77,7 +78,7 @@ constexpr ObjectModelTableEntry PrintMonitor::objectModelTable[] = { "layer", OBJECT_MODEL_FUNC(self->EstimateTimeLeftAsExpression(layerBased)), ObjectModelEntryFlags::live }, }; -constexpr uint8_t PrintMonitor::objectModelTableDescriptor[] = { 3, 8, 11, 3 }; +constexpr uint8_t PrintMonitor::objectModelTableDescriptor[] = { 3, 9, 11, 3 }; DEFINE_GET_OBJECT_MODEL_TABLE(PrintMonitor) |