merged from trunk

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13835 67ed7778-7388-44ab-90cf-0a291f65f57c

7 files changed, 97 insertions, 45 deletions

diff --git a/camlibs/digigr8/ChangeLog b/camlibs/digigr8/ChangeLog
index 605b041eb..b4f8f62c6 100644
--- a/camlibs/digigr8/ChangeLog
+++ b/camlibs/digigr8/ChangeLog
@@ -1,3 +1,13 @@
+2012-01-12   Theodore Kilgore <kilgota@auburn.edu>
+	* library.c: Digital Blue Barbie Camera DC150 added.
+	* README.*: Revisions.
+
+2011-06-20   Theodore Kilgore <kilgota@auburn.edu>
+	* library.c: Cobra Digital Camera DC150 added.
+
+2010-12-17   Theodore Kilgore <kilgota@auburn.edu>
+	* library.c: Aries Digital Keychain Camera, ITEM 128986 added.
+
 2010-12-17   Theodore Kilgore <kilgota@auburn.edu>
 	* library.c: Lego Bionicle added. New Product number 0x9051.
 	* README.9051: Added.
diff --git a/camlibs/digigr8/README.9050 b/camlibs/digigr8/README.9050
index 63b4b8273..325ad2dc6 100644
--- a/camlibs/digigr8/README.9050
+++ b/camlibs/digigr8/README.9050
@@ -8,7 +8,14 @@
 
 CONCERNING 0x2770:0x9050 CAMERAS:
 
-As of 01/20/2008, the only known camera with this USB ID string is the 
+First, a general remark. The reader is strongly encouraged to read 
+README.905C as well as this file. That file in fact pertains to all of the 
+cameras which are supported by libgphoto2/camlibs/digigr8. All of what it says
+pertains to the 0x2770:0x9050 cameras, too, unless something to the contrary is
+stated below.
+
+
+As of 01/20/2008, the only known camera with USB ID string 0x2770:0x9050 is the
 "Disney pix micro," found at KB Toys. Its functionality is very basic. On the 
 package it says the camera is able to take 20 photos, but in fact the number 
 of photos is variable. For, they are all compressed. 
@@ -26,18 +33,19 @@ gphoto2 -D, while for the other cameras supported in camlibs/digigr8 the
 gphoto2 -D option does nothing at all and is therefore considered as an 
 unsupported operation for those other cameras. However:
 
+
+WARNING
+
 The USB command to delete is the same as the command to shoot a frame 
 (gphoto2 option is --capture-preview). If you shoot a frame with the Disney 
 pix micro, it will delete whatever photos are on the camera !!!
 
+WARNING
 
-PLEASE TEST THE STANDALONE RAW PHOTO CONVERTER/DISPLAYER
+The camera has kernel support as a webcam, at 320x240 resolution. 
 
-An experimental program for processing raw files into finished photos is
-available now, in gphoto2/trunk/playground/raw_converters/sq_raw_converter
-Please try this program. If the results are good, I will incorporate the
-routines used there directly into libgphot02/camlibs/digigr8. I like the
-results, but they need testing.
+Use of the camera in webcam mode will delete all photos stored on the 
+camera, too !!!
 
 
 WARRANTY? 
@@ -59,4 +67,4 @@ WARRANTY?
 
 
 Theodore Kilgore
-01/21/2008, revised 01/22/2008
+01/21/2008, revised 01/22/2008, 01/12/2012
diff --git a/camlibs/digigr8/README.9051 b/camlibs/digigr8/README.9051
index 7a7516083..51af2f90e 100644
--- a/camlibs/digigr8/README.9051
+++ b/camlibs/digigr8/README.9051
@@ -8,12 +8,21 @@
 
 CONCERNING 0x2770:0x9051 CAMERAS:
 
-As of 12/17/2010, the only known camera with this USB ID string is the 
+First, a general remark. The reader is strongly encouraged to read.
+README.905C as well as this file. That file in fact pertains to all of the.
+cameras which are supported by libgphoto2/camlibs/digigr8. All of what it says
+pertains to the 0x2770:0x9051 cameras, too, unless something to the contrary is
+stated below.
+
+As of 12/17/2010, the only known camera with USB ID string 0x2770:0x9051 is the 
 "Lego Bionicle," apparently produced by Digital Blue for Lego. Its 
 functionality is very basic. On the package it says the camera is able to take 
 40 photos, but in fact the number of photos is variable. For, they are all 
 compressed. 
 
+On 01/12/2012 the Digital Blue Barbie Camera, has been discovered, too. Except
+for the name and the camera case, it seems identical to the Lego Bionicle.
+
 Since the compression algorithm is the same as that in the 0x905C cameras, this  
 camera is quite usable, for what it is. Resolution for this camera in still 
 mode appears to be nonadjustable and fixed at 640x480. 
@@ -23,10 +32,19 @@ button on top is the shutter button, of course. The button on the rear is
 often called the "mode" button on other cameras, and it will do such things
 as to switch the resolution mode, the compression mode, the continuous shooting
 mode, and such. But that is on other cameras. Here, that button is a "delete"
-button and will perform no other function. To delete the last photo, press that 
-button. To delete all, hold it down longer. The photos will be deleted then,
-one by one, starting with the last one. The small LCD window on the rear of the
-camera will show the decreasing number of photos while the button is being held.
+button and will perform no other function -- well, none except to turn the
+camera on if it is in power-off mode and the user is adventurous.
+
+To start the camera in stillcam mode, first look at the indicator window on the
+back. If it is blank, the camera is off. Press the shutter button. It can also 
+work to press the "Delete" button quickly and let go. But holding the "Delete"
+button down will start the deletion of photos.
+
+To delete the last photo, press the "Delete" button and watch the LCD indicator
+window on the rear of the camera. The number of photos shown there will 
+decrease by one. To delete all, hold the button down longer. The photos will be
+deleted then, one by one, starting with the last one. The LCD window will show 
+the decreasing number of photos while the button is being held.
 
 To the best of my ability to determine, the camera has no clip option, 
 no delayed-shooting option, and no multi-frame clips intended for AVI images.
@@ -42,16 +60,10 @@ resolution setting is in fact adjustable. Those who are curious may consult
 /linux(recent version)/drivers/media/video/gspca/sq905c.c
 
 where resolution-choosing is completely supported. That file supports the
-"webcam" functionality of the cameras supported in still mode in 
-libgphoto2/camlibs/digigr8. Since I have already made the minor changes
-in my kernel source tree which make this camera work as a webcam, I also
-mention here that the camera will work as a webcam, too. I only needed to
-add the USB Vendor:Product number in the aforementioned kernel source file,
-then to run "make modules" and "make modules_install." I was then able to 
-make the camera to stream and to choose any of the resolution settings
-640x480, 320x240, and 160x120. I promise to add the camera there formally, as
-soon as I get around to it, and then after understandable time lag the change
-will appear in the kernel source tree, too. 
+"webcam" functionality of all the cameras which are supported in still mode in 
+libgphoto2/camlibs/digigr8. That is, these cameras work as webcams, too.
+The resolution settings which are supported in webcam mode are 
+640x480, and 320x240.
 
 
 WARNING: The --capture-preview option *will* delete all photos on the camera.
@@ -63,6 +75,9 @@ frame (gphoto2 option is --capture-preview). Again. If you shoot a frame with
 the Lego Bionicle, it will delete whatever photos are on the camera !!!
 
 
+WARNING: Use of the camera as a webcam will delete all photos on the camera, 
+too !!!
+
 
 WARRANTY? 
 
@@ -83,4 +98,4 @@ WARRANTY?
 
 
 Theodore Kilgore
-12/17/2010
+12/17/2010, revised 01/12/2012.
diff --git a/camlibs/digigr8/README.9052 b/camlibs/digigr8/README.9052
index 3db380f08..40a8a6d29 100644
--- a/camlibs/digigr8/README.9052
+++ b/camlibs/digigr8/README.9052
@@ -8,7 +8,14 @@
 
 CONCERNING 0x2770:0x9052 CAMERAS
 
