darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,596 Commits 14 Branches 69 Tags
2f627cb99869db52f252d5d014b0f87e94de6709
Commit Graph

237 Commits

Author SHA1 Message Date
Michael Rensing
bed4d5d496 Added colons for new Manufacturer:Model notation 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6048 67ed7778-7388-44ab-90cf-0a291f65f57c
 2003-01-10 21:37:23 +00:00
Marcus Meissner
c132d4b5c9 * sierra.c: Epson PhotoPC 650 at least partially working, so list it. 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6013 67ed7778-7388-44ab-90cf-0a291f65f57c
 2003-01-08 07:04:37 +00:00
Marcus Meissner
53c49b480c * library.c: Replaced stack allocated CameraList by dynamic 
allocated one, since this struct is huge.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6005 67ed7778-7388-44ab-90cf-0a291f65f57c
 2003-01-03 20:46:37 +00:00
Arnaud Launay
b9d58ca88b replace (c) and (C) by � 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5969 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-12-15 11:45:10 +00:00
Marcus Meissner
bea4217a33 * sierra.c, sierra.h: replaced usb_wrap flag value by a generic 
flags value.

	  Added a hack for "low speed" cameras and cameras which do not
	  like the register 51 being retrieved, like the Agfa ePhoto 780c
	  apparently.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5934 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-12-10 11:19:58 +00:00
Arnaud Launay
64e420e288 <config.h> -> "config.h" 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5859 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-29 16:09:58 +00:00
Patrick Mansfield
1ca8345c2d * sierra.c: start off with folder set to empty rather than "/", 
since we have no idea of the camera directory on startup.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5799 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-23 18:27:15 +00:00
Hans Ulrich Niedermann
917ba5e7c3 gettext stuff for Arnaud 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5776 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-23 00:47:57 +00:00
Patrick Mansfield
0945bbe8a9 * sierra.c: Change 2100UZ to be SIERRA_MODEL_CAM_DESC per 
patch from C.A. Marby <marby@lhasa.harvard.edu>.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5725 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-21 17:42:38 +00:00
Arnaud Launay
fcc0c14c05 More misc fixes 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5674 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-19 18:45:34 +00:00
Marcus Meissner
89d1b5b213 * sierra.c: Do not cast between time_t* and int*. 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5630 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-17 16:54:56 +00:00
Patrick Mansfield
136092fe15 * library.c: oops accidentally took out the retrieval of the 
current picture number (it's used to set the file name if no
          valid file name is retrieved), put it back.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5594 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-10 23:56:01 +00:00
Patrick Mansfield
a80d16c128 * library.c: Conditionally save the file path on capture. 
Note that this requires gp_camera_capture() to allow a NULL
          path, else the the sierra_capture is never called with a NULL
          path.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5587 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-10 18:07:33 +00:00
Patrick Mansfield
486111a1ce * library.c: Per patch and details from C.A. Marby 
<marby@lhasa.harvard.edu>, fix bugs with capture: fix a bug I
          introduced, put back the read after action of a SIERRA_PACKET_ENQ.
          Move the timeout increase before the capture, and increase the
          timeout to 20 seconds.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5586 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-10 17:22:43 +00:00
Hans Ulrich Niedermann
be9b07f8bf moved definition of camlibdir to configure.in 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5547 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-06 14:31:44 +00:00
Lutz Mueller
10c89d4a9e 2002-11-05 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra.c: The 2100UZ seems to use oly3040_cam_desc (reported by
	  C.A. Marby <marby@lhasa.harvard.edu>)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5535 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-05 20:23:21 +00:00
Patrick Mansfield
8773afa472 * PROTOCOL, epson-desc.c, library.c, nikon-desc.c 
* olympus-desc.c, sierra-desc.h, sierra.c, sierra.h: Add changes
  to support the 0x6 get register strings, the extended protocol.
  This gives roughly twice the download speed. This is not
  supported for the default cases. Thanks to Selmeczi David
  <david@esr.elte.hu> for discovering and coding up the original
  patch for this support. Also includes a minor change in
  library.c for the message when a recursive call is detected.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5521 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-11-02 01:38:06 +00:00
