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

Fixed formatting

Browse source
This commit is contained in:
hermlon 2024-08-28 16:19:43 +02:00
parent 0c837fd1f7
commit 81f03772ea
2 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,11 +8,11 @@ namespace esphome {
namespace mqtt { namespace mqtt {
static const char *const TAG = "mqtt-backend-esp8266"; static const char *const TAG = "mqtt-backend-esp8266";
MQTTBackendESP8266 *object; MQTTBackendESP8266 *object;
void MQTTBackendESP8266::on_mqtt_message_wrapper_(const char *topic, unsigned char *payload, unsigned int length) { void MQTTBackendESP8266::on_mqtt_message_wrapper_(const char *topic, unsigned char *payload, unsigned int length) {
object->on_mqtt_message_(topic, reinterpret_cast<const char*>(payload), length); object->on_mqtt_message_(topic, reinterpret_cast<const char *>(payload), length);
} }
void MQTTBackendESP8266::on_mqtt_message_(const char *topic, const char *payload, unsigned int length) { void MQTTBackendESP8266::on_mqtt_message_(const char *topic, const char *payload, unsigned int length) {
@ -21,7 +21,7 @@ void MQTTBackendESP8266::on_mqtt_message_(const char *topic, const char *payload
} }
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());
this->wifi_client_.setTrustAnchors(&this->ca_certificate_); this->wifi_client_.setTrustAnchors(&this->ca_certificate_);
@ -29,7 +29,7 @@ void MQTTBackendESP8266::initialize_() {
this->wifi_client_.setInsecure(); this->wifi_client_.setInsecure();
} }
} }
#endif #endif
object = this; object = this;
mqtt_client_.setCallback(MQTTBackendESP8266::on_mqtt_message_wrapper_); mqtt_client_.setCallback(MQTTBackendESP8266::on_mqtt_message_wrapper_);
@ -42,7 +42,7 @@ void MQTTBackendESP8266::loop() {
if (this->mqtt_client_.loop()) { if (this->mqtt_client_.loop()) {
if (!this->is_connected_) { if (!this->is_connected_) {
this->is_connected_ = true; this->is_connected_ = true;
/* /*
* PubSubClient doesn't expose session_present flag in CONNACK, passing the clean_session flag * PubSubClient doesn't expose session_present flag in CONNACK, passing the clean_session flag
* assumes the broker remembered it correctly * assumes the broker remembered it correctly
*/ */
@ -57,19 +57,26 @@ void MQTTBackendESP8266::loop() {
case MQTT_CONNECTION_LOST: case MQTT_CONNECTION_LOST:
case MQTT_CONNECT_FAILED: case MQTT_CONNECT_FAILED:
case MQTT_DISCONNECTED: case MQTT_DISCONNECTED:
reason = MQTTClientDisconnectReason::TCP_DISCONNECTED; break; reason = MQTTClientDisconnectReason::TCP_DISCONNECTED;
break;
case MQTT_CONNECT_BAD_PROTOCOL: case MQTT_CONNECT_BAD_PROTOCOL:
reason = MQTTClientDisconnectReason::MQTT_UNACCEPTABLE_PROTOCOL_VERSION; break; reason = MQTTClientDisconnectReason::MQTT_UNACCEPTABLE_PROTOCOL_VERSION;
break;
case MQTT_CONNECT_BAD_CLIENT_ID: case MQTT_CONNECT_BAD_CLIENT_ID:
reason = MQTTClientDisconnectReason::MQTT_IDENTIFIER_REJECTED; break; reason = MQTTClientDisconnectReason::MQTT_IDENTIFIER_REJECTED;
break;
case MQTT_CONNECT_UNAVAILABLE: case MQTT_CONNECT_UNAVAILABLE:
reason = MQTTClientDisconnectReason::MQTT_SERVER_UNAVAILABLE; break; reason = MQTTClientDisconnectReason::MQTT_SERVER_UNAVAILABLE;
break;
case MQTT_CONNECT_BAD_CREDENTIALS: case MQTT_CONNECT_BAD_CREDENTIALS:
reason = MQTTClientDisconnectReason::MQTT_MALFORMED_CREDENTIALS; break; reason = MQTTClientDisconnectReason::MQTT_MALFORMED_CREDENTIALS;
break;
case MQTT_CONNECT_UNAUTHORIZED: case MQTT_CONNECT_UNAUTHORIZED:
reason = MQTTClientDisconnectReason::MQTT_NOT_AUTHORIZED; break; reason = MQTTClientDisconnectReason::MQTT_NOT_AUTHORIZED;
break;
case MQTT_CONNECTED: case MQTT_CONNECTED:
assert(false); break; assert(false);
break;
} }
this->on_disconnect_.call(reason); this->on_disconnect_.call(reason);
} }

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

@ -17,15 +17,9 @@ namespace mqtt {
class MQTTBackendESP8266 final : public MQTTBackend { class MQTTBackendESP8266 final : public MQTTBackend {
public: public:
void set_keep_alive(uint16_t keep_alive) final { void set_keep_alive(uint16_t keep_alive) final { this->keep_alive_ = keep_alive; }
this->keep_alive_ = keep_alive; void set_client_id(const char *client_id) final { this->client_id_ = client_id; }
} void set_clean_session(bool clean_session) final { this->clean_session_ = clean_session; }
void set_client_id(const char *client_id) final {
this->client_id_ = client_id;
}
void set_clean_session(bool clean_session) final {
this->clean_session_ = clean_session;
}
void set_credentials(const char *username, const char *password) final { void set_credentials(const char *username, const char *password) final {
if (username) if (username)
this->username_ = username; this->username_ = username;
@ -41,13 +35,11 @@ class MQTTBackendESP8266 final : public MQTTBackend {
this->lwt_retain_ = retain; this->lwt_retain_ = retain;
} }
void set_server(network::IPAddress ip, uint16_t port) final { void set_server(network::IPAddress ip, uint16_t port) final {
ESP_LOGD("mqtt", "setting by ip");
this->host_ = ip.str(); this->host_ = ip.str();
this->port_ = port; this->port_ = port;
this->mqtt_client_.setServer(ip, port); this->mqtt_client_.setServer(ip, port);
} }
void set_server(const char *host, uint16_t port) final { void set_server(const char *host, uint16_t port) final {
ESP_LOGD("mqtt", "setting by host %s, port: %d", host, port);
this->host_ = host; this->host_ = host;
this->port_ = port; this->port_ = port;
this->mqtt_client_.setServer(this->host_.c_str(), port); this->mqtt_client_.setServer(this->host_.c_str(), port);
@ -72,15 +64,14 @@ class MQTTBackendESP8266 final : public MQTTBackend {
this->on_publish_.add(std::move(callback)); this->on_publish_.add(std::move(callback));
} }
bool connected() const final { bool connected() const final { return this->is_connected_; }
return this->is_connected_;
}
void connect() final { void connect() final {
if (!this->is_initalized_) { if (!this->is_initalized_) {
this->initialize_(); this->initialize_();
} }
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->lwt_topic_.c_str(), this->lwt_qos_, this->lwt_retain_, this->lwt_message_.c_str(), this->clean_session_); this->lwt_topic_.c_str(), this->lwt_qos_, this->lwt_retain_, this->lwt_message_.c_str(),
this->clean_session_);
} }
void disconnect() final { void disconnect() final {
if (this->is_initalized_) if (this->is_initalized_)
@ -90,25 +81,25 @@ class MQTTBackendESP8266 final : public MQTTBackend {
bool unsubscribe(const char *topic) final { return this->mqtt_client_.unsubscribe(topic); } bool unsubscribe(const char *topic) final { return this->mqtt_client_.unsubscribe(topic); }
bool publish(const char *topic, const char *payload, size_t length, uint8_t qos, bool retain) final { bool publish(const char *topic, const char *payload, size_t length, uint8_t qos, bool retain) final {
/* qos parameter is ignored, as PubSubClient can only publish QoS 0 messages */ /* qos parameter is ignored, as PubSubClient can only publish QoS 0 messages */
return this->mqtt_client_.publish(topic, reinterpret_cast<const uint8_t*>(payload), length, retain); return this->mqtt_client_.publish(topic, reinterpret_cast<const uint8_t *>(payload), length, retain);
} }
using MQTTBackend::publish; using MQTTBackend::publish;
void loop() final; void loop() final;
void set_ca_certificate(const std::string &cert) { ca_certificate_str_ = cert; } void set_ca_certificate(const std::string &cert) { this->ca_certificate_str_ = cert; }
void set_skip_cert_cn_check(bool skip_check) { skip_cert_cn_check_ = skip_check; } void set_skip_cert_cn_check(bool skip_check) { this->skip_cert_cn_check_ = skip_check; }
protected: protected:
void initialize_(); void initialize_();
static void on_mqtt_message_wrapper_(const char *topic, unsigned char *payload, unsigned int length); static void on_mqtt_message_wrapper_(const char *topic, unsigned char *payload, unsigned int length);
void on_mqtt_message_(const char *topic, const char *payload, unsigned int length); void on_mqtt_message_(const char *topic, const char *payload, unsigned int length);
#ifdef USE_MQTT_SECURE_CLIENT #ifdef USE_MQTT_SECURE_CLIENT
WiFiClientSecure wifi_client_; WiFiClientSecure wifi_client_;
#else #else
WiFiClient wifi_client_; WiFiClient wifi_client_;
#endif #endif
PubSubClient mqtt_client_{wifi_client_}; PubSubClient mqtt_client_{wifi_client_};
bool is_connected_{false}; bool is_connected_{false};