mirror of
https://github.com/esphome/esphome.git
synced 2024-12-26 07:24:54 +01:00
whitespace and clang-format cleanup
This commit is contained in:
parent
637cc3ac6b
commit
6e5ecf72ac
3 changed files with 7 additions and 9 deletions
|
@ -15,8 +15,7 @@ ListEntitiesIterator::ListEntitiesIterator(WebServer *web_server) : web_server_(
|
||||||
bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
|
bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
|
||||||
if (!this->has_connected_client())
|
if (!this->has_connected_client())
|
||||||
return true;
|
return true;
|
||||||
return this->process(
|
return this->process(this->web_server_->binary_sensor_json(binary_sensor, binary_sensor->state, DETAIL_ALL));
|
||||||
this->web_server_->binary_sensor_json(binary_sensor, binary_sensor->state, DETAIL_ALL));
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_COVER
|
#ifdef USE_COVER
|
||||||
|
@ -65,8 +64,7 @@ bool ListEntitiesIterator::on_button(button::Button *button) {
|
||||||
bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
|
bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
|
||||||
if (!this->has_connected_client())
|
if (!this->has_connected_client())
|
||||||
return true;
|
return true;
|
||||||
return this->process(
|
return this->process(this->web_server_->text_sensor_json(text_sensor, text_sensor->state, DETAIL_ALL));
|
||||||
this->web_server_->text_sensor_json(text_sensor, text_sensor->state, DETAIL_ALL));
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_LOCK
|
#ifdef USE_LOCK
|
||||||
|
@ -145,8 +143,8 @@ bool ListEntitiesIterator::on_select(select::Select *select) {
|
||||||
bool ListEntitiesIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
|
bool ListEntitiesIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
|
||||||
if (!this->has_connected_client())
|
if (!this->has_connected_client())
|
||||||
return true;
|
return true;
|
||||||
return this->process(
|
return this->process(this->web_server_->alarm_control_panel_json(a_alarm_control_panel,
|
||||||
this->web_server_->alarm_control_panel_json(a_alarm_control_panel, a_alarm_control_panel->get_state(), DETAIL_ALL));
|
a_alarm_control_panel->get_state(), DETAIL_ALL));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -155,7 +153,7 @@ bool ListEntitiesIterator::on_event(event::Event *event) {
|
||||||
// Null event type, since we are just iterating over entities
|
// Null event type, since we are just iterating over entities
|
||||||
const std::string null_event_type = "";
|
const std::string null_event_type = "";
|
||||||
if (!this->has_connected_client())
|
if (!this->has_connected_client())
|
||||||
return true;
|
return true;
|
||||||
return this->process(this->web_server_->event_json(event, null_event_type, DETAIL_ALL));
|
return this->process(this->web_server_->event_json(event, null_event_type, DETAIL_ALL));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,7 +9,7 @@ namespace esphome {
|
||||||
namespace web_server {
|
namespace web_server {
|
||||||
|
|
||||||
StatesIterator::StatesIterator(WebServer *web_server) : ListEntitiesIterator::ListEntitiesIterator(web_server) {}
|
StatesIterator::StatesIterator(WebServer *web_server) : ListEntitiesIterator::ListEntitiesIterator(web_server) {}
|
||||||
|
|
||||||
bool StatesIterator::has_connected_client() { return true; }
|
bool StatesIterator::has_connected_client() { return true; }
|
||||||
|
|
||||||
bool StatesIterator::process(const std::string &s) {
|
bool StatesIterator::process(const std::string &s) {
|
||||||
|
|
|
@ -21,7 +21,7 @@ class StatesIterator : public ListEntitiesIterator {
|
||||||
protected:
|
protected:
|
||||||
// WebServer *web_server_;
|
// WebServer *web_server_;
|
||||||
optional<std::string> str_;
|
optional<std::string> str_;
|
||||||
|
|
||||||
bool has_connected_client() override;
|
bool has_connected_client() override;
|
||||||
bool process(const std::string &s) override;
|
bool process(const std::string &s) override;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue