diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-10-25 12:13:00 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-10-25 12:13:00 +0300 |
| commit | 4fab707f0c205bb55e1c98a72be37b1069dc7ba3 (patch) | |
| tree | ffe1db2df45cefcf08ef0dd59e29c9bbe294fc1e /src/ObjectModel | |
| parent | af4c424a01b73a7bb4ad9b2e9ebdf1f6172990bb (diff) | |
Work towards v3.4-b6
Added SBC data types for null, uint64_t, and datetimes
Added new OM handler for file positions
Refactored GCodes::GetFilePosition
Diffstat (limited to 'src/ObjectModel')
| -rw-r--r-- | src/ObjectModel/ObjectModel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h index 63262be4..3202aa54 100644 --- a/src/ObjectModel/ObjectModel.h +++ b/src/ObjectModel/ObjectModel.h @@ -115,6 +115,7 @@ struct ExpressionValue explicit constexpr ExpressionValue(float f) noexcept : type((uint32_t)TypeCode::Float), param(MaxFloatDigitsDisplayedAfterPoint), fVal(f) { } constexpr ExpressionValue(float f, uint8_t numDecimalPlaces) noexcept : type((uint32_t)TypeCode::Float), param(numDecimalPlaces), fVal(f) { } explicit constexpr ExpressionValue(int32_t i) noexcept : type((uint32_t)TypeCode::Int32), param(0), iVal(i) { } + explicit constexpr ExpressionValue(FilePosition p) noexcept : type((uint32_t)TypeCode::Uint32), param(0), uVal(p) { } explicit ExpressionValue(uint64_t u) noexcept : type((uint32_t)TypeCode::Uint64) { Set56BitValue(u); } explicit constexpr ExpressionValue(const ObjectModel *om) noexcept : type((om == nullptr) ? (uint32_t)TypeCode::None : (uint32_t)TypeCode::ObjectModel_tc), param(0), omVal(om) { } constexpr ExpressionValue(const ObjectModel *om, uint8_t tableNumber) noexcept : type((om == nullptr) ? (uint32_t)TypeCode::None : (uint32_t)TypeCode::ObjectModel_tc), param(tableNumber), omVal(om) { } |