Add multistate output cluster
This commit is contained in:
parent
6c2bccd775
commit
ae18e793e6
@ -27,6 +27,7 @@ SOURCES += \
|
|||||||
zcl/general/zigbeeclusteridentify.cpp \
|
zcl/general/zigbeeclusteridentify.cpp \
|
||||||
zcl/general/zigbeeclusterlevelcontrol.cpp \
|
zcl/general/zigbeeclusterlevelcontrol.cpp \
|
||||||
zcl/general/zigbeeclustermultistateinput.cpp \
|
zcl/general/zigbeeclustermultistateinput.cpp \
|
||||||
|
zcl/general/zigbeeclustermultistateoutput.cpp \
|
||||||
zcl/general/zigbeeclusteronoff.cpp \
|
zcl/general/zigbeeclusteronoff.cpp \
|
||||||
zcl/general/zigbeeclusterpowerconfiguration.cpp \
|
zcl/general/zigbeeclusterpowerconfiguration.cpp \
|
||||||
zcl/hvac/zigbeeclusterthermostat.cpp \
|
zcl/hvac/zigbeeclusterthermostat.cpp \
|
||||||
@ -91,6 +92,7 @@ HEADERS += \
|
|||||||
zcl/general/zigbeeclusteridentify.h \
|
zcl/general/zigbeeclusteridentify.h \
|
||||||
zcl/general/zigbeeclusterlevelcontrol.h \
|
zcl/general/zigbeeclusterlevelcontrol.h \
|
||||||
zcl/general/zigbeeclustermultistateinput.h \
|
zcl/general/zigbeeclustermultistateinput.h \
|
||||||
|
zcl/general/zigbeeclustermultistateoutput.h \
|
||||||
zcl/general/zigbeeclusteronoff.h \
|
zcl/general/zigbeeclusteronoff.h \
|
||||||
zcl/general/zigbeeclusterpowerconfiguration.h \
|
zcl/general/zigbeeclusterpowerconfiguration.h \
|
||||||
zcl/hvac/zigbeeclusterthermostat.h \
|
zcl/hvac/zigbeeclusterthermostat.h \
|
||||||
|
|||||||
@ -35,11 +35,11 @@
|
|||||||
class ZigbeeClusterMultistateInput : public ZigbeeCluster
|
class ZigbeeClusterMultistateInput : public ZigbeeCluster
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
|
||||||
|
|
||||||
friend class ZigbeeNode;
|
friend class ZigbeeNode;
|
||||||
friend class ZigbeeNetwork;
|
friend class ZigbeeNetwork;
|
||||||
|
|
||||||
|
public:
|
||||||
enum Attribute {
|
enum Attribute {
|
||||||
AttributeDescription = 0x001C,
|
AttributeDescription = 0x001C,
|
||||||
AttributeOutOfService = 0x0051,
|
AttributeOutOfService = 0x0051,
|
||||||
@ -58,7 +58,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
void setAttribute(const ZigbeeClusterAttribute &attribute) override;
|
void setAttribute(const ZigbeeClusterAttribute &attribute) override;
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ZIGBEECLUSTERMULTISTATEINPUT_H
|
#endif // ZIGBEECLUSTERMULTISTATEINPUT_H
|
||||||
|
|||||||
@ -0,0 +1,41 @@
|
|||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
*
|
||||||
|
* Copyright 2013 - 2020, nymea GmbH
|
||||||
|
* Contact: contact@nymea.io
|
||||||
|
*
|
||||||
|
* This file is part of nymea-zigbee.
|
||||||
|
* This project including source code and documentation is protected by copyright law, and
|
||||||
|
* remains the property of nymea GmbH. All rights, including reproduction, publication,
|
||||||
|
* editing and translation, are reserved. The use of this project is subject to the terms of a
|
||||||
|
* license agreement to be concluded with nymea GmbH in accordance with the terms
|
||||||
|
* of use of nymea GmbH, available under https://nymea.io/license
|
||||||
|
*
|
||||||
|
* GNU Lesser General Public License Usage
|
||||||
|
* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
|
||||||
|
* Lesser General Public License as published by the Free Software Foundation; version 3.
|
||||||
|
* this project is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||||
|
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
* See the GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License along with this project.
|
||||||
|
* If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* For any further details and any questions please contact us under contact@nymea.io
|
||||||
|
* or see our FAQ/Licensing Information on https://nymea.io/license/faq
|
||||||
|
*
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
#include "zigbeeclustermultistateoutput.h"
|
||||||
|
#include "loggingcategory.h"
|
||||||
|
|
||||||
|
ZigbeeClusterMultistateOutput::ZigbeeClusterMultistateOutput(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent) :
|
||||||
|
ZigbeeCluster(network, node, endpoint, ZigbeeClusterLibrary::ClusterIdMultistateOutput, direction, parent)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ZigbeeClusterMultistateOutput::setAttribute(const ZigbeeClusterAttribute &attribute)
|
||||||
|
{
|
||||||
|
qCDebug(dcZigbeeCluster()) << "Update attribute" << m_node << m_endpoint << this << static_cast<Attribute>(attribute.id()) << attribute.dataType();
|
||||||
|
updateOrAddAttribute(attribute);
|
||||||
|
}
|
||||||
64
libnymea-zigbee/zcl/general/zigbeeclustermultistateoutput.h
Normal file
64
libnymea-zigbee/zcl/general/zigbeeclustermultistateoutput.h
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
*
|
||||||
|
* Copyright 2013 - 2020, nymea GmbH
|
||||||
|
* Contact: contact@nymea.io
|
||||||
|
*
|
||||||
|
* This file is part of nymea-zigbee.
|
||||||
|
* This project including source code and documentation is protected by copyright law, and
|
||||||
|
* remains the property of nymea GmbH. All rights, including reproduction, publication,
|
||||||
|
* editing and translation, are reserved. The use of this project is subject to the terms of a
|
||||||
|
* license agreement to be concluded with nymea GmbH in accordance with the terms
|
||||||
|
* of use of nymea GmbH, available under https://nymea.io/license
|
||||||
|
*
|
||||||
|
* GNU Lesser General Public License Usage
|
||||||
|
* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
|
||||||
|
* Lesser General Public License as published by the Free Software Foundation; version 3.
|
||||||
|
* this project is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||||
|
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
* See the GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License along with this project.
|
||||||
|
* If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* For any further details and any questions please contact us under contact@nymea.io
|
||||||
|
* or see our FAQ/Licensing Information on https://nymea.io/license/faq
|
||||||
|
*
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
#ifndef ZIGBEECLUSTERMULTISTATEOUTPUT_H
|
||||||
|
#define ZIGBEECLUSTERMULTISTATEOUTPUT_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
#include "zcl/zigbeecluster.h"
|
||||||
|
|
||||||
|
class ZigbeeClusterMultistateOutput : public ZigbeeCluster
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
friend class ZigbeeNode;
|
||||||
|
friend class ZigbeeNetwork;
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum Attribute {
|
||||||
|
AttributeStateText = 0x000E,
|
||||||
|
AttributeDescription = 0x001C,
|
||||||
|
AttributeNumberOfStates = 0x004A,
|
||||||
|
AttributeOutOfService = 0x0051,
|
||||||
|
AttributePresentValue = 0x0055,
|
||||||
|
AttributePriorityArray = 0x0057,
|
||||||
|
AttributeReliability = 0x0067,
|
||||||
|
AttributeRelinquishDefault = 0x0068,
|
||||||
|
AttributeStatusFlags = 0x006F,
|
||||||
|
AttributeApplicationType = 0x0100
|
||||||
|
};
|
||||||
|
Q_ENUM(Attribute)
|
||||||
|
|
||||||
|
explicit ZigbeeClusterMultistateOutput(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent = nullptr);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void setAttribute(const ZigbeeClusterAttribute &attribute) override;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ZIGBEECLUSTERMULTISTATEOUTPUT_H
|
||||||
@ -191,6 +191,8 @@ ZigbeeCluster *ZigbeeNodeEndpoint::createCluster(ZigbeeClusterLibrary::ClusterId
|
|||||||
return new ZigbeeClusterBinaryValue(m_network, m_node, this, direction, this);
|
return new ZigbeeClusterBinaryValue(m_network, m_node, this, direction, this);
|
||||||
case ZigbeeClusterLibrary::ClusterIdMultistateInput:
|
case ZigbeeClusterLibrary::ClusterIdMultistateInput:
|
||||||
return new ZigbeeClusterMultistateInput(m_network, m_node, this, direction, this);
|
return new ZigbeeClusterMultistateInput(m_network, m_node, this, direction, this);
|
||||||
|
case ZigbeeClusterLibrary::ClusterIdMultistateOutput:
|
||||||
|
return new ZigbeeClusterMultistateOutput(m_network, m_node, this, direction, this);
|
||||||
|
|
||||||
// Measurement
|
// Measurement
|
||||||
case ZigbeeClusterLibrary::ClusterIdIlluminanceMeasurement:
|
case ZigbeeClusterLibrary::ClusterIdIlluminanceMeasurement:
|
||||||
|
|||||||
@ -50,6 +50,7 @@
|
|||||||
#include "zcl/general/zigbeeclusterbinaryoutput.h"
|
#include "zcl/general/zigbeeclusterbinaryoutput.h"
|
||||||
#include "zcl/general/zigbeeclusterbinaryvalue.h"
|
#include "zcl/general/zigbeeclusterbinaryvalue.h"
|
||||||
#include "zcl/general/zigbeeclustermultistateinput.h"
|
#include "zcl/general/zigbeeclustermultistateinput.h"
|
||||||
|
#include "zcl/general/zigbeeclustermultistateoutput.h"
|
||||||
|
|
||||||
#include "zcl/closures/zigbeeclusterdoorlock.h"
|
#include "zcl/closures/zigbeeclusterdoorlock.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user