smalruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee7bfa97bf4f6b1e8691e86af1d9617b52e3279
-  data.tar.gz: e186289f5699b0aead9dcb2829251c3b850bb47e
+  metadata.gz: 2183b4f4a9939796027d8e12cb2432baa9c293ab
+  data.tar.gz: a6092b282cdbc1acbbe5cb8f80f4e6ee68300ac7
 SHA512:
-  metadata.gz: 4132f6b082f968a59d4bc81f963fb96ccba1b798e7671632734cf556daf2c9f42b810fe96af832df926e4a230df2a0bf7fbea03d38a8eee85332d70759049d41
-  data.tar.gz: 9f5108758dad9fc3ec58bf845403389a94408d322a73bcb30e3f0681263bdad40c42fdef5d409dd13a5914696149be87ee9de6bf5a727c6b32d8fd469cb8b0a0
+  metadata.gz: df8e9248b7f7c0458a18d48728bb241448173c9db683cf84681ad1381084c27768f5c1c7ed611f756db16668a996f15c795307705b263b9ba55eebe90224426b
+  data.tar.gz: b484ca9b742a2e93119bb3a54eb99ed548983c50489317fb37a7e2a263c62225ac680dcbbf4d1f2a76ca2abc6aaddcbe4202252321accc8b4ea48ba8732baf94

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: ruby
 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: