Merge pull request #6 from ArbiGunbardhi/main

Added support for ST25R3916B component

Author: cparata

README.md

@@ -1,6 +1,6 @@
 # ST25R3916
 
-The code implements the RF/NFC abstraction layer (RFAL) APIs for the ST25R3916 component.
+The code implements the RF/NFC abstraction layer (RFAL) APIs for the ST25R3916 and ST25R3916B components.
 
 # Dependencies
 
@@ -16,3 +16,7 @@ https://github.com/stm32duino/ST25R3916
 The ST25R3916 datasheet is available at  
 https://www.st.com/en/nfc/st25r3916.html
 
+The ST25R3916B datasheet is available at  
+https://www.st.com/en/nfc/st25r3916b.html
+
+

library.properties

@@ -1,8 +1,8 @@
 name=STM32duino ST25R3916
-version=1.0.2
+version=1.1.0
 author=STMicroelectronics
 maintainer=stm32duino
-sentence=Allows controlling the ST ST25R3916 component
+sentence=Allows controlling the ST ST25R3916 and ST25R3916B components
 paragraph=This library provides an implementation of the NFC RFAL for ST25R3916 component
 category=Communication
 url=https://github.com/stm32duino/ST25R3916

src/st25r3916.cpp

@@ -478,24 +478,19 @@ ReturnCode RfalRfST25R3916Class::st25r3916SetStartGPTimer(uint16_t gpt_8fcs, uin
 /*******************************************************************************/
 bool RfalRfST25R3916Class::st25r3916CheckChipID(uint8_t *rev)
 {
-  uint8_t ID;
+  uint8_t id;
+  st25r3916ReadRegister(ST25R3916_REG_IC_IDENTITY, &id);
 
-  ID = 0;
-  st25r3916ReadRegister(ST25R3916_REG_IC_IDENTITY, &ID);
+  const uint8_t chipId = id & ST25R3916_REG_IC_IDENTITY_ic_type_mask;
 
-  /* Check if IC Identity Register contains ST25R3916's IC type code */
-  if ((ID & ST25R3916_REG_IC_IDENTITY_ic_type_mask) != ST25R3916_REG_IC_IDENTITY_ic_type_st25r3916) {
-    return false;
-  }
-
-  if (rev != NULL) {
-    *rev = (ID & ST25R3916_REG_IC_IDENTITY_ic_rev_mask);
+  if (rev) {
+    *rev = (id & ST25R3916_REG_IC_IDENTITY_ic_rev_mask);
   }
 
-  return true;
+  return (chipId == ST25R3916_REG_IC_IDENTITY_ic_type_st25r3916 ||
+          chipId == ST25R3916_REG_IC_IDENTITY_ic_type_st25r3916b);
 }
 
-
 /*******************************************************************************/
 ReturnCode RfalRfST25R3916Class::st25r3916GetRegsDump(t_st25r3916Regs *regDump)
 {

src/st25r3916_com.h

@@ -974,6 +974,7 @@
 #define ST25R3916_REG_IC_IDENTITY_ic_type1                    (1U<<4)
 #define ST25R3916_REG_IC_IDENTITY_ic_type0                    (1U<<3)
 #define ST25R3916_REG_IC_IDENTITY_ic_type_st25r3916           (5U<<3)
+#define ST25R3916_REG_IC_IDENTITY_ic_type_st25r3916b          (6U<<3)
 #define ST25R3916_REG_IC_IDENTITY_ic_type_mask                (0x1fU<<3)
 #define ST25R3916_REG_IC_IDENTITY_ic_type_shift               (3U)
 #define ST25R3916_REG_IC_IDENTITY_ic_rev2                     (1U<<2)