Skip to content

Switch builds to use ESP32 Core 3.3.7 #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LeeLeahy2 wants to merge 2 commits into
base: MoveToLatestCore
Choose a base branch
from
Open

Switch builds to use ESP32 Core 3.3.7 #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3a968d
Switch builds to use ESP32 Core 3.3.7
LeeLeahy2 Feb 22, 2026
2a33917
Fix wifiAuthorizationName table
LeeLeahy2 Feb 22, 2026
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
14 changes: 7 additions & 7 deletions Firmware/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:latest AS upstream

ARG DEBIAN_FRONTEND=noninteractive

ARG CORE_VERSION=3.0.7
ARG CORE_VERSION=3.3.7

ARG FIRMWARE_VERSION_MAJOR=99
ARG FIRMWARE_VERSION_MINOR=99
Expand Down Expand Up @@ -150,13 +150,13 @@ RUN if [ "$COMPILE_AUTHENTICATION" = "false" ] ; \

# Patch libmbedtls and libbt
RUN cd ./RTK_Everywhere/Patch \
&& ESP_IDF=$(ls /root/.arduino15/packages/esp32/tools/esp32-arduino-libs | grep idf-release) \
&& ESP_IDF=$(ls /root/.arduino15/packages/esp32/tools/esp32-libs | grep idf-release) \
&& echo "ESP IDF Version: ${ESP_IDF}" \
&& cp libmbedtls.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libmbedtls.a" \
&& cp libmbedtls_2.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libmbedtls_2.a" \
&& cp libmbedcrypto.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libmbedcrypto.a" \
&& cp libmbedx509.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libmbedx509.a" \
&& cp libbt.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libbt.a"
&& cp libmbedtls.a "/root/.arduino15/packages/esp32/tools/esp32-libs/${ESP_IDF}/lib/libmbedtls.a" \
&& cp libmbedtls_2.a "/root/.arduino15/packages/esp32/tools/esp32-libs/${ESP_IDF}/lib/libmbedtls_2.a" \
&& cp libmbedcrypto.a "/root/.arduino15/packages/esp32/tools/esp32-libs/${ESP_IDF}/lib/libmbedcrypto.a" \
&& cp libmbedx509.a "/root/.arduino15/packages/esp32/tools/esp32-libs/${ESP_IDF}/lib/libmbedx509.a" \
&& cp libbt.a "/root/.arduino15/packages/esp32/tools/esp32-libs/${ESP_IDF}/lib/libbt.a"

# Update form.h with index_html and main_js
RUN cd ./Tools \
Expand Down
15 changes: 6 additions & 9 deletions Firmware/RTK_Everywhere/WiFi.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,12 @@ static const char *wifiAuthorizationName[] = {
"WAPI_PSK",
"OWE",
"WPA3_ENT_192",

// Compatible with ESP32 core v3.2.1, 16 reported, 18 listed here:
// https://github.com/espressif/esp-idf/blob/master/components/esp_wifi/include/esp_wifi_types_generic.h#L86
//"WPA3_EXT_PSK",
//"WPA3_EXT_PSK_MIXED_MODE",
//"DPP",
//"WPA3_ENTERPRISE",
//"WPA2_WPA3_ENTERPRISE",
//"WPA_ENTERPRISE",
"WPA3_ENT_PSK",
"WPA3_EXT_PSK_MIXED_MODE",
"DPP",
"WPA3_ENTERPRISE",
"WPA2_WPA3_ENTERPRISE",
"WPA_ENTERPRISE",
};
static const int wifiAuthorizationNameEntries = sizeof(wifiAuthorizationName) / sizeof(wifiAuthorizationName[0]);

Expand Down
14 changes: 7 additions & 7 deletions Firmware/RTK_Everywhere/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
##########

SKETCH=RTK_Everywhere.ino
ESP_CORE_VERSION=3.0.7
ESP_IDF_VERSION=idf-release_v5.1-632e0c2a
ESP_CORE_VERSION=3.3.7
ESP_IDF_VERSION=$(ESP_CORE_VERSION)

# Uncomment all five lines for a complete update
#EXECUTABLES = arduino-config lib-update
Expand Down Expand Up @@ -46,7 +46,7 @@ PARTITION_SRC_PATH=$(FIRMWARE_PATH)$(PARTITION_CSV_FILE).csv
PATCH_SRC_PATH=$(RTK_EVERYWHERE_PATH)Patch\

# Windows NT patch destination paths
MBED_LIB_DEST_PATH=$(HOME_BOARD_PATH)\tools\esp32-arduino-libs\${{ env.ESP_IDF }}\esp32/lib\
MBED_LIB_DEST_PATH=$(HOME_BOARD_PATH)\tools\esp32-arduino-libs\${{ env.ESP_IDF }}\lib\
NET_EVENT_PATCH_PATH=$(HOME_BOARD_PATH)\hardware\esp32\$(ESP_CORE_VERSION)\libraries\Network\src\
PARTITION_DST_PATH=$(HOME_BOARD_PATH)\hardware\esp32\$(ESP_CORE_VERSION)\tools\partitions\$(PARTITION_CSV_FILE).csv

Expand Down Expand Up @@ -75,7 +75,7 @@ TERMINAL_PARAMS=-b 115200 -8 < /dev/tty
USER_DIRECTORY_PATH=~/
TMP_PATH=/tmp/
ARDUINO_LIBRARY_PATH=$(USER_DIRECTORY_PATH)Arduino/libraries
ESP_IDF_PATH=$(HOME_BOARD_PATH)/tools/esp32-arduino-libs
ESP_IDF_PATH=$(HOME_BOARD_PATH)/tools/esp32-libs
HOME_BOARD_PATH=$(USER_DIRECTORY_PATH).arduino15/packages/esp32

# Linux patch source paths
Expand All @@ -86,8 +86,8 @@ PARTITION_SRC_PATH=$(FIRMWARE_PATH)$(PARTITION_CSV_FILE).csv
PATCH_SRC_PATH=$(RTK_EVERYWHERE_PATH)Patch/

# Linux patch destination paths
BT_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/esp32/lib/
MBED_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/esp32/lib/
BT_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/lib/
MBED_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/lib/
NET_EVENT_PATCH_PATH=$(HOME_BOARD_PATH)/hardware/esp32/$(ESP_CORE_VERSION)/libraries/Network/src/
PARTITION_DST_PATH=$(HOME_BOARD_PATH)/hardware/esp32/$(ESP_CORE_VERSION)/tools/partitions/$(PARTITION_CSV_FILE).csv

Expand Down Expand Up @@ -149,7 +149,7 @@ lib-install: index-update
.PHONY: get-idf-version

get-idf-version:
ESP_IDF_VERSION=$(ls ~/.arduino15/packages/esp32/tools/esp32-arduino-libs | grep idf-release)
ESP_IDF_VERSION=$(ls ~/.arduino15/packages/esp32/tools/esp32-libs | grep idf-release)
echo "ESP IDF Version: ${ESP_IDF_VERSION}"

$(PARTITION_DST_PATH): $(PARTITION_SRC_PATH)
Expand Down