smalruby-editor 0.1.24 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f7cc4d9a3e93cfb74cbb139e4e46429f3aa6011
-  data.tar.gz: f8837100d385ab0114a1596481b6500dd7852a30
+  metadata.gz: 4f9b14363d11ea6f2183f59c8457d162bb17f186
+  data.tar.gz: ff251621c10ae581bd696908ca3a42e9a1df5346
 SHA512:
-  metadata.gz: b352897a1eea4be81af8b3d72ff7e3d2697c02b2e619656a4ead5ab7943964672f5d0d753f401b88dd5fd5adfbafd0a3d82bc22ea4740bbc6dbd50a177d2451c
-  data.tar.gz: 806c1574f73523fecb2a83fba6288918084ac85ffa7688810a7c4f9d084f73620698f9380af6924e26507a7267bc60f01b0615e464fcf74931601b21e4f8b3e4
+  metadata.gz: 8f2590be9012299e533bc2654f9e422a3701a897dfaaddbc681fe54810948072d7132f4ece20f00d8b39db6ca74c34d12a4f5c750d71b10e7f1639e11eac7fd5
+  data.tar.gz: e43a47979a4e9613db19d3acf1cfa7bbc9334746bbaf4c9744af3a97121948a7e450f568554fa7e69c94e0a44396cef7d4a7827481ddc0f3957c74d4b0ef2964

data/Guardfile

@@ -7,13 +7,19 @@
 ## Uncomment to clear the screen before every task
 # clearing :on
 
+TEMPFILE_BY_EMACS = %r{/\.?\#[^\/]+$}
+
 group :red_green_refactor, halt_on_fail: true do
   guard :rubocop, all_on_start: false do
+    ignore(TEMPFILE_BY_EMACS)
+
     watch(%r{.+\.rb$})
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end
 
   guard :rspec, cmd: 'bundle exec bin/rspec' do
+    ignore(TEMPFILE_BY_EMACS)
+
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
     watch('spec/spec_helper.rb')  { "spec" }
@@ -36,10 +42,13 @@ group :red_green_refactor, halt_on_fail: true do
 end
 
 guard 'livereload' do
+  ignore(TEMPFILE_BY_EMACS)
+
   watch(%r{app/views/.+\.(erb|haml|slim)$})
   watch(%r{app/helpers/.+\.rb})
   watch(%r{public/.+\.(css|js|html)})
   watch(%r{config/locales/.+\.yml})
+
   # Rails Assets Pipeline
   watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
 end

data/app/assets/javascripts/blocks/hardware.js.coffee.erb

@@ -12,8 +12,9 @@ pwmPinDropdown = null
 rgbLedPinDropdown = null
 aiPinDropdown = null
 acDropdown = null
-lorPinDropdown = null
+lorDropdown = null
 twoWDPinDropdown = null
+actionDropdown = null
 
 $(document).ready ->
   # ハードウェアの環境設定
@@ -40,13 +41,21 @@ $(document).ready ->
     [<%= bm('.cathode') %>, 'cathode']
   ]
 
