diff options
author | David Crocker <dcrocker@eschertech.com> | 2021-10-29 13:17:42 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2021-10-29 13:17:42 +0300 |
commit | 8d50ec9705a71347d1371be9e7022f268738f1e6 (patch) | |
tree | 7c519f3122b1df4759fcd88a7955278197029c56 /src | |
parent | 9dfad056245fa2a202b1e18e6f03c3c9ce17d064 (diff) |
Renamed TypeCode::UniqueId for eCv
Diffstat (limited to 'src')
-rw-r--r-- | src/GCodes/GCodeBuffer/ExpressionParser.cpp | 4 | ||||
-rw-r--r-- | src/ObjectModel/ObjectModel.cpp | 4 | ||||
-rw-r--r-- | src/ObjectModel/ObjectModel.h | 4 | ||||
-rw-r--r-- | src/RepRapFirmware.pdp | bin | 4435 -> 4466 bytes | |||
-rw-r--r-- | src/SBC/DataTransfer.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.cpp b/src/GCodes/GCodeBuffer/ExpressionParser.cpp index 315f3e09..b091227d 100644 --- a/src/GCodes/GCodeBuffer/ExpressionParser.cpp +++ b/src/GCodes/GCodeBuffer/ExpressionParser.cpp @@ -699,11 +699,11 @@ void ExpressionParser::BalanceTypes(ExpressionValue& val1, ExpressionValue& val2 } // Convert any port or unique ID values to string - if (val1.GetType() == TypeCode::Port || val1.GetType() == TypeCode::UniqueId) + if (val1.GetType() == TypeCode::Port || val1.GetType() == TypeCode::UniqueId_tc) { ConvertToString(val1, evaluate); } - if (val2.GetType() == TypeCode::Port || val2.GetType() == TypeCode::UniqueId) + if (val2.GetType() == TypeCode::Port || val2.GetType() == TypeCode::UniqueId_tc) { ConvertToString(val2, evaluate); } diff --git a/src/ObjectModel/ObjectModel.cpp b/src/ObjectModel/ObjectModel.cpp index 938479ae..cb4a247f 100644 --- a/src/ObjectModel/ObjectModel.cpp +++ b/src/ObjectModel/ObjectModel.cpp @@ -137,7 +137,7 @@ void ExpressionValue::AppendAsString(const StringRef& str) const noexcept iopVal->AppendPinName(str); break; - case TypeCode::UniqueId: + case TypeCode::UniqueId_tc: uniqueIdVal->AppendCharsToString(str); break; } @@ -779,7 +779,7 @@ void ObjectModel::ReportItemAsJsonFull(OutputBuffer *buf, ObjectExplorationConte ReportPinNameAsJson(buf, val); break; - case TypeCode::UniqueId: + case TypeCode::UniqueId_tc: buf->cat('"'); val.uniqueIdVal->AppendCharsToBuffer(buf); buf->cat('"'); diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h index 9ae99e80..a5109050 100644 --- a/src/ObjectModel/ObjectModel.h +++ b/src/ObjectModel/ObjectModel.h @@ -44,7 +44,7 @@ enum class TypeCode : uint8_t MacAddress_tc, // renamed for eCv to avoid clash with class MacAddress Special, Port, - UniqueId, + UniqueId_tc, #if SUPPORT_CAN_EXPANSION CanExpansionBoardDetails #endif @@ -143,7 +143,7 @@ struct ExpressionValue explicit ExpressionValue(SpecialType s, uint32_t u) noexcept : type((uint32_t)TypeCode::Special), param((uint32_t)s), uVal(u) { } explicit ExpressionValue(StringHandle h) noexcept : type((uint32_t)TypeCode::HeapString), param(0), shVal(h) { } explicit ExpressionValue(const IoPort& p) noexcept : type((uint32_t)TypeCode::Port), param(0), iopVal(&p) { } - explicit ExpressionValue(const UniqueId& id) noexcept : type((uint32_t)TypeCode::UniqueId), param(0), uniqueIdVal(&id) { } + explicit ExpressionValue(const UniqueId& id) noexcept : type((uint32_t)TypeCode::UniqueId_tc), param(0), uniqueIdVal(&id) { } #if SUPPORT_CAN_EXPANSION ExpressionValue(const char*s, ExpansionDetail p) noexcept : type((uint32_t)TypeCode::CanExpansionBoardDetails), param((uint32_t)p), sVal(s) { } #endif diff --git a/src/RepRapFirmware.pdp b/src/RepRapFirmware.pdp Binary files differindex c471b874..363c53d9 100644 --- a/src/RepRapFirmware.pdp +++ b/src/RepRapFirmware.pdp diff --git a/src/SBC/DataTransfer.cpp b/src/SBC/DataTransfer.cpp index 53166c38..2902da8b 100644 --- a/src/SBC/DataTransfer.cpp +++ b/src/SBC/DataTransfer.cpp @@ -1294,7 +1294,7 @@ bool DataTransfer::WriteEvaluationResult(const char *expression, const Expressio case TypeCode::MacAddress_tc: case TypeCode::DateTime_tc: case TypeCode::Port: - case TypeCode::UniqueId: + case TypeCode::UniqueId_tc: // All these types are represented as strings value.AppendAsString(rslt.GetRef()); payloadLength = expressionLength + rslt.strlen(); @@ -1375,7 +1375,7 @@ bool DataTransfer::WriteEvaluationResult(const char *expression, const Expressio case TypeCode::MacAddress_tc: case TypeCode::IPAddress_tc: case TypeCode::Port: - case TypeCode::UniqueId: + case TypeCode::UniqueId_tc: default: // We have already converted the value to a string in 'rslt' header->dataType = (value.GetType() == TypeCode::DateTime_tc) ? DataType::DateTime : DataType::String; |