From 772d3181d16d288c51dd53d40f487dbac47b45c4 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Wed, 14 May 2014 16:58:49 +0200 Subject: [PATCH] Webcam experiment --- ReleaseNotes.md | 3 + extra/openwrt-build/openwrt-diffconfig-webcam | 62 +++++++++++++++++++ extra/scripts/publish-wifibox-release.lua | 2 +- src/FIRMWARE-VERSION | 2 +- 4 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 extra/openwrt-build/openwrt-diffconfig-webcam diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 0a3ac6f..a471b60 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,4 +1,7 @@ Changelog +# 0.10.4-webcamexperiment (16th apr 2014) +- Experimental webcam streaming support. + # 0.10.3 (9th apr 2014) - Fixed Makerbot issue where printer driver didn't get past connecting state diff --git a/extra/openwrt-build/openwrt-diffconfig-webcam b/extra/openwrt-build/openwrt-diffconfig-webcam new file mode 100644 index 0000000..47e229c --- /dev/null +++ b/extra/openwrt-build/openwrt-diffconfig-webcam @@ -0,0 +1,62 @@ +CONFIG_TARGET_ar71xx=y +CONFIG_TARGET_ar71xx_generic=y +CONFIG_TARGET_ar71xx_generic_TLMR3020=y +CONFIG_ATH_USER_REGD=y +# CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set +CONFIG_BUSYBOX_CONFIG_INOTIFYD=y +CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y +# CONFIG_IPV6 is not set +# CONFIG_KERNEL_DEBUG_INFO is not set +# CONFIG_KERNEL_DEBUG_KERNEL is not set +# CONFIG_KERNEL_KALLSYMS is not set +# CONFIG_KERNEL_MAGIC_SYSRQ is not set +CONFIG_MJPG_STREAMER_INPUT_FILE=y +CONFIG_MJPG_STREAMER_INPUT_UVC=y +CONFIG_MJPG_STREAMER_OUTPUT_FILE=y +CONFIG_MJPG_STREAMER_OUTPUT_HTTP=y +CONFIG_MJPG_STREAMER_WWW=y +# CONFIG_PACKAGE_6relayd is not set +CONFIG_PACKAGE_GraphicsMagick=m +CONFIG_PACKAGE_doodle3d-client=y +CONFIG_PACKAGE_kmod-input-core=y +# CONFIG_PACKAGE_kmod-ip6tables is not set +# CONFIG_PACKAGE_kmod-ipv6 is not set +# CONFIG_PACKAGE_kmod-ppp is not set +CONFIG_PACKAGE_kmod-usb-acm=y +CONFIG_PACKAGE_kmod-usb-serial=y +CONFIG_PACKAGE_kmod-usb-serial-ftdi=y +CONFIG_PACKAGE_kmod-video-core=y +CONFIG_PACKAGE_kmod-video-uvc=y +CONFIG_PACKAGE_kmod-video-videobuf2=y +CONFIG_PACKAGE_libbz2=m +CONFIG_PACKAGE_libfreetype=m +# CONFIG_PACKAGE_libip6tc is not set +CONFIG_PACKAGE_libiwinfo=y +CONFIG_PACKAGE_libiwinfo-lua=y +CONFIG_PACKAGE_libjpeg=y +CONFIG_PACKAGE_libltdl=m +CONFIG_PACKAGE_liblua=y +CONFIG_PACKAGE_libpthread=y +CONFIG_PACKAGE_librt=y +CONFIG_PACKAGE_libstdcpp=m +CONFIG_PACKAGE_libuci-lua=y +CONFIG_PACKAGE_libv4l=y +CONFIG_PACKAGE_lua=y +CONFIG_PACKAGE_luafilesystem=y +CONFIG_PACKAGE_mjpg-streamer=y +# CONFIG_PACKAGE_odhcp6c is not set +# CONFIG_PACKAGE_ppp is not set +CONFIG_PACKAGE_print3d=y +CONFIG_PACKAGE_uclibcxx=y +CONFIG_PACKAGE_uhttpd=y +CONFIG_PACKAGE_uhttpd-mod-lua=y +CONFIG_PACKAGE_webcamstreamer=y +CONFIG_PACKAGE_wifibox=y +CONFIG_PACKAGE_zlib=m +CONFIG_STRIP_KERNEL_EXPORTS=y +# CONFIG_TARGET_ROOTFS_TARGZ is not set +CONFIG_USE_MKLIBS=y +CONFIG_WIFIBOX_AP_SSID="d3d-ap-%%MAC_TAIL%%" +CONFIG_WIFIBOX_INIT_PRIORITY=18 +CONFIG_WIFIBOX_WIRELESS_DEVICE="radio0" +CONFIG_PACKAGE_kmod-lib-crc-ccitt=y diff --git a/extra/scripts/publish-wifibox-release.lua b/extra/scripts/publish-wifibox-release.lua index 8dbeac0..45587a8 100755 --- a/extra/scripts/publish-wifibox-release.lua +++ b/extra/scripts/publish-wifibox-release.lua @@ -425,7 +425,7 @@ local function uploadFiles() end local function checkWrtConfig() - local goodConfigPath = pl.path.join(paths.firmware, "extra/openwrt-build/openwrt-diffconfig-extramini") + local goodConfigPath = pl.path.join(paths.firmware, "extra/openwrt-build/openwrt-diffconfig-webcam") local wrtConfigPath = pl.path.tmpname() --print("diffonfig output file: " .. wrtConfigPath) diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION index 56e9df1..26ecd8f 100644 --- a/src/FIRMWARE-VERSION +++ b/src/FIRMWARE-VERSION @@ -1 +1 @@ -0.10.3 \ No newline at end of file +0.10.4-webcamexperiment \ No newline at end of file