diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-11-08 17:51:09 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-11-08 17:51:09 +0300 |
| commit | 650206683469e979f135a80efb10557488da566f (patch) | |
| tree | a7aba0212497aee95f79749564cf7e76238d75ef | |
| parent | fd67416a7ec8a13a5531aabf4c7a2ff052929d6b (diff) | |
OM field boards[].maxMotors is no longer flagged verbose
| -rw-r--r-- | src/CAN/ExpansionManager.cpp | 2 | ||||
| -rw-r--r-- | src/RepRapFirmware.h | 4 | ||||
| -rw-r--r-- | src/Version.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/CAN/ExpansionManager.cpp b/src/CAN/ExpansionManager.cpp index 5e4494bd..d3b10ff2 100644 --- a/src/CAN/ExpansionManager.cpp +++ b/src/CAN/ExpansionManager.cpp @@ -32,7 +32,7 @@ constexpr ObjectModelTableEntry ExpansionManager::objectModelTable[] = { "firmwareDate", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::firmwareDate), ObjectModelEntryFlags::none }, { "firmwareFileName", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::firmwareFileName), ObjectModelEntryFlags::none }, { "firmwareVersion", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::firmwareVersion), ObjectModelEntryFlags::none }, - { "maxMotors", OBJECT_MODEL_FUNC((int32_t)self->FindIndexedBoard(context.GetLastIndex()).numDrivers), ObjectModelEntryFlags::verbose }, + { "maxMotors", OBJECT_MODEL_FUNC((int32_t)self->FindIndexedBoard(context.GetLastIndex()).numDrivers), ObjectModelEntryFlags::none }, { "mcuTemp", OBJECT_MODEL_FUNC_IF(self->FindIndexedBoard(context.GetLastIndex()).hasMcuTemp, self, 1), ObjectModelEntryFlags::live }, { "shortName", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).typeName, ExpansionDetail::shortName), ObjectModelEntryFlags::none }, { "state", OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).state.ToString()), ObjectModelEntryFlags::none }, diff --git a/src/RepRapFirmware.h b/src/RepRapFirmware.h index 1387947f..769de336 100644 --- a/src/RepRapFirmware.h +++ b/src/RepRapFirmware.h @@ -30,8 +30,8 @@ Licence: GPL #include <climits> // for CHAR_BIT #include <ctime> -[[deprecated("use gmtime_r instead for thread-safety")]] tm* gmtime(const time_t* t); -[[deprecated("use SafeStrptime instead")]] char * strptime (const char *buf, const char *format, struct tm *timeptr); +[[deprecated("use gmtime_r instead for thread-safety")]] tm *_ecv_null gmtime(const time_t* t); +[[deprecated("use SafeStrptime instead")]] char *_ecv_array strptime (const char *_ecv_array buf, const char *_ecv_array format, struct tm *timeptr); const char *_ecv_array SafeStrptime(const char *_ecv_array buf, const char *_ecv_array format, struct tm *timeptr) noexcept; #include <Core.h> diff --git a/src/Version.h b/src/Version.h index 799b88b2..f5c2e6ad 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.0beta6" +# define MAIN_VERSION "3.4.0beta6+1" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else |