diff --git a/README.md b/README.md index 6a98081..317b546 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,6 @@ Using this project can potentially expose your device to the open internet depen 1. PAN v2: - Tilt (Vertical) only works at motor speed 9 - 2. v2 - - webcam mode does not work on v2 yet ## Setup v3/PANv2 @@ -282,14 +280,15 @@ CUSTOM_SCRIPT_PATH="" --- -Live stream from the local built-in RTSP server to youtube/twitch/facebook live. +Live stream DIRECTLY from the camera's local RTSP server to youtube/twitch/facebook live. -edit the file `wz_mini/usr/bin/rtmp-stream.sh` with your stream keys and then run `rtsmp-stream.sh ` to begin streaming. Experimental. +Edit the file `wz_mini/bin/rtmp-stream.sh` with your stream keys and then run `rtsmp-stream.sh ` to begin streaming to your favorite service. --- ## Latest Updates +* 06-04-22: updated v2 kernel with fix for webcam mode on v2 camera's, working well now. * 05-31-22: added kernel and initramfs configs to src dir, fixed old logs deleted on boot, save dmesg to log folder, upgrade script fixes, user selectable usb ethernet kernel modules in config. * 05-27-22: update `rtmp-stream.sh`, update various system binaries. * 05-25-22: usb direct mode and rndis are now supported on the v2 camera diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh b/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh index bac4ff3..d72e8db 100755 --- a/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh +++ b/SD_ROOT/wz_mini/etc/init.d/wz_cam.sh @@ -22,13 +22,19 @@ echo "welcome to wz_cam.sh" echo "PID $$" #test for v2 -if [ -b /dev/mtdblock9 ]; then - mount -t jffs2 /dev/mtdblock9 /params +v2_test() { if cat /params/config/.product_config | grep WYZEC1-JZ; then V2="true" fi -fi +} +if mountpoint -q /params; then + echo "params already mounted" + v2_test +else + mount -t jffs2 /dev/mtdblock9 /params + v2_test +fi if [ "$V2" == "false" ]; then @@ -92,7 +98,7 @@ else insmod /driver/tx-isp.ko isp_clk=100000000 insmod /driver/exfat.ko insmod /driver/sample_motor.ko - insmod /system/audio.ko + insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/audio_webcam.ko insmod /driver/sinfo.ko insmod /driver/sample_pwm_core.ko insmod /driver/sample_pwm_hal.ko @@ -101,16 +107,21 @@ else 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 + sleep 1 + + echo 38 > /sys/class/gpio/export + echo 39 > /sys/class/gpio/export + + echo out > /sys/class/gpio/gpio38/direction + echo out > /sys/class/gpio/gpio39/direction + /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/binbin_v3.wav 30 fi diff --git a/SD_ROOT/wz_mini/etc/uvc_jxf22.config b/SD_ROOT/wz_mini/etc/uvc_jxf22.config new file mode 100644 index 0000000..4f62ebc --- /dev/null +++ b/SD_ROOT/wz_mini/etc/uvc_jxf22.config @@ -0,0 +1,16 @@ +sensor_name :jxf22 +i2c_addr :0x40 +fps_num :25 +width :1920 +height :1080 +wdr_en :0 +bitrate :8000 +rcmode :cbr +audio_en :1 +gop :25 +adb_en :0 +speak_en :1 +nframes :3 +{640, 360} +{1280, 720} +{1920, 1080} \ No newline at end of file diff --git a/SD_ROOT/wz_mini/etc/uvc_jxf23.config b/SD_ROOT/wz_mini/etc/uvc_jxf23.config new file mode 100644 index 0000000..902bd44 --- /dev/null +++ b/SD_ROOT/wz_mini/etc/uvc_jxf23.config @@ -0,0 +1,16 @@ +sensor_name :jxf23 +i2c_addr :0x40 +fps_num :25 +width :1920 +height :1080 +wdr_en :0 +bitrate :8000 +rcmode :cbr +audio_en :1 +gop :25 +adb_en :0 +speak_en :1 +nframes :3 +{640, 360} +{1280, 720} +{1920, 1080} \ No newline at end of file diff --git a/SD_ROOT/wz_mini/etc/uvc_v2.config b/SD_ROOT/wz_mini/etc/uvc_v2.config new file mode 100644 index 0000000..902bd44 --- /dev/null +++ b/SD_ROOT/wz_mini/etc/uvc_v2.config @@ -0,0 +1,16 @@ +sensor_name :jxf23 +i2c_addr :0x40 +fps_num :25 +width :1920 +height :1080 +wdr_en :0 +bitrate :8000 +rcmode :cbr +audio_en :1 +gop :25 +adb_en :0 +speak_en :1 +nframes :3 +{640, 360} +{1280, 720} +{1920, 1080} \ No newline at end of file diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/audio_webcam.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/audio_webcam.ko new file mode 100644 index 0000000..70166ef Binary files /dev/null and b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/audio_webcam.ko differ diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/libcomposite.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/libcomposite.ko new file mode 100644 index 0000000..10be94b Binary files /dev/null and b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/libcomposite.ko differ diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/usbcamera.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/usbcamera.ko new file mode 100644 index 0000000..f4a319e Binary files /dev/null and b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/usbcamera.ko differ diff --git a/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/videobuf2-vmalloc.ko b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/videobuf2-vmalloc.ko new file mode 100644 index 0000000..705aa68 Binary files /dev/null and b/SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/videobuf2-vmalloc.ko differ diff --git a/SD_ROOT/wz_mini/usr/bin/getSensorType b/SD_ROOT/wz_mini/usr/bin/getSensorType new file mode 100644 index 0000000..d0ccb9c Binary files /dev/null and b/SD_ROOT/wz_mini/usr/bin/getSensorType differ diff --git a/SD_ROOT/wz_mini/usr/bin/ucamera_v2 b/SD_ROOT/wz_mini/usr/bin/ucamera_v2 new file mode 100644 index 0000000..4c7ad96 Binary files /dev/null and b/SD_ROOT/wz_mini/usr/bin/ucamera_v2 differ diff --git a/SD_ROOT/wz_mini/usr/share/audio/binbin_v3.wav b/SD_ROOT/wz_mini/usr/share/audio/binbin_v3.wav new file mode 100644 index 0000000..83550a4 Binary files /dev/null and b/SD_ROOT/wz_mini/usr/share/audio/binbin_v3.wav differ diff --git a/file.chk b/file.chk index 0cf25fe..6414448 100644 --- a/file.chk +++ b/file.chk @@ -1,16 +1,19 @@ 793a40caeb2d516552e4f88b22a85551 SD_ROOT/factory_t31_ZMC6tiIDQN d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/mnt/.gitignore 34c6a4c3a941ff2becd9f487826d7692 SD_ROOT/wz_mini/etc/uvc.config -b4e404d9205a8e139571d4e5d2b55e92 SD_ROOT/wz_mini/etc/init.d/wz_cam.sh +58d3a10a80422e3aa1b49b046e17db5c SD_ROOT/wz_mini/etc/init.d/wz_cam.sh 93b23f80c000b56cd5855fe674f32296 SD_ROOT/wz_mini/etc/init.d/v3_init.sh 0bd12f2862cfaea0fecd8e654bb21bd2 SD_ROOT/wz_mini/etc/init.d/wz_user.sh 86082f8c1b7de18463731372bac630d1 SD_ROOT/wz_mini/etc/init.d/wz_post.sh e3034eac02d8eda9902ca9cf89f0a586 SD_ROOT/wz_mini/etc/inittab +840aa9c26726201f7cffbf001bee193a SD_ROOT/wz_mini/etc/uvc_jxf22.config 8b5e58acfcbb20034dc4873a08b45fd9 SD_ROOT/wz_mini/etc/profile 2c2df1b9cb603f9c31c46162d6ac307f SD_ROOT/wz_mini/etc/alsa/alsa.conf 9e5591da95042bcca910403bde25dc60 SD_ROOT/wz_mini/etc/fstab +c838ac76efbe3d3fc3c4805789a6519f SD_ROOT/wz_mini/etc/uvc_jxf23.config d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/etc/configs/.gitignore d0541c45c77ad3c5f27f06f03547c4f2 SD_ROOT/wz_mini/etc/shadow +c838ac76efbe3d3fc3c4805789a6519f SD_ROOT/wz_mini/etc/uvc_v2.config c2aec0b677cf239f374dda8583314332 SD_ROOT/wz_mini/etc/ssh/authorized_keys d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/etc/wireguard/.gitignore d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/log/.gitignore @@ -65,23 +68,30 @@ e2e7f9190edcfb31af42fb00c59919ab SD_ROOT/wz_mini/usr/share/audio/upgrade_mode_v 99d3ad0812870a67893f247f779666ab SD_ROOT/wz_mini/usr/share/audio/swap.wav eaf86f91cb1b15b2191a8845ae88e3c8 SD_ROOT/wz_mini/usr/share/audio/init_v2.wav 02fed0e4b2382d839f630ce0477aba26 SD_ROOT/wz_mini/usr/share/audio/init.wav +5754f767c1334df202983aed2a20a050 SD_ROOT/wz_mini/usr/share/audio/binbin_v3.wav +ac9f3a5d097d25d5d972c3d2ad288df9 SD_ROOT/wz_mini/usr/bin/ucamera_v2 2f055470bf862f8ddaf2a0c2d55fc46d SD_ROOT/wz_mini/usr/bin/iCamera cf049b9446094cc8a7e07a33cf91c4a8 SD_ROOT/wz_mini/usr/bin/watch_up.sh b339aee882a5d1c943ad08e4282ec3fd SD_ROOT/wz_mini/usr/bin/iCamera-dbg 20b061689308b2cee7edf3b9b906bca7 SD_ROOT/wz_mini/usr/bin/ucamera 7c33612b0b83b322996a2533e05c6212 SD_ROOT/wz_mini/usr/bin/upgrade-run.sh +580b1b6e91e72b4a4fef7b21d8954403 SD_ROOT/wz_mini/usr/bin/getSensorType 4c780f0455481d106d47d89f0ae04ed5 SD_ROOT/wz_mini/lib/uClibc.tar 9afeb088e4cbabbe0b04033b560204d0 SD_ROOT/wz_mini/lib/libimp.so 4100755cb6cc6e3b76da20c7e3690e16 SD_ROOT/wz_mini/lib/libalog.so 4d63637c5390a6c54e32cb5a9ad08848 SD_ROOT/wz_mini/lib/libcallback.so 3f7f24b71a73f9597b64cda42cd83221 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/modules.order 5ef8504ca3fa25445bfd8ae782b94e52 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/crypto/md4.ko +3d1f59ab6fa1987f58ed8b6bc0444582 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/libcomposite.ko cd9565bd88e2b910b61f0336a4e296d3 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/v4l2loopback_V2.ko +9527880c237f446d03204edddbca2df2 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/usbcamera.ko +35aa03804c11ac247aba7f6e9ea98019 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/audio_webcam.ko 4413a7e052e37858a5d97686b8996d0f SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/fs/ext4/ext4.ko 818d3d38a30ebcc300bbcef8e0e89ace SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/fs/cifs/cifs.ko c2802249ed0ecb768ddd6066f49e2916 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/fs/mbcache.ko aa0f67eae6aa6a93022a41b3571e166f SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/fs/nfs/nfsv4.ko a9c96219ce10629f5f7fb2e678c0bfc7 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/fs/jbd2/jbd2.ko +2327f9e639420864680c37b9b0607a78 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/videobuf2-vmalloc.ko 8c965b01f101b72cd5360398dbf8b68e SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/audio.ko 00710455a45257f48215e7124bb7a8d0 SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko 8cada78b0fe0e257d190aa0ba23c73bc SD_ROOT/wz_mini/lib/modules/3.10.14_v2/kernel/net/dns_resolver/dns_resolver.ko