Added Jeronimo Barraco to TESTERS, and added his camera to camlibs/jl2005a. Changes in camlibs/jl2005a to accommodate new camera.

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

4 files changed, 26 insertions, 1 deletions

diff --git a/camlibs/jl2005a/ChangeLog b/camlibs/jl2005a/ChangeLog
index 823ffa7e6..fda742478 100644
--- a/camlibs/jl2005a/ChangeLog
+++ b/camlibs/jl2005a/ChangeLog
@@ -2,3 +2,8 @@
 2007-09-16  Theodore Kilgore <kilgota@auburn.edu>
 
 	* *.[c,h]: First check-in. 
+	library.c: NogaNet TDC-15 added, reported by 
+		   Jeronimo Barraco <jerobarraco@yahoo.com.ar>
+	README.jl2005a: Updated
+	jl2005a.c: Size of 176x144 compressed photos was incorrectly reported.
+		   Patch applied. Will need testing by J. Barraco
\ No newline at end of file
diff --git a/camlibs/jl2005a/README.jl2005a b/camlibs/jl2005a/README.jl2005a
index 5e1091bee..9ef4d19e5 100644
--- a/camlibs/jl2005a/README.jl2005a
+++ b/camlibs/jl2005a/README.jl2005a
@@ -82,6 +82,14 @@ use this function, then, and get an animation, that can easily be done using
 the "animate" function from the ImageMagick toolkit, or with a similar tool 
 from a similar image processing suite. 
 
+ANOTHER JL2005A CAMERA, WHICH IN ADDITION TO THE ABOVE, USES COMPRESSION
+
+has been discovered by Jeronimo Barraco <jerobarraco@yahoo.com.ar>. That 
+camera is the TDC-15, sold by NogaNet in Argentina. Work is under way to 
+support the compressed mode, which is optional on this camera. Unless and 
+until the compressed mode is supported, the camera is still usable in the 
+non-compressed mode which has already been supported. 
+
 WARRANTY?
 
 Absolutely none. Remember, I did not sell you this software. I have written 
@@ -89,3 +97,4 @@ this driver for my own edification and in the sincere hope that it might help
 you to use of your camera. Please see also the warranty clauses 
 in the LGPL license. 
 
+Updated 10/15/2007
\ No newline at end of file
diff --git a/camlibs/jl2005a/jl2005a.c b/camlibs/jl2005a/jl2005a.c
index 9c1e83a89..b3d02901e 100644
--- a/camlibs/jl2005a/jl2005a.c
+++ b/camlibs/jl2005a/jl2005a.c
@@ -74,6 +74,8 @@ jl2005a_get_pic_data_size (GPPort *port, int n)
 	GP_DEBUG("size = 0x%x\n", size);
 	response = (jl2005a_read_info_byte(port, 2 ))&0xff;
 	size = ((response&0xff)<<16)|size;
+	if (size == 0x3100)
+		size += 0x80;
 	GP_DEBUG("size = 0x%x\n", size);
 	return (size); 
 }
@@ -121,7 +123,15 @@ jl2005a_read_picture_data (Camera *camera, GPPort *port,
 
 	response = (jl2005a_read_info_byte(port, 7) )&0xff;
 	/* Always 0x80. Purpose unknown */
-	response = (jl2005a_read_info_byte(port, 0xa0) )&0xff;
+	response = (jl2005a_read_info_byte(port, 0x0a) )&0xff;
+	/* Previous byte is 0x11 if what is to be downloaded is the first
+	 * frame in a clip, is 0x01 if it is any clip frame after the initial
+	 * one, and is zero if what is to be downloaded is a standalone photo.
+	 * If clips will in the future be processed as AVI files, then there is
+	 * not any information to know how many frames are present, prior to 
+	 * downloading them. There is only a starting point and an indicator
+	 * for each frame. 
+	 */
         gp_port_write (port, "\xab\x00", 2);
         gp_port_write (port, "\xa1\x04", 2);
         gp_port_write (port, "\xab\x00", 2);
diff --git a/camlibs/jl2005a/library.c b/camlibs/jl2005a/library.c
index 96fe8d4c9..db78dd456 100644
--- a/camlibs/jl2005a/library.c
+++ b/camlibs/jl2005a/library.c
@@ -58,6 +58,7 @@ struct {
 } models[] = {
         {"American Idol Keychain Camera", GP_DRIVER_STATUS_EXPERIMENTAL, 
     							    0x0979, 0x0224},
+        {"NogaNet TDC-15", GP_DRIVER_STATUS_EXPERIMENTAL, 0x0979, 0x0224},
 	{NULL,0,0,0}
 };