Skip to content

Commit 8e6cdda

Browse files
committed
Move PiCamera settings to configuration.py
1 parent 1ef8c0f commit 8e6cdda

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

autonomous.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import sys
55
import io
66
import picamera
7+
import configuration
78
from predict import Predictor
89
import helpers.motor_driver as motor_driver_helper
910
import helpers.image as image_helper
@@ -12,9 +13,9 @@ def autonomous_control(model):
1213
"""Run the car autonomously"""
1314
predictor = Predictor(model)
1415
with picamera.PiCamera() as camera:
15-
camera.resolution = (640, 480)
16-
camera.framerate = 60
17-
time.sleep(2)
16+
camera.resolution = configuration.PICAMERA_RESOLUTION
17+
camera.framerate = configuration.PICAMERA_FRAMERATE
18+
time.sleep(configuration.PICAMERA_WARM_UP_TIME)
1819
pwm = motor_driver_helper.get_pwm_imstance()
1920
motor_driver_helper.start_pwm(pwm)
2021
forward_cycle_count = left_cycle_count = right_cycle_count = 0

configuration.py

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
"""Configurations for the RC car"""
22

3+
PICAMERA_RESOLUTION_WIDTH = 640
4+
PICAMERA_RESOLUTION_HEIGHT = 480
5+
PICAMERA_RESOLUTION = (PICAMERA_RESOLUTION_WIDTH, PICAMERA_RESOLUTION_HEIGHT)
6+
PICAMERA_FRAMERATE = 60
7+
PICAMERA_WARM_UP_TIME = 2
8+
39
BACK_MOTOR_DATA_ONE = 17
410
BACK_MOTOR_DATA_TWO = 27
511
BACK_MOTOR_ENABLE_PIN = 22

interactive_control_train.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ def interactive_control():
4444
setup_interactive_control()
4545
clock = pygame.time.Clock()
4646
with picamera.PiCamera() as camera:
47-
camera.resolution = (640, 480)
48-
camera.framerate = 60
49-
time.sleep(2)
47+
camera.resolution = configuration.PICAMERA_RESOLUTION
48+
camera.framerate = configuration.PICAMERA_FRAMERATE
49+
time.sleep(configuration.PICAMERA_WARM_UP_TIME)
5050
# GPIO.output(BACK_MOTOR_ENABLE_PIN, True)
5151
pwm = motor_driver_helper.get_pwm_imstance()
5252
motor_driver_helper.start_pwm(pwm)

predict.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from scipy.misc import imresize
1010
from sigmoid import sigmoid
1111
from configuration import CLASSIFICATION_LABELS, IMAGE_DIMENSIONS
12+
from configuration import PICAMERA_RESOLUTION_WIDTH, PICAMERA_RESOLUTION_HEIGHT
1213

1314
class Predictor:
1415
"""Predictor class for determining direction"""
@@ -52,7 +53,7 @@ def change_model(self, model):
5253
def _convert_stream_to_array(stream):
5354
stream.seek(0)
5455
image = Image.open(stream).convert('L')
55-
image = image.crop((0, 240, 640, 480))
56+
image = image.crop((0, PICAMERA_RESOLUTION_HEIGHT / 2, PICAMERA_RESOLUTION_WIDTH, PICAMERA_RESOLUTION_HEIGHT))
5657
image_array = asarray(image)
5758
resized_image_array = imresize(image_array, IMAGE_DIMENSIONS)
5859
input_layer_size = resized_image_array.flatten().shape[0]

0 commit comments

Comments
 (0)