uvos/UvosSmartHomeInterface
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Add groups to the sensors

Browse source
This commit is contained in:
Carl Philipp Klemm 2026-04-21 17:17:56 +02:00
parent 2fbfd1d458
commit 221cb519a2
6 changed files with 68 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/sensors/sensor.cpp
View file

@ -33,6 +33,29 @@ void SensorStore::load(const QJsonObject& json)
}
}
std::vector<QString> SensorStore::allGroups() const
{
std::vector<QString> groups;
for(const Sensor& sensor : sensors_)
{
if(!sensor.groupName.isEmpty())
{
bool found = false;
for(const QString& group : groups)
{
if(group == sensor.groupName)
{
found = true;
break;
}
}
if(!found)
groups.push_back(sensor.groupName);
}
}
return groups;
}
void SensorStore::sensorGotState(const Sensor& sensor, sensor_update_type_t type)
{
bool inSensors = false;
@ -48,6 +71,7 @@ void SensorStore::sensorGotState(const Sensor& sensor, sensor_update_type_t type
{
sensors_[i].name = sensor.name;
sensors_[i].hidden = sensor.hidden;
sensors_[i].groupName = sensor.groupName;
// Also update knownSensors_
for(Sensor& known : knownSensors_)
{
@ -55,6 +79,7 @@ void SensorStore::sensorGotState(const Sensor& sensor, sensor_update_type_t type
{
known.name = sensor.name;
known.hidden = sensor.hidden;
known.groupName = sensor.groupName;
break;
}
}
@ -76,6 +101,7 @@ void SensorStore::sensorGotState(const Sensor& sensor, sensor_update_type_t type
{
newSensor.name = known.name;
newSensor.hidden = known.hidden;
newSensor.groupName = known.groupName;
break;
}
}

10
src/sensors/sensor.h
View file

@ -37,17 +37,18 @@ public:
uint64_t id;
float field;
QString name;
QString groupName;
QDateTime lastSeen;
bool hidden;
Sensor(sensor_type_t typeIn, uint64_t idIn, float fieldIn = 0, QString nameIn = "", bool hiddenIn = false): type(typeIn),
id(idIn), field(fieldIn), name(nameIn), hidden(hiddenIn)
Sensor(sensor_type_t typeIn, uint64_t idIn, float fieldIn = 0, QString nameIn = "", bool hiddenIn = false, QString groupNameIn = ""): type(typeIn),
id(idIn), field(fieldIn), name(nameIn), groupName(groupNameIn), hidden(hiddenIn)
{
lastSeen = QDateTime::currentDateTime();
if(nameIn == "")
generateName();
}
Sensor(QString nameIn = "dummy"): type(TYPE_DUMMY), id(0), field(0), name(nameIn), hidden(false)
Sensor(QString nameIn = "dummy"): type(TYPE_DUMMY), id(0), field(0), name(nameIn), groupName(""), hidden(false)
{
lastSeen = QDateTime::currentDateTime();
}
@ -59,6 +60,7 @@ public:
lastSeen = QDateTime::fromString(json["LastSeen"].toString(""));
hidden = json["Hidden"].toBool(false);
name = json["Name"].toString();
groupName = json["GroupName"].toString();
if(name == "")
generateName();
}
@ -105,6 +107,7 @@ public:
json["Id"] = static_cast<int>(id);
json["Field"] = field;
json["Name"] = name;
json["GroupName"] = groupName;
json["LastSeen"] = lastSeen.toString();
json["Hidden"] = hidden;
json["Unit"] = getUnit();
@ -186,6 +189,7 @@ public:
void store(QJsonObject& json);
void load(const QJsonObject& json);
std::vector<QString> allGroups() const;
public slots: