Merge branch 'main' into pr/45

IQTLabs · Mar 24, 2024 · bc71895 · bc71895
2 parents 727ea5f + eb28030
commit bc71895
Show file tree

Hide file tree

Showing 23 changed files with 3,129 additions and 971 deletions.
diff --git a/.gitignore b/.gitignore
@@ -131,6 +131,7 @@ dmypy.json
 # Developer files
 *~
 *#
+.archive
 .bashrc
 .dir-locals.el
 .DS_Store

diff --git a/axis-ptz-controller.env b/axis-ptz-controller.env
@@ -23,17 +23,20 @@ LOOP_INTERVAL=0.1
 CAPTURE_INTERVAL=2
 CAPTURE_DIR=/data/tosort
 LEAD_TIME=0.5
-YAW=0.0
-PITCH=0.0
-ROLL=0.0
+TRIPOD_YAW=0.0
+TRIPOD_PITCH=0.0
+TRIPOD_ROLL=0.0
 PAN_GAIN=6.0
 PAN_RATE_MIN=1.8
 PAN_RATE_MAX=150.0
 TILT_GAIN=30.0
 TILT_RATE_MIN=1.8
 TILT_RATE_MAX=150.0
-FOCUS_SLOPE=0.0006
-FOCUS_INTERCEPT=54
+ZOOM=6000
+FOCUS=8749
+FOCUS_MIN=1749
+FOCUS_MAX=9999
+HYPERFOCAL_DISTANCE=22500.0
 JPEG_RESOLUTION=1920x1080
 JPEG_COMPRESSION=5
 USE_MQTT=True

diff --git a/axis-ptz-controller/Dockerfile b/axis-ptz-controller/Dockerfile
@@ -1,5 +1,5 @@
 FROM iqtlabs/edgetech-core:latest
-RUN pip3 install poetry==1.5.1
+RUN pip3 install poetry==1.8.2
 
 COPY ./pyproject.toml .
 COPY ./poetry.lock .