X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=www%2Fassets%2Fjavascripts%2Fapplication.js;h=df4c9ebfefc7ca40845878a06c68b83a65dfa34b;hp=eed4a38f4a565d1d3a121920a3bd1d5254751ef5;hb=2b77cd47ca07d0e078b3dd27616ab255b7657db1;hpb=5d2b909797fd168b0981af8f4570d608a9a32626 diff --git a/www/assets/javascripts/application.js b/www/assets/javascripts/application.js index eed4a38..df4c9eb 100644 --- a/www/assets/javascripts/application.js +++ b/www/assets/javascripts/application.js @@ -1,8 +1,12 @@ function init() { var ros = new ROSLIB.Ros(); - ros.connect('ws://wildthumper:9090'); + connect(); var isDragging = false; + function connect() { + ros.connect('ws://'+robothostname+':9090'); + } + ros.on('connection', function() { information.alerts.push({message: "Connected to websocket server.", success: true}); }); @@ -13,6 +17,9 @@ function init() { ros.on('close', function() { information.alerts.push({message: "Connection to websocket server closed.", info: true}); + setTimeout(function() { + connect(); + }, 2000); }); //tfClient.subscribe('base_link', function(tf) { @@ -114,6 +121,16 @@ function init() { // Set the initial speed. teleop.scale = ($('#speed-slider').slider('value') * 2); + new Vue({ + el: '#lights', + data: { + front_row: ["[0]", "[1]", "[2]", "[3]"], + top_row: ["[7]", "[6]", "[5]", "[4]"], + aft_row: ["[8]", "[9]", "[10]", "[11]"], + bottom_left_row: ["[14]", "[15]"], + bottom_right_row: ["[13]", "[12]"], + } + }) $('.led_color').minicolors({ control: 'wheel', format: 'rgb', @@ -216,4 +233,19 @@ function init() { speed: $('#speed-slider').slider('value'), } }) + + $(".imagelink").on('click',function(){ + // reload + $("img").attr("src", $("img").attr("src")) + }); } + +Vue.component('input-value', { + template: '#input-value-template', + props: ['value', 'label', 'unit'] +}) + +Vue.component('input-led', { + template: '#input-led-template', + props: ['name', 'label'] +})