rfid-usb-gom-sensor 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/{rfid-usb-gom-sensor.rb → rfid-usb-gom-sensor}

@@ -6,7 +6,7 @@ require 'applix'
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rfid-usb-gom-sensor'
 
-#Thread.abort_on_exception = true
+Thread.abort_on_exception = true
 $stderr.sync = true
 $stdout.sync = true
 
@@ -26,6 +26,7 @@ def main argv
   end
   sensor = RfidUsbGomSensor::Node.new daemon.service_path, options
   sensor.preroll
+  daemon.background_loop(1.1) { sensor.push_active_tags_to_gom }
   daemon.forever { sensor.detect }
 
 rescue Usage => e

data/lib/rfid-usb-gom-sensor/node.rb

@@ -3,6 +3,74 @@ begin
 rescue Exception
   require 'serialport'
 end
+require 'monitor.rb'
+
+module X
+  class Entry
+    attr_accessor :path, :name, :mtime
+    def initialize data = nil
+      @data = data
+    end
+
+    def mtime
+      @mtime ||= Time.parse @data["mtime"]
+    end
+
+    def path
+      @path ||= @data["uri"]
+    end
+
+    def name
+      @name ||= (path.split %r|[:/]|)[-1]
+    end
+
+    def to_s
+      "name: #{name}\npath: #{path}\nmtime: #{mtime}"
+    end
+
+    def self.find path, recurse = 0
+      json = (Gom::Remote.connection.read "#{path}.json")
+      clazz, key = /:/.match(path) ? [Attribute, "attribute"] : [Node, "node"]
+      a = clazz.new JSON.parse(json)[key]
+      a
+=begin
+      json = (connection.read "#{path}.json")
+      (JSON.parse json)["node"]["entries"].select do |entry|
+        # 1. select attribute entries
+        entry.has_key? "attribute"
+      end.inject({}) do |h, a|
+          # 2. make it a key, value list
+          h[a["attribute"]["name"].to_sym] = a["attribute"]["value"]
+          h
+      end
+=end
+    end
+  end
+
+  class Attribute < Entry
+    attr_writer :value
+    def value
+      @value ||= @data["value"]
+    end
+  end
+
+  class Node < Entry
+    def entries 
+      debugger if(defined? debugger)
+      @entries ||= @data["entries"].map do |entry|
+        if a = entry['attribute']
+          (Attribute.new a)
+        else
+          X::Entry.find entry['node']
+        end
+      end
+    end
+
+    def to_s
+      "#{super.to_s}\n#{entries.inspect}"
+    end
+  end
+end
 
 module RfidUsbGomSensor
   class Node < Gom::Remote::Entry
@@ -25,6 +93,18 @@ module RfidUsbGomSensor
 
       @ip = connection.callback_server.host
       @sp = SerialPort.new device, baudrate
+
+      @sensor_tags = {}.extend(MonitorMixin)
+      @gom_tags = find_tags
+    end
+
+    def find_tags
+      tag_node = X::Entry.find "#{@path}/tags"
+      #puts "-->#{tag_node.inspect}<---"
+      #puts "--->\n#{tag_node}\n<---"
+      tag_node.entries.inject({}) do |tags, node|
+        tags.update node.name => node.mtime
+      end
     end
 
     # reader commands
@@ -37,7 +117,7 @@ module RfidUsbGomSensor
       #info = [0x02, 0x01, 0x47, 0x46, 0x03]
       #info.each {|c| @sp.putc c.to_i}
       @sp.puts GetInfo
-      2.times {@sp.getc}
+      2.times { @sp.getc}
       print "Detected reader: "
       37.times {putc(@sp.getc)}
       print "\n"
@@ -50,17 +130,37 @@ module RfidUsbGomSensor
     end
 
     class << self 
-      def checksum buf, expected
-        cc = (buf.unpack "C*").inject(0) { |cc, c| cc ^ c }
-        (cc != expected) and raise BrokenRead, "checksum missmatch: #{cc} != #{expected}"
-        cc
+      def raise_broken_read cc, expected, buf
+        msg = "checksum missmatch: #{cc} != #{expected} -- #{buf.unpack 'H*'}"
+        raise BrokenRead, msg
       end
 
+      # blk format:
+      #
+      #   0 STX  0x02
+      #   1 ADR  0x01
+      #   2 UID7 0xE0
+      #   3 UID6  
+      #   4 UID5  
+      #   5 UID4  
+      #   6 UID3  
+      #   7 UID2  
+      #   8 UID1  
+      #   9 UID0  
+      #  10 ERR  0x00
+      #  11 BCC  XOR[1..10]
+      #  12 ETX  0x03
+      #
       def decode blk
         #validate 
         rec = (blk.unpack 'c2Qc*')
-        checksum blk[1..10], rec[4]
-        puts "-#{rec.inspect}-"
+        id = rec[2]
+        rec[2] = "0x#{([id].pack 'Q').unpack 'H*'}"
+        expected = rec[4]
+        cc = (blk[1..10].unpack "C*").inject(0) {|cc, c| cc^c}
+        (cc == expected) or (raise_broken_read cc, expected, blk)
+        #checksum blk[1..10], rec[4]
+        #puts "-#{rec.inspect}-"
         rec
       end
     end
