farmbot-serial 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baebe8a0cfa185dafd4fbe91636c72f455e5aed2
-  data.tar.gz: d0b77fa227cbdf5c28b4800446f107d8063e28b6
+  metadata.gz: 7ab299472231f9765ad9f25cf45fbc9ee02a8daf
+  data.tar.gz: 61cdd2c8d32a6d5faea497d335b217c1113b4335
 SHA512:
-  metadata.gz: b7ec31f6cc54759f023c1b42e6001025c78714ba5a9b60198b9959140f9e30bbc8473f79f2ccc1728576e20471692afe4b56df6f9aad8e1963a6fa081e439da7
-  data.tar.gz: d19e8921f94dc79f4c15418318f7d1a239ac8d53d3cea335daadc93ee08a9430f43d640c54c2f49ab29e76094c5fc8f118015f414d6204c33c091ab834f4248a
+  metadata.gz: 736508d897f2f552e277fbc3713eccab3075b3e73896177ba3c534e55750dbb31b0b08597d81cadd9150ee20eb78641b12d3d2fc365303cb2664c5740bd9d2ee
+  data.tar.gz: fd005c33a0519e801ef33ce4531ed1a474371f4c936b31860c2d50e57a1a7be5d52415eb5baada1b0fe8391390c8d8770dfd8ca6a904e5a210d905ccf7fac1e6

data/lib/arduino/incoming_handler.rb

@@ -20,7 +20,6 @@ module FB
     end
 
     def report_parameter_value(gcode)
-      # This is not correct. We need to store pin values in an array somewhere.
       bot.status.gcode_update(gcode)
     end
 
@@ -33,7 +32,7 @@ module FB
     end
 
     def report_status_value(gcode)
-      bot.status.gcode_update(gcode)
+      bot.status.set_pin(gcode.value_of(:P), gcode.value_of(:V))
     end
 
     def received(gcode)

data/lib/arduino/outgoing_handler.rb

@@ -11,6 +11,7 @@ module FB
     end
 
     def emergency_stop(*)
+      # This message is special- it is the only method that bypasses the queue.
       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

data/lib/arduino/status.rb

@@ -1,9 +1,7 @@
 module FB
   class Status
     # 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, LAST: 'none'}
+    DEFAULT_INFO = {X: 0, Y: 0, Z: 0, S: 10, BUSY: 1, LAST: 'none', PINS: {}}
     Info = Struct.new(*DEFAULT_INFO.keys)
 
     def initialize
@@ -36,7 +34,10 @@ module FB
 
     def gcode_update(gcode)
       transaction do
-        gcode.params.each { |p| @info.send("#{p.head}=", p.tail) }
+        gcode.params.each do |p|
+          setter = "#{p.head}="
+          @info.send(setter, p.tail) if @info.respond_to?(setter)
+        end
       end
     end
 
@@ -47,5 +48,14 @@ module FB
     def ready?
       self[:BUSY] == 0
     end
+
+    def pin(num)
+      @info[:PINS][num] || :unknown
+    end
+
+    def set_pin(num, val)
+      val = [true, 1, '1'].include?(val) ? :on : :off
+      transaction { |info| info.PINS[num] = val }
+    end
   end
 end

data/lib/gcode.rb

@@ -38,6 +38,10 @@ module FB
       GcodeToken.new(cmd.any? ? cmd.first : "NULL0")
     end
 
+    def value_of(param)
+      params.find{ |p| p.head == param.to_sym.upcase }.tail
+    end
+
     # A head/tail pair of a single node of GCode. Ex: R01 = [:R, '01']
     class GcodeToken
       attr_reader :head, :tail

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farmbot-serial
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tim Evers