farmbot-serial 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a66521f3af57ec3336636065bb5019cccd8391
-  data.tar.gz: 3566d30977fddd4e4907974545d41079e9691b2e
+  metadata.gz: 52762a06bad21afddef2fa922e24b444961b8409
+  data.tar.gz: 2229dc5fa90ce682ce14910c3acf55d95afff12e
 SHA512:
-  metadata.gz: 4df445412c5fc62137559d7b551d61d5cbea3819315b83d0bcde102168323f8f181097ba21401f41bddfa71979435d56f05d3744efaad1a0423733305213dd50
-  data.tar.gz: b14b9e64075481dd4b3e8e653885e033a8ccebbf220fe439e1d14ef5a1ab11144259d264cc5182909181b56aad25178ae4818c7a885c2be9893bff6a061fdc32
+  metadata.gz: ff41ce048316615c745a2946f7709c63339a0cc7b825d91eccd90f5bf0ec2bfc98751cdfff2409d599d0560aea600e7eb834f7cdebb5c7dd5ee11a8509d3da5c
+  data.tar.gz: 4a4c5e4af533e65809435d98cec2be8241c1fe16f10d6335fe3ce4865fcde936435a8516209689e08f6eb093d92a947b0375a92e68f6d62ff3ac6d0fe4a9e3c2

data/lib/arduino.rb

@@ -65,19 +65,27 @@ module FB
       outbound_queue.first
     end
 
-    def maybe_execute_command
+    def maybe_execute_command # This method smells procedural. Refactor?
       sleep 0.08 # Throttle CPU
+      return unless can_execute?
       gcode = @outbound_queue.pop
-      return unless gcode && status.ready?
-      if gcode.is_a?(FB::Gcode)
-        log "RPI MSG: #{gcode}"
-        serial_port.puts gcode
-        status[:last] = gcode.name
-        status[:BUSY] = 1 # If not, pi will race arduino and "talk too fast"
-      else
-        return log "Outbound messages must be GCode objects. Use of "\
-                   "#{gcode.class}:#{gcode.inspect} is not permitted."
-      end
+      gcode.is_a?(FB::Gcode) ? execute_now(gcode) : reject_gcode(gcode)
+    end
+
+    def can_execute? # If the device is ready and commands are in the queue
+      @outbound_queue.any? && status.ready?
+    end
+
+    def execute_now(gcode)
+      log "RPI MSG: #{gcode}"
+      serial_port.puts gcode
+      status[:last] = gcode.name
+      status[:BUSY] = 1 # If not, pi will race arduino and "talk too fast"
+    end
+
+    def reject_gcode(gcode)
+      log "Outbound messages must be GCode objects. Use of "\
+          "#{gcode.class}:#{gcode.inspect} is not permitted."
     end
 
     def start_event_listeners

metadata

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