feat: add MicroBit More tilt/pin Ruby conversion (Issue #20)

src/containers/ruby-tab/microbit-more-snippets.json

@@ -11,7 +11,7 @@
     },
     "microbit_more.button_pressed?": {
         "snippet": "microbit_more.button_pressed?(\"${1:A}\")",
-        "description": "ボタン [A▼] が押されている",
+        "description": "ボタン [A▼] が押された",
         "type": "value"
     },
     "microbit_more.when_pin_is": {
@@ -24,11 +24,26 @@
         "description": "ピン [ログ▼] がタッチされている",
         "type": "value"
     },
+    "microbit_more.when_pin_connected": {
+        "snippet": "microbit_more.when_pin_connected(${1:0}) do\n\t${2}\nend",
+        "description": "ピン [0▼] がつながったとき",
+        "type": "event"
+    },
     "microbit_more.when": {
-        "snippet": "microbit_more.when(\"${1:shake}\") do\n\t${2}\nend",
-        "description": "[ゆさぶられた▼] とき",
+        "snippet": "microbit_more.when(\"${1:moved}\") do\n\t${2}\nend",
+        "description": "[動いた▼] とき",
         "type": "event"
     },
+    "microbit_more.tilted?": {
+        "snippet": "microbit_more.tilted?(\"${1:any}\")",
+        "description": "[どれかの向き▼] に傾いた",
+        "type": "value"
+    },
+    "microbit_more.tilt_angle": {
+        "snippet": "microbit_more.tilt_angle(\"${1:front}\")",
+        "description": "[前▼] 方向の傾き",
+        "type": "variable"
+    },
     "microbit_more.display_pattern": {
         "snippet": "microbit_more.display_pattern(\n\t\"${1:.1.1.}\",\n\t\"${2:1.1.1}\",\n\t\"${3:1...1}\",\n\t\"${4:.1.1.}\",\n\t\"${5:..1..}\"\n)",
         "description": "パターン (♡▼) を表示する",

src/lib/ruby-generator/microbit_more.js

@@ -40,18 +40,26 @@ export default function (Generator) {
         return [`microbit_more.pin_is_touched?(${name})`, Generator.ORDER_FUNCTION_CALL];
     };
 
+    Generator.microbitMore_whenPinConnected = function (block) {
+        block.isStatement = true;
+        const pin = Generator.getFieldValue(block, 'PIN', 'P0').replace('P', '');
+        return `microbit_more.when_pin_connected(${pin}) do\n`;
+    };
+
     const GestureLabel = {
-        TILT_UP: 'tilt up',
-        TILT_DOWN: 'tilt down',
-        TILT_LEFT: 'tilt left',
-        TILT_RIGHT: 'tilt right',
+        TILT_UP: 'tilted_front',
+        TILT_DOWN: 'tilted_back',
+        TILT_LEFT: 'tilted_left',
+        TILT_RIGHT: 'tilted_right',
         FACE_UP: 'face up',
         FACE_DOWN: 'face down',
         FREEFALL: 'freefall',
         G3: '3G',
         G6: '6G',
         G8: '8G',
-        SHAKE: 'shake'
+        SHAKE: 'shake',
+        MOVED: 'moved',
+        TILTED: 'tilted_any'
     };
     Generator.microbitMore_whenGesture = function (block) {
         block.isStatement = true;
@@ -60,6 +68,25 @@ export default function (Generator) {
         return `microbit_more.when(${gestureLabel}) do\n`;
     };
 
+    const TiltedDirectionLabel = {
+        ANY: 'any',
+        TILT_UP: 'front',
+        TILT_DOWN: 'back',
+        TILT_LEFT: 'left',
+        TILT_RIGHT: 'right'
+    };
+    Generator.microbitMore_isTilted = function (block) {
+        const direction = Generator.getFieldValue(block, 'DIRECTION', 'ANY');
+        const directionLabel = Generator.quote_(TiltedDirectionLabel[direction]);
+        return [`microbit_more.tilted?(${directionLabel})`, Generator.ORDER_FUNCTION_CALL];
+    };
+
+    Generator.microbitMore_getTiltAngle = function (block) {
+        const direction = Generator.getFieldValue(block, 'DIRECTION', 'FRONT').toLowerCase();
+        const directionLabel = Generator.quote_(direction);
+        return [`microbit_more.tilt_angle(${directionLabel})`, Generator.ORDER_FUNCTION_CALL];
+    };
+
     const makeMatrixArgs = function (matrix) {
         matrix = matrix.replace(/0/g, '.');
         matrix = matrix.match(/.{5}/g).map(s => Generator.quote_(s));

src/lib/ruby-to-blocks-converter/microbit_more.js

@@ -30,17 +30,19 @@ const TouchEventMenu = {
 };
 
 const GestureMenu = {
-    TILT_UP: 'tilt up',
-    TILT_DOWN: 'tilt down',
-    TILT_LEFT: 'tilt left',
-    TILT_RIGHT: 'tilt right',
+    TILT_UP: 'tilted_front',
+    TILT_DOWN: 'tilted_back',
+    TILT_LEFT: 'tilted_left',
+    TILT_RIGHT: 'tilted_right',
     FACE_UP: 'face up',
     FACE_DOWN: 'face down',
     FREEFALL: 'freefall',
     G3: '3G',
     G6: '6G',
     G8: '8G',
-    SHAKE: 'shake'
+    SHAKE: 'shake',
+    MOVED: 'moved',
+    TILTED: 'tilted_any'
 };
 const GestureMenuLower = Object.entries(GestureMenu).map(x => x[1].toLowerCase());
 const GestureMenuValue = Object.entries(GestureMenu).map(x => x[0]);
@@ -97,6 +99,32 @@ const ConnectionStateMenu = [
     'disconnected'
 ];
 
+const TouchPinIDMenu = {
+    0: 'P0',
+    1: 'P1',
+    2: 'P2'
+};
+const TouchPinIDMenuLower = Object.keys(TouchPinIDMenu);
+const TouchPinIDMenuValue = Object.values(TouchPinIDMenu);
+
+const TiltDirectionMenu = {
+    any: 'ANY',
+    front: 'TILT_UP',
+    back: 'TILT_DOWN',
+    left: 'TILT_LEFT',
+    right: 'TILT_RIGHT'
+};
+const TiltDirectionMenuLower = Object.keys(TiltDirectionMenu);
+const TiltDirectionMenuValue = Object.values(TiltDirectionMenu);
+
+const TiltAngleDirectionMenu = [
+    'FRONT',
+    'BACK',
+    'LEFT',
+    'RIGHT'
+];
+const TiltAngleDirectionMenuLower = TiltAngleDirectionMenu.map(x => x.toLowerCase());
+
 /**
  * MicrobitMore converter
  */
@@ -231,6 +259,59 @@ const MicrobitMoreConverter = {
             return block;
         });
 
+        converter.registerOnSendWithBlock(MicrobitMore, 'when_pin_connected', 1, 0, params => {
+            const {receiver, args, rubyBlock} = params;
+
+            if (converter.isNumber(args[0])) {
+                const index = TouchPinIDMenuLower.indexOf(args[0].toString());
+                if (index < 0) return null;
+
+                args[0] = new Primitive('str', TouchPinIDMenuValue[index], args[0].node);
+            } else {
+                return null;
+            }
+
+            const block = converter.changeRubyExpressionBlock(receiver, 'microbitMore_whenPinConnected', 'hat');
+            converter.addField(block, 'PIN', args[0]);
+            converter.setParent(rubyBlock, block);
+            return block;
+        });
+
+        converter.registerOnSend(MicrobitMore, 'tilted?', 1, params => {
+            const {receiver, args} = params;
+
+            if (converter.isString(args[0])) {
+                const index = TiltDirectionMenuLower.indexOf(args[0].toString().toLowerCase());
+                if (index < 0) return null;
+
+                args[0] = new Primitive('str', TiltDirectionMenuValue[index], args[0].node);
+            } else {
+                return null;
+            }
+
+            const block =
+                  converter.changeRubyExpressionBlock(receiver, 'microbitMore_isTilted', 'value_boolean');
+            converter.addField(block, 'DIRECTION', args[0]);
+            return block;
+        });
+
+        converter.registerOnSend(MicrobitMore, 'tilt_angle', 1, params => {
+            const {receiver, args} = params;
+
+            if (converter.isString(args[0])) {
+                const index = TiltAngleDirectionMenuLower.indexOf(args[0].toString().toLowerCase());
+                if (index < 0) return null;
+
+                args[0] = new Primitive('str', TiltAngleDirectionMenu[index], args[0].node);
+            } else {
+                return null;
+            }
+
+            const block = converter.changeRubyExpressionBlock(receiver, 'microbitMore_getTiltAngle', 'value');
+            converter.addField(block, 'DIRECTION', args[0]);
+            return block;
+        });
+
         converter.registerOnSend(MicrobitMore, 'display_pattern', 5, params => {
             const {receiver, args} = params;
 

src/locales/ja-Hira.js

@@ -210,5 +210,11 @@ export default {
     'gui.smalruby3.blockDisplayModal.operator_mod': '(　) を (　) でわったあまり',
     'gui.smalruby3.blockDisplayModal.operator_round': '(　) をししゃごにゅう',
     'gui.smalruby3.blockDisplayModal.operator_mathop': '(　) の [ぜったいち▼]',
-    'gui.extensionLibrary.showAllExtensions': 'すべてのかくちょうきのうをひょうじ'
+    'gui.extensionLibrary.showAllExtensions': 'すべてのかくちょうきのうをひょうじ',
+
+    // MicroBit More - Tilt gesture labels (override to match microbit extension)
+    'mbitMore.gesturesMenu.tiltUp': 'うえにかたむいた',
+    'mbitMore.gesturesMenu.tiltDown': 'したにかたむいた',
+    'mbitMore.gesturesMenu.tiltLeft': 'ひだりにかたむいた',
+    'mbitMore.gesturesMenu.tiltRight': 'みぎにかたむいた'
 };

src/locales/ja.js

@@ -247,5 +247,11 @@ export default {
     'gui.smalruby3.blockDisplayModal.operator_mod': '(　) を (　) で割った余り',
     'gui.smalruby3.blockDisplayModal.operator_round': '(　) を四捨五入',
     'gui.smalruby3.blockDisplayModal.operator_mathop': '(　) の [絶対値▼]',
-    'gui.extensionLibrary.showAllExtensions': 'すべての拡張機能を表示'
+    'gui.extensionLibrary.showAllExtensions': 'すべての拡張機能を表示',
+
+    // MicroBit More - Tilt gesture labels (override to match microbit extension)
+    'mbitMore.gesturesMenu.tiltUp': '上に傾いた',
+    'mbitMore.gesturesMenu.tiltDown': '下に傾いた',
+    'mbitMore.gesturesMenu.tiltLeft': '左に傾いた',
+    'mbitMore.gesturesMenu.tiltRight': '右に傾いた'
 };

test/integration/ruby-tab/extension_microbit_more.test.js

@@ -51,6 +51,15 @@ describe('Ruby Tab: Microbit More v2 extension blocks', () => {
             microbit_more.when_pin_is("P2", "tapped") do
             end
 
+            microbit_more.when_pin_connected(0) do
+            end
+
+            microbit_more.when_pin_connected(1) do
+            end
+
+            microbit_more.when_pin_connected(2) do
+            end
+
             microbit_more.pin_is_touched?("LOGO")
 
             microbit_more.pin_is_touched?("P2")
@@ -61,6 +70,34 @@ describe('Ruby Tab: Microbit More v2 extension blocks', () => {
             microbit_more.when("6G") do
             end
 
+            microbit_more.when("moved") do
+            end
+
+            microbit_more.when("tilted_any") do
+            end
+
+            microbit_more.when("tilted_front") do
+            end
+
+            microbit_more.when("tilted_back") do
+            end
+
+            microbit_more.when("tilted_left") do
+            end
+
+            microbit_more.when("tilted_right") do
+            end
+
+            microbit_more.tilted?("any")
+
+            microbit_more.tilted?("front")
+
+            microbit_more.tilted?("back")
+
+            microbit_more.tilted?("left")
+
+            microbit_more.tilted?("right")
+
             microbit_more.display_pattern(
               ".1.1.",
               "1.1.1",
@@ -89,6 +126,14 @@ describe('Ruby Tab: Microbit More v2 extension blocks', () => {
 
             microbit_more.roll
 
+            microbit_more.tilt_angle("front")
+
+            microbit_more.tilt_angle("back")
+
+            microbit_more.tilt_angle("left")
+
+            microbit_more.tilt_angle("right")
+
             microbit_more.sound_level
 
             microbit_more.magnetic_force("absolute")