Merge pull request #20 from halak0013/master

New verison

Author: byrmeng

.gitignore

@@ -1 +1,2 @@
 releases
+*zip

boards.txt

@@ -1,5 +1,5 @@
 # Deneyap Gelistirme Kartlari
-# version=1.3.12
+# version=1.3.13
 
 # Official Espressif options
 menu.UploadSpeed=Upload Speed
@@ -20,6 +20,7 @@ menu.EventsCore=Events Run On
 menu.MemoryType=Memory Type
 menu.EraseFlash=Erase All Flash Before Sketch Upload
 menu.JTAGAdapter=JTAG Adapter
+menu.PinNumbers=Pin Numbering
 
 # Custom options
 menu.Revision=Board Revision
@@ -623,6 +624,251 @@ dydk1a_mpv20.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+dydk1a_mpv30.name=Deneyap Kart 1A v3
+
+dydk1a_mpv30.vid.0=0x303a #! burası değişebilir
+dydk1a_mpv30.pid.0=0x8147
+
+dydk1a_mpv30.bootloader.tool=esptool_py
+dydk1a_mpv30.bootloader.tool.default=esptool_py
+
+dydk1a_mpv30.upload.tool=esptool_py
+dydk1a_mpv30.upload.tool.default=esptool_py
+dydk1a_mpv30.upload.tool.network=esp_ota
+
+dydk1a_mpv30.upload.maximum_size=1310720
+dydk1a_mpv30.upload.maximum_data_size=327680
+dydk1a_mpv30.upload.flags=
+dydk1a_mpv30.upload.extra_flags=
+dydk1a_mpv30.upload.use_1200bps_touch=false
+dydk1a_mpv30.upload.wait_for_upload_port=false
+
+dydk1a_mpv30.serial.disableDTR=false
+dydk1a_mpv30.serial.disableRTS=false
+
+dydk1a_mpv30.build.tarch=xtensa
+dydk1a_mpv30.build.bootloader_addr=0x0
+dydk1a_mpv30.build.target=esp32s3
+dydk1a_mpv30.build.mcu=esp32s3
+dydk1a_mpv30.build.core=esp32
+dydk1a_mpv30.build.variant=dydk1a_mpv30
+dydk1a_mpv30.build.board=DYDK1Av3
+
+dydk1a_mpv30.build.usb_mode=1
+dydk1a_mpv30.build.cdc_on_boot=1 #0 bakılmalı
+dydk1a_mpv30.build.msc_on_boot=0
+dydk1a_mpv30.build.dfu_on_boot=0
+dydk1a_mpv30.build.f_cpu=240000000L
+dydk1a_mpv30.build.flash_size=4MB
+dydk1a_mpv30.build.flash_freq=80m
+dydk1a_mpv30.build.flash_mode=dio
+dydk1a_mpv30.build.boot=qio
+dydk1a_mpv30.build.boot_freq=80m
+dydk1a_mpv30.build.partitions=default
+dydk1a_mpv30.build.defines=-DBOARD_HAS_PSRAM #burası bos
+dydk1a_mpv30.build.loop_core=
+dydk1a_mpv30.build.event_core=
+dydk1a_mpv30.build.psram_type=opi
+dydk1a_mpv30.build.memory_type={build.boot}_{build.psram_type}
+
+## IDE 2.0 Seems to not update the value
+dydk1a_mpv30.menu.JTAGAdapter.default=Disabled
+dydk1a_mpv30.menu.JTAGAdapter.default.build.copy_jtag_files=0
+dydk1a_mpv30.menu.JTAGAdapter.builtin=Integrated USB JTAG
+dydk1a_mpv30.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
+dydk1a_mpv30.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+dydk1a_mpv30.menu.JTAGAdapter.external=FTDI Adapter
+dydk1a_mpv30.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
+dydk1a_mpv30.menu.JTAGAdapter.external.build.copy_jtag_files=1
+dydk1a_mpv30.menu.JTAGAdapter.bridge=ESP USB Bridge
+dydk1a_mpv30.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
+dydk1a_mpv30.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+dydk1a_mpv30.menu.PSRAM.opi=OPI PSRAM
+dydk1a_mpv30.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+dydk1a_mpv30.menu.PSRAM.opi.build.psram_type=opi
+dydk1a_mpv30.menu.PSRAM.disabled=Disabled
+dydk1a_mpv30.menu.PSRAM.disabled.build.defines=
+dydk1a_mpv30.menu.PSRAM.disabled.build.psram_type=qspi
+dydk1a_mpv30.menu.PSRAM.enabled=QSPI PSRAM
+dydk1a_mpv30.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+dydk1a_mpv30.menu.PSRAM.enabled.build.psram_type=qspi
+
+dydk1a_mpv30.menu.FlashMode.qio=QIO 80MHz
+dydk1a_mpv30.menu.FlashMode.qio.build.flash_mode=dio
+dydk1a_mpv30.menu.FlashMode.qio.build.boot=qio
+dydk1a_mpv30.menu.FlashMode.qio.build.boot_freq=80m
+dydk1a_mpv30.menu.FlashMode.qio.build.flash_freq=80m
+dydk1a_mpv30.menu.FlashMode.qio120=QIO 120MHz
+dydk1a_mpv30.menu.FlashMode.qio120.build.flash_mode=dio
+dydk1a_mpv30.menu.FlashMode.qio120.build.boot=qio
+dydk1a_mpv30.menu.FlashMode.qio120.build.boot_freq=120m
+dydk1a_mpv30.menu.FlashMode.qio120.build.flash_freq=80m
+dydk1a_mpv30.menu.FlashMode.dio=DIO 80MHz
+dydk1a_mpv30.menu.FlashMode.dio.build.flash_mode=dio
+dydk1a_mpv30.menu.FlashMode.dio.build.boot=dio
+dydk1a_mpv30.menu.FlashMode.dio.build.boot_freq=80m
+dydk1a_mpv30.menu.FlashMode.dio.build.flash_freq=80m
+dydk1a_mpv30.menu.FlashMode.opi=OPI 80MHz
+dydk1a_mpv30.menu.FlashMode.opi.build.flash_mode=dout
+dydk1a_mpv30.menu.FlashMode.opi.build.boot=opi
+dydk1a_mpv30.menu.FlashMode.opi.build.boot_freq=80m
+dydk1a_mpv30.menu.FlashMode.opi.build.flash_freq=80m
+
+dydk1a_mpv30.menu.FlashSize.4M=4MB (32Mb)
+dydk1a_mpv30.menu.FlashSize.4M.build.flash_size=4MB
+dydk1a_mpv30.menu.FlashSize.8M=8MB (64Mb)
+dydk1a_mpv30.menu.FlashSize.8M.build.flash_size=8MB
+dydk1a_mpv30.menu.FlashSize.8M.build.partitions=default_8MB
+dydk1a_mpv30.menu.FlashSize.16M=16MB (128Mb)
+dydk1a_mpv30.menu.FlashSize.16M.build.flash_size=16MB
+#dydk1a_mpv30.menu.FlashSize.32M=32MB (256Mb)
+#dydk1a_mpv30.menu.FlashSize.32M.build.flash_size=32MB
+dydk1a_mpv30.menu.FlashSize.32M.build.partitions=app5M_fat24M_32MB #yeni geldi
+
+dydk1a_mpv30.menu.LoopCore.1=Core 1
+dydk1a_mpv30.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+dydk1a_mpv30.menu.LoopCore.0=Core 0
+dydk1a_mpv30.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+dydk1a_mpv30.menu.EventsCore.1=Core 1
+dydk1a_mpv30.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+dydk1a_mpv30.menu.EventsCore.0=Core 0
+dydk1a_mpv30.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+dydk1a_mpv30.menu.USBMode.hwcdc=Hardware CDC and JTAG
+dydk1a_mpv30.menu.USBMode.hwcdc.build.usb_mode=1
+dydk1a_mpv30.menu.USBMode.default=USB-OTG (TinyUSB)
+dydk1a_mpv30.menu.USBMode.default.build.usb_mode=0
+
+dydk1a_mpv30.menu.CDCOnBoot.cdc=Enabled
+dydk1a_mpv30.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+dydk1a_mpv30.menu.CDCOnBoot.default=Disabled
+dydk1a_mpv30.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+dydk1a_mpv30.menu.MSCOnBoot.default=Disabled
+dydk1a_mpv30.menu.MSCOnBoot.default.build.msc_on_boot=0
+dydk1a_mpv30.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+dydk1a_mpv30.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+dydk1a_mpv30.menu.DFUOnBoot.default=Disabled
+dydk1a_mpv30.menu.DFUOnBoot.default.build.dfu_on_boot=0
+dydk1a_mpv30.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+dydk1a_mpv30.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+dydk1a_mpv30.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+dydk1a_mpv30.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+dydk1a_mpv30.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+dydk1a_mpv30.menu.UploadMode.default=UART0 / Hardware CDC
+dydk1a_mpv30.menu.UploadMode.default.upload.use_1200bps_touch=false
+dydk1a_mpv30.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+dydk1a_mpv30.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.default.build.partitions=default
+dydk1a_mpv30.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+dydk1a_mpv30.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+dydk1a_mpv30.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+dydk1a_mpv30.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+dydk1a_mpv30.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.minimal.build.partitions=minimal
+dydk1a_mpv30.menu.PartitionScheme.no_fs=No FS 4MB (2MB APP x2) #yeni geldi
+dydk1a_mpv30.menu.PartitionScheme.no_fs.build.partitions=no_fs #yeni geldi
+dydk1a_mpv30.menu.PartitionScheme.no_fs.upload.maximum_size=2031616 #yeni geldi
+dydk1a_mpv30.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.no_ota.build.partitions=no_ota
+dydk1a_mpv30.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+dydk1a_mpv30.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+dydk1a_mpv30.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+dydk1a_mpv30.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+dydk1a_mpv30.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+dydk1a_mpv30.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+dydk1a_mpv30.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+dydk1a_mpv30.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+dydk1a_mpv30.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+dydk1a_mpv30.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.huge_app.build.partitions=huge_app
+dydk1a_mpv30.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+dydk1a_mpv30.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+dydk1a_mpv30.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+dydk1a_mpv30.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+dydk1a_mpv30.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+dydk1a_mpv30.menu.PartitionScheme.fatflash.build.partitions=ffat
+dydk1a_mpv30.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+dydk1a_mpv30.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+dydk1a_mpv30.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+dydk1a_mpv30.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+dydk1a_mpv30.menu.PartitionScheme.rainmaker=RainMaker
+dydk1a_mpv30.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+dydk1a_mpv30.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+# alttakiler yeni
+dydk1a_mpv30.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
+dydk1a_mpv30.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
+dydk1a_mpv30.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
+dydk1a_mpv30.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
+dydk1a_mpv30.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
+dydk1a_mpv30.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
+dydk1a_mpv30.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODEL)
+dydk1a_mpv30.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
+dydk1a_mpv30.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
+dydk1a_mpv30.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16
+dydk1a_mpv30.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+dydk1a_mpv30.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+dydk1a_mpv30.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+dydk1a_mpv30.menu.PartitionScheme.custom=Custom
+dydk1a_mpv30.menu.PartitionScheme.custom.build.partitions=
+dydk1a_mpv30.menu.PartitionScheme.custom.upload.maximum_size=16777216
+
+
+dydk1a_mpv30.menu.CPUFreq.240=240MHz (WiFi)
+dydk1a_mpv30.menu.CPUFreq.240.build.f_cpu=240000000L
+dydk1a_mpv30.menu.CPUFreq.160=160MHz (WiFi)
+dydk1a_mpv30.menu.CPUFreq.160.build.f_cpu=160000000L
+dydk1a_mpv30.menu.CPUFreq.80=80MHz (WiFi)
+dydk1a_mpv30.menu.CPUFreq.80.build.f_cpu=80000000L
+dydk1a_mpv30.menu.CPUFreq.40=40MHz
+dydk1a_mpv30.menu.CPUFreq.40.build.f_cpu=40000000L
+dydk1a_mpv30.menu.CPUFreq.20=20MHz
+dydk1a_mpv30.menu.CPUFreq.20.build.f_cpu=20000000L
+dydk1a_mpv30.menu.CPUFreq.10=10MHz
+dydk1a_mpv30.menu.CPUFreq.10.build.f_cpu=10000000L
+
+dydk1a_mpv30.menu.UploadSpeed.921600=921600
+dydk1a_mpv30.menu.UploadSpeed.921600.upload.speed=921600
+dydk1a_mpv30.menu.UploadSpeed.115200=115200
+dydk1a_mpv30.menu.UploadSpeed.115200.upload.speed=115200
+dydk1a_mpv30.menu.UploadSpeed.256000.windows=256000
+dydk1a_mpv30.menu.UploadSpeed.256000.upload.speed=256000
+dydk1a_mpv30.menu.UploadSpeed.230400.windows.upload.speed=256000
+dydk1a_mpv30.menu.UploadSpeed.230400=230400
+dydk1a_mpv30.menu.UploadSpeed.230400.upload.speed=230400
+dydk1a_mpv30.menu.UploadSpeed.460800.linux=460800
+dydk1a_mpv30.menu.UploadSpeed.460800.macosx=460800
+dydk1a_mpv30.menu.UploadSpeed.460800.upload.speed=460800
+dydk1a_mpv30.menu.UploadSpeed.512000.windows=512000
+dydk1a_mpv30.menu.UploadSpeed.512000.upload.speed=512000
+
+dydk1a_mpv30.menu.DebugLevel.none=None
+dydk1a_mpv30.menu.DebugLevel.none.build.code_debug=0
+dydk1a_mpv30.menu.DebugLevel.error=Error
+dydk1a_mpv30.menu.DebugLevel.error.build.code_debug=1
+dydk1a_mpv30.menu.DebugLevel.warn=Warn
+dydk1a_mpv30.menu.DebugLevel.warn.build.code_debug=2
+dydk1a_mpv30.menu.DebugLevel.info=Info
+dydk1a_mpv30.menu.DebugLevel.info.build.code_debug=3
+dydk1a_mpv30.menu.DebugLevel.debug=Debug
+dydk1a_mpv30.menu.DebugLevel.debug.build.code_debug=4
+dydk1a_mpv30.menu.DebugLevel.verbose=Verbose
+dydk1a_mpv30.menu.DebugLevel.verbose.build.code_debug=5
+
+dydk1a_mpv30.menu.EraseFlash.none=Disabled
+dydk1a_mpv30.menu.EraseFlash.none.upload.erase_cmd=
+dydk1a_mpv30.menu.EraseFlash.all=Enabled
+dydk1a_mpv30.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 dym_mpv10.name=Deneyap Mini
 
 dym_mpv10.vid.0=0x303a

cores/esp32/Arduino.h

@@ -110,13 +110,13 @@
 #define analogInPinToBit(P)         (P)
 #if SOC_GPIO_PIN_COUNT <= 32
 #define digitalPinToPort(pin)       (0)
-#define digitalPinToBitMask(pin)    (1UL << (pin))
+#define digitalPinToBitMask(pin)    (1UL << digitalPinToGPIONumber(pin))
 #define portOutputRegister(port)    ((volatile uint32_t*)GPIO_OUT_REG)
 #define portInputRegister(port)     ((volatile uint32_t*)GPIO_IN_REG)
 #define portModeRegister(port)      ((volatile uint32_t*)GPIO_ENABLE_REG)
 #elif SOC_GPIO_PIN_COUNT <= 64
-#define digitalPinToPort(pin)       (((pin)>31)?1:0)
-#define digitalPinToBitMask(pin)    (1UL << (((pin)>31)?((pin)-32):(pin)))
+#define digitalPinToPort(pin)       ((digitalPinToGPIONumber(pin)>31)?1:0)
+#define digitalPinToBitMask(pin)    (1UL << (digitalPinToGPIONumber(pin)&31))
 #define portOutputRegister(port)    ((volatile uint32_t*)((port)?GPIO_OUT1_REG:GPIO_OUT_REG))
 #define portInputRegister(port)     ((volatile uint32_t*)((port)?GPIO_IN1_REG:GPIO_IN_REG))
 #define portModeRegister(port)      ((volatile uint32_t*)((port)?GPIO_ENABLE1_REG:GPIO_ENABLE_REG))
