diff --git a/config/machine_settings/hostnames.ini b/config/machine_settings/hostnames.ini index 13a589e..eca000e 100644 --- a/config/machine_settings/hostnames.ini +++ b/config/machine_settings/hostnames.ini @@ -16,3 +16,4 @@ st-ten-14: st-ten-14 st-ten-15: st-ten-15 test-linux: test-linux Dell06:st-ten-3 +ST-TEN-16: st-ten-16 diff --git a/config/machine_settings/st-ten-16.ini b/config/machine_settings/st-ten-16.ini new file mode 100644 index 0000000..7925f32 --- /dev/null +++ b/config/machine_settings/st-ten-16.ini @@ -0,0 +1,99 @@ +[machine] +description = ST-TEN-16 raccordati +instruction_folder = st-ten-16 +image_for_warning= st-ten-16 + +[hardware_config] +archive_synchronizer: present +archive_synchronizer_extra: absent +uvc_camera: absent +label_printer: present +neo_pixels: absent +remote_api: absent +tecna_t3: present +vision_saver: absent +vision: absent +screwdriver: absent +digital_io: absent +barcode_recipe_selection: absent +fixture_id: absent +discard_box: absent +second_leak_test:absent +dual_channel: absent +#enforce_piece_removal: yes + +[tecna_t3] +port: /dev/ttyUSB0 +model: t3P + +[archive_synchronizer_extra] +portal_address: http://172.20.3.13:45022/ +poll_time: 10 +hold_time: 10 + +[label_printer] +platform: linux +printer: ZTC-ZD421-203dpi-ZPL +risoluzione:203 + + +[recipe] +recipe_name_field: codice_ricetta +part_number_field: codice_ricetta +label_template_field: modello_etichetta +description_field: descrizione + +[recipes_defaults] +tester_discharge_enable: yes +dimensione_lotto_abilitata: x +tempo_pre_riempimento: 0 +pressione_pre_riempimento: 1000 +tempo_riempimento: 15 +tempo_assestamento: 15 +tempo_di_test: 10 +n_componenti:1 +percentuale_minima_pressione_assestamento: 5 +percentuale_massima_pressione_assestamento: 5 +pressione_di_test_delta_minimo: 30 +pressione_di_test: 7000 +pressione_di_test_delta_massimo: 30 +tempo_svuotamento: 0 +pressione_svuotamento: 100 +canale_di_prova: 1 +prova_tenuta_abilitata_2: +tempo_pre_riempimento_2: 0 +pressione_pre_riempimento_2: 1000 +tempo_riempimento_2: 20 +tempo_assestamento_2: 20 +tempo_di_test_2: 10 +percentuale_minima_pressione_assestamento_2: 5 +percentuale_massima_pressione_assestamento_2: 5 +pressione_di_test_delta_minimo_2: 30 +pressione_di_test_2: 1000 +pressione_di_test_delta_massimo_2: 30 +tempo_svuotamento_2: 0 +pressione_svuotamento_2: 100 +canale_di_prova_2: 2 +modello_etichetta: EtichettaR5_Montaggio_1prova.prn +pid_pressure_correction: 100 +istruzione_abilitata_extra: +slow_pid: + +[autotest_leak] +enabled: true +pre_filling_time: 0 +pre_filling_pressure: 1000 +filling_time: 10 +settling_time: 10 +settling_pressure_min_percent: 5 +settling_pressure_max_percent: 5 +test_pressure: 7000 +test_time: 10 +test_pressure_qpos: 16 #Q+ Upper test leak limit +test_pressure_qneg: 24 #Q- Lower test leak limit +test_pressure_tt_qpos: 1 # Q+ Upper test leak limit (tube-tube) +test_pressure_tt_qneg: 5 # Q- Lower test leak limit (tube-tube) +flush_time: 1 +flush_pressure: 100 +relay_config: 1 +pid_pressure_correction: 100 \ No newline at end of file diff --git a/make_desktop_file.sh b/make_desktop_file.sh index d92389a..2e3e49d 100644 --- a/make_desktop_file.sh +++ b/make_desktop_file.sh @@ -9,6 +9,6 @@ Exec=bash $here/runme.sh Icon=$here/src/ui/imgs/neo.ico Terminal=false Type=Application -Categories=Application;" > "$HOME/.local/share/applications/ST-TEN-13.desktop" +Categories=Application;" > "$HOME/.local/share/applications/ST-TEN-16.desktop" -ln -f -s "$HOME/.local/share/applications/ST-TEN-13.desktop" "$HOME/Scrivania/ST-TEN-13.desktop" +ln -f -s "$HOME/.local/share/applications/ST-TEN-16.desktop" "$HOME/Scrivania/ST-TEN-16.desktop" diff --git a/src/lib/db/models/base_model.py b/src/lib/db/models/base_model.py index 6afc1f5..bc2d080 100644 --- a/src/lib/db/models/base_model.py +++ b/src/lib/db/models/base_model.py @@ -1,29 +1,25 @@ import os - -from peewee import Model -from playhouse.sqlite_ext import SqliteExtDatabase +from peewee import Model, SqliteDatabase db_path = "./data/database" os.makedirs(db_path, exist_ok=True) -db = SqliteExtDatabase( +db = SqliteDatabase( db_path + "/sqlite.db", - pragmas={ # see https://www.sqlite.org/pragma.html + pragmas={ "auto_vacuum": 1, "busy_timeout": 5000, "cache_size": round(-64e3), "foreign_keys": 1, "ignore_check_constraints": 0, "journal_mode": "wal", - "synchronous": 1, # Changed from 0 to 1 (NORMAL) for better data integrity + "synchronous": 1, }, timeout=5 ) - class BaseModel(Model): """A base model that will use our Sqlite database.""" class Meta: - global db - database = db + database = db \ No newline at end of file