farmbot-serial 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8656fb126d608b73102d0a77ac29d38e5fa60647
-  data.tar.gz: 67f35f21edc7b07e20894ef6e0f8768dd5d41751
+  metadata.gz: 5b9026a21d4da007da2bdc85509d68297763fce5
+  data.tar.gz: 78705810cdea9c1b98e6f217859b2be0a08e6090
 SHA512:
-  metadata.gz: 99d37958fcc632fea80f2393becb10da870d94289045a6b22c75e2f1a23c820f07c227f8ac92086598e4f55172fa81d88380dbcb591725edb873f0bba81f2eb5
-  data.tar.gz: c30665c95c08c2bd69be3ef65adf51ea7869ff41b2d94a712c00fdc8f92e16970e951c67de05f0cb434fe7ca6cb3cc9eb7df91dcd521fa421c029bcb313941d6
+  metadata.gz: d02a8e074e6964ed3340b0450528b3caac103bc54734266cbd24db2d1db25c1516ed48fbd704cd17416f4a6c6f9134da4cbc1e8c18d0a467e560c13d27614aa6
+  data.tar.gz: 1aa4ede5691439074cd5de2e269b52e18a405d65a2faac85aeac8d305b8643e50570de696fa58a72ee4a54468e0f42ad63dc4d688a8f5ce7d19d613710ef5f7f

data/lib/arduino.rb

@@ -35,8 +35,8 @@ module FB
     end
 
     # Send outgoing test to arduino from pi
-    def write(string)
-      @outbound_queue.unshift string
+    def write(gcode)
+      @outbound_queue.unshift gcode
       execute_command_next_tick
     end
 

data/lib/arduino/outgoing_handler.rb

@@ -20,7 +20,7 @@ module FB
       y += (bot.current_position.y || 0)
       z += (bot.current_position.z || 0)
 
-      write "G00 X#{x} Y#{y} Z#{z}"
+      write { FB::Gcode.new { "G00 X#{x} Y#{y} Z#{z}" } }
     end
 
     def move_absolute(x: 0, y: 0, z: 0, s: 100)
@@ -61,8 +61,8 @@ module FB
 
   private
 
-    def write(str)
-      bot.write(FB::Gcode.new(str))
+    def write(str = "\n")
+      bot.write( block_given? ? yield : FB::Gcode.new{ str } )
     end
   end
 end

data/lib/gcode.rb

@@ -3,18 +3,16 @@ module FB
   class Gcode
     GCODE_DICTIONARY = YAML.load_file(File.join(File.dirname(__FILE__), 'gcode.yml'))
 
-    attr_accessor :cmd, :params, :str
+    attr_accessor :cmd, :params, :block
 
-    def initialize(str)
-      @str    = str
-      @params = str.split(' ').map { |line| GcodeToken.new(line) }
-      @cmd    = @params.shift || 'NULL'
+    def initialize(&block)
+      @block  = block
     end
 
     # Turns a string of many gcodes into an array of many gcodes. Used to parse
     # incoming serial.
     def self.parse_lines(string)
-      string.gsub("\r", '').split("\n").map { |s| self.new(s) }
+      string.gsub("\r", '').split("\n").map { |s| self.new { s } }
     end
 
     # Returns a symbolized english version of the gcode's name.
@@ -24,12 +22,25 @@ module FB
 
     def to_s
       # self.to_s # => "A12 B23 C45"
-      [@cmd, *@params].map(&:to_s).join(" ")
+      [cmd, *params].map(&:to_s).join(" ")
+    end
+
+    def params
+      @block
+        .call
+        .split(' ')
+        .map { |line| GcodeToken.new(line) }
+        .tap { |p| p.shift }
+    end
+
+    def cmd
+      cmd = @block.call.split(' ')
+      GcodeToken.new(cmd.any? ? cmd.first : "NULL0")
     end
 
     # A head/tail pair of a single node of GCode. Ex: R01 = [:R, '01']
     class GcodeToken
-      attr_reader :head, :tail, :name
+      attr_reader :head, :tail
 
       def initialize(str)
         nodes = str.scan(/\d+|\D+/) # ["R", "01"]

data/spec/lib/gcode_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 describe FB::Gcode do
-  let(:gcode) { FB::Gcode.new("F31 P8 ")}
+  let(:gcode) { FB::Gcode.new{ "F31 P8 " } }
+  let(:null_token) { FB::Gcode::GcodeToken.new("NULL0") }
 
   it("initializes from string") { expect(gcode).to be_kind_of(FB::Gcode) }
 
   it("infers Gcode name") { expect(gcode.name).to eq(:read_status) }
 
   it "returns :unknown for bad Gcode tokens" do
-    unknown = FB::Gcode.new("QQQ31 F32 ").name
+    unknown = FB::Gcode.new{ "QQQ31 F32 " }.name
     expect(unknown).to eq(:unknown)
   end
 
-  it("sets the original input string") { expect(gcode.str).to eq("F31 P8 ") }
+  it("sets the original input string") { expect(gcode.block[]).to eq("F31 P8 ") }
 
   it("sets @cmd using the first Gcode node") do
     expect(gcode.cmd).to be_kind_of(FB::Gcode::GcodeToken)
@@ -39,8 +40,14 @@ describe FB::Gcode do
   end
 
   it 'handles parameterless Gcode' do
-    expect(FB::Gcode.new("  ").name).to be(:unknown)
-    expect(FB::Gcode.new("  ").cmd).to  eq("NULL")
+    expect(FB::Gcode.new{ "  " }.name).to be(:unknown)
+    expect(FB::Gcode.new{ "  " }.cmd.head).to eq(null_token.head)
+    expect(FB::Gcode.new{ "  " }.cmd.tail).to eq(null_token.tail)
+  end
+
+  it 'sets dyanmic parameters' do
+    random_gcode = FB::Gcode.new{ "Q#{Time.now.to_f.to_s[-2, 2]}" }
+    expect(random_gcode.cmd.tail).to_not eq(random_gcode.cmd.tail)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farmbot-serial
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Evers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler