Commit Graph

251 Commits

Author SHA1 Message Date
ori
2e5c2bcddb bug fix for creating a new cam 2019-09-17 13:44:42 -07:00
Unknown
326da862c4 added calib calc
added bool to check if calib is done
2019-09-17 13:59:53 +03:00
Unknown
fca17885bb added pipeline listener methods and fixed centermost sort
-added change camera values function
-added pipeline listener
- added driver mode listener 
-changed centermost to use Collections and grab the minimum distance
2019-09-17 11:22:54 +03:00
Banks Troutman
6187b1a205 Added SortMode rect filtering, Added exposure/brightness websocket adjustment 2019-09-17 02:12:53 -04:00
ori agranat
0bbbb8049d added client test for the same message 2019-09-16 23:54:31 +03:00
ori agranat
41aef79d7a added fps counter 2019-09-16 22:36:30 +03:00
ori agranat
e7e0632b2b added group contours method and target intersection 2019-09-16 21:45:04 +03:00
Omer
adc5aa2399 Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java 2019-09-16 18:50:30 +03:00
Omer
8374b9af7b camera and pipeline changes synced 2019-09-16 18:50:00 +03:00
Banks Troutman
99c32e1d18 Fixed area filtering of contours 2019-09-16 11:45:56 -04:00
Banks Troutman
86b811a36d Vision work, move camera calcs to CameraValues class 2019-09-16 04:08:23 -04:00
Omer
dc3936ad8f Websockets almost done, TODO ports,testing 2019-09-16 04:20:40 +03:00
Omer
00552c751a Websockets almost done TODO ports, testing 2019-09-16 04:10:26 +03:00
Banks Troutman
889072e0fe Cleanup pom.xml and add platform-specific classifiers for all JNI 2019-09-15 20:35:59 -04:00
Banks Troutman
0e8029840d Memory usage fixes, general cleanup 2019-09-15 19:07:58 -04:00
Banks Troutman
d04096f2c8 Package change fix
Moved Main.java, added missing import
2019-09-15 15:22:52 -04:00
Banks Troutman
588dfdab54 Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java
# Conflicts:
#	Main/pom.xml
2019-09-15 15:13:29 -04:00
Banks Troutman
f26b7df000 Merge branch 'folderStructure' into Java
# Conflicts:
#	Main/pom.xml
#	Main/src/main/java/com/chameleonvision/web/Server.java
2019-09-15 15:11:26 -04:00
ori agranat
4178b3d6de updated pom file 2019-09-15 22:05:19 +03:00
Banks Troutman
25652ba32e Adjusted folder structure to sit under com.chameleonvision package 2019-09-15 15:03:44 -04:00
ori agranat
3f7f589dc9 Merge branch 'visionLoop' into 'Java'
Vision loop

See merge request chameleon-vision/Chameleon-Vision!9
2019-09-15 19:01:57 +00:00
ori agranat
71e0e9eba7 Merge branch 'Java' into 'visionLoop'
# Conflicts:
#   Main/pom.xml
2019-09-15 19:01:45 +00:00
Unknown
ec5a94d076 pom with opencv from wpilib 2019-09-15 13:58:45 +03:00
Omer
e80f35b39f Client to server handling 2019-09-15 01:55:29 +03:00
ori agranat
440d68a1f1 bugfix for camera mat 0 2019-09-15 00:46:26 +03:00
ori agranat
d6850f73b1 added target grouping 2019-09-14 20:38:50 +03:00
ori agranat
1b8943eb27 stated camera process and vision process
-added camera thread call in main
-initial work on camera process class
-initial work on vision process class
2019-09-14 17:14:49 +03:00
Unknown
cde4a63feb added acess methods
-get current pipeline
- get current camera
- get res list
- set current camera 
-set current pipeline
2019-09-14 13:27:16 +03:00
Unknown
d69d7ddb4f added usb camera settings intiat
- added camera creator
- added pipeline creator
- added camera saver
- added general settings saver
2019-09-14 12:45:00 +03:00
Unknown
2d4acbaf59 added create new cam function 2019-09-13 20:08:40 +03:00
ori agranat
c1f335bab8 added usb cameras info init 2019-09-13 18:20:40 +03:00
ori agranat
aa45f9ece2 added jni libs to pom and stated work on camera info 2019-09-13 02:45:11 +03:00
ori agranat
46891f767e added init general settings function 2019-09-12 23:23:36 +03:00
ori agranat
c5901e1ae5 removed singleton inheritance and re implemented with thread safe 2019-09-12 01:05:27 +03:00
ori agranat
55aa11b08e added settings manager variablers 2019-09-11 22:07:24 +03:00
ori agranat
fc554d6bd6 added website and web socket handler 2019-09-11 20:28:56 +03:00
ori agranat
e72bb51308 initial project setup and updated git ignore 2019-09-10 23:47:06 +03:00
ori agranat
b2486cc4a7 added json and comments 2019-09-10 22:03:05 +03:00
ori agranat
92c9306feb initial dependency load 2019-09-10 21:52:13 +03:00
ori agranat
6966713119 Merge branch 'master' into dev 2019-09-10 20:17:57 +03:00
ori agranat
3112ac74f1 bug fix in vision correction 2019-08-30 23:22:43 +03:00
ori agranat
2d6412c2bc built the site for production 2019-08-30 21:54:45 +03:00
ori agranat
51aac221c5 added logo and fixed arrows in ui menu 2019-08-30 21:52:48 +03:00
ori agranat
8269ee78a3 Merge branch 'dev' into 'master'
v2 final

See merge request oriagranat9/Chameleon-Vision!8
2019-08-28 21:16:37 +00:00
ori agranat
35b1674208 added install script 2019-08-29 00:04:31 +03:00
ori agranat
2291a1e195 updated readme 2019-08-29 00:01:40 +03:00
ori agranat
b88964d31e updated readme 2019-08-28 21:08:51 +03:00
ori
67c6931b6a bug fix in countour 2019-08-28 09:17:23 -07:00
Unknown
135bb12d34 cleanup of old comments 2019-08-22 10:22:08 +03:00
ori agranat
804a1224e4 added adapter error message 2019-08-21 23:01:27 +03:00