diff --git a/api/index.js b/api/index.js index fc8f535e..d77fa089 100644 --- a/api/index.js +++ b/api/index.js @@ -40,15 +40,14 @@ app.get("/status", function (req, res) { res.status(200).json(last_status); }); -app.post("/move_up", function (req, res) { - console.log("got move up request"); - var speed = req.data.speed; +app.post("/move", function (req, res) { + console.log("got move request"); var request = JSON.stringify({ command: 3, - up_down: speed, - left_right: 0, - forward_backward: 0, - yaw: 0, + up_down: req.data.up_down, + left_right: req.data.left_right, + forward_backward: req.data.forward_backward, + yaw: req.data.turn_left_right }); ws.send(request); }); diff --git a/api/views/index.ejs b/api/views/index.ejs index 4a4c756a..c2a865b3 100644 --- a/api/views/index.ejs +++ b/api/views/index.ejs @@ -79,35 +79,47 @@ xhr.send(); } + function send_move_request(data) + { + var xhr = new XMLHttpRequest(); + xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open("POST", "/move", true); + xhr.send(data); + } + function turn_left() { console.log("turnleft"); + send_move_request(JSON.stringify({ "up_down": 0 ,"forward_backward": 0, "left_right": 0, "turn_left_right": -10})); } function turn_right() { console.log("turnright"); + send_move_request(JSON.stringify({ "up_down": 0 ,"forward_backward": 0, "left_right": 0, "turn_left_right": 10})); } function up() { console.log("up"); - var xhr = new XMLHttpRequest(); - xhr.setRequestHeader("Content-Type", "application/json"); - xhr.open("POST", "/move_up", true); - var data = JSON.stringify({ "speed": 1 }); - xhr.send(data); + send_move_request(JSON.stringify({ "up_down": 1 ,"forward_backward": 0, "left_right": 0, "turn_left_right": 0})); } function down() { console.log("down"); + send_move_request(JSON.stringify({ "up_down": -1 ,"forward_backward": 0, "left_right": 0, "turn_left_right": 0})); + } function forward() { - console.log("forward"); + console.log("forward");send_move_request(JSON.stringify({ "up_down": 0,"forward_backward": 1, "left_right": 0, "turn_left_right": 0})); + } function backward() { console.log("backward"); + send_move_request(JSON.stringify({ "up_down": 0 ,"forward_backward": -1, "left_right": 0, "turn_left_right": 0})); } function left() { console.log("left"); + send_move_request(JSON.stringify({ "up_down": 0 ,"forward_backward": 0, "left_right": -1, "turn_left_right": 0})); } function right() { console.log("right"); + send_move_request(JSON.stringify({ "up_down": 0 ,"forward_backward": 0, "left_right": 1, "turn_left_right": 0})); } function stop() { console.log("stop");