Add Wrover Support and Option to enable SPIRAM

boards.txt

@@ -4,6 +4,7 @@ menu.FlashMode=Flash Mode
 menu.FlashSize=Flash Size
 menu.PartitionScheme=Partition Scheme
 menu.DebugLevel=Core Debug Level
+menu.PSRAM=PSRAM
 
 ##############################################################
 
@@ -28,6 +29,12 @@ esp32.build.flash_freq=40m
 esp32.build.flash_mode=dio
 esp32.build.boot=dio
 esp32.build.partitions=default
+esp32.build.defines=
+
+esp32.menu.PSRAM.disabled=Disabled
+esp32.menu.PSRAM.disabled.build.defines=
+esp32.menu.PSRAM.enabled=Enabled
+esp32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
 
 esp32.menu.PartitionScheme.default=Default
 esp32.menu.PartitionScheme.default.build.partitions=default
@@ -94,6 +101,88 @@ esp32.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+esp32wrover.name=ESP32 Wrover Module
+
+esp32wrover.upload.tool=esptool
+esp32wrover.upload.maximum_size=1310720
+esp32wrover.upload.maximum_data_size=327680
+esp32wrover.upload.wait_for_upload_port=true
+
+esp32wrover.serial.disableDTR=true
+esp32wrover.serial.disableRTS=true
+
+esp32wrover.build.mcu=esp32
+esp32wrover.build.core=esp32
+esp32wrover.build.variant=esp32
+esp32wrover.build.board=ESP32_DEV
+
+esp32wrover.build.f_cpu=240000000L
+esp32wrover.build.flash_size=4MB
+esp32wrover.build.flash_freq=40m
+esp32wrover.build.flash_mode=dio
+esp32wrover.build.boot=dio
+esp32wrover.build.partitions=default
+esp32wrover.build.defines=-DBOARD_HAS_PSRAM
+
+esp32wrover.menu.PartitionScheme.default=Default
+esp32wrover.menu.PartitionScheme.default.build.partitions=default
+esp32wrover.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
+esp32wrover.menu.PartitionScheme.minimal.build.partitions=minimal
+esp32wrover.menu.PartitionScheme.no_ota=No OTA (Large APP)
+esp32wrover.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32wrover.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32wrover.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+esp32wrover.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32wrover.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+esp32wrover.menu.FlashMode.qio=QIO
+esp32wrover.menu.FlashMode.qio.build.flash_mode=dio
+esp32wrover.menu.FlashMode.qio.build.boot=qio
+esp32wrover.menu.FlashMode.dio=DIO
+esp32wrover.menu.FlashMode.dio.build.flash_mode=dio
+esp32wrover.menu.FlashMode.dio.build.boot=dio
+esp32wrover.menu.FlashMode.qout=QOUT
+esp32wrover.menu.FlashMode.qout.build.flash_mode=dout
+esp32wrover.menu.FlashMode.qout.build.boot=qout
+esp32wrover.menu.FlashMode.dout=DOUT
+esp32wrover.menu.FlashMode.dout.build.flash_mode=dout
+esp32wrover.menu.FlashMode.dout.build.boot=dout
+
+esp32wrover.menu.FlashFreq.80=80MHz
+esp32wrover.menu.FlashFreq.80.build.flash_freq=80m
+esp32wrover.menu.FlashFreq.40=40MHz
+esp32wrover.menu.FlashFreq.40.build.flash_freq=40m
+
+esp32wrover.menu.UploadSpeed.921600=921600
+esp32wrover.menu.UploadSpeed.921600.upload.speed=921600
+esp32wrover.menu.UploadSpeed.115200=115200
+esp32wrover.menu.UploadSpeed.115200.upload.speed=115200
+esp32wrover.menu.UploadSpeed.256000.windows=256000
+esp32wrover.menu.UploadSpeed.256000.upload.speed=256000
+esp32wrover.menu.UploadSpeed.230400.windows.upload.speed=256000
+esp32wrover.menu.UploadSpeed.230400=230400
+esp32wrover.menu.UploadSpeed.230400.upload.speed=230400
+esp32wrover.menu.UploadSpeed.460800.linux=460800
+esp32wrover.menu.UploadSpeed.460800.macosx=460800
+esp32wrover.menu.UploadSpeed.460800.upload.speed=460800
+esp32wrover.menu.UploadSpeed.512000.windows=512000
+esp32wrover.menu.UploadSpeed.512000.upload.speed=512000
+
+esp32wrover.menu.DebugLevel.none=None
+esp32wrover.menu.DebugLevel.none.build.code_debug=0
+esp32wrover.menu.DebugLevel.error=Error
+esp32wrover.menu.DebugLevel.error.build.code_debug=1
+esp32wrover.menu.DebugLevel.warn=Warn
+esp32wrover.menu.DebugLevel.warn.build.code_debug=2
+esp32wrover.menu.DebugLevel.info=Info
+esp32wrover.menu.DebugLevel.info.build.code_debug=3
+esp32wrover.menu.DebugLevel.debug=Debug
+esp32wrover.menu.DebugLevel.debug.build.code_debug=4
+esp32wrover.menu.DebugLevel.verbose=Verbose
+esp32wrover.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 pico32.name=ESP32 Pico Kit
 
 pico32.upload.tool=esptool
@@ -115,6 +204,7 @@ pico32.build.flash_freq=80m
 pico32.build.flash_mode=dio
 pico32.build.boot=dio
 pico32.build.partitions=default
+pico32.build.defines=
 
 pico32.menu.UploadSpeed.921600=921600
 pico32.menu.UploadSpeed.921600.upload.speed=921600
@@ -166,6 +256,7 @@ esp32thing.build.flash_mode=dio
 esp32thing.build.flash_size=4MB
 esp32thing.build.boot=dio
 esp32thing.build.partitions=default
+esp32thing.build.defines=
 
 esp32thing.menu.FlashFreq.80=80MHz
 esp32thing.menu.FlashFreq.80.build.flash_freq=80m
@@ -209,6 +300,7 @@ nina_w10.build.partitions=minimal
 nina_w10.build.flash_mode=dio
 nina_w10.build.flash_size=2MB
 nina_w10.build.flash_freq=40m
+nina_w10.build.defines=
 
 nina_w10.menu.UploadSpeed.921600=921600
 nina_w10.menu.UploadSpeed.921600.upload.speed=921600
@@ -247,6 +339,7 @@ widora-air.build.flash_mode=dio
 widora-air.build.flash_size=16MB
 widora-air.build.boot=dio
 widora-air.build.partitions=default
+widora-air.build.defines=
 
 widora-air.menu.FlashFreq.80=80MHz
 widora-air.menu.FlashFreq.80.build.flash_freq=80m
@@ -290,6 +383,7 @@ esp320.build.flash_mode=qio
 esp320.build.flash_size=4MB
 esp320.build.boot=dio
 esp320.build.partitions=default
+esp320.build.defines=
 
 esp320.menu.FlashFreq.80=80MHz
 esp320.menu.FlashFreq.80.build.flash_freq=80m
@@ -333,6 +427,7 @@ nano32.build.flash_mode=dio
 nano32.build.flash_size=4MB
 nano32.build.boot=dio
 nano32.build.partitions=default
+nano32.build.defines=
 
 nano32.menu.FlashFreq.80=80MHz
 nano32.menu.FlashFreq.80.build.flash_freq=80m
@@ -376,6 +471,7 @@ lolin32.build.flash_mode=dio
 lolin32.build.flash_size=4MB
 lolin32.build.boot=dio
 lolin32.build.partitions=default
+lolin32.build.defines=
 
 lolin32.menu.FlashFreq.80=80MHz
 lolin32.menu.FlashFreq.80.build.flash_freq=80m
@@ -428,6 +524,7 @@ pocket_32.build.flash_mode=dio
 pocket_32.build.flash_size=4MB
 pocket_32.build.boot=dio
 pocket_32.build.partitions=default
+pocket_32.build.defines=
 
 pocket_32.menu.FlashFreq.80=80MHz
 pocket_32.menu.FlashFreq.80.build.flash_freq=80m
@@ -471,6 +568,7 @@ WeMosBat.build.flash_mode=dio
 WeMosBat.build.flash_size=4MB
 WeMosBat.build.boot=dio
 WeMosBat.build.partitions=default
+WeMosBat.build.defines=
 
 WeMosBat.menu.FlashFreq.80=80MHz
 WeMosBat.menu.FlashFreq.80.build.flash_freq=80m
@@ -527,6 +625,7 @@ espea32.build.flash_mode=dio
 espea32.build.flash_size=4MB
 espea32.build.boot=dio
 espea32.build.partitions=default
+espea32.build.defines=
 
 espea32.menu.FlashFreq.80=80MHz
 espea32.menu.FlashFreq.80.build.flash_freq=80m
@@ -570,6 +669,7 @@ quantum.build.flash_mode=qio
 quantum.build.flash_size=16MB
 quantum.build.boot=dio
 quantum.build.partitions=default
+quantum.build.defines=
 
 quantum.menu.FlashFreq.80=80MHz
 quantum.menu.FlashFreq.80.build.flash_freq=80m
@@ -613,6 +713,7 @@ node32s.build.flash_mode=dio
 node32s.build.flash_size=4MB
 node32s.build.boot=dio
 node32s.build.partitions=default
+node32s.build.defines=
 
 node32s.menu.FlashFreq.80=80MHz
 node32s.menu.FlashFreq.80.build.flash_freq=80m
@@ -656,6 +757,7 @@ hornbill32dev.build.flash_mode=dio
 hornbill32dev.build.flash_size=4MB
 hornbill32dev.build.boot=dio
 hornbill32dev.build.partitions=default
+hornbill32dev.build.defines=
 
 hornbill32dev.menu.FlashFreq.80=80MHz
 hornbill32dev.menu.FlashFreq.80.build.flash_freq=80m
@@ -698,6 +800,7 @@ hornbill32minima.build.flash_mode=dio
 hornbill32minima.build.flash_size=4MB
 hornbill32minima.build.boot=dio
 hornbill32minima.build.partitions=default
+hornbill32minima.build.defines=
 
 hornbill32minima.menu.FlashFreq.80=80MHz
 hornbill32minima.menu.FlashFreq.80.build.flash_freq=80m
@@ -741,6 +844,7 @@ firebeetle32.build.flash_mode=dio
 firebeetle32.build.flash_size=4MB
 firebeetle32.build.boot=dio
 firebeetle32.build.partitions=default
+firebeetle32.build.defines=
 
 firebeetle32.menu.FlashFreq.80=80MHz
 firebeetle32.menu.FlashFreq.80.build.flash_freq=80m
@@ -784,6 +888,7 @@ intorobot-fig.build.flash_mode=dio
 intorobot-fig.build.flash_size=4MB
 intorobot-fig.build.boot=dio
 intorobot-fig.build.partitions=default
+intorobot-fig.build.defines=
 
 intorobot-fig.menu.FlashFreq.80=80MHz
 intorobot-fig.menu.FlashFreq.80.build.flash_freq=80m
@@ -827,6 +932,7 @@ onehorse32dev.build.flash_mode=dout
 onehorse32dev.build.flash_size=4MB
 onehorse32dev.build.boot=dio
 onehorse32dev.build.partitions=default
+onehorse32dev.build.defines=
 
 onehorse32dev.menu.FlashFreq.80=80MHz
 onehorse32dev.menu.FlashFreq.80.build.flash_freq=80m
@@ -870,6 +976,7 @@ featheresp32.build.flash_mode=dio
 featheresp32.build.flash_size=4MB
 featheresp32.build.boot=dio
 featheresp32.build.partitions=default
+featheresp32.build.defines=
 
 featheresp32.menu.FlashFreq.80=80MHz
 featheresp32.menu.FlashFreq.80.build.flash_freq=80m
@@ -926,6 +1033,7 @@ nodemcu-32s.build.flash_mode=dio
 nodemcu-32s.build.flash_size=4MB
 nodemcu-32s.build.boot=dio
 nodemcu-32s.build.partitions=default
+nodemcu-32s.build.defines=
 
 nodemcu-32s.menu.FlashFreq.80=80MHz
 nodemcu-32s.menu.FlashFreq.80.build.flash_freq=80m
