rotor 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf88f9049feb8ff521853258e111d72f1f22d47
-  data.tar.gz: 9836c93f42752ff2f2dca44452827d67d4b44147
+  metadata.gz: cef1ab9b690175aeb72266ccd9ad3c6cdba2e049
+  data.tar.gz: 5602d17ba17365706aab8bc6e396dcc6737af84e
 SHA512:
-  metadata.gz: b0665868a8a31735bce1fb0aa1bde3d4081b5cddf1580c9c62de663cbde7708e29819473d185fe60ddaa6a3f66ea16b3da538fbd0f28e57f5690ede6e057722b
-  data.tar.gz: 11f5c40470346c2f8652b9c9d2d4687951167a04008aa26184538a35598317deac31b5e2b28e85d1cf5ad1709bed60f8200521a5168ba7c0c18567ff026c7782
+  metadata.gz: 2ed5b1fe398742143a0961f6421757a623d51b0661c0f6e4d1e57158da07ec1f64fc0e85254d0ecff79fbe6c1f776c37bec3cbc0a07c61c8d88da3ceabbef753
+  data.tar.gz: 14a9e600d3b1685d17ff625217c23dfac9fb8ad127037238675c9e3584c8d5ad91e96f35aa171607ac0368e03cd74d34aeb5d03cec2aa1dd41a08c82c94c4fe2

data/lib/rotor/motor.rb

@@ -1,9 +1,9 @@
 require 'wiringpi'
-require 'pi_piper'
+#require 'pi_piper'
 
 module Rotor
-  include PiPiper
   class Stepper
+    include PiPiper
     def initialize(coil_A_1_pin, coil_A_2_pin, coil_B_1_pin, coil_B_2_pin, enable_pin=nil)
       @io = WiringPi::GPIO.new(WPI_MODE_GPIO)
       @coil_A_1_pin = coil_A_1_pin
@@ -61,28 +61,20 @@ module Rotor
       @io.write(@coil_B_2_pin, w4)
     end
 
-    def set_home(x_coord=0, y_coord=0, x_homing_switch, y_homing_switch, x_homing_normally_open, y_homing_normally_open)
-      x_homing_normally_open ? x_homing_logic = :high : x_homing_logic = :low
-      y_homing_normally_open ? y_homing_logic = :high : y_homing_logic = :low
+    def set_home(coord=0, direction, homing_switch, homing_normally)
+      `echo #{homing_switch} > /sys/class/gpio/unexport`
+      @io.mode(homing_switch,INPUT)
+      @move = true
 
-      @x_move = true
-      @y_move = true
-
-      while @x_move == true
-        self.backwards(10,5)
+      while @move == true
+        backwards(10,5) if direction == :backwards && @io.read(homing_switch) == homing_normally
+        forward(10,5) if direction == :forward && @io.read(homing_switch) == homing_normally
       end
 
-      while @y_move == true
-        self.forward(10,5)
-      end      
-      
-      after :pin => x_homing_switch, :goes => x_homing_logic do
-        @x_move = false
-      end
+      #after :pin => homing_switch, :goes => homing_normally_open do
+      #  @move = false
+      #end
 
-      after :pin => y_homing_switch, :goes => y_homing_logic do
-        @y_move = false
-      end      
     end
 
   end

data/lib/rotor/version.rb

@@ -1,3 +1,3 @@
 module Rotor
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/rotor.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_dependency "wiringpi"
-  spec.add_dependency "pi_piper"
+  #spec.add_dependency "pi_piper"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rotor
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kobaltz
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pi_piper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ruby Gem for controlling Bipolar and Unipolar Stepper Motors
 email:
 - dave@k-innovations.net