Commit Graph

1134 Commits

Author SHA1 Message Date
ST-TEN-11
f108724ae8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/label_templates/st-ten-15/203/Mclaren_barcode.prn
2025-04-08 12:21:05 +02:00
ST-TEN-11
07bb9bc291 Label fix 2025-04-08 12:19:59 +02:00
gg
b5c239ca03 svg import 2025-04-03 16:20:20 +02:00
ST-TEN12
893a939ef7 Merge remote-tracking branch 'origin/master' 2025-04-03 14:53:24 +02:00
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
5c72a23681 recipes stten12 fix 2025-04-02 15:46:27 +02:00
neo
e75474d516 Merge remote-tracking branch 'origin/master' 2025-04-02 14:34:53 +02:00
neo
3fffb153bd stten12 reprint 2025-04-02 14:34:39 +02:00
ST-TEN12
035739e96e recipes stten12 fix 2025-04-02 13:56:11 +02:00
ST-TEN12
d703830ad6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/csv_import/st-ten-12_RECIPES_31-03-2025.csv
#	config/machine_settings/st-ten-12.ini
2025-04-02 13:42:54 +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
ST-TEN12
f389585594 recipes stten12 fix 2025-04-01 09:09:24 +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
neo
ff4e209251 Merge remote-tracking branch 'origin/master' 2025-03-31 18:22:56 +02:00
neo
6703f6e935 export recipes improvements 2025-03-31 18:22:42 +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
2c252b3626 Merge remote-tracking branch 'origin/master' 2025-03-27 16:16:45 +01:00
86ff1d1c51 Reduce default autotest period to 4 hours.
Changed the default autotest_period from 8.5 hours to 4 hours for better testing frequency. The commented-out code remains as a reference for previous configurations.
2025-03-27 16:16:34 +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
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
01b1ff2cb0 stten8 fix 2025-03-19 12:38:24 +01:00
STTEN8
a08625f9df stten8 2025-03-19 11:45:22 +01:00