diff --git a/etc/1-install-sys.sh b/etc/1-install-sys.sh index 0de4043..1bffaa6 100755 --- a/etc/1-install-sys.sh +++ b/etc/1-install-sys.sh @@ -2,7 +2,6 @@ echo "==== System installation for rpi" echo - sudo apt update sudo apt upgrade diff --git a/etc/2-cargo-reductstore-install.sh b/etc/2-cargo-reductstore-install.sh index fe7bd38..57e2877 100755 --- a/etc/2-cargo-reductstore-install.sh +++ b/etc/2-cargo-reductstore-install.sh @@ -11,4 +11,4 @@ cargo --version rustc --version cargo install reductstore -mkdir -p $HOME/medias +mkdir -p $HOME/medias \ No newline at end of file diff --git a/etc/3-install-samba-client.sh b/etc/3-install-samba-client.sh index 437268a..5a935d0 100755 --- a/etc/3-install-samba-client.sh +++ b/etc/3-install-samba-client.sh @@ -1,7 +1,6 @@ #!/bin/bash # Script d'installation et de configuration d'un client Samba sur Raspberry Pi 4 (Debian Trixie) - # Mise à jour des paquets echo "[1/5] Mise à jour des paquets..." sudo apt update && sudo apt upgrade -y diff --git a/etc/4-install_mariadb.sh b/etc/4-install_mariadb.sh index 4e99b50..a4b6c01 100755 --- a/etc/4-install_mariadb.sh +++ b/etc/4-install_mariadb.sh @@ -3,7 +3,6 @@ # Script d'installation et de configuration de MariaDB # Utilisation : source mariadb_config.sh && ./install_mariadb.sh - ENV_FILE="../test_tube_scanner/.env" source $ENV_FILE diff --git a/etc/5-install_adminer.sh b/etc/5-install_adminer.sh index 32b4739..d6f7be5 100755 --- a/etc/5-install_adminer.sh +++ b/etc/5-install_adminer.sh @@ -1,7 +1,6 @@ #!/bin/bash # Script d'installation d'Adminer avec Nginx (sans Apache) + détection automatique de PHP - # Mise à jour des paquets echo "[1/6] Mise à jour des paquets..." sudo apt update && sudo apt upgrade -y diff --git a/etc/6-install_django_app.sh b/etc/6-install_django_app.sh index e6efffe..0a4161d 100755 --- a/etc/6-install_django_app.sh +++ b/etc/6-install_django_app.sh @@ -4,7 +4,6 @@ # Mise à jour des paquets echo "installation de l'application django ..." echo - ETC="$(pwd)" APP_DIR=" ../test_tube_scanner" diff --git a/etc/db/configuration.json b/etc/db/configuration.json index e4afd62..2e7080b 100644 --- a/etc/db/configuration.json +++ b/etc/db/configuration.json @@ -1,2 +1 @@ - [{"model": "scanner.configuration", "pk": 1, "fields": {"name": "Configuration par défaut", "author": 1, "sidebar_width": "25%", "default_grid_columns": 3, "opencv_fourcc_format": "mp4v", "opencv_video_type": "mp4", "grbl_xmax": 350.0, "grbl_ymax": 250.0, "use_rpicam": true, "webcam_device_index": 2, "image_quality": 90, "video_jpeg_quality": 90, "video_frame_rate": 5.0, "video_width_capture": 2028, "video_height_capture": 1520, "calibration_crop_radius": 500, "calibration_default_multiwell": "HG", "calibration_default_feed": 1000, "calibration_default_step": 1.0, "calibration_default_duration": 3.0, "active": true}}] diff --git a/etc/db/multiwell.json b/etc/db/multiwell.json index 6ca1657..a3f2777 100644 --- a/etc/db/multiwell.json +++ b/etc/db/multiwell.json @@ -1 +1 @@ -[{"model": "scanner.multiwell", "pk": 2, "fields": {"label": "Haut gauche", "author": 1, "position": "HG", "default": false, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 2, "duration": 12, "xbase": 156.45, "ybase": 12.75, "dx": 19.3, "dy": 19.3, "feed": 1000, "well_position": true, "active": true}}, {"model": "scanner.multiwell", "pk": 3, "fields": {"label": "Haut droit", "author": 1, "position": "HD", "default": true, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 0, "duration": 3, "xbase": 10.963, "ybase": 15.825, "dx": 19.4, "dy": 19.4, "feed": 1000, "well_position": true, "active": true}}, {"model": "scanner.multiwell", "pk": 4, "fields": {"label": "Bas gauche", "author": 1, "position": "BG", "default": false, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 3, "duration": 12, "xbase": 150.15, "ybase": 112.55, "dx": 19.5, "dy": 19.5, "feed": 1000, "well_position": true, "active": true}}, {"model": "scanner.multiwell", "pk": 5, "fields": {"label": "Bas droit", "author": 1, "position": "BD", "default": false, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 1, "duration": 12, "xbase": 10.15, "ybase": 111.05, "dx": 19.55, "dy": 19.55, "feed": 1000, "well_position": true, "active": true}}] +[{"model": "scanner.multiwell", "pk": 2, "fields": {"label": "Haut gauche", "author": 1, "position": "HG", "default": false, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 2, "duration": 12, "xbase": 156.45, "ybase": 12.75, "dx": 19.3, "dy": 19.3, "feed": 1000, "well_position": true, "active": true}}, {"model": "scanner.multiwell", "pk": 3, "fields": {"label": "Haut droit", "author": 1, "position": "HD", "default": true, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 0, "duration": 3, "xbase": 10.963, "ybase": 15.825, "dx": 19.4, "dy": 19.4, "feed": 1000, "well_position": true, "active": true}}, {"model": "scanner.multiwell", "pk": 4, "fields": {"label": "Bas gauche", "author": 1, "position": "BG", "default": false, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 3, "duration": 12, "xbase": 150.15, "ybase": 112.55, "dx": 19.5, "dy": 19.5, "feed": 1000, "well_position": true, "active": true}}, {"model": "scanner.multiwell", "pk": 5, "fields": {"label": "Bas droit", "author": 1, "position": "BD", "default": false, "cols": 6, "rows": 4, "diameter": 16.0, "row_def": "A,B,C,D", "row_order": "D,C,B,A", "order": 1, "duration": 12, "xbase": 10.15, "ybase": 111.05, "dx": 19.55, "dy": 19.55, "feed": 1000, "well_position": true, "active": true}}] \ No newline at end of file diff --git a/etc/db/well.json b/etc/db/well.json index 1c32ba1..28b6d12 100644 --- a/etc/db/well.json +++ b/etc/db/well.json @@ -1 +1 @@ -[{"model": "scanner.well", "pk": 1, "fields": {"author": 1, "name": "A1"}}, {"model": "scanner.well", "pk": 2, "fields": {"author": 1, "name": "A2"}}, {"model": "scanner.well", "pk": 3, "fields": {"author": 1, "name": "A3"}}, {"model": "scanner.well", "pk": 4, "fields": {"author": 1, "name": "A4"}}, {"model": "scanner.well", "pk": 5, "fields": {"author": 1, "name": "A5"}}, {"model": "scanner.well", "pk": 6, "fields": {"author": 1, "name": "A6"}}, {"model": "scanner.well", "pk": 7, "fields": {"author": 1, "name": "B1"}}, {"model": "scanner.well", "pk": 8, "fields": {"author": 1, "name": "B2"}}, {"model": "scanner.well", "pk": 9, "fields": {"author": 1, "name": "B3"}}, {"model": "scanner.well", "pk": 10, "fields": {"author": 1, "name": "B4"}}, {"model": "scanner.well", "pk": 11, "fields": {"author": 1, "name": "B5"}}, {"model": "scanner.well", "pk": 12, "fields": {"author": 1, "name": "B6"}}, {"model": "scanner.well", "pk": 13, "fields": {"author": 1, "name": "C1"}}, {"model": "scanner.well", "pk": 14, "fields": {"author": 1, "name": "C2"}}, {"model": "scanner.well", "pk": 15, "fields": {"author": 1, "name": "C3"}}, {"model": "scanner.well", "pk": 16, "fields": {"author": 1, "name": "C4"}}, {"model": "scanner.well", "pk": 17, "fields": {"author": 1, "name": "C5"}}, {"model": "scanner.well", "pk": 18, "fields": {"author": 1, "name": "C6"}}, {"model": "scanner.well", "pk": 19, "fields": {"author": 1, "name": "D1"}}, {"model": "scanner.well", "pk": 20, "fields": {"author": 1, "name": "D2"}}, {"model": "scanner.well", "pk": 21, "fields": {"author": 1, "name": "D3"}}, {"model": "scanner.well", "pk": 22, "fields": {"author": 1, "name": "D4"}}, {"model": "scanner.well", "pk": 23, "fields": {"author": 1, "name": "D5"}}, {"model": "scanner.well", "pk": 24, "fields": {"author": 1, "name": "D6"}}] +[{"model": "scanner.well", "pk": 1, "fields": {"author": 1, "name": "A1"}}, {"model": "scanner.well", "pk": 2, "fields": {"author": 1, "name": "A2"}}, {"model": "scanner.well", "pk": 3, "fields": {"author": 1, "name": "A3"}}, {"model": "scanner.well", "pk": 4, "fields": {"author": 1, "name": "A4"}}, {"model": "scanner.well", "pk": 5, "fields": {"author": 1, "name": "A5"}}, {"model": "scanner.well", "pk": 6, "fields": {"author": 1, "name": "A6"}}, {"model": "scanner.well", "pk": 7, "fields": {"author": 1, "name": "B1"}}, {"model": "scanner.well", "pk": 8, "fields": {"author": 1, "name": "B2"}}, {"model": "scanner.well", "pk": 9, "fields": {"author": 1, "name": "B3"}}, {"model": "scanner.well", "pk": 10, "fields": {"author": 1, "name": "B4"}}, {"model": "scanner.well", "pk": 11, "fields": {"author": 1, "name": "B5"}}, {"model": "scanner.well", "pk": 12, "fields": {"author": 1, "name": "B6"}}, {"model": "scanner.well", "pk": 13, "fields": {"author": 1, "name": "C1"}}, {"model": "scanner.well", "pk": 14, "fields": {"author": 1, "name": "C2"}}, {"model": "scanner.well", "pk": 15, "fields": {"author": 1, "name": "C3"}}, {"model": "scanner.well", "pk": 16, "fields": {"author": 1, "name": "C4"}}, {"model": "scanner.well", "pk": 17, "fields": {"author": 1, "name": "C5"}}, {"model": "scanner.well", "pk": 18, "fields": {"author": 1, "name": "C6"}}, {"model": "scanner.well", "pk": 19, "fields": {"author": 1, "name": "D1"}}, {"model": "scanner.well", "pk": 20, "fields": {"author": 1, "name": "D2"}}, {"model": "scanner.well", "pk": 21, "fields": {"author": 1, "name": "D3"}}, {"model": "scanner.well", "pk": 22, "fields": {"author": 1, "name": "D4"}}, {"model": "scanner.well", "pk": 23, "fields": {"author": 1, "name": "D5"}}, {"model": "scanner.well", "pk": 24, "fields": {"author": 1, "name": "D6"}}] \ No newline at end of file diff --git a/etc/install-linux-samba-server.sh b/etc/install-linux-samba-server.sh index 84f33ee..738d4fd 100755 --- a/etc/install-linux-samba-server.sh +++ b/etc/install-linux-samba-server.sh @@ -1,7 +1,6 @@ #!/bin/bash # Script d'installation et de configuration d'un serveur Samba sur Debian Trixie - # Mise à jour des paquets echo "[1/6] Mise à jour des paquets..." apt update && apt upgrade -y diff --git a/etc/reductstore_service.conf b/etc/reductstore_service.conf index 1e55d59..9462fdf 100644 --- a/etc/reductstore_service.conf +++ b/etc/reductstore_service.conf @@ -1,4 +1,3 @@ - [program:reductstore] process_name=%(program_name)s priority=10 diff --git a/etc/requirements.txt b/etc/requirements.txt index 57d4fda..c3abd26 100644 --- a/etc/requirements.txt +++ b/etc/requirements.txt @@ -19,3 +19,4 @@ opencv-python-headless mysqlclient psycopg2 pyserial + diff --git a/etc/scanner_service.conf b/etc/scanner_service.conf index cdae740..775cf02 100644 --- a/etc/scanner_service.conf +++ b/etc/scanner_service.conf @@ -1,6 +1,7 @@ [group:test_tube] programs=webUI,planification,services + [program:webUI] process_name=%(program_name)s priority=500 diff --git a/etc/supervisor-inet_http.conf b/etc/supervisor-inet_http.conf index b4c9812..a876d12 100644 --- a/etc/supervisor-inet_http.conf +++ b/etc/supervisor-inet_http.conf @@ -1,4 +1,4 @@ [inet_http_server] port=*:9001 username=root - password=toor + password=toor \ No newline at end of file diff --git a/test_tube_scanner/scanner/process.py b/test_tube_scanner/scanner/process.py index ce9c1b3..5e99cda 100644 --- a/test_tube_scanner/scanner/process.py +++ b/test_tube_scanner/scanner/process.py @@ -1,4 +1,3 @@ -# # process.py import os os.environ['OPENCV_LOG_LEVEL']="0"