ESP32: Migrate to Arduino 3.x (pioarduino) - #9122
Merged
Merged
Conversation
The latest fixes and the latest bugs!
Includes Manuel's recent commit
chasing the release
mverch67
reviewed
Jan 23, 2026
3 tasks
mariotti
pushed a commit
to mariotti/firmware
that referenced
this pull request
May 6, 2026
…gs" (meshtastic#10073) This reverts commit 391928e. Since esp32_https_server commit e2c9f98, this is no longer necessary. Also, the esp32-common.ini '-include mbedtls/error.h' causes a build error under IDF v5 (meshtastic#9122 (comment)): <command-line>: fatal error: mbedtls/error.h: No such file or directory so this change fixes that error.
thebentern
marked this pull request as ready for review
May 13, 2026 14:14
Contributor
|
@copilot resolve the merge conflicts in this pull request |
Resolve conflict in src/nimble/NimbleBluetooth.cpp by keeping pioarduino's Arduino BLE API (onPassKeyNotify callback, passkey set via pSecurity->setPassKey at setup time). Develop's changes (variable rename + showSimpleBanner) target the old NimBLE-Arduino API which pioarduino no longer uses. Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Contributor
Merge conflicts resolved in |
thebentern
approved these changes
May 13, 2026
3 tasks
jeek
pushed a commit
to jeek/Meshtastic-Exploiteers-Hacker-Pager
that referenced
this pull request
Jun 30, 2026
…shtastic#9875) Fixes this build error: <command-line>: error: expected unqualified-id before '-' token /home/<snip>/.platformio/packages/framework-arduinoespressif32/variants/esp32s3/pins_arduino.h:15:22: note: in expansion of macro 'LED_BUILTIN' 15 | static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED; | ^~~~~~~~~~~ More info: meshtastic#9122 (comment) The fix is consistent with variants/esp32s3/heltec_v3/platformio.ini This commit is intentionally on the develop branch, because it's harmless to develop branch, and makes us more ready for pioarduino when the time comes. Heltec v4 introduced in: meshtastic#7845 Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
thebentern
added a commit
that referenced
this pull request
Jun 30, 2026
…0824) Reconciles develop to master's latest renovate values for deps bumped on the 2.7 line but never back-merged, so the develop->master 2.8 promotion (#10777) doesn't regress them. Done as a value reconcile, not a cherry-pick: several master commits are superseded (5 device-ui bumps, 2 ststm32 bumps), and develop's stale archive/refs/tags/ URL form actually blocked renovate from bumping these (the regex expects archive/<version>.zip). GitHub Actions: - actions/checkout v6 -> v7 (35 refs) - actions/cache v5 -> v6 - actions/github-script v8 -> v9 (3 refs) - actions/stale v10.2.0 -> v10.3.0 Build / platform: - alpine 3.23 -> 3.24 (alpine.Dockerfile) - platformio/ststm32 19.5.0 -> 19.7.0 - platformio/nordicnrf52 10.11.0 -> 10.12.0 Libraries: - Adafruit SSD1306 2.5.16 -> 2.5.17 - SparkFun MMC5983MA v1.1.4 -> v1.1.5 - Sensirion I2C SCD30 1.0.0 -> 1.1.1 - meshtastic esp8266-oled-ssd1306 6bfd1f1 -> 2e26010 Deliberately excluded: - meshtastic/device-ui digest: coupled to firmware protobuf/API and develop has diverged hard (NodeDB v25); left for a separate maintainer bump + visual check. - libpax: develop uses the mverch67 fork (pinned by Arduino-3.x migration #9122), master uses dbinfrago -- a fork divergence, not a version bump; not reconciled. - platform-native digest: develop already at 61067ac (equal to master).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Switch all ESP32 builds to pioarduino/platform-espressif32.
https://docs.espressif.com/projects/arduino-esp32/en/latest/migration_guides/2.x_to_3.0.html
Switching to Arduino-ESP32 3.x will be necessary in order to properly support newer Espressif MCUs (esp32h2, esp32c5, esp32c6, esp32p4, etc)
DRAFT for now, see below.
TODO:
heltec-v3t-deck-tfttbeamtlora-v2-1-1_6station-g1heltec-ht62-esp32c3-sx1262tlora-c6m5stack-unitc6lcrowpanel p4 advanced 5"crowpanel p4 advanced 9"crowpanel p4 advanced 10.1"Tasks:
AUDIOModuleDepends on:
sysloglib (replace?)libpaxrelies on bluetooth vhci APIs which DO NOT EXIST on esp32c6, esp32h2, or newer (c5, p4, etc)This PR is a continuation of the work in #8952
Huge shoutout / credit to @mverch67 who's initial work this is based upon #7180 ❤️