Commit Graph

1494 Commits

Author SHA1 Message Date
matteo porta
1a63355a85 wip 2022-08-24 12:59:16 +02:00
matteo porta
fa9921c9bc wip 2022-08-23 16:00:04 +02:00
matteo porta
cc59c09fd5 Merge branch 'master' into st-ten-2 2022-08-22 12:10:06 +02:00
matteo porta
6f21251f0e todo update 2022-08-03 17:45:47 +02:00
matteo porta
fc61dc2068 global result as border 2022-08-03 17:39:09 +02:00
ST-TEN-1
887766f8ce wip st-ten-2 support for multimeter and no camera/neopixel 2022-08-03 10:47:09 +02:00
matteo porta
3a5043b6b0 Merge remote-tracking branch 'origin/master' 2022-08-02 18:15:49 +02:00
matteo porta
304fd9d664 wip 2022-08-02 18:15:30 +02:00
stres1
fca98bdd0f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	config/machine_settings/hostnames.ini
2022-08-02 17:33:02 +02:00
stres1
6dac4ae2f2 cfg fix 2022-08-02 17:31:52 +02:00
matteo porta
df3be4c784 wip 2022-08-01 13:36:38 +02:00
matteo porta
3722af34a1 wip 2022-08-01 13:29:12 +02:00
neo-dl
6e8a6ab806 detection ok 2022-07-29 18:54:27 +02:00
neo-dl
8635c7fd37 Merge remote-tracking branch 'origin/master' 2022-07-29 18:19:10 +02:00
stres1
66fb6f3929 detection no-tflite ok 2022-07-29 18:18:29 +02:00
stres1
a0d1703e8f detection no-tflite ok 2022-07-28 16:13:09 +02:00
stres1
3c2d6f3775 dev 2022-07-28 12:27:54 +02:00
neo-dl
3ad3071561 Merge remote-tracking branch 'origin/master' 2022-07-27 17:46:12 +02:00
matteo porta
18f260bed3 wip 2022-07-27 17:46:01 +02:00
neo-dl
6c154ab2df Merge remote-tracking branch 'origin/master' 2022-07-27 17:13:25 +02:00
matteo porta
966bb3f2eb wip 2022-07-27 17:12:28 +02:00
matteo porta
623e3e3f6f wip 2022-07-27 17:09:17 +02:00
neo-dl
6d0f40ae60 Merge remote-tracking branch 'origin/master' 2022-07-27 16:22:36 +02:00
germano2239
a490db9138 wip gg 2022-07-27 16:21:59 +02:00
neo-dl
a6e9a1a853 Merge remote-tracking branch 'origin/master' 2022-07-27 16:20:52 +02:00
matteo porta
d9b09debb2 wip 2022-07-27 16:05:38 +02:00
neo-dl
15e07c7945 Merge remote-tracking branch 'origin/master' 2022-07-27 15:46:30 +02:00
matteo porta
70c9fb1dbd wip 2022-07-27 15:43:03 +02:00
matteo porta
e7faf3355f wip 2022-07-27 15:36:38 +02:00
matteo porta
8f44ed2ef4 wip 2022-07-27 15:00:28 +02:00
matteo porta
1edfb24415 wip 2022-07-27 14:54:19 +02:00
germano2239
92a0bed98f Merge remote-tracking branch 'origin/master' 2022-07-27 13:31:09 +02:00
germano2239
bc528d6759 wip gg 2022-07-27 13:30:57 +02:00
matteo porta
c450ab75c1 wip 2022-07-26 20:25:23 +02:00
germano2239
15b215e4ae wip gg 2022-07-26 19:03:09 +02:00
germano2239
ce63082d14 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ui/test/test.py
2022-07-26 17:29:51 +02:00
germano2239
ce424dd152 dev gg 2022-07-26 17:27:51 +02:00
matteo porta
e91d2682e7 wip 2022-07-26 16:56:26 +02:00
matteo porta
c5ab2f16dd wip 2022-07-26 16:46:27 +02:00
germano2239
c46d5e1ab0 printer test ok 2022-07-26 16:37:22 +02:00
matteo porta
5bba17f5d3 Merge remote-tracking branch 'origin/master' 2022-07-26 16:19:01 +02:00
matteo porta
417e36d8ad wip 2022-07-26 16:18:44 +02:00
germano2239
50908f237f Merge remote-tracking branch 'origin/master' 2022-07-26 16:12:38 +02:00
germano2239
8be8175ea3 dev gg 2022-07-26 16:12:04 +02:00
germano2239
09ce995866 dev gg 2022-07-26 16:09:01 +02:00
matteo porta
7d02cd8a0d fixes 2022-07-26 16:05:04 +02:00
matteo porta
485594d44b wip 2022-07-26 15:47:31 +02:00
matteo porta
85305c0729 wip 2022-07-26 15:43:11 +02:00
germano2239
0401f26cad dev gg 2022-07-26 15:34:09 +02:00
matteo porta
408a1e466f wip 2022-07-26 12:24:53 +02:00