mfrc522 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215975fcbc3557e0178dfb4914d1f7c485da80ec
-  data.tar.gz: 23d6d8c256dcd032ac97a4c8cfc24484d2b63f1f
+  metadata.gz: 9428817820b5c88cd3cff12e41b08d10c04d9059
+  data.tar.gz: 5b47fcf6a136886d21b45b5afbacff6493926b9c
 SHA512:
-  metadata.gz: 14924647fdbe471062ef2cf950148f8aef115c3a0a39e77d599a78950928e3356163a001dfdbba9f2a432fd5cf4bce7f54ad49d756e6a2acc30aec4226529293
-  data.tar.gz: 94d9f280bcd1fe4d9d7b9b91c96e149bcd7b0d03dadc3b3023c83ea21a1abd363abaab504c2c504f52ad1471e9e1952fd8d2166ddfb47120086fadd53d7c9bbc
+  metadata.gz: 8b8df55a9798f3c3d91cf359b341f0ff42871dc7530e9b06e2504d517de20083c772fcb528d01b623a5e9d2e27a32add5fc6bfca66ab0fde499eaf02cb6ba8c6
+  data.tar.gz: 205c14b4031c9ec0dd11e7ce54ad91bf633a01cdd7ef4122556ef689f30d6e89ff7236816ed6dc3b2e948b13c0b4f286f26c329399aaaca6fc3de675d56af3b6

data/lib/mfrc522.rb

@@ -249,14 +249,10 @@ class MFRC522
       received_data = []
       valid_bits = 0
 
-      loop do
+      # Maxmimum loop is defined in ISO spec
+      32.times do
         if current_level_known_bits >= 32 # Prepare to do a complete select if we knew everything
-          # ensure there's nothing weird in buffer
-          if buffer.size != 6 && !buffer.select{|b| !buffer.is_a?(Fixnum)}.empty?
-            current_level_known_bits = 0
-            buffer = [cascade_level]
-            next
-          end
+          buffer = buffer[0..5] if buffer.size != 6
 
           tx_last_bits = 0
           buffer[1] = 0x70 # NVB - We're sending full length byte[0..6]
@@ -281,7 +277,15 @@ class MFRC522
         end
 
         # Append received UID into buffer if not doing full select
-        buffer = buffer[0...all_full_byte] + received_data[0..3] if current_level_known_bits < 32
+        if current_level_known_bits < 32
+          if current_level_known_bits % 8 != 0
+            uid_bit = current_level_known_bits % 8
+            buffer[-1] &= (0xFF >> (8 - uid_bit))
+            buffer[-1] |= received_data.shift
+          end
+
+          buffer.concat(received_data[0..3])
+        end
 
         # Handle collision
         if status == :status_collision
@@ -294,11 +298,19 @@ class MFRC522
           collision_position = 32 if collision_position == 0 # Values 0-31, 0 means bit 32
           raise CollisionError if collision_position <= current_level_known_bits
         
-          # Mark the collision bit
+          # Calculate positioin
           current_level_known_bits = collision_position
-          uid_bit = (current_level_known_bits - 1) % 8
-          uid_byte = (current_level_known_bits / 8) + (uid_bit != 0 ? 1 : 0)
-          buffer[1 + uid_byte] |= (1 << uid_bit)
+          uid_bit = current_level_known_bits % 8
+          uid_byte = (current_level_known_bits + 7) / 8
+
+          # Mark the collision bit
+          buffer = buffer[0..(uid_byte + 1)]
+          if uid_bit == 0
+            buffer << 0x01
+          else
+            buffer[-1] &= (0xFF >> (8 - uid_bit))
+            buffer[-1] |= (1 << uid_bit)
+          end
         else
           break if current_level_known_bits >= 32
           current_level_known_bits = 32 # We've already known all bits, loop again for a complete select

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mfrc522
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - atitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pi_piper