smalruby 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b508a590f263734e3d29d9e1f3af7226befec19e
-  data.tar.gz: 5055ee4f30c4306b67634b0489c0ca28b37b1ece
+  metadata.gz: 12cf0b5241dbdd9be29328dca53e2894f87efb35
+  data.tar.gz: 5378af22841268eb3a10e0ea1958fd93a9d8ee3a
 SHA512:
-  metadata.gz: 1dd52cf93cc83ae39b7e93b752a23ff6630b06a5c5de4f99f60751b080f980e6649f6222b3f8efab894beaafc3716acd07d5eb604960f39676164b6611a864c9
-  data.tar.gz: 795d4a73223c55fae1aeeb870fa289abbf0ba32585a80c38bd0ad392ef726b43287500e4e65950fb4f0f797085b67a03bd9859ea5e4f4ed00bc444da84e254f7
+  metadata.gz: 8f7e5ed7fac92defed856d3ee4ae8d90f5b295a46a871d0c6c506600d9326dfebc25adb6a42241951364d8cd7f8a3e973db1347458fcd3f4891afb624c3fe2d0
+  data.tar.gz: 23e20aee90dc7ba22e88898afd0c5d2110ad689199f99b59bc8da9a073555522c21c1d65fbddefd18978f4be723b9e0dc93c10b8b71c72bb8249fe57f82e8824

data/lib/smalruby/character.rb

@@ -497,6 +497,7 @@ module Smalruby
     end
 
     def alive?
+      @threads.compact!
       @threads.delete_if { |t|
         if t.alive?
           false
@@ -514,6 +515,7 @@ module Smalruby
     end
 
     def join
+      @threads.compact!
       @threads.each(&:join)
     end
 

data/lib/smalruby/event_handler.rb

@@ -13,12 +13,19 @@ module Smalruby
       @object = object
       @options = options
       @block = block
+      @running = false
     end
 
     def call(*args)
+      return nil if @running
       return Thread.start(@object, @block) { |object, block|
-               object.instance_exec(*args, &block)
-             }
+        begin
+          @running = true
+          object.instance_exec(*args, &block)
+        ensure
+          @running = false
+        end
+      }
     end
   end
 end

data/lib/smalruby/hardware/two_wheel_drive_car.rb

@@ -16,38 +16,29 @@ module Smalruby
       end
 
       # 前進する
-      def forward(left_level = Dino::Board::HIGH,
-                  right_level = Dino::Board::HIGH)
-        digital_write_pins(left_level, Dino::Board::LOW,
-                           right_level, Dino::Board::LOW)
+      def forward(left_level = 100,
+                  right_level = 100)
+        digital_write_pins(left_level, 0, right_level, 0)
       end
 
       # 後退する
-      def backward(left_level = Dino::Board::HIGH,
-                   right_level = Dino::Board::HIGH)
-        digital_write_pins(Dino::Board::LOW, left_level,
-                           Dino::Board::LOW, right_level)
+      def backward(left_level = 100, right_level = 100)
+        digital_write_pins(0, left_level, 0, right_level)
       end
 
       # 左に曲がる
-      def turn_left(left_level = Dino::Board::HIGH,
-                    right_level = Dino::Board::HIGH)
-        digital_write_pins(Dino::Board::LOW, left_level,
-                           right_level, Dino::Board::LOW)
+      def turn_left(left_level = 100, right_level = 100)
+        digital_write_pins(0, left_level, right_level, 0)
       end
 
       # 右に曲がる
-      def turn_right(left_level = Dino::Board::HIGH,
-                     right_level = Dino::Board::HIGH)
-        digital_write_pins(left_level, Dino::Board::LOW,
-                           Dino::Board::LOW, right_level)
+      def turn_right(left_level = 100, right_level = 100)
+        digital_write_pins(left_level, 0, 0, right_level)
       end
 
       # 停止する
-      def stop(left_level = Dino::Board::HIGH,
-               right_level = Dino::Board::HIGH)
-        digital_write_pins(Dino::Board::LOW, Dino::Board::LOW,
-                           Dino::Board::LOW, Dino::Board::LOW)
+      def stop
+        digital_write_pins(0, 0, 0, 0)
       end
 
       # 命令する
@@ -75,10 +66,12 @@ module Smalruby
       end
 
       def digital_write_pins(*levels)
-        levels.each.with_index do
-          |level, i|
-          analog_write(pins[i], (Dino::Board::HIGH * level / 100.0).to_i)
-          sleep(0.05) if i % 2 == 0
+        2.times do
+          levels.each.with_index do
+            |level, i|
+            digital_write(pins[i], (Dino::Board::HIGH * level / 100.0).to_i)
+            sleep(0.05) if i.odd?
+          end
         end
       end
     end

data/lib/smalruby/hardware.rb

@@ -31,7 +31,8 @@ module Smalruby
 
       defaults = {
         device: nil,
-        baud: 115_200
+        baud: 115_200,
+        heart_rate: 40 # HACK: 実機で調整した値
       }
       opt = Util.process_options(options, defaults)
 
@@ -42,6 +43,7 @@ module Smalruby
         txrx.io = opt[:device] if opt[:device]
       end
       world.board = Dino::Board.new(txrx)
+      world.board.heart_rate = opt[:heart_rate]
 
       @initialized_hardware = true
     end

data/lib/smalruby/util.rb

@@ -21,7 +21,21 @@ module Smalruby
     #
     # @return [Boolean] Windowsの場合はtrue、そうでない場合はfalseを返す
     def windows?
-      /windows|mingw|cygwin/i =~ RbConfig::CONFIG['arch']
+      ENV['SMALRUBY_WINDOWS_MODE'] || /windows|mingw|cygwin/i =~ RbConfig::CONFIG['arch']
+    end
+
+    # プラットフォームがRaspberry Piかどうかを返す
+    #
+    # @return [Boolean] Raspberry Piの場合はtrue、そうでない場合はfalseを返す
+    def raspberrypi?
+      ENV['SMALRUBY_RASPBERRYPI_MODE'] || /armv6l-linux-eabihf/i =~ RbConfig::CONFIG['arch']
+    end
+
+    # プラットフォームがMac OS Xかどうかを返す
+    #
+    # @return [Boolean] Mac OS Xの場合はtrue、そうでない場合はfalseを返す
+    def osx?
+      ENV['SMALRUBY_OSX_MODE'] || /darwin/i =~ RbConfig::CONFIG['arch']
     end
   end
 end

data/lib/smalruby/version.rb

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

data/lib/smalruby.rb

@@ -120,7 +120,7 @@ module Smalruby
 
           if first
             unless world.objects.any? { |o| o.is_a?(Stage) }
-              Stage.new(color: 'white')
+              Stage.new(color: 'white') unless Util.raspberrypi?
             end
             world.objects.each do |object|
               object.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler