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/index_m.html CHANGED
@@ -671,48 +671,31 @@
671
671
  </div>
672
672
  <ul id="nav-mobile" class="right">
673
673
  <li>
674
- <a id="ErrorNotificationBtn" class="btn-floating waves-effect waves-light black tooltipped center-align hoverable translateT hide" title="Zigbee not running">
675
- <i id="ErrorNotificationIcon" class="material-icons large icon-red">error</i></a>
674
+ <a id="adapterStopped_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Adapter not running">
675
+ <i class="material-icons large">grid_off</i></a>
676
+ </li>
677
+ <li>
678
+ <li>
679
+ <a id="ErrorNotificationBtn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Zigbee not running">
680
+ <i id="ErrorNotificationIcon" class="material-icons large">error</i></a>
676
681
  </li>
677
- <!--
678
- <li>
682
+ <li>
679
683
  <a id="state_cleanup_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="State Cleanup">
680
684
  <i class="material-icons large icon-blue">delete_sweep</i></a>
681
- </li>
682
- -->
685
+ </li>
683
686
  <li>
684
- <a id="show_errors_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Show Errors">
687
+ <a id="show_errors_btn" class="btn-floating disabled waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Show Errors">
685
688
  <i class="material-icons large icon-blue">feedback</i></a>
686
689
  </li>
687
- <!--
688
- <li>
689
- <a id="fw_check_btn"
690
- class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT"
691
- title="Check firmware updates">
692
- <i class="material-icons large icon-blue">system_update</i></a>
693
- </li>
694
- <li>
695
- <a id="add_grp_btn"
696
- class="btn-floating waves-effect waves-light brown tooltipped center-align hoverable translateT"
697
- title="Add Group">
698
- <i class="material-icons large">group_work</i></a>
699
- </li>
700
- <li>
701
- <a id="touchlink_btn"
702
- class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT"
703
- title="Touchlink reset and pairing">
704
- <i class="material-icons large">wifi_tethering</i></a>
705
- </li>
706
- <li>
707
- <a id="code_pairing"
708
- class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT"
709
- title="Pairing with QR Code">
710
- <i class="material-icons large">select_all</i></a>
711
- </li>
712
- -->
690
+ <li>
691
+ <a id="download_icons_btn"
692
+ class="btn-floating disabled waves-effect waves-light blue tooltipped center-align hoverable translateT"
693
+ title="Download missing icons">
694
+ <i class="material-icons large">cloud_download</i></a>
695
+ </li>
713
696
  <li>
714
697
  <a id="pairing"
715
- class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT"
698
+ class="btn-floating disabled waves-effect waves-light green tooltipped center-align hoverable translateT"
716
699
  title="Let's pairing!">
717
700
  <i class="material-icons large">leak_add</i></a>
718
701
  </li>
@@ -725,6 +708,7 @@
725
708
  <!--<li class="tab col s2"><a href="#tab-map" id="tabmap" class="translate tooltipped">Network map</a></li> -->
726
709
  <!--<li class="tab col s1"><a href="#tab-binding" class="translate tooltipped">Binding</a></li> -->
727
710
  <li class="tab col s2"><a href="#tab-exclude" class="translate tooltipped">Local Overrides</a></li>
711
+ <li class="tab col s2"><a href="#tab-overrides" class="translate tooltipped">Local Data</a></li>
728
712
  <!--<li class="tab col s2"><a href="#tab-main" id="devs" class="translate tooltipped">Devices</a></li>-->
729
713
  <li class="tab col s2"><a href="#tab-dev" id="develop" class="translate tooltipped">Developer</a>
730
714
  <!--<li class="tab col s2"><a href="#tab-debug" id="tabdebug" class="translate">Debug</a></li>-->
@@ -781,13 +765,23 @@
781
765
  <input id="disableBackup" type="checkbox" class="value"/>
782
766
  <label class="translate" for="disableBackup">disable internal Backup</label>
783
767
  </div>
784
- <div class="input-field col s12 m6 l4 col-disablePing">
768
+ <!--<div class="input-field col s12 m6 l4 col-disablePing">
785
769
  <input id="disablePing" type="checkbox" class="value"/>
786
770
  <label class="translate" for="disablePing">Disable active availability check</label>
