github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-22 22:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ci] Add rp2 clang-tidy environment (#17486)

Browse Source
This commit is contained in:
Jonathan Swoboda
2026-07-15 21:17:21 -04:00
committed by GitHub
parent e700b01406
commit 5a3c2f4d11
32 changed files with 214 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+4
View File
@@ -504,6 +504,10 @@ jobs:
options: --environment nrf52-tidy --grep USE_ZEPHYR --grep USE_NRF52
cache_sdk_nrf: true
ignore_errors: false
- id: clang-tidy
name: Run script/clang-tidy for RP2
options: --environment rp2-tidy --grep USE_RP2
pio_cache_key: tidyrp2
steps:
- name: Check out code from GitHub
esphome/components/debug/debug_rp2.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
constexpr size_t size = DEVICE_INFO_BUFFER_SIZE;
char *buf = buffer.data();
uint32_t cpu_freq = ::rp2040.f_cpu();
uint32_t cpu_freq = RP2040::f_cpu();
ESP_LOGD(TAG, "CPU Frequency: %" PRIu32, cpu_freq);
pos = buf_append_printf(buf, size, pos, "|CPU Frequency: %" PRIu32, cpu_freq);
esphome/components/ethernet/ethernet_component.h
+2
View File
@@ -112,8 +112,10 @@ enum class EthernetComponentState : uint8_t {
// Platform-neutral duplex/speed types
#ifndef USE_ESP32
// NOLINTBEGIN(readability-identifier-naming)
enum eth_duplex_t { ETH_DUPLEX_HALF, ETH_DUPLEX_FULL };
enum eth_speed_t { ETH_SPEED_10M, ETH_SPEED_100M };
// NOLINTEND(readability-identifier-naming)
#endif
class EthernetComponent final : public Component {
esphome/components/ethernet/ethernet_component_rp2.cpp
+7 -6
View File
@@ -187,17 +187,18 @@ void EthernetComponent::loop() {
}
void EthernetComponent::dump_config() {
const char *type_str = "Unknown";
#if defined(USE_ETHERNET_W5500)
type_str = "W5500";
const char *type_str = "W5500";
#elif defined(USE_ETHERNET_W5100)
type_str = "W5100";
const char *type_str = "W5100";
#elif defined(USE_ETHERNET_W6100)
type_str = "W6100";
const char *type_str = "W6100";
#elif defined(USE_ETHERNET_W6300)
type_str = "W6300";
const char *type_str = "W6300";
#elif defined(USE_ETHERNET_ENC28J60)
type_str = "ENC28J60";
const char *type_str = "ENC28J60";
#else
const char *type_str = "Unknown";
#endif
#if defined(USE_ETHERNET_W6300)
// W6300 uses PIO QSPI with hardcoded pins — SPI pin fields are not used
esphome/components/fastled_base/fastled_light.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
#include "fastled_light.h"
#include "esphome/core/log.h"
esphome/components/fastled_base/fastled_light.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
#include "esphome/core/component.h"
#include "esphome/core/helpers.h"
esphome/components/midea/ac_adapter.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
#include "esphome/core/log.h"
#include "ac_adapter.h"
esphome/components/midea/ac_adapter.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
// MideaUART
#include <Appliance/AirConditioner/AirConditioner.h>
esphome/components/midea/ac_automations.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
#include "esphome/core/automation.h"
#include "air_conditioner.h"
esphome/components/midea/air_conditioner.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
#include "esphome/core/helpers.h"
#include "esphome/core/log.h"
esphome/components/midea/air_conditioner.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
// MideaUART
#include <Appliance/AirConditioner/AirConditioner.h>
esphome/components/midea/appliance_base.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
// MideaUART
#include <Appliance/ApplianceBase.h>
esphome/components/midea/climate.py
+14
View File
@@ -25,6 +25,11 @@ from esphome.const import (
ICON_POWER,
ICON_THERMOMETER,
ICON_WATER_PERCENT,
PLATFORM_BK72XX,
PLATFORM_ESP32,
PLATFORM_ESP8266,
PLATFORM_LN882X,
PLATFORM_RTL87XX,
STATE_CLASS_MEASUREMENT,
UNIT_CELSIUS,
UNIT_PERCENT,
@@ -152,6 +157,15 @@ CONFIG_SCHEMA = cv.All(
.extend(uart.UART_DEVICE_SCHEMA)
.extend(cv.COMPONENT_SCHEMA),
cv.only_with_arduino,
cv.only_on(
[
PLATFORM_ESP32,
PLATFORM_ESP8266,
PLATFORM_BK72XX,
PLATFORM_RTL87XX,
PLATFORM_LN882X,
]
),
)
# Actions
esphome/components/midea/ir_transmitter.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#ifdef USE_ARDUINO
#if defined(USE_ARDUINO) && !defined(USE_RP2)
#ifdef USE_REMOTE_TRANSMITTER
#include "esphome/components/remote_base/midea_protocol.h"
esphome/components/rp2/core.h
+1
View File
@@ -5,6 +5,7 @@
#include <Arduino.h>
#include <pico.h>
// NOLINTNEXTLINE(google-runtime-int,readability-identifier-naming,readability-redundant-declaration)
extern "C" unsigned long ulMainGetRunTimeCounterValue();
namespace esphome::rp2 {} // namespace esphome::rp2
esphome/components/rp2/crash_handler.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ static struct CrashData {
uint32_t sp;
uint32_t backtrace[MAX_BACKTRACE];
uint8_t backtrace_count;
} s_crash_data __attribute__((section(".noinit")));
} s_crash_data __attribute__((section(".noinit"))); // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
bool crash_handler_has_data() { return s_crash_data.valid; }
esphome/components/rp2/hal.cpp
+1 -2
View File
@@ -20,8 +20,7 @@ namespace esphome {
// arch_feed_wdt(), arch_get_cpu_cycle_count() inlined in components/rp2/hal.h.
void arch_restart() {
watchdog_reboot(0, 0, 10);
while (1) {
continue;
while (true) {
}
}
esphome/components/rp2/hal.h
+4 -4
View File
@@ -17,13 +17,13 @@ extern "C" unsigned long micros(void);
extern "C" unsigned long millis(void);
// NOLINTEND(google-runtime-int,readability-identifier-naming,readability-redundant-declaration)
// Forward decl from <pico/time.h>.
// Forward decls from <pico/time.h> and the pico-sdk / FreeRTOS port for the
// inline arch_* wrappers below.
// NOLINTBEGIN(google-runtime-int,readability-identifier-naming,readability-redundant-declaration)
extern "C" uint64_t time_us_64(void);
// Forward decls from pico-sdk / FreeRTOS port for the inline arch_*
// wrappers below.
extern "C" void watchdog_update(void);
extern "C" unsigned long ulMainGetRunTimeCounterValue(void);
// NOLINTEND(google-runtime-int,readability-identifier-naming,readability-redundant-declaration)
namespace esphome::rp2 {}
esphome/components/rp2/preferences.cpp
+5 -4
View File
@@ -26,6 +26,7 @@ static bool s_flash_dirty = false; // NOLINT(cppcoreguidelines-avo
// No preference can exceed the total flash storage, so stack buffer covers all cases.
static constexpr size_t PREF_MAX_BUFFER_SIZE = RP2040_FLASH_STORAGE_SIZE;
// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp)
extern "C" uint8_t _EEPROM_start;
template<class It> uint8_t calculate_crc(It first, It last, uint32_t type) {
@@ -38,9 +39,9 @@ template<class It> uint8_t calculate_crc(It first, It last, uint32_t type) {
}
bool RP2PreferenceBackend::save(const uint8_t *data, size_t len) {
const size_t buffer_size = len + 1;
if (buffer_size > PREF_MAX_BUFFER_SIZE)
if (len >= PREF_MAX_BUFFER_SIZE)
return false;
const size_t buffer_size = len + 1;
uint8_t buffer[PREF_MAX_BUFFER_SIZE];
memcpy(buffer, data, len);
buffer[len] = calculate_crc(buffer, buffer + len, this->type);
@@ -59,9 +60,9 @@ bool RP2PreferenceBackend::save(const uint8_t *data, size_t len) {
}
bool RP2PreferenceBackend::load(uint8_t *data, size_t len) {
const size_t buffer_size = len + 1;
if (buffer_size > PREF_MAX_BUFFER_SIZE)
if (len >= PREF_MAX_BUFFER_SIZE)
return false;
const size_t buffer_size = len + 1;
uint8_t buffer[PREF_MAX_BUFFER_SIZE];
for (size_t i = 0; i < buffer_size; i++) {
esphome/components/rp2/printf_stubs.cpp
+2 -2
View File
@@ -33,8 +33,8 @@ static int write_printf_buffer(FILE *stream, char *buf, int len) {
if (write_len >= PRINTF_BUFFER_SIZE) {
fwrite(buf, 1, PRINTF_BUFFER_SIZE - 1, stream);
// Use fwrite for the message to avoid recursive __wrap_printf call
static const char msg[] = "\nprintf buffer overflow\n";
fwrite(msg, 1, sizeof(msg) - 1, stream);
static const char MSG[] = "\nprintf buffer overflow\n";
fwrite(MSG, 1, sizeof(MSG) - 1, stream);
abort();
}
if (fwrite(buf, 1, write_len, stream) < write_len || ferror(stream)) {
esphome/components/rp2040_ble/rp2040_ble.cpp
+3 -3
View File
@@ -35,10 +35,10 @@ void RP2040BLE::enable() {
l2cap_init();
sm_init();
this->hci_event_callback_registration_.callback = &RP2040BLE::packet_handler_;
this->hci_event_callback_registration_.callback = &RP2040BLE::packet_handler;
hci_add_event_handler(&this->hci_event_callback_registration_);
this->sm_event_callback_registration_.callback = &RP2040BLE::packet_handler_;
this->sm_event_callback_registration_.callback = &RP2040BLE::packet_handler;
sm_add_event_handler(&this->sm_event_callback_registration_);
this->btstack_initialized_ = true;
@@ -95,7 +95,7 @@ void RP2040BLE::dump_config() {
float RP2040BLE::get_setup_priority() const { return setup_priority::BLUETOOTH; }
void RP2040BLE::packet_handler_(uint8_t type, uint16_t channel, uint8_t *packet, uint16_t size) {
void RP2040BLE::packet_handler(uint8_t type, uint16_t channel, uint8_t *packet, uint16_t size) {
if (global_ble == nullptr) {
return;
}
esphome/components/rp2040_ble/rp2040_ble.h
+1 -1
View File
@@ -32,7 +32,7 @@ class RP2040BLE final : public Component {
void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }
protected:
static void packet_handler_(uint8_t type, uint16_t channel, uint8_t *packet, uint16_t size);
static void packet_handler(uint8_t type, uint16_t channel, uint8_t *packet, uint16_t size);
btstack_packet_callback_registration_t hci_event_callback_registration_{};
btstack_packet_callback_registration_t sm_event_callback_registration_{};
esphome/components/rp2040_pio_led_strip/led_strip.cpp
+15 -26
View File
@@ -14,26 +14,15 @@
namespace esphome::rp2040_pio_led_strip {
static const char *TAG = "rp2040_pio_led_strip";
static uint8_t num_instance_[2] = {0, 0};
static std::map<Chipset, uint> chipset_offsets_ = {
{CHIPSET_WS2812, 0}, {CHIPSET_WS2812B, 0}, {CHIPSET_SK6812, 0}, {CHIPSET_SM16703, 0}, {CHIPSET_CUSTOM, 0},
};
static std::map<Chipset, bool> conf_count_ = {
{CHIPSET_WS2812, false}, {CHIPSET_WS2812B, false}, {CHIPSET_SK6812, false},
{CHIPSET_SM16703, false}, {CHIPSET_CUSTOM, false},
};
static bool dma_chan_active_[12];
static struct semaphore dma_write_complete_sem_[12];
static const char *const TAG = "rp2040_pio_led_strip";
// DMA interrupt service routine
void RP2040PIOLEDStripLightOutput::dma_write_complete_handler_() {
void RP2040PIOLEDStripLightOutput::dma_write_complete_handler() {
uint32_t channel = dma_hw->ints0;
for (uint dma_chan = 0; dma_chan < 12; ++dma_chan) {
if (RP2040PIOLEDStripLightOutput::dma_chan_active_[dma_chan] && (channel & (1u << dma_chan))) {
if (RP2040PIOLEDStripLightOutput::dma_chan_active[dma_chan] && (channel & (1u << dma_chan))) {
dma_hw->ints0 = (1u << dma_chan); // Clear the interrupt
sem_release(&RP2040PIOLEDStripLightOutput::dma_write_complete_sem_[dma_chan]); // Handle the interrupt
sem_release(&RP2040PIOLEDStripLightOutput::dma_write_complete_sem[dma_chan]); // Handle the interrupt
}
}
}
@@ -69,22 +58,22 @@ void RP2040PIOLEDStripLightOutput::setup() {
// but there are only 4 state machines on each PIO so we can only have 4 strips per PIO
uint offset = 0;
if (RP2040PIOLEDStripLightOutput::num_instance_[this->pio_ == pio0 ? 0 : 1] >= 4) {
if (RP2040PIOLEDStripLightOutput::num_instance[this->pio_ == pio0 ? 0 : 1] >= 4) {
ESP_LOGE(TAG, "Too many instances of PIO program");
this->mark_failed();
return;
}
// keep track of how many instances of the PIO program are running on each PIO
RP2040PIOLEDStripLightOutput::num_instance_[this->pio_ == pio0 ? 0 : 1]++;
RP2040PIOLEDStripLightOutput::num_instance[this->pio_ == pio0 ? 0 : 1]++;
// if there are multiple strips of the same chipset, we can reuse the same PIO program and save space
if (this->conf_count_[this->chipset_]) {
offset = RP2040PIOLEDStripLightOutput::chipset_offsets_[this->chipset_];
if (RP2040PIOLEDStripLightOutput::conf_count[this->chipset_]) {
offset = RP2040PIOLEDStripLightOutput::chipset_offsets[this->chipset_];
} else {
// Load the assembled program into the PIO and get its location in the PIO's instruction memory and save it
offset = pio_add_program(this->pio_, this->program_);
RP2040PIOLEDStripLightOutput::chipset_offsets_[this->chipset_] = offset;
RP2040PIOLEDStripLightOutput::conf_count_[this->chipset_] = true;
RP2040PIOLEDStripLightOutput::chipset_offsets[this->chipset_] = offset;
RP2040PIOLEDStripLightOutput::conf_count[this->chipset_] = true;
}
// Configure the state machine's PIO, and start it
@@ -106,7 +95,7 @@ void RP2040PIOLEDStripLightOutput::setup() {
}
// Mark the DMA channel as active
RP2040PIOLEDStripLightOutput::dma_chan_active_[this->dma_chan_] = true;
RP2040PIOLEDStripLightOutput::dma_chan_active[this->dma_chan_] = true;
this->dma_config_ = dma_channel_get_default_config(this->dma_chan_);
channel_config_set_transfer_data_size(
@@ -125,9 +114,9 @@ void RP2040PIOLEDStripLightOutput::setup() {
);
// Initialize the semaphore for this DMA channel
sem_init(&RP2040PIOLEDStripLightOutput::dma_write_complete_sem_[this->dma_chan_], 1, 1);
sem_init(&RP2040PIOLEDStripLightOutput::dma_write_complete_sem[this->dma_chan_], 1, 1);
irq_set_exclusive_handler(DMA_IRQ_0, dma_write_complete_handler_); // after DMA all data, raise an interrupt
irq_set_exclusive_handler(DMA_IRQ_0, dma_write_complete_handler); // after DMA all data, raise an interrupt
dma_channel_set_irq0_enabled(this->dma_chan_, true); // map DMA channel to interrupt
irq_set_enabled(DMA_IRQ_0, true); // enable interrupt
@@ -148,12 +137,12 @@ void RP2040PIOLEDStripLightOutput::write_state(light::LightState *state) {
}
// the bits are already in the correct order for the pio program so we can just copy the buffer using DMA
sem_acquire_blocking(&RP2040PIOLEDStripLightOutput::dma_write_complete_sem_[this->dma_chan_]);
sem_acquire_blocking(&RP2040PIOLEDStripLightOutput::dma_write_complete_sem[this->dma_chan_]);
dma_channel_transfer_from_buffer_now(this->dma_chan_, this->buf_, this->get_buffer_size_());
}
light::ESPColorView RP2040PIOLEDStripLightOutput::get_view_internal(int32_t index) const {
int32_t r = 0, g = 0, b = 0, w = 0;
int32_t r = 0, g = 0, b = 0;
switch (this->rgb_order_) {
case ORDER_RGB:
r = 0;
esphome/components/rp2040_pio_led_strip/led_strip.h
+6 -6
View File
@@ -95,7 +95,7 @@ class RP2040PIOLEDStripLightOutput final : public light::AddressableLight {
size_t get_buffer_size_() const { return this->num_leds_ * (3 + this->is_rgbw_); }
static void dma_write_complete_handler_();
static void dma_write_complete_handler();
uint8_t *buf_{nullptr};
uint8_t *effect_data_{nullptr};
@@ -119,11 +119,11 @@ class RP2040PIOLEDStripLightOutput final : public light::AddressableLight {
init_fn init_;
private:
inline static int num_instance_[2];
inline static std::map<Chipset, bool> conf_count_;
inline static std::map<Chipset, int> chipset_offsets_;
inline static bool dma_chan_active_[12];
inline static struct semaphore dma_write_complete_sem_[12];
inline static int num_instance[2];
inline static std::map<Chipset, bool> conf_count;
inline static std::map<Chipset, int> chipset_offsets;
inline static bool dma_chan_active[12];
inline static struct semaphore dma_write_complete_sem[12];
};
} // namespace esphome::rp2040_pio_led_strip
esphome/components/wifi/wifi_component.h
+1 -1
View File
@@ -819,7 +819,7 @@ class WiFiComponent final : public Component {
#ifdef USE_RP2
static int s_wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result);
void wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result);
void wifi_scan_result_(void *env, const cyw43_ev_scan_result_t *result);
#endif
#ifdef USE_LIBRETINY
esphome/components/wifi/wifi_component_pico_w.cpp
+9 -13
View File
@@ -109,10 +109,7 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
// setup depends on begin() succeeding. beginNoBlock() skips the outer wait loop, saving
// up to 20 additional seconds of blocking per attempt.
auto ret = WiFi.beginNoBlock(ap.ssid_.c_str(), ap.password_.c_str());
if (ret == WL_IDLE_STATUS)
return false;
return true;
return ret != WL_IDLE_STATUS;
}
bool WiFiComponent::wifi_sta_pre_setup_() { return this->wifi_mode_(true, {}); }
@@ -169,11 +166,11 @@ WiFiSTAConnectStatus WiFiComponent::wifi_sta_connect_status_() const {
}
int WiFiComponent::s_wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result) {
global_wifi_component->wifi_scan_result(env, result);
global_wifi_component->wifi_scan_result_(env, result);
return 0;
}
void WiFiComponent::wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result) {
void WiFiComponent::wifi_scan_result_(void *env, const cyw43_ev_scan_result_t *result) {
s_scan_result_count++;
// CYW43 scan results have ssid as a 32-byte buffer that is NOT null-terminated.
@@ -282,7 +279,7 @@ network::IPAddresses WiFiComponent::wifi_sta_ip_addresses() {
// Filter out AP interface addresses — addrList includes all lwIP netifs.
// The AP netif IP lingers even after the AP radio is disabled.
IPAddress ap_ip = WiFi.softAPIP();
for (auto addr : addrList) {
for (const auto &addr : addrList) {
IPAddress ip(addr.ipFromNetifNum());
if (ip == ap_ip) {
continue;
@@ -351,12 +348,11 @@ bool WiFiComponent::wifi_loop_() {
// Detect IP address changes (only when connected)
if (is_connected) {
bool has_ip = false;
// Check for any IP address (IPv4 or IPv6)
for (auto addr : addrList) {
has_ip = true;
break;
}
// Check for any IP address (IPv4 or IPv6). The iterator comparison
// operators take non-const references, so the temporaries need names.
auto addr_it = addrList.begin();
auto addr_end = addrList.end();
bool has_ip = addr_it != addr_end;
if (has_ip && !s_sta_had_ip) {
// Just got IP address
esphome/components/wireguard/__init__.py
+24 -3
View File
@@ -6,7 +6,17 @@ import esphome.codegen as cg
from esphome.components import time
from esphome.components.esp32 import CORE, add_idf_sdkconfig_option
import esphome.config_validation as cv
from esphome.const import CONF_ADDRESS, CONF_ID, CONF_REBOOT_TIMEOUT, CONF_TIME_ID
from esphome.const import (
CONF_ADDRESS,
CONF_ID,
CONF_REBOOT_TIMEOUT,
CONF_TIME_ID,
PLATFORM_BK72XX,
PLATFORM_ESP32,
PLATFORM_ESP8266,
PLATFORM_LN882X,
PLATFORM_RTL87XX,
)
from esphome.core import TimePeriod
CONF_NETMASK = "netmask"
@@ -57,7 +67,8 @@ def _cidr_network(value):
return value
CONFIG_SCHEMA = cv.Schema(
CONFIG_SCHEMA = cv.All(
cv.Schema(
{
cv.GenerateID(): cv.declare_id(Wireguard),
cv.GenerateID(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
@@ -80,7 +91,17 @@ CONFIG_SCHEMA = cv.Schema(
): cv.positive_time_period_milliseconds,
cv.Optional(CONF_REQUIRE_CONNECTION_TO_PROCEED, default=False): cv.boolean,
}
).extend(cv.polling_component_schema("10s"))
).extend(cv.polling_component_schema("10s")),
cv.only_on(
[
PLATFORM_ESP32,
PLATFORM_ESP8266,
PLATFORM_BK72XX,
PLATFORM_RTL87XX,
PLATFORM_LN882X,
]
),
)
async def to_code(config):
esphome/components/wled/wled_light_effect.h
+7
View File
@@ -8,7 +8,14 @@
#include <vector>
#include <memory>
#ifdef USE_RP2
namespace arduino {
class UDP;
} // namespace arduino
using arduino::UDP; // NOLINT(google-global-names-in-headers)
#else
class UDP;
#endif
namespace esphome::wled {
esphome/core/defines.h
+8 -1
View File
@@ -205,8 +205,11 @@
#define MAX_API_CONNECTIONS 6
#define USE_MD5
#define USE_SHA256
#ifndef USE_RP2 // no MQTT backend or esp_wireguard library on RP2
#define USE_MQTT
#define USE_MQTT_COVER_JSON
#define USE_WIREGUARD
#endif
#define USE_RTTTL_FINISHED_PLAYBACK_CALLBACK
#define USE_RUNTIME_IMAGE_BMP
#define USE_RUNTIME_IMAGE_PNG
@@ -219,7 +222,6 @@
#define USE_WIFI
#define USE_WIFI_AP
#define USE_WIFI_MANUAL_IP
#define USE_WIREGUARD
#endif
// Arduino-specific feature flags
@@ -432,6 +434,11 @@
#ifndef USE_ETHERNET_SPI
#define USE_ETHERNET_SPI
#endif
#define USE_ETHERNET_W5500
#define USE_WIFI_IP_STATE_LISTENERS
#define ESPHOME_WIFI_IP_STATE_LISTENERS 2
#define USE_ETHERNET_IP_STATE_LISTENERS
#define ESPHOME_ETHERNET_IP_STATE_LISTENERS 2
#endif
#ifdef USE_LIBRETINY
esphome/core/wake/wake_rp2.cpp
+2 -2
View File
@@ -20,7 +20,7 @@ volatile bool g_main_loop_woke = false;
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
static volatile bool s_delay_expired = false;
static int64_t alarm_callback_(alarm_id_t id, void *user_data) {
static int64_t alarm_callback(alarm_id_t id, void *user_data) {
(void) id;
(void) user_data;
s_delay_expired = true;
@@ -43,7 +43,7 @@ void wakeable_delay(uint32_t ms) {
return;
}
s_delay_expired = false;
alarm_id_t alarm = add_alarm_in_ms(ms, alarm_callback_, nullptr, true);
alarm_id_t alarm = add_alarm_in_ms(ms, alarm_callback, nullptr, true);
if (alarm <= 0) {
delay(ms);
return;
platformio.ini
+22
View File
@@ -214,8 +214,19 @@ lib_deps =
${common:idf-component-libs.lib_deps}
ayushsharma82/RPAsyncTCP@1.3.2 ; async_tcp
ESP32Async/ESPAsyncWebServer@3.9.6 ; web_server_base
WiFi ; wifi (arduino-pico built-in)
lwIP_CYW43 ; wifi (arduino-pico built-in, WiFi dependency)
HTTPClient ; http_request (arduino-pico built-in)
Updater ; ota (arduino-pico built-in)
MD5Builder ; md5 (arduino-pico built-in)
LEAmDNS ; mdns (arduino-pico built-in)
lwIP_w5500 ; ethernet (arduino-pico built-in)
lwIP-Ethernet ; ethernet (arduino-pico built-in, lwIP_w5500/lwIP_CYW43 dependency)
WebServer ; web_server_base (arduino-pico built-in, ESPAsyncWebServer dependency)
http-parser ; web_server_base (arduino-pico built-in, ESPAsyncWebServer dependency)
build_flags =
${common:arduino.build_flags}
-DUSE_RP2
-DUSE_RP2040
-DUSE_RP2040_FRAMEWORK_ARDUINO
build_unflags =
@@ -510,6 +521,17 @@ build_flags =
build_unflags =
${common.build_unflags}
[env:rp2-tidy]
extends = common:rp2040-arduino
; The W variant so the cyw43 / WiFi library paths are part of the idedata.
board = rpipicow
build_flags =
${common:rp2040-arduino.build_flags}
${flags:clangtidy.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH
build_unflags =
${common.build_unflags}
;;;;;;;; LibreTiny ;;;;;;;;
[env:bk72xx-arduino]
script/clang-tidy
+30 -9
View File
@@ -29,7 +29,7 @@ from helpers import (
)
def clang_options(idedata):
def clang_options(idedata, environment):
cmd = []
# extract target architecture from triplet in g++ filename
@@ -95,8 +95,27 @@ def clang_options(idedata):
[
# disable built-in include directories from the host
"-nostdinc",
# allow to condition code on the presence of clang-tidy
"-DCLANG_TIDY",
# (esp-idf) Fix __once_callable in some libstdc++ headers
"-D_GLIBCXX_HAVE_TLS",
# suppress warning about attribute cannot be applied to type
# https://github.com/esp8266/Arduino/pull/8258
# also keeps deprecation diagnostics consistent across environments
"-Ddeprecated(x)=",
]
)
if environment.startswith("rp2"):
# clang's ARM backend doesn't know GCC's long_call attribute (IRAM_ATTR)
cmd.append("-Wno-unknown-attributes")
else:
# replace pgmspace.h, as it uses GNU extensions clang doesn't support
# https://github.com/earlephilhower/newlib-xtensa/pull/18
# arduino-pico ships clang-parseable pgmspace inline functions, so the
# replacements are skipped there (they clash with those definitions).
cmd.extend(
[
"-D_PGMSPACE_H_",
"-Dpgm_read_byte(s)=(*(const uint8_t *)(s))",
"-Dpgm_read_byte_near(s)=(*(const uint8_t *)(s))",
@@ -109,13 +128,6 @@ def clang_options(idedata):
# this next one is also needed with upstream pgmspace.h
# suppress warning about identifier naming in expansion of this macro
"-DPSTRN(s, n)=(s)",
# suppress warning about attribute cannot be applied to type
# https://github.com/esp8266/Arduino/pull/8258
"-Ddeprecated(x)=",
# allow to condition code on the presence of clang-tidy
"-DCLANG_TIDY",
# (esp-idf) Fix __once_callable in some libstdc++ headers
"-D_GLIBCXX_HAVE_TLS",
]
)
@@ -207,6 +219,15 @@ def run_tidy(executable, args, options, tmpdir, path_queue, lock, failed_files):
if sys.stdout.isatty():
invocation.append("--use-color")
if args.environment.startswith("rp2"):
# MMIO peripheral access on bare-metal RP2 is all fixed-address.
# bugprone-pointer-arithmetic-on-polymorphic-object (and its
# cert-ctr56-cpp alias) crashes clang-tidy 22 with infinite matcher
# recursion on lvgl_esphome.h under the RP2 defines.
invocation.append(
"--checks=-clang-analyzer-core.FixedAddressDereference,"
"-bugprone-pointer-arithmetic-on-polymorphic-object,-cert-ctr56-cpp"
)
invocation.append(f"--header-filter={Path(basepath).resolve()}/.*")
invocation.append(str(Path(path).resolve()))
invocation.append("--")
@@ -351,7 +372,7 @@ def main():
# Load idedata and options only if we have files to check
idedata = load_idedata(args.environment)
options = clang_options(idedata)
options = clang_options(idedata, args.environment)
tmpdir = None
if args.fix: