smalruby-editor 0.1.24-x86-mingw32 → 0.2.0-x86-mingw32

data/app/assets/javascripts/msg/ja.js

@@ -8,6 +8,21 @@ goog.require('Blockly.Msg');
  * to message files.
  */
 
+// common
+Blockly.Msg.COMMON_TURN_ON = 'オンにする';
+Blockly.Msg.COMMON_TURN_OFF = 'オフにする';
+Blockly.Msg.COMMON_FORWARD = '進める';
+Blockly.Msg.COMMON_BACKWARD = 'バックさせる';
+Blockly.Msg.COMMON_TURN_LEFT = '左に曲げる';
+Blockly.Msg.COMMON_TURN_RIGHT = '右に曲げる';
+Blockly.Msg.COMMON_STOP = '止める';
+
+
+// colour name
+Blockly.Msg.COLOUR_RED = '赤色';
+Blockly.Msg.COLOUR_GREEN = '緑色';
+
+
 // views/main_menu_view.js.coffee
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LINES = '行';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LETTERS = '文字';
@@ -74,13 +89,16 @@ Blockly.Msg.BLOCKS_SENSING_K_DOWN = '↓';
 Blockly.Msg.BLOCKS_SENSING_K_LEFT = '←';
 Blockly.Msg.BLOCKS_SENSING_K_RIGHT = '→';
 Blockly.Msg.BLOCKS_SENSING_K_SPACE = 'スペース';
-Blockly.Msg.BLOCKS_SENSING_PUSH = '押された';
-Blockly.Msg.BLOCKS_SENSING_HOLD_DOWN = '押され続けている';
-Blockly.Msg.BLOCKS_SENSING_DOWN = Blockly.Msg.BLOCKS_SENSING_PUSH;
+Blockly.Msg.BLOCKS_SENSING_PRESSED = '押された';
+Blockly.Msg.BLOCKS_SENSING_PUSH = Blockly.Msg.BLOCKS_SENSING_PRESSED;
+Blockly.Msg.BLOCKS_SENSING_UP = Blockly.Msg.BLOCKS_SENSING_PRESSED;
+Blockly.Msg.BLOCKS_SENSING_HOLD_PRESSED = '押され続けている';
+Blockly.Msg.BLOCKS_SENSING_HOLD_DOWN = Blockly.Msg.BLOCKS_SENSING_HOLD_PRESSED;
 Blockly.Msg.BLOCKS_SENSING_M_LBUTTON = '左ボタン';
 Blockly.Msg.BLOCKS_SENSING_M_MBUTTON = '中ボタン';
 Blockly.Msg.BLOCKS_SENSING_M_RBUTTON = '右ボタン';
-Blockly.Msg.BLOCKS_SENSING_UP = '離された';
+Blockly.Msg.BLOCKS_SENSING_RELEASED = '離された';
+Blockly.Msg.BLOCKS_SENSING_UP = Blockly.Msg.BLOCKS_SENSING_RELEASED;
 Blockly.Msg.BLOCKS_SENSING_REACH_WALL = '端に触れた';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_PREFIX = 'キーボードの';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_MIDDLE = 'が';
@@ -153,17 +171,15 @@ Blockly.Msg.BLOCKS_LOOKS_HIDE = '隠す';
 Blockly.Msg.BLOCKS_LOOKS_VANISH = '消滅する';
 
 // blocks/hardware.js.coffee.erb
-Blockly.Msg.BLOCKS_HARDWARE_LED_ON = 'LED%1をオンにする';
-Blockly.Msg.BLOCKS_HARDWARE_LED_OFF = 'LED%1をオフにする';
+Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_ON = 'LED%1をオンにする';
+Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_OFF = 'LED%1をオフにする';
 Blockly.Msg.BLOCKS_HARDWARE_ANODE = 'アノード';
 Blockly.Msg.BLOCKS_HARDWARE_CATHODE = 'カソード';
 Blockly.Msg.BLOCKS_HARDWARE_LEFT = ' 左';
 Blockly.Msg.BLOCKS_HARDWARE_RIGHT = '右';
 Blockly.Msg.BLOCKS_HARDWARE_INIT_HARDWARE = 'ハードウェアを準備する';
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_ON = 'set RGB LED %1 common %2 color to %3';
-
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_ON = 'RGB LED%1コモン%2を%3にする';
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_OFF = 'RGB LED%1コモン%2をオフにする';
+Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_SET_COLOR = 'RGB LED%1コモン%2を%3にする';
+Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_TURN_OFF = 'RGB LED%1コモン%2をオフにする';
 Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_SHOW = '7セグディスプレイに%1を表示する';
 Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_OFF = '7セグディスプレイをオフにする';
 Blockly.Msg.BLOCKS_HARDWARE_LCD_PUTS = 'LCDに%1を表示する';
