summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcamera/camera13
1 files changed, 8 insertions, 5 deletions
diff --git a/camera/camera b/camera/camera
index f2a7329..57592c6 100755
--- a/camera/camera
+++ b/camera/camera
@@ -2,18 +2,20 @@
# scripts/camera
# rpicam-still frontend script
+# This script requires a patched version of the rpicam-apps package
#
+
# supports manual mode and timelapse
camera_help() {
- echo "$0 [-t] [-i ms] [-m] [-e μs] [-f filename]"
+ echo "$0 [-t] [-i ms] [-m] [-e μs] [-o filename]"
echo " --timelapse"
echo " --interval <timelapse interval in ms>"
echo " --manual"
echo " --exposure <exposure time in μs>"
echo " --gain <1.0-12.0>"
echo " --awb <auto, incandescent, tungsten, fluorescent, indoor, daylight, cloudy, custom>"
- echo " --filename <filename prefix>"
+ echo " --output <filename>"
}
TZ="Europe/Brussels"
@@ -79,11 +81,11 @@ while [[ $# -gt 0 ]]; do
fi
shift
;;
- -f|--filename)
+ -o|--output)
shift
FILENAME="$1"
if [ -z "${FILENAME}" ]; then
- echo "Argument expected: --filename <filename suffix>"
+ echo "Argument expected: --output <filename>"
exit 1
fi
shift
@@ -113,6 +115,7 @@ if [[ "${OPTION_MANUAL}" = "yes" ]]; then
SUFFIX="_GAIN${GAIN}_EXP${EXPOSURE}"
INTERVAL="$(($EXPOSURE/1000))"
CMD_CAPTURE="--shutter ${EXPOSURE} --gain ${GAIN} --awbgains 2.9,1.7 --flicker-period 0 --raw --quality 100"
+ SUFFIX="_GAIN${GAIN}_EXP${EXPOSURE}"
fi
# timelapse options
@@ -130,5 +133,5 @@ exec rpicam-still \
--fullscreen --timeout 0 \
${CMD_CONTROL} ${CMD_CAPTURE} \
--width 4056 --height 3040 --thumb none \
- --encoding jpg --datetime --output ~/DCIM/${DIRECTORY}
+ --encoding jpg --datetime --output ~/DCIM/${DIRECTORY}${FILENAME}_%s${SUFFIX}.jpg