Skip to content

Bug fix/bugs 363 0step value #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alaromeny wants to merge 1 commit into
base: mv2app
Choose a base branch
from
+30 −10
Open

Bug fix/bugs 363 0step value #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions src/blocks/scratch3_mv2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,54 +377,70 @@ class Scratch3Mv2Blocks {

walk_fw (args, util) {
const moveTime = 1500;
let timeOut = moveTime;
let steps = parseInt(args.STEPS);
steps = Math.min(Math.max(steps, 1), 20);
steps = Math.min(Math.max(steps, 0), 20);
const stepLength = 25;
console.log(`traj/step/${steps}/?moveTime=${moveTime}&stepLength=${stepLength}`);
mv2.send_REST(`traj/step/${steps}/?moveTime=${moveTime}&stepLength=${stepLength}`);
if(steps){
timeOut = timeOut * steps;
}
return new Promise(resolve =>
setTimeout(resolve, moveTime * steps));
setTimeout(resolve, timeOut));
}

walk_bw (args, util) {
const moveTime = 1500;
let timeOut = moveTime;
let steps = parseInt(args.STEPS);
steps = Math.min(Math.max(steps, 1), 20);
steps = Math.min(Math.max(steps, 0), 20);
const stepLength = -25;
console.log(`traj/step/${steps}/?moveTime=${moveTime}&stepLength=${stepLength}`);
mv2.send_REST(`traj/step/${steps}/?moveTime=${moveTime}&stepLength=${stepLength}`);
if(steps){
timeOut = timeOut * steps;
}
return new Promise(resolve =>
setTimeout(resolve, moveTime * steps));
setTimeout(resolve, timeOut));
}

walk (args, util) {
let moveTime = parseFloat(args.MOVETIME) * 1000;
moveTime = Math.min(Math.max(moveTime, 1), 10000);
let timeOut = moveTime;
let stepLength = parseInt(args.STEPLEN);
stepLength = Math.min(Math.max(stepLength, -50), 50);
let steps = parseInt(args.STEPS);
steps = Math.min(Math.max(steps, 1), 20);
steps = Math.min(Math.max(steps, 0), 20);
let turn = parseInt(args.TURN);
turn = Math.min(Math.max(turn, -25), 25);
console.log(`traj/step/${steps}/?stepLength=${stepLength}&moveTime=${moveTime}&turn=${turn}`);
mv2.send_REST(`traj/step/${steps}/?stepLength=${stepLength}&moveTime=${moveTime}&turn=${turn}`);
if(steps){
timeOut = timeOut * steps;
}
return new Promise(resolve =>
setTimeout(resolve, moveTime * steps));
setTimeout(resolve, timeOut));
}

turn (args, util) {
const moveTime = 1500;
let timeOut = moveTime;
let steps = parseInt(args.STEPS);
steps = Math.min(Math.max(steps, 1), 20);
steps = Math.min(Math.max(steps, 0), 20);
let turn = 20;
const side = args.SIDE;
if (side === '1'){
turn *= -1;
}
console.log(`traj/step/${steps}/?moveTime=${moveTime}&turn=${turn}&stepLength=1`);
mv2.send_REST(`traj/step/${steps}/?moveTime=${moveTime}&turn=${turn}&stepLength=1`);
if(steps){
timeOut = timeOut * steps;
}
return new Promise(resolve =>
setTimeout(resolve, moveTime * steps));
setTimeout(resolve, timeOut));
}

wiggle (args, util) {
Expand Down Expand Up @@ -466,13 +482,17 @@ class Scratch3Mv2Blocks {

slide (args, util) {
const moveTime = 1000;
let timeOut = moveTime;
let steps = parseInt(args.STEPS);
steps = Math.min(Math.max(steps, 1), 20);
steps = Math.min(Math.max(steps, 0), 20);
const side = args.SIDE;
console.log(`traj/sidestep/${steps}/?side= ${side}&moveTime=${moveTime}`);
mv2.send_REST(`traj/sidestep/${steps}/?side=${side}&moveTime=${moveTime}`);
if(steps){
timeOut = timeOut * steps;
}
return new Promise(resolve =>
setTimeout(resolve, moveTime * steps));
setTimeout(resolve, timeOut));
}

eyes (args, util) {
Expand Down