rfid-usb-gom-sensor 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

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

@@ -81,6 +81,7 @@ module RfidUsbGomSensor
     Defaults = {
       :device => "/dev/ttyUSB0", 
       :baudrate => 9600,
+      :hex_id => false,
     }
 
     include OAttr
@@ -98,6 +99,10 @@ module RfidUsbGomSensor
       @gom_tags = find_tags
     end
 
+    def hex_id
+      @hex_id ||= @options[:hex_id] 
+    end
+
     def find_tags
       tag_node = X::Entry.find "#{@path}/tags"
       #puts "-->#{tag_node.inspect}<---"
@@ -151,18 +156,24 @@ module RfidUsbGomSensor
       #  11 BCC  XOR[1..10]
       #  12 ETX  0x03
       #
-      def decode blk
+      def decode blk, hex_id = false
         #validate 
         rec = (blk.unpack 'c2Qc*')
-        id = rec[2]
-        rec[2] = "0x#{([id].pack 'Q').unpack 'H*'}"
+        if hex_id
+          id = rec[2]
+          rec[2] = "0x#{([id].pack 'Q').unpack 'H*'}"
+        end
         expected = rec[4]
-        cc = (blk[1..10].unpack "C*").inject(0) {|cc, c| cc^c}
+        cc = (calc_checksum blk[1..10]) # (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
+
+      def calc_checksum blk
+        (blk.unpack "C*").inject(0) {|cc, c| cc^c}
+      end
     end
 
     def detect
@@ -210,7 +221,7 @@ module RfidUsbGomSensor
 
     def next_tag
       (blk = @sp.read(13))
-      stx, adx, uid, err, bcc, etx = (Node.decode blk)
+      stx, adx, uid, err, bcc, etx = (Node.decode blk, hex_id)
       uid
     end
   end

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

@@ -22,7 +22,7 @@ describe RfidUsbGomSensor::Node do
 
   it "should calc a xor checksum" do
     buf = [0x01, 0x02, 0x04, 0x08].pack "c*"
-    lambda { Node.checksum buf, 0x0f }.should_not raise_error
+    lambda { Node.calc_checksum buf }.should_not raise_error
   end
 
   describe "with a node it" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfid-usb-gom-sensor
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - art+com/dirk luesebrink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-11 00:00:00 +01:00
 default_executable: rfid-usb-gom-sensor
 dependencies: 
 - !ruby/object:Gem::Dependency