From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 11 Jan 2014 14:47:17 +0000 (+0200)
Subject: special wrappers for raspberry pi camera module are no longer needed
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=45d38fb26b14f95aec9ad05cd1a18393b36b707f;p=motioneye-debian

special wrappers for raspberry pi camera module are no longer needed
---

diff --git a/README.md b/README.md
index a958d30..c92afbc 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,3 @@ Being designed with responsiveness in mind, it will also work nicely on mobile d
  
  5. point your favourite browser to <http://localhost:8765>
 
-## Raspberry PI ##
-
-If running motionEye on a Raspberry PI with a *CSI camera board*, see `raspicam/README.md`.
-Also note that only one camera is supported when using this configuration.
-
diff --git a/raspicam/README.md b/raspicam/README.md
deleted file mode 100644
index d523633..0000000
--- a/raspicam/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-## This folder is only meaningful for Raspberry PI devices used with the CSI camera board. ##
-
-1. make sure you have installed `uv4l` and `uv4l-raspicam` packages:
-   <http://www.linux-projects.org/modules/sections/index.php?op=viewarticle&artid=14>
-
-2. create links for `motion` and `v4l2-ctl` scripts into `/usr/local/bin`;
-   they serve as wrappers for their corresponding programs and will
-   make the CSI camera work out of the box with motionEye:
-   
-        sudo ln -s /path/to/motioneye/raspicam/motion /usr/local/bin
-        sudo ln -s /path/to/motioneye/raspicam/v4l2-ctl /usr/local/bin
-
-3. if you wish to start motionEye at boot, add this to `/etc/rc.local` (assuming motionEye lives in pi's home directory):
-
-        sudo -u pi /home/pi/motioneye/motioneye.py > /home/pi/motioneye/run/motioneye.log 2>&1 &
-
-4. the `uv4l` daemon must be started at boot; add the following line to `/etc/rc.local`,
-   *before* the line that starts motionEye:
-
-        test -x /usr/local/bin/motion && sudo -u pi /usr/local/bin/motion -h > /dev/null 2>&1 || false
-
-## CSI camera board troubleshooting ##
-
-* make sure you run the latest version of the Raspberry PI firmware
-(you may need a `rpi-update` for the latest `uv4l` version to work)
-* make sure you have enabled the camera module in `raspi-config`
-* don't overclock your PI too much, using the camera module causes core overheating already
-* don't reduce the memory allocated to the GPU too much
-
diff --git a/raspicam/motion b/raspicam/motion
deleted file mode 100755
index ef21046..0000000
--- a/raspicam/motion
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# this script is a wrapper around motion binary
-# that makes motion work with the uv4l raspi camera module
-
-MOTION_BIN=/usr/bin/motion
-UV4L_BIN=/usr/bin/uv4l
-JPEG_QUALITY=85
-ARGS="$*"
-
-function config_full_path() {
-    dir="$1"
-    read file
-    if [ "${file:0:1}" != "/" ]; then
-        file="$dir/$file"
-    fi
-    echo "$file"
-}
-
-function list_config_files() {
-    prev_arg=""
-    config_file=""
-    for arg in $*; do
-        if [ "$prev_arg" == "-c" ]; then
-            config_file=$arg
-            break
-        fi
-        prev_arg=$arg
-    done
-
-    if [ -r "$config_file" ];then
-        echo "$config_file"
-        cat motion.conf | grep thread | cut -d ' ' -f 2 | config_full_path $(dirname "$config_file")
-    fi
-}
-
-function find_resolution() {
-    width="640" # the defaults
-    height="480"
-
-    for file in $(list_config_files); do
-        w=$(cat "$file" | grep width | cut -d ' ' -f 2)
-        h=$(cat "$file" | grep height | cut -d ' ' -f 2)
-        if [ -n "$w" ] && [ -n "$h" ]; then
-            width=$w
-            height=$h
-
-            break
-        fi
-    done
-
-    echo $width $height
-}
-
-# find the configured resolution
-resolution=$(find_resolution)
-resolution=($resolution)
-
-# kill any previous uv4l instance
-pkill uv4l
-${UV4L_BIN} --driver raspicam --auto-video_nr --extension-presence 1 --sched-rr --width ${resolution[0]} --height ${resolution[1]} --encoding jpeg --quality $JPEG_QUALITY
-
-# start motion binary with preloaded .so
-export LD_PRELOAD=/usr/lib/uv4l/uv4lext/armv6l/libuv4lext.so
-exec ${MOTION_BIN} $*
-
diff --git a/raspicam/v4l2-ctl b/raspicam/v4l2-ctl
deleted file mode 100755
index 27035af..0000000
--- a/raspicam/v4l2-ctl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# this is a wrapper for v4l2-ctl that lists some custom resolutions
-# when called with --list-formats-ext for the raspi camera module
-
-V4L2_CTL_BIN=/usr/bin/v4l2-ctl
-
-if echo $* | grep -- '--list-formats-ext' > /dev/null; then
-    echo "ioctl: VIDIOC_ENUM_FMT"
-    echo -e "\tIndex       : 0"
-    echo -e "\tType        : Video Capture"
-    echo -e "\tPixel Format: 'YUYV'"
-    echo -e "\tName        : YUV 4:2:2 (YUYV)"
-    echo -e "\t\tSize: Discrete 320x240"
-    echo -e "\t\tSize: Discrete 640x480"
-    echo -e "\t\tSize: Discrete 1024x768"
-    echo -e "\t\tSize: Discrete 1280x1024"
-
-    exit
-fi
-
-${V4L2_CTL_BIN} $*