diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-09-24 17:58:08 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-09-24 17:58:08 +0300 |
| commit | 5507c7a68ec7ff47566c6ae697143f3855546e85 (patch) | |
| tree | f8a95496ab59f6f4a5f3a38e9b0b41005faf47c4 /src/RepRap.cpp | |
| parent | 8f5b63e328b6a332005e855afdec8c7addd8ba89 (diff) | |
Changes for new CoreN2G and to support v0.4 Duet 3 Mini prototype
Diffstat (limited to 'src/RepRap.cpp')
| -rw-r--r-- | src/RepRap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/RepRap.cpp b/src/RepRap.cpp index e47a2ff3..c7c72c82 100644 --- a/src/RepRap.cpp +++ b/src/RepRap.cpp @@ -317,6 +317,7 @@ constexpr ObjectModelTableEntry RepRap::objectModelTable[] = #endif { "machineMode", OBJECT_MODEL_FUNC(self->gCodes->GetMachineModeString()), ObjectModelEntryFlags::none }, { "messageBox", OBJECT_MODEL_FUNC_IF(self->mbox.active, self, 5), ObjectModelEntryFlags::none }, + { "msUpTime", OBJECT_MODEL_FUNC_NOSELF((int32_t)(context.GetStartMillis() % 1000u)), ObjectModelEntryFlags::live }, { "nextTool", OBJECT_MODEL_FUNC((int32_t)self->gCodes->GetNewToolNumber()), ObjectModelEntryFlags::live }, #if HAS_VOLTAGE_MONITOR { "powerFailScript", OBJECT_MODEL_FUNC(self->gCodes->GetPowerFailScript()), ObjectModelEntryFlags::none }, @@ -325,7 +326,7 @@ constexpr ObjectModelTableEntry RepRap::objectModelTable[] = { "restorePoints", OBJECT_MODEL_FUNC_NOSELF(&restorePointsArrayDescriptor), ObjectModelEntryFlags::none }, { "status", OBJECT_MODEL_FUNC(self->GetStatusString()), ObjectModelEntryFlags::live }, { "time", OBJECT_MODEL_FUNC(DateTime(self->platform->GetDateTime())), ObjectModelEntryFlags::live }, - { "upTime", OBJECT_MODEL_FUNC_NOSELF((int32_t)((millis64()/1000u) & 0x7FFFFFFF)), ObjectModelEntryFlags::live }, + { "upTime", OBJECT_MODEL_FUNC_NOSELF((int32_t)((context.GetStartMillis()/1000u) & 0x7FFFFFFF)), ObjectModelEntryFlags::live }, // 4. MachineModel.state.beep { "duration", OBJECT_MODEL_FUNC((int32_t)self->beepDuration), ObjectModelEntryFlags::none }, @@ -376,7 +377,7 @@ constexpr uint8_t RepRap::objectModelTableDescriptor[] = 0, // directories #endif 25, // limits - 14 + HAS_VOLTAGE_MONITOR + SUPPORT_LASER, // state + 15 + HAS_VOLTAGE_MONITOR + SUPPORT_LASER, // state 2, // state.beep 6, // state.messageBox 10 + 2 * HAS_NETWORKING + SUPPORT_SCANNER + 2 * HAS_MASS_STORAGE // seqs |