diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-09-30 16:06:53 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-09-30 16:06:53 +0300 |
| commit | b70232c988f584c3520c8dcaccc13adde50989ea (patch) | |
| tree | 50477c8b91f994dae22ae07346dee78e1a869a70 | |
| parent | 41ef0f2290e3595077155dcc2cbf78dfc9da3793 (diff) | |
Removed obsolete OM fields + other minor changes to save flash space
| -rw-r--r-- | src/PrintMonitor/PrintMonitor.cpp | 4 | ||||
| -rw-r--r-- | src/bossa/Device.cpp | 3 | ||||
| -rw-r--r-- | src/bossa/Device.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/PrintMonitor/PrintMonitor.cpp b/src/PrintMonitor/PrintMonitor.cpp index 6b6fc1d9..af10959e 100644 --- a/src/PrintMonitor/PrintMonitor.cpp +++ b/src/PrintMonitor/PrintMonitor.cpp @@ -74,7 +74,6 @@ constexpr ObjectModelTableEntry PrintMonitor::objectModelTable[] = { "duration", OBJECT_MODEL_FUNC_IF(self->IsPrinting(), self->GetPrintOrSimulatedDuration()), ObjectModelEntryFlags::live }, { "file", OBJECT_MODEL_FUNC(self, 1), ObjectModelEntryFlags::none }, { "filePosition", OBJECT_MODEL_FUNC(self->gCodes.GetPrintingFilePosition()), ObjectModelEntryFlags::live }, - { "firstLayerDuration", OBJECT_MODEL_FUNC_NOSELF(nullptr), ObjectModelEntryFlags::obsolete }, { "lastDuration", OBJECT_MODEL_FUNC_IF(!self->IsPrinting(), (int32_t)self->gCodes.GetLastDuration()), ObjectModelEntryFlags::none }, { "lastFileName", OBJECT_MODEL_FUNC_IF(!self->filenameBeingPrinted.IsEmpty() && !self->IsPrinting(), self->filenameBeingPrinted.c_str()), ObjectModelEntryFlags::none }, // TODO Add enum about the last file print here (to replace lastFileAborted, lastFileCancelled, lastFileSimulated) @@ -108,11 +107,10 @@ constexpr ObjectModelTableEntry PrintMonitor::objectModelTable[] = // 3. TimesLeft members { "filament", OBJECT_MODEL_FUNC(self->EstimateTimeLeftAsExpression(filamentBased)), ObjectModelEntryFlags::live }, { "file", OBJECT_MODEL_FUNC(self->EstimateTimeLeftAsExpression(fileBased)), ObjectModelEntryFlags::live }, - { "layer", OBJECT_MODEL_FUNC_NOSELF(nullptr), ObjectModelEntryFlags::obsolete }, { "slicer", OBJECT_MODEL_FUNC(self->EstimateTimeLeftAsExpression(slicerBased)), ObjectModelEntryFlags::live }, }; -constexpr uint8_t PrintMonitor::objectModelTableDescriptor[] = { 4, 13, 11, 5, 4 }; +constexpr uint8_t PrintMonitor::objectModelTableDescriptor[] = { 4, 12, 11, 5, 3 }; DEFINE_GET_OBJECT_MODEL_TABLE(PrintMonitor) diff --git a/src/bossa/Device.cpp b/src/bossa/Device.cpp index d3abc9e8..df7f9d5b 100644 --- a/src/bossa/Device.cpp +++ b/src/bossa/Device.cpp @@ -635,8 +635,7 @@ Device::create() THROWS(GCodeException) _flash = flashPtr; } -void -Device::reset() THROWS(GCodeException) +void Device::reset() noexcept { try { diff --git a/src/bossa/Device.h b/src/bossa/Device.h index 06054576..914ed7d2 100644 --- a/src/bossa/Device.h +++ b/src/bossa/Device.h @@ -85,7 +85,7 @@ public: BossaFlash *_ecv_from null getFlash() const noexcept { return _flash; } - void reset() THROWS(GCodeException); + void reset() noexcept; private: Samba& _samba; |