rotor 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a9f96abcefc34dafec5fbb7e2b42001a914a3c
-  data.tar.gz: 9cafb0d441b1ca31778ee344d3740f5aa3021d8a
+  metadata.gz: 514bde73c602619ea83893fca22097539fbb8e95
+  data.tar.gz: b948b19e6d5faa4b1abcfadfaa0d4c7bc0d12aab
 SHA512:
-  metadata.gz: 55aae03f77e9c557d2753f52be0c59153fce2d3b70b9c88bfa14e0b41e23192945c5be829dd34be171bf597d28e80f835cafff3e150b7acd8d45d6cf6013ca80
-  data.tar.gz: e08346a466a3f9ac1b24da19e2759c7451631f0e28515ec8577410b44ec1cec478447fc107fd944122cb41fc322740af9e849d24bf3dc316052ea81de258d3d7
+  metadata.gz: 766ce6e59e93fd306361d83d8fcbbf02ebf2d59235422feb6e34cc7dffbb3b2e3b5c6691d10957a6bbe7344ec83d2bf6f5fafb24bdf261631228fca156c14f0a
+  data.tar.gz: 01203a2ce658cc37374ae69ce9e6fe7ea937ad7be6d8fe670befb4b865ce0c60828fbb2b1b4421989f5fb0b71d557f6471b6fe8e1bf78114dd272b0c62501413

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 Rotor (Ruby Motor)
 ==================
 
+Version 0.1.7
+-------------
+
+Updated GCode Simulator to take into account various movement delays. For example, 
+
+- X moves 10 steps
+- Y moves 100 steps
+- Delays are the same
+
+X would have finished it's movement much faster than Y.
+
+Now, the delay will be automatically adjusted for the maximum movement and will start
+and now end at the same time (hopefully).
+
+Updated GCode Simulator to add a small delay for Z Movement (500 * Delay) milliseconds to allow time for puncture.
+
 Version 0.1.6
 -------------
 

data/lib/rotor/gcode.rb

@@ -115,62 +115,72 @@ module Rotor
         @x_move = parsed_line[:x]        
         @x_move ||= 0
         @x_move *= @scale
-
         @x_movement = (@x_move - @x).abs
+        @x = @x_move
+      end
+
+      @y_move = nil    
+      if parsed_line[:y]
+        @y_move = parsed_line[:y]        
+        @y_move ||= 0
+        @y_move *= @scale
+        @y_movement = (@y_move - @y).abs
+        @y = @y_move
+      end
+
+      @z_move = nil    
+      if parsed_line[:z]
+        @z_move = parsed_line[:z]        
+        @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(delay, @x_movement) }
+            threads << Thread.new { @stepper_x.forward(x_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(delay, @x_movement) } 
+            threads << Thread.new { @stepper_x.backwards(x_delay, @x_movement) } 
           end
         end unless @x_movement == 0
-        @x = @x_move
       end
 
-      @y_move = nil    
       if parsed_line[:y]
-        @y_move = parsed_line[:y]        
-        @y_move ||= 0
-        @y_move *= @scale
-
-        @y_movement = (@y_move - @y).abs
-
+        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(delay, @y_movement) }
+            threads << Thread.new { @stepper_y.forward(y_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(delay, @y_movement) } 
+            threads << Thread.new { @stepper_y.backwards(y_delay, @y_movement) } 
           end
         end unless @y_movement == 0
-        @y = @y_move
       end
 
-      @z_move = nil    
       if parsed_line[:z]
-        @z_move = parsed_line[:z]        
-        @z_move ||= 0
-        @z_move *= @scale
-
-        @z_movement = (@z_move - @z).abs
-
+        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(delay, @z_movement) }
+            threads << Thread.new { @stepper_z.forward(z_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(delay, @z_movement) } 
+            threads << Thread.new { @stepper_z.backwards(z_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
       threads.each { |thr| thr.join }
+      sleep (delay * 500) if @x_move == 0.0 && @y_move == 0.0 && @z_move > 0.0
       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    
 

data/lib/rotor/version.rb

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

metadata

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