771
+ </div>-->
772
+ <div class="input-field col s12 m6 l4 col">
773
+ <select id="pingCluster" class="value" >
774
+ <option value="off">off</option>
775
+ <option value="default" selected>default</option>
776
+ <option value="c0a0">genBasic/zclVersion</option>
777
+ <option value="c0a5">genBasic/modelId</option>
778
+ <option value="c25a0">genOta/serverId</option>
779
+ </select>
780
+ <label class="translate" for="pingCluster">Active activity check</label>
787
781
  </div>
788
782
  <div class="input-field col s12 m6 l4">
789
783
  <input id="pingTimeout" type="number" min="60" max="3600" class="value"/>
790
- <label class="translate" for="pingTimeout">Time between activity Check [s]</label>
784
+ <label class="translate" for="pingTimeout">Time between activity Checks [s]</label>
791
785
  </div>
792
786
  </div>
793
787
  <div class="row">
@@ -800,8 +794,8 @@
800
794
  <div class="row">
801
795
  <h6 class="translate">Global Options</h6>
802
796
  <div class="input-field col s12 m6 l4 col-readAtAnnounce">
803
- <input id="readAtAnnounce" type="checkbox" class="value"/>
804
- <label class="translate" for="readAtAnnounce">Read states at device announce</label>
797
+ <input id="listDevicesAtStart" type="checkbox" class="value"/>
798
+ <label class="translate" for="listDevicesAtStart">List devices at start</label>
805
799
  </div>
806
800
  <div class="input-field col s12 m6 l4 col-readAtAnnounce">
807
801
  <input id="readAllAtStart" type="checkbox" class="value"/>
@@ -811,6 +805,14 @@
811
805
  <input id="startReadDelay" type="number" min="0" max="10" class="value"/>
812
806
  <label class="translate" for="startReadDelay">Read delay in seconds.</label>
813
807
  </div>
808
+ <div class="input-field col s12 m6 l4 col-readAtAnnounce">
809
+ <input id="readAtAnnounce" type="checkbox" class="value"/>
810
+ <label class="translate" for="readAtAnnounce">Read states at device announce</label>
811
+ </div>
812
+ <div class="input-field col s12 m6 l4 col-useNewCompositeStates">
813
+ <input id="useNewCompositeStates" type="checkbox" class="value"/>
814
+ <label class="translate" for="useNewCompositeStates">use channel for complex exposes</label>
815
+ </div>
814
816
  <div class="input-field col s12 m12 l12 col-startWithInconsistent">
815
817
  <input id="startWithInconsistent" type="checkbox" class="value"/>
816
818
  <label class="translate" for="startWithInconsistent">SettingsExclude</label>
@@ -1184,6 +1186,16 @@
1184
1186
  <ul id="dbg_data_list">
1185
1187
  </ul>
1186
1188
  </div>
1189
+ <div id="tab-overrides" class="col s12 page">
1190
+ <div class="fixed-action-btn" style="margin-bottom: 100px">
1191
+ <a id="updateData"
1192
+ class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT"
1193
+ title="update Data"><i class="material-icons large">replay</i></a>
1194
+ </div>
1195
+ <div id="tab-overrides" row>
1196
+ Nothing to see yet.
1197
+ </div>
1198
+ </div>
1187
1199
  </div>
1188
1200
  </div>
1189
1201
 
@@ -1192,130 +1204,16 @@
1192
1204
  <div class="modal-content">
1193
1205
  <h3 class="translate">Rename / Group device</h3>
1194
1206
  <div class="row">
1195
- <div class="col1">
1207
+ <div class="col s12 m12 l12">
1196
1208
  <div class="input-field">
1197
1209
  <input id="d_name" type="text" class="value validate">
1198
1210
  <label for="d_name" class="translate">Name</label>
1199
1211
  </div>
1200
1212
  </div>
1201
1213
  </div>
1202
- <div class="groups_available">
1203
- <div class="row">
1204
- <h6>Groups</h6>
1214
+ <div class="row endpoints_for_groups">
1205
1215
  </div>
1206
- <div class="row epid0">
1207
- <div class="col">
1208
- <div class=endpointid>
1209
- <p class="translate device_with_endpoint">Main Endpoint</p>
1210
- </div>
1211
- </div>
1212
- <div class="col1">
1213
- <div class="input-field groups">
1214
- <select id="d_groups_ep0" class="materialSelect" multiple>
1215
- <option value="1">select</option>
1216
- </select>
1217
- <label for="d_groups_ep0" class="translate">Groups</label>
1218
- </div>
1219
- </div>
1220
- </div>
1221
- <div class="row epid1">
1222
- <div class="col epid">
1223
- <div class=endpointid>
1224
- <p class="translate device_with_endpoint">Sub Endpoint 1</p>
1225
- </div>
1226
- </div>
1227
- <div class="col">
1228
- <div class="input-field groups">
1229
- <select id="d_groups_ep1" class="materialSelect" multiple>
1230
- <option value="1">select</option>
1231
- </select>
1232
- <label for="d_groups_ep1" class="translate">Groups</label>
1233
- </div>
1234
- </div>
1235
- </div>
1236
- <div class="row epid2">
1237
- <div class="col epid">
1238
- <div class=endpointid>
1239
- <p class="translate device_with_endpoint">Sub Endpoint 2</p>
1240
- </div>
1241
- </div>
1242
- <div class="col">
1243
- <div class="input-field groups">
1244
- <select id="d_groups_ep2" class="materialSelect" multiple>
1245
- <option value="1">select</option>
1246
- </select>
1247
- <label for="d_groups_ep2" class="translate">Groups</label>
1248
- </div>
1249
- </div>
1250
- </div>
1251
- <div class="row epid3">
1252
- <div class="col epid">
1253
- <div class=endpointid>
1254
- <p class="translate device_with_endpoint">Sub Endpoint 3</p>
1255
- </div>
1256
- </div>
1257
- <div class="col">
1258
- <div class="input-field groups">
1259
- <select id="d_groups_ep3" class="materialSelect" multiple>
1260
- <option value="1">select</option>
1261
- </select>
1262
- <label for="d_groups_ep3" class="translate">Groups</label>
1263
- </div>
1264
- </div>
1265
- </div>
1266
- <div class="row epid4">
1267
- <div class="col epid">
1268
- <div class=endpointid>
1269
- <p class="translate device_with_endpoint">Sub Endpoint 4</p>
1270
- </div>
1271
- </div>
1272
- <div class="col">
1273
- <div class="input-field groups">
1274
- <select id="d_groups_ep4" class="materialSelect" multiple>
1275
- <option value="1">select</option>
1276
- </select>
1277
- <label for="d_groups_ep4" class="translate">Groups</label>
1278
- </div>
1279
- </div>
1280
- </div>
1281
- <div class="row epid5">
1282
- <div class="col epid">
1283
- <div class=endpointid>
1284
- <p class="translate device_with_endpoint">Sub Endpoint 5</p>
1285
- </div>
1286
- </div>
1287
- <div class="col">
1288
- <div class="input-field groups">
1289
- <select id="d_groups_ep5" class="materialSelect" multiple>
1290
- <option value="1">select</option>
1291
- </select>
1292
- <label for="d_groups_ep5" class="translate">Groups</label>
1293
- </div>
1294
- </div>
1295
- </div>
1296
- <div class="row epid6">
1297
- <div class="col epid">
1298
- <div class=endpointid>
1299
- <p class="translate device_with_endpoint">Sub Endpoint 6</p>
1300
- </div>
1301
- </div>
1302
- <div class="col">
1303
- <div class="input-field groups">
1304
- <select id="d_groups_ep6" class="materialSelect" multiple>
1305
- <option value="1">select</option>
1306
- </select>
1307
- <label for="d_groups_ep6" class="translate">Groups</label>
1308
- </div>
1309
- </div>
1310
- </div>
1311
- </div>
1312
- <div class="options_available">
1313
- <div class="row">
1314
- <h6>Options</h6>
1315
- </div>
1316
- <div class="row options">
1317
-
1318
- </div>
1216
+ <div class="row options">
1319
1217
  </div>
1320
1218
  </div>
1321
1219
  <div class="modal-footer">
@@ -1480,6 +1378,8 @@
1480
1378
  </div>
1481
1379
  <div class="modal-footer">
1482
1380
  <a name="IEEE" href="#!" class="modal-action waves-effect waves-red btn-flat left">Network</a>
1381
+ <a name="endpairing" id="endpairing" href="#!" class="modal-action waves-effect waves-red btn red translate">Stop</a>
1382
+ <a name="extendpairing" id="endpairing" href="#!" class="modal-action waves-effect waves-green btn green translate">Extend</a>
1483
1383
  <a name="hide" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Hide</a>
1484
1384
  </div>
1485
1385
  </div>