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

add 3r new device(dual plug) #8494

Merged
merged 31 commits into from
Dec 24, 2024
Merged
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6779b27
update
jintj Oct 10, 2024
26bea65
Merge branch 'Koenkk:master' into master
3reality-support Oct 10, 2024
376c2bb
Update third_reality.ts
3reality-support Oct 10, 2024
3b494c6
Update third_reality.ts
3reality-support Oct 10, 2024
62eacd9
Update src/devices/third_reality.ts
3reality-support Oct 11, 2024
3ee4c08
Update third_reality.ts
3reality-support Oct 11, 2024
0933456
u
Koenkk Oct 11, 2024
f0fd394
Merge branch 'Koenkk:master' into master
3reality-support Oct 16, 2024
f38f962
update
jintj Oct 16, 2024
96156b0
Merge branch 'Koenkk:master' into master
3reality-support Oct 17, 2024
40c137c
add
jintj Oct 17, 2024
990094c
update
jintj Oct 17, 2024
7629695
Merge branch 'Koenkk:master' into master
3reality-support Oct 23, 2024
73c6e0e
update 3r th2 cluster id
jintj Oct 23, 2024
aa945b5
Merge branch 'Koenkk:master' into master
3reality-support Nov 5, 2024
7a06cbc
update 3r water kit battery
jintj Nov 5, 2024
0c9fede
Merge branch 'Koenkk:master' into master
3reality-support Nov 29, 2024
50d4c06
Merge branch 'Koenkk:master' into master
3reality-support Dec 3, 2024
90ae6ad
update
jintj Dec 3, 2024
a82aac5
Update third_reality.ts
3reality-support Dec 3, 2024
19a5a3d
Merge branch 'Koenkk:master' into master
3reality-support Dec 4, 2024
9211630
update
jintj Dec 4, 2024
bcd55c8
Merge branch 'Koenkk:master' into master
3reality-support Dec 10, 2024
9a46dca
update
jintj Dec 10, 2024
d151edf
update
jintj Dec 10, 2024
8482277
Merge branch 'Koenkk:master' into master
3reality-support Dec 16, 2024
ad14ef4
Merge branch 'Koenkk:master' into master
3reality-support Dec 20, 2024
d8480e0
update
jintj Dec 20, 2024
d885c6e
Merge branch 'Koenkk:master' into master
3reality-support Dec 23, 2024
ebfe841
update
jintj Dec 23, 2024
1efa72f
update
jintj Dec 24, 2024
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
24 changes: 23 additions & 1 deletion src/devices/third_reality.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@ import {Zcl} from 'zigbee-herdsman';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import * as exposes from '../lib/exposes';
import {battery, deviceAddCustomCluster, humidity, iasZoneAlarm, light, onOff, temperature} from '../lib/modernExtend';
import {
battery,
deviceAddCustomCluster,
deviceEndpoints,
electricityMeter,
humidity,
iasZoneAlarm,
light,
onOff,
temperature,
} from '../lib/modernExtend';
import * as reporting from '../lib/reporting';
import {DefinitionWithExtend, Fz, KeyValue} from '../lib/types';

Expand Down Expand Up @@ -406,6 +416,18 @@ const definitions: DefinitionWithExtend[] = [
}),
],
},
{
zigbeeModel: ['3RDP01072Z'],
model: '3RDP01072Z',
vendor: 'Third Reality',
description: 'Zigbee / BLE dual plug with power',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove everything below this line and try with:

ota: true
extend: [deviceEndpoints({endpoints: {left: 1, right: 2}}), onOff({endpointNames: ['left', 'right']}), electricityMeter({endpointNames: ['left', 'right']})],

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you now try after removing fromZigbee, toZigbee and exposes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

ota: true,
extend: [
deviceEndpoints({endpoints: {left: 1, right: 2}}),
onOff({endpointNames: ['left', 'right']}),
electricityMeter({acFrequency: true, powerFactor: true, endpointNames: ['left', 'right']}),
],
},
{
zigbeeModel: ['3RVS01031Z'],
model: '3RVS01031Z',
Expand Down
Loading