Commit Graph

4651 Commits

Author SHA1 Message Date
Marcus Meissner
217eee5109 * blink2.txt: New file describing the protocol of the Blink2.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7669 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-23 23:20:51 +00:00
Stephen H. Westin
e6592ac8e6 Corrected bug in canon_int_set_file_attributes: one byte too short on
command (we need two NULs at the end). We now use
  canon_usb_set_file_attributes in usb.c.
Corrected canon_usb_set_file_attributes, which never could have worked.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7664 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 18:53:43 +00:00
Stephen H. Westin
e03ac95213 Now ignores all HTML output from Protocol.xml.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7663 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 14:23:11 +00:00
Stephen H. Westin
ca6c46f4f0 Fixed one type warning long vs. int
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7662 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 14:14:03 +00:00
Marcus Meissner
b8f4763ba4 * actually brandname is Sea & Sea 5000G
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7661 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 13:48:36 +00:00
Stephen H. Westin
0f077cea74 Updated copyright notice.
Added more info on new protocol (EOS 20D).
Added note on differing response lengths to "get camera photo abilities"
  with some newer cameras.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7660 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 13:44:07 +00:00
Stephen H. Westin
ca95975d75 Fixed parsing of output from current (1.8) version of SniffUSB, which I
broke in fixing parsing of 0.13 output.
Improved parsing of output from EOS 20D (new protocol).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7659 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 13:38:25 +00:00
Marcus Meissner
befe2a8ac9 * g3.c: Added Ricoh 5000G
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7658 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 13:35:00 +00:00
Marcus Meissner
69d5a6415d * commands.c: memset had arguments swapped, reported by Tim Waugh.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7657 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-21 12:26:46 +00:00
Marcus Meissner
564a4b9115 * gphoto2-widget.c: long choice lists may overflow the 64 entry
buffer. return errors when the list is full.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7656 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-20 20:54:57 +00:00
Marcus Meissner
f7bd804f80 * ptp.h: Merged some findings during debugging.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7655 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-20 10:36:23 +00:00
Marcus Meissner
8ed6686039 * POTFILES.in: added adc65
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7654 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-19 15:43:58 +00:00
Marcus Meissner
f2f9167c38 * make update-po
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7653 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-19 15:42:01 +00:00
Stephen H. Westin
9b50066e71 Minor fix to "Models Covered" table.
Added a model or two to the table of initial responses.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7652 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 18:12:01 +00:00
Stephen H. Westin
685e33f06e We can now interpret logs from older versions of USBSnoop (0.13) again.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7651 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 18:04:09 +00:00
Stephen H. Westin
ab17da51e1 Progess toward downloading files from EOS 20D, including getting
download block size from camera when available.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7650 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 17:55:56 +00:00
Stephen H. Westin
c4ae17e6ce Added CANON_USB_FUNCTION_DISK_INFO_2
CANON_USB_FUNCTION_20D_UNKNOWN_5
      CANON_USB_FUNCTION_DELETE_FILE_2
  to enum, and fixed command table.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7649 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 17:54:06 +00:00
Stephen H. Westin
3d7d220663 Added keys_locked flag and xfer_length to private library structure.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7648 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 17:50:06 +00:00
Stephen H. Westin
c311577d8c Fixed sizes reported by get_disk_info for EOS 20D.
Added PowerShot A510.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7647 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 17:38:26 +00:00
Marcus Meissner
7e7066bce0 * library.c: Added Kodak CX7525
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7646 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-17 16:59:13 +00:00
Stephen H. Westin
0382a37e7e Syntax corrections.
More info on EOS 20D.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7645 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-14 22:52:22 +00:00
Stephen H. Westin
100894e315 Log a debugging message, rather than using gp_context_message, for an
unexpected length returned from "get camera photo abilities".
Added "keys_locked" member to the camera data, and unlock only when we
  think the camera has been left locked. This should be never for EOS
  cameras, and useless for other models, as we don't know how to
  unlock those.
Trying a different command code for key lock and unlock for EOS 20D.
Corrected comments in canon_usb_dialogue.
Added some casts to avoid warnings on both Linux and Darwin, since one
  defines size_t as long, the other as int.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7644 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-14 15:25:50 +00:00
Stephen H. Westin
47290c6d9b Fixes toward EOS 20D support:
o "flash device ID", "get disk info", and "delete file"
   have different command codes.
 o "get disk info" seems to return values in K rather than bytes.
Moved PowerShot A60 & A70 from class 5 to class 1.
Casts on various parameters to avoid warnings both on Linux and
  on Mac OS X, which seem to have different sizes for size_t.
Changed to use all 32 bytes, if present, from both camera
  model and owner name from "identify camera" command.