Patrick Mansfield
ea1c90a95e * library.c: rename ifdef around recursive call problem, and 
change ifdef-ed out code to use gp_context_progress_start.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5502 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-10-28 04:24:07 +00:00
Lutz Mueller
596bfb64c8 2002-10-20 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra.c (camera_init): Don't call sierra_init if the camera is
	  a 'Polaroid PDC 2300Z'. Reported by William Bader
	  <williambader@hotmail.com>.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5408 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-10-20 19:58:04 +00:00
Lutz Mueller
147977c2ef 2002-10-03 Lutz M�ller <lutz@users.sourceforge.net> 
* Makefile.am: -I$(top_builddir)/libgphoto2


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5347 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-10-03 07:58:54 +00:00
Lutz Mueller
56f0129c86 2002-09-21 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c: Don't tell the camera to switch to a speed it is
	  currently operating at.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5320 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-09-21 17:12:53 +00:00
Lutz Mueller
4b36d4c9c5 2002-09-21 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c
	* sierra.c: Make the check for the precence of a memory card
	  non-fatal.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5319 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-09-21 06:34:42 +00:00
Lutz Mueller
f6db0a05c2 2002-09-19 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c (sierra_check_connection): Fix.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5318 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-09-19 21:18:05 +00:00
Arnaud Launay
317c63b327 - modify config.h location 
- add intl dir in include dirs


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5277 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-09-14 19:42:54 +00:00
Patrick Mansfield
01fecba330 * sierra.c 
* library.c: Avoid recursive calls from gtkam into get/set
          functions by not calling gp_context_progress_update.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5210 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-09-07 19:19:07 +00:00
Patrick Mansfield
365156709e * sierra-desc.c: set the widget info field. 
* sierra.c: Change GP_DEBUG's to be more consistent.
	* library.c: Do not call sierra_read_packet_wait after a
	  sierra_transmit_ack, since it's called by sierra_transmit_ack.
	  Add file name to progress bar in sierra_get_string_register.
	  Add recursion protection to sierra_get_string_register.
	  Increase the timeout temporarily for the next command after
	  capture completes.
	  Change GP_DEBUG's to be more consistent.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5005 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-08-13 17:51:18 +00:00
Gilles Grandou
4ab9729fea 2002-07-09 Gilles Grandou <gilles@grandou.net> 
* epson-desc.h
	* sierra-desc.h
	* sierra.h
	* Makefile.am: add initial configuration support for epson
	  3000z through cam_desc. original code is still here for
	  other cameras which may rely on it (if any).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4835 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-09 22:00:52 +00:00
Patrick Mansfield
53b4433bf1 * olympus-desc.c: Patch aperature to use menu rather than radio. 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4834 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-09 16:24:53 +00:00
Patrick Mansfield
ffb9ba7836 * nikon-desc.c: Add comment clarifying 995 non-support. 
* olympus-desc.c:
	* sierra-desc.h: Add sierra_default_cam_desc.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4833 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-09 04:43:55 +00:00
Patrick Mansfield
af3c4d3201 * sierra.c: Output summary with warning if no memory card present. 
* library.c: Check for memory card before capture or listing.
	* sierra-desc.c: add extern round() rather than a complete hack.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4824 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-07 05:26:35 +00:00
uid34756
927e6d3224 2002-07-05 Lutz M�ller <lutz@users.sourceforge.net> 
Patch by Thomas Reitelbach <tr@erdfunkstelle.de>:

	* sierra.c: Add support for Epson 850z.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4820 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-05 21:09:53 +00:00
Patrick Mansfield
ba79efaa13 * nikon-desc.c 
* olympus-desc.c
       * sierra-desc.c
       * sierra-desc.h
       * sierra.c
       * sierra.h: Add the ability to put the camera manual text in the
         camera descriptor. Added text for cp880 and cp995. Put text in
         for the Oly 3040.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4799 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-01 23:38:21 +00:00
Patrick Mansfield
c28de58b75 sierra.c: Use SIERRA_MODEL_CAM_DESC for some olympus models. 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4798 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-07-01 21:30:23 +00:00
Lutz Mueller
33f9c0f07b 2002-06-28 Lutz M�ller <lutz@users.sourceforge.net> 
Patch by Selmeczi David <david@esr.elte.hu>:

	* olympus-desc.c:
	* nikon-desc.c: Prepare for translation.
	* sierra.c: Use the new configuration dialog for more camera models.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4787 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-28 16:43:31 +00:00
