rotor 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 514bde73c602619ea83893fca22097539fbb8e95
-  data.tar.gz: b948b19e6d5faa4b1abcfadfaa0d4c7bc0d12aab
+  metadata.gz: 50f2b68c317d9cb0d9b000f8d082c1372c3cab25
+  data.tar.gz: ba40643e271f161807e12782e30c0ecd8b0edc63
 SHA512:
-  metadata.gz: 766ce6e59e93fd306361d83d8fcbbf02ebf2d59235422feb6e34cc7dffbb3b2e3b5c6691d10957a6bbe7344ec83d2bf6f5fafb24bdf261631228fca156c14f0a
-  data.tar.gz: 01203a2ce658cc37374ae69ce9e6fe7ea937ad7be6d8fe670befb4b865ce0c60828fbb2b1b4421989f5fb0b71d557f6471b6fe8e1bf78114dd272b0c62501413
+  metadata.gz: 18bf94a2ebec5eb2c47ad03756f8b59fe4e773b9b8009da8d6fc8733f167e441f37d6fac60c4bc110e9009b2114a2c8eefce5573d294dd56ff80c470cdfc65e4
+  data.tar.gz: 11d6bf222f6ee4d8ea3b989d347f900dbf8937c1078e8d495f75702e9dd8d6a1346be45e80469881f1ca69af371ce94c5873d1f9f75c4d6f7ee5bc07e3abe39e

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Rotor (Ruby Motor)
 ==================
 
+Version 0.1.9
+-------------
+
+Fixed bug on various movement delays.
+
+Version 0.1.8
+-------------
+
+Fixed bug on various movement delays.
+
 Version 0.1.7
 -------------
 

data/lib/rotor/gcode.rb

@@ -42,16 +42,21 @@ module Rotor
             y_start = @y
             y_end = parsed_line[:y]
 
-            if parsed_line[:i] && parsed_line[:j] && parsed_line[:r].nil?
+            z_start = @z
+            z_end = parsed_line[:z]
+
+            if (parsed_line[:i] || parsed_line[:j] || parsed_line[:k]) && parsed_line[:r].nil?
               x_offset = parsed_line[:i]
               y_offset = parsed_line[:j]
+              z_offset = parsed_line[:k]
 
               x_origin = x_offset + x_start
               y_origin = y_offset + y_start
+              # z_origin = z_offset + z_start
 
               radius = Math.sqrt((x_start - x_origin) ** 2 + (y_start - y_origin) ** 2)
        
-            elsif parsed_line[:i].nil? && parsed_line[:j].nil? && parsed_line[:r]
+            elsif parsed_line[:i].nil? && parsed_line[:j].nil? && parsed_line[:k].nil? && parsed_line[:r]
               ignore = true
             end
 
@@ -116,7 +121,6 @@ module Rotor
         @x_move ||= 0
         @x_move *= @scale
         @x_movement = (@x_move - @x).abs
-        @x = @x_move
       end
 
       @y_move = nil    
@@ -125,7 +129,6 @@ module Rotor
         @y_move ||= 0
         @y_move *= @scale
         @y_movement = (@y_move - @y).abs
-        @y = @y_move
       end
 
       @z_move = nil    
@@ -134,48 +137,46 @@ module Rotor
         @z_move ||= 0
         @z_move *= @scale
         @z_movement = (@z_move - @z).abs
-        @z = @z_move
       end
 
-      comp_delay_calc = [@x_movement,@y_movement,@z_movement].max
 
       if parsed_line[:x]
-        x_delay = comp_delay_calc * delay / @x_movement
         if @x_move.to_f < @x #move to the right
           if @stepper_x # && @stepper_x.at_safe_area?
-            threads << Thread.new { @stepper_x.forward(x_delay, @x_movement) }
+            threads << Thread.new { @stepper_x.forward(delay, @x_movement) }
           end
         elsif @x_move.to_f > @x #move to the left
           if @stepper_x # && @stepper_x.at_safe_area?
-            threads << Thread.new { @stepper_x.backwards(x_delay, @x_movement) } 
+            threads << Thread.new { @stepper_x.backwards(delay, @x_movement) } 
           end
         end unless @x_movement == 0
+        @x = @x_move
       end
 
       if parsed_line[:y]
-        y_delay = comp_delay_calc * delay / @y_movement
         if @y_move.to_f < @y #move to the right
           if @stepper_y # && @stepper_y.at_safe_area?
-            threads << Thread.new { @stepper_y.forward(y_delay, @y_movement) }
+            threads << Thread.new { @stepper_y.forward(delay, @y_movement) }
           end
         elsif @y_move.to_f > @y #move to the left
           if @stepper_y # && @stepper_y.at_safe_area?
-            threads << Thread.new { @stepper_y.backwards(y_delay, @y_movement) } 
+            threads << Thread.new { @stepper_y.backwards(delay, @y_movement) } 
           end
         end unless @y_movement == 0
+        @y = @y_move
       end
 
       if parsed_line[:z]
-        z_delay = comp_delay_calc * delay / @z_movement
         if @z_move.to_f > @z #move to the right
           if @stepper_z # && @stepper_z.at_safe_area?
-            threads << Thread.new { @stepper_z.forward(z_delay, @z_movement) }
+            threads << Thread.new { @stepper_z.forward(delay, @z_movement) }
           end
         elsif @z_move.to_f < @z #move to the left
           if @stepper_z # && @stepper_z.at_safe_area?
-            threads << Thread.new { @stepper_z.backwards(z_delay, @z_movement) } 
+            threads << Thread.new { @stepper_z.backwards(delay, @z_movement) } 
           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})"
       sleep (delay * 500) if @x_move == 0.0 && @y_move == 0.0 && @z_move > 0.0

data/lib/rotor/version.rb

@@ -1,3 +1,3 @@
 module Rotor
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rotor
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - kobaltz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler