Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-21 01:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
653 Commits 3 Branches 97 Tags
3955e707b6b6874f7d09b7a31023e71b91ef403c
Commit Graph

304 Commits

Author SHA1 Message Date
Matt
3955e707b6 Fix 60721ca camera/pipeline rename mixup 2019-11-30 11:10:57 -08:00
Matt
60721cac36 Reset network tables on camera rename 2019-11-30 11:02:10 -08:00
ori agranat
806c8d6968 web socket speed improvement and input values bugfix 2019-11-30 10:39:53 -08:00
ori agranat
5fe728751d moved res and divisor into pipeline in ui 
-- added handling of divisor and res in socket handler 
-- moved pipeline to be index -1 in ui
-- removed driver mode object
 2019-11-30 19:24:03 +02:00
Banks Troutman
9efb6373a6 DriverMode changed to "real" pipeline, fixed pipeline renames 2019-11-30 11:52:35 -05:00
Banks Troutman
98add64c35 add gain setting 2019-11-30 11:08:58 -05:00
ori agranat
89a6d9026d fixed dual contours not drawing 2019-11-30 17:43:32 +02:00
Matt
40d31c4c48 Resolve TODO 2019-11-29 21:46:39 -08:00
Matt
a2c6668280 make pipelinemanager update networktables on ui pipeline change 2019-11-29 21:41:38 -08:00
Matt
373b4262e5 Misc fixes and cleanup 2019-11-29 21:41:12 -08:00
Matt
55f01fb4b5 Only allow changes if we aren't driver mode right now 2019-11-29 21:21:40 -08:00
Matt
4aa9cc5dfc Fix driver mode hash map key bug 2019-11-29 21:18:07 -08:00
Matt
1a9b0982e4 Merge branch 'dev' of https://github.com/chameleon-vision/Chameleon-Vision into dev 2019-11-29 21:05:45 -08:00
Matt
e97c77cc78 compile the new UI 2019-11-29 21:05:34 -08:00
Matt
31f5c805a3 Fix int/double cast exception in request handler 2019-11-29 21:05:21 -08:00
Banks Troutman
e25c2c92d4 fix videomode load from config 2019-11-29 23:52:12 -05:00
Banks Troutman
d01e70b1ec Add PipelineManager 2019-11-29 23:13:57 -05:00
Matt
1674feae73 Fix networktable instantiation in Main 2019-11-29 20:00:49 -08:00
Banks Troutman
5b2af86f87 More UI fixes, add videomode and StreamDivisor to config 2019-11-29 14:24:34 -05:00
ori agranat
3ff1f56bd5 added show multiple switch in ui and back end 2019-11-29 16:50:16 +02:00
ori agranat
720911e5e6 removed unnecessary code 2019-11-29 13:58:37 +02:00
ori agranat
288000b295 fixed resolution list send to ui 2019-11-29 13:34:38 +02:00
Banks Troutman
25613d2625 Fix pipeline renaming and saving, RotationMode UI fix 2019-11-29 00:30:29 -05:00
ori agranat
0b1e0e4701 added setting and getting video mode by index 2019-11-29 01:10:01 +02:00
Matt
efa2aa6cad Merge branch 'dev' of https://github.com/chameleon-vision/Chameleon-Vision into dev 2019-11-28 10:12:42 -08:00
Matt
addd976668 Start on camerastreamer resizing 2019-11-28 10:12:27 -08:00
Matt
2b85d3b120 Revert "Handle generalSettings saving" 
This reverts commit 1d721f7867.
 2019-11-28 20:04:20 +02:00
Matt
1d721f7867 Handle generalSettings saving 2019-11-28 09:13:16 -08:00
Matt
2a96ee917d Fix sockethandler rotation mode/orientation bug 2019-11-28 08:54:24 -08:00
Matt
2347cade4e Fix aux target bug 2019-11-28 08:31:59 -08:00
Unknown
922bceda3e fixed remove pipeline 2019-11-28 13:42:53 +02:00
Unknown
6ae0f0c127 fixed duplicate pipeline 2019-11-28 13:28:36 +02:00
Banks Troutman
a534b6d5ce Cleaned up PipelineConfig 2019-11-28 01:15:24 -05:00
Matt
febd7292cf Start work on video mode selection 2019-11-27 21:11:05 -08:00
Matt
9e068ea0f0 Fix drivermode NPE and rename visionprocess method 2019-11-27 20:41:29 -08:00
Matt
0cb8960005 refactor pipelineConfigPath into CameraConfig 2019-11-27 20:20:00 -08:00
Matt
249d69bf92 Make directories and remove whitespaces from config 2019-11-27 20:06:49 -08:00
Matt
8e5b1848ef Start work on pipelineconfig 2019-11-27 19:51:49 -08:00
Banks Troutman
02adf3c588 Prep for new pipeline config setup 2019-11-27 22:23:02 -05:00
Banks Troutman
07e07df040 Fixed usb camera bug, work on pipeline configs 2019-11-27 19:39:14 -05:00
Matt
5f8ca112a9 Scale area to [0,1] out of total image size in pixels 2019-11-27 16:08:46 -08:00
Matt
bf3de38a2b Merge branch 'dev' of https://github.com/chameleon-vision/Chameleon-Vision into dev 2019-11-27 15:39:30 -08:00
Matt
37159f9e6c Add image rotation mode to CVPipelineSettings 2019-11-27 15:38:59 -08:00
ori agranat
16c6caab8a Merge remote-tracking branch 'origin/dev' into dev 2019-11-28 01:38:52 +02:00
ori agranat
ab9cf217aa bugfix in 2d pipeline and added area in ui 2019-11-28 01:38:45 +02:00
Banks Troutman
221af540b2 GroupContoursPipe optimization 2019-11-27 18:16:00 -05:00
Banks Troutman
c5f2a90f86 Now running after merge to dev 2019-11-27 18:09:41 -05:00
Matt
154667c9d0 Fix average FPS calculation 2019-11-27 14:59:26 -08:00
Banks Troutman
b49ad68df0 Updated SocketHandler dependent classes 2019-11-27 17:43:33 -05:00
Banks Troutman
a0dddc0289 Merge branch 'dev' into class-abstraction 
# Conflicts:
#	.gitignore
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraSerializer.java
#	Main/src/main/java/com/chameleonvision/vision/enums/StreamDivisor.java
#	Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/Server.java
#	Main/src/main/java/com/chameleonvision/web/SocketHandler.java
 2019-11-27 17:40:24 -05:00