smalruby 0.0.32 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847fbb5e57bbfcea47b0bf1f84a27a62166e0634
-  data.tar.gz: 4b613d78dfd46c3ba2f1709e61757a4a8bda8172
+  metadata.gz: 394212f1249a7f89b50237580b654131fb50e70b
+  data.tar.gz: a030834e15aec64cd9a5201d640e1909a609ba31
 SHA512:
-  metadata.gz: a8be1b3c75d63b1e88c4d9fa914aef4f7999d901a1a09211016cc43f96a9297390366f491f9a8517c98fe549c94036d5cf21f268b04b56edaa88c1e988338495
-  data.tar.gz: cc87cbc9c9de2d63e3f603d9e343a60e7f601591b693e820665e0645d4bae39e74b79019e310a4c225ecc2f80a733f892223990d46a3c408338abe1a6e03b1e5
+  metadata.gz: a1bc7b61993e39c1fe80ca52376c844a375e332d24165b71c3cdea02eff35d68e21e5e184b030ba0c7702804d998246f9cafaa400c3ad8ef3ea4cdb800af8fea
+  data.tar.gz: 0f52a717e36e29b350821aa692361451da0971ea0058331dfa3377d02d758bb7188a8b0e51d85d59440e45ea02bc9be74cbb8be58f68dc45150b41d15ca8b166

data/lib/smalruby/hardware/button.rb

@@ -4,44 +4,24 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # ボタンを表現するクラス
-    class Button < Dino::Components::Button
+    class Button < Smalrubot::Components::BaseComponent
       def initialize(options)
         @using_pullup = true
-        super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]),
+        super(board: world.board, pin: Pin.smalruby_to_smalrubot(options[:pin]),
               pullup: true)
       end
 
-      # プルアップ抵抗を使わない
-      def not_use_pullup
-        @using_pullup = false
-        board.set_pullup(pin, false)
-      end
-
-      def stop
-        @board.remove_digital_hardware(self)
-      end
-
       def up?
-        @using_pullup ? @state == DOWN : @state == UP
+        digital_read(pin) == Smalrubot::Board::LOW
       end
 
-      alias_method :on?, :up?
+      alias_method :off?, :up?
 
       def down?
         !up?
       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, (@using_pullup ? :up : :down)) }
-        up { world.button_changed(s_pin, (@using_pullup ? :down : :up)) }
-      end
+      alias_method :on?, :down?
     end
   end
 end

data/lib/smalruby/hardware/led.rb

@@ -4,9 +4,9 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # LEDを表現するクラス
-    class Led < Dino::Components::Led
+    class Led < Smalrubot::Components::Led
       def initialize(options)
-        super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]))
+        super(board: world.board, pin: Pin.smalruby_to_smalrubot(options[:pin]))
       end
 
       # @!method on

data/lib/smalruby/hardware/motor_driver.rb

@@ -12,12 +12,12 @@ module Smalruby
     # 動作確認済みのモータードライバの一覧
     # * TOSHIBA
     #   * TA7291P
-    class MotorDriver < Dino::Components::BaseComponent
+    class MotorDriver < Smalrubot::Components::BaseComponent
       # モーターの回転速度の割合(0～100%)
       attr_reader :speed
 
       def initialize(options)
-        pin = Pin.smalruby_to_dino(options[:pin])
+        pin = Pin.smalruby_to_smalrubot(options[:pin])
         case pin
         when 3, 5, 6, 9, 10, 11
           super(board: world.board, pin: (pin...(pin + 3)).to_a)
@@ -64,11 +64,11 @@ module Smalruby
         levels.each.with_index do |level, i|
           case level
           when 0
-            digital_write(pins[i], Dino::Board::LOW)
+            digital_write(pins[i], Smalrubot::Board::LOW)
           when 100
-            digital_write(pins[i], Dino::Board::HIGH)
+            digital_write(pins[i], Smalrubot::Board::HIGH)
           else
-            analog_write(pins[i], (Dino::Board::HIGH * level / 100.0).round)
+            analog_write(pins[i], (Smalrubot::Board::HIGH * level / 100.0).round)
           end
         end
       end

data/lib/smalruby/hardware/pin.rb

@@ -1,26 +1,26 @@
 # -*- coding: utf-8 -*-
-require 'dino'
+require 'smalrubot'
 
 module Smalruby
   module Hardware
     module Pin
       module_function
 
-      DIO_DINO_RE = /\A([0-9]|1[0-3])\z/
+      DIO_SMALRUBOT_RE = /\A([0-9]|1[0-3])\z/
       DIO_SMALRUBY_RE = /\AD([0-9]|1[0-3])\z/
       AI_RE = /\AA[0-5]\z/
 
-      # Smalrubyのピン番号をDinoのピン番号に変換する
+      # Smalrubyのピン番号をSmalrubotのピン番号に変換する
       #
       # ピン番号が0～13、D0～D13、A0～A5でなければ例外が発生する
       #
       # @param [String|Numeric] pin Smalrubyのピン番号
-      # @return [Numeric] Dinoのデジタル入出力のピン番号
-      # @return [String] Dinoのアナログ入力のピン番号
-      def smalruby_to_dino(pin)
+      # @return [Numeric] Smalrubotのデジタル入出力のピン番号
+      # @return [String] Smalrubotのアナログ入力のピン番号
+      def smalruby_to_smalrubot(pin)
         pin = pin.to_s
         case pin
-        when DIO_DINO_RE
+        when DIO_SMALRUBOT_RE
           pin.to_i
         when DIO_SMALRUBY_RE
           pin[1..-1].to_i
@@ -31,16 +31,16 @@ module Smalruby
         end
       end
 
-      # Dinoのピン番号をSmalrubyのピン番号に変換する
+      # Smalrubotのピン番号をSmalrubyのピン番号に変換する
       #
       # ピン番号が0～13、D0～D13、A0～A5でなければ例外が発生する
       #
-      # @param [String|Numeric] pin Dinoのピン番号
+      # @param [String|Numeric] pin Smalrubotのピン番号
       # @return [String] Smalrubyのピン番号
-      def dino_to_smalruby(pin)
+      def smalrubot_to_smalruby(pin)
         pin = pin.to_s
         case pin
-        when DIO_DINO_RE
+        when DIO_SMALRUBOT_RE
           "D#{pin}"
         when DIO_SMALRUBY_RE
           pin

data/lib/smalruby/hardware/rgb_led_anode.rb

@@ -4,9 +4,9 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # RGB LED(アノード)を表現するクラス
-    class RgbLedAnode < Dino::Components::BaseComponent
+    class RgbLedAnode < Smalrubot::Components::BaseComponent
       def initialize(options)
-        pin = Pin.smalruby_to_dino(options[:pin])
+        pin = Pin.smalruby_to_smalrubot(options[:pin])
         case pin
         when 3..6
           super(board: world.board, pin: [3, 5, 6, 4])
@@ -28,12 +28,12 @@ module Smalruby
         analog_write(pins[0], calc_value(color[0]))
         analog_write(pins[1], calc_value(color[1]))
         analog_write(pins[2], calc_value(color[2]))
-        digital_write(pins[3], Dino::Board::HIGH)
+        digital_write(pins[3], Smalrubot::Board::HIGH)
       end
 
       # RGB LEDをオフにする
       def off
-        digital_write(pins[3], Dino::Board::LOW)
+        digital_write(pins[3], Smalrubot::Board::LOW)
       end
 
       def stop
@@ -48,11 +48,11 @@ module Smalruby
       end
 
       def calc_value(value)
-        v = Dino::Board::HIGH - value
-        if v < Dino::Board::LOW
-          Dino::Board::LOW
-        elsif v > Dino::Board::HIGH
-          Dino::Board::HIGH
+        v = Smalrubot::Board::HIGH - value
+        if v < Smalrubot::Board::LOW
+          Smalrubot::Board::LOW
+        elsif v > Smalrubot::Board::HIGH
+          Smalrubot::Board::HIGH
         else
           v
         end

data/lib/smalruby/hardware/rgb_led_cathode.rb

@@ -4,9 +4,9 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # RGB LED(カソード)を表現するクラス
-    class RgbLedCathode < Dino::Components::BaseComponent
+    class RgbLedCathode < Smalrubot::Components::BaseComponent
       def initialize(options)
-        pin = Pin.smalruby_to_dino(options[:pin])
+        pin = Pin.smalruby_to_smalrubot(options[:pin])
         case pin
         when 3, 5, 6
           super(board: world.board, pin: [3, 5, 6])
@@ -49,10 +49,10 @@ module Smalruby
       end
 
       def calc_value(value)
-        if value < Dino::Board::LOW
-          Dino::Board::LOW
-        elsif value > Dino::Board::HIGH
-          Dino::Board::HIGH
+        if value < Smalrubot::Board::LOW
+          Smalrubot::Board::LOW
+        elsif value > Smalrubot::Board::HIGH
+          Smalrubot::Board::HIGH
         else
           value
         end

data/lib/smalruby/hardware/sensor.rb

@@ -4,46 +4,13 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # 汎用的なセンサーを表現するクラス
-    class Sensor < Dino::Components::Sensor
-      # デフォルトのセンサーの値に変化があったかどうかをチェックする閾値
-      DEFAULT_THRESHOLD = 32
-
-      attr_reader :value
-      attr_accessor :threshold
-
+    class Sensor < Smalrubot::Components::BaseComponent
       def initialize(options)
-        super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]))
-      end
-
-      def stop
-        @board.remove_analog_hardware(self)
-      end
-
-      private
-
-      def after_initialize(options = {})
-        super(options)
-
-        @value = 0
-        @threshold = options[:threshold] || DEFAULT_THRESHOLD
-
-        start_receiving_data
+        super(board: world.board, pin: Pin.smalruby_to_smalrubot(options[:pin]))
       end
 
-      def start_receiving_data
-        prev_data = 0
-        when_data_received { |data|
-          begin
-            @value = data = data.to_i
-            if (data - prev_data).abs >= @threshold ||
-                (prev_data != data && (data == 0 || data >= 1023))
-              world.sensor_changed(pin, data)
-              prev_data = data
-            end
-          rescue
-            Util.print_exception($ERROR_INFO)
-          end
-        }
+      def value
+        board.analog_read(pin)
       end
     end
   end

data/lib/smalruby/hardware/servo.rb

@@ -4,9 +4,9 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # サーボモーターを表現するクラス
-    class Servo < Dino::Components::Servo
+    class Servo < Smalrubot::Components::Servo
       def initialize(options)
-        super(board: world.board, pin: Pin.smalruby_to_dino(options[:pin]))
+        super(board: world.board, pin: Pin.smalruby_to_smalrubot(options[:pin]))
       end
 
       # @!method position=(angle)

data/lib/smalruby/hardware/two_wheel_drive_car.rb

@@ -4,7 +4,7 @@ require 'smalruby/hardware'
 module Smalruby
   module Hardware
     # 2WD車のモーターを表現するクラス
-    class TwoWheelDriveCar < Dino::Components::BaseComponent
+    class TwoWheelDriveCar < Smalrubot::Components::BaseComponent
       # 左のモーターの速度%
       attr_reader :left_speed
 
@@ -15,7 +15,7 @@ module Smalruby
         @left_speed = 100
         @right_speed = 100
 
-        pin = Pin.smalruby_to_dino(options[:pin])
+        pin = Pin.smalruby_to_smalrubot(options[:pin])
         case pin
         when 5
           super(board: world.board, pin: [5, 6, 9, 10])
@@ -87,25 +87,15 @@ module Smalruby
       end
 
       def digital_write_pins(*speeds)
-        if pins.first == 5
-          speeds.each.with_index do |speed, i|
-            level = (Dino::Board::HIGH * speed / 100.0).floor
-            case level
-            when 0
-              digital_write(pins[i], Dino::Board::LOW)
-            when 100
-              digital_write(pins[i], Dino::Board::HIGH)
-            else
-              analog_write(pins[i], level)
-            end
-          end
-        else
-          2.times do
-            speeds.each.with_index do
-              |speed, i|
-              digital_write(pins[i], (Dino::Board::HIGH * speed / 100.0).floor)
-              sleep(0.05) if i.odd?
-            end
+        speeds.each.with_index do |speed, i|
+          level = (Smalrubot::Board::HIGH * speed / 100.0).floor
+          case level
+          when 0
+            digital_write(pins[i], Smalrubot::Board::LOW)
+          when 100
+            digital_write(pins[i], Smalrubot::Board::HIGH)
+          else
+            analog_write(pins[i], level)
           end
         end
       end

