From 798776ae2fa754854e05310f13502ab2689b19ed Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 31 Mar 2021 12:49:16 +0200
Subject: [PATCH 1/3] Use Berry as default

---
 tasmota/my_user_config.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 0972b6d4f..60da2294c 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -908,6 +908,8 @@
 //#define USE_IBEACON_ESP32
 //#define USE_WEBCAM                               // Add support for webcam
 
+#define USE_BERRY                                // Enable Berry scripting language
+
 #define USE_CSE7761                              // Add support for CSE7761 Energy monitor as used in Sonoff Dual R3
 
 #endif  // ESP32

From a1ffd8f57ad97d1b1f5e637e1d6ac52526c72173 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 31 Mar 2021 12:55:37 +0200
Subject: [PATCH 2/3] Enable PSRAM for Berry

Berry is enabled in `my_user_config.h` by default.
---
 tasmota/tasmota_configurations_ESP32.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index fea1429e1..86c44b038 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -60,8 +60,9 @@
 #define USE_SDCARD
   #define GUI_TRASH_FILE
 
-#define USE_BERRY                                // Enable Berry scripting language
+#ifdef USE_BERRY                                 // Berry scripting language
   #define USE_BERRY_PSRAM                        // Allocate Berry memory in PSRAM if PSRAM is connected - this might be slightly slower but leaves main memory intact
+#endif
 
 #define USE_ADC
 #define USE_SPI
@@ -93,8 +94,9 @@
 #define USE_SDCARD
   #define GUI_TRASH_FILE
 
-#define USE_BERRY                                // Enable Berry scripting language
+#ifdef USE_BERRY                                 // Berry scripting language
   #define USE_BERRY_PSRAM                        // Allocate Berry memory in PSRAM if PSRAM is connected - this might be slightly slower but leaves main memory intact
+#endif
 
 #define USE_I2C
   #define USE_BMA423

From d540d5aaf6ec71c675b498686829f9777ed7d6ed Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 31 Mar 2021 13:00:07 +0200
Subject: [PATCH 3/3] Disable Berry

for Webcam and Bluetooth builds
---
 tasmota/tasmota_configurations_ESP32.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 86c44b038..b4ccdde12 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -37,6 +37,7 @@
 #define USE_SDCARD
   #define GUI_TRASH_FILE
 #define USE_SPI
+#undef USE_BERRY                                 // Disable Berry scripting language
 #undef  USE_MI_ESP32                             // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
 #endif  // FIRMWARE_WEBCAM
 
@@ -150,6 +151,7 @@
 #define USE_SDCARD
   #define GUI_TRASH_FILE
 #define USE_ADC
+#undef USE_BERRY                                 // Disable Berry scripting language
 #define USE_BLE_ESP32                            // Enable new BLE driver
 #define USE_MI_ESP32                             // (ESP32 only) Add support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
 #endif  // FIRMWARE_BLUETOOTH