Skip to content

В сценариях пробел после "-" теперь не нужен + fix AnalogADC #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DmitriyTychina wants to merge 3 commits into
base: ver4dev
Choose a base branch
from
Open

В сценариях пробел после "-" теперь не нужен + fix AnalogADC #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
287cc47
пробел после "-" не нужен
DmitriyTychina May 25, 2026
80d112f
fix AnalogADC при _avgSteps>1
DmitriyTychina May 25, 2026
f295724
Merge branch 'IoTManagerProject:ver4dev' into ver4dev
DmitriyTychina May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/classes/IoTScenario.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,13 +709,6 @@ int IoTScenario::gettok() {
}

NumStr = "";
if (LastChar == '-') {
LastChar = getLastChar();
if (isdigit(LastChar))
NumStr = "-";
else
return '-';
}
if (isdigit(LastChar)) { // Число: [0-9.]+
do {
NumStr += (char)LastChar;
Expand Down Expand Up @@ -1009,6 +1002,12 @@ ExprAST *IoTScenario::ParsePrimary(String *IDNames, bool callFromCondition) {
return ParseQuotesExpr();
case tok_if:
return ParseIfExpr(IDNames);
case '-': {
getNextToken();
ExprAST *Operand = ParsePrimary(IDNames, callFromCondition);
if (!Operand) return nullptr;
return new BinaryExprAST('-', new NumberExprAST("0"), Operand);
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/modules/sensors/AnalogAdc/AnalogAdc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class AnalogAdc : public IoTItem
//Serial.print("adcAverage = " + String(_adcAverage) + " \t");
//Serial.println("realSteps = " + String(realSteps));
realSteps = 0;
_adcAverage = 0;
}
regEvent(value.valD, "AnalogAdc"); // обязательный вызов хотяб один
}
Expand Down