farmbot-serial 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc6e55de74753b25d80ecb3b1ad5ffab421dee2
-  data.tar.gz: 24fcba6046ace193dc977be60e22240c65837c35
+  metadata.gz: 5f70c1d389944aaf66a8f619de9b56b0c4810ac5
+  data.tar.gz: b2a4a401415b351b5c0fa0a2b6ed0f3a5f45d93f
 SHA512:
-  metadata.gz: 5ff97f82563c17b7bbf2eb59a480a0cca3404d715dd9dd7cd6732f8cce52627b613209b62190de03f62bd8849f8bfae2d5eb10e3184aab349d7fda90c75e63d0
-  data.tar.gz: 48dba271d062b49875e2a79b1b8cad54097bf411fdac2fd223ff221e4d4820bc20ea5bef3fcc650c04f142621700e5d34a2904748e0dc6c467b56a117c3c1da2
+  metadata.gz: 67fe520ab93bd13b4deac3609b9ba9b5b5939e2ef8c0f3c38b6b5ec4b9bf721519067c868981e23f600bba307ee94d35f1c303665a1cda3c023a28e3c771405f
+  data.tar.gz: 543109b2e6d97f0fdade6e8935ccb422315e8d8adec7a681aa17423fdb21584f88859f83bc1af94f96eac4c62f158b42413774f92762add8dffb1f3bda699f16

data/lib/arduino/incoming_handler.rb

@@ -25,7 +25,11 @@ module FB
       bot.status.set(gcode.value_of(:P), gcode.value_of(:V))
     end
 
-    def reporting_end_stops(gcode)
+    def report_pin_value(gcode)
+      bot.status.set_pin(gcode.value_of(:P), gcode.value_of(:V))
+    end
+
+    def report_end_stops(gcode)
       bot.status.gcode_update(gcode)
     end
 

data/lib/arduino/outgoing_handler.rb

@@ -51,21 +51,29 @@ module FB
       write { "G28" }
     end
 
+    # Parameters are settings, which is not to be confused with status.
     def read_parameter(num)
       write { "F21 P#{num}" }
     end
 
-    def write_parameter(num, val)
-      write { "F22 P#{num} V#{val}" }
+    def read_pin(pin, mode = :digital)
+      unless [:analog, :digital].include?(mode)
+        raise "Mode must be :analog or :digital"
+      end
+      write { "F42 P#{pin} M#{(mode == :digital) ? 0 : 1}" }
     end
 
-    def read_status(pin)
-      write { "F31 P#{pin}" }
+    def read_status(num)
+      write { "F31 P#{num}" }
+    end
+
+    def write_parameter(num, val)
+      write { "F22 P#{num} V#{val}" }
     end
 
-    def pin_write(pin:, value:, mode:)
+    def write_pin(pin:, value:, mode:)
       write { "F41 P#{pin} V#{value} M#{mode}" }
-      bot.status.set(pin, value)
+      bot.status.set_pin(pin, value)
     end
 
     def set_max_speed(axis, value)

data/lib/arduino/status.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 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, BUSY: 1, LAST: 'none'}
+    DEFAULT_INFO = {X: 0, Y: 0, Z: 0, S: 10, BUSY: 1, LAST: 'none', PINS: {}}
 
     def initialize
       @changes = EM::Channel.new
@@ -22,7 +22,7 @@ module FB
     end
 
     def [](value)
-      @info[value.upcase.to_s]
+      @info[value.to_s.upcase] || :unknown
     end
 
     def to_h
@@ -43,8 +43,13 @@ module FB
       self[:BUSY] == 0
     end
 
-    def get(val)
-      @info[val.to_s.upcase] || :unknown
+    def get_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
 
     def set(key, val)
@@ -52,13 +57,5 @@ module FB
         info[Gcode::PARAMETER_DICTIONARY.fetch(key, "PIN_#{key}".to_sym)] = val
       end
     end
-
-    def pin(num)
-      case get("PIN_#{num}")
-      when false, 0, :off then :off
-      when true, 1, :on then :on
-      else; :unknown
-      end
-    end
   end
 end

data/spec/lib/arduino/incoming_handler_spec.rb

@@ -18,15 +18,15 @@ describe FB::IncomingHandler do
   end
 
   it 'reports the value of a parameter' do
-    handler.report_parameter_value(FB::Gcode.new { "A1 P1 V0" })
-    expect(bot.status.pin(1)).to eq(:off)
-    handler.report_parameter_value(FB::Gcode.new { "A1 P1 V1" })
-    expect(bot.status.pin(1)).to eq(:on)
+    handler.report_pin_value(FB::Gcode.new { "A1 P1 V0" })
+    expect(bot.status.get_pin(1)).to eq(:off)
+    handler.report_pin_value(FB::Gcode.new { "A1 P1 V1" })
+    expect(bot.status.get_pin(1)).to eq(:on)
   end
 
   it 'reports end stops' do
     gcode = FB::Gcode.new { "LOL1 S99" }
-    handler.reporting_end_stops(gcode)
+    handler.report_end_stops(gcode)
     expect(bot.status[:S]).to eq(99)
   end
 
@@ -37,10 +37,10 @@ describe FB::IncomingHandler do
   end
 
   it 'reports the value of a status' do
-    handler.report_status_value(FB::Gcode.new { "A1 P1 V0" })
-    expect(bot.status.pin(1)).to eq(:off)
-    handler.report_status_value(FB::Gcode.new { "A1 P1 V1" })
-    expect(bot.status.pin(1)).to eq(:on)
+    handler.report_pin_value(FB::Gcode.new { "A1 P1 V0" })
+    expect(bot.status.get_pin(1)).to eq(:off)
+    handler.report_pin_value(FB::Gcode.new { "A1 P1 V1" })
+    expect(bot.status.get_pin(1)).to eq(:on)
   end
 
   it 'responds to message received' do

data/spec/lib/arduino/outgoing_handler_spec.rb

@@ -70,7 +70,7 @@ describe FB::OutgoingHandler do
   end
 
   it 'writes to a pin' do
-    handler.pin_write(pin: 0, value: 1, mode: 3)
+    handler.write_pin(pin: 0, value: 1, mode: 3)
     expect(bot.next_cmd.to_s).to eq("F41 P0 V1 M3")
   end
 

data/spec/lib/arduino/status_spec.rb

@@ -46,9 +46,9 @@ describe FB::Status do
   end
 
   it 'reads known and unknow pin values' do
-    status.set(1, 1)
-    expect(status.pin(1)).to eq(:on)
-    expect(status.pin(2)).to eq(:unknown)
+    status.set_pin(1, 1)
+    expect(status.get_pin(1)).to eq(:on)
+    expect(status.get_pin(2)).to eq(:unknown)
   end
 
   it 'serializes into a hash' do

metadata

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