@@ -969,6 +1077,7 @@ mhetesp32devkit.build.flash_mode=dio
 mhetesp32devkit.build.flash_size=4MB
 mhetesp32devkit.build.boot=dio
 mhetesp32devkit.build.partitions=default
+mhetesp32devkit.build.defines=
 
 mhetesp32devkit.menu.FlashFreq.80=80MHz
 mhetesp32devkit.menu.FlashFreq.80.build.flash_freq=80m
@@ -1034,6 +1143,7 @@ mhetesp32minikit.build.flash_mode=dio
 mhetesp32minikit.build.flash_size=4MB
 mhetesp32minikit.build.boot=dio
 mhetesp32minikit.build.partitions=default
+mhetesp32minikit.build.defines=
 
 mhetesp32minikit.menu.FlashFreq.80=80MHz
 mhetesp32minikit.menu.FlashFreq.80.build.flash_freq=80m
@@ -1099,6 +1209,7 @@ esp32vn-iot-uno.build.flash_mode=dio
 esp32vn-iot-uno.build.flash_size=4MB
 esp32vn-iot-uno.build.boot=dio
 esp32vn-iot-uno.build.partitions=default
+esp32vn-iot-uno.build.defines=
 
 esp32vn-iot-uno.menu.FlashFreq.80=80MHz
 esp32vn-iot-uno.menu.FlashFreq.80.build.flash_freq=80m
@@ -1142,6 +1253,7 @@ esp32doit-devkit-v1.build.flash_mode=dio
 esp32doit-devkit-v1.build.flash_size=4MB
 esp32doit-devkit-v1.build.boot=dio
 esp32doit-devkit-v1.build.partitions=default
+esp32doit-devkit-v1.build.defines=
 
 esp32doit-devkit-v1.menu.FlashFreq.80=80MHz
 esp32doit-devkit-v1.menu.FlashFreq.80.build.flash_freq=80m
@@ -1196,6 +1308,7 @@ esp32-evb.build.flash_mode=dio
 esp32-evb.build.flash_size=4MB
 esp32-evb.build.boot=dio
 esp32-evb.build.partitions=default
+esp32-evb.build.defines=
 
 esp32-evb.menu.FlashFreq.80=80MHz
 esp32-evb.menu.FlashFreq.80.build.flash_freq=80m
@@ -1228,6 +1341,7 @@ esp32-gateway.build.flash_mode=dio
 esp32-gateway.build.flash_size=4MB
 esp32-gateway.build.boot=dio
 esp32-gateway.build.partitions=default
+esp32-gateway.build.defines=
 
 esp32-gateway.menu.FlashFreq.80=80MHz
 esp32-gateway.menu.FlashFreq.80.build.flash_freq=80m
@@ -1260,6 +1374,7 @@ espino32.build.flash_mode=dio
 espino32.build.flash_size=4MB
 espino32.build.boot=dio
 espino32.build.partitions=default
+espino32.build.defines=
 
 espino32.menu.FlashFreq.80=80MHz
 espino32.menu.FlashFreq.80.build.flash_freq=80m
@@ -1303,6 +1418,7 @@ m5stack-core-esp32.build.flash_size=4MB
 m5stack-core-esp32.build.flash_mode=dio
 m5stack-core-esp32.build.boot=dio
 m5stack-core-esp32.build.partitions=default
+m5stack-core-esp32.build.defines=
 
 m5stack-core-esp32.menu.FlashMode.qio=QIO
 m5stack-core-esp32.menu.FlashMode.qio.build.flash_mode=dio
@@ -1381,6 +1497,7 @@ odroid_esp32.build.flash_size=16MB
 odroid_esp32.build.flash_mode=dio
 odroid_esp32.build.boot=dio
 odroid_esp32.build.partitions=default
+odroid_esp32.build.defines=
 
 odroid_esp32.menu.FlashMode.qio=QIO
 odroid_esp32.menu.FlashMode.qio.build.flash_mode=dio
@@ -1459,6 +1576,7 @@ heltec_wifi_kit_32.build.flash_mode=dio
 heltec_wifi_kit_32.build.flash_size=4MB
 heltec_wifi_kit_32.build.boot=dio
 heltec_wifi_kit_32.build.partitions=default
