Skip to content

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
  • Loading branch information
tcharp38 committed Sep 13, 2024
1 parent 28b0481 commit 5439585
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions core/class/AbeilleParser.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ function findModel(&$eq, $by='modelId') {
$modelSource = "Abeille"; // Default location

if (isset($eq['zigbee']['modelId']) && ($eq['zigbee']['modelId'] !== false) && ($eq['zigbee']['modelId'] != '')) {
if (($eq['zigbee']['manufId'] !== false) && ($eq['zigbee']['manufId'] != '')) {
if (isset($eq['zigbee']['manufId']) && ($eq['zigbee']['manufId'] !== false) && ($eq['zigbee']['manufId'] != '')) {
/* Search by modelId AND manufacturer */
$identifier = $eq['zigbee']['modelId'].'_'.$eq['zigbee']['manufId'];
if (isset($GLOBALS['customEqList'][$identifier])) {
Expand Down Expand Up @@ -887,10 +887,9 @@ function deviceConfigure($net, $addr) {
'net' => $net,
'addr' => $addr,
'ieee' => $eq['zigbee']['ieee'],
// 'ep' => $eq['epFirst'],
'ep' => $eq['mainEp'],
'modelId' => $eq['zigbee']['modelId'],
'manufId' => $eq['zigbee']['manufId'],
'manufId' => isset($eq['zigbee']['manufId']) ? $eq['zigbee']['manufId'] : '',
'modelName' => $eq['eqModel']['modelName'],
'modelSource' => $eq['eqModel']['modelSource'], // "Abeille" or "local"
'macCapa' => $eq['zigbee']['macCapa'],
Expand Down
Binary file modified resources/fw_zigate/zigatev1-AB01-0000-opdm-dev.bin
Binary file not shown.

0 comments on commit 5439585

Please sign in to comment.