Commit Graph

26 Commits

Author SHA1 Message Date
ori agranat
e8083794bd bug fix in video mode name 2019-11-30 22:03:28 +02:00
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
Matt
40d31c4c48 Resolve TODO 2019-11-29 21:46:39 -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
Banks Troutman
d01e70b1ec Add PipelineManager 2019-11-29 23:13:57 -05:00
Banks Troutman
5b2af86f87 More UI fixes, add videomode and StreamDivisor to config 2019-11-29 14:24:34 -05: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
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
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
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
Banks Troutman
07e07df040 Fixed usb camera bug, work on pipeline configs 2019-11-27 19:39:14 -05:00
Banks Troutman
c5f2a90f86 Now running after merge to dev 2019-11-27 18:09:41 -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
ori agranat
1198e2cf99 general settings and camera settings as http requests 2019-11-09 19:52:33 +02:00