iobroker.zigbee 3.1.2 → 3.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/README.md +19 -1
  2. package/admin/admin.js +1020 -729
  3. package/admin/index_m.html +55 -155
  4. package/admin/tab_m.html +161 -242
  5. package/io-package.json +42 -39
  6. package/lib/DeviceDebug.js +24 -2
  7. package/lib/binding.js +7 -7
  8. package/lib/commands.js +319 -255
  9. package/lib/developer.js +1 -1
  10. package/lib/devices.js +2 -2
  11. package/lib/exclude.js +1 -1
  12. package/lib/exposes.js +54 -24
  13. package/lib/groups.js +26 -28
  14. package/lib/localConfig.js +8 -8
  15. package/lib/networkmap.js +10 -2
  16. package/lib/statescontroller.js +135 -91
  17. package/lib/zbDelayedAction.js +4 -4
  18. package/lib/zbDeviceAvailability.js +32 -33
  19. package/lib/zbDeviceConfigure.js +7 -0
  20. package/lib/zbDeviceEvent.js +38 -6
  21. package/lib/zigbeecontroller.js +98 -46
  22. package/main.js +43 -57
  23. package/package.json +6 -9
  24. package/lib/tools.js +0 -55
package/admin/tab_m.html CHANGED
@@ -214,6 +214,12 @@
214
214
  border: 0;
215
215
  border-radius: 2px;
216
216
  }
217
+
218
+ .button-round-sml {
219
+ font-size: 1.6rem !important;
220
+ line-height: 20px !important;
221
+ transition: background-color 250ms cubic-bezier(.4, 0, .2, 1),box-shadow 250ms cubic-bezier(.4, 0, .2, 1),border-color 250ms cubic-bezier(.4, 0, .2, 1);
222
+ }
217
223
  i.icon-green {
218
224
  color: green;
219
225
  }
@@ -269,6 +275,9 @@
269
275
  .m .btn-small.btn-flat {
270
276
  padding: 0 4px;
271
277
  }
278
+ .m .btn-tiny.btn-flat {
279
+ padding: 0 4px;
280
+ }
272
281
  .m .row .col.tool {
273
282
  padding: 0 .1rem;
274
283
  }
@@ -666,21 +675,26 @@
666
675
  </p></div>
667
676
  <ul id="nav-mobile" class="right">
668
677
  <li>
669
- <a id="ErrorNotificationBtn" class="btn-floating waves-effect waves-light black tooltipped center-align hoverable translateT hide" title="Zigbee not running">
670
- <i class="material-icons large icon-red">error</i></a>
678
+ <a id="adapterStopped_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Adapter not running">
679
+ <i class="material-icons large">grid_off</i></a>
680
+ </li>
681
+ <li>
682
+ <li>
683
+ <a id="ErrorNotificationBtn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Zigbee not running">
684
+ <i class="material-icons large">error</i></a>
671
685
  </li>
672
686
  <li>
673
687
  <li>
674
688
  <a id="state_cleanup_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="State Cleanup">
675
- <i class="material-icons large icon-blue">delete_sweep</i></a>
689
+ <i class="material-icons large">delete_sweep</i></a>
676
690
  </li>
677
691
  <li>
678
692
  <a id="show_errors_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Show Errors">
679
- <i class="material-icons large icon-blue">feedback</i></a>
693
+ <i class="material-icons large">feedback</i></a>
680
694
  </li>
681
695
  <li>
682
696
  <a id="fw_check_btn" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT hide" title="Check firmware updates">
683
- <i class="material-icons large icon-blue">system_update</i></a>
697
+ <i class="material-icons large">system_update</i></a>
684
698
  </li>
685
699
  <li>
686
700
  <a id="add_grp_btn" class="btn-floating waves-effect waves-light brown tooltipped center-align hoverable translateT hide" title="Add Group">
@@ -775,13 +789,15 @@
775
789
  </div>
776
790
  </div>
777
791
  <div id="tab-map" class="col s12 page">
