scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

All EV3 blocks stubbed out with console logs for now.

Browse source
This commit is contained in:
Evelyn Eastmond 2018-06-25 14:11:26 -04:00 committed by Ray Schamp
parent 2d8ad05a78
commit 42e0576549
1 changed files with 179 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,25 @@ const MOTOR_PORTS = [
* the EV3 hub. * the EV3 hub.
* @type {array} * @type {array}
*/ */
// const SENSOR_PORTS = ['1', '2', '3', '4']; // TODO: are these names/values correct?
const SENSOR_PORTS = [
{
name: '1',
value: 1
},
{
name: '2',
value: 2
},
{
name: '3',
value: 3
},
{
name: '4',
value: 4
}
];
class EV3 { class EV3 {
@ -299,7 +317,7 @@ class Scratch3Ev3Blocks {
blocks: [ blocks: [
{ {
opcode: 'motorTurnClockwise', opcode: 'motorTurnClockwise',
text: '[PORT] turn clockwise [TIME] seconds', text: 'motor [PORT] turn clockwise for [TIME] seconds',
blockType: BlockType.COMMAND, blockType: BlockType.COMMAND,
arguments: { arguments: {
PORT: { PORT: {
@ -315,7 +333,7 @@ class Scratch3Ev3Blocks {
}, },
{ {
opcode: 'motorTurnCounterClockwise', opcode: 'motorTurnCounterClockwise',
text: '[PORT] turn counter [TIME] seconds', text: 'motor [PORT] turn counter for [TIME] seconds',
blockType: BlockType.COMMAND, blockType: BlockType.COMMAND,
arguments: { arguments: {
PORT: { PORT: {
@ -329,6 +347,122 @@ class Scratch3Ev3Blocks {
} }
} }
}, },
{
opcode: 'motorRotate',
text: 'motor [PORT] rotate [DEGREES] degrees',
blockType: BlockType.COMMAND,
arguments: {
PORT: {
type: ArgumentType.STRING,
menu: 'motorPorts',
defaultValue: MOTOR_PORTS[0].value
},
DEGREES: {
type: ArgumentType.NUMBER,
defaultValue: 90
}
}
},
{
opcode: 'motorSetPosition',
text: 'motor [PORT] set position [DEGREES] degrees',
blockType: BlockType.COMMAND,
arguments: {
PORT: {
type: ArgumentType.STRING,
menu: 'motorPorts',
defaultValue: MOTOR_PORTS[0].value
},
DEGREES: {
type: ArgumentType.NUMBER,
defaultValue: 90
}
}
},
{
opcode: 'motorSetPower',
text: 'motor [PORT] set power [POWER] %',
blockType: BlockType.COMMAND,
arguments: {
PORT: {
type: ArgumentType.STRING,
menu: 'motorPorts',
defaultValue: MOTOR_PORTS[0].value
},
POWER: {
type: ArgumentType.NUMBER,
defaultValue: 50
}
}
},
{
opcode: 'getMotorPosition',
text: 'motor [PORT] position',
blockType: BlockType.REPORTER,
arguments: {
PORT: {
type: ArgumentType.STRING,
menu: 'motorPorts',
defaultValue: MOTOR_PORTS[0].value
}
}
},
{
opcode: 'whenButtonPressed',
text: 'when button [PORT] pressed',
blockType: BlockType.HAT,
arguments: {
PORT: {
type: ArgumentType.STRING,
menu: 'sensorPorts',
defaultValue: SENSOR_PORTS[0].value
}
}
},
{
opcode: 'whenDistanceLessThan',
text: 'when distance < [DISTANCE]',
blockType: BlockType.HAT,
arguments: {
DISTANCE: {
type: ArgumentType.NUMBER,
defaultValue: 50
}
}
},
{
opcode: 'whenBrightnessLessThan',
text: 'when brightness < [DISTANCE]',
blockType: BlockType.HAT,
arguments: {
DISTANCE: {
type: ArgumentType.NUMBER,
defaultValue: 50
}
}
},
{
opcode: 'buttonPressed',
text: 'button [PORT] pressed?',
blockType: BlockType.BOOLEAN,
arguments: {
PORT: {
type: ArgumentType.STRING,
menu: 'sensorPorts',
defaultValue: SENSOR_PORTS[0].value
}
}
},
{
opcode: 'getDistance',
text: 'distance',
blockType: BlockType.REPORTER
},
{
opcode: 'getBrightness',
text: 'brightness',
blockType: BlockType.REPORTER
},
{ {
opcode: 'beep', opcode: 'beep',
text: 'beep', text: 'beep',
@ -336,7 +470,8 @@ class Scratch3Ev3Blocks {
} }
], ],
menus: { menus: {
motorPorts: this._buildMenu(MOTOR_PORTS) motorPorts: this._buildMenu(MOTOR_PORTS),
sensorPorts: this._buildMenu(SENSOR_PORTS)
} }
}; };
} }
@ -373,6 +508,46 @@ class Scratch3Ev3Blocks {
this._device.motorTurnCounterClockwise(port, time); this._device.motorTurnCounterClockwise(port, time);
} }
motorRotate (args) {
log.info(`motor rotate: ${args}`);
}
motorSetPosition (args) {
log.info(`motor set position: ${args}`);
}
motorSetPower (args) {
log.info(`motor set power: ${args}`);
}
getMotorPosition (args) {
log.info(`get motor position: ${args}`);
}
whenButtonPressed (args) {
log.info(`when button pressed: ${args}`);
}
whenDistanceLessThan (args) {
log.info(`when distance less than: ${args}`);
}
whenBrightnessLessThan (args) {
log.info(`when brightness less than: ${args}`);
}
buttonPressed (args) {
log.info(`button pressed: ${args}`);
}
getDistance () {
log.info(`distance`);
}
getBrightness () {
log.info(`brightness`);
}
beep () { beep () {
return this._device.beep(); return this._device.beep();
} }