data/lib/smalruby/hardware.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-require 'dino'
 require 'mutex_m'
-require_relative 'hardware/dino/fix_gets'
+require 'smalrubot'
 
 module Smalruby
   # ハードウェアの名前空間
@@ -34,20 +33,12 @@ module Smalruby
       defaults = {
         device: nil,
         baud: 115_200,
-        heart_rate: 40 # HACK: 実機で調整した値
       }
       opt = Util.process_options(options, defaults)
 
-      if Dino::VERSION >= '0.11'
-        txrx = Dino::TxRx.new(opt)
-      elsif Dino::VERSION >= '0.10'
-        txrx = Dino::TxRx.new
-        txrx.io = opt[:device] if opt[:device]
-      end
+      txrx = Smalrubot::TxRx.new(opt)
       begin
-        world.board = Dino::Board.new(txrx)
-        world.board.heart_rate = opt[:heart_rate]
-
+        world.board = Smalrubot::Board.new(txrx)
         @initialized_hardware = true
       rescue Exception
         Util.print_exception($!)

data/lib/smalruby/version.rb

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

data/samples/check_hardware_motor_driver.rb

@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+モータードライバ(TA7291P)を操作します
+EOS
+
+# デジタルの6～11番ピンをそれぞれ左右のモーター用のモータードライバ
+# (TA7291P)の4・5・6に接続してください。
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  fill(color: 'white')
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  motor_driver('D6').speed = 100
+  motor_driver('D9').speed = 100
+
+  loop do
+    if Input.key_down?(K_UP)
+      fill(color: 'white')
+      draw_font(string: '進む', color: 'black')
+
+      motor_driver('D6').forward
+      motor_driver('D9').forward
+
+      await until !Input.key_down?(K_UP)
+
+      fill(color: 'white')
+
+      motor_driver('D6').stop
+      motor_driver('D9').stop
+      sleep(0.2)
+    end
+
+    if Input.key_down?(K_DOWN)
+      fill(color: 'white')
+      draw_font(string: 'バックする', color: 'black')
+
+      motor_driver('D6').backward
+      motor_driver('D9').backward
+
+      await until !Input.key_down?(K_DOWN)
+
+      fill(color: 'white')
+
+      motor_driver('D6').stop
+      motor_driver('D9').stop
+      sleep(0.2)
+    end
+
+    if Input.key_down?(K_LEFT)
+      fill(color: 'white')
+      draw_font(string: '左に旋回する', color: 'black')
+
+      motor_driver('D6').backward
+      motor_driver('D9').forward
+
+      await until !Input.key_down?(K_LEFT)
+
+      fill(color: 'white')
+
+      motor_driver('D6').stop
+      motor_driver('D9').stop
+      sleep(0.2)
+    end
+
+    if Input.key_down?(K_RIGHT)
+      fill(color: 'white')
+      draw_font(string: '右に旋回する', color: 'black')
+
+      motor_driver('D6').forward
+      motor_driver('D9').backward
+
+      await until !Input.key_down?(K_RIGHT)
+
+      fill(color: 'white')
+
+      motor_driver('D6').stop
+      motor_driver('D9').stop
+      sleep(0.2)
+    end
+
+    if Input.key_down?(K_W)
+      motor_driver('D6').speed += 10
+
+      fill(color: 'white')
+      draw_font(string: "左の速度: #{motor_driver('D6').speed}%", color: 'black')
+    end
+
+    if Input.key_down?(K_S)
+      motor_driver('D6').speed -= 10
+
+      fill(color: 'white')
+      draw_font(string: "左の速度: #{motor_driver('D6').speed}%", color: 'black')
+    end
+
+    if Input.key_down?(K_O)
+      motor_driver('D9').speed += 10
+
+      fill(color: 'white')
+      draw_font(string: "右の速度: #{motor_driver('D9').speed}%", color: 'black')
+    end
+
+    if Input.key_down?(K_L)
+      motor_driver('D9').speed -= 10
+
+      fill(color: 'white')
+      draw_font(string: "右の速度: #{motor_driver('D9').speed}%", color: 'black')
+    end
+
+    if Input.key_down?(K_SPACE)
+      fill(color: 'white')
+      draw_font(string: '右のLED赤色を光らせる', color: 'black')
+
+      led('D13').on
+
+      await until !Input.key_down?(K_SPACE)
+
+      led('D13').off
+
+      fill(color: 'white')
+      draw_font(string: '左のLED緑色を光らせる', color: 'black')
+
+      led('D2').on
+
+      sleep(1)
+
+      led('D2').off
+    end
+
+    if Input.key_down?(K_B)
+      until !Input.key_down?(K_B)
+        fill(color: 'white')
+        draw_font(string: "センサーの情報#{sensor('A0').value}", color: 'black')
+        await
+      end
+      fill(color: 'white')
+    end
+  end
+end

