Skip to content

Commit 2383725

Browse files
committed
Merge branch 'develop'
2 parents d0901c5 + ae0336b commit 2383725

File tree

4 files changed

+21
-22
lines changed

4 files changed

+21
-22
lines changed

coderbot/cv/image.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ class Image():
3939
_aruco_dict = cv2.aruco.Dictionary_get(cv2.aruco.DICT_ARUCO_ORIGINAL)
4040
_aruco_parameters = cv2.aruco.DetectorParameters_create()
4141

42-
#_face_cascade = cv2.CascadeClassifier('/usr/local/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml')
43-
_face_cascade = cv2.CascadeClassifier('/usr/share/opencv/lbpcascades/lbpcascade_frontalface.xml')
42+
_face_cascade = cv2.CascadeClassifier(cv2.data.haarcascades + 'haarcascade_frontalface_default.xml')
4443

4544
def __init__(self, array):
4645
self._data = array

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM coderbot/rpi-debian:bullseye-20220923
1+
FROM coderbot/rpi-debian:bullseye-20240227
22

33
ENV QEMU_CPU=max
44
ENV DEBIAN_FRONTEND=noninteractive

docker/stub/requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# API framework
22
connexion==2.14.2
3-
Flask==2.2.3
3+
Flask==2.2.5
44
Flask-Cors==3.0.10
5-
tinydb==4.7.1
5+
tinydb==4.8.0
66
Werkzeug==2.2.3
77

88
# Misc utils
9-
setuptools==67.4.0
9+
setuptools==69.2.0
1010
event-channel==0.4.3
1111

1212
# IO extensions
13-
spidev==3.5
13+
spidev==3.6
1414

1515
# Audio
1616
sox==1.4.1
1717

1818
# Computer Vision
19-
grpcio==1.48.1
20-
numpy==1.24.2
21-
Pillow==9.4.0
22-
protobuf==4.22.0
19+
grpcio==1.62.1
20+
numpy==1.26.4
21+
Pillow==10.2.0
22+
protobuf==4.25.2
2323
opencv-contrib-python==4.5.5.62
2424
tflite-runtime==2.11.0
2525
pytesseract==0.3.10

requirements.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
# API framework
22
connexion==2.14.2
3-
Flask==2.2.3
3+
Flask==2.2.5
44
Flask-Cors==3.0.10
5-
tinydb==4.7.1
5+
tinydb==4.8.0
66
Werkzeug==2.2.3
77

88
# Misc utils
9-
setuptools==67.4.0
9+
setuptools==69.2.0
1010
event-channel==0.4.3
1111

1212
# IO extensions
1313
pigpio==1.78
14-
smbus2==0.4.2
15-
spidev==3.5
14+
smbus2==0.4.3
15+
spidev==3.6
1616

1717
# Audio
1818
sox==1.4.1
19-
PyAudio==0.2.12
20-
pyalsaaudio==0.9.2
19+
PyAudio==0.2.14
20+
pyalsaaudio==0.10.0
2121

2222
# Computer Vision
23-
grpcio==1.48.1
24-
numpy==1.24.2
25-
Pillow==9.4.0
26-
protobuf==4.22.0
23+
grpcio==1.62.1
24+
numpy==1.26.4
25+
Pillow==10.2.0
26+
protobuf==4.25.2
2727
opencv-contrib-python==4.5.5.62
2828
tflite-runtime==2.11.0
2929
pytesseract==0.3.10

0 commit comments

Comments
 (0)