778
- <div class="fixed-action-btn">
779
- <a id="refresh" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Refresh"><i class="material-icons large">autorenew</i></a>
780
- </div>
781
- <div id="viewconfigbtn" class="fixed-action-btn top left">
782
- <a id="viewconfig" class="btn-floating waves-effect waves-light orange tooltipped center-align hoverable translateT" title="View config"><i class="material-icons large">menu</i></a>
792
+ <div class="row">
793
+ <div class="fixed-action-btn left">
794
+ <a id="refresh" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Reload"><i class="material-icons large">autorenew</i></a>
795
+ </div>
796
+ <div id="viewconfigbtn" class="fixed-action-btn left">
797
+ <a id="viewconfig" class="btn-floating waves-effect waves-light orange tooltipped center-align hoverable translateT" title="View config"><i class="material-icons large">menu</i></a>
798
+ </div>
783
799
  </div>
784
- <div id="map" class="row">
800
+ <div id="map">
785
801
  </div>
786
802
  </div>
787
803
  <div id="tab-sett" class="col s12 page">
@@ -924,266 +940,165 @@
924
940
  </div>
925
941
 
926
942
  <div class="materialize-dialogs m">
927
- <div id="modaledit" class="modal">
928
- <div class="modal-content">
929
- <h3 class="translate">Rename / Group device</h3>
930
- <div class="row">
931
- <div class="col1">
932
- <div class="input-field">
933
- <input id="d_name" type="text" class="value validate">
934
- <label for="d_name" class="translate">Name</label>
935
- </div>
936
- </div>
937
- </div>
938
- <div class="groups_available">
939
- <div class="row">
940
- <h6>Groups</h6>
941
- </div>
942
- <div class="row epid0">
943
- <div class="col">
944
- <div class=endpointid>
945
- <p class="translate device_with_endpoint">Main Endpoint</p>
946
- </div>
947
- </div>
948
- <div class="col1">
949
- <div class="input-field groups">
950
- <select id="d_groups_ep0" class="materialSelect" multiple>
951
- <option value="1">select</option>
952
- </select>
953
- <label for="d_groups_ep0" class="translate">Groups</label>
943
+
944
+ <div id="modaledit" class="modal">
945
+ <div class="modal-content">
946
+ <h3 class="translate">Rename / Group device</h3>
947
+ <div class="row">
948
+ <div class="col s12">
949
+ <div class="input-field">
950
+ <input id="d_name" type="text" class="value validate">
951
+ <label for="d_name" class="translate">Name</label>
954
952
  </div>
955
953
  </div>
956
954
  </div>
957
- <div class="row epid1">
958
- <div class="col epid">
959
- <div class=endpointid>
960
- <p class="translate device_with_endpoint">Sub Endpoint 1</p>
961
- </div>
962
- </div>
963
- <div class="col">
964
- <div class="input-field groups">
965
- <select id="d_groups_ep1" class="materialSelect" multiple>
966
- <option value="1">select</option>
967
- </select>
968
- <label for="d_groups_ep1" class="translate">Groups</label>
969
- </div>
955
+ <div class="row">
956
+ <div class="col endpoints_for_groups s12">
970
957
  </div>
971
958
  </div>
972
- <div class="row epid2">
973
- <div class="col epid">
974
- <div class=endpointid>
975
- <p class="translate device_with_endpoint">Sub Endpoint 2</p>
976
- </div>
977
- </div>
978
- <div class="col">
979
- <div class="input-field groups">
980
- <select id="d_groups_ep2" class="materialSelect" multiple>
981
- <option value="1">select</option>
982
- </select>
983
- <label for="d_groups_ep2" class="translate">Groups</label>
984
- </div>
985
- </div>
959
+ </div>
960
+ <div class="modal-footer">
961
+ <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
962
+ <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
963
+ </div>
964
+ </div>
965
+
966
+ <div id="codeentry" class="modal">
967
+ <div class="modal-content">
968
+ <div class="addgroup">
969
+ <h3 class="translate">Enter Pairing Code</h3>
986
970
  </div>
987
- <div class="row epid3">
988
- <div class="col epid">
989
- <div class=endpointid>
990
- <p class="translate device_with_endpoint">Sub Endpoint 3</p>
991
- </div>
992
- </div>
993
- <div class="col">
994
- <div class="input-field groups">
995
- <select id="d_groups_ep3" class="materialSelect" multiple>
996
- <option value="1">select</option>
997
- </select>
998
- <label for="d_groups_ep3" class="translate">Groups</label>
999
- </div>
971
+ <div class="row">
972
+ <div class="input-field">
973
+ <input id="qr_code" type="text" class="value validate">
974
+ <label for="qr_code" class="translate">QR Code</label>
1000
975
  </div>
1001
976
  </div>
