diff --git a/make/base-jail.sh b/make/base-jail.sh index 16d5474..d264155 100755 --- a/make/base-jail.sh +++ b/make/base-jail.sh @@ -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 diff --git a/src/camera.py b/src/camera.py index d7d0be9..ea23b01 100644 --- a/src/camera.py +++ b/src/camera.py @@ -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 diff --git a/src/main.py b/src/main.py index cee20b7..801337b 100644 --- a/src/main.py +++ b/src/main.py @@ -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 @@ -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')