Commit Graph

50 Commits

Author SHA1 Message Date
Omer
84ddc8ec4e Cleaned up server.java and creeated a server handler 2019-09-21 16:04:58 +03:00
Banks Troutman
06e7230f46 Add approximate FPS limiter (keeps CPU usage down) 2019-09-21 04:43:13 -04:00
Banks Troutman
17009bc04c Moved camera stream to separate thread 2019-09-20 21:25:54 -04:00
Banks Troutman
096e214a8e Make SettingsManager completely static 2019-09-20 19:54:59 -04:00
Banks Troutman
d733995ac6 Add CameraDeserializer, fix empty camera.json crash 2019-09-20 15:42:13 -04:00
ori
f5c6a92a92 added rounding for contour area 2019-09-20 09:24:20 -07:00
ori
61f21e6b1b fixed empty lists in ui 2019-09-20 01:25:53 -07:00
ori
c143e18f3e opencv cam open bugfix 2019-09-20 11:08:16 +03:00
Banks Troutman
07c21aca1d Allow resolution change to take effect without restarting CameraProcess 2019-09-20 02:30:19 -04:00
Banks Troutman
012aa9559a Moved CvSink/CvSource to Camera class 2019-09-20 02:17:22 -04:00
ori agranat
afb7872eb6 added driver mode check before vision processing loop 2019-09-19 23:35:01 +03:00
Banks Troutman
508ccff766 Full rewrite of camera system 2019-09-19 14:07:42 -04:00
Unknown
b2b2d00dce added networktables send and websocket send of current camera 2019-09-18 13:48:34 +03:00
Unknown
bcaad63c28 Merge remote-tracking branch 'origin/Java' into Java 2019-09-18 10:36:52 +03:00
Unknown
5b75c85c0f removed unnecessary save of cameras current pipline 2019-09-18 10:36:29 +03:00
Banks Troutman
965b3953f9 Separated vision process loop and added PipelineResult class 2019-09-18 03:08:06 -04:00
Omer
7fdab7d3db Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java 2019-09-18 03:06:10 +03:00
Omer
5fd3dc8f6c Added saving for selected pipeline 2019-09-18 03:04:48 +03:00
ori agranat
45916b3e11 removed setCameraSettings function 2019-09-18 00:16:56 +03:00
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
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
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
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
Banks Troutman
25652ba32e Adjusted folder structure to sit under com.chameleonvision package 2019-09-15 15:03:44 -04: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
92c9306feb initial dependency load 2019-09-10 21:52:13 +03:00