1002
- <div class="row epid4">
1003
- <div class="col epid">
1004
- <div class=endpointid>
1005
- <p class="translate device_with_endpoint">Sub Endpoint 4</p>
977
+ </div>
978
+ <div class="modal-footer">
979
+ <a name="pair" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Start Pairing</a>
980
+ <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
981
+ </div>
982
+ </div>
983
+
984
+ <div id="groupadd" class="modal">
985
+ <div class="modal-content">
986
+ <div class = "addgroup">
987
+ <h3 class="translate">Create Group</h3>
988
+ </div>
989
+ <div class="row">
990
+ <div class="col s4 m4 l2">
991
+ <div class="input-field groupid">
992
+ <input id="g_index" type="number" min="1" class="value validate">
993
+ <label for="g_index" class="translate">№</label>
1006
994
  </div>
1007
995
  </div>
1008
- <div class="col">
1009
- <div class="input-field groups">
1010
- <select id="d_groups_ep4" class="materialSelect" multiple>
1011
- <option value="1">select</option>
1012
- </select>
1013
- <label for="d_groups_ep4" class="translate">Groups</label>
1014
- </div>
996
+ <div class="input-field col s8 m8 l10">
997
+ <input id="g_name" type="text" class="value validate">
998
+ <label for="g_name" class="translate">Name</label>
1015
999
  </div>
1016
1000
  </div>
1017
- <div class="row epid5">
1018
- <div class="col epid">
1019
- <div class=endpointid>
1020
- <p class="translate device_with_endpoint">Sub Endpoint 5</p>
1001
+ </div>
1002
+ <div class="modal-footer">
1003
+ <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1004
+ <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1005
+ </div>
1006
+ </div>
1007
+
1008
+ <div id="groupedit" class="modal">
1009
+ <div class="modal-content">
1010
+ <div class = "editgroup">
1011
+ <h3 class="translate">Edit Group</h3>
1012
+ </div>
1013
+ <div class="row">
1014
+ <div class="col s4 m4 l2 hide">
1015
+ <div class="input-field groupid">
1016
+ <input id="g_index" type="number" min="1" class="value validate">
1017
+ <label for="g_index" class="translate">№</label>
1021
1018
  </div>
1022
1019
  </div>
1023
- <div class="col">
1024
- <div class="input-field groups">
1025
- <select id="d_groups_ep5" class="materialSelect" multiple>
1026
- <option value="1">select</option>
1027
- </select>
1028
- <label for="d_groups_ep5" class="translate">Groups</label>
1029
- </div>
1020
+ <div class="input-field col s8 m8 l10">
1021
+ <input id="g_name" type="text" class="value validate">
1022
+ <label for="g_name" class="translate">Name</label>
1030
1023
  </div>
1031
1024
  </div>
1032
- <div class="row epid6">
1033
- <div class="col epid">
1034
- <div class=endpointid>
1035
- <p class="translate device_with_endpoint">Sub Endpoint 6</p>
1025
+ <div class="row">
1026
+ <div class="col s12">
1027
+ <div class="input-field members">
1028
+ <label for="g_members" class="translate">Members</label>
1029
+ <ul class="collection">
1030
+ <li class="collection-item">
1031
+ <label>
1032
+ <input id="member1" type="checkbox" class="value"/>
1033
+ <span class="translate" for="member1">Member 1</span>
1034
+ </label>
1035
+ </li>
1036
+ <li class="collection-item">
1037
+ Member 2
1038
+ <label>
1039
+ <input id="globaloverride" type="checkbox" class="value"/>
1040
+ <span class="translate" for="member2"></span>
1041
+ </label>
1042
+ </li>
1043
+ </ul>
1036
1044
  </div>
1037
- </div>
1038
- <div class="col">
1039
- <div class="input-field groups">
1040
- <select id="d_groups_ep6" class="materialSelect" multiple>
1041
- <option value="1">select</option>
1042
- </select>
1043
- <label for="d_groups_ep6" class="translate">Groups</label>
1044
- </div>
1045
1045
  </div>
1046
1046
  </div>
1047
1047
  </div>
1048
- <div class="row">
1049
- <div class="options_available col1">
1050
- <h6>Options</h6>
1051
- <div class="options_grid">
1052
- </div>
1053
- </div>
1054
- </div>
1055
- </div>
1056
- <div class="modal-footer">
1057
- <a name="add_options" class="waves-effect waves-green btn green translate"><i class="material-icons large">add_circle</i></a>
1058
- <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1059
- <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1060
- </div>
1061
- </div>
1062
- <div id="codeentry" class="modal">
1063
- <div class="modal-content">
1064
- <div class="addgroup">
1065
- <h3 class="translate">Enter Pairing Code</h3>
1066
- </div>
1067
- <div class="row">
1068
- <div class="input-field">
1069
- <input id="qr_code" type="text" class="value validate">
1070
- <label for="qr_code" class="translate">QR Code</label>
1071
- </div>
1072
- </div>
1073
- </div>
1074
- <div class="modal-footer">
1075
- <a name="pair" href="#!"
1076
- class="modal-action modal-close waves-effect waves-green btn green translate">Start Pairing</a>
1077
- <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1078
- </div>
1079
- </div>
1080
-
1081
- <div id="groupadd" class="modal">
1082
- <div class="modal-content">
1083
- <div class = "addgroup">
1084
- <h3 class="translate">Create Group</h3>
1085
- </div>
1086
- <div class="row">
1087
- <div class="col s4 m4 l2">
1088
- <div class="input-field groupid">
1089
- <input id="g_index" type="number" min="1" class="value validate">
1090
- <label for="g_index" class="translate">№</label>
1091
- </div>
1092
- </div>
1093
- <div class="input-field col s8 m8 l10">
1094
- <input id="g_name" type="text" class="value validate">
1095
- <label for="g_name" class="translate">Name</label>
1096
- </div>
1048
+ <div class="modal-footer">
1049
+ <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1050
+ <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1097
1051
  </div>
1098
1052
  </div>
1099
- <div class="modal-footer">
1100
- <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1101
- <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1102
- </div>
1103
- </div>
1104
1053
 
1105
- <div id="groupedit" class="modal">
1106
- <div class="modal-content">
1107
- <div class = "editgroup">
1108
- <h3 class="translate">Edit Group</h3>
1109
- </div>
1110
- <div class="row">
1111
- <div class="col s4 m4 l2 hide">
1112
- <div class="input-field groupid">
1113
- <input id="g_index" type="number" min="1" class="value validate">
1114
- <label for="g_index" class="translate">№</label>
1115
- </div>
1116
- </div>
1117
- <div class="input-field col s8 m8 l10">
1118
- <input id="g_name" type="text" class="value validate">
1119
- <label for="g_name" class="translate">Name</label>
1120
- </div>
1121
- </div>
1122
- <div class="row">
1123
- <div class="col s12">
1124
- <div class="input-field members">
1125
- <label for="g_members" class="translate">Members</label>
1126
- <ul class="collection">
1127
- <li class="collection-item">
1128
- <label>
1129
- <input id="member1" type="checkbox" class="value"/>
1130
- <span class="translate" for="member1">Member 1</span>
1131
- </label>
1132
- </li>
1133
- <li class="collection-item">
1134
- Member 2
1135
- <label>
1136
- <input id="globaloverride" type="checkbox" class="value"/>
1137
- <span class="translate" for="member2"></span>
1138
- </label>
1139
- </li>
1140
- </ul>
1141
- </div>
1142
- </div>
1143
- </div>
1144
- </div>
1145
- <div class="modal-footer">
1146
- <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1147
- <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1148
- </div>
1149
- </div>
1150
-
1151
- <div id="chooseimage" class="modal modal-fixed-footer">
1152
- <div class="modal-content">
1153
- <div class="row">
1154
- <h3 class="translate">Data override</h3>
1054
+ <div id="chooseimage" class="modal modal-fixed-footer">
1055
+ <div class="modal-content">
1155
1056
  <div class="row">
1156
- <div class="col s12 input-field">
1157
- <input id="d_name" type="text" class="value validate">
1158
- <label for="d_name" class="translate">Name</label>
1159
- </div>
1160
- </div>
1057
+ <h3 class="translate">Data override</h3>
1161
1058
  <div class="row">
1162
- <div class="col s9 input-field">
1163
- <select id="images" class="icons">
1164
- </select>
1165
- <label for="images" class="translate">Image</label>
1059
+ <div class="col s12 input-field">
1060
+ <input id="d_name" type="text" class="value validate">
1061
+ <label for="d_name" class="translate">Name</label>
1062
+ </div>
1166
1063
  </div>
