2019-09-10 21:52:13 +03:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
|
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
|
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
|
<groupId>org.chameleon-vision.main</groupId>
|
|
|
|
|
<artifactId>chameleon-vision</artifactId>
|
Add solvePNP, 3d tab on the UI, and some other misc bug fixes (#35)
* Rebase solvePNP on master
* added 3D tab minimap and csv reader
* More solvePNP
* Create draw pipe for pnp data
* SolvePNP piping work
* Move sorting into solvepnppipe
* Create calibration pipeline
* Update CalibrateSolvePNPPipeline.java
* add camera tilt angle
* Add calibration slider and snapshot button to 3D view
* Mirror updates in the socket handler
* add 3d calibration mode to the pipeline manager
* created calibration functions in ui and backend
* Start plumbing calibration
* Add snapshot and other handling to the RequestHandler
* added select resolution before starting calibration
* Rename solvePNPPipe to bounding box solve pnp pipe
* Update BoundingBoxSolvePNPPipe.java
* Add Mat serializer and CameraCalibrationConfig
* Begun calibration saving, fixed UI/Backend snapshot count mismatch
* Add (unplumbed) option to set checkerboard size
This will allow users to change the units their calibration is in
* Create chessboard.png
* Fix calibration NPE
* changed string serialization to a json send
* bug fixed cancellation button
* Fix spelling of snapshot in 3d.vue
* Plumb resolution change
* Set resolution during config, start on config serialization
* Update .gitignore
* Config fixes
* Start transition away from cvpipeline3d
* fix NPE on uncalibrated cameras
* clear list on fail
* Fix video mode index error
* ignore getters in camera calibration config
* Create json constructor for jsonmat
* get solvePNP mostly returning sane values
* Fix solvePNP bug and add unit test
* FIx calibration mat truncation
* added capture amount model upload and minimap data
* Standardize on meters in calibration and bounding box
* fix json out of bounds and handle null calibration more gracefully
* don't put text on calibrate image, go back to inches
* convert distance to meters
this means calibration will need to be in inches
* Actually save raw contor
* Update GroupContoursPipe.java
* Add all calibration return to camera capture
* hard code 2019 target
* bugfixed draw2d added fail calib popup, merge end and cancel
added the res index to the calib start
* Clarify error message and draw more fancy rectangles
* Cleanup memory in solvepnp
* re did minimap component
* fix npe if left/right is null
* remove references to 2d
* try-catch running the current pipeline
* Add method to find corners using the harris corner detector
* Possibly fix left/right missmatch
* Fix 3D Tab error
* FIx file permissions, mat serializer adjustments
* fixed mini map for field coordinates
* mini map changes fov
* Update SolvePNPPipe.java
* get rid of target corners
* some memory leak fixes
* fixed mini map location
* added position under minimap
* changed player fov look
* put all targets in the web send
* re did target send to ui added target tables, bugfix calibration
* fixed y position
* Add tilt angle to capture properties
* maybe fix y axis in minimap
* Add square size to onCalibrationEnding
* Possibly add square size to UI
* fix NPE with pitch
* Fix bug with sending multiple targets
* Only instantiate 3d stuff if we are in 3d mode
* Fix array list exceptions
* Fix bug in sort contors
list was truncated too early
* added download chess, tilt setting and ordinal tilt,
* added square size connection
* removed unused code
* Update pom version to 2.1-RELEASE
* Send camera calibrations to UI
* Stream pose list to a LIst
* Only stream necessary parts of the aux list entry
* Make broadcastMessage synchronized to prevent ConcurrentModificationExceptions
* added fps counter changed squaresize steps bug fixes in tables
* bugfix camera settings cam wont change
Authored-by: oriagranat9 <oriagranat9@gmail.com>
2019-12-31 04:53:20 -08:00
|
|
|
<version>2.1-RELEASE</version>
|
2019-09-10 21:52:13 +03:00
|
|
|
<build>
|
|
|
|
|
<plugins>
|
2019-09-10 22:03:05 +03:00
|
|
|
<!--setup for java jdk 12-->
|
2019-09-10 21:52:13 +03:00
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
|
|
|
<version>3.8.0</version>
|
|
|
|
|
<configuration>
|
2019-10-13 15:55:07 -04:00
|
|
|
<source>12</source>
|
|
|
|
|
<target>12</target>
|
|
|
|
|
<verbose>true</verbose>
|
2019-09-10 21:52:13 +03:00
|
|
|
</configuration>
|
|
|
|
|
</plugin>
|
2019-09-21 19:50:18 -04:00
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
|
|
|
<version>3.2.1</version>
|
|
|
|
|
<executions>
|
|
|
|
|
<execution>
|
|
|
|
|
<phase>package</phase>
|
|
|
|
|
<goals>
|
|
|
|
|
<goal>shade</goal>
|
|
|
|
|
</goals>
|
2019-09-22 22:00:39 -07:00
|
|
|
<configuration>
|
|
|
|
|
<transformers>
|
2020-01-01 15:46:05 +02:00
|
|
|
<transformer
|
|
|
|
|
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
2019-09-22 22:00:39 -07:00
|
|
|
<mainClass>com.chameleonvision.Main</mainClass>
|
|
|
|
|
</transformer>
|
|
|
|
|
</transformers>
|
|
|
|
|
</configuration>
|
2019-09-21 19:50:18 -04:00
|
|
|
</execution>
|
|
|
|
|
</executions>
|
|
|
|
|
</plugin>
|
2019-09-10 21:52:13 +03:00
|
|
|
</plugins>
|
|
|
|
|
</build>
|
2019-09-15 20:35:59 -04:00
|
|
|
<properties>
|
|
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
2020-01-03 01:31:05 +02:00
|
|
|
<wpilib.version>2020.1.2</wpilib.version>
|
2019-12-06 14:17:07 +02:00
|
|
|
<opencv.version>3.4.7-2</opencv.version>
|
2019-09-15 20:35:59 -04:00
|
|
|
</properties>
|
2019-09-10 21:52:13 +03:00
|
|
|
<repositories>
|
|
|
|
|
<repository>
|
|
|
|
|
<id>WPI</id>
|
2019-09-26 01:52:20 -04:00
|
|
|
<name>WPILib Artifactory Server-releases</name>
|
2020-01-01 15:46:05 +02:00
|
|
|
<url>https://frcmaven.wpi.edu:443/artifactory/release</url>
|
2019-09-26 01:52:20 -04:00
|
|
|
</repository>
|
2019-09-10 21:52:13 +03:00
|
|
|
</repositories>
|
|
|
|
|
<dependencies>
|
2019-09-10 22:03:05 +03:00
|
|
|
<!--javalin micro webservices framework-->
|
2019-09-15 20:35:59 -04:00
|
|
|
<dependency>
|
2019-09-10 21:52:13 +03:00
|
|
|
<groupId>io.javalin</groupId>
|
|
|
|
|
<artifactId>javalin</artifactId>
|
|
|
|
|
<version>3.4.1</version>
|
|
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!--org.json from saving and loading data-->
|
2019-09-10 21:52:13 +03:00
|
|
|
<dependency>
|
2019-09-10 22:03:05 +03:00
|
|
|
<groupId>org.json</groupId>
|
|
|
|
|
<artifactId>json</artifactId>
|
2019-09-15 20:35:59 -04:00
|
|
|
<version>20190722</version>
|
2019-09-10 22:03:05 +03:00
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!--slf4j for javalin -->
|
2019-09-10 23:47:06 +03:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.slf4j</groupId>
|
2019-10-28 20:16:18 +02:00
|
|
|
<artifactId>slf4j-nop</artifactId>
|
2019-09-10 23:47:06 +03:00
|
|
|
<version>1.7.26</version>
|
|
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!--apache common classes libs-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
|
<artifactId>commons-math3</artifactId>
|
|
|
|
|
<version>3.6.1</version>
|
|
|
|
|
</dependency>
|
2019-10-10 22:40:51 +03:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.msgpack</groupId>
|
2019-10-12 03:38:42 +03:00
|
|
|
<artifactId>msgpack-core</artifactId>
|
|
|
|
|
<version>0.8.18</version>
|
2019-10-10 22:40:51 +03:00
|
|
|
</dependency>
|
2019-10-14 11:21:20 +03:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.msgpack</groupId>
|
|
|
|
|
<artifactId>jackson-dataformat-msgpack</artifactId>
|
|
|
|
|
<version>0.8.18</version>
|
|
|
|
|
</dependency>
|
2019-09-21 18:38:08 +03:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
|
<artifactId>commons-lang3</artifactId>
|
|
|
|
|
<version>3.9</version>
|
|
|
|
|
</dependency>
|
2019-11-16 14:30:44 -05:00
|
|
|
|
2019-11-11 17:26:32 +02:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
|
|
|
<artifactId>jackson-core</artifactId>
|
2019-11-16 14:30:44 -05:00
|
|
|
<version>2.10.1</version>
|
2019-11-11 17:26:32 +02:00
|
|
|
</dependency>
|
|
|
|
|
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
|
|
|
<artifactId>jackson-annotations</artifactId>
|
2019-11-16 14:30:44 -05:00
|
|
|
<version>2.10.1</version>
|
2019-11-11 17:26:32 +02:00
|
|
|
</dependency>
|
|
|
|
|
|
2019-09-26 01:52:20 -04:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
|
|
|
<artifactId>jackson-databind</artifactId>
|
2019-11-16 14:30:44 -05:00
|
|
|
<version>2.10.1</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
2019-11-27 14:59:36 -05:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>org.junit.jupiter</groupId>
|
|
|
|
|
<artifactId>junit-jupiter-engine</artifactId>
|
|
|
|
|
<version>5.5.2</version>
|
|
|
|
|
</dependency>
|
|
|
|
|
|
2019-09-15 20:35:59 -04:00
|
|
|
<!-- supported platforms for wpilib JNI classifiers
|
2019-09-26 01:52:20 -04:00
|
|
|
linuxaarch64bionic
|
2019-09-15 20:35:59 -04:00
|
|
|
linuxraspbian
|
|
|
|
|
linuxx86-64
|
2019-09-26 01:52:20 -04:00
|
|
|
osxx86-64
|
2019-09-15 20:35:59 -04:00
|
|
|
windowsx86-64
|
|
|
|
|
-->
|
|
|
|
|
<!--frc cscore java libs-->
|
2019-09-10 22:03:05 +03:00
|
|
|
<dependency>
|
2019-09-10 21:52:13 +03:00
|
|
|
<groupId>edu.wpi.first.cscore</groupId>
|
|
|
|
|
<artifactId>cscore-java</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
</dependency>
|
|
|
|
|
<!--frc cscore interface libs-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.cscore</groupId>
|
|
|
|
|
<artifactId>cscore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-26 14:19:30 -04:00
|
|
|
<classifier>linuxaarch64bionic</classifier>
|
2019-09-15 20:35:59 -04:00
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.cscore</groupId>
|
|
|
|
|
<artifactId>cscore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
<classifier>linuxraspbian</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.cscore</groupId>
|
|
|
|
|
<artifactId>cscore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
<classifier>linuxx86-64</classifier>
|
2019-09-10 21:52:13 +03:00
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
2019-09-13 02:45:11 +03:00
|
|
|
<groupId>edu.wpi.first.cscore</groupId>
|
|
|
|
|
<artifactId>cscore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-26 14:19:30 -04:00
|
|
|
<classifier>osxx86-64</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.cscore</groupId>
|
|
|
|
|
<artifactId>cscore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
<classifier>windowsx86-64</classifier>
|
2019-09-13 02:45:11 +03:00
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!--frc camera server libs-->
|
2019-09-13 02:45:11 +03:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.cameraserver</groupId>
|
|
|
|
|
<artifactId>cameraserver-java</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-13 02:45:11 +03:00
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!--frc network table java libs-->
|
2019-09-13 02:45:11 +03:00
|
|
|
<dependency>
|
2019-09-10 21:52:13 +03:00
|
|
|
<groupId>edu.wpi.first.ntcore</groupId>
|
|
|
|
|
<artifactId>ntcore-java</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-10 21:52:13 +03:00
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!--frc network tables interface libs-->
|
2019-09-10 21:52:13 +03:00
|
|
|
<dependency>
|
2019-09-13 02:45:11 +03:00
|
|
|
<groupId>edu.wpi.first.ntcore</groupId>
|
|
|
|
|
<artifactId>ntcore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-26 14:19:30 -04:00
|
|
|
<classifier>osxx86-64</classifier>
|
2019-09-13 02:45:11 +03:00
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
<groupId>edu.wpi.first.ntcore</groupId>
|
|
|
|
|
<artifactId>ntcore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
<classifier>linuxraspbian</classifier>
|
2019-09-10 21:52:13 +03:00
|
|
|
</dependency>
|
2019-09-12 23:23:36 +03:00
|
|
|
<dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
<groupId>edu.wpi.first.ntcore</groupId>
|
|
|
|
|
<artifactId>ntcore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
<classifier>linuxx86-64</classifier>
|
2019-09-12 23:23:36 +03:00
|
|
|
</dependency>
|
2019-11-26 17:56:21 -05:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.ntcore</groupId>
|
|
|
|
|
<artifactId>ntcore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-11-26 17:56:21 -05:00
|
|
|
<classifier>linuxaarch64bionic</classifier>
|
|
|
|
|
</dependency>
|
2019-09-12 23:23:36 +03:00
|
|
|
<dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
<groupId>edu.wpi.first.ntcore</groupId>
|
|
|
|
|
<artifactId>ntcore-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-15 20:35:59 -04:00
|
|
|
<classifier>windowsx86-64</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
|
|
|
|
|
<!--frc java libs-->
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.wpiutil</groupId>
|
|
|
|
|
<artifactId>wpiutil-java</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${wpilib.version}</version>
|
2019-09-12 23:23:36 +03:00
|
|
|
</dependency>
|
2019-09-15 20:35:59 -04:00
|
|
|
|
|
|
|
|
<!-- WPI OpenCV for all supported platforms -->
|
2019-09-26 01:52:20 -04:00
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.thirdparty.frc2020.opencv</groupId>
|
|
|
|
|
<artifactId>opencv-java</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${opencv.version}</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.thirdparty.frc2020.opencv</groupId>
|
|
|
|
|
<artifactId>opencv-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${opencv.version}</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
<classifier>linuxaarch64bionic</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.thirdparty.frc2020.opencv</groupId>
|
|
|
|
|
<artifactId>opencv-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${opencv.version}</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
<classifier>linuxraspbian</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.thirdparty.frc2020.opencv</groupId>
|
|
|
|
|
<artifactId>opencv-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${opencv.version}</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
<classifier>linuxx86-64</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.thirdparty.frc2020.opencv</groupId>
|
|
|
|
|
<artifactId>opencv-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${opencv.version}</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
<classifier>osxx86-64</classifier>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>edu.wpi.first.thirdparty.frc2020.opencv</groupId>
|
|
|
|
|
<artifactId>opencv-jni</artifactId>
|
2019-12-06 14:17:07 +02:00
|
|
|
<version>${opencv.version}</version>
|
2019-09-26 01:52:20 -04:00
|
|
|
<classifier>windowsx86-64</classifier>
|
|
|
|
|
</dependency>
|
2019-09-10 21:52:13 +03:00
|
|
|
</dependencies>
|
2019-09-15 15:13:29 -04:00
|
|
|
</project>
|