scan

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
+directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
-command=/home/rpi4/PlanarianScanner/.venv/bin/celery -A home beat -l info
+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
+directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
-command=/home/rpi4/PlanarianScanner/run-workers.sh
+command=/home/rpi4/django-test-tube-scanner/run-workers.sh
 user=rpi4
 group=rpi4
 stopasgroup=true

run-workers.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-
+APP_DIR="/home/rpi4/django-test-tube-scanner"
-APP_DIR="/home/rpi4/PlanarianScanner"
+#APP_DIR="/home/rpi4/PlanarianScanner"
 
 cd "$APP_DIR/test_tube_scanner"
 

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)

test_tube_scanner/scanner/templates/scanner/base.html

@@ -90,7 +90,7 @@
                      <i class="fa-regular fa-file-lines w3-text-orange"></i> {% trans "Logs des planifications" %}
                 </a>   
                 <a href="{% url 'scanner:logs_worker' %}"  class="w3-bar-item w3-btn w3-hover-opacity w3-margin-left">
-                     <i class="fa-regular fa-file-lines w3-text-amber"></i> {% trans "Logs des workers" %}
+                     <i class="fa-regular fa-file-lines w3-text-amber"></i> {% trans "Logs des services" %}
                 </a>                              
 	            <a href="{% url 'scanner:calibration' %}"  class="w3-bar-item w3-btn w3-hover-opacity w3-margin-left">
 	                <i class="fa-solid fa-wrench w3-text-red"></i> {% trans "Calibration" %}

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