smalruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec6a107067381290914885042336c01037c6fef0
-  data.tar.gz: 4842514d256c5439e2ae92d4d94b5906c3ac2c4f
+  metadata.gz: ab59d720a1858ebc30ba93e44e746205947990fa
+  data.tar.gz: 0690c79c901e0d1fa23875f29f7c2b6c794566b0
 SHA512:
-  metadata.gz: 4e648a0a9adfb24038e4c24006a5201aba155ada13c703f67be288643c262948b91fe978b0ee4efec685396f04d36d311bf8346a5a8a524906988e9381077adf
-  data.tar.gz: d78a07a18293228d5cb6337df0b62bcbb2f2dba8b64388cb47fbfee3fa4cd5a5d50f12af7d1a86e7c9d5f4779a369d97e6d292e0b00d765720fbee4c23e4b161
+  metadata.gz: fe48b0c30b9f51c697ca2da140c035e08f8bd511719698119f4695927a45509ca3d721440eea3ec5aadee29735e58baedfbc05412bb26d8386474a4dc71d9377
+  data.tar.gz: 136e4228c387e16c11518e45a6da60bef08c02b90da9fca6fa7c937f58cf7530429c24dff6d4a076939f951f3bbacc63736d747cef0113f93714f35a94d11e60

data/Rakefile

@@ -47,21 +47,25 @@ task :build do
   ENV['GEM_PLATFORM'] = 'linux'
   Rake::Task['gem:build'].invoke
 
-  ENV['GEM_PLATFORM'] = 'x86-mingw32'
-  Rake::Task['gem:build'].reenable
-  Rake::Task['gem:build'].invoke
+  require 'smalruby/version'
+  Bundler.with_clean_env do
+    ENV['GEM_PLATFORM'] = 'x86-mingw32'
+    dest = "smalruby-#{Smalruby::VERSION}-#{ENV['GEM_PLATFORM']}.gem"
+    sh "gem build smalruby.gemspec && mv #{dest} pkg/"
+  end
 end
 
 task :release do
   ENV['GEM_PLATFORM'] = 'linux'
   Rake::Task['gem:release'].invoke
 
-  ENV['GEM_PLATFORM'] = 'x86-mingw32'
-  Rake::Task['gem:release'].reenable
-  Rake::Task['gem:build'].reenable
-  Rake::Task['gem:release'].invoke
-
   require 'smalruby/version'
+  Bundler.with_clean_env do
+    ENV['GEM_PLATFORM'] = 'x86-mingw32'
+    dest = "smalruby-#{Smalruby::VERSION}-#{ENV['GEM_PLATFORM']}.gem"
+    sh "gem build smalruby.gemspec && mv #{dest} pkg/ && gem push pkg/#{dest}"
+  end
+
   next_version = Smalruby::VERSION.split('.').tap { |versions|
     versions[-1] = (versions[-1].to_i + 1).to_s
   }.join('.')

data/lib/smalruby/character.rb

@@ -411,6 +411,11 @@ module Smalruby
       Hardware.create_hardware(Hardware::SmalrubotV3)
     end
 
+    # create or get Hardware::Studuino instance
+    def studuino
+      Hardware.create_hardware(Hardware::Studuino)
+    end
+
     # @!endgroup
 
     def draw

data/lib/smalruby/hardware/studuino.rb

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+require 'smalruby/hardware'
+
+module Smalruby
+  module Hardware
+    # Studuino class
+    class Studuino
+      include Smalrubot::Board::Studuino
+
+      def initialize(_)
+        world.board.init_dc_motor_port(PORT_M1, 0)
+        world.board.init_dc_motor_port(PORT_M2, 0)
+
+        world.board.init_sensor_port(PORT_A0, PIDIRPHOTOREFLECTOR)
+      end
+
+      # @!method forward(sec: nil)
+      #   forward
+      #
+      #   @param [Float] time of forwarding
+
+      # @!method backward(sec: nil)
+      #   backward
+      #
+      #   @param [Float] time of backwarding
+
+      # @!method turn_left(sec: nil)
+      #   turn left
+      #
+      #   @param [Float] time of turning left
+
+      # @!method turn_right(sec: nil)
+      #   turn right
+      #
+      #   @param [Float] time of turning right
+
+      # @!method stop(sec: nil)
+      #   stop
+      #
+      #   @param [Float] time of stopping
+      %i(forward backward turn_left turn_right stop).each do |direction|
+        define_method(direction) do |sec: nil|
+          run(direction, sec: sec)
+        end
+      end
+
+      def ir_photoreflector_value
+        world.board.get_ir_photoreflector_value(0).to_i
+      end
+
+      private
+
+      def run(direction, sec: nil)
+        case direction
+        when :forward
+          world.board.dc_motor_power(PORT_M1, 255)
+          world.board.dc_motor_power(PORT_M2, 255)
+          world.board.dc_motor_control(PORT_M1, NORMAL)
+          world.board.dc_motor_control(PORT_M2, NORMAL)
+        when :backward
+          world.board.dc_motor_power(PORT_M1, 255)
+          world.board.dc_motor_power(PORT_M2, 255)
+          world.board.dc_motor_control(PORT_M1, REVERSE)
+          world.board.dc_motor_control(PORT_M2, REVERSE)
+        when :turn_left
+          world.board.dc_motor_power(PORT_M1, 255)
+          world.board.dc_motor_power(PORT_M2, 255)
+          world.board.dc_motor_control(PORT_M1, REVERSE)
+          world.board.dc_motor_control(PORT_M2, NORMAL)
+        when :turn_right
+          world.board.dc_motor_power(PORT_M1, 255)
+          world.board.dc_motor_power(PORT_M2, 255)
+          world.board.dc_motor_control(PORT_M1, NORMAL)
+          world.board.dc_motor_control(PORT_M2, REVERSE)
+        when :stop
+          _stop
+        end
+
+        if (sec = sec.to_f) > 0
+          sleep(sec)
+          if direction != :stop
+            _stop
+          end
+        end
+      end
+
+      def _stop
+        world.board.dc_motor_power(PORT_M1, 255)
+        world.board.dc_motor_power(PORT_M2, 255)
+        world.board.dc_motor_control(PORT_M1, COAST)
+        world.board.dc_motor_control(PORT_M2, COAST)
+      end
+    end
+  end
+end

