Commit Graph

585 Commits

Author SHA1 Message Date
STTEN8
f5cfa21424 stten8 save 2025-02-20 13:13:21 +01:00
1e57600026 Merge remote-tracking branch 'origin/master' 2025-02-19 15:07:14 +01:00
e63e34efdc dev tbt label 203 and 300 dpi selector 2025-02-19 15:07:00 +01:00
ST-TEN12
dff59920be read tecna recipes retry 2025-02-18 12:28:16 +01:00
0543345c0d dev tbt label 203 and 300 dpi selector 2025-02-17 18:17:39 +01:00
4708a01199 dev tbt label 203 and 300 dpi selector 2025-02-17 16:31:30 +01:00
ST-TEN-11
0426065804 Merge remote-tracking branch 'origin/master' 2025-02-12 10:29:09 +01:00
neo
4d0784a8c1 stten1 csv 2025-02-11 18:20:27 +01:00
ST-TEN-11
5505e599e3 Merge remote-tracking branch 'origin/master' 2025-02-11 09:25:17 +01:00
ST-TEN12
a67148eece read tecna recipes retry 2025-02-10 19:01:35 +01:00
30fadc52ca dev 2025-02-10 15:45:18 +01:00
ST-TEN-11
6458aebd03 Merge remote-tracking branch 'origin/master' 2025-02-10 11:26:00 +01:00
ST-TEN-11
5ce0e5345e stten11 98facp 2025-02-10 11:25:46 +01:00
edo-neo
89565ef276 ferrari_csv 2025-02-07 15:58:26 +01:00
ST-TEN12
2228687aa0 Merge remote-tracking branch 'origin/master' 2025-02-04 17:48:10 +01:00
ST-TEN12
daaec51ebe stten12 2025-02-04 17:47:33 +01:00
0749e277a0 Added pid pressure correction to recipe 2025-02-03 15:53:53 +01:00
ST-TEN12
8508ff0ba5 Merge remote-tracking branch 'origin/master' 2025-02-03 15:20:10 +01:00
ST-TEN12
8608ef7993 stten12 2025-02-03 15:19:41 +01:00
ST-TEN-11
4318ea96c1 stten11 98facp 2025-02-03 10:41:03 +01:00
3d0ae7b1b2 Added pid pressure correction to recipe 2025-01-31 16:09:31 +01:00
cf831dc19e fix 2025-01-30 12:56:01 +01:00
eduardo
1047171fa5 Merge remote-tracking branch 'origin/master' 2025-01-30 10:37:04 +01:00
eduardo
f1f5aef5c8 labels 2025-01-30 10:34:38 +01:00
b524bc55c5 st-ten-15 2025-01-30 10:32:31 +01:00
739443299a st-ten-15 2025-01-29 17:14:14 +01:00
ST-TEN12
32a4527776 fix & dev stten12 2025-01-28 18:29:00 +01:00
germano laptop
c0786315f7 pipe cutter test ok recipe ok need calibration for first cut 2025-01-27 14:42:18 +01:00
b62549148d dev 2025-01-27 10:58:51 +01:00
gg
6edbcd0692 hikrobot dual smart cam test alpha 2025-01-25 17:27:40 +01:00
gg
b52897fc33 hikrobot dual smart cam test alpha 2025-01-24 16:51:58 +01:00
gg
10c9284d00 Merge remote-tracking branch 'origin/master' 2025-01-24 09:35:34 +01:00
germano laptop
944266ecb9 dev 2025-01-24 08:21:22 +01:00
gg
fa4112c001 hikrobot dual smart cam test wip 2025-01-23 18:33:40 +01:00
gg
0f28ff4218 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py
2025-01-23 16:51:04 +01:00
gg
410e1fef3f hikrobot dual smart cam test wip 2025-01-23 16:49:51 +01:00
neonb
47b9d8aa4f Merge remote-tracking branch 'origin/master' 2025-01-23 10:58:29 +01:00
neonb
3de4e2695f dev pipe 2025-01-23 10:58:14 +01:00
d7d59ff76c dev 2025-01-23 09:07:55 +01:00
neonb
53c8ed4a60 dev TODO test for tecna compatibility 2025-01-21 15:44:47 +01:00
ee70974ec6 Merge remote-tracking branch 'origin/master' 2025-01-17 15:14:41 +01:00
849db63176 pipe cutter wip 2025-01-17 15:14:28 +01:00
gg
d03242eccf hikrobot smart camera test init single camera list ok 2025-01-16 19:01:07 +01:00
gg
24e7eefda8 fix 2025-01-14 08:47:52 +01:00
gg
8c283376fb RFID connection 2025-01-13 11:56:47 +01:00
germano laptop
c83125cb71 dev 2025-01-09 10:37:49 +01:00
germano laptop
0f1e164c28 dev 2025-01-09 10:19:41 +01:00
stres1
c38496d657 fix csv import 2025-01-07 15:43:29 +01:00
Utente
755ce179b0 Merge remote-tracking branch 'origin/master' 2025-01-07 08:49:12 +01:00
Utente
b07b0ba658 fix csv import 2025-01-07 08:49:00 +01:00
stres1
1ad3b89814 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/st-ten-1.ini
#	src/ui/barcode_recipe_selection/barcode_recipe_selection.py
2024-12-17 12:31:43 +01:00
stres1
35a0cd9f81 stten1 cfg 2024-12-17 12:29:43 +01:00
Utente
d6d387f605 Merge remote-tracking branch 'origin/master' 2024-12-17 12:15:44 +01:00
Eduardo
434450656a fix stten6 gg 2024-12-16 08:42:17 +01:00
Eduardo
85cacaddfd Merge remote-tracking branch 'origin/master' 2024-12-11 12:48:12 +01:00
ST-TEN-11
cb3841bc36 fix 2024-12-11 12:27:26 +01:00
Edo
6afae93359 Merge remote-tracking branch 'origin/master' 2024-12-10 10:36:04 +01:00
Edo
3aa5b8ae54 st ten 10 img 2024-12-10 10:35:46 +01:00
ST-TEN-11
1d5845c872 Merge remote-tracking branch 'origin/master' 2024-12-09 15:24:57 +01:00
ST-TEN-11
ce90737c45 fix STTEN11 labels 2024-12-09 15:24:30 +01:00
neo-2
6202806fab ST TEN 14 2024-12-06 14:32:19 +01:00
neo
141e1361bb extra server on stten1/4/14 tbt 2024-12-06 11:49:43 +01:00
neo
1ee19f292a extra server on stten1/4/14 tbt 2024-12-06 11:46:06 +01:00
neo
4bfdcd1576 Merge remote-tracking branch 'origin/master' 2024-12-06 11:17:43 +01:00
neo-2
959143734b ST TEN 14 2024-12-06 11:16:06 +01:00
neo-2
1bd85cadf0 ST TEN 14 2024-12-06 11:12:55 +01:00
neo
3c95c5a6c7 extra server on stten1/4/14 tbt 2024-12-06 09:37:50 +01:00
ST-TEN-1
f9ec07e948 guaine stten2 2024-12-06 09:12:30 +01:00
neo
357c517638 extra server on stten1/4/14 tbt 2024-12-05 17:31:49 +01:00
Eduardo
757867fbda dev stten6 2024-12-02 16:26:33 +01:00
gg
596829f656 stten6 barcode selection 2024-12-02 11:16:15 +01:00
567a4a4e95 st-ten-15 2024-11-27 11:45:54 +01:00
4facf27bdb st-ten-15 2024-11-27 11:43:36 +01:00
neo
b1a7e69f5d fix 2024-11-23 15:24:42 +01:00
ST-TEN-11
0b9e3d097e fix 2024-11-22 14:04:45 +01:00
ST-TEN-11
4feb92471f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/label_templates/ferrari_30x16_203.prn
2024-11-21 11:58:10 +01:00
ST-TEN-11
286a72f409 STTEN11 2024-11-21 11:50:57 +01:00
Eduardo
8474729dd2 fix 2024-11-15 12:28:28 +01:00
Eduardo
26508cc25c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/recipe_selection/recipe_selection.py
2024-11-15 11:10:15 +01:00
5f1189f277 st-ten-6 ready for update 2024-11-14 16:45:43 +01:00
gg
5bb7dd66ce new dime 2024-11-11 10:11:24 +01:00
9942b5c542 remote fecthing ok on sim
wip on server
2024-11-08 16:47:25 +01:00
neo-nb3
a38aea5e5c file download from server wip 2024-11-06 21:00:17 +01:00
neo
6b26bf941c Merge remote-tracking branch 'origin/master' 2024-11-06 12:37:39 +01:00
neo
e20c85cc62 status update rewrite wip 2024-11-06 12:37:19 +01:00
eduardo
b0510d205a labels ptototipi 2024-11-06 11:28:58 +01:00
neo-2
5015d3a4ea ST TEN 14 2024-11-06 09:37:54 +01:00
neo-2
93e0d8c050 Merge remote-tracking branch 'origin/master' 2024-11-06 08:57:25 +01:00
neo-2
d5c4fe420f ST TEN 14 2024-11-06 08:57:08 +01:00
eduardo
2501a8f910 dev 2024-11-05 15:51:08 +01:00
eduardo
54f5ade0ca dev 2024-11-05 15:11:36 +01:00
germano laptop
7a7cd3817e dev 2024-11-05 10:14:13 +01:00
germano laptop
ed6e449238 dev 2024-11-05 10:07:33 +01:00
germano laptop
edd09bfbdd dev 2024-11-05 10:02:38 +01:00
Eduardo
1e9439268f io id 2024-10-30 14:51:18 +01:00
gg
115ae7bea4 Merge remote-tracking branch 'origin/master' 2024-10-29 13:19:13 +01:00
gg
f6b9bc568c ferrari label flag qr only 2024-10-29 13:17:15 +01:00
bd0ea025f7 Update machine status handling and fix archive synchronizer init
Refactor machine status updates to include more states such as working" for better control. Also, ensure `ArchiveSynchronizer` is initialized with the `config` parameter where needed, improving consistency in object creation across multiple UI components.
2024-10-29 11:41:42 +01:00
e940964f84 merge 2024-10-24 16:47:56 +02:00
gg
3239e6de5c Merge branch 'remove-steps-table' of https://gitlab.com/neosystems/errecinque/mappano/st-ten-1 into remove-steps-table 2024-10-24 12:54:54 +02:00
gg
a60a2d945e ferrari label 203dpi 2024-10-24 12:42:03 +02:00
27fd430a0b auto import wip
Updated remote_fetch to allow flexible machine_status input and reorganized file saving logic to categorize downloads based on file types. Modified test configuration to ensure compatibility with the new changes.
2024-10-24 11:11:03 +02:00
stten7
716c8b2607 st ten 7 PALLINI 2024-10-23 15:54:47 +02:00
neo
847338984d fixme prod server status 2024-10-21 12:50:44 +02:00
neo
c4e83468c8 new extra synchronizer endpoint wip 2024-10-18 12:37:07 +02:00
germano laptop
3acbbe8508 Label Lamborghini 2024-10-10 10:43:23 +02:00
germano laptop
4ad66b3b59 Label Lamborghini 2024-10-10 10:37:59 +02:00
eduardo
e2b334e862 Mclaren labels 2024-10-10 10:35:53 +02:00
eduardo
a3bd6f4aaf Merge remote-tracking branch 'origin/master' 2024-10-10 10:35:46 +02:00
eduardo
26a59ac600 Mclaren labels 2024-10-10 10:35:36 +02:00
germano laptop
9a6d88047c Label Lamborghini 2024-10-10 10:26:34 +02:00
germano laptop
a32515ff09 Label Lamborghini 2024-10-10 10:15:17 +02:00
eduardo
88c45fc9c4 dev 2024-10-10 08:49:36 +02:00
neo
7a7c2b6f5d simple leak test on linux tested OK 2024-10-09 13:12:40 +02:00
neo
05718fc32e Merge remote-tracking branch 'origin/remove-steps-table' into remove-steps-table 2024-10-09 12:44:35 +02:00
neo
a3903678a1 ref 2024-10-09 12:44:11 +02:00
ST-TEN-11
62c21573cd ricette tecna t3l 2024-10-09 12:24:41 +02:00
neo
5b6aaf99c9 Merge remote-tracking branch 'origin/remove-steps-table' into remove-steps-table 2024-10-09 12:07:57 +02:00
neo
6467307957 dev 2024-10-09 12:07:41 +02:00
ST-TEN-11
c9226d40ab ricette tecna t3p serial 20060720 2024-10-09 11:51:31 +02:00
ST-TEN-11
bbb3086c90 dev 2024-10-09 11:17:36 +02:00
neo
7ee96d63dd advantech digital I/O ok on linux, tbt 2024-10-08 15:36:05 +02:00
eduardo
3ba426b48b Merge remote-tracking branch 'origin/master' 2024-10-08 14:28:15 +02:00
3a163bfab4 dima Mclaren 2024-10-08 16:24:35 +02:00
eduardo
a239765bbb dev 2024-10-08 14:27:59 +02:00
eb0c876aeb second test instruction step for st-ten-11 tbt sim ok 2024-10-08 09:35:29 +02:00
Utente
237c976543 fix cal 2024-10-07 12:41:49 +02:00
363021c8d9 Merge remote-tracking branch 'origin/master' 2024-10-07 11:49:51 +02:00
f7355805e7 Add default value to 'codice_prodotto' if missing
Ensure 'codice_prodotto' has a default value in recipe selection. Additionally, appended 'archived' column in st-ten-11.csv to indicate archived status.
2024-10-07 11:49:40 +02:00
fc105eadf0 second test instruction step for st-ten-11 tbt sim ok 2024-10-07 11:49:38 +02:00
gg
e1c496ea30 st-ten-11.csv 2024-10-07 11:19:21 +02:00
gg
e4b0e204b6 Merge remote-tracking branch 'origin/master' 2024-10-07 09:35:13 +02:00
gg
486e09b479 new recipe and import svg rows names 2024-10-07 09:33:11 +02:00
gg
700849ef9b save recipes OK 2024-10-04 15:52:54 +02:00
neo
dd88b1eafa save recipes wip 2024-10-04 11:39:16 +02:00
stres1
4b867dc7a9 stten1 fix 2024-10-04 08:40:12 +02:00
stres1
92abd632b2 Merge remote-tracking branch 'origin/master' 2024-10-01 13:08:58 +02:00
stres1
b0584851f5 stten1 2024-10-01 13:08:49 +02:00
neo
63f95b4e61 ferrari label on st ten 1 2024-10-01 13:03:51 +02:00
neonb
ded52c83d8 new recipes st-ten-11 2024-09-30 14:25:38 +02:00
neo
982c44793c Merge remote-tracking branch 'origin/master' into remove-steps-table 2024-09-23 17:29:35 +02:00
gg
2df52b6865 CSV BACKUP ST-TEN-8 2024-09-19 15:45:50 +02:00
stten7
5ea6a58101 dev st ten 7 2024-09-19 12:53:03 +02:00
stten7
ed6d2e263b fix 2024-09-19 11:04:02 +02:00
eduardo
457afae4a3 dev 2024-09-19 06:35:34 +02:00
neo
e7fc30d5f6 remove steps table wip 2024-09-18 18:03:13 +02:00
gg
e2cfa8204f dogotal i/o 2024-09-18 14:47:54 +02:00
Edo
eb0c1ae0e9 st ten 10 img 2024-09-17 13:31:22 +02:00
neo
9e0bc33904 ferrari label ok 2024-09-13 11:32:14 +02:00
neo
099cb7a93e Merge remote-tracking branch 'origin/master' 2024-09-13 10:15:16 +02:00