Skip to content

Commit

Permalink
iAlarm siren
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcharp38
tcharp38 committed Oct 9, 2023
1 parent 9fb73d2 commit 28f8650
Show file tree
Hide file tree
Showing 5 changed files with 184 additions and 10 deletions.
167 changes: 167 additions & 0 deletions core/config/devices/TS0224__TZ3000_cipibmnp/TS0224__TZ3000_cipibmnp.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
{
"TS0224__TZ3000_cipibmnp": {
"manufacturer": "iAlarm",
"model": "Siren",
"type": "iAlarm siren",
"timeout": "60",
"category": {
"security": "1"
},
"configuration": {
"icon": "iAlarm-Siren",
"mainEP": "01"
},
"commands": {
"Battery-Percent": {
"use": "inf_zbAttr-0001-BatteryPercent",
"params": "ep=01"
},
"SetReporting 01-0001-00021": {
"use": "act_zbConfigureReporting2",
"params": "ep=01&clustId=0001&attrType=20&attrId=0021&minInterval=1800&maxInterval=3600",
"execAtCreation": "yes"
},
"Bind 01-0001-ToZigate": {
"use": "act_zbBindToZigate",
"params": "ep=01&clustId=0001",
"execAtCreation": "yes"
},
"Identify": {
"use": "act_zbCmdC-Identify",
"isVisible": "1"
},
"On 1": {
"use": "act_zbCmdC-0006-On",
"params": "ep=01",
"isVisible": "1"
},
"Off 1": {
"use": "act_zbCmdC-0006-Off",
"params": "ep=01",
"isVisible": "1"
},
"Toggle 1": {
"use": "act_zbCmdC-0006-Toggle",
"params": "ep=01"
},
"Status 1": {
"use": "inf_zbAttr-0006-OnOff",
"params": "ep=01",
"isVisible": "1",
"nextLine": "after"
},
"Get Status 1": {
"use": "act_zbReadAttribute",
"params": "ep=01&clustId=0006&attrId=0000"
},
"Bind 01-0006-ToZigate": {
"use": "act_zbBindToZigate",
"params": "ep=01&clustId=0006",
"execAtCreation": "yes"
},
"SetReporting 01-0006": {
"use": "act_zbConfigureReporting2",
"params": "ep=01&clustId=0006&attrType=10&attrId=0000",
"execAtCreation": "yes"
},
"Color Mode": {
"use": "inf_zbAttr-0300-ColorMode"
},
"Get Color Mode": {
"use": "act_zbReadAttribute",
"params": "clustId=0300&attrId=0008"
},
"Current HUE": {
"use": "inf_zbAttr-0300-CurrentHue"
},
"Get Current HUE": {
"use": "act_zbReadAttribute",
"params": "clustId=0300&attrId=0000"
},
"Current Saturation": {
"use": "inf_zbAttr-0300-CurrentSaturation"
},
"Get Current Saturation": {
"use": "act_zbReadAttribute",
"params": "clustId=0300&attrId=0001"
},
"Current X": {
"use": "inf_zbAttr-0300-CurrentX"
},
"Get Current X": {
"use": "act_zbReadAttribute",
"params": "clustId=0300&attrId=0003"
},
"Current Y": {
"use": "inf_zbAttr-0300-CurrentY"
},
"Get Current Y": {
"use": "act_zbReadAttribute",
"params": "clustId=0300&attrId=0004"
},
"White": {
"use": "act_zbCmdC-0300-MoveToColor",
"params": "X=6000&Y=6000",
"logicalId": "SetWhite",
"isVisible": "1"
},
"Blue": {
"use": "act_zbCmdC-0300-MoveToColor",
"params": "X=228F&Y=228F",
"logicalId": "SetBlue",
"isVisible": "1"
},
"Red": {
"use": "act_zbCmdC-0300-MoveToColor",
"params": "X=AE13&Y=51EB",
"logicalId": "SetRed",
"isVisible": "1"
},
"Green": {
"use": "act_zbCmdC-0300-MoveToColor",
"params": "X=147A&Y=D709",
"logicalId": "SetGreen",
"isVisible": "1"
},
"RGB": {
"use": "setRGB",
"isVisible": "1",
"nextLine": "after"
},
"Set Color Temp": {
"use": "act_zbCmdC-0300-MoveToColorTemp",
"isVisible": "1"
},
"Color Temp": {
"use": "inf_zbAttr-0300-ColorTemperatureMireds",
"isVisible": "1"
},
"Get ColorTemperature": {
"use": "act_zbReadAttribute",
"params": "clustId=0300&attrId=0007"
},
"Bind 01-0300-ToZigate": {
"use": "act_zbBindToZigate",
"params": "ep=01&clustId=0300",
"execAtCreation": "yes"
},
"Zone Alarm1": {
"use": "inf_Zone-Alarm1",
"params": "ep=01",
"isVisible": "1"
},
"Zone Status Changed": {
"use": "inf_zbCmdS-0500-ZoneStatus-ChangeNotification",
"params": "ep=01",
"comment": "On receive we trig <EP>-0500-alarm1 with extracted boolean\/bit0 value",
"trigOut": "01-0500-alarm1",
"trigOutOffset": "#value#&1"
},
"Bind 01-0500-ToZigate": {
"use": "act_zbBindToZigate",
"params": "ep=01&clustId=0500",
"execAtCreation": "yes"
}
}
}
}
1 change: 1 addition & 0 deletions core/config/devices/TS0224__TZ3000_cipibmnp/discovery-TS0224__TZ3000_cipibmnp_alarme.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"epCount":2,"endPoints":{"01":{"servClusters":{"0001":{"attributes":{"0000":{"dataType":"21","access":"05","value":0},"0020":{"dataType":"20","access":"05","value":0.2},"0021":{"dataType":"20","access":"05","value":1},"FFFD":{"dataType":"21","access":"05","value":1}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0003":{"attributes":{},"commandsGenerated":"UNSUPPORTED","commandsReceived":"UNSUPPORTED"},"0004":{"attributes":{"0000":{"dataType":"18","access":"05","value":0},"FFFD":{"dataType":"21","access":"05","value":2}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0005":{"attributes":{"0000":{"dataType":"20","access":"05","value":0},"0001":{"dataType":"20","access":"05","value":0},"0002":{"dataType":"21","access":"05","value":0},"0003":{"dataType":"10","access":"05","value":0},"0004":{"dataType":"18","access":"05","value":0},"FFFD":{"dataType":"21","access":"05","value":2}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0006":{"attributes":{"0000":{"dataType":"10","access":"05","value":0},"FFFD":{"dataType":"21","access":"05","value":2}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0300":{"attributes":{"0000":{"dataType":"20","access":"07","value":16},"0001":{"dataType":"20","access":"07","value":16},"0002":{"dataType":"21","access":"05","value":0},"0003":{"dataType":"21","access":"07","value":0},"0004":{"dataType":"21","access":"07","value":0},"0007":{"dataType":"21","access":"07","value":0},"0008":{"dataType":"30","access":"07","value":2},"E100":{"dataType":"25","access":"07","value":4294967296000},"F000":{"dataType":"20","access":"07","value":1},"F102":{"dataType":"48","access":"07","value":"0000000003E80000000001000C"},"FFFD":{"dataType":"21","access":"05","value":2}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0500":{"attributes":{"0000":{"dataType":"30","access":"05","value":0},"0001":{"dataType":"31","access":"05","value":549},"0002":{"dataType":"19","access":"05","value":0},"0010":{"dataType":"F0","access":"07","value":"0000000000000000"},"0011":{"dataType":"20","access":"05","value":255},"FFFD":{"dataType":"21","access":"05","value":1}},"commandsGenerated":"UNSUPPORTED","commandsReceived":"UNSUPPORTED"},"0502":{"attributes":{"0000":{"dataType":"21","access":"07","value":60},"0001":{"dataType":"20","access":"07","value":100},"0002":{"dataType":"20","access":"07","value":50},"0003":{"dataType":"20","access":"05","value":0},"0004":{"dataType":"20","access":"07","value":0},"0005":{"dataType":"30","access":"07","value":0},"0006":{"dataType":"20","access":"07","value":50},"E000":{"dataType":"20","access":"07","value":0},"FFFD":{"dataType":"21","access":"05","value":1}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0000":{"attributes":{"0000":{"dataType":"20","access":"05","value":3},"0001":{"dataType":"20","access":"05","value":69},"0002":{"dataType":"20","access":"05","value":0},"0003":{"dataType":"20","access":"05","value":1},"0004":{"dataType":"42","access":"05","value":"_TZ3000_cipibmnp"},"0005":{"dataType":"42","access":"05","value":"TS0224"},"0006":{"dataType":"42","access":"05","value":""},"0007":{"dataType":"30","access":"05","value":132},"FFDE":{"dataType":"20","access":"07","value":13},"FFFD":{"dataType":"21","access":"05","value":2},"FFFE":{"dataType":"30","access":"05","value":0},"FFE2":{"dataType":"20","access":"05","value":54},"FFE3":{"dataType":"48","access":"05","value":"00"}},"commandsReceived":"UNSUPPORTED","commandsGenerated":"UNSUPPORTED"},"0019":{"attributes":{"0000":{"value":"FFFFFFFFFFFFFFFF"},"0001":{"value":4294967295},"0002":{"value":69},"0003":{"value":2},"0004":{"value":4294967295},"0005":{"value":65535},"0006":{"value":0},"0007":{"value":4417},"0008":{"value":65535},"0009":{"value":0},"FFFD":{"value":3}}},"000A":{"attributes":{"FFFD":{"value":1}}}},"cliClusters":{"0019":{"attributes":{"0000":{},"0001":{},"0002":{},"0003":{},"0004":{},"0005":{},"0006":{},"0007":{},"0008":{},"0009":{},"FFFD":{}}},"000A":{"attributes":{"FFFD":{}}}}},"F2":{"servClusters":{"":{}},"cliClusters":{"0021":{}}}},"powerSource":"mains","fileSignature":"Abeille discovery file"}
24 changes: 14 additions & 10 deletions desktop/php/AbeilleEqAssist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,17 +1028,21 @@ function zigbeeToModel() {
// Step color (cmd 0x09)
// Stop move step (cmd 0x47)
cmds["White"] = newCmd("act_zbCmdC-0300-MoveToColor", "X=6000&Y=6000");
// if (currentMode == 1) // If X + Y
cmds["White"]["isVisible"] = 1;
cmds["White"]["isVisible"] = 1;
cmds["White"]["logicalId"] = "SetWhite";

cmds["Blue"] = newCmd("act_zbCmdC-0300-MoveToColor", "X=228F&Y=228F");
// if (currentMode == 1) // If X + Y
cmds["Blue"]["isVisible"] = 1;
cmds["Blue"]["isVisible"] = 1;
cmds["Blue"]["logicalId"] = "SetBlue";

cmds["Red"] = newCmd("act_zbCmdC-0300-MoveToColor", "X=AE13&Y=51EB");
// if (currentMode == 1) // If X + Y
cmds["Red"]["isVisible"] = 1;
cmds["Red"]["isVisible"] = 1;
cmds["Red"]["logicalId"] = "SetRed";

cmds["Green"] = newCmd("act_zbCmdC-0300-MoveToColor", "X=147A&Y=D709");
// if (currentMode == 1) // If X + Y
cmds["Green"]["isVisible"] = 1;
cmds["Green"]["isVisible"] = 1;
cmds["Green"]["logicalId"] = "SetGreen";

cmds["RGB"] = newCmd("setRGB");
cmds["RGB"]["isVisible"] = 1;
cmds["RGB"]["nextLine"] = "after";
Expand Down Expand Up @@ -1136,9 +1140,9 @@ function zigbeeToModel() {
// }

// Generated cmd 00 seems to be mandatory. Using it by default
cmds["Zone Alarm1"] = newCmd("attr-Zone-Alarm1", "ep="+epId);
cmds["Zone Alarm1"] = newCmd("inf_Zone-Alarm1", "ep="+epId);
cmds["Zone Alarm1"]["isVisible"] = 1;
cmds["Zone Status Changed"] = newCmd("inf_zbAttr-0500-ZoneStatus-ChangeNotification", "ep="+epId);
cmds["Zone Status Changed"] = newCmd("inf_zbCmdS-0500-ZoneStatus-ChangeNotification", "ep="+epId);
cmds["Zone Status Changed"]["comment"] = "On receive we trig <EP>-0500-alarm1 with extracted boolean/bit0 value";
cmds["Zone Status Changed"]["trigOut"] = epId+"-0500-alarm1";
cmds["Zone Status Changed"]["trigOutOffset"] = "#value#&1";
Expand Down
2 changes: 2 additions & 0 deletions docs/fr_FR/Changelog.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ ChangeLog
- Interne: AbeilleCmd: Nouvelles modifs pour support Tuya Zosung (universal remote).
- Interne: Tuya parser: Support cmd EF00-06 (TY_DATA_SEARCH ?) revue.
- Interne: Cmd & parser: Amélioration fonction de 'monitoring.
- Assistant modèle: Corrections suite changement noms modèles de commandes.
- Sirene iAlarm: Support préliminaire (2629).

231004-BETA-1
-------------
Expand Down
Binary file added images/node_iAlarm-Siren.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 28f8650

Please sign in to comment.