+heltec_wifi_kit_32.build.defines=
 
 heltec_wifi_kit_32.menu.FlashFreq.80=80MHz
 heltec_wifi_kit_32.menu.FlashFreq.80.build.flash_freq=80m
@@ -1502,6 +1620,7 @@ heltec_wifi_lora_32.build.flash_mode=dio
 heltec_wifi_lora_32.build.flash_size=4MB
 heltec_wifi_lora_32.build.boot=dio
 heltec_wifi_lora_32.build.partitions=default
+heltec_wifi_lora_32.build.defines=
 
 heltec_wifi_lora_32.menu.FlashFreq.80=80MHz
 heltec_wifi_lora_32.menu.FlashFreq.80.build.flash_freq=80m
@@ -1545,6 +1664,7 @@ espectro32.build.flash_size=4MB
 espectro32.build.flash_mode=dio
 espectro32.build.boot=dio
 espectro32.build.partitions=default
+espectro32.build.defines=
 
 espectro32.menu.FlashMode.qio=QIO
 espectro32.menu.FlashMode.qio.build.flash_mode=dio
@@ -1620,6 +1740,7 @@ CoreESP32.build.flash_mode=dio
 CoreESP32.build.flash_size=4MB
 CoreESP32.build.boot=dio
 CoreESP32.build.partitions=default
+CoreESP32.build.defines=
 
 CoreESP32.menu.FlashFreq.80=80MHz
 CoreESP32.menu.FlashFreq.80.build.flash_freq=80m
@@ -1663,6 +1784,7 @@ wipy3.build.flash_mode=dio
 wipy3.build.flash_size=8MB
 wipy3.build.boot=dio
 wipy3.build.partitions=default
+wipy3.build.defines=
 
 wipy3.menu.FlashFreq.80=80MHz
 wipy3.menu.FlashFreq.80.build.flash_freq=80m

cores/esp32/esp32-hal-misc.c

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "esp32-hal.h"
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -24,6 +23,7 @@
 #include "esp_timer.h"
 #include "esp_bt.h"
 #include <sys/time.h>
+#include "esp32-hal.h"
 
 //Undocumented!!! Get chip temperature in Farenheit
 //Source: https://github.com/pcbreflux/espressif/blob/master/esp32/arduino/sketchbook/ESP32_int_temp_sensor/ESP32_int_temp_sensor.ino

cores/esp32/esp32-hal-psram.c

 
 #include "esp32-hal.h"
-#include "sdkconfig.h"
 
 #if CONFIG_SPIRAM_SUPPORT
 #include "esp_spiram.h"

cores/esp32/esp32-hal-psram.h

@@ -15,6 +15,10 @@
 #ifndef _ESP32_HAL_PSRAM_H_
 #define _ESP32_HAL_PSRAM_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool psramInit();
 bool psramFound();
 
@@ -22,4 +26,8 @@ void *ps_malloc(size_t size);
 void *ps_calloc(size_t n, size_t size);
 void *ps_realloc(void *ptr, size_t size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ESP32_HAL_PSRAM_H_ */

cores/esp32/esp32-hal.h

@@ -33,6 +33,7 @@ extern "C" {
 #include <string.h>
 #include <math.h>
 #include "sdkconfig.h"
+#include "esp_system.h"
 
 #ifndef F_CPU
 #define F_CPU (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000U)
@@ -60,7 +61,12 @@ void yield(void);
 #include "esp32-hal-timer.h"
 #include "esp32-hal-bt.h"
 #include "esp32-hal-psram.h"
-#include "esp_system.h"
+
+#ifndef BOARD_HAS_PSRAM
+#ifdef CONFIG_SPIRAM_SUPPORT
+#undef CONFIG_SPIRAM_SUPPORT
+#endif
+#endif
 
 //returns chip temperature in Celsius
 float temperatureRead();

platform.txt

@@ -49,7 +49,8 @@ build.flash_size=4MB
 build.flash_mode=dio
 build.boot=bootloader
 build.code_debug=0
-build.extra_flags=-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug}
+build.defines=
+build.extra_flags=-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.defines}
 
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags=