mfrc522 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c15749e6896a2e58865f9e6639bc829fa717068
-  data.tar.gz: e340cba7fdc0810a3d581b8a14d329bba72886e4
+SHA256:
+  metadata.gz: b180534b3c1fff35f759792d021ba7005b460838e82b43782341f358d314ae5c
+  data.tar.gz: 77f1e85d84082d57ed27dbba18aea6b6e1e9949327f62ed135e2ec1389e12efe
 SHA512:
-  metadata.gz: 7b88ed0c68070b2bafe8e3bd7e25304852a24bd88c609b1688b2c5e1ce830114c3540801482c7aee5276cd357226dfb49884fea1c9c79fba56e6a9c47a73d293
-  data.tar.gz: 94e20de85a0185679b75a2902516406f6e5ed499433f5195f26493621ddac779932ca3c61b88a2c487a044db1e0ac56a489d9ec4a21aae47b842b190d782d98f
+  metadata.gz: d558480f55924d0e55e6028f87186008ed51346ab8cb1720dd2330613fe3c34ec1c6c8c33575d4e9bc228e9a9bd3be2f6826da3349c67ab12a4006c744e5ea49
+  data.tar.gz: 75554b9bcb105507d74f18ae96552bc1dd93b1d5b813f0dc5fba1e5cfdbf3ace56a54f25b623a5948ee268c1ea936b87466e87101900efba49da2d94ac763168

data/lib/mfrc522.rb

@@ -1,4 +1,4 @@
-require 'pi_piper'
+require 'fubuki'
 
 require 'openssl'
 require 'securerandom'
@@ -16,8 +16,6 @@ require 'mifare/ultralight'
 require 'mifare/ultralight_c'
 require 'mifare/ultralight_ev1'
 
-include PiPiper
-
 class MFRC522
 
   # PICC commands used by the PCD to manage communication with several PICCs (ISO 14443-3, Type A, section 6.4)
@@ -99,19 +97,11 @@ 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 = 1000000, timer = 256)
-    chip_option = { 0 => PiPiper::Spi::CHIP_SELECT_0,
-                    1 => PiPiper::Spi::CHIP_SELECT_1,
-                    2 => PiPiper::Spi::CHIP_SELECT_BOTH,
-                    3 => PiPiper::Spi::CHIP_SELECT_NONE }
-    @spi_chip = chip_option[chip]
-    @spi_spd = spd
-    @timer = timer
-
-    # Power it up
-    nrstpd_pin = PiPiper::Pin.new(pin: nrstpd, direction: :out)
-    nrstpd_pin.on
-    sleep 1.0 / 20.0 # Wait 50ms
+  def initialize(spi_bus: 0, spi_chip: 0, spi_spd: 1_000_000, spi_delay: 1, pcd_timer: 256)
+    @spi_driver = Fubuki::SPI.new(spi_bus, spi_chip)
+    @spi_speed = spi_spd
+    @spi_delay = spi_delay
+    @pcd_timer = pcd_timer
 
     soft_reset # Perform software reset
 
@@ -148,7 +138,7 @@ class MFRC522
     transceiver_baud_rate(:rx, 0)
 
     # Set PCD timer value for 302us default timer
-    internal_timer(@timer)
+    internal_timer(@pcd_timer)
   end
 
   # Control transceive timeout value
@@ -268,13 +258,7 @@ class MFRC522
           # 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
+          dirty_buffer ||= buffer.any?{|byte| !byte.is_a?(Integer) }
 
           # Retry reading UID when buffer is dirty, but don't reset loop count to prevent infinite loop
           if dirty_buffer
@@ -443,35 +427,33 @@ class MFRC522
     return received_data, valid_bits
   end
 
-  private
-
   # Read from SPI communication
   def read_spi(reg)
-    output = 0
-    PiPiper::Spi.begin do |spi|
-      spi.chip_select_active_low(true)
-      spi.bit_order Spi::MSBFIRST
-      spi.clock @spi_spd
-
-      spi.chip_select(@spi_chip) do
-        spi.write((reg << 1) & 0x7E | 0x80)
-        output = spi.read
-      end
-    end
-    output
+    read_spi_bulk(reg).first
+  end
+
+  def read_spi_bulk(*regs)
+    regs.flatten!
+
+    payload = regs.map{ |reg| ((reg & 0x3F) << 1) | 0x80 }
+    payload << 0x00
+
+    result = @spi_driver.transfer(payload, @spi_speed, @spi_delay)
+
+    # discard first byte
+    result.shift
+
+    result
   end
 
   # Write to SPI communication
   def write_spi(reg, values)
-    PiPiper::Spi.begin do |spi|
-      spi.chip_select_active_low(true)
-      spi.bit_order Spi::MSBFIRST
-      spi.clock @spi_spd
+    spi_addr = (reg & 0x3F) << 1
+    payload = [spi_addr, *values]
 
-      spi.chip_select(@spi_chip) do
-        spi.write((reg << 1) & 0x7E, *values)
-      end
-    end
+    @spi_driver.transfer(payload, @spi_speed, @spi_delay)
+
+    true
   end
 
   # Set bits by mask
@@ -522,10 +504,8 @@ class MFRC522
     # Receiving data
     received_data = []
     data_length = read_spi(FIFOLevelReg)
-    while data_length > 0 do
-      data = read_spi(FIFODataReg)
-      received_data << data
-      data_length -=1
+    if data_length > 0
+      received_data = read_spi_bulk(Array.new(data_length, FIFODataReg))
     end
     valid_bits = read_spi(ControlReg) & 0x07
 

data/lib/picc.rb

@@ -92,11 +92,11 @@ class PICC
     # Collect INF from chain
     inf = []
     received_chained_data.each do |data|
-      inf_position = 1
-      inf_position += 1 if data[0] & 0x08 != 0 # CID present
-      inf_position += 1 if data[0] & 0x04 != 0 # NAD present
+      flag = data.shift
+      data.shift if flag & 0x08 != 0 # CID present
+      data.shift if flag & 0x04 != 0 # NAD present
 
-      inf.concat(data[inf_position..-1])
+      inf.concat(data)
     end
     inf
   end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mfrc522
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - atitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pi_piper
+  name: fubuki
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.1
 description: 
 email: commit@atifans.net
 executables: []
@@ -70,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: MFRC522 RFID Reader Library for RaspberryPi