diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-02-22 13:00:53 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-02-22 13:00:53 +0300 |
| commit | 4b00457c6707b3ad571c9e60d0a795e3f82bdfdb (patch) | |
| tree | 6af360354205440dcd5e0484e2323f48555972e2 | |
| parent | 36d4fd653bee02c286f76280792d63ffeda75b57 (diff) | |
Changed type of state.deferredPowerDown to bool
| -rw-r--r-- | src/Platform/RepRap.cpp | 2 | ||||
| -rw-r--r-- | src/Version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Platform/RepRap.cpp b/src/Platform/RepRap.cpp index 0a90d067..0d819992 100644 --- a/src/Platform/RepRap.cpp +++ b/src/Platform/RepRap.cpp @@ -327,7 +327,7 @@ constexpr ObjectModelTableEntry RepRap::objectModelTable[] = { "atxPowerPort", OBJECT_MODEL_FUNC_IF(self->platform->IsAtxPowerControlled(), self->platform->GetAtxPowerPort()), ObjectModelEntryFlags::none }, { "beep", OBJECT_MODEL_FUNC_IF(self->beepDuration != 0, self, 4), ObjectModelEntryFlags::none }, { "currentTool", OBJECT_MODEL_FUNC((int32_t)self->GetCurrentToolNumber()), ObjectModelEntryFlags::live }, - { "deferredPowerDown", OBJECT_MODEL_FUNC_IF(self->platform->IsAtxPowerControlled(), (int32_t)self->platform->IsDeferredPowerDown()), ObjectModelEntryFlags::none }, + { "deferredPowerDown", OBJECT_MODEL_FUNC_IF(self->platform->IsAtxPowerControlled(), self->platform->IsDeferredPowerDown()), ObjectModelEntryFlags::none }, { "displayMessage", OBJECT_MODEL_FUNC(self->message.c_str()), ObjectModelEntryFlags::none }, { "gpOut", OBJECT_MODEL_FUNC_NOSELF(&gpoutArrayDescriptor), ObjectModelEntryFlags::live }, #if SUPPORT_LASER diff --git a/src/Version.h b/src/Version.h index b5f732a3..044430ad 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it. -# define MAIN_VERSION "3.4.0rc1+2" +# define MAIN_VERSION "3.4.0rc2" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else |