diff --git a/core/config/devices/freebox/rocketcam.json b/core/config/devices/freebox/rocketcam.json
index 87f3a1d..520b648 100644
--- a/core/config/devices/freebox/rocketcam.json
+++ b/core/config/devices/freebox/rocketcam.json
@@ -2,8 +2,9 @@
"name" : "RocketCam",
"manufacturer" : "Freebox",
"configuration": {
+ "username" : "freeboxcam",
"urlStream": "\/img\/snapshot.cgi?size=4&quality=1",
- "cameraStreamAccessUrl" : "rtsp:\/\/#username#:#password#@#ip#\/img\/live",
+ "cameraStreamAccessUrl" : "http:\/\/#username#:#password#@#ip#\/img\/stream.m3u8",
"protocole": "http"
},
"commands": []
diff --git a/desktop/modal/health.php b/desktop/modal/health.php
index 93e1b6d..114c7a5 100644
--- a/desktop/modal/health.php
+++ b/desktop/modal/health.php
@@ -44,8 +44,8 @@
getIsEnable()) ? '' : 'disableCard';
- if (file_exists(dirname(__FILE__) . '/../../core/config/devices/' . $eqLogic->getConfiguration('device') . '.jpg')) {
- $img = '
';
+ if ($eqLogic->getConfiguration('device') != "" && camera::getImgFilePath($eqLogic->getConfiguration('device')) !== false) {
+ $img = '
';
} else {
$img = '
';
}
@@ -75,12 +75,12 @@
} else {
echo '
' . $framerate . '/s | ';
}
-
- echo '' . $eqLogic->getConfiguration('refreshDelaySlow',1) . '/s | ';
- echo '' . $eqLogic->getConfiguration('refreshDelayFast',1) . '/s | ';
+
+ echo '' . $eqLogic->getConfiguration('refreshDelaySlow', 1) . '/s | ';
+ echo '' . $eqLogic->getConfiguration('refreshDelayFast', 1) . '/s | ';
echo '' . $eqLogic->getConfiguration('maxReccordTime') . 's | ';
echo '' . $eqLogic->getConfiguration('createtime') . ' | ';
}
?>
-
+
\ No newline at end of file
diff --git a/desktop/php/camera.php b/desktop/php/camera.php
index 14d74ba..d561de9 100644
--- a/desktop/php/camera.php
+++ b/desktop/php/camera.php
@@ -48,18 +48,17 @@
echo '';
foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard';
- echo '
';
+ echo '
';
if ($eqLogic->getConfiguration('device') != "" && camera::getImgFilePath($eqLogic->getConfiguration('device')) !== false) {
- echo '
) . ')
';
- }
- else {
+ echo '
) . ')
';
+ } else {
echo '
 . ')
';
}
echo '
';
echo '
' . $eqLogic->getHumanName(true, true) . '';
echo '
';
if ($eqLogic->getConfiguration('ip', '') != '') {
- echo ''.$eqLogic->getConfiguration('ip').'';
+ echo '' . $eqLogic->getConfiguration('ip') . '';
}
echo ($eqLogic->getIsVisible() == 1) ? '' : '';
echo '';
@@ -237,208 +236,208 @@
-
+
-
-
-
-
{{Si votre caméra n'est pas dans la liste vous pouvez trouver}}
{{ici}} {{les informations de configuration pour pas mal de camera}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-