mfrc522 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc5f3921bd767b79efbdbd0d21a6ee673c1ac15
-  data.tar.gz: 564343a2457082eb7d394a0a8f6d7f7dfe0f2e94
+  metadata.gz: 6970a8238b5e32859472bec37f4a0c7327dd8bf7
+  data.tar.gz: cbeac674373f82caa74e5fc91179176bb2c40c86
 SHA512:
-  metadata.gz: 38314cbd1525c65bd8f4a797b9c38b3cff3e1bd2dd36ec32c720da3921eff070d6ca4eb8f4ba07a5b75413bd0f1d98f45c61292d312dcc801c5324d9d4eda39c
-  data.tar.gz: 77b667701217f597d8b1fdcd22fde1b98cef93d00646583de55be5e9fe229d77da5d5894733c9d511481cab09b73a6e27c5f0b0397e008ac3752bdb355f9b5ee
+  metadata.gz: edbb612b4d103e712eff156431ebdcc55b601cbf74a666d39a34b8246f027d5cfd5d2a938fcb4b33612f7970187bd68983e5d391c05b3eb586a33374e8b9f02e
+  data.tar.gz: 3affc064c30c146115c0c0d1894fd1e71a519af1557700178b07ba1a5e3655e55a0102e989f6c3e4a3da04e1164dbe7a56604b997d46e0c5364aa3a6ba30a753

data/lib/iso144434.rb

@@ -169,9 +169,11 @@ class ISO144434 < PICC
       ds = (ta >> 4) & 0x07 # PICC to PCD baud rate
 
       # Convert fastest baud rate to PCD setting
-      dr = convert_iso_baud_rate_to_pcd_setting(dr)
-      ds = convert_iso_baud_rate_to_pcd_setting(ds)
+      # dr = convert_iso_baud_rate_to_pcd_setting(dr)
+      # ds = convert_iso_baud_rate_to_pcd_setting(ds)
 
+      # FIXME: baud rate fixed to 106kBd
+      # until author can confirm negotiation works
       dr = 0
       ds = 0
     end

data/lib/mfrc522.rb

@@ -100,7 +100,7 @@ class MFRC522
   TestDAC2Reg       = 0x3A  # defines the test value for TestDAC2
   TestADCReg        = 0x3B  # shows the value of ADC I and Q channels
 
-  def initialize(nrstpd = 24, chip = 0, spd = 8000000, timer = 256)
+  def initialize(nrstpd = 24, chip = 0, spd = 1000000, timer = 256)
     chip_option = { 0 => PiPiper::Spi::CHIP_SELECT_0,
                     1 => PiPiper::Spi::CHIP_SELECT_1,
                     2 => PiPiper::Spi::CHIP_SELECT_BOTH,
@@ -248,15 +248,37 @@ class MFRC522
       current_level_known_bits = 0
       received_data = []
       valid_bits = 0
+      timeout = true
 
-      # Maxmimum loop is defined in ISO spec
+      # Maxmimum loop count is defined in ISO spec
       32.times do
         if current_level_known_bits >= 32 # Prepare to do a complete select if we knew everything
-          buffer = buffer[0..5] if buffer.size != 6
+          # Validate buffer content against non-numeric classes and incorrect size
+          buffer = buffer[0..5]
+          dirty_buffer = buffer.size != 6
+          dirty_buffer ||= buffer.any? do |byte|
+            if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+              !byte.is_a?(Numeric)
+            else
+              !byte.is_a?(Fixnum)
+            end
+          end
+
+          # Retry reading UID when buffer is dirty, but don't reset loop count to prevent infinite loop
+          if dirty_buffer
+            # Reinitialize all variables
+            buffer = [cascade_level]
+            current_level_known_bits = 0
+            received_data = []
+            valid_bits = 0
+
+            # Continue to next loop
+            next
+          end
 
           tx_last_bits = 0
           buffer[1] = 0x70 # NVB - We're sending full length byte[0..6]
-          buffer << (buffer[2] ^ buffer[3] ^ buffer[4] ^ buffer[5]) # Block Check Character
+          buffer[6] = (buffer[2] ^ buffer[3] ^ buffer[4] ^ buffer[5]) # Block Check Character
 
           # Append CRC to buffer
           buffer = append_crc(buffer)
@@ -265,6 +287,9 @@ class MFRC522
           uid_full_byte = current_level_known_bits / 8
           all_full_byte = 2 + uid_full_byte # length of SEL + NVB + UID
           buffer[1] = (all_full_byte << 4) + tx_last_bits # NVB
+
+          buffer_length = all_full_byte + (tx_last_bits > 0 ? 1 : 0)
+          buffer = buffer[0...buffer_length]
         end
 
         framing_bit = (tx_last_bits << 4) + tx_last_bits
@@ -284,11 +309,10 @@ class MFRC522
         if current_level_known_bits < 32
           # Check for last collision
           if tx_last_bits != 0
-            buffer[-1] &= (0xFF >> (8 - tx_last_bits))
             buffer[-1] |= received_data.shift
           end
 
-          buffer = buffer[0...all_full_byte] + received_data
+          buffer += received_data
         end
 
         # Handle collision
@@ -301,26 +325,27 @@ class MFRC522
           collision_position = collision & 0x1F
           collision_position = 32 if collision_position == 0 # Values 0-31, 0 means bit 32
           raise CollisionError if collision_position <= current_level_known_bits
-        
+
           # Calculate positioin
           current_level_known_bits = collision_position
-          uid_bit = current_level_known_bits % 8
-          uid_byte = (current_level_known_bits + 7) / 8
+          uid_bit = (current_level_known_bits - 1) % 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
+          buffer[-1] |= (1 << uid_bit)
         else
-          break if current_level_known_bits >= 32
+          if current_level_known_bits >= 32
+            timeout = false
+            break
+          end
           current_level_known_bits = 32 # We've already known all bits, loop again for a complete select
         end 
       end
 
+      # Handle timeout after 32 loops
+      if timeout
+        raise UnexpectedDataError, 'Keep receiving incomplete UID until timeout'
+      end
+
       # We've finished current cascade level
       # Check and collect all uid stored in buffer
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mfrc522
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - atitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pi_piper
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: MFRC522 RFID Reader Library for RaspberryPi