Skip to content

Commit 7eabd76

Browse files
Make memx and mx_accl support separate
1 parent ba3f9f8 commit 7eabd76

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

web/skins/classic/views/monitor.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,9 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
10771077
if (defined('HAVE_QUADRA'))
10781078
$od_options['quadra'] = 'NetInt Quadra';
10791079
if (defined('HAVE_MEMX'))
1080-
$od_options['memx'] = 'MemryX MX3';
1080+
$od_options['memx'] = 'MemryX Local MX3';
1081+
if (defined('HAVE_MEMX'))
1082+
$od_options['mx_accl'] = 'MemryX MxAccl';
10811083

10821084
echo htmlSelect('newMonitor[ObjectDetection]', $od_options, $monitor->ObjectDetection(), [ 'data-on-change-this'=>'ObjectDetection_onChange']);
10831085
?>
@@ -1090,9 +1092,15 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
10901092
foreach (glob(ZM_DIR_MODELS.'/*') as $model) {
10911093
$model = basename($model);
10921094
$extension = pathinfo($model, PATHINFO_EXTENSION);
1093-
if ($extension == 'dfp' and defined('HAVE_MEMX')) {
1094-
if (!isset($models['memx'])) $models['memx'] = [];
1095-
$models['memx'][$model] = $model;
1095+
if ($extension == 'dfp') {
1096+
if (defined('HAVE_MEMX')) {
1097+
if (!isset($models['memx'])) $models['memx'] = [];
1098+
$models['memx'][$model] = $model;
1099+
}
1100+
if (defined('HAVE_MX_ACCL')) {
1101+
if (!isset($models['mx_accl'])) $models['mx_accl'] = [];
1102+
$models['mx_accl'][$model] = $model;
1103+
}
10961104
} else if ($extension == 'uxf' and defined('HAVE_UNTETHER')) {
10971105
if (!isset($models['speedai'])) $models['speedai'] = [];
10981106
$models['speedai'][$model] = $model;

0 commit comments

Comments
 (0)