Commit Graph

54 Commits

Author SHA1 Message Date
Banks Troutman
2097778461 Temp fix for port setting, add flush to NetworkTables, add --manage-network argument 2019-10-01 03:00:42 -04:00
Banks Troutman
507592735c Changed all pipeline sets to integer 2019-10-01 02:18:55 -04:00
ori agranat
4e6bd3e75a bug fixed the sync and bug fixed the pipe change from nt 2019-09-29 08:01:00 -07:00
ori agranat
b13f145ee6 initial pipeline update 2019-09-29 17:39:58 +03:00
ori agranat
055194f9a7 added sigmoid function 2019-09-29 00:05:20 +03:00
ori agranat
267d06f577 removed log scale for area 2019-09-25 11:58:18 -07:00
Banks Troutman
4ddc8e2b08 Merge remote-tracking branch 'origin/dev' into dev 2019-09-25 14:41:40 -04:00
Banks Troutman
b913ea7595 More area slider tweaking 2019-09-25 14:41:24 -04:00
ori agranat
69bb4bc562 bug fix in calibration 2019-09-25 11:08:59 -07:00
ori agranat
42db3c12b5 fixed extent and area 2019-09-25 10:57:29 -07:00
Banks Troutman
abeda8e531 Merge branch 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev
# Conflicts:
#	Main/src/main/java/com/chameleonvision/Main.java
2019-09-25 13:37:17 -04:00
Banks Troutman
d4842154a3 Area slider adjustments, add NT for local testing 2019-09-25 13:32:24 -04:00
ori agranat
f611b857a4 bug fixes and added nt pipline change 2019-09-25 10:32:22 -07:00
Omer
e644eec49d Fix for ratio in decimal number 2019-09-24 02:44:02 +03:00
Banks Troutman
50fb60b3a2 Potential fix for floating point crash with sliders 2019-09-23 18:26:53 -04:00
ori agranat
478222b428 changed gorup from cnter to line mass 2019-09-23 12:36:57 -07:00
ori agranat
5389d79532 added camname with suffix when open a camera and server 2019-09-23 09:22:05 -07:00
Omer
1a1d77340a Fixed missing parentheses in the intersection code + formatting 2019-09-22 23:33:51 +03:00
Banks Troutman
07d0274753 Fixed video mode not being set when loading from json 2019-09-22 13:35:19 -04:00
Banks Troutman
33c35cda86 Merge remote-tracking branch 'origin/Java' into Java
# Conflicts:
#	Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java
2019-09-22 02:51:44 -04:00
Banks Troutman
8c16815305 resolution change fix, various cleanup 2019-09-22 02:49:30 -04:00
Omer
6d4c48e74f removed debugging print 2019-09-22 03:43:00 +03:00
Omer
1110634b29 bug hunting 2019-09-22 03:40:55 +03:00
Banks Troutman
3d1de034c7 Rename Processes, move camera frame get to the publishing thread 2019-09-21 13:30:09 -04:00
Banks Troutman
038e84ce0d Various cleanup, slowed down UI FPS counter 2019-09-21 13:05:00 -04:00
ori
e45b679dc9 Merge remote-tracking branch 'origin/Java' into Java 2019-09-21 09:42:27 -07:00
ori
4160b2aba7 removed unnecessary parameters 2019-09-21 09:42:22 -07:00
ori agranat
d97f3c1e1a added port handling and pipline change sync wth ui
- added port hash map
- putting port into hashmap from camera class
- added sending port from full settings and camera change 
- nt pipe change now sends pipe name to ui
2019-09-21 18:52:28 +03:00
ori
4c315ac554 added image flip and fixed focal length 2019-09-21 08:06:27 -07:00
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
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
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
5fd3dc8f6c Added saving for selected pipeline 2019-09-18 03:04:48 +03: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
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