sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-15 15:18:16 +00:00
Code Issues Releases Wiki Activity

Make method protected

Browse Source
This commit is contained in:
clydebarrow 2025-02-24 11:51:34 +11:00
parent 4503acf3dc
commit 51b095bbf5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/uptime/text_sensor/uptime_text_sensor.cpp
View File

@ -16,7 +16,7 @@ void UptimeTextSensor::setup() {
this->update(); this->update();
} }
void UptimeTextSensor::insert_buffer(std::string &buffer, const char *key, unsigned value) const { void UptimeTextSensor::insert_buffer_(std::string &buffer, const char *key, unsigned value) const {
if (!buffer.empty() && !this->separator_.empty()) if (!buffer.empty() && !this->separator_.empty())
buffer.insert(0, this->separator_); buffer.insert(0, this->separator_);
buffer.insert(0, str_sprintf("%u%s", value, key)); buffer.insert(0, str_sprintf("%u%s", value, key));
@ -38,25 +38,25 @@ void UptimeTextSensor::update() {
unsigned remainder = uptime % 60; unsigned remainder = uptime % 60;
uptime /= 60; uptime /= 60;
if (interval < 30) { if (interval < 30) {
insert_buffer(buffer, "s", remainder); this->insert_buffer_(buffer, "s", remainder);
if (uptime == 0) if (uptime == 0)
break; break;
} }
remainder = uptime % 60; remainder = uptime % 60;
uptime /= 60; uptime /= 60;
if (interval < 1800) { if (interval < 1800) {
insert_buffer(buffer, "m", remainder); this->insert_buffer_(buffer, "m", remainder);
if (uptime == 0) if (uptime == 0)
break; break;
} }
remainder = uptime % 24; remainder = uptime % 24;
uptime /= 24; uptime /= 24;
if (interval < 12 * 3600) { if (interval < 12 * 3600) {
insert_buffer(buffer, "h", remainder); this->insert_buffer_(buffer, "h", remainder);
if (uptime == 0) if (uptime == 0)
break; break;
} }
insert_buffer(buffer, "d", (unsigned) uptime); this->insert_buffer_(buffer, "d", (unsigned) uptime);
break; break;
} }
this->publish_state(buffer); this->publish_state(buffer);

2
esphome/components/uptime/text_sensor/uptime_text_sensor.h
View File

@ -13,13 +13,13 @@ class UptimeTextSensor : public text_sensor::TextSensor, public PollingComponent
void update() override; void update() override;
void dump_config() override; void dump_config() override;
void setup() override; void setup() override;
void insert_buffer(std::string &buffer, const char *key, unsigned value) const;
void set_separator(const std::string &separator) { this->separator_ = separator; } void set_separator(const std::string &separator) { this->separator_ = separator; }
float get_setup_priority() const override; float get_setup_priority() const override;
protected: protected:
void insert_buffer_(std::string &buffer, const char *key, unsigned value) const;
std::string separator_{}; std::string separator_{};
uint32_t uptime_{0}; // uptime in seconds, will overflow after 136 years uint32_t uptime_{0}; // uptime in seconds, will overflow after 136 years
uint32_t last_ms_{0}; uint32_t last_ms_{0};