diff --git a/README.md b/README.md index c2ebcea5..e03ae996 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Web based interface for controlling the Raspberry Pi Camera, includes motion detection, time lapse, and image and video recording. -Current version 6.0.10 +Current version 6.0.11 All information on this project can be found here: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=63276 The wiki page can be found here: diff --git a/bin/raspimjpeg b/bin/raspimjpeg index 327aa72b..e47318d8 100755 Binary files a/bin/raspimjpeg and b/bin/raspimjpeg differ diff --git a/etc/raspimjpeg/raspimjpeg.1 b/etc/raspimjpeg/raspimjpeg.1 index cf29d0eb..598535f8 100755 --- a/etc/raspimjpeg/raspimjpeg.1 +++ b/etc/raspimjpeg/raspimjpeg.1 @@ -42,6 +42,7 @@ sensor_region_w 65536 sensor_region_h 65536 shutter_speed 0 raw_layer false +stat_pass 0 # camera_num 0 - no selection. 1/2 selects first or second camera on compute module camera_num 0 diff --git a/www/config.php b/www/config.php index f50b6202..2f7cf360 100755 --- a/www/config.php +++ b/www/config.php @@ -3,7 +3,7 @@ define('LBASE_DIR',dirname(__FILE__)); //Global defines and utility functions // version string - define('APP_VERSION', 'v6.0.10'); + define('APP_VERSION', 'v6.0.11'); // name of this application define('APP_NAME', 'RPi Cam Control'); diff --git a/www/index.php b/www/index.php index 99507acf..71aab365 100644 --- a/www/index.php +++ b/www/index.php @@ -25,6 +25,7 @@ $options_mx = array('Internal' => '0', 'External' => '1'); $options_mf = array('Off' => '0', 'On' => '1'); $options_cn = array('First' => '1', 'Second' => '2'); + $options_st = array('Off' => '0', 'On' => '1'); function initCamPos() { $tr = fopen("pipan_bak.txt", "r"); @@ -307,6 +308,10 @@ function getImgWidth() { + + Image Statistics, default 'Off': + + Rotation, default 0: diff --git a/www/schedule.php b/www/schedule.php index a4aed666..8e2a73ad 100644 --- a/www/schedule.php +++ b/www/schedule.php @@ -406,6 +406,7 @@ function cmdHelp() { echo "sc1Rescan for video and image indexes"; echo "symacroExecute macro"; echo "cn1/2Select camera (Compute model only)"; + echo "st0/1Camera statistics"; echo ""; echo ""; echo "";