Merge pull request #11527 from Jason2866/patch-4

Use Berry as default
This commit is contained in:
Theo Arends 2021-03-31 13:20:46 +02:00 committed by GitHub
commit c096a032b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -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

View File

@ -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
@ -60,8 +61,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 +95,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
@ -148,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