Commit Graph

670 Commits

Author SHA1 Message Date
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
gg
0f0d3aeffd ferrari new label ok 2024-09-13 10:13:46 +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
gg
d4bcc1545a Merge remote-tracking branch 'origin/master' 2024-09-10 18:09:10 +02:00
eduardo
201a3ed18d st_ten 12/13 update 2024-09-11 13:54:38 +02:00
gg
71fc0c4a05 ferrari new label wip 2024-09-10 18:08:50 +02:00
gg
6eb3c0608f Merge remote-tracking branch 'origin/master' 2024-09-10 18:02:31 +02:00
gg
b5fb437519 ferrari new label wip 2024-09-10 17:57:46 +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
stten5
3de0a8e726 6744/6743 2024-09-03 09:07:56 +02:00
gg
e9450d882e svg update 2024-09-02 12:05:25 +02:00
gg
321a0f7720 svg update 2024-09-02 12:02:19 +02:00
stten7
d2b0d234c8 fix 2024-07-31 13:02:30 +02:00
gg
bbb053462a _stat implementation tbt 2024-07-18 09:43:42 +02:00
gg
4243507d62 _stat implementation 2024-07-16 13:02:01 +02:00
gg
c56a069a2b dime caricate 2024-07-16 11:19:18 +02:00
ST-TEN-11
4b02fa50d5 Merge remote-tracking branch 'origin/master' 2024-07-12 11:03:47 +02:00
ST-TEN-11
978df8ff01 Add inverse sensor monitoring in test instructions
Expanded the functionality in test_instructions.py to also monitor and record the state of inverse sensors (inv_sensor). This was done in the checking phase, following similar logic that is used for regular sensors (sensor). Also adjusted the sensor index referencing for these inverse sensors.
2024-07-12 11:03:32 +02:00
gg
8ef837563e Merge remote-tracking branch 'origin/master' 2024-07-12 10:30:08 +02:00
gg
2f38144388 dime caricate 2024-07-12 10:29:07 +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
gg
bd96cf59f7 Merge remote-tracking branch 'origin/master' 2024-06-18 13:29:21 +02:00
gg
8310c75cd1 dime caricate 2024-06-18 13:28:31 +02:00
Eduardo
c6717c3ae6 fix 2024-06-05 11:20:28 +02:00
Eduardo
c4b3fcc921 fix 2024-06-05 10:55:13 +02:00
eduardo
ba1bb3f559 Merge remote-tracking branch 'origin/master' 2024-05-28 07:41:47 +02:00
eduardo
47a77d83c5 supporto assemblati ok 2024-05-28 07:35:58 +02:00
Edo
6dfb8bd66f st ten 10 img 2024-05-24 16:31:20 +02:00
eduardo
8e87c5b212 supporto assemblati ok 2024-05-24 13:40:48 +02:00
eduardo
3f72be3abc supporto assemblati whip 2024-05-23 14:26:01 +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
16be11d326 last csv update 2024-05-14 06:19:42 +02:00
eduardo
4b2d078ce0 fix 2024-05-14 06:15:18 +02:00
ST-TEN-1
a2c572191a Merge remote-tracking branch 'origin/master' 2024-05-09 12:14:59 +02:00
ST-TEN-1
c87331368d DEV 2024-05-09 12:09:35 +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
Eduardo
414d8431c1 svg files for st-ten 5 and 7 2024-03-26 10:15:58 +01: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
Eduardo
51fe8bc283 Merge remote-tracking branch 'origin/master' 2024-02-29 17:16:05 +01:00
Eduardo
b314bdbcdb svg files 2024-02-29 17:14:11 +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
a61f2c4bc0 svg files 2024-02-20 14:06:21 +01:00
Eduardo
8f420d7cd2 svg files 2024-02-16 13:08:49 +01:00
Eduardo
4c127a70af svg files 2024-02-07 11:28:50 +01:00
Eduardo
1a36ad8f18 svg files from Federica 2024-02-07 09:23:37 +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
Eduardo
cc741c827f update svg 2024-01-30 13:15:25 +01:00
stten5
0d579a22d0 Merge remote-tracking branch 'origin/master' 2024-01-30 12:12:22 +01:00
stten5
2f9ee6afad STTEN5 no box 2024-01-30 12:12:01 +01:00
Eduardo
92b3368f37 Dime R5 file SVG 2024-01-25 09:25:03 +01:00
Eduardo
1a258632af Merge remote-tracking branch 'origin/master' 2024-01-23 12:48:13 +01:00
Eduardo
a0a1cbc926 Dime R5 file SVG 2024-01-23 12:47:22 +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
Guglielmi
0d6d7761f1 Merge remote-tracking branch 'origin/master' 2023-12-15 11:38:28 +01:00
Guglielmi
dc5a53ace5 passaggio solo 20pn 2023-12-15 11:37:50 +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
stten7
42c111ee7d Merge remote-tracking branch 'origin/master' 2023-11-10 14:56:01 +01:00
stten7
765a740912 csv 2023-11-10 14:55:44 +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
12b0fc937b Merge remote-tracking branch 'origin/master' 2023-10-11 15:16:18 +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
neo-dl
abbf58277d satil 2023-10-06 17:59:38 +02:00
stten6
6645d333a0 stten6 final beta 2023-10-05 18:39:09 +02:00
neo-dl
7dbc1c6417 dev 2023-10-03 15:29:02 +02:00
stres1
03c30b31eb Merge remote-tracking branch 'origin/master' 2023-09-08 15:08:18 +02:00
stres1
15e56a6639 ferrari label 2023-09-08 15:08:06 +02:00
neo-dl
835f551450 fix stten8 tbt 2023-09-05 18:54:54 +02:00
stten7
8c24b3a783 stten7 fix 2023-09-05 15:07:28 +02:00
germano2239
6a3f192f18 e-daily reprinted labels for zebra printer 2023-09-01 15:28:14 +02:00
neo-dl
df0950930e stten8 discharge 2023-08-28 13:49:34 +02:00
neo-dl
85ef751ad2 stten8 discharge 2023-08-28 10:29:34 +02:00
neo-dl
a725a587ec fix 2023-08-25 18:51:03 +02:00
STTEN8
98e0f3a112 stten8 beta 2023-08-25 15:35:07 +02:00
STTEN8
34a5c434a5 Merge remote-tracking branch 'origin/master' 2023-08-25 14:58:27 +02:00
STTEN8
ab0df50dab stten8 beta 2023-08-25 14:58:07 +02:00
neo-dl
86b839aff3 discard piece tbt 2023-08-23 15:08:22 +02:00
neo-dl
1956a4da8d optional tecna internal discharge 2023-08-09 11:32:49 +02:00
neo-dl
f5bffe31a2 mod autotest cfg 2023-08-08 12:07:00 +02:00
neo-dl
c960ac4dfd mod autotest cfg 2023-08-08 11:06:37 +02:00
STTEN8
d89d6ffa01 stten8 beta 2023-08-01 15:51:38 +02:00
stten5
b3cfffa69a Merge remote-tracking branch 'origin/master' 2023-08-01 14:57:35 +02:00
stten5
d402a8d3c5 STTEN5 2023-08-01 14:57:19 +02:00
germano2239
17d7fedb7f lbl ferrari & aston martin 2023-07-31 19:27:00 +02:00
STTEN8
b5e4d465e0 stten8 beta 2023-07-28 12:17:14 +02:00
STTEN8
371b48d997 stten8 wip 2023-07-27 18:19:05 +02:00
germano laptop
59cb76c443 stten8 beta ok 2023-07-27 12:02:37 +02:00
germano
d26c23c82f stten8 wip 2023-07-26 21:29:14 +02:00
neo-dl
6a96328b14 stten8 wip 2023-07-26 19:40:55 +02:00
germano
6346a91c19 PID params tbt 2023-07-24 22:46:19 +02:00
germano laptop
0ff07836ed blow&flush beta ok 2023-07-24 18:11:47 +02:00
neo-dl
6d65d00d88 flush_blow option wip 2023-07-24 14:31:52 +02:00
neo-dl
9bf1d6b0fd Merge branch 'flushdev'
# Conflicts:
#	config/machine_settings/st-ten-6.ini
2023-07-24 09:02:55 +02:00
neo-dl
900e94daa3 flush_blow option wip 2023-07-22 12:42:25 +02:00
stres1
4eb1e0e0ad ferrari cam wip 2023-07-19 18:40:11 +02:00
stten5
91fe3c12ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/st-ten-5.ini
2023-07-19 17:26:57 +02:00
neo-dl
13684e8ab6 instruction reminder ok 2023-07-18 16:47:06 +02:00
neo-dl
2b681f13b5 blow&flush wip 2023-07-18 15:20:53 +02:00
stten5
0ddae686a1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/st-ten-5.ini
2023-07-18 12:18:59 +02:00
stten5
dae0073bd7 STTEN5 2023-07-18 11:25:51 +02:00
neo-dl
216a957fc6 blow&flush wip 2023-07-14 17:09:29 +02:00
Utente
7a7d7eb197 fix positive qpos in tube-tube check 2023-07-13 16:31:10 +02:00
Utente
9de63dad9c stten4 2023-07-13 16:07:37 +02:00
Utente
2b6480129b stten4 2023-07-06 13:58:29 +02:00
Utente
e9a11be9d3 Merge remote-tracking branch 'origin/master' 2023-07-01 16:17:13 +02:00
Utente
241f669aa4 stten4 2023-07-01 16:16:58 +02:00
stten7
36115d55d7 stten7 2023-07-01 11:34:51 +02:00
neo-dl
1fada57b7a stten4 2023-06-30 15:59:40 +02:00
germano2239
fe320af13e lbl ferrari 2023-06-29 15:47:44 +02:00
neo-dl
db92d7741e rfid beta 2023-06-28 19:49:13 +02:00
neo-dl
2e6f3840e3 rfid wip 2023-06-23 19:25:41 +02:00
neo-dl
79d99bd718 autotest window fix 2023-06-23 10:20:26 +02:00
neo-dl
ce525e99e5 autotest window fix 2023-06-18 16:44:43 +02:00
Guglielmi
cab8e27724 passaggio solo 20pn 2023-06-15 11:26:50 +02:00
Guglielmi
bb01c51eeb Merge remote-tracking branch 'origin/master'
# Conflicts:
#	runme_custom.sh
2023-06-13 10:32:23 +02:00
Guglielmi
d3118de973 passaggio 20pn 2023-06-13 10:31:49 +02:00
stten6
2e6a754393 stten6 at window ok 2023-06-10 11:22:26 +02:00
stten6
ab539bd50f Merge remote-tracking branch 'origin/master' 2023-06-10 09:55:34 +02:00
stten6
554263cc21 stten6 2023-06-10 09:55:19 +02:00
neo-dl
1d1457f29c autotest window tbt 2023-05-31 15:02:06 +02:00
stres1
068cf7b973 dev stten1 2023-05-22 09:23:37 +02:00
stres1
d59e9744e4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/test/test.py
2023-05-22 08:56:40 +02:00
stres1
57780e1e59 dev stten1 2023-05-22 08:52:20 +02:00
stten6
c561db8128 stten6 2023-05-20 09:13:03 +02:00
neo-dl
66b94fef6f rfid wip 2023-05-16 19:39:30 +02:00
STTEN8
0617d0f4bb discard wip 2023-05-12 09:05:17 -07:00
stten6
9064950213 Merge remote-tracking branch 'origin/master' 2023-05-12 15:18:45 +02:00
stten7
311159ae8a stten7 2023-05-11 17:53:56 +02:00
stten6
bea5c30295 stten6 2023-05-11 11:19:08 +02:00
neo-dl
dcc2167f8c vision oring tbt 2023-05-02 19:18:58 +02:00
neo-dl
367d0cf178 stten8 begin 2023-04-29 15:11:32 +02:00
Utente
e459443a86 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/hostnames.ini
#	config/machine_settings/st-ten-4.ini
2023-04-28 09:32:25 +02:00
Utente
7ff770f43b stten4 2023-04-28 09:30:25 +02:00
ST-TEN-1
24c50d990d DEV 2023-04-21 12:16:42 +02:00
neo-dl
7fd2328a04 stten3 update 2023-04-21 10:56:27 +02:00
neo-dl
9955ceeb0a fix 2023-04-12 15:01:23 +02:00
Guglielmi
a5a39b581a sistemato MB1 2023-04-12 14:15:03 +02:00
neo-dl
4e787a679b review instruction during leak test wip 2023-04-12 11:38:30 +02:00
Guglielmi
a660f32a1c sistemato 3681 2023-04-12 10:26:13 +02:00
neo-dl
0705d40a09 new sensor id ok 2023-04-11 17:01:17 +02:00
ST-TEN-1
d38c39acfe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/test_leak/test_leak.py
2023-04-11 10:54:06 +02:00
ST-TEN-1
2707e54e74 DEV 2023-04-11 10:52:42 +02:00
stten5
51a93116b3 STTEN5 2023-03-27 09:14:01 +02:00
neo-dl
918488896d autotest stten5 2023-03-25 15:28:51 +01:00
germano laptop
609e432e8d dev 2023-03-13 18:38:30 +01:00
neo-dl
697f3a109e Merge remote-tracking branch 'origin/master' 2023-03-13 15:26:33 +01:00
neonb
e600e2e01e oring 2023-03-13 15:06:56 +01:00
neo-dl
d686e3310c barcode recipe selection wip 2023-03-03 18:51:35 +01:00
stten6
59ead323b7 stten6 autotest ok 2023-02-27 12:17:53 +01:00
stten6
7c90b0408e stten6 ok 2023-02-27 11:49:51 +01:00
germano
a15630d430 Merge remote-tracking branch 'origin/master' 2023-02-26 19:10:01 +01:00
germano
1a5536f4d2 config-dependent autotest tbt 2023-02-26 19:09:46 +01:00
germano2239
0e895efde3 fix io test 2023-02-24 19:05:52 +01:00
germano
247ac72261 stten6 dev 2023-02-21 23:36:27 +01:00
stten5
f08736bcb2 STTEN5 2023-02-20 17:59:07 +01:00
stten5
551910e145 STTEN5 2023-02-20 16:30:23 +01:00
stten5
4b473fc77b STTEN5 2023-02-18 11:26:30 +01:00
stten5
18729fd24e Merge remote-tracking branch 'origin/master' 2023-02-17 18:27:05 +01:00
stten5
90915b1602 STTEN5 wip 2023-02-17 18:26:48 +01:00
stten6
34a740e4e5 stten6 ok 2023-02-17 17:38:03 +01:00
germano2239
586a800d04 Merge remote-tracking branch 'origin/master' 2023-02-17 14:07:38 +01:00
stten6
f3d1418118 stten6 wip 2023-02-17 12:26:18 +01:00
stten5
9b4e6333a9 extra labels wip 2023-02-17 11:46:30 +01:00
neo-dl
69254a7f35 stten6 wip 2023-02-16 18:58:01 +01:00
germano2239
23595b6f8d Merge remote-tracking branch 'origin/master' 2023-02-16 17:23:02 +01:00
stten6
c2cf424e95 stten6 wip 2023-02-16 13:16:05 +01:00
neo-dl
3a47b6ebe3 second leak test tbt 2023-02-15 13:31:42 +01:00
neo-dl
7d07f9c769 extra label fields tbt 2023-02-14 17:03:17 +01:00
germano2239
1b37ec3bdc extra label fields wip 2023-02-14 16:19:24 +01:00
germano2239
0017d00687 std label tbt 2023-02-14 16:15:22 +01:00
stten6
2cee64fdb8 stten6 wip 2023-02-14 15:06:31 +01:00
neo-dl
e0e5a5d963 Merge remote-tracking branch 'origin/master' 2023-02-09 15:14:47 +01:00
neo-dl
bf7f56f0c4 new label 2023-02-09 15:14:34 +01:00
germano
e837bef74f svg wip 2023-02-07 17:37:09 +01:00
germano
9f7a172546 svg wip 2023-02-01 11:51:57 +01:00
germano
8f708b1f9a svg wip 2023-01-31 17:42:37 +01:00
stten5
6da8c73275 io wip 2023-01-31 15:51:41 +01:00
germano
1022f25daf svg wip 2023-01-31 15:02:27 +01:00
germano
513203f404 svg wip 2023-01-30 16:50:02 +01:00
stten5
62d19bcaf6 MI1 fix 2023-01-27 15:18:12 +01:00
stten5
07d55dcf12 MI1 LABEL 2023-01-27 14:58:40 +01:00
stten5
8c2c595f50 printer test ok 2023-01-27 14:19:34 +01:00
germano
aa9e7bc461 fix print test 2023-01-27 13:51:12 +01:00
germano
2c8abcb8b0 instructions wip 2023-01-26 14:13:03 +01:00
germano
17443bc1c7 custom config in cmd line params 2023-01-20 17:19:39 +01:00
neo-dl
cd188c5d44 fix 2023-01-19 10:40:28 +01:00
germano
14189425ed fix stten3 2023-01-19 10:31:57 +01:00
germano
aad97ef70a fix stten3 2023-01-19 09:49:42 +01:00
germano
6e24e783e2 fix 2023-01-18 18:49:03 +01:00
germano
306e774c26 instructions wip 2023-01-12 22:15:29 +01:00
germano girardi
f7bf61aada st-ten-5 wip 2023-01-11 22:13:01 +00:00
germano
1cf0df0540 test camera linux wip, vision components optional ok 2023-01-11 11:38:13 +01:00
germano
a6021f7d78 test camera linux wip 2023-01-06 15:42:52 +01:00
germano
c8282b5511 warning img tbt 2023-01-05 12:16:04 +01:00
germano
7edbf65c1c dev new features partial 2023-01-04 18:43:10 +01:00
germano
5591116c4d dev new features partial 2023-01-04 18:20:58 +01:00
germano
001f71b8dc usb-5862 tbt 2023-01-03 17:57:14 +01:00
germano
46deb81013 4-wire resistance measurement feature TBT 2022-12-16 11:57:33 +01:00
germano
8c9ee6584e enable autotest override 2022-12-07 17:58:15 +01:00
ST-TEN-1
e60fe622ed Merge remote-tracking branch 'origin/master' 2022-12-06 09:31:14 +01:00
germano2239
575c4b1daa std label tbt 2022-11-17 17:26:11 +01:00
ST-TEN-1
8ab7dfe514 dev stten2 tbt 2022-11-17 09:53:33 +01:00
neo-dl
0e8dd4b6ce split pos & neg resistance tolerance 2022-11-14 16:02:30 +01:00
neo-dl
fd86a629ba ui & csv 2022-11-09 19:00:24 +01:00
matteo porta
e01c8ab3e2 wip 2022-11-09 17:18:11 +01:00
neo-dl
cd9810e356 test himatic import 2022-11-04 18:20:32 +01:00
ST-TEN-1
cfa0665c02 dev stten2 ok 2022-11-04 16:45:42 +01:00
ST-TEN-1
aa48b4d047 dev stten2 2022-11-04 15:17:32 +01:00
stres1
1ea859fc22 dev 2022-10-28 17:34:26 +02:00
stres1
2f34627213 sd dev 2022-10-27 12:07:53 +02:00
neo-dl
0591b9a126 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/recipes_defaults.csv
2022-10-24 18:28:30 +02:00
neo-dl
a6009664e5 cfg change 2022-10-24 18:24:25 +02:00
matteo porta
c81864df72 lot counter 2022-10-24 16:51:58 +02:00
matteo porta
7fa2039e52 wip 2022-10-24 12:19:20 +02:00
germano laptop
fe33cc4d4a upload ok 2022-10-20 09:20:43 +02:00
neo-dl
bfe03b07bd wip 2022-10-19 12:01:45 +02:00
neo-dl
a3f2116da9 wip 2022-10-19 11:58:46 +02:00
matteo porta
37ed5ac009 wip 2022-10-18 11:57:08 +02:00
neo-dl
bf19c783d7 final csv import wip 2022-10-14 10:48:56 +02:00
neo-dl
0ead61b960 final csv import wip 2022-10-13 20:20:04 +02:00
matteo porta
86636736a1 machine description 2022-10-12 16:23:34 +02:00
neo-dl
83a6597238 stten3 dev 2022-10-12 13:26:16 +02:00
mino
8ecb7dcad8 wip 2022-10-11 16:25:18 +02:00
matteo porta
a662a950ee camera 2022-10-11 15:30:53 +02:00
matteo porta
41e7bfe426 Merge remote-tracking branch 'origin/master' 2022-10-10 14:20:49 +02:00
matteo porta
f263f56cf4 screwdriver fix 2022-10-10 14:20:22 +02:00
neo-dl
a9f88fd1bd uvc camera component wip 2022-10-07 22:34:11 +02:00
matteo porta
a20bef6538 fixes 2022-10-04 16:22:37 +02:00
matteo porta
a42b086f26 wip 2022-10-04 13:51:36 +02:00
neo-dl
87e1e18ad3 Merge remote-tracking branch 'origin/master' 2022-10-03 17:24:03 +02:00
matteo porta
af6951c8f9 wip 2022-10-03 17:17:47 +02:00
ST-TEN-1
1c21a35ffd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/test/test_import_tubi_riscaldati.csv
2022-10-03 16:53:08 +02:00
ST-TEN-1
3439249a8d dev stten2 2022-10-03 16:52:05 +02:00
neo-dl
b1e18f520a stten3 dev 2022-10-03 16:50:51 +02:00
neo-dl
4dab4a60a0 screwdriver component wip 2022-09-27 15:50:20 +02:00
matteo porta
2e7e1a015b wip 2022-09-27 14:18:15 +02:00
matteo porta
f14b5dc3ac wip 2022-09-26 13:08:34 +02:00
matteo porta
b5228c8311 wip 2022-09-26 13:00:36 +02:00
matteo porta
90250d622e wip 2022-09-26 12:35:02 +02:00
neo-dl
c7479a5e61 screwdriver component wip 2022-09-23 19:07:36 +02:00
ST-TEN-1
fa4d727254 dev 2022-09-23 18:20:22 +02:00
ST-TEN-1
489db30a4b dev 2022-09-23 17:49:25 +02:00
neo-dl
b00788074e new label 2022-09-22 19:25:31 +02:00
neo-dl
e317e3c122 dev 2022-09-22 18:28:27 +02:00
stres1
870239ffbf cfg fix 2022-09-22 17:47:37 +02:00
ST-TEN-1
1963209cfd dev 2022-09-22 11:21:40 +02:00
matteo porta
24b2bb4758 wip 2022-09-21 16:33:48 +02:00
matteo porta
83b266c72f wip 2022-09-21 16:15:04 +02:00
matteo porta
35a9a30805 wip 2022-09-20 17:42:59 +02:00
stres1
b27f82263b Merge remote-tracking branch 'origin/master' 2022-09-19 09:28:47 +02:00
stres1
3f9e4245ff cfg fix 2022-09-19 09:28:20 +02:00
ST-TEN-1
96f9fa884d dev 2022-09-17 18:06:57 +02:00
ST-TEN-1
4910a6b6eb dev 2022-09-15 15:25:22 +02:00
matteo porta
daa7edbb0a wip 2022-09-14 16:53:55 +02:00
matteo porta
b44005ed05 wip 2022-09-14 14:47:09 +02:00
ST-TEN-1
0a5a009281 wip 2022-09-13 13:17:15 +02:00
matteo porta
7bbde6f2a9 ok 2022-09-06 15:17:25 +02:00
matteo porta
08677a6882 Merge remote-tracking branch 'origin/master' 2022-09-06 15:15:38 +02:00
matteo porta
06f0e8814f optional component initialization and st-ten unification 2022-09-06 12:06:43 +02:00
neo-dl
e7018c2d57 stten3 2022-09-05 15:26:35 +02:00
ST-TEN-1
f89169fa43 wip 2022-08-30 17:00:07 +02:00
matteo porta
a5d57c3bd9 wip 2022-08-24 13:22:16 +02:00
matteo porta
fa9921c9bc wip 2022-08-23 16:00:04 +02:00
matteo porta
cc59c09fd5 Merge branch 'master' into st-ten-2 2022-08-22 12:10:06 +02:00
ST-TEN-1
887766f8ce wip st-ten-2 support for multimeter and no camera/neopixel 2022-08-03 10:47:09 +02:00
matteo porta
3a5043b6b0 Merge remote-tracking branch 'origin/master' 2022-08-02 18:15:49 +02:00
matteo porta
304fd9d664 wip 2022-08-02 18:15:30 +02:00
stres1
fca98bdd0f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/hostnames.ini
2022-08-02 17:33:02 +02:00
stres1
6dac4ae2f2 cfg fix 2022-08-02 17:31:52 +02:00
matteo porta
df3be4c784 wip 2022-08-01 13:36:38 +02:00
matteo porta
3722af34a1 wip 2022-08-01 13:29:12 +02:00
neo-dl
6e8a6ab806 detection ok 2022-07-29 18:54:27 +02:00
stres1
66fb6f3929 detection no-tflite ok 2022-07-29 18:18:29 +02:00
stres1
3c2d6f3775 dev 2022-07-28 12:27:54 +02:00