rotor 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f2b68c317d9cb0d9b000f8d082c1372c3cab25
-  data.tar.gz: ba40643e271f161807e12782e30c0ecd8b0edc63
+  metadata.gz: 113473297a421939fb5df7f1e6297aab7f7db0ab
+  data.tar.gz: daa003e3aa36d83c96410389d3ef85ec4ec54df1
 SHA512:
-  metadata.gz: 18bf94a2ebec5eb2c47ad03756f8b59fe4e773b9b8009da8d6fc8733f167e441f37d6fac60c4bc110e9009b2114a2c8eefce5573d294dd56ff80c470cdfc65e4
-  data.tar.gz: 11d6bf222f6ee4d8ea3b989d347f900dbf8937c1078e8d495f75702e9dd8d6a1346be45e80469881f1ca69af371ce94c5873d1f9f75c4d6f7ee5bc07e3abe39e
+  metadata.gz: 98e16965a096bcdbe70c40e0147b791ae9b8193c1d0a9772f591448ce55dd75c5cbf94c5a4f500a1dd717553033e18ce2f85451aa364bb074a8112f8a2c948f6
+  data.tar.gz: 33a57e1c215bede215b05e6817021357c176c309b7240c3dc00512f7f2d700bd08bccb0af7486054c86eefba1b320face637b2d68ac0074fc7d6dd20d2f0cab4

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Rotor (Ruby Motor)
 ==================
 
+Version 0.2.0
+-------------
+
+My only experience with GCode is stuff that I have generated. However, upon experimenting with
+various other types of GCode and generators, I have found that the repetition of G0 and G1 is not
+always necessary. This version takes into account the previous command if no new one is provided for
+G movements.
+
+I've also added back in the movement delays that were causing some problems before.
+
 Version 0.1.9
 -------------
 

data/lib/rotor/gcode.rb

@@ -21,16 +21,17 @@ module Rotor
       line_num = 0
 
       @file.each_line do |line|
+        line[0..2] = @previous_command if line[0..2] == "   "
         parsed_line = parse_line(line)
         
         line_num += 1
         if parsed_line[:g]
           #Move to this origin point.
           if parsed_line[:g] == 0
-            puts "Move Stepper::#{parsed_line}"
+            puts "Move Stepper (#{line_num})::#{parsed_line}"
             move_stepper(parsed_line,@fast_move)
           elsif parsed_line[:g] == 1
-            puts "Move Stepper::#{parsed_line}"
+            puts "Move Stepper (#{line_num})::#{parsed_line}"
             move_stepper(parsed_line,speed)
           elsif parsed_line[:g] == 2 || parsed_line[:g] == 3
             # Get my ARC on
@@ -85,14 +86,14 @@ module Rotor
               arc_line[:x] = radius * Math.cos(current_degrees) + x_origin
               arc_line[:y] = radius * Math.sin(current_degrees) + y_origin
               arc_line[:z] = nil
-              puts "Move Arc Stepper (#{line_num})::#{arc_line}::#{start_angle},#{end_angle}"
+              # puts "Move Arc Stepper (#{line_num})::#{arc_line}::#{start_angle},#{end_angle}"
               move_stepper(arc_line,speed)
             end unless ignore
 
           else
-            # puts "GLINE - Something else"
-            puts "DEBUG::GLINE - Something else::#{parsed_line}"
+            # puts "DEBUG::GLINE - Something else::#{parsed_line}"
           end
+          @previous_command = line[0..2]
         elsif parsed_line[:m]
           if line[0..2] == "M03"
             puts "Lowering marker"
@@ -101,13 +102,11 @@ module Rotor
             puts "Lifting marker"
             @servo.rotate(:up) if @servo
           else
-            # puts "MLINE - Something else"
-            puts "DEBUG::MLINE - Something else::#{parsed_line}"
+            # puts "DEBUG::MLINE - Something else::#{parsed_line}"
           end
         else
-          # puts "Something else"
-          puts "DEBUG::????? - Something else::#{parsed_line}"
-        end
+          # puts "DEBUG::????? - Something else::#{parsed_line}"
+        end        
       end
     end
 
@@ -115,12 +114,15 @@ module Rotor
 
     def move_stepper(parsed_line,delay)
       threads = []
+      comp_delay_calc = []
+
       @x_move = nil    
       if parsed_line[:x]
         @x_move = parsed_line[:x]        
         @x_move ||= 0
         @x_move *= @scale
         @x_movement = (@x_move - @x).abs
+        comp_delay_calc << @x_movement
       end
 
       @y_move = nil    
@@ -129,6 +131,7 @@ module Rotor
         @y_move ||= 0
         @y_move *= @scale
         @y_movement = (@y_move - @y).abs
+        comp_delay_calc << @y_movement
       end
 
       @z_move = nil    
@@ -137,10 +140,12 @@ module Rotor
         @z_move ||= 0
         @z_move *= @scale
         @z_movement = (@z_move - @z).abs
+        comp_delay_calc << @z_movement
       end
 
-
       if parsed_line[:x]
+        x_delay = comp_delay_calc.max * delay / @x_movement
+        x_delay = delay if x_delay == 0.0
         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) }
@@ -152,36 +157,40 @@ module Rotor
         end unless @x_movement == 0
         @x = @x_move
       end
+      @x_move ||= @x
 
       if parsed_line[:y]
+        y_delay = comp_delay_calc.max * delay / @y_movement
+        y_delay = delay if y_delay == 0.0        
         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
+      @y_move ||= @y
 
       if parsed_line[:z]
+        z_delay = comp_delay_calc.max * delay / @z_movement
+        z_delay = delay if z_delay == 0.0        
         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
+      end
+      @z_move ||= @z
       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.9"
+  VERSION = "0.2.0"
 end

metadata

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