-  lorPinDropdown = [
+  lorDropdown = [
     [<%= bm('.left') %>, 'left'],
     [<%= bm('.right') %>, 'right'],
   ]
 
   twoWDPinDropdown = (["D#{n}", "D#{n}"] for n in [5, 6])
 
+  actionDropdown = [
+    [<%= bm('common.forward') %>, 'forward'],
+    [<%= bm('common.backward') %>, 'backward'],
+    [<%= bm('common.turn_left') %>, 'turn_left'],
+    [<%= bm('common.turn_right') %>, 'turn_right'],
+    [<%= bm('common.stop') %>, 'stop'],
+  ]
+
 # ハードウェアを準備する
 <% n = "#{category}_init_hardware" %>
 Blockly.Blocks['<%= n %>'] =
@@ -65,7 +74,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 # LED[▼PIN]をオンにする
 # LED[▼PIN]をオフにする
 <%
-  %w(on off).each do |method|
+  %w(turn_on turn_off).each do |method|
     n = "#{category}_led_#{method}"
 %>
 
@@ -90,12 +99,12 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 # 「RGB LED」サブジャンル
 
 # RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
-<% n = "#{category}_rgb_led_on" %>
+<% n = "#{category}_rgb_led_set_color" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
-    @interpolateMsg(<%= bm('.rgb_led_on') %>,
+    @interpolateMsg(<%= bm('.rgb_led_set_color') %>,
                     ['AC', ['Dropdown', acDropdown], Blockly.ALIGN_RIGHT],
                     ['PIN', ['Dropdown', rgbLedPinDropdown], Blockly.ALIGN_RIGHT],
                     ['COLOUR', ['Colour', '#ff0000'], Blockly.ALIGN_RIGHT],
@@ -111,16 +120,16 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   red = parseInt(c[1..2], 16)
   green = parseInt(c[3..4], 16)
   blue = parseInt(c[5..6], 16)
-  Blockly.Ruby.characterMethodCall_("rgb_led_#{ac}(#{Blockly.Ruby.quote_(pin)}).on",
-                                    "color: [#{red}, #{green}, #{blue}]")
+  Blockly.Ruby.characterSetVariable_("rgb_led_#{ac}(#{Blockly.Ruby.quote_(pin)}).color",
+                                    "[#{red}, #{green}, #{blue}]")
 
 # RGB LED[▼アノード]コモン[▼PIN]をオフにする
-<% n = "#{category}_rgb_led_off" %>
+<% n = "#{category}_rgb_led_turn_off" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
-    @interpolateMsg(<%= bm('.rgb_led_off') %>,
+    @interpolateMsg(<%= bm('.rgb_led_turn_off') %>,
                     ['AC', ['Dropdown', acDropdown], Blockly.ALIGN_RIGHT],
                     ['PIN', ['Dropdown', rgbLedPinDropdown], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
@@ -131,7 +140,7 @@ Blockly.Blocks['<%= n %>'] =
 Blockly.Ruby['<%= n %>'] = (block) ->
   ac = @getFieldValue('AC')
   pin = @getFieldValue('PIN')
-  Blockly.Ruby.characterMethodCall_("rgb_led_#{ac}(#{Blockly.Ruby.quote_(pin)}).off")
+  Blockly.Ruby.characterMethodCall_("rgb_led_#{ac}(#{Blockly.Ruby.quote_(pin)}).turn_off")
 
 # 「7セグディスプレイ」サブジャンル
 
@@ -285,17 +294,10 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 <% n = "#{category}_#{subcategory}_commands" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
-    commands = [
-      [<%= bm(".#{subcategory}_commands_forward") %>, 'forward'],
-      [<%= bm(".#{subcategory}_commands_backward") %>, 'backward'],
-      [<%= bm(".#{subcategory}_commands_turn_left") %>, 'turn_left'],
-      [<%= bm(".#{subcategory}_commands_turn_right") %>, 'turn_right'],
-      [<%= bm(".#{subcategory}_commands_stop") %>, 'stop'],
-    ]
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @appendDummyInput()
-      .appendField(new Blockly.FieldDropdown(commands), 'COMMAND')
+      .appendField(new Blockly.FieldDropdown(actionDropdown), 'COMMAND')
     @setOutput(true, 'String')
     @setTooltip('')
 
@@ -311,7 +313,7 @@ Blockly.Blocks['<%= n %>'] =
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_set_speed") %>,
                     ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['LOR', ['Dropdown', lorPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
                     ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -333,7 +335,7 @@ Blockly.Blocks['<%= n %>'] =
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_speed") %>,
                     ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['LOR', ['Dropdown', lorPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
@@ -413,96 +415,179 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 # 「ボタン」サブジャンル
 
 # 条件:ボタン[▼PIN]が[▼押された]
-<% n = "#{category}_button_down_or_up" %>
+<% n = "#{category}_button_pressed_or_released" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
-    douDropdown = window.SmalrubyEditor.Sensing.DownOrUpDropdown
+    porDropdown = window.SmalrubyEditor.Sensing.PressedOrReleasedDropdown
 
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
-    @interpolateMsg(<%= bm(".button_down_or_up") %>,
+    @interpolateMsg(<%= bm(".button_pressed_or_released") %>,
                     ['PIN', ['Dropdown', dioPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['DOU', ['Dropdown', douDropdown], Blockly.ALIGN_RIGHT],
+                    ['POR', ['Dropdown', porDropdown], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Boolean')
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   pin = @getFieldValue('PIN')
-  dou = @getFieldValue('DOU')
-  Blockly.Ruby.characterMethodCallInput_("button(#{Blockly.Ruby.quote_(pin)}).#{dou}?")
+  por = @getFieldValue('POR')
+  Blockly.Ruby.characterMethodCallInput_("button(#{Blockly.Ruby.quote_(pin)}).#{por}?")
 
-# ボタン[▼PIN]が[▼押された]とき
-<% n = "#{category}_on_button_down_or_up" %>
+# 「センサー」サブジャンル
+
+# センサー[▼PIN]
+<% n = "#{category}_sensor_value" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
-    douDropdown = window.SmalrubyEditor.Sensing.DownOrUpDropdown
-
     @setHelpUrl('')
-    @setColour(<%= colors[:events] %>)
-    @interpolateMsg(<%= bm('.on_button_down_or_up') %>,
-                    ['PIN', ['Dropdown', dioPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['DOU', ['Dropdown', douDropdown], Blockly.ALIGN_RIGHT],
+    @setColour(<%= colors[:sensing] %>)
+    @interpolateMsg(<%= bm('.sensor_value') %>,
+                    ['PIN', ['Dropdown', aiPinDropdown], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
-    @appendStatementInput('DO')
-    @setPreviousStatement(true)
-    @setNextStatement(true)
+    @setOutput(true, 'Number')
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   pin = @getFieldValue('PIN')
-  dou = @getFieldValue('DOU')
-  Blockly.Ruby.characterEvent_(block, 'DO', "button_#{dou}", Blockly.Ruby.quote_(pin))
+  Blockly.Ruby.characterMethodCallInput_("sensor(#{Blockly.Ruby.quote_(pin)}).value")
+
+# SmalrubotV3 sub category
+<% subcategory = 'smalrubot_v3' %>
 
-# ボタン[▼PIN]のプルアップ抵抗を使わない
-<% n = "#{category}_button_not_use_pullup" %>
+# turn on/off Smalrubot v3 red/green LED
+<% n = "#{category}_#{subcategory}_led_turn_on_or_off" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
+    colourDropdown = [
+      [<%= bm('colour.red') %>, 'red'],
+      [<%= bm('colour.green') %>, 'green'],
+    ]
+    oooDropdown = [
+      [<%= bm('common.turn_on') %>, 'turn_on'],
+      [<%= bm('common.turn_off') %>, 'turn_off'],
+    ]
+
     @setHelpUrl('')
-    @setColour(<%= colors[:etc] %>)
-    @interpolateMsg(<%= bm('.button_not_use_pullup') %>,
-                    ['PIN', ['Dropdown', dioPinDropdown], Blockly.ALIGN_RIGHT],
+    @setColour(<%= colors[:looks] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_led_turn_on_or_off") %>,
+                    ['COLOUR', ['Dropdown', colourDropdown], Blockly.ALIGN_RIGHT],
+                    ['OOO', ['Dropdown', oooDropdown], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  pin = @getFieldValue('PIN')
-  Blockly.Ruby.characterMethodCall_("button(#{Blockly.Ruby.quote_(pin)}).not_use_pullup")
+  colour = @getFieldValue('COLOUR')
+  ooo = @getFieldValue('OOO')
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{colour}_led.#{ooo}")
 
-# 「センサー」サブジャンル
-
-# センサー[▼PIN]
-<% n = "#{category}_sensor_value" %>
+# Smalrubot v3 left/right motor speed
+<% n = "#{category}_#{subcategory}_motor_speed" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
-    @interpolateMsg(<%= bm('.sensor_value') %>,
-                    ['PIN', ['Dropdown', aiPinDropdown], Blockly.ALIGN_RIGHT],
+    @interpolateMsg(<%= bm(".#{subcategory}_motor_speed") %>,
+                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  pin = @getFieldValue('PIN')
-  Blockly.Ruby.characterMethodCallInput_("sensor(#{Blockly.Ruby.quote_(pin)}).value")
+  lor = @getFieldValue('LOR')
+  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_motor.speed")
 
-# センサー[▼PIN]が変化したとき
-<% n = "#{category}_on_sensor_change" %>
+# set Smalrubot v3 left/right motor speed
+<% n = "#{category}_#{subcategory}_motor_set_speed" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= colors[:events] %>)
-    @interpolateMsg(<%= bm('.on_sensor_change') %>,
-                    ['PIN', ['Dropdown', aiPinDropdown], Blockly.ALIGN_RIGHT],
+    @setColour(<%= colors[:motion] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_motor_set_speed") %>,
+                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
+                    ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
-    @appendStatementInput('DO')
+    @setInputsInline(true)
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  pin = @getFieldValue('PIN')
-  Blockly.Ruby.characterEvent_(block, 'DO', 'sensor_change', Blockly.Ruby.quote_(pin))
+  lor = @getFieldValue('LOR')
+  speed = Blockly.Ruby.valueToCode(@, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100'
+  Blockly.Ruby.characterSetVariable_("<%= subcategory %>.#{lor}_motor.speed",
+                                     speed)
+
+# forward/backward/turn left/turn right/stop Smalrubot v3
+<% n = "#{category}_#{subcategory}_action" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_action") %>,
+                    ['ACTION', ['Dropdown', actionDropdown], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  action = @getFieldValue('ACTION')
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}")
+
+# forward/backward/turn left/turn right/stop Smalrubot v3 for ( ) secs
+<% n = "#{category}_#{subcategory}_action_with_sec" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_action_with_sec") %>,
+                    ['ACTION', ['Dropdown', actionDropdown], Blockly.ALIGN_RIGHT],
+                    ['SEC', ['Number'], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  action = @getFieldValue('ACTION')
+  sec = Blockly.Ruby.valueToCode(@, 'SEC', Blockly.Ruby.ORDER_FUNCTION_CALL) || 'nil'
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}(sec: #{sec})")
+
+# Smalrubot v3 touch sensor pressed/released
+<% n = "#{category}_#{subcategory}_touch_sensor_pressed_or_released" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    porDropdown = window.SmalrubyEditor.Sensing.PressedOrReleasedDropdown
+
+    @setHelpUrl('')
+    @setColour(<%= colors[:sensing] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_touch_sensor_pressed_or_released") %>,
+                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
+                    ['POR', ['Dropdown', porDropdown], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
+    @setOutput(true, 'Boolean')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  lor = @getFieldValue('LOR')
+  por = @getFieldValue('POR')
+  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_touch_sensor.#{por}?")
+
+# Smalrubot v3 light sensor value
+<% n = "#{category}_#{subcategory}_light_sensor_value" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:sensing] %>)
+    @appendDummyInput().appendField(<%= bm(".#{subcategory}_light_sensor_value") %>)
+    @setOutput(true, 'Number')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.light_sensor.value")

data/app/assets/javascripts/blocks/sensing.js.coffee.erb

@@ -33,6 +33,10 @@ $(document).ready ->
       [<%= bm('.down') %>, 'down'],
       [<%= bm('.up') %>, 'up'],
     ]
+    PressedOrReleasedDropdown: [
+      [<%= bm('.pressed') %>, 'pressed'],
+      [<%= bm('.released') %>, 'released'],
+    ]
 
 # 条件:端に触れた
 <% n = "#{category}_reach_wall" %>

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

@@ -8,6 +8,21 @@ goog.require('Blockly.Msg');
  * to message files.
  */
 
+// common
+Blockly.Msg.COMMON_TURN_ON = 'turn on';
+Blockly.Msg.COMMON_TURN_OFF = 'turn off';
+Blockly.Msg.COMMON_FORWARD = 'forward';
+Blockly.Msg.COMMON_BACKWARD = 'backward';
+Blockly.Msg.COMMON_TURN_LEFT = 'turn left';
+Blockly.Msg.COMMON_TURN_RIGHT = 'turn right';
+Blockly.Msg.COMMON_STOP = 'stop';
+
+
+// colour name
+Blockly.Msg.COLOUR_RED = 'red';
+Blockly.Msg.COLOUR_GREEN = 'green';
+
+
 // views/main_menu_view.js.coffee
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LINES = ' Lines';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LETTERS = ' Letters';
@@ -75,13 +90,16 @@ Blockly.Msg.BLOCKS_SENSING_K_DOWN = 'down arrow';
 Blockly.Msg.BLOCKS_SENSING_K_LEFT = 'left arrow';
 Blockly.Msg.BLOCKS_SENSING_K_RIGHT = 'right arrow';
 Blockly.Msg.BLOCKS_SENSING_K_SPACE = 'space';
-Blockly.Msg.BLOCKS_SENSING_PUSH = 'pressed?';
-Blockly.Msg.BLOCKS_SENSING_HOLD_DOWN = 'hold pressed?';
-Blockly.Msg.BLOCKS_SENSING_DOWN = Blockly.Msg.BLOCKS_SENSING_PUSH;
+Blockly.Msg.BLOCKS_SENSING_PRESSED = 'pressed';
+Blockly.Msg.BLOCKS_SENSING_PUSH = Blockly.Msg.BLOCKS_SENSING_PRESSED;
+Blockly.Msg.BLOCKS_SENSING_DOWN = Blockly.Msg.BLOCKS_SENSING_PRESSED;
+Blockly.Msg.BLOCKS_SENSING_HOLD_PRESSED = 'hold pressed';
+Blockly.Msg.BLOCKS_SENSING_HOLD_DOWN = Blockly.Msg.BLOCKS_SENSING_HOLD_PRESSED;
 Blockly.Msg.BLOCKS_SENSING_M_LBUTTON = 'left-button';
 Blockly.Msg.BLOCKS_SENSING_M_MBUTTON = 'middle-button';
 Blockly.Msg.BLOCKS_SENSING_M_RBUTTON = 'right-button';
-Blockly.Msg.BLOCKS_SENSING_UP = 'released?';
+Blockly.Msg.BLOCKS_SENSING_RELEASED = 'released';
+Blockly.Msg.BLOCKS_SENSING_UP = Blockly.Msg.BLOCKS_SENSING_RELEASED;
 Blockly.Msg.BLOCKS_SENSING_REACH_WALL = 'reach wall?';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_PREFIX = 'key ';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_MIDDLE = ' ';
@@ -154,15 +172,15 @@ Blockly.Msg.BLOCKS_LOOKS_HIDE = 'hide';
 Blockly.Msg.BLOCKS_LOOKS_VANISH = 'vanish';
 
 // blocks/hardware.js.coffee.erb
-Blockly.Msg.BLOCKS_HARDWARE_LED_ON = 'turn on LED %1';
-Blockly.Msg.BLOCKS_HARDWARE_LED_OFF = 'turn off LED %1';
+Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_ON = 'turn on LED %1';
+Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_OFF = 'turn off LED %1';
 Blockly.Msg.BLOCKS_HARDWARE_ANODE = 'anode';
 Blockly.Msg.BLOCKS_HARDWARE_CATHODE = 'cathode';
 Blockly.Msg.BLOCKS_HARDWARE_LEFT = 'left';
 Blockly.Msg.BLOCKS_HARDWARE_RIGHT = 'right';
 Blockly.Msg.BLOCKS_HARDWARE_INIT_HARDWARE = 'setup hardware';
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_ON = 'set RGB LED %1 common %2 color to %3';
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_OFF = 'turn off RGB LED %1 common %2';
+Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_SET_COLOR = 'set RGB LED %1 common %2 color to %3';
+Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_TURN_OFF = 'turn off RGB LED %1 common %2';
 Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_SHOW = 'show 7 segment display %1';
 Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_OFF = 'turn off 7 segment display';
 Blockly.Msg.BLOCKS_HARDWARE_LCD_PUTS = 'display %1 on the LCD';
@@ -187,11 +205,15 @@ Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_STOP = 'stop';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER = "%2 (motor driver %1's) motor";
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SET_SPEED = "set (motor driver %1's) motor speed to %2 %";
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SPEED = "(motor driver %1's) motor speed (%)";
-Blockly.Msg.BLOCKS_HARDWARE_BUTTON_DOWN_OR_UP = 'button %1 %2';
-Blockly.Msg.BLOCKS_HARDWARE_ON_BUTTON_DOWN_OR_UP = 'when button %1 %2';
-Blockly.Msg.BLOCKS_HARDWARE_BUTTON_NOT_USE_PULLUP = "don't use button %1's pull-up resistor";
+Blockly.Msg.BLOCKS_HARDWARE_BUTTON_PRESSED_OR_RELEASED = 'button %1 %2 ?';
 Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = 'sensor %1 value';
-Blockly.Msg.BLOCKS_HARDWARE_ON_SENSOR_CHANGE = 'when sensor %1 value changed';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LED_TURN_ON_OR_OFF = '%2 Smalrubot v3 %1 LED';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SPEED = 'Smalrubot v3 %1 motor speed';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SET_SPEED = 'set Smalrubot v3 %1 motor speed to %2 %';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = '%1 Smalrubot v3';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = '%1 Smalrubot v3 for %2 secs';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = 'Smalrubot v3 %1 touch sensor %2 ?';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = 'Smalrubot v3 light sensor value';
 
 
 // blocks/operators.js.coffee.erb