Lutz Mueller
8d35aaad64 2002-06-28 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra.h:
        * library.[c,h]:
        * sierra-desc.[c,h]: Fix includes.
        * sierra.c: Remove cruft.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4786 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-28 12:43:20 +00:00
Lutz Mueller
5cbfea644c 2002-06-28 Selmeczi David <david@esr.elte.hu> 
* olympus-desc.c: New.
        * Makefile.am: Add above file.
        * sierra-desc.h: Reference to olympus-desc.c
        * sierra.c: Use new configuration dialog for the 3040Z.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4785 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-28 12:16:04 +00:00
Lutz Mueller
604c042bb8 2002-06-28 Selmeczi David <david@esr.elte.hu> 
* olympus-desc.c: New.
        * Makefile.am: Add above file.
        * sierra-desc.h: Reference to olympus-desc.c
        * sierra.c: Use new configuration dialog for the 3040Z.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4784 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-28 12:15:16 +00:00
Lutz Mueller
2eaf405e95 2002-06-27 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra-usbwrap.c: I missed one < GP_OK.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4778 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-27 11:09:31 +00:00
Lutz Mueller
602c91d181 2002-06-27 Lutz M�ller <lutz@users.sourceforge.net> 
Selmeczi David <david@esr.elte.hu> fixed the error checks. I added
	the CR macro and fixed the headers.

	* sierra-usbwrap.h: Fix header.
	* sierra-usbwrap.c: Check for gp_* < GP_OK instead of != GP_OK.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4777 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-27 08:00:20 +00:00
Lutz Mueller
6ec6391206 2002-06-26 Lutz M�ller <lutz@users.sourceforge.net> 
Selmeczi David <david@esr.elte.hu> is working on supporting
        his camera. This is a first step to get his camera working:

        * sierra.c: "Olympus C-3040Z" is supported by this driver, too.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4772 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-26 17:32:53 +00:00
Patrick Mansfield
93b7f2df9f Added a new camera descriptor table for getting and setting the camera 
configuration.

Added more complete configuration support for the Nikon Coolpix 880 using
the new camera descriptor table.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4625 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-06-06 05:38:03 +00:00
Lutz Mueller
16c52afd83 2002-05-26 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c: Handle the error where the camera sends strange bytes.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4575 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-26 17:16:09 +00:00
Lutz Mueller
ede0fbc66a 2002-05-26 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c (sierra_check_connection, sierra_set_speed):
          These functions are only applicable for serial connections.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4572 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-26 10:23:07 +00:00
Lutz Mueller
bb391a6de0 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c: If we receive SIERRA_PACKET_SESSION_END, reestablish
	  the connection and switch to the default speed.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4571 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 21:42:48 +00:00
Lutz Mueller
0ab65ee602 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra.c (camera_init): It seems the code I '#if 0'ed out is needed
          by USB cameras...


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4564 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 20:09:02 +00:00
Lutz Mueller
5d95198cf1 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra.c: '#if 0' some code that I don't think is needed at all.
        * library.c (sierra_init): Logs show that sierra_init does not
          start a new session (i.e. no 0x53 instead of 0x43 needed).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4562 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 17:02:14 +00:00
Lutz Mueller
07e2d9e9b0 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c (sierra_set_speed): A speed change automatically
          starts a new session.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4561 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 16:33:33 +00:00
Lutz Mueller
6b33f72cb7 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c: The first packet after initialization (sierra_init)
          needs a special flag.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4554 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 13:16:40 +00:00
Lutz Mueller
823d008ed1 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* sierra.c (camera_init): Check if the computer supports high speeds
          (i.e. 115200).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4552 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 10:07:54 +00:00
Lutz Mueller
1b127cfe29 2002-05-25 Lutz M�ller <lutz@users.sourceforge.net> 
* library.c (sierra_check_connection): GP_ERROR_IO_READ is fine, too.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4551 67ed7778-7388-44ab-90cf-0a291f65f57c
 2002-05-25 07:09:50 +00:00