smalruby 0.0.24-x86-mingw32 → 0.0.25-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 162b6755ecf90609dee0d3a56303ecf9ae331eb1
-  data.tar.gz: fcb65c4ad16e19b98ed970895e130e8a96452d4f
+  metadata.gz: d346fac3b28a5b569ced073c36f7bee4282e60ac
+  data.tar.gz: b31902a8e609e7fa22559e3027b35b682c7ff974
 SHA512:
-  metadata.gz: 9fe6f2c512edf883a660088b294ee44968a507faba830ad1961f3715e7cbb05d6f4df2dc726ec33d6ce4f85d7a67b14b4f09cbd45012235499ef100c78365fbd
-  data.tar.gz: fdf9b7573ee4d3be344a1f29a0abd49642a75c5a2e1c16d21fde36994647d34208c25f1373a846349de1b419f2276e8d44fd7a889826bfa4eddd8286128f3dbc
+  metadata.gz: 8f4b68718be4eb86c64affe5f01299d670a18af587ce91565c570a805cd15e7230bfdae85c6c6b1efc60367c53e4cadb5ccc03dfd710ab41d54308e479332abb
+  data.tar.gz: 8846804314cddeedcb5a78b915ed2da5e26915a9c9eaa45b99835d3091beffc06f6bc25e65c578543aa7719a9dc5d13f2ce15ddc707082b35bf98526c9639674

data/Rakefile

@@ -79,4 +79,4 @@ task :release do
   sh 'git push'
 end
 
-task :default => [:rubocop, :spec]
+task :default => [:spec]

data/lib/smalruby/character.rb

@@ -285,6 +285,16 @@ module Smalruby
       @balloon = Sprite.new(x, y, image)
     end
 
+    # 表示する/隠す
+    def visible=(val)
+      if val
+        self.collision_enable = true
+      else
+        self.collision_enable = false
+      end
+      super
+    end
+
     # 次のコスチュームにする
     def next_costume
       @costume_index += 1
@@ -394,7 +404,7 @@ module Smalruby
     # @!endgroup
 
     def draw
-      draw_balloon
+      draw_balloon if visible
 
       super
     end

data/lib/smalruby/hardware/two_wheel_drive_car.rb

@@ -16,28 +16,53 @@ module Smalruby
       end
 
       # 前進する
-      def forward
-        digital_write_pins(true, false, true, false)
+      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)
       end
 
       # 後退する
-      def backward
-        digital_write_pins(false, true, false, true)
+      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)
       end
 
       # 左に曲がる
-      def turn_left
-        digital_write_pins(false, true, true, false)
+      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)
       end
 
       # 右に曲がる
-      def turn_right
-        digital_write_pins(true, false, false, true)
+      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)
       end
 
       # 停止する
-      def stop
-        digital_write_pins(false, false, false, false)
+      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)
+      end
+
+      # 命令する
+      def run(options = {})
+        defaults = {
+          command: 'forward',
+          sec: nil,
+          left_level: 100,
+          right_level: 100,
+        }
+        opts = Util.process_options(options, defaults)
+
+        send(opts[:command], opts[:left_level], opts[:right_level])
+        sleep(opts[:sec]) if opts[:sec]
+        stop unless opts[:command] == :stop
       end
 
       private
@@ -49,10 +74,11 @@ module Smalruby
         stop
       end
 
-      def digital_write_pins(*level_flags)
-        level_flags.each.with_index do |level_flag, i|
-          level = level_flag ? Dino::Board::HIGH : Dino::Board::LOW
-          digital_write(pins[i], level)
+      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
         end
       end
     end

data/lib/smalruby/version.rb

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

data/samples/hardware_two_wheel_drive_car.rb

@@ -17,15 +17,15 @@ stage1.on(:start) do
   draw_font(string: DESCRIPTION, color: 'black')
 
   loop do
-    two_wheel_drive_car('D2').forward
+    two_wheel_drive_car('D6').forward
     sleep(3)
-    two_wheel_drive_car('D2').backward
+    two_wheel_drive_car('D6').backward
     sleep(3)
-    two_wheel_drive_car('D2').turn_left
+    two_wheel_drive_car('D6').turn_left
     sleep(3)
-    two_wheel_drive_car('D2').turn_right
+    two_wheel_drive_car('D6').turn_right
     sleep(3)
-    two_wheel_drive_car('D2').stop
+    two_wheel_drive_car('D6').stop
     sleep(3)
   end
 end

data/samples/hardware_two_wheel_drive_car_run.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+DESCRIPTION = <<EOS
+2WD車のタイヤ(モーター)を操作します
+EOS
+
+# デジタルの6番・7番ピンに左のモーター、8番・9番ピンに右のモーターを接
+# 続してください。
+
+require 'smalruby'
+
+init_hardware
+
+stage1 = Stage.new(color: 'white')
+
+stage1.on(:start) do
+  draw_font(string: DESCRIPTION, color: 'black')
+
+  loop do
+    two_wheel_drive_car('D6').run(command: 'forward', sec: 2, left_level: 85, right_level: 100)
+    sleep(1)
+    two_wheel_drive_car('D6').run(command: 'backward', sec: 2, left_level: 85, right_level: 100)
+    sleep(1)
+    two_wheel_drive_car('D6').run(command: 'turn_left', sec: 2, left_level: 85, right_level: 100)
+    sleep(1)
+    two_wheel_drive_car('D6').run(command: 'turn_right', sec: 2, left_level: 85, right_level: 100)
+    sleep(1)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -285,6 +285,7 @@ files:
 - samples/hardware_sensor.rb
 - samples/hardware_servo.rb
 - samples/hardware_two_wheel_drive_car.rb
+- samples/hardware_two_wheel_drive_car_run.rb
 - samples/hit_car.rb
 - samples/pen.rb
 - samples/pen2.rb