gg
|
10c9284d00
|
Merge remote-tracking branch 'origin/master'
|
2025-01-24 09:35:34 +01:00 |
|
germano laptop
|
d99922c1b9
|
dev
|
2025-01-24 08:23:45 +01:00 |
|
germano laptop
|
dd452081a5
|
Merge remote-tracking branch 'origin/master'
|
2025-01-24 08:21:41 +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 |
|
|
|
d7d59ff76c
|
dev
|
2025-01-23 09:07:55 +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
|
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 |
|
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 |
|
