sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-17 02:32:20 +01:00
Code Issues Releases Wiki Activity

Keep Unit of Measurement in Flash. (#4719)

Browse Source 
Co-authored-by: Your Name <you@example.com>
This commit is contained in:
Fabian
2023-05-10 01:42:55 +02:00
committed by GitHub
parent 3c05ae4e1a
commit 535003014b
6 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/number/number_traits.cpp
View File

@@ -6,15 +6,5 @@ namespace number {
static const char *const TAG = "number";
void NumberTraits::set_unit_of_measurement(const std::string &unit_of_measurement) {
this->unit_of_measurement_ = unit_of_measurement;
}
std::string NumberTraits::get_unit_of_measurement() {
if (this->unit_of_measurement_.has_value())
return *this->unit_of_measurement_;
return "";
}
} // namespace number
} // namespace esphome

8
esphome/components/number/number_traits.h
View File

@@ -12,7 +12,7 @@ enum NumberMode : uint8_t {
NUMBER_MODE_SLIDER = 2,
};
class NumberTraits : public EntityBase_DeviceClass {
class NumberTraits : public EntityBase_DeviceClass, public EntityBase_UnitOfMeasurement {
public:
// Set/get the number value boundaries.
void set_min_value(float min_value) { min_value_ = min_value; }
@@ -24,11 +24,6 @@ class NumberTraits : public EntityBase_DeviceClass {
void set_step(float step) { step_ = step; }
float get_step() const { return step_; }
/// Manually set the unit of measurement.
void set_unit_of_measurement(const std::string &unit_of_measurement);
/// Get the unit of measurement, using the manual override if set.
std::string get_unit_of_measurement();
// Set/get the frontend mode.
void set_mode(NumberMode mode) { this->mode_ = mode; }
NumberMode get_mode() const { return this->mode_; }
@@ -37,7 +32,6 @@ class NumberTraits : public EntityBase_DeviceClass {
float min_value_ = NAN;
float max_value_ = NAN;
float step_ = NAN;
optional<std::string> unit_of_measurement_; ///< Unit of measurement override
NumberMode mode_{NUMBER_MODE_AUTO};
};