@@ -129,6 +129,18 @@
 #define NOT_AN_INTERRUPT -1
 #define NOT_ON_TIMER 0
 
+// some defines generic for all SoC moved from variants/board_name/pins_arduino.h
+#define NUM_DIGITAL_PINS        SOC_GPIO_PIN_COUNT // All GPIOs
+#if SOC_ADC_PERIPH_NUM == 1
+#define NUM_ANALOG_INPUTS       (SOC_ADC_CHANNEL_NUM(0))
+#elif SOC_ADC_PERIPH_NUM == 2
+#define NUM_ANALOG_INPUTS       (SOC_ADC_CHANNEL_NUM(0)+SOC_ADC_CHANNEL_NUM(1))
+#endif
+#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS  // All GPIOs
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    ((((uint8_t)digitalPinToGPIONumber(p))<NUM_DIGITAL_PINS)?digitalPinToGPIONumber(p):NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)         (((uint8_t)digitalPinToGPIONumber(p))<NUM_DIGITAL_PINS)
+
 typedef bool boolean;
 typedef uint8_t byte;
 typedef unsigned int word;
@@ -220,5 +232,6 @@ void noTone(uint8_t _pin);
 #endif /* __cplusplus */
 
 #include "pins_arduino.h"
+#include "io_pin_remap.h"
 
 #endif /* _ESP32_CORE_ARDUINO_H_ */

