diff --git a/etc/scanner_service.conf b/etc/scanner_service.conf
index cdae740..70fde26 100644
--- a/etc/scanner_service.conf
+++ b/etc/scanner_service.conf
@@ -4,9 +4,9 @@ programs=webUI,planification,services
[program:webUI]
process_name=%(program_name)s
priority=500
-directory=/home/rpi4/PlanarianScanner/test_tube_scanner
+directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
command=
- /home/rpi4/PlanarianScanner/.venv/bin/daphne
+ /home/rpi4/django-test-tube-scanner/.venv/bin/daphne
-b 0.0.0.0
-p 8000
home.asgi:application
@@ -21,8 +21,8 @@ redirect_stderr=true
[program:planification]
process_name=%(program_name)s
priority=800
-directory=/home/rpi4/PlanarianScanner/test_tube_scanner
-command=/home/rpi4/PlanarianScanner/.venv/bin/celery -A home beat -l info
+directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
+command=/home/rpi4/django-test-tube-scanner/.venv/bin/celery -A home beat -l info
user=rpi4
group=rpi4
stopasgroup=true
@@ -34,8 +34,8 @@ redirect_stderr=true
[program:services]
process_name=%(program_name)s
priority=900
-directory=/home/rpi4/PlanarianScanner/test_tube_scanner
-command=/home/rpi4/PlanarianScanner/run-workers.sh
+directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
+command=/home/rpi4/django-test-tube-scanner/run-workers.sh
user=rpi4
group=rpi4
stopasgroup=true
diff --git a/run-workers.sh b/run-workers.sh
index 388a705..44fc14e 100755
--- a/run-workers.sh
+++ b/run-workers.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-
-APP_DIR="/home/rpi4/PlanarianScanner"
+APP_DIR="/home/rpi4/django-test-tube-scanner"
+#APP_DIR="/home/rpi4/PlanarianScanner"
cd "$APP_DIR/test_tube_scanner"
diff --git a/test_tube_scanner/modules/grbl.py b/test_tube_scanner/modules/grbl.py
index c4731b7..c6063ab 100644
--- a/test_tube_scanner/modules/grbl.py
+++ b/test_tube_scanner/modules/grbl.py
@@ -344,8 +344,8 @@ class GridScanner:
"[%02d/%02d] row=%d col=%d → X=%.1f mm Y=%.1f mm",
cell, max_cells, row, col, x, y,
)
- if cell>1:
- self.grbl.move_to(x, y, feed=self.feed)
+
+ self.grbl.move_to(x, y, feed=self.feed)
uuid = f'{self.proc.session}-{position}-{self.row_to_char[row]}{col+1}'
self._capture(uuid, self.duration, self.stop_playing)
diff --git a/test_tube_scanner/scanner/templates/scanner/base.html b/test_tube_scanner/scanner/templates/scanner/base.html
index b096b0e..745ddb1 100644
--- a/test_tube_scanner/scanner/templates/scanner/base.html
+++ b/test_tube_scanner/scanner/templates/scanner/base.html
@@ -90,7 +90,7 @@
{% trans "Logs des planifications" %}
- {% trans "Logs des workers" %}
+ {% trans "Logs des services" %}
{% trans "Calibration" %}
diff --git a/test_tube_scanner/scanner/views.py b/test_tube_scanner/scanner/views.py
index c0d00e2..6af9743 100644
--- a/test_tube_scanner/scanner/views.py
+++ b/test_tube_scanner/scanner/views.py
@@ -12,7 +12,7 @@ from reduct.time import unix_timestamp_to_iso
from modules.system_stats import get_cached_stats, start_background_updater
from modules import reductstore
-from .tasks import download_video, export_images, export_videos, export_all_images, export_all_videos
+from .tasks import download_video, export_all_images, export_all_videos
from .process import CameraRecordManager, cameraDB
from . import models
@@ -63,11 +63,11 @@ def supervisor_view(request):
@login_required
def supervisor_worker(request):
- return render(request, "scanner/iframe.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:workers'))
+ return render(request, "scanner/iframe.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:services'))
@login_required
def supervisor_scheduler(request):
- return render(request, "scanner/iframe.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:beat'))
+ return render(request, "scanner/iframe.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:planification'))
## Mainboard
@login_required