io_pin_remap: additional bugfixes

- FunctionalInterrupt.h: prevent macro expansion in declaration
- io_pin_remap.h: fix remaining pin-remapped functions whose API
  allow a variable number of parameters

Author: pillo79

Diff for: cores/esp32/FunctionalInterrupt.h

@@ -12,10 +12,11 @@
 #include <stdint.h>
 
 struct InterruptArgStructure {
-	std::function<void(void)> interruptFunction;
+    std::function<void(void)> interruptFunction;
 };
 
-void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode);
-
+// The extra set of parentheses here prevents macros defined
+// in io_pin_remap.h from applying to this declaration.
+void (attachInterrupt)(uint8_t pin, std::function<void(void)> intRoutine, int mode);
 
 #endif /* CORE_CORE_FUNCTIONALINTERRUPT_H_ */

Diff for: cores/esp32/io_pin_remap.h

@@ -7,18 +7,18 @@
 
 // Pin remapping functions
 int8_t digitalPinToGPIONumber(int8_t digitalPin);
-int8_t digitalPinFromGPIONumber(int8_t gpioPin);
+int8_t digitalPinFromGPIONumber(int8_t gpioNumber);
 
 // Apply pin remapping to API only when building libraries and user sketch
 #ifndef ARDUINO_CORE_BUILD
 
 // Override APIs requiring pin remapping
 
 // cores/esp32/Arduino.h
-#define pulseInLong(pin, state, timeout)    pulseInLong(digitalPinToGPIONumber(pin), state, timeout)
-#define pulseIn(pin, state, timeout)        pulseIn(digitalPinToGPIONumber(pin), state, timeout)
-#define noTone(_pin)                        noTone(digitalPinToGPIONumber(_pin))
-#define tone(_pin, args...)                 tone(digitalPinToGPIONumber(_pin), args)
+#define pulseInLong(pin, args...)   pulseInLong(digitalPinToGPIONumber(pin), args)
+#define pulseIn(pin, args...)       pulseIn(digitalPinToGPIONumber(pin), args)
+#define noTone(_pin)                noTone(digitalPinToGPIONumber(_pin))
+#define tone(_pin, args...)         tone(digitalPinToGPIONumber(_pin), args)
 
 // cores/esp32/esp32-hal.h
 #define analogGetChannel(pin)       analogGetChannel(digitalPinToGPIONumber(pin))