Commit Graph

108 Commits

Author SHA1 Message Date
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
ST-TEN-1
c36f953012 tecna wip 2022-07-04 12:36:51 +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
281e7b09ec localdev 2022-06-29 11:07:13 +02:00
matteo porta
dec264e054 vision wip 2022-06-21 14:18:49 +02:00
ST-TEN-1
c7f2bf8764 dev 2022-06-20 09:08:34 +02:00