scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix motor turn for ports C/D. Zero out sensors and motor values on disconnect.

Browse source
This commit is contained in:
Evelyn Eastmond 2018-07-03 14:38:17 -04:00 committed by Ray Schamp
parent a220829007
commit f511730602
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/extensions/scratch3_ev3/index.js
View file

@ -171,8 +171,16 @@ class EV3 {
disconnectSession () { disconnectSession () {
this._bt.disconnectSession(); this._bt.disconnectSession();
window.clearInterval(this._pollingIntervalID); // TODO: window? window.clearInterval(this._pollingIntervalID); // TODO: window?
this.speed = 50;
this._sensors = {
distance: 0,
brightness: 0,
buttons: [0, 0, 0, 0]
};
this._motorPositions = [0, 0, 0, 0];
this._sensorPorts = []; this._sensorPorts = [];
this._motorPorts = []; this._motorPorts = [];
this._pollingIntervalID = null;
} }
/** /**
@ -885,17 +893,39 @@ class Scratch3Ev3Blocks {
} }
motorTurnClockwise (args) { motorTurnClockwise (args) {
const port = Cast.toNumber(args.PORT); const port = Cast.toNumber(args.PORT); // TODO: fix
const time = Cast.toNumber(args.TIME) * 1000; const time = Cast.toNumber(args.TIME) * 1000;
return this._device.motorTurnClockwise(port, time); let p = null;
if (port === 1) {
p = 1;
} else if (port === 2) {
p = 2;
} else if (port === 3) {
p = 4;
} else if (port === 4) {
p = 8;
}
return this._device.motorTurnClockwise(p, time);
} }
motorTurnCounterClockwise (args) { motorTurnCounterClockwise (args) {
const port = Cast.toNumber(args.PORT); const port = Cast.toNumber(args.PORT); // TODO: fix
const time = Cast.toNumber(args.TIME) * 1000; const time = Cast.toNumber(args.TIME) * 1000;
return this._device.motorTurnCounterClockwise(port, time); let p = null;
if (port === 1) {
p = 1;
} else if (port === 2) {
p = 2;
} else if (port === 3) {
p = 4;
} else if (port === 4) {
p = 8;
}
return this._device.motorTurnCounterClockwise(p, time);
} }
motorRotate (args) { motorRotate (args) {