Merge pull request #2110 from xodio/fix-gpio-no-global-namespace

Fix calling of GPIO functions only from global namespace
This commit is contained in:
Kirill Shumilov
2021-03-17 16:08:28 +03:00
committed by GitHub
7 changed files with 11 additions and 11 deletions

View File

@@ -18,10 +18,10 @@ node {
#ifdef ESP8266
if (transactionTime() - lastReadTime > 4) {
lastReadTime = transactionTime();
emitValue<output_VAL>(ctx, ::analogRead(constant_input_PORT) / 1023.);
emitValue<output_VAL>(ctx, analogRead(constant_input_PORT) / 1023.);
}
#else
emitValue<output_VAL>(ctx, ::analogRead(constant_input_PORT) / 1023.);
emitValue<output_VAL>(ctx, analogRead(constant_input_PORT) / 1023.);
#endif
emitValue<output_DONE>(ctx, 1);
}

View File

@@ -9,7 +9,7 @@ node {
return;
::pinMode(constant_input_PORT, INPUT_PULLUP);
emitValue<output_SIG>(ctx, ::digitalRead(constant_input_PORT));
emitValue<output_SIG>(ctx, digitalRead(constant_input_PORT));
emitValue<output_DONE>(ctx, 1);
}
}

View File

@@ -9,7 +9,7 @@ node {
return;
::pinMode(constant_input_PORT, INPUT);
emitValue<output_SIG>(ctx, ::digitalRead(constant_input_PORT));
emitValue<output_SIG>(ctx, digitalRead(constant_input_PORT));
emitValue<output_DONE>(ctx, 1);
}
}

View File

@@ -10,7 +10,7 @@ node {
::pinMode(constant_input_PORT, OUTPUT);
const bool val = getValue<input_SIG>(ctx);
::digitalWrite(constant_input_PORT, val);
digitalWrite(constant_input_PORT, val);
emitValue<output_DONE>(ctx, 1);
}
}

View File

@@ -1999,10 +1999,10 @@ struct Node {
#ifdef ESP8266
if (transactionTime() - lastReadTime > 4) {
lastReadTime = transactionTime();
emitValue<output_VAL>(ctx, ::analogRead(constant_input_PORT) / 1023.);
emitValue<output_VAL>(ctx, analogRead(constant_input_PORT) / 1023.);
}
#else
emitValue<output_VAL>(ctx, ::analogRead(constant_input_PORT) / 1023.);
emitValue<output_VAL>(ctx, analogRead(constant_input_PORT) / 1023.);
#endif
emitValue<output_DONE>(ctx, 1);
}
@@ -2126,7 +2126,7 @@ struct Node {
return;
::pinMode(constant_input_PORT, INPUT_PULLUP);
emitValue<output_SIG>(ctx, ::digitalRead(constant_input_PORT));
emitValue<output_SIG>(ctx, digitalRead(constant_input_PORT));
emitValue<output_DONE>(ctx, 1);
}

View File

@@ -1449,7 +1449,7 @@ struct Node {
::pinMode(constant_input_PORT, OUTPUT);
const bool val = getValue<input_SIG>(ctx);
::digitalWrite(constant_input_PORT, val);
digitalWrite(constant_input_PORT, val);
emitValue<output_DONE>(ctx, 1);
}

View File

@@ -1169,7 +1169,7 @@ struct Node {
return;
::pinMode(constant_input_PORT, INPUT);
emitValue<output_SIG>(ctx, ::digitalRead(constant_input_PORT));
emitValue<output_SIG>(ctx, digitalRead(constant_input_PORT));
emitValue<output_DONE>(ctx, 1);
}
@@ -1538,7 +1538,7 @@ struct Node {
::pinMode(constant_input_PORT, OUTPUT);
const bool val = getValue<input_SIG>(ctx);
::digitalWrite(constant_input_PORT, val);
digitalWrite(constant_input_PORT, val);
emitValue<output_DONE>(ctx, 1);
}