fix(xod-arduino, xod-tabtest, stdlib): do not rely on NUM_ANALOG_INPU…

…TS being defined
xodio · Oct 18, 2018 · 645f32a · 645f32a
1 parent 422b63c
commit 645f32a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 2 deletions.
diff --git a/packages/xod-arduino/platform/runtime.cpp b/packages/xod-arduino/platform/runtime.cpp
@@ -206,6 +206,14 @@ bool isValidDigitalPort(uint8_t port) {
 #endif
 }
 
+bool isValidAnalogPort(uint8_t port) {
+#ifdef NUM_ANALOG_INPUTS
+    return port >= A0 && port < A0 + NUM_ANALOG_INPUTS;
+#else
+    return port >= A0;
+#endif
+}
+
 } // namespace xod
 
 //----------------------------------------------------------------------------

diff --git a/packages/xod-tabtest/cpp/Arduino.h b/packages/xod-tabtest/cpp/Arduino.h
@@ -11,6 +11,8 @@
 void setup();
 void loop();
 
+#define A0 14
+
 uint32_t millis();
 void delay(uint32_t);
 

diff --git a/workspace/__lib__/xod/gpio/analog-read/patch.cpp b/workspace/__lib__/xod/gpio/analog-read/patch.cpp
@@ -8,8 +8,8 @@ void evaluate(Context ctx) {
         return;
 
     const uint8_t port = getValue<input_PORT>(ctx);
-    bool err = (port < A0 || port > A0 + NUM_ANALOG_INPUTS - 1);
-    if (err) {
+
+    if (!isValidAnalogPort(port)) {
         emitValue<output_ERR>(ctx, 1);
         return;
     }

diff --git a/workspace/blink/__fixtures__/arduino.cpp b/workspace/blink/__fixtures__/arduino.cpp
diff --git a/workspace/count-with-feedback-loops/__fixtures__/arduino.cpp b/workspace/count-with-feedback-loops/__fixtures__/arduino.cpp
diff --git a/workspace/lcd-time/__fixtures__/arduino.cpp b/workspace/lcd-time/__fixtures__/arduino.cpp
diff --git a/workspace/two-button-switch/__fixtures__/arduino.cpp b/workspace/two-button-switch/__fixtures__/arduino.cpp