diff --git a/etc/scanner_service.conf b/etc/scanner_service.conf index 55d15da..70fde26 100644 --- a/etc/scanner_service.conf +++ b/etc/scanner_service.conf @@ -1,7 +1,7 @@ [group:test_tube] -programs=scanner,beat,workers +programs=webUI,planification,services -[program:scanner] +[program:webUI] process_name=%(program_name)s priority=500 directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner @@ -18,7 +18,7 @@ autostart=true autorestart=true redirect_stderr=true -[program:beat] +[program:planification] process_name=%(program_name)s priority=800 directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner @@ -31,7 +31,7 @@ autostart=true autorestart=true redirect_stderr=true -[program:workers] +[program:services] process_name=%(program_name)s priority=900 directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner diff --git a/test_tube_scanner/modules/grbl.py b/test_tube_scanner/modules/grbl.py index 88505b5..c4731b7 100644 --- a/test_tube_scanner/modules/grbl.py +++ b/test_tube_scanner/modules/grbl.py @@ -339,11 +339,13 @@ class GridScanner: x = self.xbase + col * self.dx y = self.ybase + row * self.dy cell += 1 + logger.info( "[%02d/%02d] row=%d col=%d → X=%.1f mm Y=%.1f mm", cell, max_cells, row, col, x, y, ) - self.grbl.move_to(x, y, feed=self.feed) + if cell>1: + 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/calibration.html b/test_tube_scanner/scanner/templates/scanner/calibration.html index f4e8a0d..c8bf5ae 100644 --- a/test_tube_scanner/scanner/templates/scanner/calibration.html +++ b/test_tube_scanner/scanner/templates/scanner/calibration.html @@ -67,10 +67,10 @@ {% trans 'Définir (dx, dy)' %}
-
-
-
-
+
+
+
+