]> defiant.homedns.org Git - ros_wild_thumper.git/commitdiff
www/teleop: Slider unit to m/s
authorErik Andresen <erik@vontaene.de>
Sat, 27 Jan 2018 14:55:48 +0000 (15:55 +0100)
committerErik Andresen <erik@vontaene.de>
Sat, 27 Jan 2018 14:55:48 +0000 (15:55 +0100)
www/index.html

index 87da1eaf2281a5f03543f67c4ef218d8af046f82..8a14cec0f577868e2074bb8f793793e821b1acd8 100644 (file)
                        });
 
                        // Initialize the teleop.
                        });
 
                        // Initialize the teleop.
-                       var teleop = new KEYBOARDTELEOP.Teleop({
+                       teleop = new KEYBOARDTELEOP.Teleop({
                                ros : ros,
                                topic : '/cmd_vel'
                        });
                                ros : ros,
                                topic : '/cmd_vel'
                        });
                        // Create a UI slider using JQuery UI.
                        $('#speed-slider').slider({
                                range : 'min',
                        // Create a UI slider using JQuery UI.
                        $('#speed-slider').slider({
                                range : 'min',
-                               min : 0,
-                               max : 100,
-                               value : 50,
+                               min : 0.10,
+                               max : 1.0,
+                               step : 0.05,
+                               value : 0.5,
                                slide : function(event, ui) {
                                        // Change the speed label.
                                slide : function(event, ui) {
                                        // Change the speed label.
-                                       $('#speed-label').html('Speed: ' + ui.value + '%');
+                                       $('#speed-label').html('Speed: ' + ui.value + ' m/s');
                                        // Scale the speed.
                                        // Scale the speed.
-                                       teleop.scale = (ui.value / 100.0);
+                                       teleop.scale = (ui.value * 2);
                                }
                        });
 
                        // Set the initial speed.
                                }
                        });
 
                        // Set the initial speed.
-                       $('#speed-label').html('Speed: ' + ($('#speed-slider').slider('value')) + '%');
-                       teleop.scale = ($('#speed-slider').slider('value') / 100.0);
+                       $('#speed-label').html('Speed: ' + ($('#speed-slider').slider('value')) + ' m/s');
+                       teleop.scale = ($('#speed-slider').slider('value') * 2);
 
                        $('.led_color').minicolors({
                                control: 'wheel',
 
                        $('.led_color').minicolors({
                                control: 'wheel',