cores/esp32/Esp.cpp

@@ -119,7 +119,7 @@ unsigned long long operator"" _GB(unsigned long long x)
 
 EspClass ESP;
 
-void EspClass::deepSleep(uint32_t time_us)
+void EspClass::deepSleep(uint64_t time_us)
 {
     esp_deep_sleep(time_us);
 }
@@ -240,6 +240,10 @@ String EspClass::getSketchMD5()
         md5.add(buf.get(), readBytes);
         lengthLeft -= readBytes;
         offset += readBytes;
+
+        #if CONFIG_FREERTOS_UNICORE
+        delay(1);  // Fix solo WDT
+        #endif
     }
     md5.calculate();
     result = md5.toString();

cores/esp32/Esp.h

@@ -83,7 +83,7 @@ class EspClass
     inline uint32_t getCycleCount() __attribute__((always_inline));
     const char * getSdkVersion();
 
-    void deepSleep(uint32_t time_us);
+    void deepSleep(uint64_t time_us);
 
     uint32_t getFlashChipSize();
     uint32_t getFlashChipSpeed();

cores/esp32/FunctionalInterrupt.cpp

@@ -28,7 +28,7 @@ void ARDUINO_ISR_ATTR interruptFunctional(void* arg)
 void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
 {
 	// use the local interrupt routine which takes the ArgStructure as argument
-	__attachInterruptFunctionalArg (pin, (voidFuncPtrArg)interruptFunctional, new InterruptArgStructure{intRoutine}, mode, true);
+	__attachInterruptFunctionalArg (digitalPinToGPIONumber(pin), (voidFuncPtrArg)interruptFunctional, new InterruptArgStructure{intRoutine}, mode, true);
 }
 
 extern "C"

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_ */