data/lib/smalruby/hardware.rb

@@ -21,6 +21,7 @@ module Smalruby
     autoload :Sensor
 
     autoload :SmalrubotV3
+    autoload :Studuino
 
     module_function
 
@@ -34,7 +35,7 @@ module Smalruby
 
       defaults = {
         device: nil,
-        baud: 115_200,
+        baud: 19_200,
       }
       opt = Util.process_options(options, defaults)
 

data/lib/smalruby/version.rb

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

data/samples/check_hardware_studuino.rb

@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+Studuinoを操作します
+EOS
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  fill(color: 'white')
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  stage1.studuino
+
+  loop do
+    if Input.key_down?(K_UP)
+      fill(color: 'white')
+      draw_font(string: '進む', color: 'black')
+
+      studuino.forward
+
+      await until !Input.key_down?(K_UP)
+
+      fill(color: 'white')
+
+      studuino.stop
+    end
+
+    if Input.key_down?(K_DOWN)
+      fill(color: 'white')
+      draw_font(string: 'バックする', color: 'black')
+
+      studuino.backward
+
+      await until !Input.key_down?(K_DOWN)
+
+      fill(color: 'white')
+
+      studuino.stop
+    end
+
+    if Input.key_down?(K_LEFT)
+      fill(color: 'white')
+      draw_font(string: '左に旋回する', color: 'black')
+
+      studuino.turn_left
+
+      await until !Input.key_down?(K_LEFT)
+
+      fill(color: 'white')
+
+      studuino.stop
+    end
+
+    if Input.key_down?(K_RIGHT)
+      fill(color: 'white')
+      draw_font(string: '右に旋回する', color: 'black')
+
+      studuino.turn_right
+
+      await until !Input.key_down?(K_RIGHT)
+
+      fill(color: 'white')
+
+      studuino.stop
+    end
+
+    if Input.key_down?(K_B)
+      until !Input.key_down?(K_B)
+        fill(color: 'white')
+        draw_font(string: "ライントレーサーの情報: #{studuino.ir_photoreflector_value}",
+                  color: 'black')
+        await
+      end
+      fill(color: 'white')
+    end
+  end
+end
+
+stage1.on(:key_push, K_A) do
+  loop do
+    fill(color: 'white')
+    draw_font(string: '自動運転', color: 'black')
+
+    studuino.forward
+
+    loop do
+      if studuino.ir_photoreflector_value < 500
+        fill(color: 'white')
+        draw_font(string: '前方障害物発見！', color: 'black')
+
+        studuino.backward
+        sleep(0.25)
+        if rand(2) == 1
+          studuino.turn_left
+          sleep(0.1)
+        else
+          studuino.turn_left
+          sleep(0.1)
+        end
+        break
+      end
+
+      if Input.key_down?(K_Y)
+        fill(color: 'white')
+        break
+      end
+    end
+    studuino.stop
+    sleep(0.1)
+
+    if Input.key_down?(K_Y)
+      fill(color: 'white')
+      break
+    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 'smalrubot', '~> 0.0.1'
+  spec.add_runtime_dependency 'smalrubot', '~> 0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
 description: smalruby is a 2D game development library. This is part of "Smalruby"
   project that is a learning ruby programming environment for kids.
 email:
@@ -266,6 +266,7 @@ files:
 - lib/smalruby/hardware/sensor.rb
 - lib/smalruby/hardware/servo.rb
 - lib/smalruby/hardware/smalrubot_v3.rb
+- lib/smalruby/hardware/studuino.rb
 - lib/smalruby/hardware/two_wheel_drive_car.rb
 - lib/smalruby/stage.rb
 - lib/smalruby/util.rb
@@ -278,6 +279,7 @@ files:
 - samples/cat.rb
 - samples/check_hardware_motor_driver.rb
 - samples/check_hardware_smalrubot_v3.rb
+- samples/check_hardware_studuino.rb
 - samples/console.rb
 - samples/costume.rb
 - samples/costumes.rb