Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.10.14 #2339

Merged
merged 3 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ You can thank the authors by these links:
-----------------------------------------------------------------------------------------------------
## Changelog
### **WORK IN PROGRESS**


### 1.10.14 (2024-12-31)
* (arteck) Herdsman 2.1.9, Converters 20.58.0
* (asgothian) Fix: Aqara T1M (CL-L02D)
* (arteck) deleteDeviceStates change to deleteObj

### 1.10.13 (2024-11-10)
Expand Down
15 changes: 14 additions & 1 deletion io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{
"common": {
"name": "zigbee",
"version": "1.10.13",
"version": "1.10.14",
"news": {
"1.10.14": {
"en": "Herdsman 2.1.9, Converters 20.58.0",
"de": "Herdsman 2.1.9, Converters 20.58.0",
"ru": "Herdsman 2.1.9, Converters 20.58.0",
"pt": "Herdsman 2.1.9, Converters 20.58.0",
"nl": "Herdsman 2.1.9, Converters 20.58.0",
"fr": "Herdsman 2.1.9, Converters 20.58.0",
"it": "Herdsman 2.1.9, Converters 20.58.0",
"es": "Herdsman 2.1.9, Converters 20.58.0",
"pl": "Herdsman 2.1.9, Converters 20.58.0",
"uk": "Herdsman 2.1.9, Converters 20.58.0",
"zh-cn": "Herdsman 2.1.9, Converters 20.58.0"
},
"1.10.13": {
"en": "corr icon download bug (axios)",
"de": "corr icon download bug (axios)",
Expand Down
5 changes: 2 additions & 3 deletions lib/devices.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,8 @@ const generator = {
setattr: 'state',
});
}
if (endpoint.supportsOutputCluster('genMultistateInput')||
endpoint.clusters.hasOwnProperty('genMultistateInput')
) {
if (endpoint.supportsOutputCluster('genMultistateInput') || endpoint.clusters.hasOwnProperty('genMultistateInput'))
{
devstates.push({
id: `channel_${epID}.click`,
prop: 'action',
Expand Down
6 changes: 3 additions & 3 deletions lib/statescontroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class StatesController extends EventEmitter {
return;
}

if (this.checkDebugDevice(id))
if (this.checkDebugDevice(id))
this.warn(`ELEVATED O1: User state change of state ${id} with value ${state.val} (ack: ${state.ack}) from ${state.from}`);

this.debug(`User stateChange ${id} ${JSON.stringify(state)}`);
Expand Down Expand Up @@ -228,7 +228,7 @@ class StatesController extends EventEmitter {

const value = state.val;
if (value === undefined || value === '') {
if (elevated)
if (elevated)
this.error(`ELEVATED OE2: no value for device ${deviceId} type '${model}'`);
return;
}
Expand Down Expand Up @@ -683,7 +683,7 @@ class StatesController extends EventEmitter {
if (!has_published && has_debug) {
this.error(`ELEVATED IE4: No value published for device ${devId}`);

}
}
}
else {
if (has_debug)
Expand Down
23 changes: 9 additions & 14 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ class Zigbee extends utils.Adapter {
if (!converters.length) {
if (type !== 'readResponse') {
this.log.debug(`No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`);
if (has_elevated_debug)
if (has_elevated_debug)
this.log.warn(`ELEVATED IE0: No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`);
}
return;
Expand Down Expand Up @@ -719,16 +719,16 @@ class Zigbee extends utils.Adapter {

if (!c.hasOwnProperty('convertSet')) continue;
this.log.debug(`Type of toZigbee is '${typeof c}', Contains key ${(c.hasOwnProperty('key')?JSON.stringify(c.key):'false ')}`)
if (!c.hasOwnProperty('key'))
if (!c.hasOwnProperty('key'))
{
if (c.hasOwnProperty('convertSet') && converter === undefined)
if (c.hasOwnProperty('convertSet') && converter === undefined)
{
converter = c;

if (has_elevated_debug) this.log.warn(`ELEVATED O3A: Setting converter to keyless converter for ${deviceId} of type ${model}`)
if (has_elevated_debug)
this.log.warn(`ELEVATED O3A: Setting converter to keyless converter for ${deviceId} of type ${model}`)
this.log.debug('setting converter to keyless converter')
}
else
}
else
{
if (has_elevated_debug) this.log.warn(`ELEVATED O3B: ignoring keyless converter for ${deviceId} of type ${model}`)
this.log.debug('ignoring keyless converter')
Expand All @@ -741,12 +741,7 @@ class Zigbee extends utils.Adapter {
if (has_elevated_debug) this.log.warn(`ELEVATED O3C: ${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
converter = c;
}

}
/*
if (!mappedModel.toZigbee[0].hasOwnProperty('key') && mappedModel.toZigbee[0].hasOwnProperty('convertSet')) converter = mappedModel.toZigbee[0];
converter = mappedModel.toZigbee.find(c => c && c.hasOwnProperty('key') && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
*/
if (converter === undefined) {
this.log.error(`No converter available for '${model}' with key '${stateDesc.id}' `);
this.sendError(`No converter available for '${model}' with key '${stateDesc.id}' `);
Expand Down Expand Up @@ -818,11 +813,11 @@ class Zigbee extends utils.Adapter {
this.processSyncStatesList(deviceId, model, syncStateList);
}
else
if (has_elevated_debug)
if (has_elevated_debug)
this.log.error(`ELEVATED OE2: Error convert result for ${key} with ${safeJsonStringify(preparedValue)} is undefined on device ${deviceId}.`);

} catch (error) {
if (has_elevated_debug)
if (has_elevated_debug)
this.log.error(`ELEVATED OE3: caught error ${safeJsonStringify(error)} when setting value for device ${deviceId}.`);
this.filterError(`Error ${error.code} on send command to ${deviceId}.` +
` Error: ${error.stack}`, `Send command to ${deviceId} failed with`, error);
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.zigbee",
"version": "1.10.13",
"version": "1.10.14",
"author": {
"name": "Kirov Ilya",
"email": "kirovilya@gmail.com"
Expand Down
Loading