Commit Graph

675 Commits

Author SHA1 Message Date
ST-TEN12
e5d477a3ea fix label 2025-04-03 14:53:03 +02:00
2b12222932 stten15 CSV EXPORT 2025-04-03 12:04:59 +02:00
ST-TEN12
035739e96e recipes stten12 fix 2025-04-02 13:56:11 +02:00
neo
d96514bdb9 stten12 import recipes fix 2025-04-02 13:36:10 +02:00
fd03c8aa70 stten15 up 2025-04-02 10:32:32 +02:00
d327aaaf91 Merge remote-tracking branch 'origin/master' 2025-04-02 10:20:41 +02:00
de6ecdc348 stten15 up 2025-04-02 10:20:11 +02:00
stten7
9e7186f331 st ten 7 2025-04-02 09:28:15 +02:00
stten7
85898651ea Merge remote-tracking branch 'origin/master' 2025-04-01 15:35:50 +02:00
stten7
7aa51a9f07 st ten 7 2025-04-01 15:35:33 +02:00
neo
67349598d4 import recipes fix 2025-03-31 19:33:31 +02:00
ST-TEN12
defa66d422 recipes stten12 2025-03-31 18:26:40 +02:00
ST-TEN12
c6f8d7174f fix 2025-03-31 14:42:26 +02:00
ST-TEN12
9bd8260e42 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/components/tecna_marposs_provaset_t3.py
2025-03-31 14:29:27 +02:00
ST-TEN12
aca752434d fix 2025-03-28 12:52:57 +01:00
68fde4dd39 stten15 up 2025-03-28 11:36:12 +01:00
427e139905 fix 2025-03-27 15:15:34 +01:00
a13b232832 fix 2025-03-27 12:53:32 +01:00
56de1e5e1b Merge remote-tracking branch 'origin/master' 2025-03-27 12:15:06 +01:00
neo-2
b6e041d51f ST TEN 14 texa 2025-03-27 09:36:03 +01:00
neo-2
c0d4f122f0 ST TEN 14 2025-03-27 09:03:45 +01:00
4eb0132333 fix label & modbus 2025-03-26 11:59:03 +01:00
ST-TEN-11
7bf3f6876f Merge remote-tracking branch 'origin/master' 2025-03-26 10:10:50 +01:00
ST-TEN-11
c21da0a27e stten11 2025-03-26 10:10:38 +01:00
neo-2
fab08c1068 ST TEN 14 2025-03-25 12:14:15 +01:00
stten7
ae3962cf2e Merge remote-tracking branch 'origin/master' 2025-03-25 10:44:39 +01:00
stres1
731079db55 Merge remote-tracking branch 'origin/master' 2025-03-25 10:02:41 +01:00
stres1
c8e082d3a8 fix csv import 2025-03-25 10:02:33 +01:00
c22ca85f4d fix label & modbus 2025-03-25 09:54:52 +01:00
1d1da5b5df DEV TEXA 2025-03-24 13:12:13 +01:00
eduardo
ef3f3d57a3 texa label 2025-03-24 11:30:29 +01:00
eduardo
d7c1123fc6 texa label 2025-03-24 10:57:39 +01:00
stten7
46bf3a570e Merge remote-tracking branch 'origin/master' 2025-03-21 09:15:27 +01:00
neo
7444e01107 edaily 926 update 2025-03-21 09:15:04 +01:00
stten7
12692bb95b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/components/tecna_marposs_provaset_t3.py
2025-03-21 09:03:09 +01:00
stten5
e9a1e5a6c1 stten5 fix extra label 2025-03-20 15:36:03 +01:00
14a83d6928 fix 2025-03-20 15:23:21 +01:00
STTEN8
a08625f9df stten8 2025-03-19 11:45:22 +01:00
STTEN8
d767375dac Merge remote-tracking branch 'origin/master' 2025-03-19 11:32:12 +01:00
STTEN8
3e3322123c stten8 2025-03-19 11:31:04 +01:00
ST-TEN12
1ac2f90913 Merge remote-tracking branch 'origin/master' 2025-03-19 10:17:54 +01:00
92be5a6e09 fix 2025-03-19 09:54:47 +01:00
6678c666dd Merge remote-tracking branch 'origin/master' 2025-03-19 09:44:31 +01:00
474075db7d fix 2025-03-19 09:44:08 +01:00
ST-TEN-11
d54f0b7cae stten11 tmp fix 2025-03-19 09:20:23 +01:00
ST-TEN-11
eb393e5552 Merge remote-tracking branch 'origin/master' 2025-03-19 00:36:02 +01:00
ST-TEN-11
36c74e0dcc stten11 2025-03-19 00:35:42 +01:00
stten7
86413b9385 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/recipe_selection/recipe_selection.py
2025-03-18 17:54:20 +01:00
stten7
29a3248386 st ten 7 2025-03-18 17:53:37 +01:00
stten5
e17ed4a6c9 stten5 2025-03-18 17:45:09 +01:00
stten5
8efbe55108 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/instruction_images/st-ten-5/5803036734.svg
#	config/instruction_images/st-ten-5/5803036735.svg
2025-03-18 16:53:09 +01:00
a4decef101 Merge remote-tracking branch 'origin/master' 2025-03-18 15:49:15 +01:00
3ce90f4d80 Set default value for pid_mod_config in defaults.ini
Added a default configuration entry for `pid_mod_config` with a value of 5. This ensures the setting is initialized properly and avoids potential issues from missing configurations.
2025-03-18 15:49:00 +01:00
neo
7dba2a6839 fix stten7 labels tbt 2025-03-17 09:07:57 +01:00
neo
5b73ad04f0 fix stten7 labels tbt 2025-03-15 15:58:56 +01:00
stten7
c4e0ad614c st ten 7 fix scarico 2025-03-13 15:41:02 +01:00
stten7
770ff2e9ec Merge remote-tracking branch 'origin/master' 2025-03-13 15:24:19 +01:00
stten7
cf3afbb995 st ten 7 PALLINI 2025-03-13 15:23:55 +01:00
germano laptop
b103ec0438 dev b 2025-03-06 14:26:18 +01:00
eduardo
55c4be281b labels ferrary black 2025-03-06 09:25:52 +01:00
eduardo
43db7d1937 labels ferrary black 2025-03-06 07:47:45 +01:00
363cbc34b6 Update PID configuration to use mode selection via dropdown
Replaces the "slow_pid" checkbox with a "pid_mod_config" dropdown for more flexible PID mode selection. Updates configuration management, UI, and test flag logic to reflect the new PID mode options: AUTO, FAST, MEDIUM, and SLOW. Ensures backward compatibility by defaulting to AUTO mode.
2025-03-05 16:19:47 +01:00
2993049a66 fix 2025-03-05 16:08:45 +01:00
acb0072c00 fix 2025-03-05 16:01:50 +01:00
a953edb1ce Add support for "slow_pid" configuration and UI integration
Implemented a new "slow_pid" parameter across configuration files, UI components, and backend logic. Updated machine settings, Leak Test editor, and recipe manager to handle this parameter. Adjusted related layout and logic to ensure seamless integration.
2025-03-04 10:48:19 +01:00
464bba989a fix 2025-03-03 13:56:55 +01:00
5d4b2d6ed5 FIX 2025-03-03 13:38:49 +01:00
db682d12e1 Merge remote-tracking branch 'origin/master' 2025-03-03 13:38:23 +01:00
b1d2acf7c1 Add support for barcode formatting in configurations
Introduced a new `barcode_format` field in configuration files to specify barcode structure. Updated related code to utilize the default barcode format when processing recipes and test data. This change ensures consistency and flexibility in barcode generation across systems.
2025-03-03 13:38:11 +01:00
74b85940fa fix 2025-03-03 10:58:33 +01:00
de53400d18 fix 2025-02-28 11:49:40 +01:00
688b25f4e3 st-ten-13 label 2025-02-27 14:44:44 +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
77bee6ada3 Merge remote-tracking branch 'origin/master' 2025-02-27 10:42:51 +01:00
1084ddab58 fix 2025-02-27 10:42:26 +01:00
5a0182324b Merge remote-tracking branch 'origin/master' 2025-02-27 10:27:37 +01:00
c66c6ce933 st-ten-13 2025-02-27 10:25:58 +01:00
ST-TEN-11
fb2e4d3521 fix tmp 2025-02-27 08:52:40 +00:00
ce03364a81 st-ten-13 2025-02-26 16:10:29 +01:00
Eduardo
0af8f0e3df fix 2025-02-26 15:38:12 +01:00
Eduardo
e7d2c8bf53 fix 2025-02-26 11:43:26 +01:00
Eduardo
2db7c2a86e fix 2025-02-26 10:43:47 +01:00
Eduardo
966e68ad32 fix 2025-02-26 09:56:30 +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
ST-TEN12
f3528cc8d5 update ricetta dx 2025-02-20 15:08:27 +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
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