-
Notifications
You must be signed in to change notification settings - Fork 524
WWSTCERT-10225/10228/10231/10234 add driver to frient EMI devices #2730
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
Open
marcintyminski
wants to merge
9
commits into
SmartThingsCommunity:main
Choose a base branch
from
marcintyminski:Add-support-to-frient-EMIs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bfabc01
add driver
marcintyminski 115fa8e
removed unused variables
marcintyminski 6b442b4
Merge branch 'SmartThingsCommunity:main' into Add-support-to-frient-EMIs
marcintyminski 9b2dc97
Merge branch 'SmartThingsCommunity:main' into Add-support-to-frient-EMIs
marcintyminski 3c48090
Changes according to pr comments
marcintyminski 8895493
Merge branch 'SmartThingsCommunity:main' into Add-support-to-frient-EMIs
marcintyminski f0763d3
More changes based on pr comments
marcintyminski 1354d81
Merge branch 'SmartThingsCommunity:main' into Add-support-to-frient-EMIs
marcintyminski 6b1bda5
date changes
marcintyminski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...martThings/zigbee-power-meter/profiles/frient-power-energy-battery-consumption-report.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| name: frient-power-energy-battery-consumption-report | ||
| components: | ||
| - id: main | ||
| capabilities: | ||
| - id: powerMeter | ||
| version: 1 | ||
| - id: energyMeter | ||
| version: 1 | ||
| - id: powerConsumptionReport | ||
| version: 1 | ||
| - id: battery | ||
| version: 1 | ||
| - id: firmwareUpdate | ||
| version: 1 | ||
| - id: refresh | ||
| version: 1 | ||
| categories: | ||
| - name: CurbPowerMeter | ||
| preferences: | ||
| - title: "Pulse Configuration" | ||
| name: pulseConfiguration | ||
| description: "Number of pulses the meter outputs per unit" | ||
| required: false | ||
| preferenceType: integer | ||
| definition: | ||
| minimum: 50 | ||
| maximum: 10000 | ||
| default: 1000 | ||
greens marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - title: "Initial Energy Consumption" | ||
| name: currentSummation | ||
| description: "Offset (scaled value) for current summation delivered" | ||
| required: false | ||
| preferenceType: number | ||
| definition: | ||
| minimum: 0 | ||
| maximum: 268435455 | ||
| default: 0 | ||
35 changes: 35 additions & 0 deletions
35
drivers/SmartThings/zigbee-power-meter/profiles/frient-power-energy-consumption-report.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| name: frient-power-energy-consumption-report | ||
| components: | ||
| - id: main | ||
| capabilities: | ||
| - id: powerMeter | ||
| version: 1 | ||
| - id: energyMeter | ||
| version: 1 | ||
| - id: powerConsumptionReport | ||
| version: 1 | ||
| - id: firmwareUpdate | ||
| version: 1 | ||
| - id: refresh | ||
| version: 1 | ||
| categories: | ||
| - name: CurbPowerMeter | ||
| preferences: | ||
| - title: "Pulse Configuration" | ||
| name: pulseConfiguration | ||
| description: "Number of pulses the meter outputs per unit" | ||
| required: false | ||
| preferenceType: integer | ||
| definition: | ||
| minimum: 50 | ||
| maximum: 10000 | ||
| default: 1000 | ||
| - title: "Initial Energy Consumption" | ||
| name: currentSummation | ||
| description: "Offset (scaled value) for current summation delivered" | ||
| required: false | ||
| preferenceType: number | ||
| definition: | ||
| minimum: 0 | ||
| maximum: 268435455 | ||
| default: 0 |
48 changes: 48 additions & 0 deletions
48
drivers/SmartThings/zigbee-power-meter/profiles/frient-power-energy-current-voltage.yml
greens marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: frient-power-energy-current-voltage | ||
| components: | ||
| - id: main | ||
| capabilities: | ||
| - id: powerMeter | ||
| version: 1 | ||
| - id: energyMeter | ||
| version: 1 | ||
| - id: powerConsumptionReport | ||
| version: 1 | ||
| - id: firmwareUpdate | ||
| version: 1 | ||
| - id: refresh | ||
| version: 1 | ||
| categories: | ||
| - name: CurbPowerMeter | ||
| - id: production | ||
| label: Production | ||
| capabilities: | ||
| - id: energyMeter | ||
| version: 1 | ||
| - id: phaseA | ||
| label: "Phase A" | ||
| capabilities: | ||
| - id: powerMeter | ||
| version: 1 | ||
| - id: voltageMeasurement | ||
| version: 1 | ||
| - id: currentMeasurement | ||
| version: 1 | ||
| - id: phaseB | ||
| label: "Phase B" | ||
| capabilities: | ||
| - id: powerMeter | ||
| version: 1 | ||
| - id: voltageMeasurement | ||
| version: 1 | ||
| - id: currentMeasurement | ||
| version: 1 | ||
| - id: phaseC | ||
| label: "Phase C" | ||
| capabilities: | ||
| - id: powerMeter | ||
| version: 1 | ||
| - id: voltageMeasurement | ||
| version: 1 | ||
| - id: currentMeasurement | ||
| version: 1 |
15 changes: 15 additions & 0 deletions
15
drivers/SmartThings/zigbee-power-meter/src/frient/EMIZB-151/can_handle.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| -- Copyright 2026 SmartThings, Inc. | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| local is_frient_power_meter = function(opts, driver, device, zb_rx) | ||
| local FINGERPRINTS = require("frient.EMIZB-151.fingerprints") | ||
| for _, fingerprint in ipairs(FINGERPRINTS) do | ||
| if device:get_model() == fingerprint.model then | ||
| return true, require("frient.EMIZB-151") | ||
| end | ||
| end | ||
|
|
||
| return false | ||
| end | ||
|
|
||
| return is_frient_power_meter |
8 changes: 8 additions & 0 deletions
8
drivers/SmartThings/zigbee-power-meter/src/frient/EMIZB-151/fingerprints.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| -- Copyright 2026 SmartThings, Inc. | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| local ZIGBEE_POWER_METER_FINGERPRINTS = { | ||
| { model = "EMIZB-151"} | ||
| } | ||
|
|
||
| return ZIGBEE_POWER_METER_FINGERPRINTS |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these no longer necessary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. Even if new versions of the device report a different mfr string, we have to keep the old fingerprint around.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I brought it back