Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-18 15:57:58 +01:00
Code Issues Projects Releases Wiki Activity

Add new total_increasing state-class for Home Assistant 2021.9+ (#2166)

Browse Source
This commit is contained in:
Jesse Hills 2021-08-18 11:04:13 +12:00 committed by GitHub
parent fbd9e87b51
commit f0b14055b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esphome/components/api/api.proto
View File

@ -448,6 +448,7 @@ message LightCommandRequest {
enum SensorStateClass { enum SensorStateClass {
STATE_CLASS_NONE = 0; STATE_CLASS_NONE = 0;
STATE_CLASS_MEASUREMENT = 1; STATE_CLASS_MEASUREMENT = 1;
STATE_CLASS_TOTAL_INCREASING = 2;
} }
enum SensorLastResetType { enum SensorLastResetType {

2
esphome/components/api/api_pb2.cpp
View File

@ -94,6 +94,8 @@ template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::Sens
return "STATE_CLASS_NONE"; return "STATE_CLASS_NONE";
case enums::STATE_CLASS_MEASUREMENT: case enums::STATE_CLASS_MEASUREMENT:
return "STATE_CLASS_MEASUREMENT"; return "STATE_CLASS_MEASUREMENT";
case enums::STATE_CLASS_TOTAL_INCREASING:
return "STATE_CLASS_TOTAL_INCREASING";
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }

1
esphome/components/api/api_pb2.h
View File

@ -47,6 +47,7 @@ enum ColorMode : uint32_t {
enum SensorStateClass : uint32_t { enum SensorStateClass : uint32_t {
STATE_CLASS_NONE = 0, STATE_CLASS_NONE = 0,
STATE_CLASS_MEASUREMENT = 1, STATE_CLASS_MEASUREMENT = 1,
STATE_CLASS_TOTAL_INCREASING = 2,
}; };
enum SensorLastResetType : uint32_t { enum SensorLastResetType : uint32_t {
LAST_RESET_NONE = 0, LAST_RESET_NONE = 0,

1
esphome/components/sensor/__init__.py
View File

@ -81,6 +81,7 @@ StateClasses = sensor_ns.enum("StateClass")
STATE_CLASSES = { STATE_CLASSES = {
"": StateClasses.STATE_CLASS_NONE, "": StateClasses.STATE_CLASS_NONE,
"measurement": StateClasses.STATE_CLASS_MEASUREMENT, "measurement": StateClasses.STATE_CLASS_MEASUREMENT,
"total_increasing": StateClasses.STATE_CLASS_TOTAL_INCREASING,
} }
validate_state_class = cv.enum(STATE_CLASSES, lower=True, space="_") validate_state_class = cv.enum(STATE_CLASSES, lower=True, space="_")

4
esphome/components/sensor/sensor.cpp
View File

@ -10,6 +10,8 @@ const char *state_class_to_string(StateClass state_class) {
switch (state_class) { switch (state_class) {
case STATE_CLASS_MEASUREMENT: case STATE_CLASS_MEASUREMENT:
return "measurement"; return "measurement";
case STATE_CLASS_TOTAL_INCREASING:
return "total_increasing";
case STATE_CLASS_NONE: case STATE_CLASS_NONE:
default: default:
return ""; return "";
@ -72,6 +74,8 @@ void Sensor::set_state_class(StateClass state_class) { this->state_class = state
void Sensor::set_state_class(const std::string &state_class) { void Sensor::set_state_class(const std::string &state_class) {
if (str_equals_case_insensitive(state_class, "measurement")) { if (str_equals_case_insensitive(state_class, "measurement")) {
this->state_class = STATE_CLASS_MEASUREMENT; this->state_class = STATE_CLASS_MEASUREMENT;
} else if (str_equals_case_insensitive(state_class, "total_increasing")) {
this->state_class = STATE_CLASS_TOTAL_INCREASING;
} else { } else {
ESP_LOGW(TAG, "'%s' - Unrecognized state class %s", this->get_name().c_str(), state_class.c_str()); ESP_LOGW(TAG, "'%s' - Unrecognized state class %s", this->get_name().c_str(), state_class.c_str());
} }

1
esphome/components/sensor/sensor.h
View File

@ -37,6 +37,7 @@ namespace sensor {
enum StateClass : uint8_t { enum StateClass : uint8_t {
STATE_CLASS_NONE = 0, STATE_CLASS_NONE = 0,
STATE_CLASS_MEASUREMENT = 1, STATE_CLASS_MEASUREMENT = 1,
STATE_CLASS_TOTAL_INCREASING = 2,
}; };
const char *state_class_to_string(StateClass state_class); const char *state_class_to_string(StateClass state_class);

3
esphome/const.py
View File

@ -841,6 +841,9 @@ STATE_CLASS_NONE = ""
# The state represents a measurement in present time # The state represents a measurement in present time
STATE_CLASS_MEASUREMENT = "measurement" STATE_CLASS_MEASUREMENT = "measurement"
# The state represents a total that only increases, a decrease is considered a reset.
STATE_CLASS_TOTAL_INCREASING = "total_increasing"
# This sensor does not support resetting. ie, it is not accumulative # This sensor does not support resetting. ie, it is not accumulative
LAST_RESET_TYPE_NONE = "" LAST_RESET_TYPE_NONE = ""
# This sensor is expected to never reset its value # This sensor is expected to never reset its value