Skip to content

Commit

Permalink
added ESPIDF manifest
Browse files Browse the repository at this point in the history
- added ESPIDF manifest to include needed components (LittleFS and Arduino)
- modified filesystem size
- reconfigured default to LittleFS
  • Loading branch information
Paciente8159 committed Oct 30, 2023
1 parent e0e1447 commit bcb4cc4
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 20 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,9 @@ windows/uCNCgui/obj/Debug/net6.0-windows/uCNCgui.GeneratedMSBuildEditorConfig.ed

#PlatformIO
.pio

#ESPIDF
managed_components
sdkconfig.*
dependencies.lock
!sdkconfig.defaults
16 changes: 15 additions & 1 deletion dependencies.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
dependencies:
arduino:
component_hash: e15adfd50cfde0e89cab8ba0e2fc54cc0b31e9357acd27d4a3e833165889d126
source:
git: https://github.com/espressif/arduino-esp32.git
path: .
type: git
version: 3670e2bf2aca822f2e1225fdb0e0796e490005a8
esp_littlefs:
component_hash: b41b1c9d4a7237094d0d1d4518db4662e27c4c14450f49f79a665f4d6d0135a3
source:
git: https://github.com/joltwallet/esp_littlefs.git
path: .
type: git
version: b671069b1e9e279f357736e7b51402f46e39d1b5
idf:
component_hash: null
source:
type: idf
version: 4.4.4
manifest_hash: dcf4d39b94252de130019eadceb989d72b0dbc26b552cfdcbb50f6da531d2b92
manifest_hash: 9405d477551dd21ee290cffa71b99487cbfd561ba2fcba3520158d376ddb3778
target: esp32
version: 1.0.0
3 changes: 1 addition & 2 deletions min_spiffs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x1E0000,
app1, app, ota_1, 0x1F0000,0x1E0000,
spiffs, data, spiffs, 0x3D0000,0x20000,
coredump, data, coredump,0x3F0000,0x10000,
spiffs, data, spiffs, 0x3D0000,0x30000,
6 changes: 3 additions & 3 deletions sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
CONFIG_PARTITION_TABLE_SINGLE_APP=y
# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
# CONFIG_PARTITION_TABLE_TWO_OTA is not set
# CONFIG_PARTITION_TABLE_CUSTOM is not set
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_coredump.csv"
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="min_spiffs.csv"
CONFIG_PARTITION_TABLE_FILENAME="min_spiffs.csv"
CONFIG_PARTITION_TABLE_OFFSET=0x8000
CONFIG_PARTITION_TABLE_MD5=y
# end of Partition Table
Expand Down
57 changes: 57 additions & 0 deletions uCNC/idf_component.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
dependencies:
# Required IDF version
idf: ">=4.4"

esp_littlefs:
git: https://github.com/joltwallet/esp_littlefs.git

arduino:
version: 2.0.9
git: https://github.com/espressif/arduino-esp32.git

# arduino:
# version: "^2.0.9"
# git: https://github.com/espressif/arduino-esp32.git

# nghttp: "^1.50.0"
# esp_jpeg: "^1.0.4"
# esp-dsp: "^1.2.0"
# esp-sr: "^1.0.3"
# esp32-camera: "^2.0.3"
# esp-dl:
# git: https://github.com/espressif/esp-dl.git
# arduino:
# path: components/arduino

# # Defining a dependency from the registry:
# # https://components.espressif.com/component/example/cmp
# example/cmp: "^3.3.3" # Automatically update minor releases
#
# # Other ways to define dependencies
#
# # For components maintained by Espressif only name can be used.
# # Same as `espressif/cmp`
# component: "~1.0.0" # Automatically update bugfix releases
#
# # Or in a longer form with extra parameters
# component2:
# version: ">=2.0.0"
#
# # For transient dependencies `public` flag can be set.
# # `public` flag doesn't have an effect for the `main` component.
# # All dependencies of `main` are public by default.
# public: true
#
# # For components hosted on non-default registry:
# service_url: "https://componentregistry.company.com"
#
# # For components in git repository:
# test_component:
# path: test_component
# git: ssh://[email protected]/user/components.git
#
# # For test projects during component development
# # components can be used from a local directory
# # with relative or absolute path
# some_local_component:
# path: ../../projects/component
18 changes: 5 additions & 13 deletions uCNC/src/hal/boards/esp32/esp32.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ board_build.f_cpu = 240000000L
board_build.partitions = min_spiffs.csv
monitor_filters=esp32_exception_decoder
upload_speed = 921600
lib_deps = SPI, Wire, Wifi, WebServer, HTTPUpdatedServer, BluetoothSerial
board_build.filesystem = littlefs
lib_deps = SPI, Wire, Wifi, WebServer, HTTPUpdatedServer, BluetoothSerial, LittleFS

##################
# Arduino builds #
Expand All @@ -22,21 +23,15 @@ lib_deps = SPI, Wire, Wifi, WebServer, HTTPUpdatedServer, BluetoothSerial
[env:ESP32-Wemos-D1-R32]
extends = common_esp32
board = wemos_d1_uno32
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_WEMOS_D1_R32 -DMCU_FLASH_FS=1
board_build.filesystem = littlefs
lib_deps = ${common_esp32.lib_deps}, LittleFS
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_WEMOS_D1_R32

[env:ESP32-MKS-DLC32]
extends = common_esp32
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_DLC32 -DMCU_FLASH_FS=1
board_build.filesystem = littlefs
lib_deps = ${common_esp32.lib_deps}, LittleFS
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_DLC32

[env:ESP32-MKS-TINYBEE]
extends = common_esp32
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_TINYBEE -DMCU_FLASH_FS=1
board_build.filesystem = littlefs
lib_deps = ${common_esp32.lib_deps}, LittleFS
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_TINYBEE

#################
# ESPIDF builds #
Expand All @@ -47,16 +42,13 @@ extends = common_esp32
framework = arduino, espidf
board = wemos_d1_uno32
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_WEMOS_D1_R32
lib_deps = ${common_esp32.lib_deps}, SPIFFS

[env:ESP32IDF-MKS-DLC32]
extends = common_esp32
framework = arduino, espidf
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_DLC32
lib_deps = ${common_esp32.lib_deps}, SPIFFS

[env:ESP32IDF-MKS-TINYBEE]
extends = common_esp32
framework = arduino, espidf
build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_TINYBEE
lib_deps = ${common_esp32.lib_deps}, SPIFFS
2 changes: 1 addition & 1 deletion uCNC/src/hal/mcus/esp32/esp32_arduino.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ extern "C"
#define MCU_FLASH_FS_SPIFFS 2

#ifndef MCU_FLASH_FS
#define MCU_FLASH_FS MCU_FLASH_FS_SPIFFS
#define MCU_FLASH_FS MCU_FLASH_FS_LITTLE_FS
#endif

#if (MCU_FLASH_FS == MCU_FLASH_FS_LITTLE_FS)
Expand Down

0 comments on commit bcb4cc4

Please sign in to comment.