rotor 0.0.13 → 0.1.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e638f5cf2aa72eba2495da1c20e371835bfbc44f
-  data.tar.gz: c7d1adb16a04d218a1c60847fbf10aa34da70531
+  metadata.gz: 85a4ae370eef40efc19bd9a1745a36e8dbb82943
+  data.tar.gz: 9db5dfab12dc9abaad33fb8db53d3cb2a09e82b5
 SHA512:
-  metadata.gz: a43c19ecd0b86b11d88412ac257c1e0a7b0d69c746143a07485ef773eefcc70330d70414c97ccd2d99d1c4ee4e6b84236a12f63b4c658a7d41b7b583b695bd89
-  data.tar.gz: 9a79436b515b18787df5824986633d7b2d906be871ddd9cb4858cbfddc7eeb52991c6a9a6f7499ea1fd67b67123b954bacadefe1d1fedc1dba84a0501d586048
+  metadata.gz: 3380a0d8992f067736c53b0aa986a13b94f5aa9b807c33c1b9213ad4e6a5063a35653f00d3cf9815fd32826509ec4ad2cb87b7d964c011287ac7434034b4b3b4
+  data.tar.gz: b74c20526d395f4890bb2b7b8b430a629aff4eb48c89f91f57a3e5d9ff60fd242f1bbc3a65c76d4ad2278538893c69bc37c43bc881e416fb17ad81914d989877

data/lib/rotor/gcode.rb

@@ -22,9 +22,62 @@ module Rotor
         if parsed_line[:g]
           #Move to this origin point.
           if parsed_line[:g] == 0
-            move_stepper(parsed_line,1)
+            if parsed_line[:z] && parsed_line[:f] && parsed_line[:x].nil? && parsed_line[:y].nil? 
+              puts "Lowering marker"
+              @servo.rotate(:down) if @servo
+            elsif parsed_line[:z] && parsed_line[:f].nil? && parsed_line[:x].nil? && parsed_line[:y].nil? 
+              puts "Raising marker::#{parsed_line}"
+              @servo.rotate(:up) if @servo
+            else
+              puts "Move Stepper::#{parsed_line}"
+              move_stepper(parsed_line,1)
+            end
           elsif parsed_line[:g] == 1
-            move_stepper(parsed_line,10)
+            if parsed_line[:z] && parsed_line[:f] && parsed_line[:x].nil? && parsed_line[:y].nil? 
+              puts "Lowering marker"
+              @servo.rotate(:down) if @servo
+            elsif parsed_line[:z] && parsed_line[:f].nil? && parsed_line[:x].nil? && parsed_line[:y].nil? 
+              puts "Raising marker::#{parsed_line}"
+              @servo.rotate(:up) if @servo
+            else
+              puts "Move Stepper::#{parsed_line}"
+              move_stepper(parsed_line,25)
+            end
+          elsif parsed_line[:g] == 2 || parsed_line[:g] == 3
+            # Get my ARC on
+            puts "DEBUG::#{parsed_line}"
+            x_start = @x
+            x_end = parsed_line[:x]
+
+            y_start = @y
+            y_end = parsed_line[:y]
+
+            x_offset = parsed_line[:i]
+            y_offset = parsed_line[:j]
+
+            x_origin = x_offset + x_start
+            y_origin = y_offset + y_start
+
+            radius = Math.sqrt((x_start - x_origin) ** 2 + (y_start - y_origin) ** 2)
+
+            start_angle = Math.atan2((y_start - y_origin),(x_start - x_origin))
+            end_angle = Math.atan2((y_end - y_origin),(x_end - x_origin))
+
+            steps = (end_angle - start_angle) / 25
+
+            current_degrees = start_angle
+
+            25.times do
+              arc_line = {}
+              arc_line[:x] = x_origin + radius * Math.cos(current_degrees)
+              arc_line[:y] = y_origin + radius * Math.sin(current_degrees)
+              arc_line[:z] = nil
+              current_degrees += steps
+              puts "Move Arc Stepper::#{arc_line}"
+              move_stepper(arc_line,25)
+            end
+
+
           else
             # puts "GLINE - Something else"
           end
@@ -60,24 +113,24 @@ module Rotor
 
           if instance_variable_get(:"@#{ets}_move").to_f > instance_variable_get(:"@#{ets}") #move to the right
             if instance_variable_get(:"@stepper_#{ets}") && instance_variable_get(:"@stepper_#{ets}").at_safe_area?
-              threads << Thread.new { instance_variable_get(:"@stepper_#{ets}").forward(1, instance_variable_get(:"@#{ets}_movement")) }
+              threads << Thread.new { instance_variable_get(:"@stepper_#{ets}").forward(delay, instance_variable_get(:"@#{ets}_movement")) }
             end
           elsif instance_variable_get(:"@#{ets}_move").to_f < instance_variable_get(:"@#{ets}") #move to the left
             if instance_variable_get(:"@stepper_#{ets}") && instance_variable_get(:"@stepper_#{ets}").at_safe_area?
-              threads << Thread.new { instance_variable_get(:"@stepper_#{ets}").backwards(1, instance_variable_get(:"@#{ets}_movement")) } 
+              threads << Thread.new { instance_variable_get(:"@stepper_#{ets}").backwards(delay, instance_variable_get(:"@#{ets}_movement")) } 
             end
           end
           instance_variable_set(:"@#{ets}",instance_variable_get(:"@#{ets}_move"))
         end
       end
 
-      puts "Moving to G#{parsed_line[:g]} #{instance_variable_get(:"@x_move")}, #{instance_variable_get(:"@y_move")}, #{instance_variable_get(:"@z_move")}"
+      #puts "Moving to G#{parsed_line[:g]} #{instance_variable_get(:"@x_move")}, #{instance_variable_get(:"@y_move")}, #{instance_variable_get(:"@z_move")}"
       threads.each { |thr| thr.join }
     end    
 
     def parse_line(line)
       returned_json = {}
-      values = [:g,:x,:y,:z,:i,:j,:m,:f]
+      values = [:g,:x,:y,:z,:i,:j,:k,:m,:f]
       values.each do |element|
         returned_json[element] = find_value(element,line)
       end
@@ -88,11 +141,12 @@ module Rotor
       node = element.to_s.upcase
       data = line.match /#{node}(?<data>\d+[,.]\d+)/
       data ||= line.match /#{node}(?<data>\d+)/
+      data ||= line.match /#{node}(?<data>-\d+[,.]\d+)/
       if data
         case element
         when :g, :m
           return data[:data].to_i
-        when :x,:y,:z,:i,:k,:f
+        when :x,:y,:z,:i,:j,:k,:f
           return data[:data].to_f
         end
       else

data/lib/rotor/version.rb

@@ -1,3 +1,3 @@
 module Rotor
-  VERSION = "0.0.13"
+  VERSION = "0.1.00"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rotor
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.00
 platform: ruby
 authors:
 - kobaltz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler