forgot to fix variables with config changes, fixed and added v2 webcam support

SD_ROOT/wz_mini/etc/init.d/wz_cam.sh

@@ -12,53 +12,105 @@ fi
 touch -- "$LOG_NAME".log
 exec 1> $LOG_NAME.log 2>&1
 
+export WZMINI_CFG=/opt/wz_mini/wz_mini.conf
+
+[ -f $WZMINI_CFG ] && source $WZMINI_CFG
+
 set -x
 
 echo "welcome to wz_cam.sh"
 echo "PID $$"
 
-cp /opt/wz_mini/etc/uvc.config /opt/wz_mini/usr/bin/uvc.config
-
-if [[ $(cat /opt/wz_mini/run_mmc.sh | grep "WEB_CAM_FPS_RATE\=") != "" ]]; then
-WEB_CAM_FPS_RATE=$(cat /opt/wz_mini/run_mmc.sh | grep "WEB_CAM_FPS_RATE\=" | cut -d'"' -f 2)
-echo RATE IS $WEB_CAM_FPS_RATE
-sed -i "s/fps_num         :30/fps_num         :$WEB_CAM_FPS_RATE/" "/opt/wz_mini/usr/bin/uvc.config"
+#test for v2
+if [ -b /dev/mtdblock9 ]; then
+        mount -t jffs2 /dev/mtdblock9 /params
+        if cat /params/config/.product_config | grep WYZEC1-JZ; then
+                V2="true"
+        fi
 fi
 
-if [[ $(cat /opt/wz_mini/run_mmc.sh | grep "WEB_CAM_BIT_RATE\=") != "" ]]; then
-WEB_CAM_BIT_RATE=$(cat /opt/wz_mini/run_mmc.sh | grep "WEB_CAM_BIT_RATE\=" | cut -d'"' -f 2)
-sed -i "s/bitrate         :8000/bitrate         :$WEB_CAM_BIT_RATE/" "/opt/wz_mini/usr/bin/uvc.config"
-fi
 
-echo 1 > /proc/sys/vm/overcommit_memory
+if [ "$V2" == "false" ]; then
+
+	cp /opt/wz_mini/etc/uvc.config /opt/wz_mini/usr/bin/uvc.config
+
+	if [[ "WEB_CAM_FPS_RATE" != "" ]]; then
+	sed -i "s/fps_num         :30/fps_num         :$WEB_CAM_FPS_RATE/" "/opt/wz_mini/usr/bin/uvc.config"
+	fi
+
+	if [[ "WEB_CAM_BIT_RATE" != "" ]]; then
+	sed -i "s/bitrate         :8000/bitrate         :$WEB_CAM_BIT_RATE/" "/opt/wz_mini/usr/bin/uvc.config"
+	fi
+
+	echo 1 > /proc/sys/vm/overcommit_memory
+
+	mount --bind /opt/wz_mini/usr/bin /system/bin
+	insmod /system/driver/avpu.ko
+	insmod /system/driver/tx-isp-t31.ko isp_clk=220000000
+	insmod /system/driver/sensor_gc2053_t31.ko
+	insmod /system/driver/audio.ko
+	insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/drivers/usb/gadget/libcomposite.ko
+	insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/videobuf2-vmalloc.ko
+	insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/usbcamera.ko
+
+	cd /system/bin/
+	/system/bin/ucamera &
+
+	sleep 1
 
-mount --bind /opt/wz_mini/usr/bin /system/bin
-insmod /system/driver/avpu.ko
-insmod /system/driver/tx-isp-t31.ko isp_clk=220000000
-insmod /system/driver/sensor_gc2053_t31.ko
-insmod /system/driver/audio.ko
-insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/drivers/usb/gadget/libcomposite.ko
-insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/videobuf2-vmalloc.ko
-insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/usbcamera.ko
+	#Set dwc2 ID_PIN driver memory
+	devmem 0x13500000 32 0x001100cc
+	devmem 0x10000040 32 0x0b000096
+	#wipe the bits to set the ID_PIN
+	devmem 0x10000040 32 0x0b000FFF
 
-cd /system/bin/
-/system/bin/ucamera &
+	sleep 1
 
-sleep 1
+	cd /sys/class/gpio
+	echo 39 > export
+	cd gpio39
+	echo out > direction
+	echo 0 > active_low
+	echo 0 > value
 
-#Set dwc2 ID_PIN driver memory
-devmem 0x13500000 32 0x001100cc
-devmem 0x10000040 32 0x0b000096
-#wipe the bits to set the ID_PIN
-devmem 0x10000040 32 0x0b000FFF
+	/opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/binbin_v3.wav 30
 
-sleep 1
+else
 
-cd /sys/class/gpio
-echo 39 > export
-cd gpio39
-echo out > direction
-echo 0 > active_low
-echo 0 > value
+	cp /opt/wz_mini/etc/uvc_v2.config /opt/wz_mini/usr/bin/uvc.config
 
-/opt/wz_mini/bin/audioplay_t31 /usr/share/notify/binbin.wav 30
+	if [[ "WEB_CAM_FPS_RATE" != "" ]]; then
+	sed -i "s/fps_num         :30/fps_num         :$WEB_CAM_FPS_RATE/" "/opt/wz_mini/usr/bin/uvc.config"
+	fi
+
+	if [[ "WEB_CAM_BIT_RATE" != "" ]]; then
+	sed -i "s/bitrate         :8000/bitrate         :$WEB_CAM_BIT_RATE/" "/opt/wz_mini/usr/bin/uvc.config"
+	fi
+
+	mount --bind /opt/wz_mini/usr/bin /system/bin
+
+	insmod /driver/tx-isp.ko isp_clk=100000000
+	insmod /driver/exfat.ko
+	insmod /driver/sample_motor.ko
+	insmod /system/audio.ko
+	insmod /driver/sinfo.ko
+	insmod /driver/sample_pwm_core.ko
+	insmod /driver/sample_pwm_hal.ko
+
+	insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/libcomposite.ko
+	insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/videobuf2-vmalloc.ko
+	insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/usbcamera.ko
+
+	sh /system/bin/led.sh &
+	/opt/wz_mini/usr/bin/getSensorType
+	/opt/wz_mini/usr/bin/ucamera_v2 &
+
+
+
+	devmem 0x10000040 32 0x0b000096
+	devmem 0x10000040 32 0x0b800096
+	devmem 0x13500000 32 0x001100cc
+
+	/opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/binbin_v3.wav 30
+
+fi