Commit Graph

429 Commits

Author SHA1 Message Date
74b85940fa fix 2025-03-03 10:58:33 +01:00
6f7f8e7c0a Merge remote-tracking branch 'origin/master' 2025-02-27 12:47:23 +01:00
b8965b29ab fix 2025-02-27 12:47:02 +01:00
23813588b6 fix rfid path 2025-02-27 12:28:41 +01:00
1084ddab58 fix 2025-02-27 10:42:26 +01:00
553fefdfa7 Merge remote-tracking branch 'origin/master' 2025-02-20 17:16:34 +01:00
677ba4c5fb stten15 up 2025-02-20 17:16:14 +01:00
STTEN8
7732f29cf1 stten8 bugfix 1 2025-02-20 16:55:49 +01:00
STTEN8
cf6528caf0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/st-ten-8.ini
2025-02-20 13:30:07 +01:00
STTEN8
f5cfa21424 stten8 save 2025-02-20 13:13:21 +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-TEN12
a67148eece read tecna recipes retry 2025-02-10 19:01:35 +01:00
30fadc52ca dev 2025-02-10 15:45:18 +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
b524bc55c5 st-ten-15 2025-01-30 10:32:31 +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
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
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
849db63176 pipe cutter wip 2025-01-17 15:14:28 +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
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
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
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
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
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
e20c85cc62 status update rewrite wip 2024-11-06 12:37:19 +01:00
neo-2
5015d3a4ea ST TEN 14 2024-11-06 09:37:54 +01:00
neo-2
d5c4fe420f ST TEN 14 2024-11-06 08:57:08 +01:00
Eduardo
1e9439268f io id 2024-10-30 14:51:18 +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
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
neo
7a7c2b6f5d simple leak test on linux tested OK 2024-10-09 13:12:40 +02:00
neo
6467307957 dev 2024-10-09 12:07:41 +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
3a163bfab4 dima Mclaren 2024-10-08 16:24:35 +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
fc105eadf0 second test instruction step for st-ten-11 tbt sim ok 2024-10-07 11:49:38 +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
982c44793c Merge remote-tracking branch 'origin/master' into remove-steps-table 2024-09-23 17:29:35 +02:00
stten7
5ea6a58101 dev st ten 7 2024-09-19 12:53:03 +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
neo
9e0bc33904 ferrari label ok 2024-09-13 11:32:14 +02:00
neo
a4b06e3f47 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/label_templates/st-ten-1/ferrari_30x16_203.prn
2024-09-11 15:56:20 +02:00
neo
8b22158d0a ferrari label wip 2024-09-11 15:52:01 +02:00
eduardo
201a3ed18d st_ten 12/13 update 2024-09-11 13:54:38 +02:00
stten5
36836b7de4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/instruction_images/st-ten-5/5803036734.svg
#	config/instruction_images/st-ten-5/5803036735.svg
2024-09-03 11:06:14 +02:00
stten5
0f8db554c4 dev 2024-09-03 11:05:55 +02:00
gg
4243507d62 _stat implementation 2024-07-16 13:02:01 +02:00
ST-TEN-11
e0f58b9918 Update machine settings in st-ten-11.ini and st-ten-1.ini
This commit includes key changes in the machine settings files st-ten-11.ini and st-ten-1.ini. We removed several parameters from the [digital_io] section in st-ten-11.ini and also updated the 'tester_discharge_enable' value to 'yes'. In st-ten-1.ini, the 'galaxy_camera' and 'screwdriver' settings were respectively altered to 'absent' and 'absent'.
2024-07-10 09:56:39 +02:00
stres1
18eac1fc6b stten1 2024-06-27 13:49:18 +02:00
stres1
b8c8113947 stten1 2024-06-27 13:46:14 +02:00
eduardo
22f9fc540d Merge remote-tracking branch 'origin/master' 2024-06-27 06:23:30 +02:00
eduardo
6b23fc5e71 Add configuration for new machine st-ten-11
Configuration files for a new automatic machine called st-ten-11 have been created, along with a placeholder SVG image. The configuration includes settings for various hardware components, printing details, recipe defaults, and testing parameters.
2024-06-27 06:23:16 +02:00
neo
c71cf00d6a fix 2024-06-26 12:14:04 +02:00
stten5
7fff366fd2 Merge remote-tracking branch 'origin/master' 2024-06-21 13:38:47 +02:00
eduardo
47a77d83c5 supporto assemblati ok 2024-05-28 07:35:58 +02:00
eduardo
8e87c5b212 supporto assemblati ok 2024-05-24 13:40:48 +02:00
eduardo
235eaddb74 supporto assemblati whip 2024-05-23 14:09:49 +02:00
eduardo
7f489d6634 supporto assemblati whip 2024-05-21 08:45:27 +02:00
eduardo
057baabcdd supporto assemblati whip 2024-05-21 07:56:15 +02:00
ST-TEN-1
7704e70cc4 FIX 2024-05-17 09:23:52 +02:00
ST-TEN-1
b5b7af6d56 Merge branch 'master' of https://gitlab.com/neosystems/errecinque/mappano/st-ten-1
 Conflicts:
	src/ui/test/test.py
