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 |
|
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 |
|
|
|
68fde4dd39
|
stten15 up
|
2025-03-28 11:36:12 +01:00 |
|
|
|
a13b232832
|
fix
|
2025-03-27 12:53:32 +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 |
|
|
|
7444e01107
|
edaily 926 update
|
2025-03-21 09:15:04 +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
|
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 |
|
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 |
|
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 |
|
ST-TEN-11
|
5ce0e5345e
|
stten11 98facp
|
2025-02-10 11:25:46 +01:00 |
|
|
|
0749e277a0
|
Added pid pressure correction to recipe
|
2025-02-03 15:53:53 +01:00 |
|
ST-TEN-11
|
4318ea96c1
|
stten11 98facp
|
2025-02-03 10:41:03 +01:00 |
|
|
|
849db63176
|
pipe cutter wip
|
2025-01-17 15:14:28 +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
|
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 |
|
Eduardo
|
757867fbda
|
dev stten6
|
2024-12-02 16:26:33 +01:00 |
|
|
|
567a4a4e95
|
st-ten-15
|
2024-11-27 11:45:54 +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 |
|
gg
|
5bb7dd66ce
|
new dime
|
2024-11-11 10:11:24 +01:00 |
|
|
|
e940964f84
|
merge
|
2024-10-24 16:47:56 +02:00 |
|
|
|
6467307957
|
dev
|
2024-10-09 12:07:41 +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 |
|
|
|
363021c8d9
|
Merge remote-tracking branch 'origin/master'
|
2024-10-07 11:49:51 +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 |
|
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 |
|
neonb
|
ded52c83d8
|
new recipes st-ten-11
|
2024-09-30 14:25:38 +02:00 |
|
stten7
|
ed6d2e263b
|
fix
|
2024-09-19 11:04:02 +02:00 |
|
gg
|
e2cfa8204f
|
dogotal i/o
|
2024-09-18 14:47:54 +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 |
|
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 |
|