Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Comment out iso_to_av96 and update cython version #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Comment out iso_to_av96 and update cython version #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a906df2
make Cython meet kivy's minimum reqs
Apr 3, 2017
b6a71b0
iso_to_sv96 changed to iso_to_av96
Apr 10, 2017
4f6cf9c
chdkptp.py interface changed, comment out config
Apr 10, 2017
8e61f5a
use local filesystem if disk is not present
Apr 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion make/base-jail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ apt-get -y --force-yes install \
pkg-config libgl1-mesa-dev libgles2-mesa-dev \
libgstreamer1.0-dev \
gstreamer1.0-plugins-{bad,base,good,ugly} \
gstreamer1.0-{omx,alsa} python-dev cython
gstreamer1.0-{omx,alsa} python-dev
apt-get -y --force-yes install libmtdev1

pip install -I Cython==0.23
pip install git+https://github.com/kivy/kivy.git@master

apt-get clean
Expand Down
3 changes: 2 additions & 1 deletion src/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ def capture(self):

def makeOptions(self):
options = {}
options['svm'] = chdkptp.util.iso_to_sv96(100)
# TODO: the Lua API for this function changed. this method no longer works with chdkptp.py HEAD
#options['svm'] = chdkptp.util.iso_to_av96(100)
options['tv'] = chdkptp.util.shutter_to_tv96(self.calculate_shutter())
options['nd'] = 2
options['fformat'] = 1
Expand Down
4 changes: 2 additions & 2 deletions src/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ def update(self, dt):
waitString = 'Syncing to disk. Waiting %0.0f more seconds before force ejecting.' % timeLeft
self.syncWait += dt
self.powerOff.text = waitString + ' [color=ff3333]Do not power off.[/color]'
self.manager.mountPoint = None
self.manager.mountPoint = "/home/pi/logs"
if ((odd.camera is not None and odd.camera.is_connected()) or
(even.camera is not None and even.camera.is_connected())):
self.cameraOffButton.opacity = 1.0
Expand All @@ -411,7 +411,7 @@ def keyPress(self, key):

def beginAction(self):
self.manager.transition.direction = 'left'
self.manager.current = 'configure-disk'
self.manager.current = 'configure-camera'

def quitAction(self):
os.system('killall run-pi-scan.sh python')
Expand Down