-The only camera reported to use this ID is a Disney Pix Micro camera. It
+First, a general remark. The reader is strongly encouraged to read
+README.905C as well as this file. That file in fact pertains to all of the
+cameras which are supported by libgphoto2/camlibs/digigr8. All of what it says
+pertains to the 0x2770:0x9052 cameras, too, unless something to the contrary is
+stated below.
+
+
+The only camera known to use the ID 0x2770:0x9052 a Disney Pix Micro camera. It
 seems to be a VGA version of the smaller camera with the same name, which 
 reports itself as 0x2770:0x9050. The new camera has the resolution settings 
 640x480 and 320x240. Both cameras permit deletion of all photos. The same 
@@ -17,4 +24,9 @@ operations are used for that as for the capture of an image to the computer
 advised that the --capture-preview operation will also clear the camera's 
 memory and remove all images stored there. 
 
+The camera also has kernel support for webcam mode. To run the camera as a
+webcam will also delete all still photos stored in the camera.
+
 For further details please consult the file README.9050.
+
+Revised 01/12/2012
\ No newline at end of file
diff --git a/camlibs/digigr8/README.905C b/camlibs/digigr8/README.905C
index a5bddc94c..e6b31b7fe 100644
--- a/camlibs/digigr8/README.905C
+++ b/camlibs/digigr8/README.905C
@@ -46,7 +46,7 @@ chip inside.
 WHAT FEATURES DO THESE CAMERAS HAVE, AND WHAT DOES THIS DRIVER SUPPORT?
 
 	FEATURE LIST					SUPPORTED (Y/N/Part)
--- USB connection to computer
+-- USB connection to computer					Y
 -- High resolution 640x480, uncompressed 				Y
 -- Low resolution 320x240, uncompressed					Y
 -- High resolution 640x480, compressed 					Y
@@ -105,8 +105,8 @@ those obtained using the software which came with the camera, but not
 always. Generally, considering that they are cheap, low resolution cameras,
 these cameras give relatively good pictures.
 
-The digigr8 cameras can also function as webcams, but that is outside the 
-scope of gphoto2. 
+The digigr8 cameras can also function as webcams. That is supported in the
+kernel but is outside the scope of gphoto2. 
 
 
 HARDWARE LIMITATIONS AND CONSTRAINTS
@@ -154,6 +154,12 @@ action of software on the computer. The camera itself supports two choices for
 deletion: delete the last photo taken, or delete all. Each action is
 performed by an appropriate sequence of button pushes on the camera.
 
+WARNING about battery use:
+
+In addition to all of the above limitations, the cameras use SDRAM for data
+storage. Consequently, the batteries will be drained if one leaves them in
+the camera when it is not being used.
+
 
 WHAT GUI FRONTENDS DOES THIS CAMERA LIBRARY SUPPORT?
 
@@ -264,4 +270,5 @@ WARRANTY?
 
 Theodore Kilgore
 12/05/05
-(revised 12/29/05, 03/28/07, 06/25/07, 07/16/07, 07/23/07, 01/21/08, 01/22/08)
\ No newline at end of file
+(revised 12/29/2005, 03/28/2007, 06/25/2007, 07/16/2007, 07/23/2007, 
+01/21/2008, 01/22/2008, 01/12/2012)
\ No newline at end of file
diff --git a/camlibs/digigr8/README.913D b/camlibs/digigr8/README.913D
index 8bf061e4a..1ce2a4db1 100644
--- a/camlibs/digigr8/README.913D
+++ b/camlibs/digigr8/README.913D
@@ -13,7 +13,7 @@ basic functions of this camera are the same as those of the 0x2770:0x905c
 cameras which are the main ones supported in libgphoto2/camlibs/digigr8, but
 there are some small differences. For a complete description and discussion
 of the 0x2770:0x913D camera, therefore, the reader should also read 
