Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-28 00:11:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

disable some clang-tidy warnings

Browse source
This commit is contained in:
oarcher 2024-05-31 12:35:29 +02:00
parent a15c02478a
commit e1267aedaf
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
esphome/components/modem/modem_component.cpp
View file

@ -124,6 +124,7 @@ void ModemComponent::setup() {
ESP_LOGV(TAG, "DCE setup"); ESP_LOGV(TAG, "DCE setup");
// clang-format off ( create_modem_dce(dce_factory::ModemType, config, std::move(dte), netif) is private )
switch (this->model_) { switch (this->model_) {
case ModemModel::BG96: case ModemModel::BG96:
this->dce = create_BG96_dce(&dce_config, this->dte_, this->ppp_netif_); this->dce = create_BG96_dce(&dce_config, this->dte_, this->ppp_netif_);
@ -138,10 +139,11 @@ void ModemComponent::setup() {
this->dce = create_SIM7600_dce(&dce_config, this->dte_, this->ppp_netif_); this->dce = create_SIM7600_dce(&dce_config, this->dte_, this->ppp_netif_);
break; break;
default: default:
ESP_LOGE(TAG, "Unknown model"); ESP_LOGE(TAG, "Unknown modem model");
return; return;
break; break;
} }
// clang-format on
assert(this->dce); assert(this->dce);

9
esphome/components/modem/modem_component.h
View file

@ -11,7 +11,13 @@
// esp_modem will use esphome logger (needed if other components include esphome/core/log.h) // esp_modem will use esphome logger (needed if other components include esphome/core/log.h)
// We need to do this because "cxx_include/esp_modem_api.hpp" is not a pure C++ header, and use logging. // We need to do this because "cxx_include/esp_modem_api.hpp" is not a pure C++ header, and use logging.
// FIXME: Find another workaround. clang is currently disabled.
// error: using declarations in the global namespace in headers are prohibited
// [google-global-names-in-headers,-warnings-as-errors]
// clang-format off
using esphome::esp_log_printf_; using esphome::esp_log_printf_;
// clang-format on
#include <cxx_include/esp_modem_api.hpp> #include <cxx_include/esp_modem_api.hpp>
#include <driver/gpio.h> #include <driver/gpio.h>
#include <esp_modem_config.h> #include <esp_modem_config.h>
@ -31,7 +37,7 @@ enum class ModemComponentState {
CONNECTED, CONNECTED,
}; };
enum class ModemModel { BG96, SIM800, SIM7000, SIM7070, SIM7070_GNSS, SIM7600, UNKNOWN }; enum class ModemModel { BG96, SIM800, SIM7000, SIM7070, SIM7600, UNKNOWN };
class ModemComponent : public Component { class ModemComponent : public Component {
public: public:
@ -73,7 +79,6 @@ class ModemComponent : public Component {
{"SIM800", ModemModel::SIM800}, {"SIM800", ModemModel::SIM800},
{"SIM7000", ModemModel::SIM7000}, {"SIM7000", ModemModel::SIM7000},
{"SIM7070", ModemModel::SIM7070}, {"SIM7070", ModemModel::SIM7070},
{"SIM7070_GNSS", ModemModel::SIM7070_GNSS},
{"SIM7600", ModemModel::SIM7600}}; {"SIM7600", ModemModel::SIM7600}};
std::shared_ptr<DTE> dte_; std::shared_ptr<DTE> dte_;
esp_netif_t *ppp_netif_{nullptr}; esp_netif_t *ppp_netif_{nullptr};