build: add the ESP32-P4 (#29)

For boards such as Waveshare's ESP32-P4-WIFI6-POE-ETH: WiFi through the
board's ESP32-C6 on SDIO (esp-hosted), Ethernet on the P4's RMII MAC with
an IP101.  Not tested on a device: no P4 board was at hand.

- platformio.ini: env esp32p4 (esp32-p4_r3, chip v3.01+) and esp32p4es
  (esp32-p4, the esp32p4_es libraries, chips before v2.0).  An image runs
  on one of the two only, so each has its own release files, chip models
  "p4" and "p4es".  Both keep the OTA slot: at level 2 they leave about
  128 KB of it.
- Ethernet clock mode: stored as eth_clock_id_t in the ESP32's numbering
  and translated by name, like the PHY id.  The P4's eth_clock_mode_t is
  the IDF's emac_rmii_clock_mode_t, whose 0 is a deprecated default; only
  clock in (GPIO 50) translates there.
- P4 Ethernet defaults: the Waveshare wiring (IP101 as TLK110, address 1,
  MDC 31, MDIO 52, reset 51), board type 8.  The ESP32's put MDIO on an
  SDIO pin.
- Settings take pins up to GPIO 54, the P4's last, instead of 48.
- Radio defaults: SPI 32/33/27, CSN 46 (the framework's Waveshare
  variant), TX 2, RX 3.
- Web UI: a Waveshare ESP32-P4-ETH preset, the P4's clock mode, pin lists
  up to GPIO 54 without the pins the C6 link, Ethernet, USB and UART0 use.
- CI builds and releases both, with their ELFs; bootloader at 0x2000.
- ADR 0003: amended.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-29 19:41:39 +01:00
parent eadd9b801d
commit dfb003d2f7
19 changed files with 282 additions and 38 deletions

View file

@ -13,4 +13,20 @@ typedef enum {
ETH_PHY_KSZ8081,
ETH_PHY_MAX
} eth_phy_type_t;
#if defined(CONFIG_IDF_TARGET_ESP32P4)
// The P4's ETH.h takes the IDF's enum, where 0 is a deprecated default.
typedef enum {
EMAC_CLK_DEFAULT,
EMAC_CLK_EXT_IN,
EMAC_CLK_OUT
} emac_rmii_clock_mode_t;
typedef emac_rmii_clock_mode_t eth_clock_mode_t;
#else
typedef enum {
ETH_CLOCK_GPIO0_IN,
ETH_CLOCK_GPIO0_OUT,
ETH_CLOCK_GPIO16_OUT,
ETH_CLOCK_GPIO17_OUT
} eth_clock_mode_t;
#endif
#endif

View file

@ -52,6 +52,39 @@ static void test_rejects_unknown_ids() {
TEST_ASSERT_FALSE(ethPhyType(255, type));
}
/*********************************************************************
* Clock modes
********************************************************************/
static void test_clock_ids_match_stored_values() {
TEST_ASSERT_EQUAL_UINT8(0, static_cast<uint8_t>(eth_clock_id_t::GPIO0_IN));
TEST_ASSERT_EQUAL_UINT8(1, static_cast<uint8_t>(eth_clock_id_t::GPIO0_OUT));
TEST_ASSERT_EQUAL_UINT8(2, static_cast<uint8_t>(eth_clock_id_t::GPIO16_OUT));
TEST_ASSERT_EQUAL_UINT8(3, static_cast<uint8_t>(eth_clock_id_t::GPIO17_OUT));
}
static void test_translates_each_clock_mode() {
eth_clock_mode_t mode;
TEST_ASSERT_TRUE(ethClockMode(0, mode));
TEST_ASSERT_EQUAL(ETH_CLOCK_GPIO0_IN, mode);
TEST_ASSERT_TRUE(ethClockMode(1, mode));
TEST_ASSERT_EQUAL(ETH_CLOCK_GPIO0_OUT, mode);
TEST_ASSERT_TRUE(ethClockMode(2, mode));
TEST_ASSERT_EQUAL(ETH_CLOCK_GPIO16_OUT, mode);
TEST_ASSERT_TRUE(ethClockMode(3, mode));
TEST_ASSERT_EQUAL(ETH_CLOCK_GPIO17_OUT, mode);
}
static void test_rejects_unknown_clock_ids() {
eth_clock_mode_t mode;
TEST_ASSERT_FALSE(ethClockMode(4, mode));
TEST_ASSERT_FALSE(ethClockMode(255, mode));
}
static void test_clock_pins() {
TEST_ASSERT_EQUAL_INT8(0, ethClockPin(0));
TEST_ASSERT_EQUAL_INT8(0, ethClockPin(1));
TEST_ASSERT_EQUAL_INT8(16, ethClockPin(2));
TEST_ASSERT_EQUAL_INT8(17, ethClockPin(3));
TEST_ASSERT_EQUAL_INT8(-1, ethClockPin(4));
}
int main(int, char **) {
UNITY_BEGIN();
RUN_TEST(test_ids_match_stored_values);
@ -59,5 +92,9 @@ int main(int, char **) {
RUN_TEST(test_lan8720_is_not_the_framework_zero);
RUN_TEST(test_rejects_dm9051);
RUN_TEST(test_rejects_unknown_ids);
RUN_TEST(test_clock_ids_match_stored_values);
RUN_TEST(test_translates_each_clock_mode);
RUN_TEST(test_rejects_unknown_clock_ids);
RUN_TEST(test_clock_pins);
return UNITY_END();
}

View file

@ -0,0 +1,49 @@
#include <unity.h>
// As on the ESP32-P4, which has the RMII MAC too but takes the IDF's clock
// enum.
#define CONFIG_ETH_USE_ESP32_EMAC 1
#define CONFIG_IDF_TARGET_ESP32P4 1
#include "EthPhy.h"
void setUp() {}
void tearDown() {}
static void test_builds_with_ethernet() {
TEST_ASSERT_EQUAL(1, HAS_ETHERNET);
}
static void test_ip101_is_the_tlk110_id() {
// Waveshare's ESP32-P4-ETH boards have an IP101, which Arduino drives as
// the TLK110; the web UI's preset stores 1.
eth_phy_type_t type = ETH_PHY_MAX;
TEST_ASSERT_TRUE(ethPhyType(1, type));
TEST_ASSERT_EQUAL(ETH_PHY_TLK110, type);
}
static void test_clock_in_is_ext_in() {
// A cast would give the IDF's deprecated EMAC_CLK_DEFAULT.
eth_clock_mode_t mode = EMAC_CLK_DEFAULT;
TEST_ASSERT_TRUE(ethClockMode(static_cast<uint8_t>(eth_clock_id_t::GPIO0_IN), mode));
TEST_ASSERT_EQUAL(EMAC_CLK_EXT_IN, mode);
}
static void test_rejects_clock_out() {
// ETH.begin() keeps the clock on GPIO 50, which only takes a clock in.
eth_clock_mode_t mode;
TEST_ASSERT_FALSE(ethClockMode(1, mode));
TEST_ASSERT_FALSE(ethClockMode(2, mode));
TEST_ASSERT_FALSE(ethClockMode(3, mode));
TEST_ASSERT_FALSE(ethClockMode(4, mode));
}
static void test_clock_pin_is_50() {
TEST_ASSERT_EQUAL_INT8(50, ethClockPin(0));
TEST_ASSERT_EQUAL_INT8(-1, ethClockPin(1));
TEST_ASSERT_EQUAL_INT8(-1, ethClockPin(3));
}
int main(int, char **) {
UNITY_BEGIN();
RUN_TEST(test_builds_with_ethernet);
RUN_TEST(test_ip101_is_the_tlk110_id);
RUN_TEST(test_clock_in_is_ext_in);
RUN_TEST(test_rejects_clock_out);
RUN_TEST(test_clock_pin_is_50);
return UNITY_END();
}

View file

@ -93,7 +93,7 @@ static void test_whole_numbers_are_checked_against_what_the_setting_holds() {
TEST_ASSERT_EQUAL_STRING("connMode must be 1-3", expand(R"({"se":"network","cn":0})"));
TEST_ASSERT_EQUAL_STRING("port must be 1-65535", expand(R"({"se":"mqtt","po":65536})"));
TEST_ASSERT_EQUAL_STRING("txPower must be -30-12", expand(R"({"se":"radio","tp":13})"));
TEST_ASSERT_EQUAL_STRING("TXPin must be 0-48", expand(R"({"se":"radio","tx":-1})"));
TEST_ASSERT_EQUAL_STRING("TXPin must be 0-54", expand(R"({"se":"radio","tx":-1})"));
TEST_ASSERT_EQUAL_STRING("securityType must be 0-2", expand(R"({"se":"security","sy":3})"));
TEST_ASSERT_EQUAL_STRING("port must be 1-65535", expand(R"({"se":"mqtt","po":18446744073709551615})"));
// A pin of -1 is none.

View file

@ -284,6 +284,10 @@ static void test_releaseAssetName_matches_the_release_workflow() {
TEST_ASSERT_EQUAL_STRING("SomfyController.ino.esp32c5.bin", buf);
releaseAssetName(buf, sizeof(buf), "littlefs", "c6");
TEST_ASSERT_EQUAL_STRING("SomfyController.littlefs.esp32c6.bin", buf);
releaseAssetName(buf, sizeof(buf), "ino", "p4");
TEST_ASSERT_EQUAL_STRING("SomfyController.ino.esp32p4.bin", buf);
releaseAssetName(buf, sizeof(buf), "littlefs", "p4es");
TEST_ASSERT_EQUAL_STRING("SomfyController.littlefs.esp32p4es.bin", buf);
}
/*********************************************************************