semaf/MFRC522_I2C_Library
1
0
Fork 1
mirror of https://github.com/semaf/MFRC522_I2C_Library.git synced 2025-07-29 12:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

additional cleanup

Browse Source
This commit is contained in:
kkloesener
2020-11-03 21:55:15 +01:00
parent ae8faf0387
commit 3572ad0f64
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
MFRC522_I2C.cpp
View File

@ -24,7 +24,7 @@ MFRC522::MFRC522( byte chipAddress,
) { ) {
_chipAddress = chipAddress; _chipAddress = chipAddress;
_resetPowerDownPin = resetPowerDownPin; _resetPowerDownPin = resetPowerDownPin;
_myWire = TwoWireInstance; _TwoWireInstance = TwoWireInstance;
} // End constructor } // End constructor
@ -39,10 +39,10 @@ MFRC522::MFRC522( byte chipAddress,
void MFRC522::PCD_WriteRegister( byte reg, ///< The register to write to. One of the PCD_Register enums. void MFRC522::PCD_WriteRegister( byte reg, ///< The register to write to. One of the PCD_Register enums.
byte value ///< The value to write. byte value ///< The value to write.
) { ) {
_myWire.beginTransmission(_chipAddress); _TwoWireInstance.beginTransmission(_chipAddress);
_myWire.write(reg); _TwoWireInstance.write(reg);
_myWire.write(value); _TwoWireInstance.write(value);
_myWire.endTransmission(); _TwoWireInstance.endTransmission();
} // End PCD_WriteRegister() } // End PCD_WriteRegister()
/** /**
@ -53,12 +53,12 @@ void MFRC522::PCD_WriteRegister( byte reg, ///< The register to write to. One o
byte count, ///< The number of bytes to write to the register byte count, ///< The number of bytes to write to the register
byte *values ///< The values to write. Byte array. byte *values ///< The values to write. Byte array.
) { ) {
_myWire.beginTransmission(_chipAddress); _TwoWireInstance.beginTransmission(_chipAddress);
_myWire.write(reg); _TwoWireInstance.write(reg);
for (byte index = 0; index < count; index++) { for (byte index = 0; index < count; index++) {
_myWire.write(values[index]); _TwoWireInstance.write(values[index]);
} }
_myWire.endTransmission(); _TwoWireInstance.endTransmission();
} // End PCD_WriteRegister() } // End PCD_WriteRegister()
/** /**
@ -69,12 +69,12 @@ byte MFRC522::PCD_ReadRegister( byte reg ///< The register to read from. One of
) { ) {
byte value; byte value;
//digitalWrite(_chipSelectPin, LOW); // Select slave //digitalWrite(_chipSelectPin, LOW); // Select slave
_myWire.beginTransmission(_chipAddress); _TwoWireInstance.beginTransmission(_chipAddress);
_myWire.write(reg); _TwoWireInstance.write(reg);
_myWire.endTransmission(); _TwoWireInstance.endTransmission();
_myWire.requestFrom(_chipAddress, 1); _TwoWireInstance.requestFrom(_chipAddress, 1);
value = _myWire.read(); value = _TwoWireInstance.read();
return value; return value;
} // End PCD_ReadRegister() } // End PCD_ReadRegister()
@ -92,11 +92,11 @@ void MFRC522::PCD_ReadRegister( byte reg, ///< The register to read from. One o
} }
byte address = reg; byte address = reg;
byte index = 0; // Index in values array. byte index = 0; // Index in values array.
_myWire.beginTransmission(_chipAddress); _TwoWireInstance.beginTransmission(_chipAddress);
_myWire.write(address); _TwoWireInstance.write(address);
_myWire.endTransmission(); _TwoWireInstance.endTransmission();
_myWire.requestFrom(_chipAddress, count); _TwoWireInstance.requestFrom(_chipAddress, count);
while (_myWire.available()) { while (_TwoWireInstance.available()) {
if (index == 0 && rxAlign) { // Only update bit positions rxAlign..7 in values[0] if (index == 0 && rxAlign) { // Only update bit positions rxAlign..7 in values[0]
// Create bit mask for bit positions rxAlign..7 // Create bit mask for bit positions rxAlign..7
byte mask = 0; byte mask = 0;
@ -104,12 +104,12 @@ void MFRC522::PCD_ReadRegister( byte reg, ///< The register to read from. One o
mask |= (1 << i); mask |= (1 << i);
} }
// Read value and tell that we want to read the same address again. // Read value and tell that we want to read the same address again.
byte value = _myWire.read(); byte value = _TwoWireInstance.read();
// Apply mask to both current value of values[0] and the new data in value. // Apply mask to both current value of values[0] and the new data in value.
values[0] = (values[index] & ~mask) | (value & mask); values[0] = (values[index] & ~mask) | (value & mask);
} }
else { // Normal case else { // Normal case
values[index] = _myWire.read(); values[index] = _TwoWireInstance.read();
} }
index++; index++;
} }

2
MFRC522_I2C.h
View File

@ -321,7 +321,7 @@ public:
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// Functions for setting up the Arduino // Functions for setting up the Arduino
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
MFRC522(byte chipAddress, byte resetPowerDownPin, TwoWire = Wire); MFRC522(byte chipAddress, byte resetPowerDownPin, TwoWire TwoWireInstance);
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// Basic interface functions for communicating with the MFRC522 // Basic interface functions for communicating with the MFRC522