data/smalruby.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
   else
     spec.add_runtime_dependency 'dxruby_sdl', '~> 0.0.12'
   end
-  spec.add_runtime_dependency 'dino', '~> 0.11.2'
+  spec.add_runtime_dependency 'smalrubot', '~> 0.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.1.0
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.12
 - !ruby/object:Gem::Dependency
-  name: dino
+  name: smalrubot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.0.1
 description: smalruby is a 2D game development library. This is part of "Smalruby"
   project that is a learning ruby programming environment for kids.
 email:
@@ -257,7 +257,6 @@ files:
 - 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/motor_driver.rb
 - lib/smalruby/hardware/null_hardware.rb
@@ -276,6 +275,7 @@ files:
 - samples/canvas_color.rb
 - samples/car.rb
 - samples/cat.rb
+- samples/check_hardware_motor_driver.rb
 - samples/console.rb
 - samples/costume.rb
 - samples/costumes.rb

data/lib/smalruby/hardware/dino/fix_gets.rb

@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# rubocop:disable all
-
-# WindowsでのDinoの不具合を修正するモンキーパッチ
-if Util.windows?
-  require 'dino'
-
-  if Dino::VERSION >= '0.11'
-    require 'mutex_m'
-
-    class Dino::TxRx::Base
-      def write(message)
-        loop do
-          if IO.select(nil, [io], nil)
-            io.synchronize { io.syswrite(message) }
-            break
-          end
-        end
-      end
-
-      def gets(timeout = 0.005)
-        @buffer ||= ""
-        if !@buffer.include?("\n")
-          return nil unless IO.select([io], nil, nil, timeout)
-          io.synchronize do
-            io.read_timeout = (timeout * 1000).to_i
-          end
-          bytes = []
-          until (x = io.synchronize { io.getbyte }).nil?
-            bytes.push(x)
-          end
-          return nil if bytes.empty?
-          @buffer += bytes.pack("C*")
-        end
-        @buffer.slice!(/\A[^\n]*\n/)
-      end
-    end
-
-    class Dino::TxRx::Serial
-      def io
-        unless @io
-          @io = connect
-          @io.extend(Mutex_m)
-        end
-        @io
-      end
-    end
-  elsif Dino::VERSION >= '0.10'
-    class Dino::TxRx::USBSerial
-      def read
-        @thread ||= Thread.new do
-          loop do
-            line = gets
-            if line
-              pin, message = *line.chomp.split(/::/)
-              pin && message && changed && notify_observers(pin, message)
-            end
-            sleep 0.004
-          end
-        end
-      end
-
-      def gets(timeout = 0.005)
-        return nil unless IO.select([io], nil, nil, timeout)
-        io.read_timeout = (timeout * 1000).to_i
-        bytes = []
-        until (x = io.getbyte).nil?
-          bytes.push(x)
-        end
-        return nil if bytes.empty?
-        bytes.pack("C*")
-      end
-    end
-  else
-    fail "Dinoのバージョン#{version}はサポートしていません"
-  end
-end