2024-05-17 09:13:04 +02:00
ST-TEN-1
90de35b498 DEV 2024-05-17 09:09:46 +02:00
eduardo
4b2d078ce0 fix 2024-05-14 06:15:18 +02:00
Edo
9f90343666 st ten 10 2024-05-09 12:07:15 +02:00
eduardo
d6ab8b7fbb Update machine settings configuration
A modification has been made to the `st-ten-10.ini` configuration file under the `machine_settings` directory. The `istruzione_abilitata` field under `recipes_defaults` has been updated to be empty indicating likely disabling of a certain feature or instruction.
2024-05-08 12:42:40 +02:00
eduardo
e40d0e7fa7 Update label text and warning images configurations
Updated the text displayed on the brother label printer to only show "ST-TEN-10" instead of "ETICHETTA \nST-TEN-10". Also changed the warning images in machine settings for st-ten-3 and st-ten-2 to use a generic image instead of their specific ones.
2024-05-08 12:39:28 +02:00
eduardo
53c34957cc Update printing labels and warning images in config files
Updated the printing labels in the brother_label_printer.py file and added warning images fields across multiple configuration files. This includes changes in machine settings for st-ten-3.ini, st-ten-2.ini and st-ten-10.ini. Also, modified the "labeltxt_5" field in the test.py file and in recipe_selection.py to fetch the correct value.
2024-05-08 11:46:03 +02:00
eduardo
7d2d325c12 image_for_warnig uddate every machi has his own folder the images, also addede warnig images for ST-TEN-10 a last update csv for it 2024-05-08 07:46:03 +02:00
Eduardo
0f8b54b81c image_for_warnig uddate every machi has his own folder the images, also addede warnig images for ST-TEN-10 a last update csv for it 2024-05-08 07:45:19 +02:00
Eduardo
9206ff1df7 Update barcode serial field in machine settings
The configuration for machine settings `st-ten-2.ini` and `st-ten-10.ini` has been updated. Specifically, the value of the `barcode_serial_field` setting has been changed to reflect the updated input parameters. This change ensures that the machine settings are up-to-date with current requirements.
2024-05-06 13:27:55 +02:00
Eduardo
8770ee7064 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/st-ten-10.ini
2024-05-06 13:14:21 +02:00
Eduardo
01bd70c976 Update barcode serial field in machine settings
The configuration for machine settings `st-ten-2.ini` and `st-ten-10.ini` has been updated. Specifically, the value of the `barcode_serial_field` setting has been changed to reflect the updated input parameters. This change ensures that the machine settings are up-to-date with current requirements.
2024-05-06 13:11:24 +02:00
stten5
5a32b52b11 Merge remote-tracking branch 'origin/master' 2024-05-02 14:42:31 +02:00
Eduardo
c43a870db5 Merge remote-tracking branch 'origin/master' 2024-04-23 11:15:53 +02:00
Eduardo
85c1ec2d2d Add machine status tracking and update for ArchiveSynchronizer
The ArchiveSynchronizer now tracks machine status and sends updates about it. Options of status are tracked as "working", "logged-in", and "logged-out". This implementation includes configuration changes for the st-ten-10 machine and error reporting for failures during remote archive operations.
2024-04-23 11:15:23 +02:00
gg
5fcb04f969 -various fixes
-st-ten-8 tested ok with new flush blow valves
2024-04-22 18:38:34 +02:00
Edo
dfcdf31d29 st ten 10 wip 2024-03-19 14:23:58 +01:00
Edo
428d28297d st ten 10 wip 2024-03-14 13:15:08 +01:00
Edo
4fb3cdd676 st-ten-10 wip 2024-03-12 13:48:00 +01:00
STTEN8
7174fd84d4 stten8 auto select recipe from RFID at startup 2024-02-23 18:34:17 +01:00
STTEN8
f24669f18a Merge remote-tracking branch 'origin/master' 2024-02-23 17:28:01 +01:00
STTEN8
53838c7854 stten8 flush blow install 2024-02-23 17:27:34 +01:00
Eduardo
8585d7ca93 update ini files for instruction folder 2024-02-06 12:42:39 +01:00
STTEN8
0e7fc9bb36 Merge remote-tracking branch 'origin/master' 2024-02-03 09:55:51 +01:00
stten7
6d1f6c71b9 instruction folder 2024-02-01 14:50:45 +01:00
gg
4f0e3fedb9 ref 2024-01-30 14:21:20 +01:00
stten5
2f9ee6afad STTEN5 no box 2024-01-30 12:12:01 +01:00
STTEN8
6249abf014 Merge remote-tracking branch 'origin/master' 2024-01-17 09:05:05 +01:00
STTEN8
52e00b27ae stten8 fix & reprint label 2024-01-17 09:04:48 +01:00
stten6
ff2f860987 Merge remote-tracking branch 'origin/master' 2024-01-16 10:10:40 +01:00
stten6
734a758f76 pid 2024-01-16 10:10:17 +01:00
STTEN8
d54ca99bfd Merge remote-tracking branch 'origin/master' 2023-11-15 15:57:19 +01:00
STTEN8
bcb3ff2936 stten8 fix & reprint label 2023-11-13 15:00:55 +01:00
Utente
21e4073494 fix 2023-11-09 13:30:20 +01:00
gg
936647379a pid correction via config file tbt 2023-11-07 16:57:58 +01:00
stten5
1a31be38ee STTEN5 2023-10-19 08:52:16 +02:00
st-ten-9
464d8d532e fco730 alpha 2023-10-13 17:52:41 +02:00
st-ten-9
dce65caa55 fco730 dev 2023-10-12 19:37:39 +02:00
st-ten-9
5b0aee7437 fco730 dev 2023-10-11 16:40:46 +02:00
st-ten-9
587674eabb fco730 unit test ok 2023-10-11 16:26:34 +02:00
neo-dl
656b56eb62 fco730 dev 2023-10-11 09:46:38 +02:00
neo-dl
f854eff774 dev 2023-10-07 18:14:30 +02:00