Some realignment.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7643 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-14 15:21:03 +00:00
Marcus Meissner
317ce3de7d added adc65
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7642 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-12 21:47:14 +00:00
Marcus Meissner
85b68f452c added adc65 driver (from external source)
clean up by me.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7641 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-12 21:42:09 +00:00
Stephen H. Westin
1968c42e09 Setting byte 0x46 in command packet is needed for (new) class 6,
but causes other cameras to hang. I now do it only for class 6.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7637 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-09 21:35:01 +00:00
Stephen H. Westin
0fcb115c06 Corrected an infinite loop when checking for filename
of a newly captured image, only if that was the only image
  on the camera.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7636 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-09 21:31:27 +00:00
Stephen H. Westin
7df49b8313 Tidied up table of known models.
More info on camera initial response message.
Corrected length of response from "get photo abilities" in new protocol.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7635 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-09 17:07:39 +00:00
Stephen H. Westin
3ec93d3c4e Added some interpretation of initial camera response.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7634 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-09 15:58:29 +00:00
Stephen H. Westin
c61a5f4064 Corrected protocol classes for IXUS v (I think it's the same camera
as PowerShot S110, but with different USB ID) and PowerShot S45
   (we had reports that it was working with the EOS (class 4) code,
   but somehow it was in class 5).
Corrected one comment.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7633 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-09 15:51:56 +00:00
Marcus Meissner
94047ee491 added powershot a510
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7632 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-09 06:29:30 +00:00
Stephen H. Westin
0788e300f0 Move PowerShot A300 from class 4 to class 1.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7631 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:52:21 +00:00
Stephen H. Westin
e7a4ff44da Moved PowerShot A80 from class 4 to class 1.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7630 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:45:14 +00:00
Stephen H. Westin
d7ffe1ef11 Added section with list of known cameras.
More info on EOS 20D, in various places.
Details on EOS 300D's apparent oddball behavior during remote capture.
Added A400 info on initialization response packet.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7629 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:38:40 +00:00
Stephen H. Westin
b833566bca Correct some lengths expected from canon_usb_dialog: the first 0x50 bytes
are never returned.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7628 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:32:30 +00:00
Stephen H. Westin
f0ec574511 Whoops, I wanted the S400/IXUS 400 in class 1, not 3.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7627 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:30:21 +00:00
Stephen H. Westin
7d476254cd Moved PowerShot S400 (Digital IXUS 400) from class 4 (EOS-like) to class 3.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7626 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:28:36 +00:00
Stephen H. Westin
f4ffcdccc0 Corrected expected length from "New EOS get body ID".
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7625 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-08 20:25:54 +00:00
Stephen H. Westin
d978602597 Set byte 0x46 in command packet in preparation for new (EOS 20D) protocol.
Added special-case code for interrupt reads during capture to accomodate
  missing message with 300D.
Cleaned up some gcc warnings (long vs. int in format specifier).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7624 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-07 17:52:02 +00:00
Stephen H. Westin
31b82ed307 Moved PowerShot A400 back to class 5. I have my doubts, but don't know any
better candidate.
Moved PowerShot S400 from class 1 to class 4, which is where it apparently
  worked before (May 2003).
Corrected a couple of gcc warnings on type of format specifiers (long int
  vs. int).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7623 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-07 17:47:12 +00:00
Marcus Meissner
eb73392b1f * added Nikon D2H SLR.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7622 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-07 15:03:04 +00:00
Stephen H. Westin
867e655ba3 Rewrote a bit on the response packet in initialization.
Tightened borders on all tables.
Added A400 to list of camera models for which we know the initialization
  response.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7621 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 20:46:51 +00:00
Stephen H. Westin
eb17575800 Special case in canon_usb_dialog for long dialogues; don't try to get
their response length from the camera.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7620 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 20:41:41 +00:00
Stephen H. Westin
771d9c0648 Added CANON_USB_FUNCTION_FLASH_DEVICE_IDENT_2.
Added some comments on the command codes.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7619 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 20:40:16 +00:00
Stephen H. Westin
fa9c0bbad8 Interpret code 0x13 correctly, and differently for old and new cameras.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7618 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 20:38:53 +00:00
Stephen H. Westin
8af4c3bf9e unknown 4 (gleaned from Mac Info.plist file) should be 3080. It had
duplicated 3081.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7617 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 20:37:20 +00:00
Stephen H. Westin
7e9d008695 Moved PowerShot S400 (aka Digital IXUS 400) from class 4 to class 1.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7616 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 18:52:22 +00:00
Stephen H. Westin
2a371fcbe7 Corrected errors in initialization sequence.
Rewrote canon_usb_dialog() to be forgiving of replies that aren't
  the length we expect. We now try to check the length reported
  by the camera and use that when available.
Added some more code that some day will make the newer cameras
  (e.g. EOS 20D) work, I hope.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7615 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 17:48:12 +00:00
Stephen H. Westin
09e6a69d90 Added CANON_USB_FUNCTION_POWER_STATUS_2 to enum to make
usb.c compile.
Corrected expected length on "get picture abilities" for new protocol.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7614 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 17:45:16 +00:00
Stephen H. Westin
0bdc85e15d Greatly expanded manual text.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7613 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-03-04 17:42:38 +00:00