farmbot-serial 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f578bd91bd95febe44ce8f75b1590d668cbf99
-  data.tar.gz: e5cdea88aa5cab14e18e939af4628df061b4ec24
+  metadata.gz: 401a1c1137c965d0ec54830d394d7ad3f832e57a
+  data.tar.gz: b4e397128ef3aecfdfe4b0268f4e7e485248c59a
 SHA512:
-  metadata.gz: 6c0365da760d44e89efedfb3e2ea6355895fc9158a6b894671a289283dbd3dec851c45aafffce5ee092f8a2de080ef687aa655c464a7b8b382d4edcf98214ecb
-  data.tar.gz: d88848b219d0dac50f3693fc2944b88d04ffa6a3ce04405fd4d2d1ee0f5b0dd97a8a495b94c050559d7f7da110307d668f48e7edf7d9392fd3c8bea9421d1698
+  metadata.gz: 9c8234d5dc44d3b9445c34e0128e7ca38d81b408bf04a957d0ccfd7464c9b1acf1c22e844ec691e1559ce24d38c916eda0124721e283f9804f3f55d9652c3802
+  data.tar.gz: 1eb264d3282a76da3cb5123dd9a411b684c0682dabf4f61d24cf986a06a59a4e4db1fdaed56d8ad6b78d885a8a8c9af5171d704f53bb47bca861176333a55288

data/CONTRIBUTING.md

@@ -0,0 +1 @@
+To get started, <a href="https://www.clahub.com/agreements/FarmBot/farmbot-serial">sign the Contributor License Agreement</a>.

data/console.rb

@@ -1,7 +1,20 @@
 require_relative 'lib/farmbot-serial'
 require 'pry'
+                  # Defaults to '/dev/ttyACM0', can be configured.
 
-bot = FB::Arduino.new(serial_port: FB::DefaultSerialPort.new('/dev/ttyUSB0')) # Defaults to '/dev/ttyACM0', can be configured.
+puts """
+Select a port, or press enter for '/dev/ttyACM0'
+1. /dev/ttyUSB0
+2. /dev/ttyACM0
+"""
+case gets.chomp
+when "1"
+  port = "/dev/ttyUSB0"
+else
+  port = "/dev/ttyACM0"
+end
+
+bot = FB::Arduino.new(serial_port: FB::DefaultSerialPort.new(port))
 
 puts """
 FARMBOT SERIAL SANDBOX. WELCOME!

data/lib/arduino/outgoing_handler.rb

@@ -22,7 +22,7 @@ module FB
         # every time the value is read. For this reason, we use ||= and not =.
         x1 ||= [(bot.current_position.x + (x || 0)), 0].max
         y1 ||= [(bot.current_position.y + (y || 0)), 0].max
-        z1 ||= [(bot.current_position.z + (z || 0)), 0].max
+        z1 ||= (bot.current_position.z + (z || 0)) || 0
 
         "G00 X#{x1} Y#{y1} Z#{z1}"
       end
@@ -31,7 +31,7 @@ module FB
     def move_absolute(x: 0, y: 0, z: 0, s: 100)
       x = [x.to_i, 0].max
       y = [y.to_i, 0].max
-      z = [z.to_i, 0].max
+      z = z.to_i || 0
       write { "G00 X#{x} Y#{y} Z#{z}" }
     end
 

data/lib/gcode.rb

@@ -50,10 +50,11 @@ module FB
       attr_reader :head, :tail
 
       def initialize(str)
-        nodes = str.scan(/\d+|\D+/) # ["R", "01"]
+        nodes = str.scan(/[a-zA-Z]+|\-?\d+/) # ["R", "-19"], ["Z", "4"]
+
         @head, @tail = nodes.shift.to_sym, nodes.join(" ")
         # Coerce to ints if possible, since serial line is all string types.
-        @tail = @tail.to_i if @tail.match(/^\d+$/)
+        @tail = @tail.to_i if @tail.match(/^\-?\d+$/)
       end
 
       def to_sym

data/spec/lib/arduino/outgoing_handler_spec.rb

@@ -26,11 +26,15 @@ describe FB::OutgoingHandler do
     expect(bot.next_cmd.to_s).to eq("G0 X4 Y5 Z6")
   end
 
-  it 'never goes behind the 0 line' do
+  it 'never allows X / Y behind the 0 line' do
     handler.move_relative(x: -999, y: -999, z: -999)
     expect(bot.outbound_queue.first.value_of(:x)).to eq(0)
     expect(bot.outbound_queue.first.value_of(:y)).to eq(0)
-    expect(bot.outbound_queue.first.value_of(:z)).to eq(0)
+  end
+
+  it 'allows Z to be negative' do
+    handler.move_relative(z: -999)
+    expect(bot.outbound_queue.first.value_of(:z)).to eq(-999)
   end
 
   it 'Moves absolute' do
@@ -41,11 +45,16 @@ describe FB::OutgoingHandler do
     expect(bot.next_cmd.to_s).to eq("G0 X7 Y8 Z9")
   end
 
-  it 'Never goes farther than 0 when moving absolute' do
-    handler.move_absolute(x: -987, y: -654, z: -321)
+  it 'Never sends X/Y behind 0' do
+    handler.move_absolute(x: -987, y: -654, z: 0)
     expect(bot.next_cmd.to_s).to eq("G0 X0 Y0 Z0")
   end
 
+  it 'sends Z to subzero coords' do
+    handler.move_absolute(x: 0, y: 0, z: -123)
+    expect(bot.next_cmd.to_s).to eq("G0 X0 Y0 Z-123")
+  end
+
   it 'homes x, y, z, all' do
     handler.home_x
     expect(bot.next_cmd.to_s).to eq("F11")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farmbot-serial
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Tim Evers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CONTRIBUTING.md
 - README.md
 - Rakefile
 - console.rb
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Serial library for Farmbot
@@ -193,4 +194,3 @@ test_files:
 - spec/lib/arduino_spec.rb
 - spec/lib/gcode_spec.rb
 - spec/spec_helper.rb
-has_rdoc: