diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-08-26 12:54:09 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-08-26 12:54:09 +0300 |
| commit | 5d01212db90454af8380c936174c061ea3614fad (patch) | |
| tree | 35648a1aee48aa9559b56ea58644cc2be2f332ef /src/GCodes/GCodeBuffer | |
| parent | 7b470f4af01019dc0bb3b4dce6843310ab36d38e (diff) | |
PS_ON pin can now be configured
Diffstat (limited to 'src/GCodes/GCodeBuffer')
| -rw-r--r-- | src/GCodes/GCodeBuffer/ExpressionParser.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.cpp b/src/GCodes/GCodeBuffer/ExpressionParser.cpp index 1a4402b1..d4008742 100644 --- a/src/GCodes/GCodeBuffer/ExpressionParser.cpp +++ b/src/GCodes/GCodeBuffer/ExpressionParser.cpp @@ -690,6 +690,16 @@ void ExpressionParser::BalanceTypes(ExpressionValue& val1, ExpressionValue& val2 ConvertToFloat(val2, evaluate); } + // Convert any port values to string + if (val1.GetType() == TypeCode::Port) + { + ConvertToString(val1, evaluate); + } + if (val2.GetType() == TypeCode::Port) + { + ConvertToString(val2, evaluate); + } + if ((val1.GetType() == val2.GetType()) || (val1.IsStringType() && val2.IsStringType())) // handle the common case first { // nothing to do |