rotor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e48e610c2097d68d9a98bbf70151730a9957875
-  data.tar.gz: be5914357afb26ab29806eb649f1f00196fa8267
+  metadata.gz: f6a9f96abcefc34dafec5fbb7e2b42001a914a3c
+  data.tar.gz: 9cafb0d441b1ca31778ee344d3740f5aa3021d8a
 SHA512:
-  metadata.gz: c35be0d4fbde64f072d1405913058437be150c37842f42afbd24a50df9f4258089d23c9801d6d877cfa1c95e02a375db2f2feaa67da2716a5f889910ba9a69e5
-  data.tar.gz: e00420f6330260ee0bf2f5ec49e0e84d60fc8ea78457610ae0cc7536f38bab87e087a12982822ea5b2532d9f3928879937df20b2658980d4d94351e4a8ce9916
+  metadata.gz: 55aae03f77e9c557d2753f52be0c59153fce2d3b70b9c88bfa14e0b41e23192945c5be829dd34be171bf597d28e80f835cafff3e150b7acd8d45d6cf6013ca80
+  data.tar.gz: e08346a466a3f9ac1b24da19e2759c7451631f0e28515ec8577410b44ec1cec478447fc107fd944122cb41fc322740af9e849d24bf3dc316052ea81de258d3d7

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+Rotor (Ruby Motor)
+==================
+
+Version 0.1.6
+-------------
+
+The GCode Module now has an option to specify the G0 Fast Move speed. 
+
+    Rotor::Gcode.new(stepper_x=nil,stepper_y=nil,stepper_z=nil,scale=1,servo=nil,fast_move=1)
+
+    gcode = Rotor::Gcode.new(stepper_x,stepper_y,stepper_z,1,servo,1)
+
+Updated the README with new examples and updated documentation.

data/README.md

@@ -162,8 +162,13 @@ Enter each stepper motor (or nil if you do not have that particular axis) along
 with the scale (multiplies all coordinates by this. Typically you will keep this
 at 1).
 
+The last variable is the speed in which G0 will move. Typically, this move should
+be faster than your normal movement speed.
+
+    Rotor::Gcode.new(stepper_x=nil,stepper_y=nil,stepper_z=nil,scale=1,servo=nil,fast_move=1)
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#gcode = Rotor::Gcode.new(stepper_x,stepper_y,stepper_z,1,servo)
+#gcode = Rotor::Gcode.new(stepper_x,stepper_y,stepper_z,1,servo,1)
 gcode = Rotor::Gcode.new(nil,nil,nil,1,nil)
 gcode.open('sample.nc')
 gcode.simulate(accuracy=8,speed=1)
@@ -201,34 +206,27 @@ Here is the real world sample code that I am using to plot
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 require 'rotor'
 begin
-  stepper_x = Rotor::Stepper.new(23,12,17,24,nil,13,0,157.48)
-  stepper_y = Rotor::Stepper.new(25, 4,21,22,nil,19,0,157.48)
-  servo = Rotor::Servo.new(18)
-
-  stepper_x.set_home(:backwards)
-  stepper_y.set_home(:backwards)
-
-  #My threaded rods move 1 inch per 4000 steps (Stepper Motor has 200 steps/rev and    the rod has 20 threads per inch)
-
-  stepper_x.forward(1,40)
-  stepper_y.forward(1,40)
-
-  gcode = Rotor::Gcode.new(stepper_x,stepper_y,nil,1,servo)
+  stepper_x = Rotor::Stepper.new(23,12,17,24,nil,13 ,0,157.48)
+  stepper_y = Rotor::Stepper.new(25, 4,21,22,nil,19 ,0,157.48)
+  stepper_z = Rotor::Stepper.new(16,20, 6,26,nil,nil,0,157.48)
+  puts "Moving to home and soft origin"
+  stepper_z.forward(1,10) 
+  stepper_x.set_home(:forward)
+  stepper_y.set_home(:forward)
+  stepper_x.backwards(2,120)
+  stepper_y.backwards(2,70)
+  stepper_z.backwards(1,10)
+  puts "Running Code"
+
+  gcode = Rotor::Gcode.new(stepper_x,stepper_y,stepper_z,1,nil,1.5)
   gcode.open('output.nc')
-  gcode.simulate(accuracy=8,speed=5)
+  gcode.simulate(16,5)
 
 ensure
-  servo.rotate(:up)
-
-  stepper_x.set_home(:backwards)
-  stepper_y.set_home(:backwards)
-  stepper_x.forward(1,4000)
-  stepper_y.forward(1,4000)
-
   stepper_x.power_down
   stepper_y.power_down
-
-  [23,12,17,24,13,25,4,21,22,19,13].each do |pin|
+  stepper_z.power_down
+  [23,12,17,24,13,25,4,21,22,19,13,16,20,6,26].each do |pin|
    `echo #{pin} > /sys/class/gpio/unexport`
   end
 end
@@ -255,7 +253,7 @@ marker is entering into an object.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 File.open("output.txt", 'wb') { |file| file.write("x,y,xm,ym\n") }
-gcode = Rotor::Gcode.new(nil,nil,nil,1,nil)
+gcode = Rotor::Gcode.new(nil,nil,nil,1,nil,1)
 gcode.open('output.nc')
 gcode.simulate
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

data/lib/rotor/gcode.rb

@@ -1,9 +1,10 @@
 module Rotor
   class Gcode
-    def initialize(stepper_x=nil,stepper_y=nil,stepper_z=nil,scale=1,servo=nil)
+    def initialize(stepper_x=nil,stepper_y=nil,stepper_z=nil,scale=1,servo=nil,fast_move=1)
       @stepper_x = stepper_x
       @stepper_y = stepper_y
       @stepper_z = stepper_z
+      @fast_move = fast_move
       @scale = scale
       @servo = servo
     end
@@ -26,33 +27,11 @@ module Rotor
         if parsed_line[:g]
           #Move to this origin point.
           if parsed_line[:g] == 0
-            if parsed_line[:z] && parsed_line[:f] && parsed_line[:x].nil? && parsed_line[:y].nil? 
-              puts "Lowering marker"
-              @servo.rotate(:down) if @servo
-              @stepper_z.forward(5,25) if @stepper_z
-            elsif parsed_line[:z] && parsed_line[:f].nil? && parsed_line[:x].nil? && parsed_line[:y].nil? 
-              puts "Raising marker::#{parsed_line}"
-              @stepper_z.backwards(5,25) if @stepper_z
-              @servo.rotate(:up) if @servo
-            else
-              puts "Move Stepper::#{parsed_line}"
-              move_stepper(parsed_line,speed)
-            end
+            puts "Move Stepper::#{parsed_line}"
+            move_stepper(parsed_line,@fast_move)
           elsif parsed_line[:g] == 1
-            if parsed_line[:z] && parsed_line[:f] && parsed_line[:x].nil? && parsed_line[:y].nil? 
-              puts "Lowering marker"
-              @servo.rotate(:down) if @servo
-              @stepper_z.forward(5,25) if @stepper_z
-            elsif parsed_line[:z] && parsed_line[:f].nil? && parsed_line[:x].nil? && parsed_line[:y].nil? 
-              puts "Raising marker::#{parsed_line}"
-              @stepper_z.backwards(5,25) if @stepper_z
-              @servo.rotate(:up) if @servo
-            elsif parsed_line[:z].nil? && parsed_line[:f] && parsed_line[:x].nil? && parsed_line[:y].nil? 
-              # Set feed/spin rate
-            else
-              puts "Move Stepper::#{parsed_line}"
-              move_stepper(parsed_line,speed)
-            end
+            puts "Move Stepper::#{parsed_line}"
+            move_stepper(parsed_line,speed)
           elsif parsed_line[:g] == 2 || parsed_line[:g] == 3
             # Get my ARC on
             ignore = false
@@ -147,7 +126,7 @@ module Rotor
           if @stepper_x # && @stepper_x.at_safe_area?
             threads << Thread.new { @stepper_x.backwards(delay, @x_movement) } 
           end
-        end
+        end unless @x_movement == 0
         @x = @x_move
       end
 
@@ -167,7 +146,7 @@ module Rotor
           if @stepper_y # && @stepper_y.at_safe_area?
             threads << Thread.new { @stepper_y.backwards(delay, @y_movement) } 
           end
-        end
+        end unless @y_movement == 0
         @y = @y_move
       end
 
@@ -179,20 +158,20 @@ module Rotor
 
         @z_movement = (@z_move - @z).abs
 
-        if @z_move.to_f < @z #move to the right
+        if @z_move.to_f > @z #move to the right
           if @stepper_z # && @stepper_z.at_safe_area?
             threads << Thread.new { @stepper_z.forward(delay, @z_movement) }
           end
-        elsif @z_move.to_f > @z #move to the left
+        elsif @z_move.to_f < @z #move to the left
           if @stepper_z # && @stepper_z.at_safe_area?
             threads << Thread.new { @stepper_z.backwards(delay, @z_movement) } 
           end
-        end
+        end unless @z_movement == 0
         @z = @z_move
       end      
       puts "Moving to G#{parsed_line[:g]} #{@x_move}(#{@x_movement}), #{@y_move}(#{@y_movement}), #{@z_move}(#{@z_movement})"
       threads.each { |thr| thr.join }
-      File.open("output.txt", 'a') { |file| file.write("#{@x_move},#{@y_move},#{@x_movement},#{@y_movement}\n") } if File.exists?("output.txt")
+      File.open("output.txt", 'a') { |file| file.write("#{@x_move},#{@y_move},#{@z_move},#{@x_movement},#{@y_movement},#{@z_movement}\n") } if File.exists?("output.txt")
     end    
 
     def parse_line(line)

data/lib/rotor/stepper.rb

@@ -61,8 +61,8 @@ module Rotor
       puts "Setting #{direction} with Homing on GPIO #{@homing_switch}"
       @move = true
       while @move == true
-        backwards(1,1) if direction == :backwards && @io.read(@homing_switch) == @homing_normally
-        forward(1,1) if direction == :forward && @io.read(@homing_switch) == @homing_normally
+        backwards(1.5,1) if direction == :backwards && @io.read(@homing_switch) == @homing_normally
+        forward(1.5,1) if direction == :forward && @io.read(@homing_switch) == @homing_normally
         @move = false unless @io.read(@homing_switch) == @homing_normally
       end
     end

data/lib/rotor/version.rb

@@ -1,3 +1,3 @@
 module Rotor
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rotor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - kobaltz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md