Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-27 20:53:46 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

[multiple] Fix -Wformat= mismatches in component .cpp sources (#16433)

Browse Source
This commit is contained in:
Jonathan Swoboda
2026-05-14 18:53:42 -04:00
committed by Jesse Hills
parent da8286f554
commit 3831aa809f
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/bme680_bsec/bme680_bsec.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ void BME680BSECComponent::dump_config() {
" IAQ Mode: %s\n" " IAQ Mode: %s\n"
" Supply Voltage: %sV\n" " Supply Voltage: %sV\n"
" Sample Rate: %s\n" " Sample Rate: %s\n"
" State Save Interval: %ims", " State Save Interval: %" PRIu32 "ms",
this->temperature_offset_, this->iaq_mode_ == IAQ_MODE_STATIC ? "Static" : "Mobile", this->temperature_offset_, this->iaq_mode_ == IAQ_MODE_STATIC ? "Static" : "Mobile",
this->supply_voltage_ == SUPPLY_VOLTAGE_3V3 ? "3.3" : "1.8", this->supply_voltage_ == SUPPLY_VOLTAGE_3V3 ? "3.3" : "1.8",
BME680_BSEC_SAMPLE_RATE_LOG(this->sample_rate_), this->state_save_interval_ms_); BME680_BSEC_SAMPLE_RATE_LOG(this->sample_rate_), this->state_save_interval_ms_);
@@ -461,7 +461,7 @@ int8_t BME680BSECComponent::write_bytes_wrapper(uint8_t devid, uint8_t a_registe
} }
void BME680BSECComponent::delay_ms(uint32_t period) { void BME680BSECComponent::delay_ms(uint32_t period) {
ESP_LOGV(TAG, "Delaying for %ums", period); ESP_LOGV(TAG, "Delaying for %" PRIu32 "ms", period);
delay(period); delay(period);
} }
esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
+3 -3
View File
@@ -92,7 +92,7 @@ void Esp32HostedUpdate::setup() {
if (esp_hosted_get_coprocessor_fwversion(&ver_info) == ESP_OK) { if (esp_hosted_get_coprocessor_fwversion(&ver_info) == ESP_OK) {
// 16 bytes: "255.255.255" (11 chars) + null + safety margin // 16 bytes: "255.255.255" (11 chars) + null + safety margin
char buf[16]; char buf[16];
snprintf(buf, sizeof(buf), "%d.%d.%d", ver_info.major1, ver_info.minor1, ver_info.patch1); snprintf(buf, sizeof(buf), "%" PRIu32 ".%" PRIu32 ".%" PRIu32, ver_info.major1, ver_info.minor1, ver_info.patch1);
this->update_info_.current_version = buf; this->update_info_.current_version = buf;
} else { } else {
this->update_info_.current_version = "unknown"; this->update_info_.current_version = "unknown";
@@ -120,8 +120,8 @@ void Esp32HostedUpdate::setup() {
this->state_ = update::UPDATE_STATE_NO_UPDATE; this->state_ = update::UPDATE_STATE_NO_UPDATE;
} }
} else { } else {
ESP_LOGW(TAG, "Invalid app description magic word: 0x%08x (expected 0x%08x)", app_desc->magic_word, ESP_LOGW(TAG, "Invalid app description magic word: 0x%08" PRIx32 " (expected 0x%08" PRIx32 ")",
ESP_APP_DESC_MAGIC_WORD); app_desc->magic_word, ESP_APP_DESC_MAGIC_WORD);
this->state_ = update::UPDATE_STATE_NO_UPDATE; this->state_ = update::UPDATE_STATE_NO_UPDATE;
} }
} else { } else {
esphome/components/esphome/ota/ota_esphome.cpp
+7 -7
View File
@@ -108,8 +108,8 @@ void ESPHomeOTAComponent::dump_config() {
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
" Partition access allowed\n" " Partition access allowed\n"
" Running app:\n" " Running app:\n"
" Partition address: 0x%X\n" " Partition address: 0x%" PRIX32 "\n"
" Used size: %zu bytes (0x%X)", " Used size: %zu bytes (0x%zX)",
this->running_app_offset_, this->running_app_size_, this->running_app_size_); this->running_app_offset_, this->running_app_size_, this->running_app_size_);
#ifdef USE_ESP32 #ifdef USE_ESP32
@@ -378,7 +378,7 @@ void ESPHomeOTAComponent::handle_data_() {
} }
ota_size = (static_cast<size_t>(buf[0]) << 24) | (static_cast<size_t>(buf[1]) << 16) | ota_size = (static_cast<size_t>(buf[0]) << 24) | (static_cast<size_t>(buf[1]) << 16) |
(static_cast<size_t>(buf[2]) << 8) | buf[3]; (static_cast<size_t>(buf[2]) << 8) | buf[3];
ESP_LOGV(TAG, "Size is %u bytes", ota_size); ESP_LOGV(TAG, "Size is %zu bytes", ota_size);
#ifndef USE_OTA_PARTITIONS #ifndef USE_OTA_PARTITIONS
if (ota_type != ota::OTA_TYPE_UPDATE_APP) { if (ota_type != ota::OTA_TYPE_UPDATE_APP) {
@@ -749,7 +749,7 @@ bool ESPHomeOTAComponent::handle_auth_send_() {
this->auth_buf_[0] = this->auth_type_; this->auth_buf_[0] = this->auth_type_;
hasher.get_hex(buf); hasher.get_hex(buf);
ESP_LOGV(TAG, "Auth: Nonce is %.*s", hex_size, buf); ESP_LOGV(TAG, "Auth: Nonce is %.*s", (int) hex_size, buf);
} }
// Try to write auth_type + nonce // Try to write auth_type + nonce
@@ -809,13 +809,13 @@ bool ESPHomeOTAComponent::handle_auth_read_() {
hasher.add(nonce, hex_size * 2); // Add both nonce and cnonce (contiguous in buffer) hasher.add(nonce, hex_size * 2); // Add both nonce and cnonce (contiguous in buffer)
hasher.calculate(); hasher.calculate();
ESP_LOGV(TAG, "Auth: CNonce is %.*s", hex_size, cnonce); ESP_LOGV(TAG, "Auth: CNonce is %.*s", (int) hex_size, cnonce);
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
char computed_hash[SHA256_HEX_SIZE + 1]; // Buffer for hex-encoded hash (max expected length + null terminator) char computed_hash[SHA256_HEX_SIZE + 1]; // Buffer for hex-encoded hash (max expected length + null terminator)
hasher.get_hex(computed_hash); hasher.get_hex(computed_hash);
ESP_LOGV(TAG, "Auth: Result is %.*s", hex_size, computed_hash); ESP_LOGV(TAG, "Auth: Result is %.*s", (int) hex_size, computed_hash);
#endif #endif
ESP_LOGV(TAG, "Auth: Response is %.*s", hex_size, response); ESP_LOGV(TAG, "Auth: Response is %.*s", (int) hex_size, response);
// Compare response // Compare response
bool matches = hasher.equals_hex(response); bool matches = hasher.equals_hex(response);
esphome/components/fastled_base/fastled_light.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ void FastLEDLightOutput::dump_config() {
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
"FastLED light:\n" "FastLED light:\n"
" Num LEDs: %u\n" " Num LEDs: %u\n"
" Max refresh rate: %u", " Max refresh rate: %" PRIu32,
this->num_leds_, this->max_refresh_rate_.value_or(0)); this->num_leds_, this->max_refresh_rate_.value_or(0));
} }
void FastLEDLightOutput::write_state(light::LightState *state) { void FastLEDLightOutput::write_state(light::LightState *state) {
esphome/components/inkplate/inkplate.cpp
+1 -1
View File
@@ -319,7 +319,7 @@ void Inkplate::fill(Color color) {
memset(this->partial_buffer_, fill, this->get_buffer_length_()); memset(this->partial_buffer_, fill, this->get_buffer_length_());
} }
ESP_LOGV(TAG, "Fill finished (%ums)", millis() - start_time); ESP_LOGV(TAG, "Fill finished (%" PRIu32 "ms)", millis() - start_time);
} }
void Inkplate::display() { void Inkplate::display() {
esphome/components/midea/air_conditioner.cpp
+2 -2
View File
@@ -130,8 +130,8 @@ ClimateTraits AirConditioner::traits() {
void AirConditioner::dump_config() { void AirConditioner::dump_config() {
ESP_LOGCONFIG(Constants::TAG, ESP_LOGCONFIG(Constants::TAG,
"MideaDongle:\n" "MideaDongle:\n"
" [x] Period: %dms\n" " [x] Period: %" PRIu32 "ms\n"
" [x] Response timeout: %dms\n" " [x] Response timeout: %" PRIu32 "ms\n"
" [x] Request attempts: %d", " [x] Request attempts: %d",
this->base_.getPeriod(), this->base_.getTimeout(), this->base_.getNumAttempts()); this->base_.getPeriod(), this->base_.getTimeout(), this->base_.getNumAttempts());
#ifdef USE_REMOTE_TRANSMITTER #ifdef USE_REMOTE_TRANSMITTER
esphome/components/ota/ota_partitions_esp_idf.cpp
+2 -2
View File
@@ -210,7 +210,7 @@ OTAResponseTypes IDFOTABackend::update_partition_table() {
ESP_LOGE(TAG, "Cannot resolve running app partition at address 0x%" PRIX32, running_app_offset); ESP_LOGE(TAG, "Cannot resolve running app partition at address 0x%" PRIX32, running_app_offset);
return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE; return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE;
} }
ESP_LOGD(TAG, "Copying running app from 0x%X to 0x%X (size: 0x%X)", running_app_part->address, ESP_LOGD(TAG, "Copying running app from 0x%" PRIX32 " to 0x%" PRIX32 " (size: 0x%zX)", running_app_part->address,
plan.copy_dest_part->address, running_app_size); plan.copy_dest_part->address, running_app_size);
err = esp_partition_copy(plan.copy_dest_part, 0, running_app_part, 0, running_app_size); err = esp_partition_copy(plan.copy_dest_part, 0, running_app_part, 0, running_app_size);
if (err != ESP_OK) { if (err != ESP_OK) {
@@ -261,7 +261,7 @@ OTAResponseTypes IDFOTABackend::update_partition_table() {
ESP_LOGE(TAG, "Selected app partition not found after partition table update"); ESP_LOGE(TAG, "Selected app partition not found after partition table update");
return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE; return OTA_RESPONSE_ERROR_PARTITION_TABLE_UPDATE;
} }
ESP_LOGD(TAG, "Setting next boot partition to 0x%X", new_boot_partition->address); ESP_LOGD(TAG, "Setting next boot partition to 0x%" PRIX32, new_boot_partition->address);
err = esp_ota_set_boot_partition(new_boot_partition); err = esp_ota_set_boot_partition(new_boot_partition);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (err=0x%X)", err); ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (err=0x%X)", err);
esphome/components/remote_receiver/remote_receiver.cpp
+4 -4
View File
@@ -78,10 +78,10 @@ void RemoteReceiverComponent::setup() {
void RemoteReceiverComponent::dump_config() { void RemoteReceiverComponent::dump_config() {
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
"Remote Receiver:\n" "Remote Receiver:\n"
" Buffer Size: %u\n" " Buffer Size: %" PRIu32 "\n"
" Tolerance: %u%s\n" " Tolerance: %" PRIu32 "%s\n"
" Filter out pulses shorter than: %u us\n" " Filter out pulses shorter than: %" PRIu32 " us\n"
" Signal is done after %u us of no changes", " Signal is done after %" PRIu32 " us of no changes",
this->buffer_size_, this->tolerance_, this->buffer_size_, this->tolerance_,
(this->tolerance_mode_ == remote_base::TOLERANCE_MODE_TIME) ? " us" : "%", this->filter_us_, (this->tolerance_mode_ == remote_base::TOLERANCE_MODE_TIME) ? " us" : "%", this->filter_us_,
this->idle_us_); this->idle_us_);
esphome/components/sendspin/sendspin_hub.cpp
+2 -2
View File
@@ -153,7 +153,7 @@ bool SendspinHub::save_last_server_hash(uint32_t hash) {
LastPlayedServerPref pref{.server_id_hash = hash}; LastPlayedServerPref pref{.server_id_hash = hash};
bool ok = this->last_played_server_pref_.save(&pref); bool ok = this->last_played_server_pref_.save(&pref);
if (ok) { if (ok) {
ESP_LOGD(TAG, "Persisted last played server hash: 0x%08X", hash); ESP_LOGD(TAG, "Persisted last played server hash: 0x%08" PRIX32, hash);
} else { } else {
ESP_LOGW(TAG, "Failed to persist last played server hash"); ESP_LOGW(TAG, "Failed to persist last played server hash");
} }
@@ -164,7 +164,7 @@ bool SendspinHub::save_last_server_hash(uint32_t hash) {
std::optional<uint32_t> SendspinHub::load_last_server_hash() { std::optional<uint32_t> SendspinHub::load_last_server_hash() {
LastPlayedServerPref pref{}; LastPlayedServerPref pref{};
if (this->last_played_server_pref_.load(&pref)) { if (this->last_played_server_pref_.load(&pref)) {
ESP_LOGI(TAG, "Loaded last played server hash: 0x%08X", pref.server_id_hash); ESP_LOGI(TAG, "Loaded last played server hash: 0x%08" PRIX32, pref.server_id_hash);
return pref.server_id_hash; return pref.server_id_hash;
} }
return std::nullopt; return std::nullopt;
esphome/components/total_daily_energy/total_daily_energy.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ void TotalDailyEnergy::schedule_midnight_reset_() {
timeout_seconds = seconds_until_midnight + 1; timeout_seconds = seconds_until_midnight + 1;
} }
ESP_LOGD(TAG, "Scheduling midnight check in %us", timeout_seconds); ESP_LOGD(TAG, "Scheduling midnight check in %" PRIu32 "s", timeout_seconds);
this->set_timeout(TIMEOUT_ID_MIDNIGHT, timeout_seconds * MILLIS_PER_SECOND, this->set_timeout(TIMEOUT_ID_MIDNIGHT, timeout_seconds * MILLIS_PER_SECOND,
[this]() { this->schedule_midnight_reset_(); }); [this]() { this->schedule_midnight_reset_(); });
} }