diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-09-08 21:26:40 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-09-08 21:26:40 +0300 |
| commit | 43119b53b6751d628b105f40382c8e686c807ab7 (patch) | |
| tree | 74af6c3ba56c3883f41272544425178f693b4686 /src | |
| parent | 7bf5a07ed9ac5cf2084a103bb24725902a7ecf4e (diff) | |
Correction to earlier change
Diffstat (limited to 'src')
| -rw-r--r-- | src/GCodes/GCodeBuffer/ExpressionParser.cpp | 4 | ||||
| -rw-r--r-- | src/ObjectModel/ObjectModel.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.cpp b/src/GCodes/GCodeBuffer/ExpressionParser.cpp index ade5cb6a..000bd20a 100644 --- a/src/GCodes/GCodeBuffer/ExpressionParser.cpp +++ b/src/GCodes/GCodeBuffer/ExpressionParser.cpp @@ -806,7 +806,7 @@ void ExpressionParser::ConvertToDriverId(ExpressionValue& val, bool evaluate) co #if SUPPORT_CAN_EXPANSION val.Set(DriverId(0, val.uVal)); #else - val.Set(DriverId_tc(val.uVal)); + val.Set(DriverId(val.uVal)); #endif break; @@ -822,7 +822,7 @@ void ExpressionParser::ConvertToDriverId(ExpressionValue& val, bool evaluate) co #else if (ival >= 0 && ival < 10 && fabsf(f10val - (float)ival) <= 0.002) { - val.Set(DriverId_tc(ival % 10)); + val.Set(DriverId(ival % 10)); } #endif else diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h index fd6f41e9..163b6825 100644 --- a/src/ObjectModel/ObjectModel.h +++ b/src/ObjectModel/ObjectModel.h @@ -185,7 +185,7 @@ struct ExpressionValue #if SUPPORT_CAN_EXPANSION { return DriverId(param, uVal); } #else - { return DriverId_tc(uVal); } + { return DriverId(uVal); } #endif // Get the format string to use assuming this is a floating point number |