darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2001-11-05 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* camlibs/polaroid/pdc700.c: Timeout = 2sec, try each speed 2 times.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2915 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-11-05 15:00:54 +00:00
parent bd18ace7d3
commit 0b31ba02c1
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2001-11-05 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* camlibs/polaroid/pdc700.c: Timeout = 2sec, try each speed 2 times.
2001-11-05 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* camlibs/sierra/PROTOCOL: Updated (upload).

9
camlibs/polaroid/pdc700.c
View File

@@ -396,19 +396,22 @@ camera_init (Camera *camera)
/* Check if the camera is really there */
CHECK_RESULT (gp_port_get_settings (camera->port, &settings));
CHECK_RESULT (gp_port_set_timeout (camera->port, 1000));
CHECK_RESULT (gp_port_set_timeout (camera->port, 2000));
for (i = 0; i < 5; i++) {
settings.serial.speed = speeds[i];
CHECK_RESULT (gp_port_set_settings (camera->port, settings));
result = pdc700_init (camera->port);
if (result == GP_OK)
break;
result = pdc700_init (camera->port);
if (result == GP_OK)
break;
}
if (i == 4)
if (i == 5)
return (result);
/* Set the speed to the highest one */
if (speeds[i] != 57600) {
if (speeds[i] < 57600) {
CHECK_RESULT (pdc700_baud (camera->port, 57600));
settings.serial.speed = 57600;
CHECK_RESULT (gp_port_set_settings (camera->port, settings));