Skip to content
Merged

Dev #2279

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions boards/CYD-2432S028/CYD-2432S028.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/CYD-2432S028>
build_flags =
${env.build_flags}
${env_4mb.build_flags}
-Iboards/CYD-2432S028
-Os

-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
;-DARDUINO_USB_CDC_ON_BOOT=1 ; Used only in ESP32-S3 to make Serial Comands work

-DCYD=1 ;key for new device,
Expand Down Expand Up @@ -162,10 +160,10 @@ build_flags =

lib_deps =
${env.lib_deps}

lib_ignore =
FastLED
ESP8266Audio
ESP8266SAM
${env_4mb.lib_ignore}


[CYD35_base]
board = CYD-2432S028
Expand All @@ -174,11 +172,10 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/CYD-2432S028>
build_flags =
${env.build_flags}
${env_4mb.build_flags}

-Iboards/CYD-2432S028
-Os

-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
;-DARDUINO_USB_CDC_ON_BOOT=1 ; Used only in ESP32-S3 to make Serial Comands work

-DCYD=1 ;key for new device,
Expand Down Expand Up @@ -321,10 +318,10 @@ build_flags =

lib_deps =
${env.lib_deps}

lib_ignore =
FastLED
ESP8266Audio
ESP8266SAM
${env_4mb.lib_ignore}


##################################### CYD MODELS ####################################################
[env:CYD-2432S028]
Expand Down
2 changes: 1 addition & 1 deletion boards/lilygo-t-deck/lilygo-t-deck.ini
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ build_flags =

lib_deps =
${env.lib_deps}
lewisxhe/SensorLib
lewisxhe/SensorLib@0.3.4


[env:lilygo-t-deck]
Expand Down
7 changes: 4 additions & 3 deletions boards/lilygo-t-display-ttgo/lilygo-t-display-s3.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/lilygo-t-display-ttgo>
build_flags =
${env.build_flags}
${env_4mb.build_flags}
-Iboards/lilygo-t-display-ttgo
-Os
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
-DREDRAW_DELAY=1 # Used to improve navigation on menus for this device

-DALLOW_ALL_GPIO_FOR_IR_RF=1 ; Set this option to make use of all GPIOs, from 1 to 44 to be chosen, except TFT and SD pins
Expand All @@ -19,3 +17,6 @@ build_flags =
lib_deps =
${env.lib_deps}
https://github.com/bmorcelli/ESP32_Button

lib_ignore =
${env_4mb.lib_ignore}
2 changes: 1 addition & 1 deletion boards/lilygo-t-lora-pager/lilygo-t-lora-pager.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_flags =
lib_deps =
${env.lib_deps}
lewisxhe/XPowersLib @0.3.0
lewisxhe/SensorLib
lewisxhe/SensorLib@0.3.4
mathertel/RotaryEncoder @1.5.3
adafruit/Adafruit TCA8418 @ ^1.0.2
# renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
Expand Down
2 changes: 1 addition & 1 deletion boards/lilygo-t-watch-s3/lilygo-t-watch-s3.ini
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,4 @@ build_flags =
lib_deps =
${env.lib_deps}
lewisxhe/XPowersLib @0.2.7
https://github.com/lewisxhe/SensorLib
lewisxhe/SensorLib@0.3.4
6 changes: 4 additions & 2 deletions boards/m5stack-core/m5stack-core.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ build_src_filter =${env.build_src_filter} +<../boards/m5stack-core>
build_flags =
${env.build_flags}
-Iboards/m5stack-core
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

;Features Enabled
;FM Radio
Expand Down Expand Up @@ -156,8 +154,12 @@ lib_deps =
[env:m5stack-core4mb]
extends=m5stack-core_base

lib_ignore =
${env_4mb.lib_ignore}

build_flags =
${m5stack-core_base.build_flags}
${env_4mb.build_flags}
-DLITE_VERSION=1 #limits some features to save space for M5Launcher Compatibility


Expand Down
8 changes: 5 additions & 3 deletions boards/m5stack-cplus1_1/m5stack-cplus1_1.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/m5stack-cplus1_1>
build_flags =
${env.build_flags}
${env_4mb.build_flags}

-Iboards/m5stack-cplus1_1
-Os
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

;Features Enabled
;-DLITE_VERSION=1 ;limits some features to save space for M5Launcher Compatibility
Expand Down Expand Up @@ -139,6 +138,9 @@ build_flags =
lib_deps =
${env.lib_deps}

lib_ignore =
${env_4mb.lib_ignore}

[env:LAUNCHER_m5stack-cplus1_1]
extends=env:m5stack-cplus1_1
board_build.partitions = custom_4Mb.csv
Expand Down
16 changes: 10 additions & 6 deletions boards/marauder-mini/marauder-mini.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/marauder-mini>
build_flags =
${env.build_flags}
${env_4mb.build_flags}

-Iboards/marauder-mini
-Os
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

-D MARAUDER_MINI
-DUSER_SETUP_LOADED=1
-DST7735_DRIVER=1
Expand All @@ -44,6 +44,9 @@ build_flags =
lib_deps =
${env.lib_deps}

lib_ignore =
${env_4mb.lib_ignore}

[env:Awok-Mini]
extends = env:Marauder-Mini
board_build.partitions = custom_16Mb.csv
Expand All @@ -56,10 +59,9 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/marauder-mini>
build_flags =
${env.build_flags}
${env_4mb.build_flags}
-Iboards/marauder-mini
-Os
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

-D MARAUDER_MINI
-DUSER_SETUP_LOADED=1
-DILI9341_DRIVER=1
Expand All @@ -82,6 +84,8 @@ build_flags =
lib_deps =
${env.lib_deps}

lib_ignore =
${env_4mb.lib_ignore}

[env:LAUNCHER_Marauder-Mini]
extends=env:Marauder-Mini
Expand Down
8 changes: 5 additions & 3 deletions boards/marauder-touch/marauder-touch.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/marauder-touch>
build_flags =
${env.build_flags}
${env_4mb.build_flags}

-Iboards/marauder-touch
-Os
-DUSE_TFT_eSPI_TOUCH
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

-D SDCARD_CS=12
-D MARAUDER_TOUCH
Expand All @@ -36,6 +35,9 @@ build_flags =
lib_deps =
${env.lib_deps}

lib_ignore =
${env_4mb.lib_ignore}

[env:Marauder-v61]
extends=env:Marauder-V4-V6
build_flags =
Expand Down
8 changes: 4 additions & 4 deletions boards/phantom/phantom.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ board_build.partitions = custom_4Mb_full.csv
build_src_filter =${env.build_src_filter} +<../boards/phantom>
build_flags =
${env.build_flags}
${env_4mb.build_flags}
-Iboards/phantom
-Os
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
;-DARDUINO_USB_CDC_ON_BOOT=1 ; Used only in ESP32-S3 to make Serial Comands work

-DPHANTOM_BOARD=1 ;key for new device,
;mykeyboard.cpp: need map buttons an/or touchscreen and battery status value,
Expand Down Expand Up @@ -171,6 +168,9 @@ build_flags =
lib_deps =
${env.lib_deps}

lib_ignore =
${env_4mb.lib_ignore}


[env:LAUNCHER_Phantom_S024R]
extends = env:Phantom_S024R
Expand Down
4 changes: 2 additions & 2 deletions custom_4Mb_full.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x6000,
app0, app, ota_0, 0x10000, 0x390000,
spiffs, data, spiffs, 0x3A0000,0x60000,
app0, app, ota_0, 0x10000, 0x3C0000,
spiffs, data, spiffs, 0x3D0000,0x30000,
29 changes: 29 additions & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,32 @@ lib_deps =
ESP32Async/AsyncTCP@3.4.10
ESP32Async/ESPAsyncWebServer@3.9.6
;https://github.com/bmorcelli/FastLED

[env_4mb]
extends = env
build_flags =
-Os
-DCORE_DEBUG_LEVEL=0
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
# Restrict IR protocols to save Flash on 4mb devices
-D_IR_ENABLE_DEFAULT_=false
-DDECODE_NEC=true
-DSEND_NEC=true
-DDECODE_SAMSUNG=true
-DSEND_SAMSUNG=true
-DDECODE_RC5=true
-DSEND_RC5=true
-DDECODE_RC6=true
-DSEND_RC6=true
-DDECODE_LG=true
-DSEND_LG=true
-DDECODE_SONY=true
-DSEND_SONY=true
-DSEND_PANASONIC=true
-DDECODE_PANASONIC=true
-DSEND_RAW=true

lib_ignore =
FastLED
ESP8266Audio
ESP8266SAM
1 change: 0 additions & 1 deletion src/modules/ble/BLE_Suite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "fastpair_crypto.h"
#include "modules/NRF24/nrf_jammer_api.h"
#include <SD.h>
#include <TFT_eSPI.h>
#include <esp_heap_caps.h>
#include <globals.h>

Expand Down
2 changes: 1 addition & 1 deletion src/modules/others/mic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,8 @@ bool mic_capture_samples(
.mclk = I2S_GPIO_UNUSED,
.bclk = (gpio_num_t)PIN_CLK,
.ws = (gpio_num_t)PIN_WS,
.din = (gpio_num_t)PIN_DATA,
.dout = I2S_GPIO_UNUSED,
.din = (gpio_num_t)PIN_DATA,
.invert_flags = {.mclk_inv = false, .bclk_inv = false, .ws_inv = false},
},
};
Expand Down
Loading