From c90ed3ab09f17d396bc6b208c0622c504172edec Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 8 May 2022 00:19:15 +0200 Subject: [PATCH] Fix a typo in the illuminancemeasurement cluster --- libnymea-zigbee/libnymea-zigbee.pro | 4 ++-- ...ent.cpp => zigbeeclusterilluminancemeasurement.cpp} | 8 ++++---- ...surment.h => zigbeeclusterilluminancemeasurement.h} | 10 +++++----- libnymea-zigbee/zigbeenodeendpoint.cpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename libnymea-zigbee/zcl/measurement/{zigbeeclusterilluminancemeasurment.cpp => zigbeeclusterilluminancemeasurement.cpp} (86%) rename libnymea-zigbee/zcl/measurement/{zigbeeclusterilluminancemeasurment.h => zigbeeclusterilluminancemeasurement.h} (86%) diff --git a/libnymea-zigbee/libnymea-zigbee.pro b/libnymea-zigbee/libnymea-zigbee.pro index 69b090a..00e3c94 100644 --- a/libnymea-zigbee/libnymea-zigbee.pro +++ b/libnymea-zigbee/libnymea-zigbee.pro @@ -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 \ diff --git a/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.cpp b/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.cpp similarity index 86% rename from libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.cpp rename to libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.cpp index 2cac9e0..dc18bc4 100644 --- a/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.cpp +++ b/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.cpp @@ -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); diff --git a/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.h b/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.h similarity index 86% rename from libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.h rename to libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.h index dbd27c2..3f5339f 100644 --- a/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurment.h +++ b/libnymea-zigbee/zcl/measurement/zigbeeclusterilluminancemeasurement.h @@ -25,8 +25,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef ZIGBEECLUSTERILLUMINANCEMEASURMENT_H -#define ZIGBEECLUSTERILLUMINANCEMEASURMENT_H +#ifndef ZIGBEECLUSTERILLUMINANCEMEASUREMENT_H +#define ZIGBEECLUSTERILLUMINANCEMEASUREMENT_H #include #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 diff --git a/libnymea-zigbee/zigbeenodeendpoint.cpp b/libnymea-zigbee/zigbeenodeendpoint.cpp index 9e0b376..a57fa78 100644 --- a/libnymea-zigbee/zigbeenodeendpoint.cpp +++ b/libnymea-zigbee/zigbeenodeendpoint.cpp @@ -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: