ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #50: Fix a typo in the illuminancemeasurement cluster

pull/56/head
jenkins 2022-06-07 23:06:16 +02:00
parent 19d262b459 c90ed3ab09
commit 59025c0c2e
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-zigbee/libnymea-zigbee.pro
View File

@ -48,7 +48,7 @@ SOURCES += \
zcl/lighting/zigbeeclustercolorcontrol.cpp \
zcl/manufacturerspecific/philips/zigbeeclustermanufacturerspecificphilips.cpp \
zcl/measurement/zigbeeclusterelectricalmeasurement.cpp \
zcl/measurement/zigbeeclusterilluminancemeasurment.cpp \
zcl/measurement/zigbeeclusterilluminancemeasurement.cpp \
zcl/measurement/zigbeeclusteroccupancysensing.cpp \
zcl/measurement/zigbeeclusterpressuremeasurement.cpp \
zcl/measurement/zigbeeclusterrelativehumiditymeasurement.cpp \
@ -124,7 +124,7 @@ HEADERS += \
zcl/lighting/zigbeeclustercolorcontrol.h \
zcl/manufacturerspecific/philips/zigbeeclustermanufacturerspecificphilips.h \
zcl/measurement/zigbeeclusterelectricalmeasurement.h \
zcl/measurement/zigbeeclusterilluminancemeasurment.h \
zcl/measurement/zigbeeclusterilluminancemeasurement.h \
zcl/measurement/zigbeeclusteroccupancysensing.h \
zcl/measurement/zigbeeclusterpressuremeasurement.h \
zcl/measurement/zigbeeclusterrelativehumiditymeasurement.h \

8
libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.cpp → libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.cpp
View File

@ -25,23 +25,23 @@
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "zigbeeclusterilluminancemeasurment.h"
#include "zigbeeclusterilluminancemeasurement.h"
#include "zigbeenetworkreply.h"
#include "loggingcategory.h"
#include "zigbeenetwork.h"
ZigbeeClusterIlluminanceMeasurment::ZigbeeClusterIlluminanceMeasurment(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent) :
ZigbeeClusterIlluminanceMeasurement::ZigbeeClusterIlluminanceMeasurement(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent) :
ZigbeeCluster(network, node, endpoint, ZigbeeClusterLibrary::ClusterIdIlluminanceMeasurement, direction, parent)
{
}
quint16 ZigbeeClusterIlluminanceMeasurment::illuminance() const
quint16 ZigbeeClusterIlluminanceMeasurement::illuminance() const
{
return m_illuminance;
}
void ZigbeeClusterIlluminanceMeasurment::setAttribute(const ZigbeeClusterAttribute &attribute)
void ZigbeeClusterIlluminanceMeasurement::setAttribute(const ZigbeeClusterAttribute &attribute)
{
ZigbeeCluster::setAttribute(attribute);

10
libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.h → libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.h
View File

@ -25,8 +25,8 @@
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef ZIGBEECLUSTERILLUMINANCEMEASURMENT_H
#define ZIGBEECLUSTERILLUMINANCEMEASURMENT_H
#ifndef ZIGBEECLUSTERILLUMINANCEMEASUREMENT_H
#define ZIGBEECLUSTERILLUMINANCEMEASUREMENT_H
#include <QObject>
#include "zcl/zigbeecluster.h"
@ -37,7 +37,7 @@ class ZigbeeNetwork;
class ZigbeeNodeEndpoint;
class ZigbeeNetworkReply;
class ZigbeeClusterIlluminanceMeasurment : public ZigbeeCluster
class ZigbeeClusterIlluminanceMeasurement : public ZigbeeCluster
{
Q_OBJECT
@ -61,7 +61,7 @@ public:
};
Q_ENUM(LightSensorType)
explicit ZigbeeClusterIlluminanceMeasurment(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent = nullptr);
explicit ZigbeeClusterIlluminanceMeasurement(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent = nullptr);
quint16 illuminance() const;
@ -76,4 +76,4 @@ signals:
};
#endif // ZIGBEECLUSTERILLUMINANCEMEASURMENT_H
#endif // ZIGBEECLUSTERILLUMINANCEMEASUREMENT_H

4
libnymea-zigbee/zigbeenodeendpoint.cpp
View File

@ -50,7 +50,7 @@
#include "zcl/closures/zigbeeclusterdoorlock.h"
#include "zcl/measurement/zigbeeclusteroccupancysensing.h"
#include "zcl/measurement/zigbeeclusterilluminancemeasurment.h"
#include "zcl/measurement/zigbeeclusterilluminancemeasurement.h"
#include "zcl/measurement/zigbeeclustertemperaturemeasurement.h"
#include "zcl/measurement/zigbeeclusterrelativehumiditymeasurement.h"
#include "zcl/measurement/zigbeeclusterpressuremeasurement.h"
@ -239,7 +239,7 @@ ZigbeeCluster *ZigbeeNodeEndpoint::createCluster(ZigbeeClusterLibrary::ClusterId
// Measurement
case ZigbeeClusterLibrary::ClusterIdIlluminanceMeasurement:
return new ZigbeeClusterIlluminanceMeasurment(m_network, m_node, this, direction, this);
return new ZigbeeClusterIlluminanceMeasurement(m_network, m_node, this, direction, this);
case ZigbeeClusterLibrary::ClusterIdTemperatureMeasurement:
return new ZigbeeClusterTemperatureMeasurement(m_network, m_node, this, direction, this);
case ZigbeeClusterLibrary::ClusterIdRelativeHumidityMeasurement: