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 White Label Girier JR-ZPM03 Smart Plug (_TZ3000_okaz9tjs) to TS011F_plug_3 #8560

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

matriphe
Copy link
Contributor

@matriphe matriphe commented Jan 4, 2025

This PR adds whitelabel Girier model JR-ZPM03 (manufacturer name _TZ3000_okaz9tjs) to the existing TS011F_plug_3.

In my case, it's incorrectly shown as Tuya BSD29_1, I put the white label to TS011F_plug_3 and added the manufacturerID to the fingerprint to differentiate with the existing.

It addresses the issue reported here Koenkk/zigbee2mqtt#24721

Zigbee2MQTT Dashboard

Screenshot 2025-01-04 at 14 27 04

Product Image

IMG_5416
IMG_5417

Product Link

AliExpress

S16d4fe526eca4d31b50253f356aed674I

Device Info JSON

{
  "id": 15,
  "type": "Router",
  "ieeeAddr": "0x70b3d52b60124c70",
  "nwkAddr": 3636,
  "manufId": 4660,
  "manufName": "_TZ3000_okaz9tjs",
  "powerSource": "Mains (single phase)",
  "modelId": "TS011F",
  "epList": [
    1
  ],
  "endpoints": {
    "1": {
      "profId": 260,
      "epId": 1,
      "devId": 81,
      "inClusterList": [
        0,
        6,
        3,
        4,
        5,
        57345,
        2820,
        1794
      ],
      "outClusterList": [
        25
      ],
      "clusters": {
        "genBasic": {
          "attributes": {
            "modelId": "TS011F",
            "manufacturerName": "_TZ3000_okaz9tjs",
            "powerSource": 1,
            "zclVersion": 2,
            "appVersion": 100,
            "stackVersion": 1,
            "hwVersion": 2,
            "dateCode": "20210625",
            "swBuildId": "500+TZSKT31BS102"
          }
        },
        "haElectricalMeasurement": {
          "attributes": {
            "acCurrentDivisor": 1000,
            "acCurrentMultiplier": 1,
            "rmsVoltage": 231,
            "rmsCurrent": 587,
            "activePower": 82
          }
        },
        "seMetering": {
          "attributes": {
            "divisor": 100,
            "multiplier": 1,
            "currentSummDelivered": 229
          }
        },
        "genOnOff": {
          "attributes": {
            "onOff": 1
          }
        },
        "manuSpecificTuya_3": {
          "attributes": {
            "powerOnBehavior": 2
          }
        }
      },
      "binds": [],
      "configuredReportings": [],
      "meta": {}
    }
  },
  "appVersion": 4660,
  "stackVersion": 1,
  "hwVersion": 2,
  "dateCode": "20210625",
  "swBuildId": "500+TZSKT31BS102",
  "zclVersion": 2,
  "interviewCompleted": true,
  "meta": {
    "configured": 332242049
  },
  "lastSeen": 1735989812717
}

@matriphe matriphe marked this pull request as ready for review January 4, 2025 13:47
@@ -5593,6 +5593,7 @@ const definitions: DefinitionWithExtend[] = [
{vendor: 'AVATTO', model: 'MIUCOT10Z'},
{vendor: 'Neo', model: 'NAS-WR01B'},
{vendor: 'Neo', model: 'PLUG-001SPB2'},
{vendor: 'Girier', model: 'JR-ZPM03', fingerprint: [{manufacturerName: '_TZ3000_okaz9tjs', manufacturerID: 4660}]},
Copy link
Owner

Choose a reason for hiding this comment

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

Please use tuya.whitelabel() like below.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will this code work? because it shares the same manufacturerName as Tuya BSD29_1.

tuya.whitelabel('Girier', 'JR-ZPM03', 'Smart plug (with power monitoring by polling)', ['_TZ3000_okaz9tjs']),
tuya.whitelabel('Tuya', 'BSD29_1', 'Smart plug (with power monitoring by polling)', ['_TZ3000_okaz9tjs']),

if so, I'll commit the change.

Copy link
Owner

Choose a reason for hiding this comment

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

No because the manufacturer name is exactly the same (_TZ3000_okaz9tjs)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

any suggestion to differentiate 2 devices that share the same manufacturerName? maybe from manufacturerID?

maybe by passing fingerprint to whitelabel function (might need to update the whitelabel function.

Copy link
Owner

Choose a reason for hiding this comment

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

the manufacturer ID will also be the same, I don't think there is a way to distinguish them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants