smalruby 0.1.3-x86-mingw32 → 0.1.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9c7d79fbba60758c64d066b9abd9eca99553824
-  data.tar.gz: 3caaefb79371fa79e97965750191432e1c2ecc04
+  metadata.gz: aba662932637fa77948191d7ba00cd41b679368c
+  data.tar.gz: 60742405c7e343cc468ad33b6eae645ddb8eef6e
 SHA512:
-  metadata.gz: bfeb102659f0936bb341b3eca22c00dc695879e89b8d90bb679d7738e4f55b0697f41e9ac527068979e919ab4b22cf19a4c6c1238568dc37733ced79ea944215
-  data.tar.gz: f76a9ab3d5fd13c32fcac3600c859c093c7abebf39e85195333bed040e5e5d4d02dd59f84590b2d465ecac1f52c19f7d5a8c37f672e32f80b195abb92e678bca
+  metadata.gz: 3da9ed79c667e6f487d31171096582b8b59b0918a7917115b7896aab7eb51f8e9b3cce0d4ab01d0e4553f7cd447da671dd2415d9f97faae0749782ddcead3482
+  data.tar.gz: 258dde75fb8473cb20254dce0116bad2ccf782282009a0baa1e00b139733fbc63d45c5bf0ffe84565582d01baaaff17af7cc158ce629614d4e420846f88743a1

data/lib/smalruby/hardware/smalrubot_s1.rb

@@ -7,7 +7,8 @@ module Smalruby
     class SmalrubotS1
       include Smalrubot::Board::Studuino
 
-      DC_MOTOR_PACE = (255 * 0.50).round
+      # default dc motor pace ratio
+      DEFAULT_DC_MOTOR_PACE_RATIO = 50
 
       def initialize(_)
         world.board.init_dc_motor_port(PORT_M1, 0)
@@ -18,6 +19,27 @@ module Smalruby
 
         world.board.init_sensor_port(PORT_A4, PIDIRPHOTOREFLECTOR)
         world.board.init_sensor_port(PORT_A5, PIDIRPHOTOREFLECTOR)
+
+        @dc_motor_pace_ratios = {
+          PORT_M1 => DEFAULT_DC_MOTOR_PACE_RATIO,
+          PORT_M2 => DEFAULT_DC_MOTOR_PACE_RATIO,
+        }
+      end
+
+      def left_dc_motor_pace_ratio
+        @dc_motor_pace_ratios[PORT_M1]
+      end
+
+      def left_dc_motor_pace_ratio=(val)
+        set_dc_motor_pace_ratio(PORT_M1, val)
+      end
+
+      def right_dc_motor_pace_ratio
+        @dc_motor_pace_ratios[PORT_M2]
+      end
+
+      def right_dc_motor_pace_ratio=(val)
+        set_dc_motor_pace_ratio(PORT_M2, val)
       end
 
       # @!method forward(sec: nil)
@@ -76,26 +98,45 @@ module Smalruby
 
       private
 
+      def set_dc_motor_pace_ratio(port, val)
+        if val < 0
+          @dc_motor_pace_ratios[port] = 0
+        elsif val > 100
+          @dc_motor_pace_ratios[port] = 100
+        else
+          @dc_motor_pace_ratios[port] = val
+        end
+        set_dc_motor_power(port)
+      end
+
+      def set_dc_motor_power(port)
+        ratio = @dc_motor_pace_ratios[port]
+        power = Smalrubot::Board::HIGH * (ratio.to_f / 100)
+        world.board.dc_motor_power(port, power.round)
+      end
+
+      def set_dc_motor_powers
+        @dc_motor_pace_ratios.keys.each do |port|
+          set_dc_motor_power(port)
+        end
+      end
+
       def run(direction, sec: nil)
         case direction
         when :forward
-          world.board.dc_motor_power(PORT_M1, DC_MOTOR_PACE)
-          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
+          set_dc_motor_powers
           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, DC_MOTOR_PACE)
-          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
+          set_dc_motor_powers
           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, DC_MOTOR_PACE)
-          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
+          set_dc_motor_powers
           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, DC_MOTOR_PACE)
-          world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
+          set_dc_motor_powers
           world.board.dc_motor_control(PORT_M1, NORMAL)
           world.board.dc_motor_control(PORT_M2, REVERSE)
         when :stop
@@ -111,8 +152,7 @@ module Smalruby
       end
 
       def _stop
-        world.board.dc_motor_power(PORT_M1, DC_MOTOR_PACE)
-        world.board.dc_motor_power(PORT_M2, DC_MOTOR_PACE)
+        set_dc_motor_powers
         world.board.dc_motor_control(PORT_M1, COAST)
         world.board.dc_motor_control(PORT_M2, COAST)
       end

data/lib/smalruby/version.rb

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

data/samples/check_hardware_smalrubot_s1.rb

@@ -14,7 +14,8 @@ stage1.on(:start) do
   fill(color: 'white')
   draw_font(string: DESCRIPTION, color: 'black')
 
-  stage1.smalrubot_s1
+  smalrubot_s1.left_dc_motor_pace_ratio = 100
+  smalrubot_s1.right_dc_motor_pace_ratio = 100
 
   loop do
     if Input.key_down?(K_UP)
@@ -25,8 +26,17 @@ stage1.on(:start) do
 
       await until !Input.key_down?(K_UP)
 
+      [75, 50, 25].each do |ratio|
+        smalrubot_s1.left_dc_motor_pace_ratio = ratio
+        smalrubot_s1.right_dc_motor_pace_ratio = ratio
+        sleep(0.1)
+      end
+
       fill(color: 'white')
 
+      smalrubot_s1.left_dc_motor_pace_ratio = 100
+      smalrubot_s1.right_dc_motor_pace_ratio = 100
+
       smalrubot_s1.stop
     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.4'
+  spec.add_runtime_dependency 'smalrubot', '~> 0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-07 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.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 description: smalruby is a 2D game development library. This is part of "Smalruby"
   project that is a learning ruby programming environment for kids.
 email: