smalruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab59d720a1858ebc30ba93e44e746205947990fa
-  data.tar.gz: 0690c79c901e0d1fa23875f29f7c2b6c794566b0
+  metadata.gz: 1ee7bfa97bf4f6b1e8691e86af1d9617b52e3279
+  data.tar.gz: e186289f5699b0aead9dcb2829251c3b850bb47e
 SHA512:
-  metadata.gz: fe48b0c30b9f51c697ca2da140c035e08f8bd511719698119f4695927a45509ca3d721440eea3ec5aadee29735e58baedfbc05412bb26d8386474a4dc71d9377
-  data.tar.gz: 136e4228c387e16c11518e45a6da60bef08c02b90da9fca6fa7c937f58cf7530429c24dff6d4a076939f951f3bbacc63736d747cef0113f93714f35a94d11e60
+  metadata.gz: 4132f6b082f968a59d4bc81f963fb96ccba1b798e7671632734cf556daf2c9f42b810fe96af832df926e4a230df2a0bf7fbea03d38a8eee85332d70759049d41
+  data.tar.gz: 9f5108758dad9fc3ec58bf845403389a94408d322a73bcb30e3f0681263bdad40c42fdef5d409dd13a5914696149be87ee9de6bf5a727c6b32d8fd469cb8b0a0

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in smalruby.gemspec
 gemspec
 
-if File.exist?(File.expand_path('~/work/dxruby_sdl/'))
-  gem 'dxruby_sdl', path: '~/work/dxruby_sdl/'
+if File.exist?(File.expand_path('~/work/smalruby/dxruby_sdl/'))
+  gem 'dxruby_sdl', path: '~/work/smalruby/dxruby_sdl/'
+end
+
+if File.exist?(File.expand_path('~/work/smalruby/smalrubot/'))
+  gem 'smalrubot', path: '~/work/smalruby/smalrubot/'
 end

data/lib/smalruby/character.rb

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

data/lib/smalruby/hardware/{studuino.rb → smalrubot_s1.rb}

@@ -3,15 +3,21 @@ require 'smalruby/hardware'
 
 module Smalruby
   module Hardware
-    # Studuino class
-    class Studuino
+    # Smalrubot on Studuino v1 class
+    class SmalrubotS1
       include Smalrubot::Board::Studuino
 
+      DC_MOTOR_PACE = (255 * 0.50).round
+
       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)
+        world.board.init_sensor_port(PORT_A0, PIDLED)
+        world.board.init_sensor_port(PORT_A1, PIDLED)
+
+        world.board.init_sensor_port(PORT_A4, PIDIRPHOTOREFLECTOR)
+        world.board.init_sensor_port(PORT_A5, PIDIRPHOTOREFLECTOR)
       end
 
       # @!method forward(sec: nil)
@@ -44,8 +50,28 @@ module Smalruby
         end
       end
 
-      def ir_photoreflector_value
-        world.board.get_ir_photoreflector_value(0).to_i
+      def left_ir_photoreflector_value
+        world.board.get_ir_photoreflector_value(PORT_A4).to_i
+      end
+
+      def right_ir_photoreflector_value
+        world.board.get_ir_photoreflector_value(PORT_A5).to_i
+      end
+
+      def turn_on_white_led
+        world.board.led(PORT_A1, ON)
+      end
+
+      def turn_off_white_led
+        world.board.led(PORT_A1, OFF)
+      end
+
+      def turn_on_blue_led
+        world.board.led(PORT_A0, ON)
+      end
+
+      def turn_off_blue_led
+        world.board.led(PORT_A0, OFF)
       end
 
       private
@@ -53,23 +79,23 @@ module Smalruby
       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_power(PORT_M1, DC_MOTOR_PACE)
+          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
           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_power(PORT_M1, DC_MOTOR_PACE)
+          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
           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_power(PORT_M1, DC_MOTOR_PACE)
+          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
           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_power(PORT_M1, DC_MOTOR_PACE)
+          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
           world.board.dc_motor_control(PORT_M1, NORMAL)
           world.board.dc_motor_control(PORT_M2, REVERSE)
         when :stop
@@ -85,8 +111,8 @@ module Smalruby
       end
 
       def _stop
-        world.board.dc_motor_power(PORT_M1, 255)
-        world.board.dc_motor_power(PORT_M2, 255)
+        world.board.dc_motor_power(PORT_M1, DC_MOTOR_PACE)
+        world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
         world.board.dc_motor_control(PORT_M1, COAST)
         world.board.dc_motor_control(PORT_M2, COAST)
       end

data/lib/smalruby/hardware.rb

@@ -21,7 +21,7 @@ module Smalruby
     autoload :Sensor
 
     autoload :SmalrubotV3
-    autoload :Studuino
+    autoload :SmalrubotS1
 
     module_function
 

data/lib/smalruby/version.rb

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

data/samples/check_hardware_smalrubot_s1.rb

@@ -0,0 +1,170 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+Smalrubot on Studuino v1を操作します
+EOS
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  fill(color: 'white')
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  stage1.smalrubot_s1
+
+  loop do
+    if Input.key_down?(K_UP)
+      fill(color: 'white')
+      draw_font(string: '進む', color: 'black')
+
+      smalrubot_s1.forward
+
+      await until !Input.key_down?(K_UP)
+
+      fill(color: 'white')
+
+      smalrubot_s1.stop
+    end
+
+    if Input.key_down?(K_DOWN)
+      fill(color: 'white')
+      draw_font(string: 'バックする', color: 'black')
+
+      smalrubot_s1.backward
+
+      await until !Input.key_down?(K_DOWN)
+
+      fill(color: 'white')
+
+      smalrubot_s1.stop
+    end
+
+    if Input.key_down?(K_LEFT)
+      fill(color: 'white')
+      draw_font(string: '左に旋回する', color: 'black')
+
+      smalrubot_s1.turn_left
+
+      await until !Input.key_down?(K_LEFT)
+
+      fill(color: 'white')
+
+      smalrubot_s1.stop
+    end
+
+    if Input.key_down?(K_RIGHT)
+      fill(color: 'white')
+      draw_font(string: '右に旋回する', color: 'black')
+
+      smalrubot_s1.turn_right
+
+      await until !Input.key_down?(K_RIGHT)
+
+      fill(color: 'white')
+
+      smalrubot_s1.stop
+    end
+
+    if Input.key_down?(K_S)
+      until !Input.key_down?(K_S)
+        fill(color: 'white')
+        draw_font(string: "ライントレーサーの情報: 左(#{smalrubot_s1.left_ir_photoreflector_value}) 右(#{smalrubot_s1.right_ir_photoreflector_value})",
+                  color: 'black')
+        await
+      end
+
+      fill(color: 'white')
+    end
+
+    if Input.key_down?(K_W)
+      fill(color: 'white')
+      draw_font(string: '白色LEDを光らせる', color: 'black')
+
+      smalrubot_s1.turn_on_white_led
+
+      await until !Input.key_down?(K_W)
+
+      fill(color: 'white')
+
+      smalrubot_s1.turn_off_white_led
+    end
+
+    if Input.key_down?(K_B)
+      fill(color: 'white')
+      draw_font(string: '青色LEDを光らせる', color: 'black')
+
+      smalrubot_s1.turn_on_blue_led
+
+      await until !Input.key_down?(K_B)
+
+      fill(color: 'white')
+
+      smalrubot_s1.turn_off_blue_led
+    end
+  end
+end
+
+stage1.on(:key_push, K_A) do
+  loop do
+    fill(color: 'white')
+    draw_font(string: '自動運転', color: 'black')
+
+    smalrubot_s1.forward
+
+    loop do
+      if smalrubot_s1.left_ir_photoreflector_value < 300 && smalrubot_s1.right_ir_photoreflector_value < 300
+        fill(color: 'white')
+        draw_font(string: '前方障害物発見！', color: 'black')
+
+        smalrubot_s1.backward
+        sleep(0.25)
+        if rand(2) == 1
+          smalrubot_s1.turn_left
+          sleep(0.1)
+        else
+          smalrubot_s1.turn_right
+          sleep(0.1)
+        end
+        break
+      end
+
+      if smalrubot_s1.left_ir_photoreflector_value < 300
+        fill(color: 'white')
+        draw_font(string: '左側障害物発見！', color: 'black')
+
+        smalrubot_s1.backward
+        sleep(0.25)
+        smalrubot_s1.turn_right
+        sleep(0.1)
+        break
+      end
+
+      if smalrubot_s1.right_ir_photoreflector_value < 300
+        fill(color: 'white')
+        draw_font(string: '右側障害物発見！', color: 'black')
+
+        smalrubot_s1.backward
+        sleep(0.25)
+        smalrubot_s1.turn_left
+        sleep(0.1)
+        break
+      end
+
+      if Input.key_down?(K_Y)
+        fill(color: 'white')
+        break
+      end
+    end
+    smalrubot_s1.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.3'
+  spec.add_runtime_dependency 'smalrubot', '~> 0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-01-28 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.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: smalruby is a 2D game development library. This is part of "Smalruby"
   project that is a learning ruby programming environment for kids.
 email:
@@ -265,8 +265,8 @@ files:
 - lib/smalruby/hardware/rgb_led_cathode.rb
 - lib/smalruby/hardware/sensor.rb
 - lib/smalruby/hardware/servo.rb
+- lib/smalruby/hardware/smalrubot_s1.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,8 +278,8 @@ files:
 - samples/car.rb
 - samples/cat.rb
 - samples/check_hardware_motor_driver.rb
+- samples/check_hardware_smalrubot_s1.rb
 - samples/check_hardware_smalrubot_v3.rb
-- samples/check_hardware_studuino.rb
 - samples/console.rb
 - samples/costume.rb
 - samples/costumes.rb

data/samples/check_hardware_studuino.rb

@@ -1,121 +0,0 @@
-# -*- 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