Commit Graph

466 Commits

Author SHA1 Message Date
neo
311726303c Merge remote-tracking branch 'origin/master' 2025-02-11 18:19:39 +01:00
neo
ebd759f223 typo fix tbt 2025-02-11 16:42:52 +01:00
96edfe9cc3 fix 2025-02-11 11:39:03 +01:00
ST-TEN12
5a6dc82a9b Merge remote-tracking branch 'origin/master' 2025-02-10 16:03:33 +01:00
ST-TEN12
7307c3769d stten12 ok 2025-02-10 16:03:11 +01:00
edo-neo
ceebe6ad6c dev rfid new featured wip 2025-02-10 15:41:36 +01:00
edo-neo
8c8b89adea ne ui pos foe flag label 2025-02-07 13:48:12 +01:00
edo-neo
8641a99471 dev modbus err handler 2025-02-06 17:01:48 +01:00
5da86121de dev error handler 2025-02-06 16:17:45 +01:00
e28a0aa46c erro handling tecna t3 sim ok tbt on production 2025-02-05 11:38:40 +01:00
0749e277a0 Added pid pressure correction to recipe 2025-02-03 15:53:53 +01:00
062a90edad Added pid pressure correction to recipe 2025-02-03 12:32:17 +01:00
3d0ae7b1b2 Added pid pressure correction to recipe 2025-01-31 16:09:31 +01:00
c9a52f0472 New sys.args notifier working 2025-01-31 11:06:41 +01:00
ST-TEN12
32a4527776 fix & dev stten12 2025-01-28 18:29:00 +01:00
gg
5ac5f5f37d Merge remote-tracking branch 'origin/master' 2025-01-28 16:11:41 +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
a88d7f5cd8 smart camera fixture connect and remove proper management 2025-01-27 14:38:43 +01:00
germano laptop
69eb9a9f5f pipe cutter test ok recipe ok need calibration for first cut 2025-01-27 12:54:07 +01:00
germano laptop
4ff84cf342 dev PIPE 2025-01-27 12:13:56 +01:00
gg
6edbcd0692 hikrobot dual smart cam test alpha 2025-01-25 17:27:40 +01:00
gg
adf0140256 Merge remote-tracking branch 'origin/master' 2025-01-24 16:52:13 +01:00
gg
b52897fc33 hikrobot dual smart cam test alpha 2025-01-24 16:51:58 +01:00
9b10d49123 dev 2025-01-24 10:23:49 +01:00
gg
10c9284d00 Merge remote-tracking branch 'origin/master' 2025-01-24 09:35:34 +01:00
germano laptop
d99922c1b9 dev 2025-01-24 08:23:45 +01:00
germano laptop
944266ecb9 dev 2025-01-24 08:21:22 +01:00
gg
78c95b51f2 Merge remote-tracking branch 'origin/master' 2025-01-23 18:33:51 +01:00
gg
fa4112c001 hikrobot dual smart cam test wip 2025-01-23 18:33:40 +01:00
neonb
fbfe07b3cb dev pipe 2025-01-23 17:27:43 +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
4a6fa63ef7 dev pipe 2025-01-23 16:15:49 +01:00
neonb
3b9cefc009 dev pipe 2025-01-23 15:35:10 +01:00
561ab6c84d dev 2025-01-23 11:15:13 +01:00
neonb
3de4e2695f dev pipe 2025-01-23 10:58:14 +01:00
neonb
6bfb62a6e8 dev pip_gif 2025-01-22 15:21:08 +01:00
eb79ba6b72 dev 2025-01-22 12:28:49 +01:00
neonb
fe460f030a dev TODO test for tecna compatibility 2025-01-22 12:27:15 +01:00
neonb
9653812a13 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/components/pipe_cutter_component.py
#	src/ui/test_pipe_cutter/test_pipe_cutter.py
2025-01-21 15:46:06 +01:00
neonb
53c8ed4a60 dev TODO test for tecna compatibility 2025-01-21 15:44:47 +01:00
8ec410c676 Merge remote-tracking branch 'origin/master' 2025-01-21 10:52:23 +01:00
cbb487e314 dev 2025-01-21 10:52:13 +01:00
neonb
855084f7e7 dev 2025-01-21 10:51:06 +01:00
gg
1353aa14e0 Merge remote-tracking branch 'origin/master' 2025-01-17 19:17:25 +01:00
gg
cb13f28d2e hikrobot smart camera login ok 2025-01-17 16:23:24 +01:00
6ed0cd9f99 pipe cutter wip 2025-01-17 15:15:36 +01:00
849db63176 pipe cutter wip 2025-01-17 15:14:28 +01:00
Eduardo
b54903f6d1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/barcode_recipe_selection/barcode_recipe_selection.py
2025-01-14 15:24:15 +01:00
Eduardo
2ace6ce8a0 fix barcode len 2025-01-14 15:23:22 +01:00
gg
8c283376fb RFID connection 2025-01-13 11:56:47 +01:00
e827089e31 Merge remote-tracking branch 'origin/master' 2024-12-18 14:46:40 +01:00
b7a09646a9 remote import recipes under testing 2024-12-18 14:46:25 +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
Eduardo
11e21b0c23 fix stten6 gg 2024-12-16 08:58:29 +01:00
Eduardo
87818cace6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/test/test.py
2024-12-13 10:28:28 +01:00
226b7d1398 fix st-ten-6 2024-12-11 15:16:35 +01:00
Eduardo
85cacaddfd Merge remote-tracking branch 'origin/master' 2024-12-11 12:48:12 +01:00
bda17a5452 Merge remote-tracking branch 'origin/master' 2024-12-09 15:37:25 +01:00
0e6be1f8a6 dev portal ok overwrite png files 2024-12-09 15:37:08 +01:00
ST-TEN-1
bb2d069d49 FIX 2024-12-06 09:12:10 +01:00
Eduardo
96a162fe90 Merge remote-tracking branch 'origin/master' 2024-12-02 17:02:51 +01:00
neo
5d52f423e0 db fix 2024-12-02 17:00:32 +01:00
Eduardo
32b66a03a6 Merge remote-tracking branch 'origin/master' 2024-12-02 16:27:24 +01:00
Eduardo
757867fbda dev stten6 2024-12-02 16:26:33 +01:00
62681cc80f Log management ok 2024-12-02 14:23:33 +01:00
gg
edc3fa9647 Merge remote-tracking branch 'origin/master' 2024-12-02 11:16:27 +01:00
gg
596829f656 stten6 barcode selection 2024-12-02 11:16:15 +01:00
dc4651b43a Log management wip 2024-12-02 10:54:59 +01:00
ST-TEN-11
0b9e3d097e fix 2024-11-22 14:04:45 +01:00
Eduardo
8474729dd2 fix 2024-11-15 12:28:28 +01:00
5f1189f277 st-ten-6 ready for update 2024-11-14 16:45:43 +01:00
9942b5c542 remote fecthing ok on sim
wip on server
2024-11-08 16:47:25 +01:00
neo
e20c85cc62 status update rewrite wip 2024-11-06 12:37:19 +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
cbb8d81edb FIX and labels 2024-11-05 17:19:17 +01:00
82c09a8ced Refactor machine status updates
Removed unnecessary machine status update to "stand-by" and streamlined status changes to "working" and "logged-in" based on specific actions. This helps in maintaining a cleaner and more accurate status flow within the application logic.
2024-10-29 12:03:20 +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
a73fa2c66e fix error during import 2024-10-29 10:00:56 +01:00
087d3a48d6 Refactor ArchiveSynchronizer usage and clean up code
Refactor code to properly utilize `ArchiveSynchronizer` class across multiple modules. Adjust conditional statements and imports for consistency. Remove unnecessary debug outputs and redundant code, ensuring more streamlined and maintainable codebase.
2024-10-25 17:11:00 +02:00
1722ad260d auto import wip 2024-10-25 14:38:28 +02:00
ec54636257 fix dynamic export 2024-10-25 11:34:25 +02:00
bfa5ee8d74 fix merge 2024-10-25 10:07:22 +02:00
e9d83f1fce fix merge 2024-10-25 09:29:22 +02:00
4853e7883c new export logic 2024-10-25 09:18:44 +02:00
32e858f0f7 fix merge 2024-10-25 09:18:10 +02:00
cb9abeb46f fix merge 2024-10-24 16:58:31 +02:00
84c22c8035 fix merge 2024-10-24 16:55:55 +02:00
e940964f84 merge 2024-10-24 16:47:56 +02:00
0a6edec384 fix q dialog linux 2024-10-24 15:57:49 +02:00
neo
7b316bad18 fix QFileDialog.getSaveFileName 2024-10-24 13:14:52 +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
neo
6467307957 dev 2024-10-09 12:07:41 +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
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
486e09b479 new recipe and import svg rows names 2024-10-07 09:33:11 +02:00