Commit Graph

329 Commits

Author SHA1 Message Date
Banks Troutman
c5de2f8f5e Updated Maven Deps to the new WPILib Artifactory, added AARCH64-Bionic support (Jetson) 2019-09-26 14:19:30 -04:00
Banks Troutman
c46ec3066d Update OpenCV to new WPI Maven Repo
Adds support for Linux AARCH64
2019-09-26 01:52:20 -04:00
ori agranat
e665a8c9e6 1.0.2 beta 2019-09-25 21:59:37 +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
2d76152dda Merge branch 'Java' into dev 2019-09-25 13:35:17 -04:00
ori agranat
4b760a9e8a Merge branch 'master' into 'dev'
Master

See merge request chameleon-vision/Chameleon-Vision!15
2019-09-25 17:34:33 +00: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
ori agranat
3af2f3c686 added more pipeline creation for new cam 2019-09-25 10:10:11 -07:00
ori agranat
9bf1bc40c1 Merge branch 'master' of gitlab.com:chameleon-vision/Chameleon-Vision 2019-09-25 20:04:43 +03:00
ori agranat
2cec2d83ae changed version number 2019-09-25 20:04:03 +03:00
ori agranat
7113e5147d changed version number 2019-09-25 20:03:41 +03:00
ori agranat
7f529de40c Merge branch 'readme' into 'master'
Update README.md with software installation instructions

See merge request chameleon-vision/Chameleon-Vision!14
2019-09-25 14:52:19 +00:00
Banks Troutman
5eec368f79 Update README.md with software installation instructions 2019-09-25 14:49:46 +00:00
ori agranat
088c32f573 Update README.md 2019-09-24 19:14:52 +00:00
ori agranat
94c3b2db88 Merge branch 'dev' into 'master'
initial version testing

See merge request chameleon-vision/Chameleon-Vision!13
2019-09-24 17:00:17 +00:00
ori agranat
0541865b64 Merge branch 'Java' into 'dev'
java translation complete

See merge request chameleon-vision/Chameleon-Vision!12
2019-09-24 16:52:35 +00:00
ori agranat
e8dc3ed3ac cleanup old code 2019-09-24 19:50:49 +03:00
Banks Troutman
8dbf5b3a73 Potential fix for multi-camera on Windows 2019-09-24 10:35:14 -04:00
Omer
0d9b987b19 Removed windows support for networksettings 2019-09-24 03:31:56 +03:00
Omer
0b5f2b16f8 Fov whole number fix, send full settings on cam change 2019-09-24 03:06:04 +03:00
Omer
e644eec49d Fix for ratio in decimal number 2019-09-24 02:44:02 +03:00
Omer
1def77f36d Hacky fix for two cameras 2019-09-24 02:16:36 +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
Matt
c50b8093f8 Fix manifest inclusion in fat jar 2019-09-22 22:00:39 -07:00
Omer
1a1d77340a Fixed missing parentheses in the intersection code + formatting 2019-09-22 23:33:51 +03:00
Omer
03459be291 Yaw and pitch calculation fix 2019-09-22 22:28:05 +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
012c4f44de added some windows commands 2019-09-22 04:01:01 +03: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
Omer
fecb24e6b4 Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java 2019-09-22 03:37:56 +03:00
Omer
e1dcff91aa Fixed typos 2019-09-22 03:37:25 +03:00
Banks Troutman
2ddddd2955 Update pom.xml to build uberjar 2019-09-21 19:50:18 -04: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
305bd65e43 Merge remote-tracking branch 'origin/Java' into Java 2019-09-21 18:52:36 +03: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
Omer
8a451f74ab Network settings for linux 2019-09-21 18:39:31 +03:00