Commit Graph

386 Commits

Author SHA1 Message Date
ori agranat
63290a07d3 simplified the msgpack object using jackson-msgpack 2019-10-14 11:21:20 +03:00
Omer
ca2da43110 Added client parse message 2019-10-14 00:03:22 +03:00
Omer
8b61c87733 Simplified ServerHandler, move ApplyFields to set value function 2019-10-13 22:59:36 +03:00
Omer
27dcef96dd Revert "Simplfied serverhandler and moved alot of the logic to ApplyFields"
This reverts commit 34eda17e97.
2019-10-13 21:58:34 +03:00
Omer
34eda17e97 Simplfied serverhandler and moved alot of the logic to ApplyFields 2019-10-13 00:44:17 +03:00
ori agranat
0aaff35e42 added camera settings send and general settings send 2019-10-12 18:09:05 +03:00
ori agranat
276e425183 added client structure handling for all message types 2019-10-12 16:58:32 +03:00
ori agranat
16d15070d3 fixed store variable naming and sliders number going under min and max values 2019-10-12 12:31:32 +03:00
Omer
9cc30ef6ae Merge branch 'ui-integration' of https://gitlab.com/chameleon-vision/Chameleon-Vision into ui-integration
# Conflicts:
#	New client/chameleon-client/src/views/CameraViewes/ContoursTab.vue
#	New client/chameleon-client/src/views/CameraViewes/InputTab.vue
#	New client/chameleon-client/src/views/CameraViewes/OutputTab.vue
#	New client/chameleon-client/src/views/CameraViewes/ThresholdTab.vue
2019-10-12 03:43:44 +03:00
Omer
5f879f9d98 Added enums, msgpack - new ui intergration 2019-10-12 03:38:42 +03:00
ori agranat
ecbd80768c finished all pipeline values and renamed all as java variables 2019-10-11 15:48:16 +03:00
Omer
2eb4cbc950 very early msgpack handler 2019-10-11 02:25:25 +03:00
ori agranat
0b0798ff51 fixed double emit bug 2019-10-11 01:18:14 +03:00
ori agranat
c841f3d456 key value fix in websocket 2019-10-11 00:48:59 +03:00
ori agranat
0c56aa878e added emmit for more pipeline values 2019-10-11 00:00:57 +03:00
ori agranat
d5cfd7fc72 removed json format in FE websocket 2019-10-10 23:36:33 +03:00
ori agranat
82ee832148 added first data emit 2019-10-10 23:32:55 +03:00
ori agranat
5421bb09f7 added message pack dependency 2019-10-10 22:40:51 +03:00
Banks Troutman
8748dd2503 Merge branch 'networkmanager' into dev 2019-10-07 16:37:05 -04:00
Banks Troutman
34c88cb9a4 Fix for Pi OS detection 2019-10-07 16:36:53 -04:00
ori agranat
eb65156548 merge bugfix 2019-10-07 21:15:17 +03:00
Banks Troutman
61b09f2bf3 Merge branch 'networkmanager' into dev
# Conflicts:
#	Main/src/main/java/com/chameleonvision/util/MathHandler.java
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
2019-10-07 14:08:01 -04:00
Banks Troutman
53585be088 Update WPILib dependencies 2019-10-07 14:04:20 -04:00
Banks Troutman
47307e1fbd Networking bugfixes, added PixelFormat to resolution selection 2019-10-06 21:49:17 -04:00
Banks Troutman
3db2f30ea7 Continued rework of networking, added root check 2019-10-06 17:26:17 -04:00
Banks Troutman
7699766091 Begin network rewrite 2019-10-04 15:55:45 -04:00
ori agranat
285125cc22 removed video mode filter and added pixel format name to the resolution list 2019-10-04 20:17:05 +03:00
ori agranat
259753e582 redone grouped contours and fixed ratio slider 2019-10-04 16:46:16 +03:00
Matt
b618b7f897 Refactor member variables and functions to start with lowercase letters 2019-10-02 22:12:52 -07:00
ori agranat
645e3ed360 fix image location and added lazyload 2019-10-02 23:37:35 +03:00
ori agranat
e6998cc1dd Merge branch 'NewUI' into 'dev'
New ui

See merge request chameleon-vision/Chameleon-Vision!20
2019-10-02 19:32:21 +00:00
ori agranat
ed94dc751f finished basic data flow 2019-10-02 22:07:04 +03:00
ori agranat
48d327fddf added pipeline action menu 2019-10-02 00:14:37 +03:00
ori agranat
2d32fa21ce v1.1.0-BETA 2019-10-01 19:57:46 +03:00
ori agranat
532231341f changed args key name 2019-10-01 19:12:29 +03:00
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
b87d31e465 Added method for arg handling, added NT server mode and NT server host args 2019-10-01 02:19:32 -04:00
Banks Troutman
507592735c Changed all pipeline sets to integer 2019-10-01 02:18:55 -04:00
Banks Troutman
030a089d6b Fix for cscore version 2019-09-30 19:43:42 -04:00
Banks Troutman
74d5b4388f Update to latest cscore build for PS3Eye support 2019-09-30 19:37:47 -04:00
ori agranat
f6ff867070 Merge branch 'pipeline-update' into 'dev'
Pipeline update

See merge request chameleon-vision/Chameleon-Vision!18
2019-09-29 20:47:28 +00: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
1548d3aa14 added default webserver port change from arguments 2019-09-29 15:56:26 +03:00
ori agranat
585cbdae36 Merge branch 'area-slider' into 'dev'
Area slider

See merge request chameleon-vision/Chameleon-Vision!17
2019-09-29 12:40:35 +00:00
ori agranat
55902c45e7 fixed value going under 0 2019-09-28 14:27:50 -07:00
ori agranat
54412657ec Revert "Update MathHandler.java"
This reverts commit eb495284a5.
2019-09-28 14:27:05 -07:00
ori agranat
eb495284a5 Update MathHandler.java 2019-09-28 14:26:11 -07:00
ori agranat
055194f9a7 added sigmoid function 2019-09-29 00:05:20 +03:00
ori agranat
c0d10e7282 full ui finished 2019-09-28 21:42:04 +03:00