farmbot-serial 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9026a21d4da007da2bdc85509d68297763fce5
-  data.tar.gz: 78705810cdea9c1b98e6f217859b2be0a08e6090
+  metadata.gz: baebe8a0cfa185dafd4fbe91636c72f455e5aed2
+  data.tar.gz: d0b77fa227cbdf5c28b4800446f107d8063e28b6
 SHA512:
-  metadata.gz: d02a8e074e6964ed3340b0450528b3caac103bc54734266cbd24db2d1db25c1516ed48fbd704cd17416f4a6c6f9134da4cbc1e8c18d0a467e560c13d27614aa6
-  data.tar.gz: 1aa4ede5691439074cd5de2e269b52e18a405d65a2faac85aeac8d305b8643e50570de696fa58a72ee4a54468e0f42ad63dc4d688a8f5ce7d19d613710ef5f7f
+  metadata.gz: b7ec31f6cc54759f023c1b42e6001025c78714ba5a9b60198b9959140f9e30bbc8473f79f2ccc1728576e20471692afe4b56df6f9aad8e1963a6fa081e439da7
+  data.tar.gz: d19e8921f94dc79f4c15418318f7d1a239ac8d53d3cea335daadc93ee08a9430f43d640c54c2f49ab29e76094c5fc8f118015f414d6204c33c091ab834f4248a

data/lib/arduino.rb

@@ -73,17 +73,16 @@ module FB
 
     def execute_command_next_tick
       EM.next_tick do
-        if status.ready?
-          log "Exec after #{(Time.now - (@time || Time.now)).to_i}s wait"
-          serial_port.puts @outbound_queue.pop
-          @time = nil
-        else
-          @time ||= Time.now
-          execute_command_next_tick
-        end
+        status.ready? ? pop_gcode_off_queue : execute_command_next_tick
       end
     end
 
+    def pop_gcode_off_queue
+      gcode = @outbound_queue.pop
+      status[:last] = gcode.name if gcode.respond_to?(:name)
+      serial_port.puts gcode
+    end
+
     def start_event_listeners
       status.onchange { |diff| @onchange.call(diff) if @onchange }
       inbound_queue.subscribe do |gcodes|

data/lib/arduino/outgoing_handler.rb

@@ -13,6 +13,7 @@ module FB
     def emergency_stop(*)
       bot.outbound_queue = []  # Dump pending commands.
       bot.serial_port.puts "E" # Don't queue this one- write to serial line.
+      bot.status[:last] = :emergency_stop
     end
 
     def move_relative(x: 0, y: 0, z: 0, s: 100)

data/lib/arduino/status.rb

@@ -3,7 +3,7 @@ module FB
     # Map of informational status and default values for status within Arduino.
     DEFAULT_INFO = {X: 0, Y: 0, Z: 0, S: 10, Q: 0,  T: 0,  C: '', P: 0,  V: 0,
                     W: 0, L: 0, E: 0, M: 0, XA: 0, XB: 0, YA: 0, YB: 0, ZA: 0,
-                   ZB: 0,YR: 0, R: 0, BUSY: 1}
+                   ZB: 0,YR: 0, R: 0, BUSY: 1, LAST: 'none'}
     Info = Struct.new(*DEFAULT_INFO.keys)
 
     def initialize
@@ -20,7 +20,14 @@ module FB
     end
 
     def []=(register, value)
-      transaction { @info[register.upcase.to_sym] = value }
+      transaction do
+        register = register.upcase.to_sym
+        if @info.members.include?(register)
+          @info[register] = value
+        else
+          bot.log "Ignoring attempt to set unknown status value: #{register}"
+        end
+      end
     end
 
     def [](value)

metadata

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