diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-10-21 18:07:43 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-10-21 18:07:43 +0300 |
| commit | 56eb6347a62ab60848a2f46d27fa30a62a53f189 (patch) | |
| tree | 0fb4b64ad26e7dc8ed82d2ae236c7fddbf838da6 /src/RepRap.cpp | |
| parent | 80eb7895d34502c25a24b9f7d2ac6f819737eecc (diff) | |
Various fixes
Added check that a filament monitor port is on the same board as the
extruder driver
When multiple G- or M-commands are given on a line, don't require spaces
between them (for OpenPnP and CNC compatibility)
Fixed issue with missing seqs.network on Duet 2 SBC build
Fixed compile error in Duet 2 builds
Diffstat (limited to 'src/RepRap.cpp')
| -rw-r--r-- | src/RepRap.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/RepRap.cpp b/src/RepRap.cpp index 8404987a..78062ca1 100644 --- a/src/RepRap.cpp +++ b/src/RepRap.cpp @@ -238,6 +238,7 @@ constexpr ObjectModelTableEntry RepRap::objectModelTable[] = { "job", OBJECT_MODEL_FUNC(self->printMonitor), ObjectModelEntryFlags::live }, { "limits", OBJECT_MODEL_FUNC(self, 2), ObjectModelEntryFlags::none }, { "move", OBJECT_MODEL_FUNC(self->move), ObjectModelEntryFlags::live }, + // Note, 'network' is needed even if there is no networking, because it contains the machine name { "network", OBJECT_MODEL_FUNC(self->network), ObjectModelEntryFlags::none }, #if SUPPORT_SCANNER { "scanner", OBJECT_MODEL_FUNC(self->scanner), ObjectModelEntryFlags::none }, @@ -352,8 +353,9 @@ constexpr ObjectModelTableEntry RepRap::objectModelTable[] = { "job", OBJECT_MODEL_FUNC((int32_t)self->jobSeq), ObjectModelEntryFlags::live }, // no need for 'limits' because it never changes { "move", OBJECT_MODEL_FUNC((int32_t)self->moveSeq), ObjectModelEntryFlags::live }, -#if HAS_NETWORKING + // Note, 'network' is needed even if there is no networking, because it contains the machine name { "network", OBJECT_MODEL_FUNC((int32_t)self->networkSeq), ObjectModelEntryFlags::live }, +#if HAS_NETWORKING { "reply", OBJECT_MODEL_FUNC_NOSELF((int32_t)HttpResponder::GetReplySeq()), ObjectModelEntryFlags::live }, #endif #if SUPPORT_SCANNER @@ -381,7 +383,7 @@ constexpr uint8_t RepRap::objectModelTableDescriptor[] = 15 + HAS_VOLTAGE_MONITOR + SUPPORT_LASER, // state 2, // state.beep 6, // state.messageBox - 10 + 2 * HAS_NETWORKING + SUPPORT_SCANNER + 2 * HAS_MASS_STORAGE // seqs + 11 + HAS_NETWORKING + SUPPORT_SCANNER + 2 * HAS_MASS_STORAGE // seqs }; DEFINE_GET_OBJECT_MODEL_TABLE(RepRap) |