@@ -188,11 +204,15 @@ Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_STOP = '止める';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER = '(モータードライバ%1で)モーターを%2';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SET_SPEED = '(モータードライバ%1の)モーターの速度を%2にする';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SPEED = '(モータードライバ%1の)モーターの速度(%)';
-Blockly.Msg.BLOCKS_HARDWARE_BUTTON_DOWN_OR_UP = 'ボタン%1が%2';
-Blockly.Msg.BLOCKS_HARDWARE_ON_BUTTON_DOWN_OR_UP = 'ボタン%1が%2とき';
-Blockly.Msg.BLOCKS_HARDWARE_BUTTON_NOT_USE_PULLUP = 'ボタン%1のプルアップ抵抗を使わない';
-Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = 'センサー%1';
-Blockly.Msg.BLOCKS_HARDWARE_ON_SENSOR_CHANGE = 'センサー%1が変化したとき';
+Blockly.Msg.BLOCKS_HARDWARE_BUTTON_PRESSED_OR_RELEASED = 'ボタン %1 が %2 ？';
+Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = 'センサー %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LED_TURN_ON_OR_OFF = 'スモウルボットV3の %1 LEDを %2';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SPEED = 'スモウルボットV3の %1 モーターの速度(%)';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SET_SPEED = 'スモウルボットV3の %1 モーターの速度を %2 (%) にする';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = 'スモウルボットV3を %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = 'スモウルボットV3を %2 秒 %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = 'スモウルボットV3の %1 のタッチセンサーが %2 ？';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = 'スモウルボットV3の光センサー';
 
 
 // blocks/operators.js.coffee.erb

data/app/helpers/editor_helper.rb

@@ -32,10 +32,11 @@ module EditorHelper
   # @param [Numeric] value 数値
   # @return [String] XML
   def toolbox_number_value(name, value = 0)
+    value = value.to_i unless value.is_a?(Numeric)
     <<-XML.strip_heredoc.html_safe
       <value name="#{h name}">
         <block type="math_number">
-          <field name="NUM">#{h value.to_i}</field>
+          <field name="NUM">#{h value}</field>
         </block>
       </value>
     XML

data/app/models/concerns/ruby_to_block/block/{hardware_button_down_or_up.rb → hardware_button_pressed_or_released.rb}

@@ -1,11 +1,11 @@
 module RubyToBlock
   module Block
-    class HardwareButtonDownOrUp < Value
+    class HardwareButtonPressedOrReleased < Value
       include CharacterOperation
       include HardwareOperation
 
       blocknize '^\s*' + CHAR_RE +
-                'button\(' + DIO_PIN_RE + '\)\.(down|up)\?\s*$',
+                'button\(' + DIO_PIN_RE + '\)\.(pressed|released)\?\s*$',
                 value: true
 
       def self.process_match_data(md, context)
@@ -14,7 +14,7 @@ module RubyToBlock
         character = get_character(context, md2[1])
         return false if context.receiver && context.receiver != character
 
-        block = new(fields: { PIN: md2[2], DOU: md2[3] })
+        block = new(fields: { PIN: md2[2], POR: md2[3] })
         context.add_value(block)
         block.character = character
 

data/app/models/concerns/ruby_to_block/block/{hardware_led_on.rb → hardware_led_turn_off.rb}

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module RubyToBlock
   module Block
-    class HardwareLedOn < CharacterMethodCall
-      blocknize '^\s*' + CHAR_RE + 'led\("(D(?:[2-9]|1[0-3]))"\).on\s*$',
+    class HardwareLedTurnOff < CharacterMethodCall
+      blocknize '^\s*' + CHAR_RE + 'led\("(D(?:[2-9]|1[0-3]))"\).turn_off\s*$',
                 statement: true
 
       def self.process_match_data(md, context)

data/app/models/concerns/ruby_to_block/block/{hardware_led_off.rb → hardware_led_turn_on.rb}

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 module RubyToBlock
   module Block
-    class HardwareLedOff < CharacterMethodCall
-      blocknize '^\s*' + CHAR_RE + 'led\("(D(?:[2-9]|1[0-3]))"\).off\s*$',
+    class HardwareLedTurnOn < CharacterMethodCall
+      blocknize '^\s*' + CHAR_RE + 'led\("(D(?:[2-9]|1[0-3]))"\).turn_on\s*$',
                 statement: true
 
       def self.process_match_data(md, context)

data/app/models/concerns/ruby_to_block/block/hardware_operation.rb

@@ -10,6 +10,8 @@ module RubyToBlock
       AIO_PIN_RE = '\s*"(A[0-5])"\s*'
       TWO_WHEEL_DRIVE_CAR_PIN_RE = '\s*"(D[56])"\s*'
       LOR_RE = '(left|right)'
+      POR_RE = '(pressed|released)'
+      ACTION_RE = '(forward|backward|turn_left|turn_right|stop)'
     end
   end
 end

data/app/models/concerns/ruby_to_block/block/{hardware_rgb_led_on.rb → hardware_rgb_led_set_color.rb}

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 module RubyToBlock
   module Block
-    class HardwareRgbLedOn < CharacterMethodCall
+    class HardwareRgbLedSetColor < CharacterMethodCall
       # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE + 'rgb_led_(anode|cathode)\("(D[39])"\).on\(color:\s*\[(\d+),\s*(\d+),\s*(\d+)\]\)\s*$',
+      blocknize '^\s*' + CHAR_RE + 'rgb_led_(anode|cathode)\("(D[39])"\).color\s*=\s*\[(\d+),\s*(\d+),\s*(\d+)\]\s*$',
                 statement: true
       # rubocop:enable LineLength
 

data/app/models/concerns/ruby_to_block/block/{hardware_rgb_led_off.rb → hardware_rgb_led_turn_off.rb}

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 module RubyToBlock
   module Block
-    class HardwareRgbLedOff < CharacterMethodCall
+    class HardwareRgbLedTurnOff < CharacterMethodCall
       # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE + 'rgb_led_(anode|cathode)\("(D[39])"\)\.off\s*$',
+      blocknize '^\s*' + CHAR_RE + 'rgb_led_(anode|cathode)\("(D[39])"\)\.turn_off\s*$',
                 statement: true
       # rubocop:enable LineLength
 

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotV3Action < CharacterMethodCall
+      include HardwareOperation
+
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_v3\.' + ACTION_RE +
+                '\s*$',
+                statement: true, inline: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { ACTION: md2[2] }))
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action_with_sec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotV3ActionWithSec < CharacterMethodCall
+      include HardwareOperation
+
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_v3\.' + ACTION_RE +
+                '\(\s*sec:\s*(\d+(?:\.\d+)?)\)' +
+                '\s*$',
+                statement: true, inline: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { ACTION: md2[2] }),
+                                        SEC: md2[3])
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_led_turn_on_or_off.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotV3LedTurnOnOrOff < CharacterMethodCall
+      include HardwareOperation
+
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_v3\.(red|green)_led.(turn_on|turn_off)' +
+                '\s*$',
+                statement: true, inline: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        block = new(fields: { COLOUR: md2[2], OOO: md2[3] })
+        add_character_method_call_block(context, md2[1], block)
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_light_sensor_value.rb

@@ -0,0 +1,28 @@
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotV3LightSensorValue < Value
+      include CharacterOperation
+
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_v3\.' +
+                'light_sensor\.value' +
+                '\s*$',
+                value: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        character = get_character(context, md2[1])
+        return false if context.receiver && context.receiver != character
+
+        block = new
+        context.add_value(block)
+        block.character = character
+
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_touch_sensor_pressed_or_released.rb

@@ -0,0 +1,29 @@
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotV3TouchSensorPressedOrReleased < Value
+      include CharacterOperation
+      include HardwareOperation
+
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_v3\.' +
+                LOR_RE + '_touch_sensor\.' + POR_RE + '\?' +
+                '\s*$',
+                value: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        character = get_character(context, md2[1])
+        return false if context.receiver && context.receiver != character
+
+        block = new(fields: { LOR: md2[2], POR: md2[3] })
+        context.add_value(block)
+        block.character = character
+
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_commands.rb

@@ -2,7 +2,9 @@
 module RubyToBlock
   module Block
     class HardwareTwoWheelDriveCarCommands < Value
-      blocknize '^\s*"(forward|backward|turn_left|turn_right|stop)"\s*$',
+      include HardwareOperation
+
+      blocknize '^\s*"' + ACTION_RE + '"\s*$',
                 value: true, priority: 1
 
       def self.process_match_data(md, context)

data/app/views/editor/_toolbox.html.haml

