zigbee-herdsman-converters 25.32.0 → 25.34.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +38 -0
- package/dist/devices/develco.d.ts.map +1 -1
- package/dist/devices/develco.js +4 -2
- package/dist/devices/develco.js.map +1 -1
- package/dist/devices/eurotronic.d.ts.map +1 -1
- package/dist/devices/eurotronic.js +1 -0
- package/dist/devices/eurotronic.js.map +1 -1
- package/dist/devices/heiman.d.ts.map +1 -1
- package/dist/devices/heiman.js +14 -0
- package/dist/devices/heiman.js.map +1 -1
- package/dist/devices/ikea.d.ts.map +1 -1
- package/dist/devices/ikea.js +1 -0
- package/dist/devices/ikea.js.map +1 -1
- package/dist/devices/lumi.d.ts.map +1 -1
- package/dist/devices/lumi.js +216 -0
- package/dist/devices/lumi.js.map +1 -1
- package/dist/devices/mazda.js +2 -2
- package/dist/devices/mazda.js.map +1 -1
- package/dist/devices/miboxer.d.ts.map +1 -1
- package/dist/devices/miboxer.js +246 -31
- package/dist/devices/miboxer.js.map +1 -1
- package/dist/devices/namron.js +1 -1
- package/dist/devices/namron.js.map +1 -1
- package/dist/devices/shelly.d.ts.map +1 -1
- package/dist/devices/shelly.js +9 -2
- package/dist/devices/shelly.js.map +1 -1
- package/dist/devices/somfy.d.ts.map +1 -1
- package/dist/devices/somfy.js +7 -0
- package/dist/devices/somfy.js.map +1 -1
- package/dist/devices/third_reality.d.ts.map +1 -1
- package/dist/devices/third_reality.js +17 -5
- package/dist/devices/third_reality.js.map +1 -1
- package/dist/devices/tuya.d.ts.map +1 -1
- package/dist/devices/tuya.js +105 -5
- package/dist/devices/tuya.js.map +1 -1
- package/dist/lib/lumi.d.ts +33 -0
- package/dist/lib/lumi.d.ts.map +1 -1
- package/dist/lib/lumi.js +237 -7
- package/dist/lib/lumi.js.map +1 -1
- package/dist/models-index.json +1 -1
- package/package.json +3 -3
package/dist/devices/mazda.js
CHANGED
|
@@ -73,7 +73,7 @@ exports.definitions = [
|
|
|
73
73
|
.withPreset(["schedule", "eco", "comfort", "frost_protection", "holiday"])
|
|
74
74
|
.withRunningState(["idle", "heat"], ea.STATE)
|
|
75
75
|
.withSystemMode(["off", "heat"], ea.STATE, "Only for Homeassistant")
|
|
76
|
-
.withLocalTemperatureCalibration(-9.5,
|
|
76
|
+
.withLocalTemperatureCalibration(-9.5, 15, 0.5, ea.STATE_SET),
|
|
77
77
|
...tuya.exposes.scheduleAllDays(ea.STATE_SET, "HH:MM/C HH:MM/C HH:MM/C HH:MM/C HH:MM/C HH:MM/C"),
|
|
78
78
|
],
|
|
79
79
|
meta: {
|
|
@@ -138,7 +138,7 @@ exports.definitions = [
|
|
|
138
138
|
[32, "schedule_friday", tuya.valueConverter.thermostatScheduleDayMultiDPWithDayNumber(5, 6)],
|
|
139
139
|
[33, "schedule_saturday", tuya.valueConverter.thermostatScheduleDayMultiDPWithDayNumber(6, 6)],
|
|
140
140
|
[34, "schedule_sunday", tuya.valueConverter.thermostatScheduleDayMultiDPWithDayNumber(7, 6)],
|
|
141
|
-
[47, "local_temperature_calibration", tuya.valueConverter.
|
|
141
|
+
[47, "local_temperature_calibration", tuya.valueConverter.localTempCalibration3],
|
|
142
142
|
],
|
|
143
143
|
},
|
|
144
144
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mazda.js","sourceRoot":"","sources":["../../src/devices/mazda.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,kDAAoC;AAGpC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAC1B,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;AAEb,QAAA,WAAW,GAA2B;IAC/C;QACI,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;QACjF,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAC,CAAC,CAAC;QACnE,OAAO,EAAE;YACL,CAAC,CAAC,OAAO,EAAE;YACX,CAAC,CAAC,UAAU,EAAE;YACd,CAAC;iBACI,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC;iBACrD,eAAe,CAAC,iDAAiD,CAAC;iBAClE,YAAY,CAAC,QAAQ,CAAC;YAC3B,CAAC,CAAC,WAAW,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC9B,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,2BAA2B,CAAC;YAC5F,CAAC,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC3H,CAAC,CAAC,eAAe,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;YACnH,CAAC,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC3H,CAAC;iBACI,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC,SAAS,CAAC;iBAChD,QAAQ,CAAC,IAAI,CAAC;iBACd,YAAY,CAAC,GAAG,CAAC;iBACjB,YAAY,CAAC,CAAC,CAAC;iBACf,aAAa,CAAC,GAAG,CAAC;iBAClB,eAAe,CAAC,yBAAyB,CAAC;YAC/C,CAAC;iBACI,OAAO,EAAE;iBACT,cAAc,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;iBAC5D,oBAAoB,CAAC,EAAE,CAAC,KAAK,CAAC;iBAC9B,YAAY,CAAC,0BAA0B,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC;iBAClE,UAAU,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;iBACzE,gBAAgB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;iBAC5C,cAAc,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,wBAAwB,CAAC;iBACnE,+BAA+B,CAAC,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"mazda.js","sourceRoot":"","sources":["../../src/devices/mazda.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miboxer.d.ts","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"miboxer.d.ts","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAwC,oBAAoB,EAA4B,MAAM,cAAc,CAAC;AA8RzH,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAmB7C,CAAC"}
|
package/dist/devices/miboxer.js
CHANGED
|
@@ -36,8 +36,251 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.definitions = void 0;
|
|
37
37
|
const fz = __importStar(require("../converters/fromZigbee"));
|
|
38
38
|
const exposes = __importStar(require("../lib/exposes"));
|
|
39
|
+
const logger_1 = require("../lib/logger");
|
|
40
|
+
const m = __importStar(require("../lib/modernExtend"));
|
|
39
41
|
const tuya = __importStar(require("../lib/tuya"));
|
|
40
42
|
const e = exposes.presets;
|
|
43
|
+
// Constants
|
|
44
|
+
const MAX_ZONES = 8;
|
|
45
|
+
const DEFAULT_GROUP_ID_BASE = 100;
|
|
46
|
+
// Default zone to group mapping configuration
|
|
47
|
+
const defaultZoneGroupMapping = {
|
|
48
|
+
1: 101,
|
|
49
|
+
2: 102,
|
|
50
|
+
3: 103,
|
|
51
|
+
4: 104,
|
|
52
|
+
5: 105,
|
|
53
|
+
6: 106,
|
|
54
|
+
7: 107,
|
|
55
|
+
8: 108,
|
|
56
|
+
};
|
|
57
|
+
// Get zone group mapping from device options with fallback to defaults
|
|
58
|
+
function getZoneGroupMapping(options = {}) {
|
|
59
|
+
const mapping = { ...defaultZoneGroupMapping };
|
|
60
|
+
for (let i = 1; i <= MAX_ZONES; i++) {
|
|
61
|
+
const optionKey = `zone_${i}_group_id`;
|
|
62
|
+
const optionValue = options[optionKey];
|
|
63
|
+
if (optionValue !== undefined && typeof optionValue === "number" && optionValue > 0) {
|
|
64
|
+
mapping[i] = optionValue;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return mapping;
|
|
68
|
+
}
|
|
69
|
+
// Get zone suffix from group ID by checking device options
|
|
70
|
+
function getZoneSuffixFromGroupId(groupId, options = {}) {
|
|
71
|
+
if (!groupId)
|
|
72
|
+
return null;
|
|
73
|
+
// Get current zone group mapping from device options
|
|
74
|
+
const zoneGroupMapping = getZoneGroupMapping(options);
|
|
75
|
+
// Find the zone number for the given group ID
|
|
76
|
+
const zoneNumber = Object.keys(zoneGroupMapping).find((zone) => zoneGroupMapping[Number.parseInt(zone, 10)] === groupId);
|
|
77
|
+
// If no zone number is found for this group or if zone actions are disabled, add no suffix
|
|
78
|
+
if (!zoneNumber || options.zone_actions !== true) {
|
|
79
|
+
return "";
|
|
80
|
+
}
|
|
81
|
+
return `_zone_${zoneNumber}`;
|
|
82
|
+
}
|
|
83
|
+
// Create fromZigbee converter that adds zone suffix to action names
|
|
84
|
+
function createZoneAwareConverter(
|
|
85
|
+
// biome-ignore lint/suspicious/noExplicitAny: Fz.ConverterTypeStringOrArray is not exported
|
|
86
|
+
baseConverter) {
|
|
87
|
+
return {
|
|
88
|
+
cluster: baseConverter.cluster,
|
|
89
|
+
type: baseConverter.type,
|
|
90
|
+
convert: (model, msg, publish, options, meta) => {
|
|
91
|
+
const zoneSuffix = getZoneSuffixFromGroupId(msg.groupID, options);
|
|
92
|
+
if (zoneSuffix === null)
|
|
93
|
+
return undefined;
|
|
94
|
+
// Call the base converter
|
|
95
|
+
const baseResult = baseConverter.convert(model, msg, publish, options, meta);
|
|
96
|
+
if (!baseResult || typeof baseResult !== "object" || !("action" in baseResult))
|
|
97
|
+
return baseResult;
|
|
98
|
+
// Override the action with zone suffix
|
|
99
|
+
return {
|
|
100
|
+
...baseResult,
|
|
101
|
+
action: `${baseResult.action}${zoneSuffix}`,
|
|
102
|
+
};
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
// Create converters that extract action properties to numeric sensors
|
|
107
|
+
const actionPropertyConverters = {
|
|
108
|
+
hue_saturation: {
|
|
109
|
+
cluster: "lightingColorCtrl",
|
|
110
|
+
type: "commandMoveToHueAndSaturation",
|
|
111
|
+
convert: (model, msg, publish, options, meta) => {
|
|
112
|
+
if (!options?.expose_values)
|
|
113
|
+
return undefined;
|
|
114
|
+
return {
|
|
115
|
+
hue: msg.data?.hue,
|
|
116
|
+
saturation: msg.data?.saturation,
|
|
117
|
+
};
|
|
118
|
+
},
|
|
119
|
+
},
|
|
120
|
+
color_temp: {
|
|
121
|
+
cluster: "lightingColorCtrl",
|
|
122
|
+
type: "commandMoveToColorTemp",
|
|
123
|
+
convert: (model, msg, publish, options, meta) => {
|
|
124
|
+
if (!options?.expose_values)
|
|
125
|
+
return undefined;
|
|
126
|
+
return {
|
|
127
|
+
color_temperature: msg.data?.colortemp,
|
|
128
|
+
};
|
|
129
|
+
},
|
|
130
|
+
},
|
|
131
|
+
level: {
|
|
132
|
+
cluster: "genLevelCtrl",
|
|
133
|
+
type: ["commandMoveToLevel", "commandMoveToLevelWithOnOff"],
|
|
134
|
+
convert: (model, msg, publish, options, meta) => {
|
|
135
|
+
if (!options?.expose_values)
|
|
136
|
+
return undefined;
|
|
137
|
+
return {
|
|
138
|
+
level: msg.data?.level,
|
|
139
|
+
};
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
};
|
|
143
|
+
// ModernExtend function for FUT089Z remote control
|
|
144
|
+
function miboxerFut089zControls() {
|
|
145
|
+
// Create zone-aware converters using base converters (they will dynamically read device options)
|
|
146
|
+
const onConverter = createZoneAwareConverter(fz.command_on);
|
|
147
|
+
const offConverter = createZoneAwareConverter(fz.command_off);
|
|
148
|
+
const brightnessConverter = createZoneAwareConverter(fz.command_move_to_level);
|
|
149
|
+
const colorTempConverter = createZoneAwareConverter(fz.command_move_to_color_temp);
|
|
150
|
+
const colorConverter = createZoneAwareConverter(fz.command_move_to_hue_and_saturation);
|
|
151
|
+
// biome-ignore lint/suspicious/noExplicitAny: Fz.ConverterTypeStringOrArray is not exported
|
|
152
|
+
const fromZigbee = [
|
|
153
|
+
onConverter,
|
|
154
|
+
offConverter,
|
|
155
|
+
brightnessConverter,
|
|
156
|
+
colorTempConverter,
|
|
157
|
+
colorConverter,
|
|
158
|
+
fz.battery,
|
|
159
|
+
fz.tuya_switch_scene,
|
|
160
|
+
// Add converters for numeric sensors (always included, but they check options internally)
|
|
161
|
+
actionPropertyConverters.hue_saturation,
|
|
162
|
+
actionPropertyConverters.color_temp,
|
|
163
|
+
actionPropertyConverters.level,
|
|
164
|
+
];
|
|
165
|
+
// Device exposes (battery info and action)
|
|
166
|
+
const exposesList = [e.battery(), e.battery_voltage()];
|
|
167
|
+
// Device options for zone group mapping configuration and numeric sensors
|
|
168
|
+
const deviceOptions = [
|
|
169
|
+
// Generate zone group ID options dynamically
|
|
170
|
+
...Array.from({ length: MAX_ZONES }, (_, i) => {
|
|
171
|
+
const zoneNum = i + 1;
|
|
172
|
+
return exposes
|
|
173
|
+
.numeric(`zone_${zoneNum}_group_id`, exposes.access.SET)
|
|
174
|
+
.withDescription(`Group ID for zone ${zoneNum} (default: ${DEFAULT_GROUP_ID_BASE + zoneNum})`)
|
|
175
|
+
.withValueMin(1)
|
|
176
|
+
.withValueMax(65535);
|
|
177
|
+
}),
|
|
178
|
+
// Feature toggles
|
|
179
|
+
new exposes.Binary("expose_values", exposes.access.SET, true, false).withDescription("Expose additional numeric values for action properties (hue, saturation, level, etc.)"),
|
|
180
|
+
new exposes.Binary("zone_actions", exposes.access.SET, true, false).withDescription("Publish zone-specific actions with zone IDs (e.g., on_zone_1, off_zone_2)"),
|
|
181
|
+
];
|
|
182
|
+
// Generate action exposes for all possible zones
|
|
183
|
+
function zoneActions(enableZoneActions) {
|
|
184
|
+
const baseActions = ["on", "off", "brightness_move_to_level", "color_temperature_move", "move_to_hue_and_saturation"];
|
|
185
|
+
if (!enableZoneActions) {
|
|
186
|
+
return baseActions;
|
|
187
|
+
}
|
|
188
|
+
const actions = [];
|
|
189
|
+
for (let zoneNumber = 1; zoneNumber <= MAX_ZONES; zoneNumber++) {
|
|
190
|
+
baseActions.forEach((action) => {
|
|
191
|
+
actions.push(`${action}_zone_${zoneNumber}`);
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
return actions;
|
|
195
|
+
}
|
|
196
|
+
// Event handler to update device when zone options change
|
|
197
|
+
const eventHandlers = [
|
|
198
|
+
async (event) => {
|
|
199
|
+
if (event.type !== "deviceOptionsChanged")
|
|
200
|
+
return;
|
|
201
|
+
const { device, from, to } = event.data;
|
|
202
|
+
// Generate zone option keys dynamically
|
|
203
|
+
const zoneOptionKeys = Array.from({ length: MAX_ZONES }, (_, i) => `zone_${i + 1}_group_id`);
|
|
204
|
+
const hasZoneOptionChanged = zoneOptionKeys.some((key) => from[key] !== to[key]);
|
|
205
|
+
if (hasZoneOptionChanged) {
|
|
206
|
+
try {
|
|
207
|
+
const endpoint = device.getEndpoint(1);
|
|
208
|
+
if (!endpoint) {
|
|
209
|
+
throw new Error("Endpoint 1 not found on device");
|
|
210
|
+
}
|
|
211
|
+
// Get the updated zone group mapping from new options
|
|
212
|
+
const updatedMapping = getZoneGroupMapping(to);
|
|
213
|
+
// Build zone configuration array from the mapping
|
|
214
|
+
const zoneConfig = Object.entries(updatedMapping).map(([zoneNum, groupId]) => ({
|
|
215
|
+
zoneNum: Number.parseInt(zoneNum, 10),
|
|
216
|
+
groupId: groupId,
|
|
217
|
+
}));
|
|
218
|
+
// Send the updated zone configuration to the device
|
|
219
|
+
await endpoint.command("genGroups", "miboxerSetZones", { zones: zoneConfig });
|
|
220
|
+
}
|
|
221
|
+
catch (error) {
|
|
222
|
+
// Log error but don't throw to avoid breaking the update process
|
|
223
|
+
logger_1.logger.error(`Failed to update zone configuration: ${error}`, "zhc:miboxer");
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
event.data.deviceExposesChanged();
|
|
227
|
+
},
|
|
228
|
+
];
|
|
229
|
+
return {
|
|
230
|
+
fromZigbee,
|
|
231
|
+
exposes: [
|
|
232
|
+
...exposesList,
|
|
233
|
+
((device, options = {}) => {
|
|
234
|
+
const dynamicExposes = [];
|
|
235
|
+
// Add action expose with zone-aware actions
|
|
236
|
+
dynamicExposes.push(e.action(zoneActions(options.zone_actions === true)));
|
|
237
|
+
// Add numeric sensors if enabled in options
|
|
238
|
+
if (options.expose_values === true) {
|
|
239
|
+
dynamicExposes.push(exposes
|
|
240
|
+
.numeric("hue", exposes.access.STATE_GET)
|
|
241
|
+
.withDescription("Hue value from last action")
|
|
242
|
+
.withValueMin(0)
|
|
243
|
+
.withValueMax(254), exposes
|
|
244
|
+
.numeric("saturation", exposes.access.STATE_GET)
|
|
245
|
+
.withDescription("Saturation value from last action")
|
|
246
|
+
.withValueMin(0)
|
|
247
|
+
.withValueMax(254), exposes
|
|
248
|
+
.numeric("color_temperature", exposes.access.STATE_GET)
|
|
249
|
+
.withDescription("Color temperature value from last action")
|
|
250
|
+
.withUnit("mired")
|
|
251
|
+
.withValueMin(153)
|
|
252
|
+
.withValueMax(500), exposes
|
|
253
|
+
.numeric("level", exposes.access.STATE_GET)
|
|
254
|
+
.withDescription("Level value from last action")
|
|
255
|
+
.withValueMin(0)
|
|
256
|
+
.withValueMax(254));
|
|
257
|
+
}
|
|
258
|
+
return dynamicExposes;
|
|
259
|
+
}),
|
|
260
|
+
],
|
|
261
|
+
options: deviceOptions,
|
|
262
|
+
onEvent: eventHandlers,
|
|
263
|
+
isModernExtend: true,
|
|
264
|
+
configure: [
|
|
265
|
+
async (device, coordinatorEndpoint, definition) => {
|
|
266
|
+
const endpoint = device.getEndpoint(1);
|
|
267
|
+
if (!endpoint) {
|
|
268
|
+
throw new Error("Endpoint 1 not found on device");
|
|
269
|
+
}
|
|
270
|
+
await tuya.configureMagicPacket(device, coordinatorEndpoint);
|
|
271
|
+
// Use default zone group mapping for initial configuration
|
|
272
|
+
const currentMapping = getZoneGroupMapping();
|
|
273
|
+
// Build zone configuration array from the mapping
|
|
274
|
+
const zoneConfig = Object.entries(currentMapping).map(([zoneNum, groupId]) => ({
|
|
275
|
+
zoneNum: Number.parseInt(zoneNum, 10),
|
|
276
|
+
groupId: groupId,
|
|
277
|
+
}));
|
|
278
|
+
await endpoint.command("genGroups", "miboxerSetZones", { zones: zoneConfig });
|
|
279
|
+
await endpoint.command("genBasic", "tuyaSetup", {}, { disableDefaultResponse: true });
|
|
280
|
+
},
|
|
281
|
+
],
|
|
282
|
+
};
|
|
283
|
+
}
|
|
41
284
|
exports.definitions = [
|
|
42
285
|
{
|
|
43
286
|
fingerprint: tuya.fingerprint("TS0504B", ["_TZ3210_ttkgurpb"]),
|
|
@@ -51,39 +294,11 @@ exports.definitions = [
|
|
|
51
294
|
model: "FUT089Z",
|
|
52
295
|
vendor: "MiBoxer",
|
|
53
296
|
description: "RGB+CCT Remote",
|
|
54
|
-
fromZigbee: [
|
|
55
|
-
fz.battery,
|
|
56
|
-
fz.command_on,
|
|
57
|
-
fz.command_off,
|
|
58
|
-
fz.command_move_to_level,
|
|
59
|
-
fz.command_move_to_color_temp,
|
|
60
|
-
fz.command_move_to_hue_and_saturation,
|
|
61
|
-
fz.tuya_switch_scene,
|
|
62
|
-
],
|
|
63
|
-
toZigbee: [],
|
|
64
297
|
whiteLabel: [tuya.whitelabel("Ledron", "YK-16", "RGB+CCT Remote", ["_TZ3000_zwszqdpy"])],
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
e.action(["on", "off", "brightness_move_to_level", "color_temperature_move", "move_to_hue_and_saturation", "tuya_switch_scene"]),
|
|
298
|
+
extend: [
|
|
299
|
+
miboxerFut089zControls(),
|
|
300
|
+
m.quirkCheckinInterval(21600), // Device observed to report every 4h, set to 6h (21600s) for safety margin
|
|
69
301
|
],
|
|
70
|
-
configure: async (device, coordinatorEndpoint) => {
|
|
71
|
-
const endpoint = device.getEndpoint(1);
|
|
72
|
-
await tuya.configureMagicPacket(device, coordinatorEndpoint);
|
|
73
|
-
await endpoint.command("genGroups", "miboxerSetZones", {
|
|
74
|
-
zones: [
|
|
75
|
-
{ zoneNum: 1, groupId: 101 },
|
|
76
|
-
{ zoneNum: 2, groupId: 102 },
|
|
77
|
-
{ zoneNum: 3, groupId: 103 },
|
|
78
|
-
{ zoneNum: 4, groupId: 104 },
|
|
79
|
-
{ zoneNum: 5, groupId: 105 },
|
|
80
|
-
{ zoneNum: 6, groupId: 106 },
|
|
81
|
-
{ zoneNum: 7, groupId: 107 },
|
|
82
|
-
{ zoneNum: 8, groupId: 108 },
|
|
83
|
-
],
|
|
84
|
-
});
|
|
85
|
-
await endpoint.command("genBasic", "tuyaSetup", {}, { disableDefaultResponse: true });
|
|
86
|
-
},
|
|
87
302
|
},
|
|
88
303
|
];
|
|
89
304
|
//# sourceMappingURL=miboxer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miboxer.js","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA+C;AAC/C,wDAA0C;AAC1C,kDAAoC;AAGpC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"miboxer.js","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"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"}
|
package/dist/devices/namron.js
CHANGED
|
@@ -177,7 +177,7 @@ exports.definitions = [
|
|
|
177
177
|
vendor: "Namron",
|
|
178
178
|
description: "Zigbee dimmer 400W",
|
|
179
179
|
ota: true,
|
|
180
|
-
extend: [m.light({ configureReporting: true })],
|
|
180
|
+
extend: [m.light({ configureReporting: true }), m.electricityMeter({ voltage: false, current: false })],
|
|
181
181
|
},
|
|
182
182
|
{
|
|
183
183
|
zigbeeModel: ["4512708"],
|