Procházet zdrojové kódy

enable libcallback by default

libcallback is now enabled by default..  libcallback commands, such as cmd <function> are now operational, independent of the rtsp server
Alfonso Gamboa před 3 roky
rodič
revize
478b1ceba0

+ 0 - 1
SD_ROOT/wz_mini/bin/upgrade-run.sh

@@ -72,7 +72,6 @@ echo "enable wifi drivers if disabled in config"
 sed -i 's/ENABLE_RTL8189FS_DRIVER="false"/ENABLE_RTL8189FS_DRIVER="true"/g' /opt/wz_mini/wz_mini.conf
 sed -i 's/ENABLE_RTL8189FS_DRIVER="false"/ENABLE_RTL8189FS_DRIVER="true"/g' /opt/wz_mini/wz_mini.conf
 sed -i 's/ENABLE_ATBM603X_DRIVER="false"/ENABLE_ATBM603X_DRIVER="true"/g' /opt/wz_mini/wz_mini.conf
 sed -i 's/ENABLE_ATBM603X_DRIVER="false"/ENABLE_ATBM603X_DRIVER="true"/g' /opt/wz_mini/wz_mini.conf
 
 
-
 sleep 5
 sleep 5
 
 
 echo "Backup user config"
 echo "Backup user config"

+ 15 - 10
SD_ROOT/wz_mini/etc/init.d/wz_post.sh

@@ -28,6 +28,7 @@ export WZMINI_CFG=/opt/wz_mini/wz_mini.conf
 echo "welcome to wz_post.sh"
 echo "welcome to wz_post.sh"
 echo "PID $$"
 echo "PID $$"
 
 
+#CAMERA CONFIGURATION FILES BACKUP
 if [ -d /opt/.wz_backup ]; then
 if [ -d /opt/.wz_backup ]; then
         echo "backup directory missing"
         echo "backup directory missing"
 else
 else
@@ -60,6 +61,7 @@ elif [ -f /opt/wz_mini/tmp/.T20 ]; then
         fi
         fi
 fi
 fi
 
 
+#SWAP FILE, REQUIRED FOR OPERATION!
 if [[ "$ENABLE_SWAP" == "true" ]] && [[ -e /opt/wz_mini/swap ]]; then
 if [[ "$ENABLE_SWAP" == "true" ]] && [[ -e /opt/wz_mini/swap ]]; then
         echo "swap file found, enable"
         echo "swap file found, enable"
         swapon /opt/wz_mini/swap
         swapon /opt/wz_mini/swap
@@ -73,15 +75,14 @@ if [ -d /lib/modules ]; then
 fi
 fi
 
 
 ## REPLACE STOCK MODULES
 ## REPLACE STOCK MODULES
-
 if [[ "$ENABLE_RTL8189FS_DRIVER" == "true" ]] || [[ "$ENABLE_RTL8189FS_DRIVER" == "" ]]; then
 if [[ "$ENABLE_RTL8189FS_DRIVER" == "true" ]] || [[ "$ENABLE_RTL8189FS_DRIVER" == "" ]]; then
         echo "Enable 8189fs"
         echo "Enable 8189fs"
         if [ -f /opt/wz_mini/tmp/.WYZEC1-JZ ]; then
         if [ -f /opt/wz_mini/tmp/.WYZEC1-JZ ]; then
-                sed -i 's/\/driver\/rtl8189ftv.ko/\/opt\/wz_mini\/lib\/modules\/3.10.14\/extra\/8189fs.ko rtw_power_mgnt=0 rtw_enusbss=0 rtw_drv_log_level=1/g' /opt/wz_mini/tmp/.storage/app_init.sh
+                sed -i 's/\/driver\/rtl8189ftv.ko/\/opt\/wz_mini\/lib\/modules\/3.10.14\/extra\/8189fs.ko rtw_power_mgnt=0 rtw_enusbss=0 rtw_drv_log_level=2/g' /opt/wz_mini/tmp/.storage/app_init.sh
         elif [ -f /opt/wz_mini/tmp/.WYZECP1_JEF ]; then
         elif [ -f /opt/wz_mini/tmp/.WYZECP1_JEF ]; then
-                sed -i 's/insmod \/driver\/8189es.ko/insmod \/opt\/wz_mini\/lib\/modules\/3.10.14\/extra\/8189es.ko rtw_power_mgnt=0 rtw_enusbss=0 rtw_drv_log_level=1/g' /opt/wz_mini/tmp/.storage/app_init.sh
+                sed -i 's/insmod \/driver\/8189es.ko/insmod \/opt\/wz_mini\/lib\/modules\/3.10.14\/extra\/8189es.ko rtw_power_mgnt=0 rtw_enusbss=0 rtw_drv_log_level=2/g' /opt/wz_mini/tmp/.storage/app_init.sh
         elif [ -f /opt/wz_mini/tmp/.WYZE_CAKP2JFUS ]; then
         elif [ -f /opt/wz_mini/tmp/.WYZE_CAKP2JFUS ]; then
