smalruby 0.0.12-x86-mingw32 → 0.0.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893936bc5774fe45d4eaad40b553947745e83497
-  data.tar.gz: cec60036e1569da08d723ee4bb1e72100f7028b1
+  metadata.gz: 1000156099f8bcf1bf2b1729bcb5b151b922f738
+  data.tar.gz: acadb5ea4a761b44a280d966ee0332b8bd3d902e
 SHA512:
-  metadata.gz: efa9ed19fac900c24a682354daf39e2ed947bce61cc6221b9f9d07a975105cdc35d55610793c3fb681bc7a082d3ffdc11879da47508fab239fcf7e0e999f56a9
-  data.tar.gz: b56dc272f8fd0792117cff9acfab679c63b61e8c59c6e0958d1f0b34be9d761f0a36424a913b286083dff69aa0d265d879334889df4a4bd0b15e6658b4187dc9
+  metadata.gz: 965143c6fadafed0f0965dff950736629a391a78af012c2b98a85e75b81c24b7a0374711d381000259baf7fb9bceab24e6c9966edcd6f1fe55a2ed9c5ecd6021
+  data.tar.gz: f397c4132c9e557326d7ca552064b493e29a13b48bc62e97091446439174396c59f1c5c7a4c4fde5a3e5f4bc28df9353938150fb951149b0a8f98e3f1c5a0906

data/lib/smalruby/character.rb

@@ -208,6 +208,16 @@ module Smalruby
       Hardware.create_hardware(Hardware::RgbLedCathode, pin)
     end
 
+    # サーボモーター
+    def servo(pin)
+      Hardware.create_hardware(Hardware::Servo, pin)
+    end
+
+    # ボタン
+    def button(pin)
+      Hardware.create_hardware(Hardware::Button, pin)
+    end
+
     # 汎用的なセンサー
     def sensor(pin)
       Hardware.create_hardware(Hardware::Sensor, pin)
@@ -246,6 +256,8 @@ module Smalruby
         @checking_hit_targets.uniq!
       when :sensor_change
         sensor(options.first)
+      when :button_up, :button_down
+        button(options.first)
       end
     end
 
@@ -302,6 +314,20 @@ module Smalruby
       end
     end
 
+    def button_up(pin)
+      @event_handlers[:button_up].try(:each) do |h|
+        next unless h.options.include?(pin)
+        @threads << h.call
+      end
+    end
+
+    def button_down(pin)
+      @event_handlers[:button_down].try(:each) do |h|
+        next unless h.options.include?(pin)
+        @threads << h.call
+      end
+    end
+
     def alive?
       @threads.delete_if { |t|
         if t.alive?

data/lib/smalruby/hardware/button.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require 'smalruby/hardware'
+
+module Smalruby
+  module Hardware
+    # ボタンを表現するクラス
+    class Button < Dino::Components::Button
+      def initialize(options)
+        super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]))
+      end
+
+      def up?
+        @state == UP
+      end
+
+      alias_method :on?, :up?
+
+      def down?
+        @state == DOWN
+      end
+
+      alias_method :off?, :down?
+
+      private
+
+      def after_initialize(options = {})
+        super(options)
+
+        s_pin = Pin.dino_to_smalruby(pin)
+        down { world.button_changed(s_pin, :down) }
+        up { world.button_changed(s_pin, :up) }
+      end
+    end
+  end
+end

data/lib/smalruby/hardware/servo.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+require 'smalruby/hardware'
+
+module Smalruby
+  module Hardware
+    # サーボモーターを表現するクラス
+    class Servo < Dino::Components::Servo
+      def initialize(options)
+        super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]))
+      end
+
+      # @!method position=(angle)
+      # サーボモーターを(  )度にする
+
+      private
+
+      # HACK: GROVEシステムのサーボモーターでは5よりも小さい値を指定す
+      #   るとモーターが発振してしまう
+      MIN_ANGLE = 5
+      MAX_ANGLE = 180
+
+      def angle(value)
+        v = value.to_i
+        if v < MIN_ANGLE
+          MIN_ANGLE
+        elsif v > MAX_ANGLE
+          MAX_ANGLE
+        else
+          v
+        end
+      end
+    end
+  end
+end

data/lib/smalruby/hardware.rb

@@ -12,6 +12,9 @@ module Smalruby
     autoload :Led
     autoload :RgbLedAnode
     autoload :RgbLedCathode
+    autoload :Servo
+
+    autoload :Button
     autoload :Sensor
 
     module_function

data/lib/smalruby/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Smalruby
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/smalruby/world.rb

@@ -9,12 +9,15 @@ module Smalruby
     attr_accessor :objects
     attr_accessor :board
     attr_reader :sensor_change_queue
+    attr_reader :button_change_queue
 
     def initialize
       @objects = []
       @board = nil
       @sensor_change_queue = []
       @sensor_change_queue.extend(Mutex_m)
+      @button_change_queue = []
+      @button_change_queue.extend(Mutex_m)
     end
 
     def sensor_changed(pin, value)
@@ -22,5 +25,11 @@ module Smalruby
         @sensor_change_queue.push([pin, value])
       end
     end
+
+    def button_changed(pin, up_or_down)
+      @button_change_queue.synchronize do
+        @button_change_queue.push([pin, up_or_down])
+      end
+    end
   end
 end

data/lib/smalruby.rb

@@ -97,6 +97,8 @@ module Smalruby
 
           sensor_change
 
+          button_change
+
           world.objects.delete_if do |o|
             if !o.alive?
               o.join
@@ -189,6 +191,28 @@ module Smalruby
         end
       end
     end
+
+    def button_change
+      if world.button_change_queue.length > 0
+        queue = nil
+        world.button_change_queue.synchronize do
+          queue = world.button_change_queue.dup
+          world.button_change_queue.clear
+        end
+
+        world.objects.each do |o|
+          if o.respond_to?(:button_up) && o.respond_to?(:button_down)
+            queue.each do |pin, up_or_down|
+              if up_or_down == :up
+                o.button_up(pin)
+              else
+                o.button_down(pin)
+              end
+            end
+          end
+        end
+      end
+    end
   end
 end
 

data/samples/hardware_button.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+ハードウェアのボタンを操作します
+EOS
+
+# デジタルの3番ピンにボタンを接続してください。
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+frog1 = Character.new(costume: 'frog1.png', x: 300, y: 200, visible: false)
+
+stage1.on(:start) do
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  if button('D3').up?
+    frog1.visible = false
+  else
+    frog1.visible = true
+  end
+end
+
+stage1.on(:button_down, 'D3') do
+  frog1.visible = true
+end
+
+stage1.on(:button_up, 'D3') do
+  frog1.visible = false
+end

data/samples/hardware_servo.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+カーソルキーでサーボモーターを操作します
+EOS
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  servo('D3').position = 90
+end
+
+stage1.on(:key_down, K_UP, K_LEFT) do
+  servo('D3').position += 2
+end
+
+stage1.on(:key_down, K_DOWN, K_RIGHT) do
+  servo('D3').position -= 2
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,12 +252,14 @@ files:
 - lib/smalruby/console.rb
 - lib/smalruby/event_handler.rb
 - lib/smalruby/hardware.rb
+- lib/smalruby/hardware/button.rb
 - lib/smalruby/hardware/dino/fix_gets.rb
 - lib/smalruby/hardware/led.rb
 - lib/smalruby/hardware/pin.rb
 - lib/smalruby/hardware/rgb_led_anode.rb
 - lib/smalruby/hardware/rgb_led_cathode.rb
 - lib/smalruby/hardware/sensor.rb
+- lib/smalruby/hardware/servo.rb
 - lib/smalruby/stage.rb
 - lib/smalruby/util.rb
 - lib/smalruby/version.rb
@@ -270,10 +272,12 @@ files:
 - samples/costume.rb
 - samples/extra_car.png
 - samples/finding_cars.rb
+- samples/hardware_button.rb
 - samples/hardware_led.rb
 - samples/hardware_rgb_led_anode.rb
 - samples/hardware_rgb_led_cathode.rb
 - samples/hardware_sensor.rb
+- samples/hardware_servo.rb
 - samples/hit_car.rb
 - samples/piano.rb
 - smalruby.gemspec