Merge pull request #234 from smalruby/smalrubot-s1-extension

Smalrubot s1 extension

Author: takaokouji

package-lock.json

@@ -151,6 +151,6 @@
   },
   "dependencies": {
     "lodash.camelcase": "^4.3.0",
-    "scratch-vm": "github:smalruby/scratch-vm#develop"
+    "scratch-vm": "github:smalruby/scratch-vm#smalrubot-s1-extension"
   }
 }

package.json

@@ -51,6 +51,11 @@ import meshInsetIconURL from './mesh/mesh-small.png';
 import meshConnectionIconURL from './mesh/mesh-illustration.png';
 import meshConnectionSmallIconURL from './mesh/mesh-small.png';
 
+import smalrubotS1IconURL from './smalrubot-s1/smalrubot-s1.png';
+import smalrubotS1InsetIconURL from './smalrubot-s1/smalrubot-s1-small.png';
+import smalrubotS1ConnectionIconURL from './smalrubot-s1/smalrubot-s1-illustration.png';
+import smalrubotS1ConnectionSmallIconURL from './smalrubot-s1/smalrubot-s1-small.png';
+
 export default [
     {
         name: (
@@ -356,5 +361,40 @@ export default [
             />
         ),
         helpLink: 'https://github.com/smalruby/smalruby3-gui/wiki/Mesh'
+    },
+    {
+        name: (
+            <FormattedMessage
+                defaultMessage="Smalrubot S1"
+                description="Name for the 'Smalrubot S1' extension"
+                id="gui.smalruby3.extension.smalrubotS1.name"
+            />
+        ),
+        extensionId: 'smalrubotS1',
+        iconURL: smalrubotS1IconURL,
+        insetIconURL: smalrubotS1InsetIconURL,
+        description: (
+            <FormattedMessage
+                defaultMessage="Control the Smalrubot S1."
+                description="Description for the 'Smalrubot S1' extension"
+                id="gui.smalruby3.extension.smalrubotS1.description"
+            />
+        ),
+        featured: true,
+        disabled: false,
+        bluetoothRequired: false,
+        internetConnectionRequired: false,
+        launchPeripheralConnectionFlow: true,
+        useAutoScan: true,
+        connectionIconURL: smalrubotS1ConnectionIconURL,
+        connectionSmallIconURL: smalrubotS1ConnectionSmallIconURL,
+        connectingMessage: (
+            <FormattedMessage
+                defaultMessage="Connecting"
+                description="Message to help people connect to their Smalrubot S1."
+                id="gui.smalruby3.extension.smalrubotS1.connectingMessage"
+            />
+        ),
+        helpLink: 'https://github.com/smalruby/smalruby3-gui/wiki/SmalrubotS1'
     }
 ];

src/lib/libraries/extensions/index.jsx

@@ -28,6 +28,7 @@ import EV3Blocks from './ev3.js';
 import WeDo2Blocks from './wedo2.js';
 import GdxForBlocks from './gdx_for.js';
 import MeshBlocks from './mesh.js';
+import SmalrubotS1Blocks from './smalrubot_s1.js';
 
 const SCALAR_TYPE = '';
 const LIST_TYPE = 'list';
@@ -457,5 +458,6 @@ EV3Blocks(RubyGenerator);
 WeDo2Blocks(RubyGenerator);
 GdxForBlocks(RubyGenerator);
 MeshBlocks(RubyGenerator);
+SmalrubotS1Blocks(RubyGenerator);
 
 export default RubyGenerator;

src/lib/libraries/extensions/smalrubot-s1/smalrubot-s1-illustration.png

@@ -11,7 +11,7 @@ export default function (Generator) {
 
     Generator.mesh_getSensorValue = function (block) {
         const name = Generator.valueToCode(block, 'NAME', Generator.ORDER_NONE) || '" "';
-        return `mesh_sensor_value(${name})\n`;
+        return [`mesh_sensor_value(${name})`, Generator.ORDER_ATOMIC];
     };
 
     return Generator;

src/lib/libraries/extensions/smalrubot-s1/smalrubot-s1-small.png

@@ -0,0 +1,65 @@
+/**
+ * Define Ruby code generator for Smalrubot S1 Blocks
+ * @param {RubyGenerator} Generator The RubyGenerator
+ * @return {RubyGenerator} same as param.
+ */
+export default function (Generator) {
+    Generator.smalrubotS1_action = function (block) {
+        const action = Generator.quote_(
+            Generator.getFieldValue(block, 'ACTION', Generator.ORDER_NONE) || 'forward'
+        );
+        return `smalrubot_s1.action(${action})\n`;
+    };
+
+    Generator.smalrubotS1_actionAndStopAfter = function (block) {
+        const action = Generator.quote_(
+            Generator.getFieldValue(block, 'ACTION', Generator.ORDER_NONE) || 'forward'
+        );
+        const secs = Generator.valueToCode(block, 'SECS', Generator.ORDER_NONE) || 1;
+        return `smalrubot_s1.action(${action}, ${secs})\n`;
+    };
+
+    Generator.smalrubotS1_bendArm = function (block) {
+        const degree = Generator.valueToCode(block, 'DEGREE', Generator.ORDER_NONE) || 90;
+        const secs = Generator.valueToCode(block, 'SECS', Generator.ORDER_NONE) || 1;
+        return `smalrubot_s1.bend_arm(${degree}, ${secs})\n`;
+    };
+
+    Generator.smalrubotS1_getSensorValue = function (block) {
+        const position = Generator.quote_(
+            Generator.getFieldValue(block, 'POSITION', Generator.ORDER_NONE) || 'left'
+        );
+        return [`smalrubot_s1.sensor_value(${position})`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.smalrubotS1_turnLedOn = function (block) {
+        const position = Generator.quote_(
+            Generator.getFieldValue(block, 'POSITION', Generator.ORDER_NONE) || 'left'
+        );
+        return `smalrubot_s1.led(${position}, true)\n`;
+    };
+
+    Generator.smalrubotS1_turnLedOff = function (block) {
+        const position = Generator.quote_(
+            Generator.getFieldValue(block, 'POSITION', Generator.ORDER_NONE) || 'left'
+        );
+        return `smalrubot_s1.led(${position}, false)\n`;
+    };
+
+    Generator.smalrubotS1_getMotorSpeed = function (block) {
+        const position = Generator.quote_(
+            Generator.getFieldValue(block, 'POSITION', Generator.ORDER_NONE) || 'left'
+        );
+        return [`smalrubot_s1.get_motor_speed(${position})`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.smalrubotS1_setMotorSpeed = function (block) {
+        const position = Generator.quote_(
+            Generator.getFieldValue(block, 'POSITION', Generator.ORDER_NONE) || 'left'
+        );
+        const speed = Generator.valueToCode(block, 'SPEED', Generator.ORDER_NONE) || 1;
+        return `smalrubot_s1.set_motor_speed(${position}, ${speed})\n`;
+    };
+
+    return Generator;
+}

src/lib/libraries/extensions/smalrubot-s1/smalrubot-s1.png

@@ -24,6 +24,7 @@ import EV3Converter from './ev3';
 import Wedo2Converter from './wedo2';
 import GdxForConverter from './gdx_for';
 import MeshConverter from './mesh';
+import SmalrubotS1Converter from './smalrubot_s1';
 
 /* eslint-disable no-invalid-this */
 const ColorRegexp = /^#[0-9a-fA-F]{6}$/;
@@ -68,6 +69,7 @@ class RubyToBlocksConverter {
             Wedo2Converter,
             GdxForConverter,
             MeshConverter,
+            SmalrubotS1Converter,
 
             MotionConverter,
             LooksConverter,
@@ -359,6 +361,10 @@ class RubyToBlocksConverter {
         return _.isNumber(value) || (value && (value.type === 'int' || value.type === 'float'));
     }
 
+    _isTrue (value) {
+        return value === true || (value && value.type === 'true');
+    }
+
     _isFalse (value) {
         return value === false || (value && value.type === 'false');
     }
@@ -781,6 +787,15 @@ class RubyToBlocksConverter {
         return block;
     }
 
+    _changeRubyExpressionBlock (block, opcode, blockType) {
+        this._changeBlock(block, opcode, blockType);
+
+        delete this._context.blocks[block.inputs.EXPRESSION.block];
+        delete block.inputs.EXPRESSION;
+
+        return block;
+    }
+
     _changeToBooleanArgument (varName) {
         varName = varName.toString();
         const variable = this._context.localVariables[varName];