farmbot-serial 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9404c763a32e2450e343004905f6be373c533d49
-  data.tar.gz: 0fc2f566b496fc2ce390e56c900faa46761eb98f
+  metadata.gz: 63d4f03cfdeea5d307b9e4d5b9f3abff6e9c3127
+  data.tar.gz: 8d9afbc6a329232d9119fb792bab37b620025cfc
 SHA512:
-  metadata.gz: 1c3a981cf97cdfdf5b125e61d3850927f75741718154856ebb2638bb405858a9176356c832ea41c3268f19a97318b10fc8f158e330f91e9aef9a0f01accabf61
-  data.tar.gz: d5788707dc01441531d127a987b69417aaaa91f7054814b8ec74e06a16003355c70bce1e41f89c42422869b247fec8ac2f0e55f1d9c454d38fbb7f2e17041013
+  metadata.gz: 5b9aced9e498a880f65c3a1977f76f2ea7d5c38a03065f6cffebe5a5ad4648a3e9d3967f89cabf8b3651e44962e5af30b5f4beaf9ce40d052bd6842b993dc764
+  data.tar.gz: d6f3071f68e53b750a82af089125700cf6d6e6e2aafe4df1320fe7c9ba948a11200512a10bbb781fe08244add31a3afc8fc6862aaed6bca3bc8aeb444fb30d53

data/lib/arduino.rb

@@ -70,9 +70,14 @@ module FB
 
     def pop_gcode_off_queue
       gcode = @outbound_queue.pop
-      serial_port.puts gcode
-      status[:last] = gcode.name if gcode.respond_to?(:name)
-      status[:BUSY] = 1 # If not, pi will race arduino and "talk too fast"
+      if gcode.is_a?(FB::Gcode)
+        serial_port.puts gcode
+        status[:last] = gcode.name
+        status[:BUSY] = 1 # If not, pi will race arduino and "talk too fast"
+      else
+        raise TypeError, "Outbound messages must be GCode objects. "\
+                         "Use of #{gcode.class} is not permitted."
+      end
     end
 
     def start_event_listeners

data/lib/arduino/outgoing_handler.rb

@@ -16,57 +16,58 @@ module FB
     end
 
     def move_relative(x: 0, y: 0, z: 0, s: 100)
-      write FB::Gcode.new do
-          # TODO: At some point, I will need to figure out why this is double
-          # firing. In the meantime, the fix is to use `||=` instead of `=`
-          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
-          "G00 X#{x1} Y#{y1} Z#{z1}"
-        end
+      write do
+        # TODO: At some point, I will need to figure out why this is double
+        # firing. In the meantime, the fix is to use `||=` instead of `=`
+        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
+
+        "G00 X#{x1} Y#{y1} Z#{z1}"
+      end
     end
 
     def move_absolute(x: 0, y: 0, z: 0, s: 100)
-      write "G00 X#{x} Y#{y} Z#{z}"
+      write { "G00 X#{x} Y#{y} Z#{z}" }
     end
 
     def home_x
-      write "F11"
+      write { "F11" }
     end
 
     def home_y
-      write "F12"
+      write { "F12" }
     end
 
     def home_z
-      write "F13"
+      write { "F13" }
     end
 
     def home_all
-      write "G28"
+      write { "G28" }
     end
 
     def read_parameter(num)
-      write "F21 P#{num}"
+      write { "F21 P#{num}" }
     end
 
     def write_parameter(num, val)
-      write "F22 P#{num} V#{val}"
+      write { "F22 P#{num} V#{val}" }
     end
 
     def read_status(pin)
-      write "F31 P#{pin}"
+      write { "F31 P#{pin}" }
     end
 
     def pin_write(pin:, value:, mode:)
-      write "F41 P#{pin} V#{value} M#{mode}"
+      write { "F41 P#{pin} V#{value} M#{mode}" }
       bot.status.set_pin(pin, value)
     end
 
   private
 
-    def write(str = "\n")
-      bot.write( block_given? ? yield : str )
+    def write(&blk)
+      bot.write(FB::Gcode.new(&blk))
     end
   end
 end

metadata

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