From 5b654e4d8e72adf8b1d4bfa7fe22e735fb5aba63 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Fri, 23 Jan 2026 02:41:43 +0300 Subject: [PATCH] Update ESP32-Core to 3.3.6 --- .vscode/c_cpp_properties.json | 54 +++++++++++++++++------------------ Makefile | 2 +- docs/usage.md | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 2c3027f..7b42a9b 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -6,19 +6,18 @@ "${workspaceFolder}/flix", "${workspaceFolder}/gazebo", "${workspaceFolder}/tools/**", - "~/.arduino15/packages/esp32/hardware/esp32/3.2.0/cores/esp32", - "~/.arduino15/packages/esp32/hardware/esp32/3.2.0/libraries/**", - "~/.arduino15/packages/esp32/hardware/esp32/3.2.0/variants/d1_mini32", - "~/.arduino15/packages/esp32/tools/esp32-arduino-libs/idf-release_v5.4-2f7dcd86-v1/esp32/**", - "~/.arduino15/packages/esp32/tools/esp32-arduino-libs/idf-release_v5.4-2f7dcd86-v1/esp32/dio_qspi/include", + "~/.arduino15/packages/esp32/hardware/esp32/3.3.6/cores/esp32", + "~/.arduino15/packages/esp32/hardware/esp32/3.3.6/libraries/**", + "~/.arduino15/packages/esp32/hardware/esp32/3.3.6/variants/d1_mini32", + "~/.arduino15/packages/esp32/tools/esp32-libs/3.3.6/include/**", "~/Arduino/libraries/**", "/usr/include/gazebo-11/", "/usr/include/ignition/math6/" ], "forcedInclude": [ "${workspaceFolder}/.vscode/intellisense.h", - "~/.arduino15/packages/esp32/hardware/esp32/3.2.0/cores/esp32/Arduino.h", - "~/.arduino15/packages/esp32/hardware/esp32/3.2.0/variants/d1_mini32/pins_arduino.h", + "~/.arduino15/packages/esp32/hardware/esp32/3.3.6/cores/esp32/Arduino.h", + "~/.arduino15/packages/esp32/hardware/esp32/3.3.6/variants/d1_mini32/pins_arduino.h", "${workspaceFolder}/flix/cli.ino", "${workspaceFolder}/flix/control.ino", "${workspaceFolder}/flix/estimate.ino", @@ -31,9 +30,10 @@ "${workspaceFolder}/flix/rc.ino", "${workspaceFolder}/flix/time.ino", "${workspaceFolder}/flix/wifi.ino", - "${workspaceFolder}/flix/parameters.ino" + "${workspaceFolder}/flix/parameters.ino", + "${workspaceFolder}/flix/safety.ino" ], - "compilerPath": "~/.arduino15/packages/esp32/tools/esp-x32/2411/bin/xtensa-esp32-elf-g++", + "compilerPath": "~/.arduino15/packages/esp32/tools/esp-x32/2511/bin/xtensa-esp32-elf-g++", "cStandard": "c11", "cppStandard": "c++17", "defines": [ @@ -53,19 +53,18 @@ "name": "Mac", "includePath": [ "${workspaceFolder}/flix", - "~/Library/Arduino15/packages/esp32/hardware/esp32/3.2.0/cores/esp32", - "~/Library/Arduino15/packages/esp32/hardware/esp32/3.2.0/libraries/**", - "~/Library/Arduino15/packages/esp32/hardware/esp32/3.2.0/variants/d1_mini32", - "~/Library/Arduino15/packages/esp32/tools/esp32-arduino-libs/idf-release_v5.4-2f7dcd86-v1/esp32/include/**", - "~/Library/Arduino15/packages/esp32/tools/esp32-arduino-libs/idf-release_v5.4-2f7dcd86-v1/esp32/dio_qspi/include", + "~/Library/Arduino15/packages/esp32/hardware/esp32/3.3.6/cores/esp32", + "~/Library/Arduino15/packages/esp32/hardware/esp32/3.3.6/libraries/**", + "~/Library/Arduino15/packages/esp32/hardware/esp32/3.3.6/variants/d1_mini32", + "~/Library/Arduino15/packages/esp32/tools/esp32-libs/3.3.6/include/**", "~/Documents/Arduino/libraries/**", "/opt/homebrew/include/gazebo-11/", "/opt/homebrew/include/ignition/math6/" ], "forcedInclude": [ "${workspaceFolder}/.vscode/intellisense.h", - "~/Library/Arduino15/packages/esp32/hardware/esp32/3.2.0/cores/esp32/Arduino.h", - "~/Library/Arduino15/packages/esp32/hardware/esp32/3.2.0/variants/d1_mini32/pins_arduino.h", + "~/Library/Arduino15/packages/esp32/hardware/esp32/3.3.6/cores/esp32/Arduino.h", + "~/Library/Arduino15/packages/esp32/hardware/esp32/3.3.6/variants/d1_mini32/pins_arduino.h", "${workspaceFolder}/flix/flix.ino", "${workspaceFolder}/flix/cli.ino", "${workspaceFolder}/flix/control.ino", @@ -78,9 +77,10 @@ "${workspaceFolder}/flix/rc.ino", "${workspaceFolder}/flix/time.ino", "${workspaceFolder}/flix/wifi.ino", - "${workspaceFolder}/flix/parameters.ino" + "${workspaceFolder}/flix/parameters.ino", + "${workspaceFolder}/flix/safety.ino" ], - "compilerPath": "~/Library/Arduino15/packages/esp32/tools/esp-x32/2411/bin/xtensa-esp32-elf-g++", + "compilerPath": "~/Library/Arduino15/packages/esp32/tools/esp-x32/2511/bin/xtensa-esp32-elf-g++", "cStandard": "c11", "cppStandard": "c++17", "defines": [ @@ -103,17 +103,16 @@ "${workspaceFolder}/flix", "${workspaceFolder}/gazebo", "${workspaceFolder}/tools/**", - "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.2.0/cores/esp32", - "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.2.0/libraries/**", - "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.2.0/variants/d1_mini32", - "~/AppData/Local/Arduino15/packages/esp32/tools/esp32-arduino-libs/idf-release_v5.4-2f7dcd86-v1/esp32/**", - "~/AppData/Local/Arduino15/packages/esp32/tools/esp32-arduino-libs/idf-release_v5.4-2f7dcd86-v1/esp32/dio_qspi/include", + "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.3.6/cores/esp32", + "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.3.6/libraries/**", + "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.3.6/variants/d1_mini32", + "~/AppData/Local/Arduino15/packages/esp32/tools/esp32-libs/3.3.6/include/**", "~/Documents/Arduino/libraries/**" ], "forcedInclude": [ "${workspaceFolder}/.vscode/intellisense.h", - "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.2.0/cores/esp32/Arduino.h", - "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.2.0/variants/d1_mini32/pins_arduino.h", + "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.3.6/cores/esp32/Arduino.h", + "~/AppData/Local/Arduino15/packages/esp32/hardware/esp32/3.3.6/variants/d1_mini32/pins_arduino.h", "${workspaceFolder}/flix/cli.ino", "${workspaceFolder}/flix/control.ino", "${workspaceFolder}/flix/estimate.ino", @@ -126,9 +125,10 @@ "${workspaceFolder}/flix/rc.ino", "${workspaceFolder}/flix/time.ino", "${workspaceFolder}/flix/wifi.ino", - "${workspaceFolder}/flix/parameters.ino" + "${workspaceFolder}/flix/parameters.ino", + "${workspaceFolder}/flix/safety.ino" ], - "compilerPath": "~/AppData/Local/Arduino15/packages/esp32/tools/esp-x32/2411/bin/xtensa-esp32-elf-g++.exe", + "compilerPath": "~/AppData/Local/Arduino15/packages/esp32/tools/esp-x32/2511/bin/xtensa-esp32-elf-g++.exe", "cStandard": "c11", "cppStandard": "c++17", "defines": [ diff --git a/Makefile b/Makefile index 84253ca..2584560 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ monitor: dependencies .dependencies: arduino-cli core update-index --config-file arduino-cli.yaml - arduino-cli core install esp32:esp32@3.2.0 --config-file arduino-cli.yaml + arduino-cli core install esp32:esp32@3.3.6 --config-file arduino-cli.yaml arduino-cli lib update-index arduino-cli lib install "FlixPeriph" arduino-cli lib install "MAVLink"@2.0.25 diff --git a/docs/usage.md b/docs/usage.md index 01bd8fb..5265fa9 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -20,7 +20,7 @@ You can build and upload the firmware using either **Arduino IDE** (easier for b 1. Install [Arduino IDE](https://www.arduino.cc/en/software) (version 2 is recommended). 2. *Windows users might need to install [USB to UART bridge driver from Silicon Labs](https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers).* -3. Install ESP32 core, version 3.2.0. See the [official Espressif's instructions](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html#installing-using-arduino-ide) on installing ESP32 Core in Arduino IDE. +3. Install ESP32 core, version 3.3.6. See the [official Espressif's instructions](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html#installing-using-arduino-ide) on installing ESP32 Core in Arduino IDE. 4. Install the following libraries using [Library Manager](https://docs.arduino.cc/software/ide-v2/tutorials/ide-v2-installing-a-library): * `FlixPeriph`, the latest version. * `MAVLink`, version 2.0.25.