Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-23 01:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

web socket speed improvement and input values bugfix

Browse Source
This commit is contained in:
ori agranat
2019-11-30 10:39:53 -08:00
parent 5fe728751d
commit 806c8d6968
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/src/main/java/com/chameleonvision/web/SocketHandler.java
View File

@@ -145,16 +145,20 @@ public class SocketHandler {
switch (entry.getKey()) {
case "exposure": {
currentCamera.setExposure((Integer) entry.getValue());
break;
}
case "brightness": {
currentCamera.setBrightness((Integer) entry.getValue());
break;
}
case "videoMode":{
currentCamera.setVideoMode((Integer) entry.getValue());
break;
}
case "streamDivisor":{
VisionProcess currentVisionProcess = VisionManager.getCurrentUIVisionProcess();
currentVisionProcess.cameraStreamer.setDivisor(StreamDivisor.values()[(Integer) entry.getValue()], true);
break;
}
}

7
chameleon-client/src/App.vue
View File

@@ -64,10 +64,11 @@
timer: undefined
}),
created() {
this.$options.sockets.onmessage = async (data) => {
this.$options.sockets.onmessage = (data) => {
try {
var buffer = await data.data.arrayBuffer();
let message = this.$msgPack.decode(buffer);
let message = this.$msgPack.decode(data.data);
for (let prop in message) {
if (message.hasOwnProperty(prop)) {
this.handleMessage(prop, message[prop]);

7
chameleon-client/src/main.js
View File

@@ -16,8 +16,13 @@ if (process.env.NODE_ENV === "production"){
Vue.prototype.$address = location.hostname + ":5800";
}
const url = 'ws://' + Vue.prototype.$address + '/websocket';
var ws = new WebSocket(url);
ws.binaryType = "arraybuffer";
Vue.use(VueNativeSock, 'ws://' + Vue.prototype.$address + '/websocket');
Vue.use(VueNativeSock, url,{
WebSocket: ws
});
Vue.use(VueAxios, axios);
Vue.prototype.$msgPack = msgPack(true);