Commit Graph

1494 Commits

Author SHA1 Message Date
matteo porta
ec978ec9d5 mino 2022-07-12 14:02:21 +02:00
matteo porta
07f7fd4862 test leak 2022-07-12 11:54:05 +02:00
matteo porta
817d62625e test leak 2022-07-12 10:48:04 +02:00
matteo porta
02cf4797eb fixes 2022-07-06 21:37:08 +02:00
matteo porta
75abe24c54 fixes 2022-07-06 17:18:32 +02:00
matteo porta
a3a4de18dd 3.9 logging compatibility 2022-07-06 13:23:46 +02:00
neo-dl
9635c831a9 Merge remote-tracking branch 'origin/master' 2022-07-06 12:10:26 +02:00
matteo porta
1a35e49115 fixes 2022-07-06 11:54:44 +02:00
neo-dl
f5865b6f28 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/defaults.ini
#	src/components/galaxy_camera.py
2022-07-06 11:09:23 +02:00
matteo porta
ddda7357ad fixes 2022-07-05 18:23:25 +02:00
matteo porta
1581c3607e Merge remote-tracking branch 'origin/master' 2022-07-05 18:16:46 +02:00
matteo porta
a3b38a63d3 fixes 2022-07-05 18:16:22 +02:00
ST-TEN-1
c36f953012 tecna wip 2022-07-04 12:36:51 +02:00
matteo porta
514964d7c6 camera config 2022-06-29 15:00:40 +02:00
neo-dl
494dd3dc91 Merge remote-tracking branch 'origin/master' 2022-06-29 13:16:28 +02:00
matteo porta
80c4fe3cf6 camera config 2022-06-29 13:12:23 +02:00
matteo porta
e2b0912aa8 testing 2022-06-29 13:04:31 +02:00
neo-dl
36e0821ed8 Merge remote-tracking branch 'origin/master' 2022-06-29 12:12:01 +02:00
matteo porta
4d5c654707 confix 2022-06-29 12:11:54 +02:00
neo-dl
736aa98c9c Merge remote-tracking branch 'origin/master' 2022-06-29 12:09:56 +02:00
matteo porta
3c77f6e6f5 lights 2022-06-29 12:09:48 +02:00
neo-dl
fcec8ef9e8 Merge remote-tracking branch 'origin/master' 2022-06-29 11:58:33 +02:00
matteo porta
8a7a0a65ff lights 2022-06-29 11:58:24 +02:00
neo-dl
1a06d3264b Merge remote-tracking branch 'origin/master' 2022-06-29 11:41:51 +02:00
matteo porta
351b990509 lights 2022-06-29 11:41:36 +02:00
neo-dl
25cfd672d9 Merge remote-tracking branch 'origin/master' 2022-06-29 11:07:19 +02:00
neo-dl
281e7b09ec localdev 2022-06-29 11:07:13 +02:00
matteo porta
05dde48ee6 lights 2022-06-29 11:02:58 +02:00
matteo porta
d867ec709d vision 2022-06-28 12:44:28 +02:00
matteo porta
d60589ad8f Merge remote-tracking branch 'origin/master' 2022-06-28 12:32:36 +02:00
matteo porta
37ca9d9d38 vision wip 2022-06-28 12:31:41 +02:00
matteo porta
f25e0c2db6 vision wip 2022-06-27 11:03:26 +02:00
neo-dl
7505dea99a ring light init 2022-06-24 17:02:44 +02:00
matteo porta
4537c9fbc1 vision wip 2022-06-22 17:18:29 +02:00
matteo porta
dec264e054 vision wip 2022-06-21 14:18:49 +02:00
matteo porta
9986e35310 Merge remote-tracking branch 'origin/master' 2022-06-21 14:18:06 +02:00
matteo porta
ca947434f8 vision wip 2022-06-21 14:10:52 +02:00
ST-TEN-1
f99891cf25 Merge branch 'master' of https://gitlab.com/neosystems/errecinque/mappano/st-ten-1
# Conflicts:
#	config/machine_settings/defaults.ini
#	init.sh
#	simulate.sh
#	src/components/__init__.py
#	src/components/component.py
#	src/lib/db/__init__.py
#	src/lib/db/models/recipes.py
#	src/main.py
#	src/requirements.txt
#	src/ui/__init__.py
#	src/ui/crud/crud.py
#	src/ui/dialog/dialog.py
#	src/ui/login/login.py
#	src/ui/recipe_selection/recipe_selection.py
2022-06-20 16:08:02 +02:00
ST-TEN-1
c7f2bf8764 dev 2022-06-20 09:08:34 +02:00
matteo porta
e309021671 ?tecna? 2022-06-08 16:46:47 +02:00
matteo porta
0beb139753 init 2022-06-01 18:37:27 +02:00
ST-TEN-1
9496e78584 dev 2022-05-31 17:07:10 +02:00
matteo porta
5367cfaa1c wip 2022-05-25 17:28:17 +02:00
matteo porta
825b87bf80 init 2022-05-25 15:05:23 +02:00