Skip to content

Commit

Permalink
Merge pull request #1 from edwardbarnard/master
Browse files Browse the repository at this point in the history
Forward
  • Loading branch information
enkore committed Dec 24, 2012
2 parents f804674 + 63b5d6d commit ad4bbee
Show file tree
Hide file tree
Showing 12 changed files with 283 additions and 166 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -12,7 +12,7 @@ You have to install [libgphoto2](http://www.gphoto.org/proj/libgphoto2/). It sho

import piggyphoto

C = piggyphoto.camera()
C = piggyphoto.Camera()
print C.abilities
C.capture_preview('preview.jpg')
C.capture_image('image.jpg')
Expand Down
2 changes: 1 addition & 1 deletion autodetect.py
Expand Up @@ -4,5 +4,5 @@
print pp.library_version()

print "detected cameras:"
cameras = pp.cameraList(autodetect=True)
cameras = pp.CameraList(autodetect=True)
print cameras
4 changes: 3 additions & 1 deletion bulb.py
Expand Up @@ -5,7 +5,7 @@

# doesn't work...

C = pp.camera()
C = pp.Camera()
C.leave_locked()

#print C.abilities
Expand All @@ -25,5 +25,7 @@
#for i in range(10):
#C.capture_preview('preview.jpg')

C.close()

print "done"

7 changes: 7 additions & 0 deletions choices.py
@@ -0,0 +1,7 @@
import piggyphoto as pp

cam = pp.Camera()

print cam.config.main.capturesettings.shutterspeed.choices

cam.close()
4 changes: 3 additions & 1 deletion focus-snap.py
Expand Up @@ -18,7 +18,7 @@ def show(file):
main_surface.blit(picture, (0, 0))
pygame.display.flip()

C = piggyphoto.camera()
C = piggyphoto.Camera()
C.leave_locked()
C.capture_preview('preview.jpg')

Expand Down Expand Up @@ -53,3 +53,5 @@ def show(file):
Q = deque()
time.sleep(1)
looking_for_peak = True

C.close()
3 changes: 2 additions & 1 deletion list-config.py
@@ -1,6 +1,7 @@
import piggyphoto

C = piggyphoto.camera()
C = piggyphoto.Camera()
print C.abilities
C.list_config()

C.close()
3 changes: 2 additions & 1 deletion list-files.py
@@ -1,7 +1,8 @@
import piggyphoto
from pprint import pprint
C = piggyphoto.camera()
C = piggyphoto.Camera()

pprint(C.list_files("/store_00020001/DCIM/100CANON"))
pprint(C.list_folders("/store_00020001/DCIM/100CANON"))

C.close()

0 comments on commit ad4bbee

Please sign in to comment.