denis/PlanarianScanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correction calibration

Browse Source
This commit is contained in:
denis
2026-04-14 13:19:08 +02:00
parent 0cb9a670c9
commit c5f9b4bef1
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/scanner_service.conf
+4 -4
View File
@@ -1,7 +1,7 @@
[group:test_tube] [group:test_tube]
programs=scanner,beat,workers programs=webUI,planification,services
[program:scanner] [program:webUI]
process_name=%(program_name)s process_name=%(program_name)s
priority=500 priority=500
directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
@@ -18,7 +18,7 @@ autostart=true
autorestart=true autorestart=true
redirect_stderr=true redirect_stderr=true
[program:beat] [program:planification]
process_name=%(program_name)s process_name=%(program_name)s
priority=800 priority=800
directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
@@ -31,7 +31,7 @@ autostart=true
autorestart=true autorestart=true
redirect_stderr=true redirect_stderr=true
[program:workers] [program:services]
process_name=%(program_name)s process_name=%(program_name)s
priority=900 priority=900
directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner directory=/home/rpi4/django-test-tube-scanner/test_tube_scanner
test_tube_scanner/modules/grbl.py
+3 -1
View File
@@ -339,11 +339,13 @@ class GridScanner:
x = self.xbase + col * self.dx x = self.xbase + col * self.dx
y = self.ybase + row * self.dy y = self.ybase + row * self.dy
cell += 1 cell += 1
logger.info( logger.info(
"[%02d/%02d] row=%d col=%d → X=%.1f mm Y=%.1f mm", "[%02d/%02d] row=%d col=%d → X=%.1f mm Y=%.1f mm",
cell, max_cells, row, col, x, y, 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}' uuid = f'{self.proc.session}-{position}-{self.row_to_char[row]}{col+1}'
self._capture(uuid, self.duration, self.stop_playing) self._capture(uuid, self.duration, self.stop_playing)
test_tube_scanner/scanner/templates/scanner/calibration.html
+4 -4
View File
@@ -67,10 +67,10 @@
<i class="fa-solid fa-left-right"></i> {% trans 'Définir (dx, dy)' %} <i class="fa-solid fa-left-right"></i> {% trans 'Définir (dx, dy)' %}
</button> </button>
<hr> <hr>
<div><button id="_up" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2191; {% trans 'En haut' %}</button></div> <div><button id="_up" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2191; +Y {% trans 'En haut' %}</button></div>
<div><button id="_left" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2190; {% trans 'A gauches' %}</button></div> <div><button id="_left" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2190; -X {% trans 'A gauches' %}</button></div>
<div><button id="_right" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2192; {% trans 'A droite' %}</button></div> <div><button id="_right" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2192; +X {% trans 'A droite' %}</button></div>
<div><button id="_down" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2193; {% trans 'En Bas' %}</button></div> <div><button id="_down" class="w3-button w3-dark-xlight w3-round-large w3-margin-small w3-block">&#x2193; -Y {% trans 'En Bas' %}</button></div>
<hr> <hr>
<button id="_xy-base" class="w3-button w3-warning w3-round-large w3-margin-small w3-block">{% trans 'Définir base ' %}</button> <button id="_xy-base" class="w3-button w3-warning w3-round-large w3-margin-small w3-block">{% trans 'Définir base ' %}</button>
</div> </div>