Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-23 15:38:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

apply clang formatting fixes

Browse source
This commit is contained in:
hermlon 2024-09-10 20:26:04 +02:00
parent 8cbc49bf2b
commit 27865935fe
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
esphome/components/mqtt/mqtt_backend_esp8266.cpp
View file

@ -13,14 +13,14 @@ namespace mqtt {
static const char *const TAG = "mqtt-backend-esp8266"; static const char *const TAG = "mqtt-backend-esp8266";
void MQTTBackendESP8266::on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length) { void MQTTBackendESP8266::on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length) {
static_cast<MQTTBackendESP8266 *>(client->ref)->on_mqtt_message(client, topic, bytes, length); static_cast<MQTTBackendESP8266 *>(client->ref)->on_mqtt_message_(client, topic, bytes, length);
} }
void MQTTBackendESP8266::on_mqtt_message(MQTTClient *client, char topic[], char bytes[], int length) { void MQTTBackendESP8266::on_mqtt_message_(MQTTClient *client, char topic[], char bytes[], int length) {
this->on_message_.call(topic, bytes, length, 0, length); this->on_message_.call(topic, bytes, length, 0, length);
} }
void MQTTBackendESP8266::initialize() { void MQTTBackendESP8266::initialize_() {
#ifdef USE_MQTT_SECURE_CLIENT #ifdef USE_MQTT_SECURE_CLIENT
if (this->ca_certificate_str_.has_value()) { if (this->ca_certificate_str_.has_value()) {
this->ca_certificate_.append(this->ca_certificate_str_.value().c_str()); this->ca_certificate_.append(this->ca_certificate_str_.value().c_str());
@ -35,21 +35,23 @@ void MQTTBackendESP8266::initialize() {
#endif #endif
this->mqtt_client_.ref = this; this->mqtt_client_.ref = this;
mqtt_client_.onMessageAdvanced(MQTTBackendESP8266::on_mqtt_message_wrapper_); mqtt_client_.onMessageAdvanced(MQTTBackendESP8266::on_mqtt_message_wrapper);
this->is_initalized_ = true; this->is_initalized_ = true;
} }
void MQTTBackendESP8266::handleErrors() { void MQTTBackendESP8266::handle_errors_() {
lwmqtt_err_t error = this->mqtt_client_.lastError(); lwmqtt_err_t error = this->mqtt_client_.lastError();
lwmqtt_return_code_t return_code = this->mqtt_client_.returnCode(); lwmqtt_return_code_t return_code = this->mqtt_client_.returnCode();
if (error != LWMQTT_SUCCESS) { if (error != LWMQTT_SUCCESS) {
ESP_LOGD(TAG, "Error: %d, returnCode: %d", error, return_code); ESP_LOGD(TAG, "Error: %d, returnCode: %d", error, return_code);
/*
char buffer[128]; char buffer[128];
int code = this->wifi_client_.getLastSSLError(buffer, sizeof(buffer)); int code = this->wifi_client_.getLastSSLError(buffer, sizeof(buffer));
if (code != 0) { if (code != 0) {
ESP_LOGD(TAG, "SSL error code %d: %s", code, buffer); ESP_LOGD(TAG, "SSL error code %d: %s", code, buffer);
} }
*/
MQTTClientDisconnectReason reason = MQTTClientDisconnectReason::TCP_DISCONNECTED; MQTTClientDisconnectReason reason = MQTTClientDisconnectReason::TCP_DISCONNECTED;
@ -84,11 +86,11 @@ void MQTTBackendESP8266::handleErrors() {
void MQTTBackendESP8266::connect() { void MQTTBackendESP8266::connect() {
if (!this->is_initalized_) { if (!this->is_initalized_) {
this->initialize(); this->initialize_();
} }
this->mqtt_client_.begin(this->host_.c_str(), this->port_, this->wifi_client_); this->mqtt_client_.begin(this->host_.c_str(), this->port_, this->wifi_client_);
this->mqtt_client_.connect(this->client_id_.c_str(), this->username_.c_str(), this->password_.c_str()); this->mqtt_client_.connect(this->client_id_.c_str(), this->username_.c_str(), this->password_.c_str());
this->handleErrors(); this->handle_errors_();
} }
void MQTTBackendESP8266::loop() { void MQTTBackendESP8266::loop() {

6
esphome/components/mqtt/mqtt_backend_esp8266.h
View file

@ -94,10 +94,10 @@ class MQTTBackendESP8266 final : public MQTTBackend {
void set_ssl_fingerprint(const std::array<uint8_t, 20> &fingerprint) { this->ssl_fingerprint_ = fingerprint; }; void set_ssl_fingerprint(const std::array<uint8_t, 20> &fingerprint) { this->ssl_fingerprint_ = fingerprint; };
protected: protected:
void initialize(); void initialize_();
void handleErrors(); void handle_errors_();
static void on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length); static void on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length);
void on_mqtt_message(MQTTClient *client, char topic[], char bytes[], int length); void on_mqtt_message_(MQTTClient *client, char topic[], char bytes[], int length);
#ifdef USE_MQTT_SECURE_CLIENT #ifdef USE_MQTT_SECURE_CLIENT
WiFiClientSecure wifi_client_; WiFiClientSecure wifi_client_;

14
esphome/components/mqtt/mqtt_backend_libretiny.cpp
View file

@ -13,20 +13,20 @@ namespace mqtt {
static const char *const TAG = "mqtt-backend-libretiny"; static const char *const TAG = "mqtt-backend-libretiny";
void MQTTBackendLibreTiny::on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length) { void MQTTBackendLibreTiny::on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length) {
static_cast<MQTTBackendLibreTiny *>(client->ref)->on_mqtt_message(client, topic, bytes, length); static_cast<MQTTBackendLibreTiny *>(client->ref)->on_mqtt_message_(client, topic, bytes, length);
} }
void MQTTBackendLibreTiny::on_mqtt_message(MQTTClient *client, char topic[], char bytes[], int length) { void MQTTBackendLibreTiny::on_mqtt_message_(MQTTClient *client, char topic[], char bytes[], int length) {
this->on_message_.call(topic, bytes, length, 0, length); this->on_message_.call(topic, bytes, length, 0, length);
} }
void MQTTBackendLibreTiny::initialize() { void MQTTBackendLibreTiny::initialize_() {
this->mqtt_client_.ref = this; this->mqtt_client_.ref = this;
mqtt_client_.onMessageAdvanced(MQTTBackendLibreTiny::on_mqtt_message_wrapper_); mqtt_client_.onMessageAdvanced(MQTTBackendLibreTiny::on_mqtt_message_wrapper);
this->is_initalized_ = true; this->is_initalized_ = true;
} }
void MQTTBackendLibreTiny::handleErrors() { void MQTTBackendLibreTiny::handleErrors_() {
lwmqtt_err_t error = this->mqtt_client_.lastError(); lwmqtt_err_t error = this->mqtt_client_.lastError();
lwmqtt_return_code_t return_code = this->mqtt_client_.returnCode(); lwmqtt_return_code_t return_code = this->mqtt_client_.returnCode();
if (error != LWMQTT_SUCCESS) { if (error != LWMQTT_SUCCESS) {
@ -65,11 +65,11 @@ void MQTTBackendLibreTiny::handleErrors() {
void MQTTBackendLibreTiny::connect() { void MQTTBackendLibreTiny::connect() {
if (!this->is_initalized_) { if (!this->is_initalized_) {
this->initialize(); this->initialize_();
} }
this->mqtt_client_.begin(this->host_.c_str(), this->port_, this->wifi_client_); this->mqtt_client_.begin(this->host_.c_str(), this->port_, this->wifi_client_);
this->mqtt_client_.connect(this->client_id_.c_str(), this->username_.c_str(), this->password_.c_str()); this->mqtt_client_.connect(this->client_id_.c_str(), this->username_.c_str(), this->password_.c_str());
this->handleErrors(); this->handleErrors_();
} }
void MQTTBackendLibreTiny::loop() { void MQTTBackendLibreTiny::loop() {

6
esphome/components/mqtt/mqtt_backend_libretiny.h
View file

@ -93,10 +93,10 @@ class MQTTBackendLibreTiny final : public MQTTBackend {
void set_ssl_fingerprint(const std::array<uint8_t, 20> &fingerprint) { this->ssl_fingerprint_ = fingerprint; }; void set_ssl_fingerprint(const std::array<uint8_t, 20> &fingerprint) { this->ssl_fingerprint_ = fingerprint; };
protected: protected:
void initialize(); void initialize_();
void handleErrors(); void handleErrors_();
static void on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length); static void on_mqtt_message_wrapper(MQTTClient *client, char topic[], char bytes[], int length);
void on_mqtt_message(MQTTClient *client, char topic[], char bytes[], int length); void on_mqtt_message_(MQTTClient *client, char topic[], char bytes[], int length);
WiFiClient wifi_client_; WiFiClient wifi_client_;
MQTTClient mqtt_client_; MQTTClient mqtt_client_;

2
platformio.ini
View file

@ -59,7 +59,7 @@ lib_deps =
${common.lib_deps} ${common.lib_deps}
SPI ; spi (Arduino built-in) SPI ; spi (Arduino built-in)
Wire ; i2c (Arduino built-int) Wire ; i2c (Arduino built-int)
heman/AsyncMqttClient-esphome@1.0.0 ; mqtt 256dpi/MQTT@2.5.2 ; mqtt
esphome/ESPAsyncWebServer-esphome@3.2.2 ; web_server_base esphome/ESPAsyncWebServer-esphome@3.2.2 ; web_server_base
fastled/FastLED@3.3.2 ; fastled_base fastled/FastLED@3.3.2 ; fastled_base
mikalhart/TinyGPSPlus@1.0.2 ; gps mikalhart/TinyGPSPlus@1.0.2 ; gps