firmata 0.0.7 → 0.1.0

data/lib/firmata/board.rb

@@ -98,6 +98,9 @@ module Firmata
           once('firmware_query', ->() do
             once('capability_query', ->() do
               once('analog_mapping_query', ->() do
+
+                2.times { |i| toggle_pin_reporting(i) }
+
                 @connected = true
                 emit('ready')
               end)
@@ -161,6 +164,9 @@ module Firmata
 
           if analog_pin = analog_pins[pin]
             pins[analog_pin].value = value
+
+            emit('analog-read', pin, value)
+            emit("analog-read-#{pin}", value)
           end
 
         when DIGITAL_MESSAGE_RANGE
@@ -189,25 +195,25 @@ module Firmata
 
           case command
           when CAPABILITY_RESPONSE
-            supportedModes = 0
+            supported_modes = 0
             n = 0
 
             current_buffer.slice(2, current_buffer.length - 3).each do |byte|
               if byte == 127
-                modesArray = []
+                modes = []
                 # the pin modes
                 [ INPUT, OUTPUT, ANALOG, PWM, SERVO ].each do |mode|
-                   modesArray.push(mode) unless (supportedModes & (1 << mode)).zero?
+                   modes.push(mode) unless (supported_modes & (1 << mode)).zero?
                 end
 
-                @pins.push(Pin.new(modesArray, OUTPUT, 0))
+                @pins.push(Pin.new(modes, OUTPUT, 0))
 
-                supportedModes = 0
+                supported_modes = 0
                 n = 0
                 next
               end
 
-              supportedModes |= (1 << byte) if n.zero?
+              supported_modes |= (1 << byte) if n.zero?
 
               n ^= 1
             end
@@ -371,33 +377,18 @@ module Firmata
       write(START_SYSEX, ANALOG_MAPPING_QUERY, END_SYSEX)
     end
 
-
-    # Internal: Toggle the pin analog and digtal reporting off and on.
-    #
-    # state - The Integer to turn the pin on (1) or off (0).
-    #
-    # Returns nothing.
-    def toggle_pin_reporting(state)
-      16.times do |i|
-        write(REPORT_DIGITAL | i, state)
-        write(REPORT_ANALOG | i, state)
-      end
-    end
-
-    # Public: Turn pin analog and digital reporting on.
+    # Public: Toggle pin reporting on or off.
     #
-    # Returns nothing.
-    def start_pin_reporting
-      toggle_pin_reporting(1)
-    end
-
-    # Public: Turn pin analog and digital reporting off.
+    # pin   - The Integer pin to toggle.
+    # mode  - The Integer mode the pin will report. The valid values are
+    #         REPORT_DIGITAL or REPORT_ANALOG (default: REPORT_DIGITAL).
+    # state - The Integer state to toggle the pin. The valid value are
+    #         HIGH or LOW (default: HIGH)
     #
     # Returns nothing.
-    def stop_pin_reporting
-      toggle_pin_reporting(0)
+    def toggle_pin_reporting(pin, state = HIGH, mode = REPORT_DIGITAL)
+      write(mode | pin, state)
     end
 
-
   end
 end

data/lib/firmata/version.rb

@@ -1,3 +1,3 @@
 module Firmata
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/test/board_test.rb

@@ -126,32 +126,21 @@ class BoardTest < MiniTest::Unit::TestCase
     assert_equal Firmata::Board::OUTPUT, board.pins[13].mode
   end
 
-  def test_start_pin_reporting
+
+  def test_toggling_pin_reporting
     mock_sp = mock_serial_port do |mock|
-      16.times do |i|
-        mock.expect(:write_nonblock, 2, [[Firmata::Board::REPORT_DIGITAL | i, 1].map(&:chr).join])
-        mock.expect(:write_nonblock, 2, [[(Firmata::Board::REPORT_ANALOG | i), 1].map(&:chr).join])
-      end
+      mock.expect(:write_nonblock, 2, [[Firmata::Board::REPORT_DIGITAL | 13, 1].map(&:chr).join])
     end
 
     board = Firmata::Board.new(mock_sp)
-    board.start_pin_reporting
 
+    board.toggle_pin_reporting(13)
     mock_sp.verify
-  end
-
-  def test_stop_pin_reporting
-    mock_sp = mock_serial_port do |mock|
-      16.times do |i|
-        mock.expect(:write_nonblock, 2, [[Firmata::Board::REPORT_DIGITAL | i, 0].map(&:chr).join])
-        mock.expect(:write_nonblock, 2, [[(Firmata::Board::REPORT_ANALOG | i), 0].map(&:chr).join])
-      end
-    end
-
-    board = Firmata::Board.new(mock_sp)
-    board.stop_pin_reporting
 
+    mock_sp.expect(:write_nonblock, 2, [[Firmata::Board::REPORT_DIGITAL | 13, 0].map(&:chr).join])
+    board.toggle_pin_reporting(13, 0)
     mock_sp.verify
+
   end
 
   def test_processing_analog_message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firmata
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry