Commit Graph

156 Commits

Author SHA1 Message Date
ori agranat
d59ef217ef Merge branch 'dev' into 'master'
Dev

See merge request oriagranat9/Chameleon-Vision!3
2019-08-11 19:09:24 +00:00
ori
7cd7f4e57f nt pipline listener with ui integration
maybe socket bug fixed
2019-08-11 12:03:31 -07:00
ori
f8e846dda0 bug fixes for calibration module 2019-08-10 10:16:49 -07:00
ori
81667b7b98 finished calibration module 2019-08-09 05:27:08 -07:00
ori agranat
72c2db8aaf Merge branch 'bugfixes' into 'dev'
Bugfixes

See merge request oriagranat9/Chameleon-Vision!2
2019-08-09 10:31:33 +00:00
ori
33701eaf34 added cam port sending and change camera bug fix 2019-08-09 03:29:03 -07:00
ori
f61db90684 first bug fixes 2019-08-09 02:21:52 -07:00
ori
7d5666bfb8 fixes in the ui 2019-07-19 10:30:16 -07:00
ori
b19a34bb29 v1 test and bug fixes 2019-07-19 01:40:06 -07:00
ori agranat
c80f0d9f4b Merge branch 'newVisionLoop' into 'dev'
New vision loop

See merge request oriagranat9/Chameleon-Vision!1
2019-07-19 08:39:09 +00:00
ori
a34cae4c83 bug fixes and angle calc 2019-07-17 22:05:31 -07:00
ori
7cb25a0e8c single contour output and new draw 2019-07-15 12:58:15 -07:00
ori
2f725743f0 added contour merge for contour grouping 2019-07-14 12:36:41 -07:00
ori
685b17bab1 initial work on new vision loop 2019-07-13 13:45:33 -07:00
Sagi Frimer
5637948521 update git ignore 2019-07-03 20:50:34 +03:00
ori
86326e6b42 working send and revice using zmq at high speeds 2019-06-24 13:23:39 -07:00
ori
ea660ea639 sending current pipline using zmq 2019-06-17 12:37:41 -07:00
ori
e4d2f9698f BE saving selected video mode for camera
resolution var needs to be an outer pipline value and not change on pipline changes
2019-06-17 11:16:36 -07:00
ori
b93463b2b8 integrated resulotion list into FE and BE 2019-06-16 11:39:40 -07:00
ori
aed12aafb4 integration of piplines and cams into UI 2019-06-15 13:23:49 -07:00
ori
3dbe097fce initial integration between ui and be 2019-06-14 08:35:42 -07:00
ori
74fbc7a421 cleanup 2019-06-09 11:08:22 -07:00
ori
4c404f1d65 Merge branch 'multiProcessing' into dev 2019-06-09 11:00:50 -07:00
ori
5b68083a56 finished multiprocessing 2019-06-09 11:00:08 -07:00
Sagi Frimer
ab46bee5a8 try async pipe 2019-05-25 17:26:11 +03:00
ori
94f56a0f7c playing with pipe send and recive and async task 2019-05-25 06:20:25 -07:00
Sagi Frimer
2b75059910 fixed something in settingsmng 2019-05-24 17:23:33 +03:00
ori
45f76b8c5f spaning tree using threading and process 2019-05-24 05:16:15 -07:00
ori
1340a2e260 sagi this is for you 2019-05-10 07:01:39 -07:00
ori
7d11467fd3 initial work 2019-05-08 08:54:05 -07:00
ori
d42905db9a working vision handler 2019-05-05 13:48:31 -07:00
ori
18d678d6a2 working vision handler 2019-05-05 13:11:58 -07:00
Sagi Frimer
b5465a22ad bug fix 2019-05-05 22:54:52 +03:00
Sagi Frimer
f92b2f609a supposedly fixed bug 2019-05-05 22:43:37 +03:00
ori
4208b23c60 work on bug 2019-05-05 12:09:43 -07:00
Sagi Frimer
f9f6678455 Fixed wrong call problem 2019-05-05 01:11:23 +03:00
Sagi Frimer
f4bf51ebb2 Fully merged CmerasHandler to SettingManger
hadn't the time to check, also refractord every use of cameras handler to settings manager, might have missed
2019-05-05 01:07:38 +03:00
Sagi Frimer
7ca1bbde1e Merged Cameras handler into settings manager 2019-05-05 00:54:45 +03:00
ori
fc5ddfd937 fixed bugs in settings manager 2019-05-04 14:36:03 -07:00
ori
0907c31aad integration of camera handler into settings manager 2019-05-02 12:42:44 -07:00
ori
ce94cea27b Merge branch 'master' into dev 2019-05-01 12:10:46 -07:00
ori
6c2a2926af new branch and error 2019-05-01 10:37:52 -07:00
ori
93a22ffe9f intagrated setting manager into socket handler and camera handler 2019-05-01 10:16:40 -07:00
ori
82f24882cc mirrored dic keys in ui from backend 2019-05-01 19:57:03 +03:00
ori
406a9f2021 added lists to the ui and the store 2019-05-01 19:46:22 +03:00
ori
d073f6fcd2 working camera process
it need more work with integration
2019-04-29 14:15:53 -07:00
ori
6ee31a9d0c working camera runner 2019-04-29 11:57:18 -07:00
ori
560c619db7 network tables listener and cam values functiuon 2019-04-28 13:30:01 -07:00
Sagi Frimer
17381a37bf Merge remote-tracking branch 'origin/master' 2019-04-28 23:10:11 +03:00
Sagi Frimer
a37e73bde5 fixed problem 2019-04-28 23:10:02 +03:00