Avr/MarklinController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for mfrc proxyies

Browse Source
This commit is contained in:
uvos
2022-03-21 21:21:50 +01:00
parent 36cc688479
commit 58fe96f8b7
14 changed files with 518 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
mfrc522.cpp
View File

@ -61,14 +61,22 @@ void* _userData;
Mfrc522::Mfrc522(SpiMaster* spi, ShiftReg<NFC_PORTS>* csReg, uint8_t csPin):
_csReg(csReg), _spi(spi), _csPin(csPin)
{
reset();
}
void Mfrc522::reset()
{
write(CommandReg, SOFTRESET);
_delay_ms(100);
mode = MODE_IDLE;
irqDetect = false;
write(TModeReg, 0x80);
write(TPrescalerReg, 0xA9);
write(TReloadRegH, 0x0B);
write(TReloadRegL, 0xB8);
write(TPrescalerReg, PRESCALLER);
write(TReloadRegH, POLL_TIMER >> 8);
write(TReloadRegL, POLL_TIMER & 0x0F);
write(ModWidthReg, 0x26);
write(RFCfgReg, 0b111 << 4); //set gain to 48dB
@ -100,15 +108,6 @@ uint8_t Mfrc522::calculateCrc(uint8_t *data, uint8_t length, uint16_t *result)
return ERR;
write(CommandReg, IDLE);
if(serial)
{
serial->write_p(PSTR("Calculated CRC "));
serial->write((int)read(CRCResultRegL));
serial->putChar(' ');
serial->write((int)read(CRCResultRegH));
serial->putChar('\n');
}
*result = read(CRCResultRegL);
*result |= read(CRCResultRegH) << 8;
return 0;
@ -165,6 +164,13 @@ void Mfrc522::transceiveAsyncFinish(uint8_t irq)
{
write(ComIEnReg, 0); // disable irqs
if(irq & 1)
{
mode = MODE_IDLE;
_transceiveCb(TIMEOUT, this, nullptr, 0, _transceiveUserData);
return;
}
if(!_transceiveCb)
{
mode = MODE_IDLE;
@ -179,13 +185,6 @@ void Mfrc522::transceiveAsyncFinish(uint8_t irq)
_transceiveCb(ERR, this, nullptr, 0, _transceiveUserData);
return;
}
if(irq & 1)
{
mode = MODE_IDLE;
_transceiveCb(TIMEOUT, this, nullptr, 0, _transceiveUserData);
return;
}
uint8_t fifoBites = read(FIFOLevelReg);
@ -408,17 +407,6 @@ uint8_t Mfrc522::selectTag(Uid *uid)
uint8_t rxAlign = txLastBits;
// RxAlign = BitFramingReg[6..4]. TxLastBits = BitFramingReg[2..0]
write(BitFramingReg, (rxAlign << 4) + txLastBits);
if(serial)
{
serial->write_p(PSTR("entering transceive "));
serial->write((int)responseLength);
serial->putChar(' ');
serial->write((int)txLastBits);
serial->putChar(' ');
serial->write((int)currentLevelKnownBits);
serial->putChar('\n');
}
// Transmit the buffer and receive the response.
result = transceive(reponseBuffer, bufferUsed, responseBufferPtr, &responseLength, txLastBits, rxAlign, &txLastBits);
@ -437,8 +425,6 @@ uint8_t Mfrc522::selectTag(Uid *uid)
}
if (collisionPos <= currentLevelKnownBits) // No progress - should not happen
{
if(serial)
serial->write_p(PSTR("err No progress\n"));
return ERR;
}
// Choose the PICC with the bit set.
@ -530,7 +516,7 @@ uint8_t Mfrc522::getUid(Uid *uid)
for(uint8_t i = 0; i < uid->size; ++i)
{
uid->uidByte[i] = reponseBuffer[i];
uid->uidByte[i] = reponseBuffer[i+1];
}
return 0;
@ -554,8 +540,20 @@ void Mfrc522::irq()
transceiveAsyncFinish(irqs);
}
}
else if(mode == MODE_TIMEOUT)
{
write(ComIrqReg, 0b01111111); // clear irqs
write(TReloadRegH, POLL_TIMER >> 8);
write(TReloadRegL, POLL_TIMER & 0x0F);
mode = MODE_IDLE;
if(_transceiveCb)
_transceiveCb(TIMEOUT, this, nullptr, 0, _transceiveUserData);
}
else if(serial)
{
write(ComIrqReg, 0b01111111);
serial->write("IRQ wrong mode\n");
}
}
void Mfrc522::setRf(bool on)
@ -589,30 +587,30 @@ bool Mfrc522::probe(SpiMaster* spi, ShiftReg<NFC_PORTS>* csReg, uint8_t csPin)
return version == 0x91 || version == 0x92;
}
bool Mfrc522::testFifo()
bool Mfrc522::testFifo(Serial* serial)
{
uint8_t buffer[8] = {42, 43, 44, 45, 46, 47, 48, 49};
write(FIFOLevelReg, 1 << 7); // Flush fifo Buffer;
write(FIFODataReg, buffer, sizeof(buffer)); // Fill fifo
if(serial)
serial->write_p(PSTR("Fifo buffer contains: "));
serial->write_p(PSTR("Fifo buffer contains: "));
uint8_t len = read(FIFOLevelReg);
if(len > 8)
{
serial->write_p(PSTR("FIFOLevelReg to long\n"));
return false;
}
read(FIFODataReg, reponseBuffer, len);
bool ret = true;
for(uint8_t i = 0; i < len; ++i)
{
if(buffer[i] != reponseBuffer[i])
ret = false;
if(serial)
{
serial->write((int)reponseBuffer[i]);
serial->putChar(' ');
}
serial->write((int)reponseBuffer[i]);
serial->putChar(' ');
}
if(serial)
serial->putChar('\n');
serial->putChar('\n');
return ret;
}
@ -639,6 +637,7 @@ void Mfrc522::stopAsync()
write(FIFOLevelReg, 1 << 7);
mode = MODE_IDLE;
irqDetect = false;
write(ComIrqReg, 0b01111111);
}
void Mfrc522::detectAsyncCb(uint8_t ret, Mfrc522* reader, uint8_t* response, uint8_t responseLen, void* userData)