@@ -68,7 +168,7 @@ module RfidUsbGomSensor
     def detect
       loop do
         uid = next_tag
-        connection.write "#{@path}/tags/#{uid}:sensor_ip", @ip
+        @sensor_tags.synchronize { @sensor_tags[uid] = Time.now }
       end
     rescue BrokenRead => e
       (resync_from_broken_read e) and retry
@@ -76,6 +176,33 @@ module RfidUsbGomSensor
       :stop # if (e.signm == "INT")
     end
 
+    def push_active_tags_to_gom
+      active_tags = []
+      @sensor_tags.synchronize do
+        active_tags = @sensor_tags.keys
+        @sensor_tags.clear
+      end
+      #puts "active tags: #{active_tags.inspect}"
+      #connection.write "#{@path}/tags/#{uid}:sensor_ip", @ip
+
+      # 1. which gom tags are not longer active?
+      active_tags.each { |tag| @gom_tags.delete tag }
+      (to_be_deleted = @gom_tags.keys).each do |tag_id|
+        puts "disappeared: #{@path}/tags/#{tag_id}"
+        connection.destroy "#{@path}/tags/#{tag_id}"
+      end
+      @gom_tags.clear
+
+      # 2. active_tags becomes the new gom_tags
+      active_tags.each do |tag_id|
+        @gom_tags[tag_id] = Time.now
+        puts "     active: #{@path}/tags/#{tag_id}"
+        connection.write "#{@path}/tags/#{tag_id}:sensor_ip", @ip
+      end
+    end
+
+    private 
+
     def resync_from_broken_read e
       puts " !! broken read resync not yet implemented: #{e}"
       raise e
@@ -86,6 +213,10 @@ module RfidUsbGomSensor
       stx, adx, uid, err, bcc, etx = (Node.decode blk)
       uid
     end
+  end
+end
+
+__END__
 
     def _detect
 =begin
@@ -118,5 +249,3 @@ Format:
     rescue SignalException => e
       :stop # if (e.signm == "INT")
     end
-  end
-end

data/spec/rfid-usb-gom-sensor/node_spec.rb

@@ -26,22 +26,39 @@ describe RfidUsbGomSensor::Node do
   end
 
   describe "with a node it" do
+
     RFID_NODE = <<-JSON
+{
+  "node": {
+    "uri": "/sensors/rfid-usb-reader",
+    "mtime": "2010-01-06T15:14:57+01:00",
+    "ctime": "2010-01-06T15:14:57+01:00",
+    "entries": [
       {
-          "node": {
-              "uri": "/sensors/rfid-readers/preshow-tablet-1",
-              "entries": [
-                  {
-                      "attribute": {
-                          "name": "device",
-                          "node": "/sensors/rfid-readers/preshow-tablet-1",
-                          "value": "/dev/ttyS3",
-                          "type": "string"
-                      }
-                  }
-              ]
-          }
-      }
+  "node": "/sensors/rfid-usb-reader/tags",
+  "mtime": "2009-12-31T13:00:39+01:00",
+  "ctime": "2009-12-31T13:00:39+01:00"
+}
+,
+{ "attribute": {
+  "name": "daemon_ip",
+  "node": "/sensors/rfid-usb-reader",
+  "value": "127.0.0.1",
+  "type": "string",
+  "mtime": "2010-01-07T19:30:36+01:00",
+  "ctime": "2010-01-07T19:30:36+01:00"
+} }
+,
+{ "attribute": {
+  "name": "device",
+  "node": "/sensors/rfid-usb-reader",
+  "value": "/dev/tty.SLAB_USBtoUART",
+  "type": "string",
+  "mtime": "2010-01-06T15:15:29+01:00",
+  "ctime": "2010-01-06T15:15:29+01:00"
+} }    ]
+  }
+}
     JSON
 
     before :each do
@@ -51,7 +68,7 @@ describe RfidUsbGomSensor::Node do
     end
 
     it "should pull its config from GOM" do 
-      @sensor.device.should == "/dev/ttyS3"
+      @sensor.device.should == "/dev/tty.SLAB_USBtoUART"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfid-usb-gom-sensor
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - art+com/dirk luesebrink
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 +01:00
-default_executable: rfid-usb-gom-sensor.rb
+date: 2010-01-08 00:00:00 +01:00
+default_executable: rfid-usb-gom-sensor
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: toholio-serialport
@@ -45,7 +45,7 @@ dependencies:
 description: "\n      As an alternative to the gesture driven content selection on the wall\n      guests may use an tablet-PC version of the content load application.\n      After content selection the android handset must by adssociated with\n      the selection for which the tablet PC has an USB RFID sensor installed.\n      This gem now implements the RFID GOM sensor node mapping code which runs\n      on the tablet PC.\n    "
 email: dirk.luesebrink@gmail.com
 executables: 
-- rfid-usb-gom-sensor.rb
+- rfid-usb-gom-sensor
 extensions: []
 
 extra_rdoc_files: 
@@ -58,7 +58,7 @@ files:
 - README.mkd
 - Rakefile
 - VERSION
-- bin/rfid-usb-gom-sensor.rb
+- bin/rfid-usb-gom-sensor
 - lib/rfid-usb-gom-sensor.rb
 - lib/rfid-usb-gom-sensor/node.rb
 - lib/rfid_usb_reader.rb