-                sed  -i 's/\/system\/driver\/rtl8189ftv.ko/\/opt\/wz_mini\/lib\/modules\/3.10.14\_\_isvp_swan_1.0\_\_\/extra\/8189fs.ko rtw_power_mgnt=0 rtw_enusbss=0 rtw_drv_log_level=1/g'  /opt/wz_mini/tmp/.storage/app_init.sh
+                sed  -i 's/\/system\/driver\/rtl8189ftv.ko/\/opt\/wz_mini\/lib\/modules\/3.10.14\_\_isvp_swan_1.0\_\_\/extra\/8189fs.ko rtw_power_mgnt=0 rtw_enusbss=0 rtw_drv_log_level=2/g'  /opt/wz_mini/tmp/.storage/app_init.sh
         fi
         fi
 fi
 fi
 
 
@@ -92,9 +93,14 @@ if [[ "$ENABLE_ATBM603X_DRIVER" == "true" ]] || [[ "$ENABLE_ATBM603X_DRIVER" ==
 	fi
 	fi
 fi
 fi
 
 
-##RTSP SERVER INIT
+##ENABLE LIBCALLBACK BY DEFAULT
+if [[ "$LIBCALLBACK_ENABLE" == "true" ]] || ([[ "$RTSP_HI_RES_ENABLED" == "true" ]] || [[ "$RTSP_LOW_RES_ENABLED" == "true" ]]); then
+        echo "set path for iCamera"
+        sed -i 's/\/system\/bin\/iCamera/\/opt\/wz_mini\/usr\/bin\/iCamera/g' /opt/wz_mini/tmp/.storage/app_init.sh
+fi
 
 
-if [[ "$RTSP_HI_RES_ENABLED" == "true" ]] ||  [[ "$RTSP_LOW_RES_ENABLED" == "true" ]] && ! [[ -e /tmp/dbgflag ]]; then
+#RTSP SERVER
+if ([[ "$RTSP_HI_RES_ENABLED" == "true" ]] || [[ "$RTSP_LOW_RES_ENABLED" == "true" ]]) && ! [[ -e /tmp/dbgflag ]]; then
 	if [[ "$RTSP_LOW_RES_ENABLED" == "true" ]] && [[ "$RTSP_HI_RES_ENABLED" == "true" ]]; then
 	if [[ "$RTSP_LOW_RES_ENABLED" == "true" ]] && [[ "$RTSP_HI_RES_ENABLED" == "true" ]]; then
 	        if [ -f /opt/wz_mini/tmp/.T20 ]; then
 	        if [ -f /opt/wz_mini/tmp/.T20 ]; then
 		        echo "load video loopback driver at video6 video7"
 		        echo "load video loopback driver at video6 video7"
@@ -120,17 +126,16 @@ if [[ "$RTSP_HI_RES_ENABLED" == "true" ]] ||  [[ "$RTSP_LOW_RES_ENABLED" == "tru
 		        insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko video_nr=1
 		        insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko video_nr=1
 		fi
 		fi
 	fi
 	fi
-	echo "set path for iCamera"
-	sed -i 's/\/system\/bin\/iCamera/\/opt\/wz_mini\/usr\/bin\/iCamera/g' /opt/wz_mini/tmp/.storage/app_init.sh
 fi
 fi
 
 
-/opt/wz_mini/etc/init.d/wz_user.sh &
-
+#MOTORIZED CAMERA CONTROL
 if [[ "$DISABLE_MOTOR" == "true" ]]; then
 if [[ "$DISABLE_MOTOR" == "true" ]]; then
 	echo "Motor Disabled"
 	echo "Motor Disabled"
 	touch /opt/wz_mini/tmp/.ms
 	touch /opt/wz_mini/tmp/.ms
 fi
 fi
 
 
+/opt/wz_mini/etc/init.d/wz_user.sh &
+
 ##LIBRARY DEBUG
 ##LIBRARY DEBUG
 #cp /opt/wz_mini/lib/uClibc.tar /tmp
 #cp /opt/wz_mini/lib/uClibc.tar /tmp
 #tar -xf /tmp/uClibc.tar -C /tmp
 #tar -xf /tmp/uClibc.tar -C /tmp

+ 1 - 0
SD_ROOT/wz_mini/etc/wz_mini.conf.dist

@@ -80,6 +80,7 @@ RTMP_STREAM_TWITCH_KEY=""
 RTMP_STREAM_FACEBOOK_KEY=""
 RTMP_STREAM_FACEBOOK_KEY=""
 
 
 #####GENERAL#####
 #####GENERAL#####
+LIBCALLBACK_ENABLE="true"
 ENABLE_SWAP="true"
 ENABLE_SWAP="true"
 ENABLE_USB_STORAGE="false"
 ENABLE_USB_STORAGE="false"
 ENABLE_EXT4="false"
 ENABLE_EXT4="false"

+ 1 - 0
SD_ROOT/wz_mini/wz_mini.conf

@@ -80,6 +80,7 @@ RTMP_STREAM_TWITCH_KEY=""
 RTMP_STREAM_FACEBOOK_KEY=""
 RTMP_STREAM_FACEBOOK_KEY=""
 
 
 #####GENERAL#####
 #####GENERAL#####
+LIBCALLBACK_ENABLE="true"
 ENABLE_SWAP="true"
 ENABLE_SWAP="true"
 ENABLE_USB_STORAGE="false"
 ENABLE_USB_STORAGE="false"
 ENABLE_EXT4="false"
 ENABLE_EXT4="false"