1167
- <div class="col s3 ">
1168
- <div class="currentIcon"><img src="img/unknown.png"></div>
1064
+ <div class="row">
1065
+ <div class="col s9 input-field">
1066
+ <select id="images" class="icons">
1067
+ </select>
1068
+ <label for="images" class="translate">Image</label>
1069
+ </div>
1070
+ <div class="col s3 ">
1071
+ <div class="currentIcon"><img src="img/unknown.png"></div>
1072
+ </div>
1073
+ <div class="col options_grid s12">
1074
+ No Options available
1075
+ </div>
1076
+ <div class="new_options_available">
1077
+ <div class="input-field suffix col s10 m10 l10">
1078
+ <select id="option_Selector" class="materialSelect"></select class="value" />
1079
+ <label for="option_Selector">Available Options</label>
1080
+ </div>
1081
+ <div class="col">
1082
+ <a name="add_options" id="option_add_1084" class="waves-effect waves-green btn-large">
1083
+ <i class="material-icons large icon-green">add_circle</i></a>
1084
+ </div>
1085
+ </div>
1169
1086
  </div>
1170
1087
  </div>
1171
1088
  </div>
1172
- </div>
1173
- <div class="modal-footer">
1174
- <div class="forcedelete" id = "globaldiv">
1175
- <label>
1176
- <input id="globaloverride" type="checkbox" class="value"/>
1177
- <span class="translate" for="globaloverride">Apply to model</span>
1178
- </label>
1089
+ <div class="modal-footer">
1090
+ <div class="forcedelete" id = "globaldiv">
1091
+ <label>
1092
+ <input id="globaloverride" type="checkbox" class="value"/>
1093
+ <span class="translate" for="globaloverride">Apply to model</span>
1094
+ </label>
1095
+ </div>
1096
+ <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1097
+ <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1179
1098
  </div>
1180
- <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
1181
- <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1182
1099
  </div>
1183
- </div>
1184
1100
 
1185
-
1186
- <div id="modaldelete" class="modal">
1101
+ <div id="modaldelete" class="modal">
1187
1102
  <div class="modal-content">
1188
1103
  <h3 class="translate">Delete confirmation</h3>
1189
1104
  <p>A bunch of text</p>
@@ -1238,8 +1153,8 @@
1238
1153
  </div>
1239
1154
  <div class="modal-footer">
1240
1155
  <a name="IEEE" href="#!" class="modal-action waves-effect waves-red btn-flat left">Network</a>
1241
- <a name="endpairing" href="#!" class="modal-action waves-effect waves-red btn red translate">Stop</a>
1242
- <a name="extendpairing" href="#!" class="modal-action waves-effect waves-green btn green translate">Extend</a>
1156
+ <a name="endpairing" id="endpairing" href="#!" class="modal-action waves-effect waves-red btn red translate">Stop</a>
1157
+ <a name="extendpairing" id="extendpairing" href="#!" class="modal-action waves-effect waves-green btn green translate">Extend</a>
1243
1158
  <a name="hide" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Hide</a>
1244
1159
  </div>
1245
1160
  </div>
@@ -1298,6 +1213,9 @@
1298
1213
  <span style="pointer-events: none;">Show Messages</span>
1299
1214
  </label>
1300
1215
  </div>
1216
+ <div class="input-field col s12 admin-tooltip-icon translateT" title="Regenerate Map">
1217
+ <br><button id="regenerate" class="waves-effect center hoverable blue"><i class="material-icons medium border:0 icon-Black">map</i></button>
1218
+ </div>
1301
1219
  </div>
1302
1220
  <div class="input-field input-group col s12 m6 l6">
1303
1221
  <p class="translate">Device map info</p>
@@ -1353,6 +1271,7 @@
1353
1271
  <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1354
1272
  </div>
1355
1273
  </div>
1274
+
1356
1275
  <div id="excludemodaledit" class="modal">
1357
1276
  <div class="modal-content">
1358
1277
  <div class="row">
@@ -1371,6 +1290,7 @@
1371
1290
  <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
1372
1291
  </div>
1373
1292
  </div>
1293
+
1374
1294
  <div id="modaldevinfo" class="modal modal-fixed-footer modal-fixed-header">
1375
1295
  <div class="modal-header">
1376
1296
  <h3 class="translate">Device information</h3>
@@ -1414,5 +1334,4 @@
1414
1334
  </div>
1415
1335
  </div>
1416
1336
  </body>
1417
-
1418
1337
  </html>