@@ -140,6 +140,19 @@
           = toolbox_pin_field('D6')
           = toolbox_number_value('SPEED', 100)
 
+        - subcategory = 'smalrubot_v3'
+        %block{type: "#{category}_#{subcategory}_action"}
+          %field{name: 'ACTION'}<
+            forward
+
+        %block{type: "#{category}_#{subcategory}_action_with_sec"}
+          %field{name: 'ACTION'}<
+            forward
+          = toolbox_number_value('SEC', 0.5)
+
+        %block{type: "#{category}_#{subcategory}_motor_set_speed"}
+          = toolbox_number_value('SPEED', 100)
+
   - category = 'looks'
   %category{:name => t('.looks')}
     -# [　]と(　)秒言う
@@ -187,17 +200,17 @@
       - category = 'hardware'
       - subcategory = 'led'
       -# LED[▼PIN]をオンにする
-      %block{:type => "#{category}_#{subcategory}_on"}
+      %block{:type => "#{category}_#{subcategory}_turn_on"}
 
       -# LED[▼PIN]をオフにする
-      %block{:type => "#{category}_#{subcategory}_off"}
+      %block{:type => "#{category}_#{subcategory}_turn_off"}
 
       - subcategory = 'rgb_led'
       -# RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
-      %block{:type => "#{category}_#{subcategory}_on"}
+      %block{:type => "#{category}_#{subcategory}_set_color"}
 
       -# RGB LED[▼アノード]コモン[▼PIN]をオフにする
-      %block{:type => "#{category}_#{subcategory}_off"}
+      %block{:type => "#{category}_#{subcategory}_turn_off"}
 
       - subcategory = 'seven_segment_display'
       -# 7セグディスプレイに[▼0-9]を表示する
@@ -214,6 +227,13 @@
       -# LCDをクリアする
       %block{:type => "#{category}_#{subcategory}_clear"}
 
+      - subcategory = 'smalrubot_v3'
+      %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
+        %field{name: 'COLOUR'}<
+          red
+        %field{name: 'OOO'}<
+          turn_on
+
   - category = 'sound'
   %category{:name => t('.sound')}
     -# [▼プリセット音声]の音を鳴らす
@@ -257,14 +277,6 @@
     -# [▼キャラクター]にぶつかったとき
     %block{:type => "#{category}_on_hit"}
 
-    - if !raspberrypi?
-      - category = 'hardware'
-      -# センサー[▼PIN]が変化したとき
-      %block{:type => "#{category}_on_sensor_change"}
-
-      -# ボタン[▼PIN]が[▼押された]とき
-      %block{:type => "#{category}_on_button_down_or_up"}
-
   - category = 'control'
   %category{:name => t('.control')}
     %category{:name => t('.control_loop')}
@@ -359,7 +371,7 @@
           = toolbox_pin_field('A0')
 
         -# 条件:ボタン[▼PIN]が[▼押された]
-        %block{:type => "#{category}_button_down_or_up"}
+        %block{:type => "#{category}_button_pressed_or_released"}
           = toolbox_pin_field('D3')
 
         -# 2WD車[▼PIN]の[▼LOR]の速度%
@@ -370,6 +382,11 @@
         %block{:type => "#{category}_motor_driver_speed"}
           = toolbox_pin_field('D6')
 
+        - subcategory = 'smalrubot_v3'
+        %block{type: "#{category}_#{subcategory}_touch_sensor_pressed_or_released"}
+        %block{type: "#{category}_#{subcategory}_light_sensor_value"}
+        %block{type: "#{category}_#{subcategory}_motor_speed"}
+
   - category = 'operators'
   %category{:name => t('.operators')}
     %category{:name => t('.operators_calculate')}
@@ -477,7 +494,3 @@
       %category{:name => t('.etc_hardware')}
         -# ハードウェアを準備する
         %block{:type => "#{category}_init_hardware"}
-
-        -# ボタン[▼PIN]のプルアップ抵抗を使わない
-        %block{:type => "#{category}_button_not_use_pullup"}
-          = toolbox_pin_field('D3')

data/app/views/layouts/application.html.erb

@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>smalruby-editor</title>
+  <title>
+    <%= t('common.smalruby_editor', version: SmalrubyEditor::VERSION) %>
+  </title>
   <%= favicon_link_tag %>
   <link rel="apple-touch-icon" href="apple-touch-icon.png" />
   <meta name="application-name" content="Smalruby" />

data/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   common:
+    smalruby_editor: "Smalruby v%{version}"
     "ok": "OK"
     cancel: "Cancel"