Skip to content

Commit d1fbe7b

Browse files
authored
Merge pull request dresden-elektronik#5079 from SwoopX/terncyfix
Fix: Resolve compile errors due to Terncy integration
2 parents 1c0cfa1 + e893aff commit d1fbe7b

5 files changed

+12
-4
lines changed

de_web.pro

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ HEADERS = bindings.h \
124124
group_info.h \
125125
json.h \
126126
light_node.h \
127+
mfspecific_cluster_xiaoyan.h \
127128
poll_control.h \
128129
poll_manager.h \
129130
product_match.h \

de_web_plugin.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "de_web_widget.h"
4040
#include "gateway_scanner.h"
4141
#include "json.h"
42+
#include "mfspecific_cluster_xiaoyan.h"
4243
#include "poll_control.h"
4344
#include "poll_manager.h"
4445
#include "product_match.h"

de_web_plugin_private.h

-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ using namespace deCONZ::literals;
220220
#define LEGRAND_CONTROL_CLUSTER_ID 0xFC40
221221
#define XIAOMI_CLUSTER_ID 0xFCC0
222222
#define ADUROLIGHT_CLUSTER_ID 0xFCCC
223-
#define XIAOYAN_CLUSTER_ID 0xFCCC
224223
#define XAL_CLUSTER_ID 0xFCCE
225224
#define BOSCH_AIR_QUALITY_CLUSTER_ID quint16(0xFDEF)
226225

mfspecific_cluster_xiaoyan.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "de_web_plugin.h"
22
#include "de_web_plugin_private.h"
3-
4-
#define XIAOYAN_ATTRID_ROTATION_ANGLE 0x001B
5-
#define XIAOYAN_ATTRID_DURATION 0x001A
3+
#include "mfspecific_cluster_xiaoyan.h"
64

75
/*! Handle packets related to the Xiaoyan FCCC cluster.
86
\param ind the APS level data indication containing the ZCL packet

mfspecific_cluster_xiaoyan.h

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#ifndef MFSPECIFIC_CLUSTER_XIAOYAN_H
2+
#define MFSPECIFIC_CLUSTER_XIAOYAN_H
3+
4+
#define XIAOYAN_CLUSTER_ID 0xFCCC
5+
6+
#define XIAOYAN_ATTRID_ROTATION_ANGLE 0x001B
7+
#define XIAOYAN_ATTRID_DURATION 0x001A
8+
9+
#endif // MFSPECIFIC_CLUSTER_XIAOYAN_H

0 commit comments

Comments
 (0)