-@@ -206,11 +207,11 @@
- return -1; // Could not create on PID file
-
-
-- if( lockf(fd, F_TLOCK, 0) == -1 )
-- {
-- close(fd);
-- return -1; // Could not get lock on PID file
-- }
-+// if( lockf(fd, F_TLOCK, 0) == -1 )
-+// {
-+// close(fd);
-+// return -1; // Could not get lock on PID file
-+// }
-
-
- if( ftruncate(fd, 0) != 0 )
diff --git a/src/wsdd/wsdd b/src/wsdd/wsdd
deleted file mode 160000
index f9d61ed..0000000
--- a/src/wsdd/wsdd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f9d61ed16178fc376d73757ee283b303bff44870
diff --git a/src/www/httpd/cgi-bin/camera_settings.sh b/src/www/httpd/cgi-bin/camera_settings.sh
index be506fe..ad2888c 100755
--- a/src/www/httpd/cgi-bin/camera_settings.sh
+++ b/src/www/httpd/cgi-bin/camera_settings.sh
@@ -31,12 +31,6 @@ do
fi
elif [ "$CONF" == "sensitivity" ] ; then
ipc_cmd -s $VAL
- elif [ "$CONF" == "ai_human_detection" ] ; then
- if [ "$VAL" == "no" ] ; then
- ipc_cmd -a off
- else
- ipc_cmd -a on
- fi
elif [ "$CONF" == "sound_detection" ] ; then
if [ "$VAL" == "no" ] ; then
ipc_cmd -b off
@@ -47,6 +41,12 @@ do
if [ "$VAL" == "50" ] || [ "$VAL" == "60" ] || [ "$VAL" == "70" ] || [ "$VAL" == "80" ] || [ "$VAL" == "90" ] ; then
ipc_cmd -n $VAL
fi
+ elif [ "$CONF" == "baby_crying_detect" ] ; then
+ if [ "$VAL" == "no" ] ; then
+ ipc_cmd -B off
+ else
+ ipc_cmd -B on
+ fi
elif [ "$CONF" == "led" ] ; then
if [ "$VAL" == "no" ] ; then
ipc_cmd -l off
diff --git a/src/www/httpd/cgi-bin/links.sh b/src/www/httpd/cgi-bin/links.sh
index c4bcccc..8071e12 100755
--- a/src/www/httpd/cgi-bin/links.sh
+++ b/src/www/httpd/cgi-bin/links.sh
@@ -26,7 +26,7 @@ case $(get_config RTSP_PORT) in
*) RTSP_PORT=$(get_config RTSP_PORT) ;;
esac
case $(get_config HTTPD_PORT) in
- ''|*[!0-9]*) HTTPD_PORT=8080 ;;
+ ''|*[!0-9]*) HTTPD_PORT=80 ;;
*) HTTPD_PORT=$(get_config HTTPD_PORT) ;;
esac
diff --git a/src/www/httpd/cgi-bin/preset.sh b/src/www/httpd/cgi-bin/preset.sh
index 3bfc5b7..962b95e 100755
--- a/src/www/httpd/cgi-bin/preset.sh
+++ b/src/www/httpd/cgi-bin/preset.sh
@@ -1,19 +1,79 @@
#!/bin/sh
+YI_HACK_PREFIX="/tmp/sd/yi-hack-v5"
+PTZ_CONF_FILE=$YI_HACK_PREFIX/etc/ptz_presets.conf
+PTZ_SCRIPT=$YI_HACK_PREFIX/script/ptz_presets.sh
+
+. $YI_HACK_PREFIX/www/cgi-bin/validate.sh
+
+return_error() {
+ printf "Content-type: application/json\r\n\r\n"
+ printf "{\n"
+ printf "\"%s\":\"%s\",\\n" "error" "true"
+ printf "\"%s\":\"%s\"\\n" "message" "$@"
+ printf "}"
+}
+
+if ! $(validateQueryString $QUERY_STRING); then
+ return_error "Invalid query"
+ exit
+fi
+
+ACTION="none"
NUM=-1
+NAME=""
+
+for I in 1 2 3
+do
+ CONF="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f1)"
+ VAL="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f2)"
-CONF="$(echo $QUERY_STRING | cut -d'=' -f1)"
-VAL="$(echo $QUERY_STRING | cut -d'=' -f2)"
+ if [ "$CONF" == "action" ] ; then
+ ACTION="$VAL"
+ elif [ "$CONF" == "num" ] ; then
+ if $(validateNumber $VAL); then
+ NUM="$VAL"
+ else
+ if [ "$VAL" == "all" ]; then
+ NUM="$VAL"
+ else
+ return_error "Wrong arguments"
+ exit
+ fi
+ fi
+ elif [ "$CONF" == "name" ] ; then
+ if $(validateString $VAL); then
+ NAME="$VAL"
+ else
+ return_error "Wrong arguments"
+ exit
+ fi
+ fi
+done
-if [ "$CONF" == "num" ] ; then
- NUM=$VAL
+if [ "$ACTION" == "none" ] || [ "$ACTION" == "get_presets" ]; then
+ return_error -99
+ exit
fi
-if [ $NUM -ne -1 ] ; then
- ipc_cmd -p $NUM
+if [ "$NUM" != "-1" ]; then
+ NUM="-n $NUM"
+else
+ NUM=""
+fi
+if [ ! -z $NAME ]; then
+ NAME="-m $NAME"
+else
+ NAME=""
fi
-printf "Content-type: application/json\r\n\r\n"
+RES=$($PTZ_SCRIPT -a $ACTION $NUM $NAME)
-printf "{\n"
-printf "}"
+if [ "$RES" == "" ]; then
+ printf "Content-type: application/json\r\n\r\n"
+ printf "{\n"
+ printf "\"%s\":\"%s\"\\n" "error" "false"
+ printf "}"
+else
+ return_error $RES
+fi
diff --git a/src/www/httpd/cgi-bin/service.sh b/src/www/httpd/cgi-bin/service.sh
index 6db82e0..8416008 100755
--- a/src/www/httpd/cgi-bin/service.sh
+++ b/src/www/httpd/cgi-bin/service.sh
@@ -23,19 +23,16 @@ init_config()
if [[ x$(get_config USERNAME) != "x" ]] ; then
USERNAME=$(get_config USERNAME)
PASSWORD=$(get_config PASSWORD)
- ONVIF_USERPWD="--user $USERNAME --password $PASSWORD"
+ ONVIF_USERPWD="user=$USERNAME\npassword=$PASSWORD"
+ RTSP_USERPWD=$USERNAME:$PASSWORD@
fi
case $(get_config RTSP_PORT) in
''|*[!0-9]*) RTSP_PORT=554 ;;
*) RTSP_PORT=$(get_config RTSP_PORT) ;;
esac
- case $(get_config ONVIF_PORT) in
- ''|*[!0-9]*) ONVIF_PORT=80 ;;
- *) ONVIF_PORT=$(get_config ONVIF_PORT) ;;
- esac
case $(get_config HTTPD_PORT) in
- ''|*[!0-9]*) HTTPD_PORT=8080 ;;
+ ''|*[!0-9]*) HTTPD_PORT=80 ;;
*) HTTPD_PORT=$(get_config HTTPD_PORT) ;;
esac
@@ -43,10 +40,6 @@ init_config()
D_RTSP_PORT=:$RTSP_PORT
fi
- if [[ $ONVIF_PORT != "80" ]] ; then
- D_ONVIF_PORT=:$ONVIF_PORT
- fi
-
if [[ $HTTPD_PORT != "80" ]] ; then
D_HTTPD_PORT=:$HTTPD_PORT
fi
@@ -102,36 +95,116 @@ start_onvif()
WATERMARK="&watermark=yes"
fi
if [[ $1 == "high" ]]; then
- ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
+ ONVIF_PROFILE_0="name=Profile_0\nwidth=$HIGHWIDTH\nheight=$HIGHHEIGHT\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_0.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK\ntype=H264"
fi
if [[ $1 == "low" ]]; then
- ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+ ONVIF_PROFILE_1="name=Profile_1\nwidth=640\nheight=360\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_1.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK\ntype=H264"
fi
if [[ $1 == "both" ]]; then
- ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
- ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+ ONVIF_PROFILE_0="name=Profile_0\nwidth=$HIGHWIDTH\nheight=$HIGHHEIGHT\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_0.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK\ntype=H264"
+ ONVIF_PROFILE_1="name=Profile_1\nwidth=640\nheight=360\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_1.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK\ntype=H264"
+ fi
+
+ ONVIF_SRVD_CONF="/tmp/onvif_simple_server.conf"
+
+ echo "model=Yi Hack" > $ONVIF_SRVD_CONF
+ echo "manufacturer=Yi" >> $ONVIF_SRVD_CONF
+ echo "firmware_ver=$YI_HACK_VER" >> $ONVIF_SRVD_CONF
+ echo "hardware_id=$HW_ID" >> $ONVIF_SRVD_CONF
+ echo "serial_num=$SERIAL_NUMBER" >> $ONVIF_SRVD_CONF
+ echo "ifs=$ONVIF_NETIF" >> $ONVIF_SRVD_CONF
+ echo "port=$HTTPD_PORT" >> $ONVIF_SRVD_CONF
+ echo "scope=onvif://www.onvif.org/Profile/Streaming" >> $ONVIF_SRVD_CONF
+ echo "" >> $ONVIF_SRVD_CONF
+ if [ ! -z $ONVIF_USERPWD ]; then
+ echo -e $ONVIF_USERPWD >> $ONVIF_SRVD_CONF
+ echo "" >> $ONVIF_SRVD_CONF
+ fi
+ if [ ! -z $ONVIF_PROFILE_0 ]; then
+ echo "#Profile 0" >> $ONVIF_SRVD_CONF
+ echo -e $ONVIF_PROFILE_0 >> $ONVIF_SRVD_CONF
+ echo "" >> $ONVIF_SRVD_CONF
+ fi
+ if [ ! -z $ONVIF_PROFILE_1 ]; then
+ echo "#Profile 1" >> $ONVIF_SRVD_CONF
+ echo -e $ONVIF_PROFILE_1 >> $ONVIF_SRVD_CONF
+ echo "" >> $ONVIF_SRVD_CONF
fi
if [[ $MODEL_SUFFIX == "yi_dome" ]] || [[ $MODEL_SUFFIX == "yi_dome_1080p" ]] || [[ $MODEL_SUFFIX == "yi_cloud_dome_1080p" ]] ; then
- onvif_srvd --pid_file /var/run/onvif_srvd.pid --model "$MODEL_SUFFIX" --manufacturer "Yi" --firmware_ver "$YI_HACK_VER" --hardware_id $HW_ID --serial_num $SERIAL_NUMBER --ifs $ONVIF_NETIF --port $ONVIF_PORT --scope onvif://www.onvif.org/Profile/S $ONVIF_PROFILE_0 $ONVIF_PROFILE_1 $ONVIF_USERPWD --ptz --move_left "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" --move_right "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" --move_up "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" --move_down "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m down" --move_stop "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m stop" --move_preset "/tmp/sd/yi-hack-v5/bin/ipc_cmd -p %t"
- else
- onvif_srvd --pid_file /var/run/onvif_srvd.pid --model "$MODEL_SUFFIX" --manufacturer "Yi" --firmware_ver "$YI_HACK_VER" --hardware_id $HW_ID --serial_num $SERIAL_NUMBER --ifs $ONVIF_NETIF --port $ONVIF_PORT --scope onvif://www.onvif.org/Profile/S $ONVIF_PROFILE_0 $ONVIF_PROFILE_1 $ONVIF_USERPWD
+ echo "#PTZ" >> $ONVIF_SRVD_CONF
+ echo "ptz=1" >> $ONVIF_SRVD_CONF
+ echo "get_position=/tmp/sd/yi-hack-v5/bin/ipc_cmd -g" >> $ONVIF_SRVD_CONF
+ echo "is_running=/tmp/sd/yi-hack-v5/bin/ipc_cmd -u" >> $ONVIF_SRVD_CONF
+ echo "move_left=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" >> $ONVIF_SRVD_CONF
+ echo "move_right=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" >> $ONVIF_SRVD_CONF
+ echo "move_up=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" >> $ONVIF_SRVD_CONF
+ echo "move_down=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m down" >> $ONVIF_SRVD_CONF
+ echo "move_stop=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m stop" >> $ONVIF_SRVD_CONF
+ echo "move_preset=/tmp/sd/yi-hack-v5/bin/ipc_cmd -p %d" >> $ONVIF_SRVD_CONF
+ echo "set_preset=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a add_preset -m %s" >> $ONVIF_SRVD_CONF
+ echo "set_home_position=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a set_home_position" >> $ONVIF_SRVD_CONF
+ echo "remove_preset=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a del_preset -n %d" >> $ONVIF_SRVD_CONF
+ echo "jump_to_abs=/tmp/sd/yi-hack-v5/bin/ipc_cmd -j %f,%f" >> $ONVIF_SRVD_CONF
+ echo "jump_to_rel=/tmp/sd/yi-hack-v5/bin/ipc_cmd -J %f,%f" >> $ONVIF_SRVD_CONF
+ echo "get_presets=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a get_presets" >> $ONVIF_SRVD_CONF
+ echo "" >> $ONVIF_SRVD_CONF
fi
+
+ echo "#EVENT" >> $ONVIF_SRVD_CONF
+ echo "events=3" >> $ONVIF_SRVD_CONF
+ echo "#Event 0" >> $ONVIF_SRVD_CONF
+ echo "topic=tns1:VideoSource/MotionAlarm" >> $ONVIF_SRVD_CONF
+ echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+ echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+ echo "input_file=/tmp/onvif_notify_server/motion_alarm" >> $ONVIF_SRVD_CONF
+ echo "#Event 1" >> $ONVIF_SRVD_CONF
+ echo "topic=tns1:RuleEngine/MyRuleDetector/PeopleDetect" >> $ONVIF_SRVD_CONF
+ echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+ echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+ echo "input_file=/tmp/onvif_notify_server/human_detection" >> $ONVIF_SRVD_CONF
+ echo "#Event 2" >> $ONVIF_SRVD_CONF
+ echo "topic=tns1:RuleEngine/MyRuleDetector/VehicleDetect" >> $ONVIF_SRVD_CONF
+ echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+ echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+ echo "input_file=/tmp/onvif_notify_server/vehicle_detection" >> $ONVIF_SRVD_CONF
+ echo "#Event 3" >> $ONVIF_SRVD_CONF
+ echo "topic=tns1:RuleEngine/MyRuleDetector/DogCatDetect" >> $ONVIF_SRVD_CONF
+ echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+ echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+ echo "input_file=/tmp/onvif_notify_server/animal_detection" >> $ONVIF_SRVD_CONF
+ echo "#Event 4" >> $ONVIF_SRVD_CONF
+ echo "topic=tns1:RuleEngine/MyRuleDetector/BabyCryingDetect" >> $ONVIF_SRVD_CONF
+ echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+ echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+ echo "input_file=/tmp/onvif_notify_server/baby_crying" >> $ONVIF_SRVD_CONF
+ echo "#Event 5" >> $ONVIF_SRVD_CONF
+ echo "topic=tns1:AudioAnalytics/Audio/DetectedSound" >> $ONVIF_SRVD_CONF
+ echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+ echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+ echo "input_file=/tmp/onvif_notify_server/sound_detection" >> $ONVIF_SRVD_CONF
+
+ chmod 0600 $ONVIF_SRVD_CONF
+ onvif_simple_server --conf_file $ONVIF_SRVD_CONF
+ ipc2file
+ onvif_notify_server --conf_file $ONVIF_SRVD_CONF
}
stop_onvif()
{
- killall onvif_srvd
+ killall onvif_notify_server
+ killall ipc2file
+ killall onvif_simple_server
}
start_wsdd()
{
- wsdd --pid_file /var/run/wsdd.pid --if_name wlan0 --type tdn:NetworkVideoTransmitter --xaddr "http://%s$D_ONVIF_PORT" --scope "onvif://www.onvif.org/name/Unknown onvif://www.onvif.org/Profile/Streaming"
+ wsd_simple_server --pid_file /var/run/wsd_simple_server.pid --if_name $ONVIF_NETIF --xaddr "http://%s$D_HTTPD_PORT/onvif/device_service" -m yi_hack -n Yi
}
stop_wsdd()
{
- killall wsdd
+ killall wsd_simple_server
}
start_ftpd()
@@ -182,6 +255,16 @@ ps_program()
fi
}
+. $YI_HACK_PREFIX/www/cgi-bin/validate.sh
+
+if ! $(validateQueryString $QUERY_STRING); then
+ printf "Content-type: application/json\r\n\r\n"
+ printf "{\n"
+ printf "\"%s\":\"%s\"\\n" "error" "true"
+ printf "}"
+ exit
+fi
+
NAME="none"
ACTION="none"
PARAM1="none"
@@ -208,7 +291,7 @@ init_config
if [ "$ACTION" == "start" ] ; then
if [ "$NAME" == "rtsp" ]; then
- start_rtsp $PARAM1
+ start_rtsp $PARAM1 $PARAM2
elif [ "$NAME" == "onvif" ]; then
start_onvif $PARAM1 $PARAM2
elif [ "$NAME" == "wsdd" ]; then
@@ -216,20 +299,20 @@ if [ "$ACTION" == "start" ] ; then
elif [ "$NAME" == "ftpd" ]; then
start_ftpd $PARAM1
elif [ "$NAME" == "mqtt" ]; then
- mqttv4 >/dev/null &
- mqtt-config >/dev/null &
+ mqttv4 > /dev/null &
+ mqtt-config > /dev/null &
elif [ "$NAME" == "mp4record" ]; then
cd /home/app
- ./mp4record >/dev/null &
+ ./mp4record > /dev/null &
elif [ "$NAME" == "all" ]; then
start_rtsp
start_onvif
start_wsdd
start_ftpd
- mqttv4 >/dev/null &
- mqtt-config >/dev/null &
+ mqttv4 > /dev/null &
+ mqtt-config > /dev/null &
cd /home/app
- ./mp4record >/dev/null &
+ ./mp4record > /dev/null &
fi
elif [ "$ACTION" == "stop" ] ; then
if [ "$NAME" == "rtsp" ]; then
@@ -258,9 +341,9 @@ elif [ "$ACTION" == "status" ] ; then
if [ "$NAME" == "rtsp" ]; then
RES=$(ps_program rRTSPServer)
elif [ "$NAME" == "onvif" ]; then
- RES=$(ps_program onvif_srvd)
+ RES=$(ps_program onvif_simple_server)
elif [ "$NAME" == "wsdd" ]; then
- RES=$(ps_program wsdd)
+ RES=$(ps_program wsd_simple_server)
elif [ "$NAME" == "ftpd" ]; then
RES=$(ps_program ftpd)
elif [ "$NAME" == "mqtt" ]; then
diff --git a/src/www/httpd/htdocs/js/modules/camera_settings.js b/src/www/httpd/htdocs/js/modules/camera_settings.js
index b7e815e..57cdfd0 100644
--- a/src/www/httpd/htdocs/js/modules/camera_settings.js
+++ b/src/www/httpd/htdocs/js/modules/camera_settings.js
@@ -57,9 +57,9 @@ APP.camera_settings = (function ($) {
url: 'cgi-bin/camera_settings.sh?' +
'save_video_on_motion=' + configs["SAVE_VIDEO_ON_MOTION"] +
'&sensitivity=' + configs["SENSITIVITY"] +
- '&ai_human_detection=' + configs["AI_HUMAN_DETECTION"] +
'&sound_detection=' + configs["SOUND_DETECTION"] +
'&sound_sensitivity=' + configs["SOUND_SENSITIVITY"] +
+ '&baby_crying_detect=' + configs["BABY_CRYING_DETECT"] +
'&led=' + configs["LED"] +
'&ir=' + configs["IR"] +
'&rotate=' + configs["ROTATE"] +
diff --git a/src/www/httpd/htdocs/js/modules/configurations.js b/src/www/httpd/htdocs/js/modules/configurations.js
index 6add4fb..7320b49 100644
--- a/src/www/httpd/htdocs/js/modules/configurations.js
+++ b/src/www/httpd/htdocs/js/modules/configurations.js
@@ -25,7 +25,7 @@ APP.configurations = (function ($) {
loadingStatusElem.fadeOut(500);
$.each(response, function (key, state) {
- if(key=="HOSTNAME" || key=="TIMEZONE" || key=="NTP_SERVER" || key=="HTTPD_PORT" || key=="RTSP_PORT" || key=="ONVIF_PORT" || key=="USERNAME")
+ if(key=="HOSTNAME" || key=="TIMEZONE" || key=="NTP_SERVER" || key=="HTTPD_PORT" || key=="RTSP_PORT" || key=="USERNAME")
$('input[type="text"][data-key="' + key +'"]').prop('value', state);
else if(key=="RTSP_STREAM" || key=="RTSP_AUDIO" || key=="ONVIF_PROFILE" || key=="ONVIF_NETIF")
$('select[data-key="' + key +'"]').prop('value', state);
@@ -70,7 +70,6 @@ APP.configurations = (function ($) {
configs["RTSP_STREAM"] = $('select[data-key="RTSP_STREAM"]').prop('value');
configs["RTSP_AUDIO"] = $('select[data-key="RTSP_AUDIO"]').prop('value');
configs["RTSP_PORT"] = $('input[type="text"][data-key="RTSP_PORT"]').prop('value');
- configs["ONVIF_PORT"] = $('input[type="text"][data-key="ONVIF_PORT"]').prop('value');
configs["ONVIF_PROFILE"] = $('select[data-key="ONVIF_PROFILE"]').prop('value');
configs["ONVIF_NETIF"] = $('select[data-key="ONVIF_NETIF"]').prop('value');
configs["USERNAME"] = $('input[type="text"][data-key="USERNAME"]').prop('value');
diff --git a/src/www/httpd/htdocs/js/modules/ptz.js b/src/www/httpd/htdocs/js/modules/ptz.js
index 25d3817..e7424ca 100644
--- a/src/www/httpd/htdocs/js/modules/ptz.js
+++ b/src/www/httpd/htdocs/js/modules/ptz.js
@@ -5,6 +5,7 @@ APP.ptz = (function ($) {
function init() {
updatePage();
registerEventHandler();
+ initPage();
snapshotTimer();
}
@@ -61,7 +62,7 @@ APP.ptz = (function ($) {
$(button).attr("disabled", true);
$.ajax({
type: "GET",
- url: 'cgi-bin/preset.sh?num='+$(select + " option:selected").text(),
+ url: 'cgi-bin/preset.sh?action=go_preset&num='+$(select + " option:selected").text(),
dataType: "json",
error: function(response) {
console.log('error', response);
@@ -73,6 +74,89 @@ APP.ptz = (function ($) {
});
}
+ function addPreset(button) {
+ $(button).attr("disabled", true);
+ $.ajax({
+ type: "POST",
+ url: 'cgi-bin/preset.sh?action=add_preset&name='+$('input[type="text"][data-key="PRESET_NAME"]').prop('value'),
+ dataType: "json",
+ error: function(response) {
+ console.log('error', response);
+ $(button).attr("disabled", false);
+ },
+ success: function(data) {
+ $(button).attr("disabled", false);
+ window.location.reload();
+ }
+ });
+ }
+
+ function delPreset(button, select) {
+ $(button).attr("disabled", true);
+ $.ajax({
+ type: "POST",
+ url: 'cgi-bin/preset.sh?action=del_preset&num='+$(select + " option:selected").val(),
+ dataType: "json",
+ error: function(response) {
+ console.log('error', response);
+ $(button).attr("disabled", false);
+ },
+ success: function(data) {
+ $(button).attr("disabled", false);
+ window.location.reload();
+ }
+ });
+ }
+
+ function delAllPreset(button) {
+ $(button).attr("disabled", true);
+ $.ajax({
+ type: "POST",
+ url: 'cgi-bin/preset.sh?action=del_preset&num=all',
+ dataType: "json",
+ error: function(response) {
+ console.log('error', response);
+ $(button).attr("disabled", false);
+ },
+ success: function(data) {
+ $(button).attr("disabled", false);
+ window.location.reload();
+ }
+ });
+ }
+
+ function initPage() {
+ $.ajax({
+ type: "GET",
+ url: 'cgi-bin/get_configs.sh?conf=ptz_presets',
+ dataType: "json",
+ success: function(data) {
+ html = "\n";
+ document.getElementById("select-goto-container").innerHTML = html;
+
+ html = "\n";
+ document.getElementById("select-del-container").innerHTML = html;
+ },
+ error: function(response) {
+ console.log('error', response);
+ }
+ });
+ }
+
function updatePage() {
$.ajax({
type: "GET",
diff --git a/src/www/httpd/htdocs/pages/camera_settings.html b/src/www/httpd/htdocs/pages/camera_settings.html
index 55bc522..367f725 100644
--- a/src/www/httpd/htdocs/pages/camera_settings.html
+++ b/src/www/httpd/htdocs/pages/camera_settings.html
@@ -76,9 +76,9 @@ General
Enable/disable AI Human Detection.
-
+ -->
- | Sound Detection |
+ Sound Detection (if supported by your cam) |
|
-
-->
+
+
+ | Baby crying detect (if supported by your cam) |
+
+
+
+ Enable/disable baby crying detect.
+
+ |
+
| Status led |
diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index 1249f0a..9973ef1 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -160,15 +160,47 @@ General
|
- | ONVIF watermark |
+ Enable/disable time OSD |
- Add watermark to snapshot.
+ Enable/disable time OSD in the upper left corner.
+
+
+
+ It works only if the cam doesn't show osd natively.
+
+ |
+
+
+ | Snapshot |
+
+
+
+ Enable snapshot feature.
+
+ If you want to use this feature, enable swap file to avoid memory problems.
+
+ |
+
+
+ | Force low resolution snapshot |
+
+
+
+ Take low resolution snapshots only and no watermark (useful for avoiding memory problems).
|
@@ -322,21 +354,12 @@ TCP ports
-
- | ONVIF Port |
-
-
-
- TCP port used by ONVIF Server (default 80).
-
- |
-
| HTTPD Port |
- TCP port used by HTTPD Server (default 8080).
+ TCP port used by HTTPD Server (default 80).
|
diff --git a/src/www/httpd/htdocs/pages/mqtt.html b/src/www/httpd/htdocs/pages/mqtt.html
index 3dc3326..5aace03 100644
--- a/src/www/httpd/htdocs/pages/mqtt.html
+++ b/src/www/httpd/htdocs/pages/mqtt.html
@@ -130,16 +130,20 @@ Topics
+
+
A raw jpeg image is sent to this topic when a motion is detected.
+
+
-
+
| Sound Detection |
@@ -157,7 +161,7 @@ Topics
|
-
+
@@ -242,7 +246,7 @@ Advanced
-
+
| Retain for Sound Detection messages |
diff --git a/src/www/httpd/htdocs/pages/ptz.html b/src/www/httpd/htdocs/pages/ptz.html
index 054e731..a8fc6f9 100644
--- a/src/www/httpd/htdocs/pages/ptz.html
+++ b/src/www/httpd/htdocs/pages/ptz.html
@@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,7 @@
In this page you can move your cam.
-
+
PTZ functions are not available for this camera model.
@@ -38,29 +38,80 @@ Move pad
- Presets
+ Go to Preset
-
+
+
+
+
+
+ | Preset Number |
+
+
+
+
+ Number of the preset.
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ Add Preset
+
+
+
+
+
+
+
+ Delete Preset
+
+
+
+
+
+
+ | Preset Number |
+
+
+
+
+ Number of the preset to remove.
+
+ |
+
+
+
+
+
+
+
+
+
+
|