Commit Graph

22 Commits

Author SHA1 Message Date
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
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