Commit Graph

785 Commits

Author SHA1 Message Date
gg
d6c0534db6 smart camera ok memory tbt 2025-02-06 15:05:50 +01:00
gg
24d531af6a smart camera ok memory tbt 2025-02-06 13:49:03 +01:00
99a2e07195 erro handling tecna t3 sim ok tbt on production 2025-02-05 11:39:15 +01:00
e28a0aa46c erro handling tecna t3 sim ok tbt on production 2025-02-05 11:38:40 +01:00
ST-TEN12
a4a2b3a94e seriously? 2025-02-04 17:58:23 +01:00
fcf965bacc PID PRESUURE FIX 2025-02-04 13:27:23 +01:00
7cf3234c4f Merge remote-tracking branch 'origin/master' 2025-02-03 15:54:05 +01:00
0749e277a0 Added pid pressure correction to recipe 2025-02-03 15:53:53 +01:00
ST-TEN12
0280bf5d7d stten12 partial fix 2025-02-03 15:33:41 +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
2d0db4818d Merge remote-tracking branch 'origin/master' 2025-01-31 11:06:54 +01:00
c9a52f0472 New sys.args notifier working 2025-01-31 11:06:41 +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
0de9ad332e fix modbus **kwargs 2025-01-29 14:30:49 +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
57e5a7797e fix rfid 2025-01-27 11:54:00 +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
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
a8cfd52557 Merge remote-tracking branch 'origin/master' 2025-01-24 09:10:15 +01:00
germano laptop
51b1529c12 dev 2025-01-24 09:09:55 +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
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
gg
2d92ab9555 hikrobot dual smart camera test OK 2025-01-22 19:01:57 +01:00
gg
240373973d Merge remote-tracking branch 'origin/master' 2025-01-22 16:25:52 +01:00
gg
15decde342 hikrobot sc finally got the image 2025-01-22 16:25:39 +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
45df1552a1 Merge remote-tracking branch 'origin/master' 2025-01-22 12:27:30 +01:00
neonb
fe460f030a dev TODO test for tecna compatibility 2025-01-22 12:27:15 +01:00
gg
404d9b7a28 Merge remote-tracking branch 'origin/master' 2025-01-21 19:16:34 +01:00
gg
92342c006b hikrobot smart camera getting data wip 2025-01-21 19:16:21 +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
7f7fa06266 hikrobot smart camera almost getting data 2025-01-17 19:17:09 +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
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
eduardo
8117802a0c dev fix src import 2025-01-14 15:43:52 +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
374ea2cfae Merge remote-tracking branch 'origin/master' 2025-01-14 10:16:15 +01:00
356857bb58 dev 2025-01-14 10:13:26 +01:00
gg
8c283376fb RFID connection 2025-01-13 11:56:47 +01:00
gg
7c79bfc6a3 rfid imports 2024-12-24 12:30:17 +01:00
b6211a8dcb Merge remote-tracking branch 'origin/master' 2024-12-24 11:45:16 +01:00
533d010881 dev 2024-12-24 11:44:57 +01:00
gg
4bf753e50a rfid imports 2024-12-24 11:06:51 +01:00
neo-nb3
270366af32 fork nfcpy package as local lib, fixed pn532 baudrate, tbt 2024-12-22 18:39:13 +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
neo
3715436280 extra server on stten1/4/14 tbt 2024-12-06 15:04:14 +01:00
neo
4b63f5b14d extra server on stten1/4/14 tbt 2024-12-06 14:25:41 +01:00
neo-2
33ba90a35b ST TEN 14 2024-12-06 12:05:15 +01:00
neo
3fd2efcd7b extra server on stten1/4/14 tbt 2024-12-06 11:58:57 +01:00
neo
f3b19fd32b extra server on stten1/4/14 tbt 2024-12-06 11:51:45 +01:00
ST-TEN-1
bb2d069d49 FIX 2024-12-06 09:12:10 +01:00
neo
357c517638 extra server on stten1/4/14 tbt 2024-12-05 17:31:49 +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
099a07b08b Merge remote-tracking branch 'origin/master' 2024-12-02 12:24:13 +01:00
2c957a64a2 Log management ok 2024-12-02 12:24:02 +01:00
gg
edc3fa9647 Merge remote-tracking branch 'origin/master' 2024-12-02 11:16:27 +01:00