diff --git a/camera.py b/camera.py index 25f31cc..694f59a 100644 --- a/camera.py +++ b/camera.py @@ -24,7 +24,7 @@ def main(): camera.start_recording(output, format='mjpeg') try: server = ps.Streamer(address, StreamProps) - print('Server started at','http://'+address[0]+':'+str(address[1])) + print('Camera serving started at','http://'+address[0]+':'+str(address[1])) server.serve_forever() finally: camera.stop_recording() diff --git a/main.py b/main.py index 4fb2726..70be027 100644 --- a/main.py +++ b/main.py @@ -2,40 +2,7 @@ from flask import Flask import RPi.GPIO as gpio from time import sleep import subprocess -import picamera -import pyshine as ps # pip3 install pyshine==0.0.9 -# Camera server -def camera(): - HTML=""" - - - PyShine Live Streaming - - - -

PyShine Live Streaming using OpenCV

-
- - - """ - - StreamProps = ps.StreamProps - StreamProps.set_Page(StreamProps,HTML) - address = ('0.0.0.0',9000) # Enter your IP address - StreamProps.set_Mode(StreamProps,'picamera') - with picamera.PiCamera(resolution='640x480', framerate=30) as camera: - output = ps.StreamOut() - StreamProps.set_Output(StreamProps,output) - camera.rotation = 90 - camera.start_recording(output, format='mjpeg') - try: - server = ps.Streamer(address, StreamProps) - print('Camera serving started at','http://'+address[0]+':'+str(address[1])) - server.serve_forever() - finally: - camera.stop_recording() - # MQ-135 gas sensor def stinker(): gpio.setmode(gpio.BCM)