-README.905C. Only the basic features and differences with the 
+README.905C. Only the basic features and the differences with the 
 previously-supported 0x2770:0x905C cameras are listed here:
 
 Features of the Suprema Digital Keychain Camera:
@@ -37,10 +37,9 @@ Features of the Suprema Digital Keychain Camera:
 		It will probably not ever be possible, unfortunately, to
 		support deletion of any photos or images on the camera, by
 		means of software control from the computer.
-	-- webcam functionality. The webcam function is obviously
-		supportable (gphoto2 --capture-image uses it to shoot one
-		frame), but libgphoto2 does not do webcams, so that can't be
-		done here. 
+	-- webcam functionality. The webcam function is supported by the
+		kernel. This camera library in libgphoto2 supports stillcam
+		functionality.
 
 As a further note, the gphoto2 --capture-image USB command when used with an
 0x2770:0x913D camera will _not_ delete the images already on the camera. This 
@@ -57,16 +56,10 @@ battery.
 On 12/23/07 the Sakar Spiderman (no. 92045) has been reported by Martin Laberge 
 <mlsoft@videotron.ca>. THERE IS POTENTIAL NAME CONFUSION WITH THIS CAMERA. The
 Sakar Amazing Spiderman (no. 94044) has in it a JL2005C chip which is currently
-not supported in libgphoto2. Buyer beware!
-
-PLEASE TEST THE STANDALONE RAW PHOTO CONVERTER/DISPLAYER
-
-An experimental program for processing raw files into finished photos is
-available now, in gphoto2/trunk/playground/raw_converters/sq_raw_converter
-Please try this program. If the results are good, I will incorporate the
-routines used there directly into libgphot02/camlibs/digigr8. I like the
-results, but they need testing.
-
+not supported in libgphoto2. Buyer beware! (Update 01/12/2012: Support for 
+all JL2005C cameras has been added to libgphoto2. The buyer need not "beware"
+any longer. However, it seems to remain true that SQ cameras take better than
+average pictures, relative to their low price range.)
 
 WARRANTY: 
 
@@ -74,4 +67,5 @@ None. For a more complete discussion of this issue, the reader is referred to
 README.905C and to the statements of the LGPL license regarding warranty. 
 
 
-Theodore Kilgore, 08/24/2007, revised 12/23/2007, 01/21/2008, 01/22/08
\ No newline at end of file
+Theodore Kilgore, 08/24/2007, revised 12/23/2007, 01/21/2008, 
+01/22/2008, 01/12/2012
\ No newline at end of file
diff --git a/camlibs/digigr8/library.c b/camlibs/digigr8/library.c
index 997a91976..ec580a024 100644
--- a/camlibs/digigr8/library.c
+++ b/camlibs/digigr8/library.c
@@ -57,6 +57,8 @@ static const struct {
    	unsigned short idProduct;
 } models[] = {
 	{"Digigr8",		GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
+	{"Cobra Digital Camera DC150", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770,
+									0x905c},
 	{"Che-Ez Snap SNAP-U",	GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
 	{"DC-N130t",		GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905C},
 	{"Soundstar TDC-35",	GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
@@ -73,8 +75,12 @@ static const struct {
 	{"Stop & Shop 87096",		GP_DRIVER_STATUS_EXPERIMENTAL,
 							    0x2770, 0x905c},
 	{"Jazz JDC9",		GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
+	{"Aries Digital Keychain Camera, ITEM 128986",
+				GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
 	{"Disney pix micro",	GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9050},
 	{"Lego Bionicle",	GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9051},
+	{"Barbie Camera (Digital Blue)",	GP_DRIVER_STATUS_EXPERIMENTAL,
+							    0x2770, 0x9051},
 	/* from IRC reporter, adam@piggz.co.uk */
 	{"Disney pix micro 2",	GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9052},
 	{"Suprema Digital Keychain Camera",	GP_DRIVER_STATUS_EXPERIMENTAL,