Skip to content

restore various functionality #1

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

Merged
merged 3 commits into from
Jul 31, 2023
Merged

restore various functionality #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
721e7d4
enable special effects again
jepler Jul 31, 2023
6f21d07
clean up leftover lines from the old way of capturing
jepler Jul 31, 2023
acbce44
restore onionskin stop motion mode and animated gif mode
jepler Jul 31, 2023
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
17 changes: 8 additions & 9 deletions adafruit_pycamera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import board
from digitalio import DigitalInOut, Direction, Pull
from adafruit_debouncer import Debouncer
import bitmaptools
import busio
import adafruit_lis3dh
import neopixel
Expand Down Expand Up @@ -76,7 +77,7 @@ class PyCamera:
espcamera.FrameSize.QSXGA,
]

effects = ("Normal", "Negative", "Grayscale", "Reddish", "Greenish", "Bluish", "Sepia", "Overexp", "Solarize")
effects = ("Normal", "Invert", "B&W", "Reddish", "Greenish", "Bluish", "Sepia")
modes = ("JPEG", "GIF", "STOP")

_AW_DOWN = const(15)
Expand Down Expand Up @@ -135,7 +136,7 @@ def __init__(self) -> None:

self.splash = displayio.Group()
self._sd_label = label.Label(terminalio.FONT, text="SD ??", color=0x0, x=180, y=10, scale=2)
self._effect_label = label.Label(terminalio.FONT, text="", color=0xFFFFFF, x=4, y=10, scale=2)
self._effect_label = label.Label(terminalio.FONT, text="EFFECT", color=0xFFFFFF, x=4, y=10, scale=2)
self._mode_label = label.Label(terminalio.FONT, text="MODE", color=0xFFFFFF, x=150, y=10, scale=2)

# AW9523 GPIO expander
Expand Down Expand Up @@ -227,8 +228,6 @@ def __init__(self) -> None:
self.right = Debouncer(self.right_pin)

self._bigbuf = None
self._bitmap1 = displayio.Bitmap(240, 176, 65535)
self._bitmap2 = displayio.Bitmap(240, 176, 65535)

self._topbar = displayio.Group()
self._res_label = label.Label(terminalio.FONT, text="", color=0xFFFFFF, x=0, y=10, scale=2)
Expand All @@ -245,8 +244,8 @@ def __init__(self) -> None:
self.display.refresh()

#self.camera.colorbar = True
#self.effect = microcontroller.nvm[_NVM_EFFECT]
#self.camera.saturation = 3
self.effect = microcontroller.nvm[_NVM_EFFECT]
self.camera.saturation = 3
self.resolution = microcontroller.nvm[_NVM_RESOLUTION]
self.mode = microcontroller.nvm[_NVM_MODE]
print("init done @", time.monotonic()-self.t)
Expand Down Expand Up @@ -301,7 +300,7 @@ def effect(self, setting):
setting = (setting + len(self.effects)) % len(self.effects)
self._effect = setting
self._effect_label.text = self.effects[setting]
self.camera.effect = setting
self.camera.special_effect = setting
microcontroller.nvm[_NVM_EFFECT] = setting
self.display.refresh()

Expand Down Expand Up @@ -473,10 +472,10 @@ def capture_jpeg(self):

def continuous_capture_start(self):
self._bitmap1 = self.camera.take(1)
#self.camera._imagecapture.continuous_capture_start(self._bitmap1, self._bitmap2)

def capture_into_bitmap(self, bitmap):
self.camera.capture(bitmap)
self._bitmap1 = self.camera.take(1)
bitmaptools.blit(bitmap, self._bitmap1, 0, 0)

def continuous_capture(self):
return self.camera.take(1)
Expand Down
6 changes: 2 additions & 4 deletions code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import adafruit_pycamera
import displayio
import gifio
#import ulab.numpy as np
import ulab.numpy as np
import bitmaptools


Expand All @@ -21,16 +21,14 @@
last_frame = displayio.Bitmap(pycam.camera.width, pycam.camera.height, 65535)
onionskin = displayio.Bitmap(pycam.camera.width, pycam.camera.height, 65535)
while True:
"""
if (pycam.mode_text == "STOP" and pycam.stop_motion_frame != 0):
# alpha blend
new_frame = pycam.continuous_capture()
bitmaptools.alphablend(onionskin, last_frame, new_frame,
displayio.Colorspace.RGB565_SWAPPED)
pycam.blit(onionskin)
else:
"""
pycam.blit(pycam.continuous_capture())
pycam.blit(pycam.continuous_capture())
#print("\t\t", capture_time, blit_time)

pycam.keys_debounce()
Expand Down