Skip to content

Commit 683dbf3

Browse files
pedrominatelpedrominatel
authored
Added ESP32-WROOM-DA module to boards.txt (#6361)
Added dual antenna configuration based on the module selection Added warning to the example on how to use the DA
1 parent c2e5957 commit 683dbf3

File tree

5 files changed

+224
-2
lines changed

5 files changed

+224
-2
lines changed

Diff for: ‎boards.txt

+149
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,155 @@ esp32.menu.DebugLevel.verbose.build.code_debug=5
487487

488488
##############################################################
489489

490+
esp32da.name=ESP32-WROOM-DA Module
491+
492+
esp32da.upload.tool=esptool_py
493+
esp32da.upload.maximum_size=1310720
494+
esp32da.upload.maximum_data_size=327680
495+
esp32da.upload.flags=
496+
esp32da.upload.extra_flags=
497+
498+
esp32da.serial.disableDTR=true
499+
esp32da.serial.disableRTS=true
500+
501+
esp32da.build.tarch=xtensa
502+
esp32da.build.bootloader_addr=0x1000
503+
esp32da.build.target=esp32
504+
esp32da.build.mcu=esp32
505+
esp32da.build.core=esp32
506+
esp32da.build.variant=esp32da
507+
esp32da.build.board=ESP32_WROOM_DA
508+
509+
esp32da.build.f_cpu=240000000L
510+
esp32da.build.flash_size=4MB
511+
esp32da.build.flash_freq=40m
512+
esp32da.build.flash_mode=dio
513+
esp32da.build.boot=dio
514+
esp32da.build.partitions=default
515+
esp32da.build.defines=
516+
esp32da.build.loop_core=
517+
esp32da.build.event_core=
518+
519+
esp32da.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
520+
esp32da.menu.PartitionScheme.default.build.partitions=default
521+
esp32da.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
522+
esp32da.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
523+
esp32da.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
524+
esp32da.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
525+
esp32da.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
526+
esp32da.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
527+
esp32da.menu.PartitionScheme.minimal.build.partitions=minimal
528+
esp32da.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
529+
esp32da.menu.PartitionScheme.no_ota.build.partitions=no_ota
530+
esp32da.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
531+
esp32da.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
532+
esp32da.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
533+
esp32da.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
534+
esp32da.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
535+
esp32da.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
536+
esp32da.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
537+
esp32da.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
538+
esp32da.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
539+
esp32da.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
540+
esp32da.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
541+
esp32da.menu.PartitionScheme.huge_app.build.partitions=huge_app
542+
esp32da.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
543+
esp32da.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
544+
esp32da.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
545+
esp32da.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
546+
esp32da.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
547+
esp32da.menu.PartitionScheme.fatflash.build.partitions=ffat
548+
esp32da.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
549+
esp32da.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
550+
esp32da.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
551+
esp32da.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
552+
esp32da.menu.PartitionScheme.rainmaker=RainMaker
553+
esp32da.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
554+
esp32da.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
555+
556+
esp32da.menu.CPUFreq.240=240MHz (WiFi/BT)
557+
esp32da.menu.CPUFreq.240.build.f_cpu=240000000L
558+
esp32da.menu.CPUFreq.160=160MHz (WiFi/BT)
559+
esp32da.menu.CPUFreq.160.build.f_cpu=160000000L
560+
esp32da.menu.CPUFreq.80=80MHz (WiFi/BT)
561+
esp32da.menu.CPUFreq.80.build.f_cpu=80000000L
562+
esp32da.menu.CPUFreq.40=40MHz (40MHz XTAL)
563+
esp32da.menu.CPUFreq.40.build.f_cpu=40000000L
564+
esp32da.menu.CPUFreq.26=26MHz (26MHz XTAL)
565+
esp32da.menu.CPUFreq.26.build.f_cpu=26000000L
566+
esp32da.menu.CPUFreq.20=20MHz (40MHz XTAL)
567+
esp32da.menu.CPUFreq.20.build.f_cpu=20000000L
568+
esp32da.menu.CPUFreq.13=13MHz (26MHz XTAL)
569+
esp32da.menu.CPUFreq.13.build.f_cpu=13000000L
570+
esp32da.menu.CPUFreq.10=10MHz (40MHz XTAL)
571+
esp32da.menu.CPUFreq.10.build.f_cpu=10000000L
572+
573+
esp32da.menu.FlashMode.qio=QIO
574+
esp32da.menu.FlashMode.qio.build.flash_mode=dio
575+
esp32da.menu.FlashMode.qio.build.boot=qio
576+
esp32da.menu.FlashMode.dio=DIO
577+
esp32da.menu.FlashMode.dio.build.flash_mode=dio
578+
esp32da.menu.FlashMode.dio.build.boot=dio
579+
esp32da.menu.FlashMode.qout=QOUT
580+
esp32da.menu.FlashMode.qout.build.flash_mode=dout
581+
esp32da.menu.FlashMode.qout.build.boot=qout
582+
esp32da.menu.FlashMode.dout=DOUT
583+
esp32da.menu.FlashMode.dout.build.flash_mode=dout
584+
esp32da.menu.FlashMode.dout.build.boot=dout
585+
586+
esp32da.menu.FlashFreq.80=80MHz
587+
esp32da.menu.FlashFreq.80.build.flash_freq=80m
588+
esp32da.menu.FlashFreq.40=40MHz
589+
esp32da.menu.FlashFreq.40.build.flash_freq=40m
590+
591+
esp32da.menu.FlashSize.4M=4MB (32Mb)
592+
esp32da.menu.FlashSize.4M.build.flash_size=4MB
593+
esp32da.menu.FlashSize.8M=8MB (64Mb)
594+
esp32da.menu.FlashSize.8M.build.flash_size=8MB
595+
esp32da.menu.FlashSize.8M.build.partitions=default_8MB
596+
esp32da.menu.FlashSize.16M=16MB (128Mb)
597+
esp32da.menu.FlashSize.16M.build.flash_size=16MB
598+
599+
esp32da.menu.UploadSpeed.921600=921600
600+
esp32da.menu.UploadSpeed.921600.upload.speed=921600
601+
esp32da.menu.UploadSpeed.115200=115200
602+
esp32da.menu.UploadSpeed.115200.upload.speed=115200
603+
esp32da.menu.UploadSpeed.256000.windows=256000
604+
esp32da.menu.UploadSpeed.256000.upload.speed=256000
605+
esp32da.menu.UploadSpeed.230400.windows.upload.speed=256000
606+
esp32da.menu.UploadSpeed.230400=230400
607+
esp32da.menu.UploadSpeed.230400.upload.speed=230400
608+
esp32da.menu.UploadSpeed.460800.linux=460800
609+
esp32da.menu.UploadSpeed.460800.macosx=460800
610+
esp32da.menu.UploadSpeed.460800.upload.speed=460800
611+
esp32da.menu.UploadSpeed.512000.windows=512000
612+
esp32da.menu.UploadSpeed.512000.upload.speed=512000
613+
614+
esp32da.menu.LoopCore.1=Core 1
615+
esp32da.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
616+
esp32da.menu.LoopCore.0=Core 0
617+
esp32da.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
618+
619+
esp32da.menu.EventsCore.1=Core 1
620+
esp32da.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
621+
esp32da.menu.EventsCore.0=Core 0
622+
esp32da.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
623+
624+
esp32da.menu.DebugLevel.none=None
625+
esp32da.menu.DebugLevel.none.build.code_debug=0
626+
esp32da.menu.DebugLevel.error=Error
627+
esp32da.menu.DebugLevel.error.build.code_debug=1
628+
esp32da.menu.DebugLevel.warn=Warn
629+
esp32da.menu.DebugLevel.warn.build.code_debug=2
630+
esp32da.menu.DebugLevel.info=Info
631+
esp32da.menu.DebugLevel.info.build.code_debug=3
632+
esp32da.menu.DebugLevel.debug=Debug
633+
esp32da.menu.DebugLevel.debug.build.code_debug=4
634+
esp32da.menu.DebugLevel.verbose=Verbose
635+
esp32da.menu.DebugLevel.verbose.build.code_debug=5
636+
637+
##############################################################
638+
490639
esp32wrover.name=ESP32 Wrover Module
491640

492641
esp32wrover.upload.tool=esptool_py

Diff for: ‎libraries/WiFi/examples/WiFiScanDualAntenna/WiFiScanDualAntenna.ino

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ void setup()
2424
// Set WiFi to station mode and disconnect from an AP if it was previously connected
2525
WiFi.mode(WIFI_STA);
2626

27-
// Set WiFi dual antenna configuration by passing the GPIO and antenna mode for RX ant TX
27+
/* Attention: This is the manual prodecure for the dual antenna configuration.
28+
* If you choose the ESP32-WROOM-DA module from the Tools -> Board, this configuration
29+
* is not necessary!
30+
*
31+
* Set WiFi dual antenna configuration by passing the GPIO and antenna mode for RX ant TX
32+
*/
2833
err = WiFi.setDualAntennaConfig(GPIO_ANT1, GPIO_ANT1, WIFI_RX_ANT_AUTO, WIFI_TX_ANT_AUTO);
2934

3035
/* For more details on how to use this feature, see our docs:

Diff for: ‎libraries/WiFi/src/WiFiGeneric.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,14 @@ bool WiFiGenericClass::mode(wifi_mode_t m)
10611061
if(!espWiFiStart()){
10621062
return false;
10631063
}
1064+
1065+
#ifdef BOARD_HAS_DUAL_ANTENNA
1066+
if(!setDualAntennaConfig(ANT1, ANT2, WIFI_RX_ANT_AUTO, WIFI_TX_ANT_AUTO)){
1067+
log_e("Dual Antenna Config failed!");
1068+
return false;
1069+
}
1070+
#endif
1071+
10641072
return true;
10651073
}
10661074

Diff for: ‎libraries/WiFi/src/WiFiGeneric.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class WiFiGenericClass
186186

187187
bool initiateFTM(uint8_t frm_count=16, uint16_t burst_period=2, uint8_t channel=1, const uint8_t * mac=NULL);
188188

189-
bool setDualAntennaConfig(uint8_t gpio_ant1, uint8_t gpio_ant2, wifi_rx_ant_t rx_mode, wifi_tx_ant_t tx_mode);
189+
static bool setDualAntennaConfig(uint8_t gpio_ant1, uint8_t gpio_ant2, wifi_rx_ant_t rx_mode, wifi_tx_ant_t tx_mode);
190190

191191
static const char * getHostname();
192192
static bool setHostname(const char * hostname);

Diff for: ‎variants/esp32da/pins_arduino.h

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
static const uint8_t TX = 1;
15+
static const uint8_t RX = 3;
16+
17+
static const uint8_t SDA = 21;
18+
static const uint8_t SCL = 22;
19+
20+
static const uint8_t SS = 5;
21+
static const uint8_t MOSI = 23;
22+
static const uint8_t MISO = 19;
23+
static const uint8_t SCK = 18;
24+
25+
static const uint8_t A0 = 36;
26+
static const uint8_t A3 = 39;
27+
static const uint8_t A4 = 32;
28+
static const uint8_t A5 = 33;
29+
static const uint8_t A6 = 34;
30+
static const uint8_t A7 = 35;
31+
static const uint8_t A10 = 4;
32+
static const uint8_t A11 = 0;
33+
static const uint8_t A12 = 2;
34+
static const uint8_t A13 = 15;
35+
static const uint8_t A14 = 13;
36+
static const uint8_t A15 = 12;
37+
static const uint8_t A16 = 14;
38+
static const uint8_t A17 = 27;
39+
static const uint8_t A18 = 25;
40+
static const uint8_t A19 = 26;
41+
42+
static const uint8_t T0 = 4;
43+
static const uint8_t T1 = 0;
44+
static const uint8_t T2 = 2;
45+
static const uint8_t T3 = 15;
46+
static const uint8_t T4 = 13;
47+
static const uint8_t T5 = 12;
48+
static const uint8_t T6 = 14;
49+
static const uint8_t T7 = 27;
50+
static const uint8_t T8 = 33;
51+
static const uint8_t T9 = 32;
52+
53+
static const uint8_t DAC1 = 25;
54+
static const uint8_t DAC2 = 26;
55+
56+
#define BOARD_HAS_DUAL_ANTENNA
57+
static const uint8_t ANT1 = 2;
58+
static const uint8_t ANT2 = 25;
59+
60+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)