From 071d13450d205a546104b39e4a234a57e0d39f27 Mon Sep 17 00:00:00 2001 From: uvos Date: Thu, 10 Mar 2022 22:23:38 +0100 Subject: [PATCH 01/10] fix input shift register reading --- inputshiftreg.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/inputshiftreg.h b/inputshiftreg.h index 925b818..660001f 100644 --- a/inputshiftreg.h +++ b/inputshiftreg.h @@ -22,6 +22,12 @@ public: const unsigned char clk, const unsigned char serOut, const unsigned char parallelLoad): _port(portReg), _pin(pinReg), _pinSerOut(serOut), _pinClk(clk), _pinParallelLoad(parallelLoad) { + if constexpr(invert) + *_port &= ~(1<<_pinParallelLoad); + else + *_port |= (1<<_pinParallelLoad); + + read(); } bool getBit(unsigned char bit) { @@ -34,13 +40,11 @@ public: { if constexpr(invert) { - *_port &= ~(1<<_pinParallelLoad); *_port |= (1<<_pinParallelLoad); *_port &= ~(1<<_pinParallelLoad); - + for(unsigned char i = 0; i < BITS; ++i) { - *_port &= ~(1 << _pinClk); bool value = *_pin & (1 << _pinSerOut); if constexpr(invertInput) value = !value; @@ -48,14 +52,13 @@ public: data[i/8] |= (1<<(i%8)); else data[i/8] &= ~(1<<(i%8)); + *_port &= ~(1 << _pinClk); *_port |= (1 << _pinClk); } } else { - *_port |= (1<<_pinParallelLoad); *_port &= ~(1<<_pinParallelLoad); - *_port |= (1<<_pinParallelLoad); for(unsigned char i = 0; i < BITS; ++i) { @@ -69,6 +72,7 @@ public: data[i/8] &= ~(1<<(i%8)); *_port &= ~(1 << _pinClk); } + *_port |= (1<<_pinParallelLoad); } return data; } From 64dae0435be987bb8ebe635edeeded38111915bb Mon Sep 17 00:00:00 2001 From: uvos Date: Thu, 10 Mar 2022 22:24:17 +0100 Subject: [PATCH 02/10] change to new signelton method --- main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index bd6eb26..7b3cad2 100644 --- a/main.cpp +++ b/main.cpp @@ -22,7 +22,6 @@ char buffer[SNPRINTF_BUFFER_SIZE]; SVector trains; SVector turnouts; SVector signals; -NfcBoard nfcBoard; bool autoff = true; bool powerIsOn = true; @@ -347,9 +346,9 @@ int main() sei(); - Serial serial; + Serial* serial = Serial::getInstance(); - serial.write_p(PSTR("TrainController v0.5 starting\n")); + serial->write_p(PSTR("TrainController v0.5 starting\n")); while(true) { @@ -381,7 +380,7 @@ int main() Train::setOutput(Train::OFF); } } - serialDispatch(&serial); + serialDispatch(serial); } return 0; } From b01caeda28c7cf9ff40c47e2b2d56b4fa81fd0ee Mon Sep 17 00:00:00 2001 From: uvos Date: Thu, 10 Mar 2022 22:25:18 +0100 Subject: [PATCH 03/10] change some parameters in softspim --- softspim.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/softspim.h b/softspim.h index a0fbf28..c937bc3 100644 --- a/softspim.h +++ b/softspim.h @@ -6,8 +6,8 @@ class SpiMaster { private: - static constexpr uint8_t CLOCK_POLARITY = 1; - static constexpr uint8_t CLOCK_PHASE = 1; + static constexpr uint8_t CLOCK_POLARITY = 0; + static constexpr uint8_t CLOCK_PHASE = 0; static constexpr uint8_t BIT_ORDER = 1; volatile uint8_t * const _port = &PORTB; @@ -16,7 +16,7 @@ private: static constexpr uint8_t _pinOut = PB4; static constexpr uint8_t _pinClock = PB3; - static constexpr uint8_t DELAY_TIME_US = 10; + static constexpr uint8_t DELAY_TIME_US = 0; public: From 97aa264b54063adf2a98db872e5d41adaa646733 Mon Sep 17 00:00:00 2001 From: uvos Date: Thu, 10 Mar 2022 22:25:35 +0100 Subject: [PATCH 04/10] IRQ based tag polling --- mfrc522.cpp | 263 ++++++++++++++++++++++++++++++++++++++++------------ mfrc522.h | 90 +++++++++++++----- nfcbord.cpp | 186 +++++++++++++++++++++++++++++++------ nfcbord.h | 6 ++ serial.h | 15 ++- 5 files changed, 448 insertions(+), 112 deletions(-) diff --git a/mfrc522.cpp b/mfrc522.cpp index ee64c2b..e26a4a6 100644 --- a/mfrc522.cpp +++ b/mfrc522.cpp @@ -1,6 +1,7 @@ #include "mfrc522.h" - +Serial *Mfrc522::serial = nullptr; +uint8_t Mfrc522::reponseBuffer[Mfrc522::reponseBufferLen]; uint8_t Mfrc522::read(uint8_t addr) { @@ -58,25 +59,26 @@ void Mfrc522::updateBit(uint8_t addr, uint8_t bit, bool value) void (*_tagEnterdCb)(Mfrc522*, void*); void* _userData; -Mfrc522::Mfrc522(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin, - void (*tagEnterdCb)(Mfrc522*, void*), void* userData): - _csReg(csReg), _spi(spi), _csPin(csPin), _tagEnterdCb(tagEnterdCb), _userData(userData) +Mfrc522::Mfrc522(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin): + _csReg(csReg), _spi(spi), _csPin(csPin) { write(CommandReg, SOFTRESET); _delay_ms(100); write(TModeReg, 0x80); write(TPrescalerReg, 0xA9); - write(TReloadRegH, 0x03); - write(TReloadRegL, 0xE8); + write(TReloadRegH, 0x0B); + write(TReloadRegL, 0xB8); write(ModWidthReg, 0x26); write(RFCfgReg, 0b111 << 4); //set gain to 48dB write(TxAutoReg, 0x40); // Default 0x00. Force a 100 % ASK modulation independent of the ModGsPReg register setting + updateBit(RxModeReg, 3, true); write(ModeReg, 0x3D); // Default 0x3F. Set the preset value for the CRC coprocessor for the CalcCRC command to 0x6363 (ISO 14443-3 part 6.2.4) - //write(DivIEnReg, 0b10010000); // enable MfinActIrq as push-pull - //write(ComIEnReg, 0b00100000); // enable Rx irq + write(ComIrqReg, 0b01111111); + write(ComIEnReg, 0); // invert irq pin (high is active) + write(DivIEnReg, 1 << 7); // enable MfinActIrq as push-pull setRf(true); } @@ -112,18 +114,12 @@ uint8_t Mfrc522::calculateCrc(uint8_t *data, uint8_t length, uint16_t *result) return 0; } -uint8_t Mfrc522::commuicateWithTag(uint8_t command, uint8_t waitIrq, - uint8_t *sendData, uint8_t sendLen, - uint8_t *recvData, uint8_t *recvLen, - uint8_t validBits, uint8_t rxAlign, - uint8_t *rxValidBits) +void Mfrc522::setupTransceive(uint8_t *sendData, uint8_t sendLen, uint8_t validBits, uint8_t rxAlign) { - write(CommandReg, IDLE); - write(ComIrqReg, 0b01111111); // clear irqs write(FIFOLevelReg, 1 << 7); // Flush fifo Buffer; write(FIFODataReg, sendData, sendLen); // Fill fifo write(BitFramingReg, (rxAlign << 4) + validBits); - write(CommandReg, command); // Execute the command + write(CommandReg, TRANSCEIVE); // Execute the command if(serial) { @@ -140,14 +136,82 @@ uint8_t Mfrc522::commuicateWithTag(uint8_t command, uint8_t waitIrq, serial->write((int)read(BitFramingReg)); serial->putChar('\n'); } + + updateBit(BitFramingReg, 7, true); +} + +uint8_t Mfrc522::transceiveAsync(void (*transceiveCb)(uint8_t, Mfrc522*, uint8_t*, uint8_t, void*), void* userData, + uint8_t *sendData, uint8_t sendLen, uint8_t validBits, uint8_t rxAlign) +{ + if(mode != MODE_IDLE) + return BUSY; + mode = MODE_TRANSCEIVE; - if (command == TRANSCEIVE) - updateBit(BitFramingReg, 7, true); + _transceiveCb = transceiveCb; + _transceiveUserData = userData; + + write(CommandReg, IDLE); + + write(ComIrqReg, 0b01111111); // clear irqs + write(ComIEnReg, (1 << 5) | (1 << 0)); + + setupTransceive(sendData, sendLen, validBits, rxAlign); + + return 0; +} + +void Mfrc522::transceiveAsyncFinish(uint8_t irq) +{ + write(ComIEnReg, 0); // disable irqs + + if(!_transceiveCb) + { + mode = MODE_IDLE; + updateBit(FIFOLevelReg, 7, true); + return; + } + + uint8_t errorRegValue = read(ErrorReg); + if (errorRegValue & 0b00010011) // BufferOvfl ParityErr ProtocolErr + { + mode = MODE_IDLE; + _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); + + if(fifoBites > reponseBufferLen) + _transceiveCb(LEN, this, nullptr, 0, _transceiveUserData); + read(FIFODataReg, reponseBuffer, fifoBites); + mode = MODE_IDLE; + if(errorRegValue & 0x08) + _transceiveCb(COLLISION, this, reponseBuffer, fifoBites, _transceiveUserData); + else + _transceiveCb(0, this, reponseBuffer, fifoBites, _transceiveUserData); + +} + +uint8_t Mfrc522::transceive(uint8_t *sendData, uint8_t sendLen, + uint8_t *recvData, uint8_t *recvLen, + uint8_t validBits, uint8_t rxAlign, + uint8_t *rxValidBits) +{ + write(CommandReg, IDLE); + write(ComIrqReg, 0b01111111); // clear irqs + setupTransceive(sendData, sendLen, validBits, rxAlign); uint16_t i = 2000; uint8_t irq = read(ComIrqReg); - while(irq & waitIrq) + while(!(irq & 0x30)) // RxIRq and IdleIRq { irq = read(ComIrqReg); if(irq & 0x01 || --i == 0) @@ -200,13 +264,6 @@ uint8_t Mfrc522::commuicateWithTag(uint8_t command, uint8_t waitIrq, return 0; } -uint8_t Mfrc522::transceive(uint8_t *sendData, uint8_t sendLen, uint8_t *recvData, uint8_t *recvLen, - uint8_t validBits, uint8_t rxAlign, uint8_t *rxValidBits) -{ - uint8_t waitIRq = 0x30; // RxIRq and IdleIRq - return commuicateWithTag(TRANSCEIVE, waitIRq, sendData, sendLen, recvData, - recvLen, validBits, rxAlign, rxValidBits); -} uint8_t Mfrc522::wakeupTag(uint8_t* bufferATQA, uint8_t *bufferLen) { @@ -234,14 +291,13 @@ uint8_t Mfrc522::selectTag(Uid *uid) uint8_t index; uint8_t uidIndex; // The first index in uid->uidByte[] that is used in the current Cascade Level. int8_t currentLevelKnownBits; // The number of known UID bits in the current Cascade Level. - uint8_t buffer[9]; // The SELECT/ANTICOLLISION commands uses a 7 uint8_t standard frame + 2 uint8_ts CRC_A uint8_t bufferUsed; // The number of uint8_ts used in the buffer, ie the number of uint8_ts to transfer to the FIFO uint8_t txLastBits; // Used in BitFramingReg. The number of valid bits in the last transmitted uint8_t. - uint8_t *responseBuffer; + uint8_t *responseBufferPtr; uint8_t responseLength; if(serial) - serial->write_p(PSTR("Select\n")); + serial->write_p(PSTR("Select\n")); // Description of buffer structure: // Byte 0: SEL Indicates the Cascade Level: PICC_CMD_SEL_CL1, PICC_CMD_SEL_CL2 or PICC_CMD_SEL_CL3 @@ -277,17 +333,17 @@ uint8_t Mfrc522::selectTag(Uid *uid) switch(cascadeLevel) { case 0: - buffer[0] = PICC_CMD_SEL_CL1; + reponseBuffer[0] = PICC_CMD_SEL_CL1; uidIndex = 0; break; case 1: - buffer[0] = PICC_CMD_SEL_CL2; + reponseBuffer[0] = PICC_CMD_SEL_CL2; uidIndex = 3; break; case 2: - buffer[0] = PICC_CMD_SEL_CL3; + reponseBuffer[0] = PICC_CMD_SEL_CL3; uidIndex = 6; break; @@ -309,7 +365,7 @@ uint8_t Mfrc522::selectTag(Uid *uid) if (bytesToCopy > maxBytes) bytesToCopy = maxBytes; for (count = 0; count < bytesToCopy; count++) - buffer[index++] = uid->uidByte[uidIndex + count]; + reponseBuffer[index++] = uid->uidByte[uidIndex + count]; } // Repeat anti collision loop until we can transmit all UID bits + BCC and receive a SAK - max 32 iterations. @@ -319,11 +375,11 @@ uint8_t Mfrc522::selectTag(Uid *uid) // Find out how many bits and bytes to send and receive. if (currentLevelKnownBits >= 32) // All UID bits in this Cascade Level are known. This is a SELECT. { - buffer[1] = 0x70; // NVB - Number of Valid Bits: Seven whole bytes + reponseBuffer[1] = 0x70; // NVB - Number of Valid Bits: Seven whole bytes // Calculate BCC - Block Check Character - buffer[6] = buffer[2] ^ buffer[3] ^ buffer[4] ^ buffer[5]; + reponseBuffer[6] = reponseBuffer[2] ^ reponseBuffer[3] ^ reponseBuffer[4] ^ reponseBuffer[5]; // Calculate CRC_A - result = calculateCrc(buffer, 7, reinterpret_cast(&buffer[7])); + result = calculateCrc(reponseBuffer, 7, reinterpret_cast(&reponseBuffer[7])); if (result != 0) { if(serial) @@ -333,7 +389,7 @@ uint8_t Mfrc522::selectTag(Uid *uid) txLastBits = 0; // 0 => All 8 bits are valid. bufferUsed = 9; // Store response in the last 3 bytes of buffer (BCC and CRC_A - not needed after tx) - responseBuffer = &buffer[6]; + responseBufferPtr = &reponseBuffer[6]; responseLength = 3; } else // This is an ANTICOLLISION. @@ -341,11 +397,11 @@ uint8_t Mfrc522::selectTag(Uid *uid) txLastBits = currentLevelKnownBits % 8; count = currentLevelKnownBits / 8; // Number of whole bytes in the UID part. index = 2 + count; // Number of whole bytes: SEL + NVB + UIDs - buffer[1] = (index << 4) + txLastBits; // NVB - Number of Valid Bits + reponseBuffer[1] = (index << 4) + txLastBits; // NVB - Number of Valid Bits bufferUsed = index + (txLastBits ? 1 : 0); // Store response in the unused part of buffer - responseBuffer = &buffer[index]; - responseLength = sizeof(buffer) - index; + responseBufferPtr = &reponseBuffer[index]; + responseLength = sizeof(reponseBuffer) - index; } // Set bit adjustments @@ -365,7 +421,7 @@ uint8_t Mfrc522::selectTag(Uid *uid) } // Transmit the buffer and receive the response. - result = transceive(buffer, bufferUsed, responseBuffer, &responseLength, txLastBits, rxAlign, &txLastBits); + result = transceive(reponseBuffer, bufferUsed, responseBufferPtr, &responseLength, txLastBits, rxAlign, &txLastBits); if (result == COLLISION) // More than one PICC in the field => collision. { result = read(CollReg); // CollReg[7..0] bits are: ValuesAfterColl reserved CollPosNotValid CollPos[4:0] @@ -390,7 +446,7 @@ uint8_t Mfrc522::selectTag(Uid *uid) count = currentLevelKnownBits % 8; // The bit to modify checkBit = (currentLevelKnownBits - 1) % 8; index = 1 + (currentLevelKnownBits / 8) + (count ? 1 : 0); // First byte is index 0. - buffer[index] |= (1 << checkBit); + reponseBuffer[index] |= (1 << checkBit); } else if (result != 0) { @@ -410,11 +466,11 @@ uint8_t Mfrc522::selectTag(Uid *uid) // We do not check the CBB - it was constructed by us above. // Copy the found UID bytes from buffer[] to uid->uidByte[] - index = (buffer[2] == PICC_CMD_CT) ? 3 : 2; // source index in buffer[] - bytesToCopy = (buffer[2] == PICC_CMD_CT) ? 3 : 4; + index = (reponseBuffer[2] == PICC_CMD_CT) ? 3 : 2; // source index in buffer[] + bytesToCopy = (reponseBuffer[2] == PICC_CMD_CT) ? 3 : 4; for (count = 0; count < bytesToCopy; count++) { - uid->uidByte[uidIndex + count] = buffer[index++]; + uid->uidByte[uidIndex + count] = reponseBuffer[index++]; } // Check response SAK (Select Acknowledge) @@ -431,19 +487,19 @@ uint8_t Mfrc522::selectTag(Uid *uid) return ERR; } // Verify CRC_A - do our own calculation and store the control in buffer[2..3] - those bytes are not needed anymore. - result = calculateCrc(responseBuffer, 1, reinterpret_cast(&buffer[2])); + result = calculateCrc(responseBufferPtr, 1, reinterpret_cast(&reponseBuffer[2])); if (result != 0) return result; - if ((buffer[2] != responseBuffer[1]) || (buffer[3] != responseBuffer[2])) + if ((reponseBuffer[2] != responseBufferPtr[1]) || (reponseBuffer[3] != responseBufferPtr[2])) return CRC; - if (responseBuffer[0] & 0x04) // Cascade bit set - UID not complete yes + if (responseBufferPtr[0] & 0x04) // Cascade bit set - UID not complete yes { cascadeLevel++; } else { uidComplete = true; - uid->sak = responseBuffer[0]; + uid->sak = responseBufferPtr[0]; } } // End of while ( ! uidComplete) @@ -453,9 +509,53 @@ uint8_t Mfrc522::selectTag(Uid *uid) return 0; } +uint8_t Mfrc522::getUid(Uid *uid) +{ + uint8_t bufferOut[2]; + uint8_t reponseBuffer[5]; + + bufferOut[0] = PICC_CMD_SEL_CL1; + bufferOut[1] = 2 << 4; + + uint8_t rxLen = sizeof(reponseBuffer); + + uint8_t ret = transceive(bufferOut, 2, reponseBuffer, &rxLen); + if(ret != 0) + return ret; + + if(rxLen != 5) + return ERR; + + uid->size = 4; + + for(uint8_t i = 0; i < uid->size; ++i) + { + uid->uidByte[i] = reponseBuffer[i]; + } + + return 0; +} + void Mfrc522::irq() { + if(mode == MODE_TRANSCEIVE) + { + uint8_t irqs = read(ComIrqReg); + if(irqs) + { + if(serial) + { + serial->write("IRQS: "); + serial->write((int)irqs); + serial->putChar('\n'); + } + write(ComIrqReg, 0b01111111); // clear irqs + transceiveAsyncFinish(irqs); + } + } + else if(serial) + serial->write("IRQ wrong mode\n"); } void Mfrc522::setRf(bool on) @@ -469,9 +569,8 @@ void Mfrc522::setRf(bool on) bool Mfrc522::cardPresent() { - uint8_t bufferATQA[2]; - uint8_t bufferLen = sizeof(bufferATQA); - uint8_t ret = wakeupTag(bufferATQA, &bufferLen); + uint8_t bufferLen = sizeof(reponseBuffer); + uint8_t ret = wakeupTag(reponseBuffer, &bufferLen); return ret == 0 || ret == COLLISION; } @@ -480,6 +579,12 @@ bool Mfrc522::probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin) csReg->setBit(csPin, false); spi->readWrite((VersionReg << 1) | (1 << 7)); uint8_t version = spi->readWrite(); + if(serial) + { + serial->write_p(PSTR("Got version register: ")); + serial->write((int)version); + serial->putChar('\n'); + } csReg->setBit(csPin, true); return version == 0x91 || version == 0x92; } @@ -487,7 +592,6 @@ bool Mfrc522::probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin) bool Mfrc522::testFifo() { uint8_t buffer[8] = {42, 43, 44, 45, 46, 47, 48, 49}; - uint8_t buffer2[8] = {}; write(FIFOLevelReg, 1 << 7); // Flush fifo Buffer; write(FIFODataReg, buffer, sizeof(buffer)); // Fill fifo @@ -495,15 +599,58 @@ bool Mfrc522::testFifo() serial->write_p(PSTR("Fifo buffer contains: ")); uint8_t len = read(FIFOLevelReg); - read(FIFODataReg, buffer2, len); + read(FIFODataReg, reponseBuffer, len); bool ret = true; for(uint8_t i = 0; i < len; ++i) { - if(buffer[i] != buffer2[i]) + if(buffer[i] != reponseBuffer[i]) ret = false; - serial->write((int)buffer2[i]); - serial->putChar(' '); + if(serial) + { + serial->write((int)reponseBuffer[i]); + serial->putChar(' '); + } } - serial->putChar('\n'); + if(serial) + serial->putChar('\n'); return ret; } + +bool Mfrc522::detectAsync(void (*tagEnterdCb)(Mfrc522*, void*), void* userData) +{ + if(irqDetect) + return false; + _tagEnterdCb = tagEnterdCb; + _userData = userData; + irqDetect = true; + updateBit(CollReg, 7, false); + uint8_t data = PICC_CMD_WUPA; + if(transceiveAsync(&detectAsyncCb, nullptr, &data, 1, 7) != 0) + { + irqDetect = false; + return false; + } + return true; +} + +void Mfrc522::stopAsync() +{ + write(CommandReg, IDLE); + write(FIFOLevelReg, 1 << 7); + mode = MODE_IDLE; + irqDetect = false; +} + +void Mfrc522::detectAsyncCb(uint8_t ret, Mfrc522* reader, uint8_t* response, uint8_t responseLen, void* userData) +{ + if((ret == 0 || ret == COLLISION) && reader->_tagEnterdCb) + { + reader->stopAsync(); + reader->_tagEnterdCb(reader, reader->_userData); + } + else + { + reader->irqDetect = false; + reader->detectAsync(reader->_tagEnterdCb, reader->_userData); + } +} diff --git a/mfrc522.h b/mfrc522.h index 216b689..a4bdc70 100644 --- a/mfrc522.h +++ b/mfrc522.h @@ -14,7 +14,8 @@ public: static constexpr uint8_t LEN = 3; // Buffer length error static constexpr uint8_t COLLISION = 4; // Chip collision static constexpr uint8_t CRC = 5; // CRC incorrect collision - static constexpr uint8_t ERR = 6; // General error + static constexpr uint8_t BUSY = 6; // System is busy + static constexpr uint8_t ERR = 7; // General error // Command words static constexpr uint8_t IDLE = 0x00; // NO action; Cancel the current command @@ -132,13 +133,32 @@ public: // The PICC_CMD_MF_READ and PICC_CMD_MF_WRITE can also be used for MIFARE Ultralight. static constexpr uint8_t PICC_CMD_UL_WRITE = 0xA2; // Writes one 4 byte page to the PICC - typedef struct + class Uid { + public: uint8_t size; // Number of bytes in the UID. 4, 7 or 10. uint8_t uidByte[10]; uint8_t sak; // The SAK (Select acknowledge) byte returned from the PICC after successful selection. - } Uid; - + bool operator==(Uid& in) + { + if(size != in.size) + return false; + for(uint8_t i = 0; i < size; ++i) + { + if(uidByte[i] != in.uidByte[i]) + return false; + } + return true; + } + bool operator!=(Uid& in) + { + return !operator==(in); + } + }; + + // Modes + static constexpr uint8_t MODE_IDLE = 0; + static constexpr uint8_t MODE_TRANSCEIVE = 1; private: ShiftReg* _csReg; @@ -146,44 +166,70 @@ private: uint8_t _csPin; + void (*_tagEnterdCb)(Mfrc522*, void*); + void* _userData; + + void (*_transceiveCb)(uint8_t ret, Mfrc522* reader, uint8_t* response, uint8_t responseLen, void* userData); + void* _transceiveUserData; + + static constexpr uint8_t reponseBufferLen = 16; + static uint8_t reponseBuffer[reponseBufferLen]; + + volatile uint8_t mode = MODE_IDLE; + + volatile bool irqDetect = false; + + void setupTransceive(uint8_t *sendData, uint8_t sendLen, uint8_t validBits = 0, uint8_t rxAlign = 0); + + uint8_t transceiveAsync(void (*transceiveCb)(uint8_t, Mfrc522*, uint8_t*, uint8_t, void*), void* userData, uint8_t *sendData, + uint8_t sendLen, uint8_t validBits = 0, uint8_t rxAlign = 0); + void transceiveAsyncFinish(uint8_t irq); + + uint8_t transceive(uint8_t *sendData, uint8_t sendLen, uint8_t *recvData, uint8_t *recvLen, + uint8_t validBits= 0, uint8_t rxAlign = 0, uint8_t *rxValidBits = nullptr); + + static void detectAsyncCb(uint8_t ret, Mfrc522* reader, uint8_t* response, uint8_t responseLen, void* userData); + +public: uint8_t read(uint8_t addr); void read(uint8_t addr, uint8_t* data, uint8_t datalen, uint8_t rxAlign = 0); void write(uint8_t addr, uint8_t data); void write(uint8_t addr, uint8_t* data, uint8_t datalen); void updateBit(uint8_t addr, uint8_t bit, bool value); - - void (*_tagEnterdCb)(Mfrc522*, void*); - void* _userData; - -public: + static Serial* serial; - inline static Serial* serial = nullptr; - - Mfrc522(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin, - void (*tagEnterdCb)(Mfrc522*, void*) = nullptr, void* userData = nullptr); + Mfrc522(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); uint8_t calculateCrc(uint8_t *data, uint8_t length, uint16_t *result); - uint8_t commuicateWithTag(uint8_t command, uint8_t waitIrq, - uint8_t *sendData, uint8_t sendLen, - uint8_t *recvData, uint8_t *recvLen, - uint8_t validBits = 0, uint8_t rxAlign = 0, - uint8_t *rxValidBits = nullptr); - - uint8_t transceive(uint8_t *sendData, uint8_t sendLen, uint8_t *recvData, uint8_t *recvLen, - uint8_t validBits = 0, uint8_t rxAlign = 0, uint8_t *rxValidBits = nullptr); - uint8_t wakeupTag(uint8_t* bufferATQA, uint8_t *bufferLen); uint8_t selectTag(Uid *uid); + + uint8_t getUid(Uid *uid); void irq(); void setRf(bool on); + bool detectAsync(void (*tagEnterdCb)(Mfrc522*, void*) = nullptr, void* userData = nullptr); + + void stopAsync(); + bool cardPresent(); bool testFifo(); + + bool checkIrq(uint8_t *irq) + { + write(ComIrqReg, 0b01111111); + if(read(Status1Reg) & (1 << 4)) + { + *irq = read(ComIrqReg); + return true; + } + return false; + } static bool probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); }; diff --git a/nfcbord.cpp b/nfcbord.cpp index fd86b05..3b2a871 100644 --- a/nfcbord.cpp +++ b/nfcbord.cpp @@ -7,18 +7,69 @@ #include #include "writepin.h" +NfcBoard nfcBoard; + extern char buffer[SNPRINTF_BUFFER_SIZE]; +ISR(PCINT1_vect, ISR_NOBLOCK) +{ + if(readPin(&PINC, PC3)) + { + uint8_t* data = nfcBoard.irqReg.read(); + for(uint8_t i = 0; i < NFC_PORTS; ++i) + { + if(*data & (1 << i)) + { + for(uint8_t j = 0; j < nfcBoard.readers.count(); ++j) + { + if(nfcBoard.irqPins[j] == i) + { + nfcBoard.readers[j].irq(); + } + } + } + } + } +} + NfcBoard::NfcBoard(): csReg(&PORTC, PC1, PC2, PC0), irqReg(&PORTC, &PINB, PC5, PB1, PC4) { - DDRC = (1 << PC0) | (1 << PC1) | (1 << PC2) | (1 << PC4) | (1 << PC5); - DDRB = (1 << PB4) | (1 << PB3); + DDRC |= (1 << PC0) | (1 << PC1) | (1 << PC2) | (1 << PC4) | (1 << PC5); + DDRB |= (1 << PB4) | (1 << PB3); + PCMSK1 |= 1 << PCINT11; + PCICR |= 1 << PCIE1; csReg.clear(true); + irqReg.read(); probe(); } +uint8_t NfcBoard::csToIrq(uint8_t cs) +{ + switch(cs) + { + case 0: + return 3; + case 1: + return 2; + case 2: + return 1; + case 3: + return 7; + case 4: + return 7; + case 5: + return 6; + case 6: + return 5; + case 7: + return 3; + default: + return 8; + } +} + void NfcBoard::probe() { readers.clear(); @@ -27,13 +78,10 @@ void NfcBoard::probe() { if(Mfrc522::probe(&spim, &csReg, i)) { - irqPins.push_back(i); + readers.push_back(Mfrc522(&spim, &csReg, i)); + irqPins.push_back(csToIrq(i)); } } - for(uint8_t i = 0; i < irqPins.count(); ++i) - { - readers.push_back(Mfrc522(&spim, &csReg, irqPins[i])); - } } void NfcBoard::printNfcDevices(Serial* serial) @@ -41,55 +89,100 @@ void NfcBoard::printNfcDevices(Serial* serial) serial->write_p(PSTR("NFC DEVICES:\n")); for(uint8_t i = 0; i < readers.count(); ++i) { - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "NFC NUMBER: %u IRQ: %x\n", i, irqPins[i]); + snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("NFC NUMBER: %u IRQ: %x\n"), i, irqPins[i]); serial->write(buffer, SNPRINTF_BUFFER_SIZE); } } int NfcBoard::dispatch(char* inBuffer, Serial* serial) -{ +{ + if(strcmp(inBuffer, "debug") == 0) + { + Mfrc522::serial = serial; + return 0; + } + else if(strcmp(inBuffer, "quiet") == 0 ) + { + Mfrc522::serial = nullptr; + return 0; + } + else if(strcmp(inBuffer, "irqs") == 0 ) + { + PCMSK1 &= ~(1 << PCINT11); + PCICR &= ~(1 << PCIE1); + serial->write_p(PSTR("Irq pin detection test\n")); + while(!serial->dataIsWaiting()) + { + uint8_t* data = irqReg.read(); + for(uint8_t i = 0; i < NFC_PORTS; ++i) + { + if(*data & (1 << i)) + { + serial->write("IRQ: "); + serial->write((int)i); + serial->putChar('\n'); + } + } + } + serial->write_p(PSTR("Finished\n")); + PCMSK1 |= 1 << PCINT11; + PCICR |= 1 << PCIE1; + return 0; + } else if(strcmp(inBuffer, "detect") == 0 ) { - serial->write_p(PSTR("Runing tag detection test\n")); - bool oldPresent = false; + serial->write_p(PSTR("Runing tag detection test\n")); while(!serial->dataIsWaiting()) { bool present = readers[0].cardPresent(); - if(present && !oldPresent) + if(present) { - oldPresent = present; - Mfrc522::Uid uid; - //Mfrc522::serial = serial; uint8_t res = readers[0].selectTag(&uid); - Mfrc522::serial = nullptr; if(res != 0) - { - serial->write_p(PSTR("Select Failed with ")); - serial->write((int)res); - serial->putChar('\n'); continue; - } + serial->write_p(PSTR("Uid: ")); for(uint8_t i = 0; i < uid.size; ++i) { serial->write((int)uid.uidByte[i]); - serial->putChar(':'); + if(i < uid.size-1) + serial->putChar(':'); } serial->putChar('\n'); - break; - } - else if(!present && oldPresent) - { - serial->write_p(PSTR("Tag lost\n")); - oldPresent = present; } _delay_ms(100); } serial->write_p(PSTR("Finished\n")); return 0; } - else if(strcmp(inBuffer, "tste") == 0 ) + else if(strcmp(inBuffer, "fastdetect") == 0 ) + { + serial->write_p(PSTR("Runing fast tag detection test\n")); + while(!serial->dataIsWaiting()) + { + bool present = readers[0].cardPresent(); + if(present) + { + Mfrc522::Uid uid; + uint8_t res = readers[0].getUid(&uid); + if(res != 0) + continue; + + serial->write_p(PSTR("Uid: ")); + for(uint8_t i = 0; i < uid.size; ++i) + { + serial->write((int)uid.uidByte[i]); + if(i < uid.size-1) + serial->putChar(':'); + } + serial->putChar('\n'); + } + } + serial->write_p(PSTR("Finished\n")); + return 0; + } + else if(strcmp(inBuffer, "fifotst") == 0 ) { serial->write_p(PSTR("Runing fifo test\n")); Mfrc522::serial = serial; @@ -98,6 +191,15 @@ int NfcBoard::dispatch(char* inBuffer, Serial* serial) serial->write_p(PSTR("Finished\n")); return 0; } + else if(strcmp(inBuffer, "enable") == 0 ) + { + for(uint8_t i = 0; i < readers.count(); ++i) + { + readers[i].detectAsync(detectCb, serial); + } + serial->write_p(PSTR("Nfc tag listening enabled\n")); + return 0; + } else if(strcmp(inBuffer, "status") == 0 ) { printNfcDevices(serial); @@ -109,7 +211,7 @@ int NfcBoard::dispatch(char* inBuffer, Serial* serial) uint8_t len = sizeof(bufferATQA); uint8_t res = readers[0].wakeupTag(bufferATQA, &len); - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "wakeupTag returned: %u Buffer: 0x%x 0x%x len %u\n", + snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("wakeupTag returned: %u Buffer: 0x%x 0x%x len %u\n"), res, bufferATQA[0], bufferATQA[1], len); serial->write(buffer, SNPRINTF_BUFFER_SIZE); return 0; @@ -122,3 +224,27 @@ int NfcBoard::dispatch(char* inBuffer, Serial* serial) } return -3; } + +void NfcBoard::detectCb(Mfrc522* reader, void* data) +{ + Serial* serial = reinterpret_cast(data); + + static Mfrc522* oldReader = nullptr; + static Mfrc522::Uid oldUid = {0}; + + Mfrc522::Uid uid; + if(reader->getUid(&uid) == 0 && (uid != oldUid || reader != oldReader)) + { + serial->write("TAG: "); + for(uint8_t i = 0; i < uid.size; ++i) + { + serial->write((int)uid.uidByte[i]); + if(i < uid.size-1) + serial->putChar(':'); + } + serial->putChar('\n'); + oldUid = uid; + oldReader = reader; + } + reader->detectAsync(detectCb, serial); +} diff --git a/nfcbord.h b/nfcbord.h index eb18558..6a010ca 100644 --- a/nfcbord.h +++ b/nfcbord.h @@ -16,6 +16,8 @@ public: SVector readers; SVector irqPins; + static void detectCb(Mfrc522* reader, void* data); + NfcBoard(); void probe(); @@ -23,4 +25,8 @@ public: void printNfcDevices(Serial* serial); int dispatch(char* inBuffer, Serial* serial); + + uint8_t csToIrq(uint8_t cs); }; + +extern NfcBoard nfcBoard; diff --git a/serial.h b/serial.h index 80f9522..5a7ef7c 100644 --- a/serial.h +++ b/serial.h @@ -2,7 +2,8 @@ #define SERIAL_H #define BAUD 38400 -#define SERIAL_BUFFER_SIZE 384 +#define SERIAL_RX_BUFFER_SIZE 256 +#define SERIAL_TX_BUFFER_SIZE 128 #include #include @@ -11,15 +12,25 @@ #include #include +#include "ringbuffer.h" + const bool serialFlowControl = false; class Serial { private: char _terminator = '\n'; + Serial(); public: - Serial(); + + volatile RingBuffer rxBuffer; + volatile RingBuffer txBuffer; + + bool stopped = false; + volatile bool transmitting = false; + + static Serial* getInstance(); void putChar(const char c); void write(const char* in, const unsigned int length); void write(const char in[]); From 6d8baa50ebc4de06764b170cae4a8a2a8594cb23 Mon Sep 17 00:00:00 2001 From: uvos Date: Tue, 15 Mar 2022 22:39:13 +0100 Subject: [PATCH 05/10] implement single item resend --- item.cpp | 8 +++++--- item.h | 6 +++--- main.cpp | 29 ++++++++++++++++++++--------- signal.cpp | 4 ++-- train.cpp | 6 +++--- train.h | 2 +- turnout.cpp | 4 ++-- turnout.h | 2 +- 8 files changed, 37 insertions(+), 24 deletions(-) diff --git a/item.cpp b/item.cpp index 4aada35..93877a9 100644 --- a/item.cpp +++ b/item.cpp @@ -74,7 +74,7 @@ void Item::sendAddress(uint8_t address) } -void Item::sendRawAddr(const uint8_t address, const uint16_t data) +void Item::sendRawAddr(const uint8_t address, const uint16_t data, bool single) { for(uint8_t j = 0; j < SEND_COUNT; j++) { @@ -83,11 +83,13 @@ void Item::sendRawAddr(const uint8_t address, const uint16_t data) { sendBit(data & (1 << i)); } + if(single || SEND_COUNT == 1) + return; _delay_ms(1); } } -void Item::sendRaw(const uint16_t data) +void Item::sendRaw(const uint16_t data, bool single) { - sendRawAddr(_address, data); + sendRawAddr(_address, data, single); } diff --git a/item.h b/item.h index a62bcd6..d08f73e 100644 --- a/item.h +++ b/item.h @@ -18,7 +18,7 @@ private: static constexpr unsigned char _pinLowA = PD4; static constexpr unsigned char _pinHighB = PD2; static constexpr unsigned char _pinLowB = PD3; - static constexpr uint8_t SEND_COUNT = 2; + static constexpr uint8_t SEND_COUNT = 1; uint8_t _address; @@ -40,8 +40,8 @@ public: Item(const uint8_t address); - void sendRaw(const uint16_t data); - static void sendRawAddr(const uint8_t address, const uint16_t data); + void sendRaw(const uint16_t data, bool single = false); + static void sendRawAddr(const uint8_t address, const uint16_t data, bool single = false); void setAddress(const uint8_t address); uint8_t getAddress(); diff --git a/main.cpp b/main.cpp index 7b3cad2..65da1e7 100644 --- a/main.cpp +++ b/main.cpp @@ -252,7 +252,7 @@ void serialDispatch(Serial* serial) { token = strtok(NULL, " "); if(token != NULL) - ret = nfcBoard.dispatch(token, serial); + ret = nfcBoard.dispatch(token); } else if(strncmp(token, "erase", 4) == 0) { @@ -349,23 +349,32 @@ int main() Serial* serial = Serial::getInstance(); serial->write_p(PSTR("TrainController v0.5 starting\n")); + + uint8_t repeatCount = 0; while(true) { if(resendEvent && (trains.count() || turnouts.count() || signals.count())) { - timer0InterruptEnable(false); if(itemToResend < trains.count()) - trains[itemToResend].sendData(); + trains[itemToResend].sendData(true); else if(itemToResend < trains.count() + turnouts.count()) - turnouts[itemToResend-trains.count()].sendData(); + turnouts[itemToResend-trains.count()].sendData(true); else if(itemToResend < trains.count() + turnouts.count()+signals.count()) - signals[itemToResend-trains.count()-turnouts.count()].sendData(); - itemToResend++; - if(trains.count()+turnouts.count()+signals.count() <= itemToResend) - itemToResend = 0; + signals[itemToResend-trains.count()-turnouts.count()].sendData(true); resendEvent = false; - timer0InterruptEnable(true); + if(repeatCount == 0) + { + TCNT0 = 190; + repeatCount = 1; + } + else + { + itemToResend++; + if(trains.count()+turnouts.count()+signals.count() <= itemToResend) + itemToResend = 0; + repeatCount = 0; + } } if(autoff) @@ -380,7 +389,9 @@ int main() Train::setOutput(Train::OFF); } } + serialDispatch(serial); + nfcBoard.poll(serial); } return 0; } diff --git a/signal.cpp b/signal.cpp index 7387ff6..a980c37 100644 --- a/signal.cpp +++ b/signal.cpp @@ -40,9 +40,9 @@ uint16_t Signal::getPacket() return data; } -void Signal::sendData() +void Signal::sendData(bool single) { - sendRaw(getPacket()); + sendRaw(getPacket(), single); } uint8_t Signal::getType() diff --git a/train.cpp b/train.cpp index 7630a37..4633772 100644 --- a/train.cpp +++ b/train.cpp @@ -132,9 +132,9 @@ uint16_t Train::assembleSpeedPacket() return packet; } -void Train::sendData() +void Train::sendData(bool single) { - sendRaw(assembleSpeedPacket()); + sendRaw(assembleSpeedPacket(), single); if(_functionmask) { uint8_t functionToResend = (_function & 0xF0) >> 4; @@ -144,7 +144,7 @@ void Train::sendData() if(_functionmask & (1 << functionToResend)) { _delay_ms(2); - sendRaw(packetAddSpeed() | packetAddFunction(functionToResend) | packetAddFunction(0)); + sendRaw(packetAddSpeed() | packetAddFunction(functionToResend) | packetAddFunction(0), single); } _function &= ~0xF0; _function |= functionToResend << 4; diff --git a/train.h b/train.h index f5c35e6..07a7303 100644 --- a/train.h +++ b/train.h @@ -20,7 +20,7 @@ public: Train(const uint8_t address, uint8_t functionmask = 0, uint8_t quirks = 0); - void sendData(); + void sendData(bool single = false); void reverse(); void stop(); diff --git a/turnout.cpp b/turnout.cpp index f21d005..d8a87aa 100644 --- a/turnout.cpp +++ b/turnout.cpp @@ -33,7 +33,7 @@ uint16_t Turnout::getPacket() return data; } -void Turnout::sendData() +void Turnout::sendData(bool single) { - sendRaw(getPacket()); + sendRaw(getPacket(), single); } diff --git a/turnout.h b/turnout.h index 662079f..a39d45a 100644 --- a/turnout.h +++ b/turnout.h @@ -18,5 +18,5 @@ public: uint8_t getDirection(); uint8_t getSubaddress(); uint16_t getPacket(); - void sendData(); + void sendData(bool single = false); }; From cf7e3f8e6b3cb2489c5608793bf80977b54e4f20 Mon Sep 17 00:00:00 2001 From: uvos Date: Tue, 15 Mar 2022 22:40:07 +0100 Subject: [PATCH 06/10] serial: ajust rx buffer size --- serial.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serial.h b/serial.h index 5a7ef7c..4f913c7 100644 --- a/serial.h +++ b/serial.h @@ -2,7 +2,7 @@ #define SERIAL_H #define BAUD 38400 -#define SERIAL_RX_BUFFER_SIZE 256 +#define SERIAL_RX_BUFFER_SIZE 384 #define SERIAL_TX_BUFFER_SIZE 128 #include From 50d233fdf7fe368336946593c323b514e725532d Mon Sep 17 00:00:00 2001 From: uvos Date: Tue, 15 Mar 2022 22:40:37 +0100 Subject: [PATCH 07/10] finish single item resend --- signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signal.h b/signal.h index 58bebb9..628b05a 100644 --- a/signal.h +++ b/signal.h @@ -27,6 +27,6 @@ public: uint8_t getState(); uint8_t getSubaddress(); uint16_t getPacket(); - void sendData(); + void sendData(bool single = false); uint8_t getType(); }; From 36cc6884798da6e154efbf136212304d8574c3e2 Mon Sep 17 00:00:00 2001 From: uvos Date: Tue, 15 Mar 2022 22:41:06 +0100 Subject: [PATCH 08/10] softspim: allow phase mode 2 (safe phase) --- softspim.cpp | 8 ++++---- softspim.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/softspim.cpp b/softspim.cpp index a81fa4a..783e9d0 100644 --- a/softspim.cpp +++ b/softspim.cpp @@ -17,19 +17,19 @@ uint8_t SpiMaster::readWrite(uint8_t in) writePin(_port, _pinOut, in & (1 << i)); else writePin(_port, _pinOut, in & (1 << (7-i))); - if constexpr (CLOCK_PHASE == 0) + if constexpr (CLOCK_PHASE == 0 || CLOCK_PHASE == 2) _delay_us(DELAY_TIME_US); writePin(_port, _pinClock, !CLOCK_POLARITY); - if constexpr (CLOCK_PHASE == 1) + if constexpr (CLOCK_PHASE == 1 || CLOCK_PHASE == 2) _delay_us(DELAY_TIME_US); if constexpr (BIT_ORDER == 0) recByte |= readPin(_pinReg, _pinIn) << i; else recByte |= readPin(_pinReg, _pinIn) << (7-i); - if constexpr (CLOCK_PHASE == 0) + if constexpr (CLOCK_PHASE == 0 || CLOCK_PHASE == 2) _delay_us(DELAY_TIME_US); writePin(_port, _pinClock, CLOCK_POLARITY); - if constexpr (CLOCK_PHASE == 1) + if constexpr (CLOCK_PHASE == 1 || CLOCK_PHASE == 2) _delay_us(DELAY_TIME_US); } return recByte; diff --git a/softspim.h b/softspim.h index c937bc3..5fc732e 100644 --- a/softspim.h +++ b/softspim.h @@ -7,7 +7,7 @@ class SpiMaster private: static constexpr uint8_t CLOCK_POLARITY = 0; - static constexpr uint8_t CLOCK_PHASE = 0; + static constexpr uint8_t CLOCK_PHASE = 2; static constexpr uint8_t BIT_ORDER = 1; volatile uint8_t * const _port = &PORTB; From 58fe96f8b7c8244cc55c7e56e424bc83a2675ae9 Mon Sep 17 00:00:00 2001 From: uvos Date: Mon, 21 Mar 2022 21:21:50 +0100 Subject: [PATCH 09/10] add support for mfrc proxyies --- CMakeLists.txt | 13 ++- defines.h | 10 ++ main.cpp | 10 +- mfrc522.cpp | 85 +++++++-------- mfrc522.h | 57 +++++----- mfrcproxy.cpp | 52 +++++++++ mfrcproxy.h | 35 ++++++ nfcbord.cpp | 278 ++++++++++++++++++++++++++++++++++++----------- nfcbord.h | 70 ++++++++++-- placementnew.cpp | 11 ++ placementnew.h | 5 + shiftreg.h | 2 +- uid.h | 24 ++++ watchdog.h | 18 +++ 14 files changed, 518 insertions(+), 152 deletions(-) create mode 100644 defines.h create mode 100644 mfrcproxy.cpp create mode 100644 mfrcproxy.h create mode 100644 placementnew.cpp create mode 100644 placementnew.h create mode 100644 uid.h create mode 100644 watchdog.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 517218d..1f1167f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,18 @@ set(PORT_SPEED "57600" CACHE STRING "Serial Port Speed") set(PROGRAMMER "stk500v1" CACHE STRING "Programmer Type") set(COMPILE_FLAGS "" CACHE STRING "Additional Compiler Flags") -set(SRC_FILES main.cpp serial.cpp train.cpp item.cpp turnout.cpp signal.cpp softspim.cpp nfcbord.cpp mfrc522.cpp) +set(SRC_FILES + main.cpp + serial.cpp + train.cpp + item.cpp + turnout.cpp + signal.cpp + softspim.cpp + nfcbord.cpp + mfrc522.cpp + placementnew.cpp + mfrcproxy.cpp) # Compiler suite specification set(CMAKE_C_COMPILER /usr/bin/avr-gcc) diff --git a/defines.h b/defines.h new file mode 100644 index 0000000..60717ca --- /dev/null +++ b/defines.h @@ -0,0 +1,10 @@ +#pragma once + +static constexpr int COMMAND_BUFFER_SIZE = 64; +static constexpr int SNPRINTF_BUFFER_SIZE = 128; +static constexpr int EPPROM_SIZE = 1024; + +static constexpr int EEPROM_RESERVE = 32; +static constexpr int BLOCK = 4; + +static constexpr int NFC_PORTS = 8; diff --git a/main.cpp b/main.cpp index 65da1e7..cd86948 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "serial.h" #include "writepin.h" #include "train.h" @@ -144,8 +145,13 @@ inline static void printHelp(Serial* serial) turnout [nn] delete : Delete Turnout\n\ signal add [address] [subaddress] [type] : Add a signal\n\ signal list : List signal\n\ - signal [nn] set [status] : Set signal direction\n\ - signal [nn] delete : Delete signal\n\ + signal [nn] set [status] : Set signal status\n\ + nfc probe : Detect newly added nfc reader\n\ + nfc list : List nfc readers\n\ + nfc debug : Enable nfc debug output\n\ + nfc quiet : Disable nfc debug output\n\ + nfc enable : Enable tag detection\n\ + nfc disable : Disable tag detection\n\ stop : stop all trains\n\ power off : power off the rail\n\ power on : power on the rail\n\ diff --git a/mfrc522.cpp b/mfrc522.cpp index e26a4a6..fb80011 100644 --- a/mfrc522.cpp +++ b/mfrc522.cpp @@ -61,14 +61,22 @@ void* _userData; Mfrc522::Mfrc522(SpiMaster* spi, ShiftReg* 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* 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) diff --git a/mfrc522.h b/mfrc522.h index a4bdc70..61eb457 100644 --- a/mfrc522.h +++ b/mfrc522.h @@ -3,10 +3,19 @@ #include "softspim.h" #include "defines.h" #include "serial.h" +#include "uid.h" class Mfrc522 { public: + + static constexpr uint32_t POLL_OUT_US = 15000; + static constexpr uint8_t PRESCALLER = 169; + static constexpr uint16_t POLL_TIMER = (POLL_OUT_US*1.0E-6)/((2*PRESCALLER+1)/13.56E6); + + static constexpr uint32_t TIMEOUT_US = 1000000; + static constexpr uint16_t TIMEOUT_TIMER = (TIMEOUT_US*1.0E-6)/((2*169.0+1)/13.56E6); + // Error codes. static constexpr uint8_t OK = 0; // Everything A-OK. static constexpr uint8_t NOTAGERR = 1; // No tag error @@ -133,32 +142,10 @@ public: // The PICC_CMD_MF_READ and PICC_CMD_MF_WRITE can also be used for MIFARE Ultralight. static constexpr uint8_t PICC_CMD_UL_WRITE = 0xA2; // Writes one 4 byte page to the PICC - class Uid - { - public: - uint8_t size; // Number of bytes in the UID. 4, 7 or 10. - uint8_t uidByte[10]; - uint8_t sak; // The SAK (Select acknowledge) byte returned from the PICC after successful selection. - bool operator==(Uid& in) - { - if(size != in.size) - return false; - for(uint8_t i = 0; i < size; ++i) - { - if(uidByte[i] != in.uidByte[i]) - return false; - } - return true; - } - bool operator!=(Uid& in) - { - return !operator==(in); - } - }; - // Modes static constexpr uint8_t MODE_IDLE = 0; static constexpr uint8_t MODE_TRANSCEIVE = 1; + static constexpr uint8_t MODE_TIMEOUT = 2; private: ShiftReg* _csReg; @@ -207,6 +194,8 @@ public: uint8_t selectTag(Uid *uid); uint8_t getUid(Uid *uid); + + void reset(); void irq(); @@ -218,17 +207,21 @@ public: bool cardPresent(); - bool testFifo(); + bool testFifo(Serial* serial); - bool checkIrq(uint8_t *irq) + bool startTimeout(void (transceiveCb)(uint8_t, Mfrc522*, uint8_t*, uint8_t, void*), void* userData) { - write(ComIrqReg, 0b01111111); - if(read(Status1Reg) & (1 << 4)) - { - *irq = read(ComIrqReg); - return true; - } - return false; + _transceiveCb = transceiveCb; + _transceiveUserData = userData; + if(mode != MODE_IDLE) + return false; + mode = MODE_TIMEOUT; + write(TReloadRegH, TIMEOUT_TIMER >> 8); + write(TReloadRegL, TIMEOUT_TIMER & 0x0F); + write(ComIrqReg, 0b01111111); // clear irqs + write(ComIEnReg, (1 << 0)); + updateBit(ControlReg, 6, true); + return true; } static bool probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); diff --git a/mfrcproxy.cpp b/mfrcproxy.cpp new file mode 100644 index 0000000..f1fb502 --- /dev/null +++ b/mfrcproxy.cpp @@ -0,0 +1,52 @@ +#include "mfrcproxy.h" + +MfrcProxy::MfrcProxy(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin, void (detectCb)(MfrcProxy* proxy, Uid uid, void* data), void* userData): +_csReg(csReg), _spi(spi), _detectCb(detectCb), _userData(userData), _csPin(csPin) +{ + +} + +uint8_t MfrcProxy::read(uint8_t addr) +{ + _csReg->setBit(_csPin, false); + _delay_us(5); + _spi->readWrite(addr); + _delay_us(5); + uint8_t res = _spi->readWrite(); + _csReg->setBit(_csPin, true); + return res; +} + +void MfrcProxy::irq() +{ + if(read(REG_IRQ_BITS)) + { + uint8_t len = read(REG_UID_LEN); + if(len > 0 && len < 11) + { + Uid uid; + for(uint8_t i = 0; i < len; ++i) + { + uid.uidByte[i] = read(REG_UID_START_REG+i); + } + uid.size = len; + _detectCb(this, uid, _userData); + } + } +} + +bool MfrcProxy::probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin) +{ + csReg->setBit(csPin, false); + _delay_us(5); + spi->readWrite(REG_CHIP_ID); + _delay_us(5); + uint8_t version = spi->readWrite(); + csReg->setBit(csPin, true); + return version == 0x87; +} + +uint8_t MfrcProxy::getId() +{ + return read(REG_ID); +} diff --git a/mfrcproxy.h b/mfrcproxy.h new file mode 100644 index 0000000..1cfd1b5 --- /dev/null +++ b/mfrcproxy.h @@ -0,0 +1,35 @@ +#pragma once +#include + +#include "shiftreg.h" +#include "softspim.h" +#include "defines.h" +#include "serial.h" +#include "uid.h" + +class MfrcProxy +{ +public: + static constexpr uint8_t REG_CHIP_ID = 0xEE; + static constexpr uint8_t REG_ID = 0x01; + static constexpr uint8_t REG_IRQ_BITS = 0x02; + static constexpr uint8_t REG_UID_LEN = 0x04; + static constexpr uint8_t REG_UID_START_REG = 0x10; + +private: + ShiftReg* _csReg; + SpiMaster* _spi; + + void (*_detectCb)(MfrcProxy* proxy, Uid uid, void* data); + void* _userData; + + uint8_t _csPin; + + uint8_t read(uint8_t addr); + +public: + MfrcProxy(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin, void (detectCb)(MfrcProxy* proxy, Uid uid, void* data), void* userData = nullptr); + void irq(); + static bool probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); + uint8_t getId(); +}; diff --git a/nfcbord.cpp b/nfcbord.cpp index 3b2a871..8b08d6b 100644 --- a/nfcbord.cpp +++ b/nfcbord.cpp @@ -4,27 +4,78 @@ #include #include #include +#include #include #include "writepin.h" +#include "watchdog.h" -NfcBoard nfcBoard; +NfcBoard nfcBoard(Serial::getInstance()); extern char buffer[SNPRINTF_BUFFER_SIZE]; -ISR(PCINT1_vect, ISR_NOBLOCK) +ISR(WDT_vect) { + for(uint8_t i = 0; i < nfcBoard.watchDogBits.count(); ++i) + { + if(nfcBoard.watchDogBits[i] == 0) + nfcBoard.watchDogBits[i] = 2; + else + nfcBoard.watchDogBits[i] = 0; + } +} + +NfcBoard::NfcBoard(Serial* serialIn): +serial(serialIn), +csReg(&PORTC, PC1, PC2, PC0), +irqReg(&PORTC, &PINB, PC5, PB1, PC4) +{ + DDRC |= (1 << PC0) | (1 << PC1) | (1 << PC2) | (1 << PC4) | (1 << PC5); + DDRB |= (1 << PB4) | (1 << PB3); + csReg.clear(true); + irqReg.read(); + probe(); + setEnabled(true); +} + +void NfcBoard::poll(Serial* serial) +{ + for(uint8_t i = 0; i < watchDogBits.count(); ++i) + { + if(watchDogBits[i] == 2 && readers[i].type == TYPE_MFRC522) + { + if(serial) + { + serial->write_p(PSTR("Warning reader watchdog timeout for reader ")); + serial->write((int)i); + serial->putChar('\n'); + } + readers[i].device.mfrc522.reset(); + if(enabled_) + readers[i].device.mfrc522.detectAsync(detectCb, this); + watchDogBits[i] = 1; + } + } + if(readPin(&PINC, PC3)) { - uint8_t* data = nfcBoard.irqReg.read(); + uint8_t* data = irqReg.read(); for(uint8_t i = 0; i < NFC_PORTS; ++i) { if(*data & (1 << i)) { - for(uint8_t j = 0; j < nfcBoard.readers.count(); ++j) + for(uint8_t j = 0; j < readers.count(); ++j) { - if(nfcBoard.irqPins[j] == i) + if(irqPins[j] == i) { - nfcBoard.readers[j].irq(); + if(readers[j].type == TYPE_MFRC522) + { + readers[j].device.mfrc522.irq(); + watchDogBits[j] = 1; + } + else + { + readers[j].device.proxy.irq(); + } } } } @@ -32,17 +83,27 @@ ISR(PCINT1_vect, ISR_NOBLOCK) } } -NfcBoard::NfcBoard(): -csReg(&PORTC, PC1, PC2, PC0), -irqReg(&PORTC, &PINB, PC5, PB1, PC4) +void NfcBoard::setEnabled(bool enabled) { - DDRC |= (1 << PC0) | (1 << PC1) | (1 << PC2) | (1 << PC4) | (1 << PC5); - DDRB |= (1 << PB4) | (1 << PB3); - PCMSK1 |= 1 << PCINT11; - PCICR |= 1 << PCIE1; - csReg.clear(true); - irqReg.read(); - probe(); + if(enabled != enabled_) + { + enabled_ = enabled; + for(uint8_t i = 0; i < readers.count(); ++i) + { + if(readers[i].type == TYPE_MFRC522) + { + if(enabled) + readers[i].device.mfrc522.detectAsync(detectCb, this); + else + readers[i].device.mfrc522.stopAsync(); + watchDogBits[i] = 0; + } + } + if(enabled) + wdt_set(WDTO_4S); + else + wdt_disable(); + } } uint8_t NfcBoard::csToIrq(uint8_t cs) @@ -74,28 +135,48 @@ void NfcBoard::probe() { readers.clear(); irqPins.clear(); + watchDogBits.clear(); for(uint8_t i = 0; i < NFC_PORTS; ++i) { if(Mfrc522::probe(&spim, &csReg, i)) { - readers.push_back(Mfrc522(&spim, &csReg, i)); + NfcPort port(Mfrc522(&spim, &csReg, i)); + readers.push_back(port); irqPins.push_back(csToIrq(i)); + watchDogBits.push_back(0); + } + else if(MfrcProxy::probe(&spim, &csReg, i)) + { + NfcPort port(MfrcProxy(&spim, &csReg, i, proxyDetectCb, this)); + readers.push_back(port); + irqPins.push_back(csToIrq(i)); + watchDogBits.push_back(0); } } } -void NfcBoard::printNfcDevices(Serial* serial) +void NfcBoard::printNfcDevices() { serial->write_p(PSTR("NFC DEVICES:\n")); for(uint8_t i = 0; i < readers.count(); ++i) { - snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("NFC NUMBER: %u IRQ: %x\n"), i, irqPins[i]); + snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("NFC NUMBER: %u IRQ: %x TYPE: %d\n"), + readers[i].type == TYPE_MFRC522 ? i+0x80 : readers[i].device.proxy.getId(), + irqPins[i], readers[i].type); serial->write(buffer, SNPRINTF_BUFFER_SIZE); } } -int NfcBoard::dispatch(char* inBuffer, Serial* serial) +int NfcBoard::dispatch(char* inBuffer) { + Mfrc522* mainReader = nullptr; + for(uint8_t i = 0; i < readers.count(); ++i) + { + if(readers[i].type == TYPE_MFRC522) + { + mainReader = &readers[i].device.mfrc522; + } + } if(strcmp(inBuffer, "debug") == 0) { Mfrc522::serial = serial; @@ -129,16 +210,23 @@ int NfcBoard::dispatch(char* inBuffer, Serial* serial) PCICR |= 1 << PCIE1; return 0; } - else if(strcmp(inBuffer, "detect") == 0 ) + else if(strcmp(inBuffer, "select") == 0 ) { + bool enabled = enabled_; + setEnabled(false); + if(!mainReader) + { + serial->write_p(PSTR("No nfc reader present\n")); + return -1; + } serial->write_p(PSTR("Runing tag detection test\n")); while(!serial->dataIsWaiting()) { - bool present = readers[0].cardPresent(); + bool present = mainReader->cardPresent(); if(present) { - Mfrc522::Uid uid; - uint8_t res = readers[0].selectTag(&uid); + Uid uid; + uint8_t res = mainReader->selectTag(&uid); if(res != 0) continue; @@ -153,19 +241,27 @@ int NfcBoard::dispatch(char* inBuffer, Serial* serial) } _delay_ms(100); } + setEnabled(enabled); serial->write_p(PSTR("Finished\n")); return 0; } - else if(strcmp(inBuffer, "fastdetect") == 0 ) + else if(strcmp(inBuffer, "detect") == 0 ) { + bool enabled = enabled_; + setEnabled(false); + if(!mainReader) + { + serial->write_p(PSTR("No nfc reader present\n")); + return -1; + } serial->write_p(PSTR("Runing fast tag detection test\n")); while(!serial->dataIsWaiting()) { - bool present = readers[0].cardPresent(); + bool present = mainReader->cardPresent(); if(present) { - Mfrc522::Uid uid; - uint8_t res = readers[0].getUid(&uid); + Uid uid; + uint8_t res = mainReader->getUid(&uid); if(res != 0) continue; @@ -179,72 +275,124 @@ int NfcBoard::dispatch(char* inBuffer, Serial* serial) serial->putChar('\n'); } } - serial->write_p(PSTR("Finished\n")); - return 0; - } - else if(strcmp(inBuffer, "fifotst") == 0 ) - { - serial->write_p(PSTR("Runing fifo test\n")); - Mfrc522::serial = serial; - readers[0].testFifo(); - Mfrc522::serial = nullptr; + setEnabled(enabled); serial->write_p(PSTR("Finished\n")); return 0; } else if(strcmp(inBuffer, "enable") == 0 ) { - for(uint8_t i = 0; i < readers.count(); ++i) + if(enabled_) { - readers[i].detectAsync(detectCb, serial); + serial->write_p(PSTR("Nfc tag listening allready enabled\n")); + return -1; } + setEnabled(true); serial->write_p(PSTR("Nfc tag listening enabled\n")); return 0; } - else if(strcmp(inBuffer, "status") == 0 ) + else if(strcmp(inBuffer, "disable") == 0 ) { - printNfcDevices(serial); + if(!enabled_) + { + serial->write_p(PSTR("Nfc tag listening already disabled\n")); + return -1; + } + setEnabled(false); + serial->write_p(PSTR("Nfc tag listening disabled\n")); return 0; } - else if(strcmp(inBuffer, "wake") == 0 ) + else if(strcmp(inBuffer, "list") == 0 ) { - uint8_t bufferATQA[2]; - uint8_t len = sizeof(bufferATQA); - - uint8_t res = readers[0].wakeupTag(bufferATQA, &len); - snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("wakeupTag returned: %u Buffer: 0x%x 0x%x len %u\n"), - res, bufferATQA[0], bufferATQA[1], len); - serial->write(buffer, SNPRINTF_BUFFER_SIZE); + printNfcDevices(); return 0; } else if(strcmp(inBuffer, "probe") == 0 ) { + bool enabled = enabled_; + setEnabled(false); probe(); - printNfcDevices(serial); + printNfcDevices(); + setEnabled(enabled); + return 0; + } + else if(strcmp(inBuffer, "read") == 0 ) + { + char* token = strtok(NULL, " "); + int16_t addr = -1; + int16_t csPin = -1; + if(token) + addr = strtol(token, nullptr, 16); + if(addr < 0 || addr > 0xFF) + { + serial->write_p(PSTR("A address must be specified\n")); + return -1; + } + token = strtok(NULL, " "); + if(token) + csPin = strtol(token, nullptr, 16); + if(csPin < 0 || csPin > 7) + { + serial->write_p(PSTR("A valid cs pin must be specified\n")); + return -1; + } + csReg.setBit(csPin, false); + _delay_us(5); + spim.readWrite(addr); + _delay_us(5); + uint8_t result = spim.readWrite(); + csReg.setBit(csPin, true); + serial->write_p(PSTR("Got: ")); + serial->write((int)result); + serial->write_p(PSTR(" in return\n")); return 0; } return -3; } +void NfcBoard::printTag(const uint8_t id, const Uid& uid, Serial* serial) +{ + serial->write("NFC "); + serial->write((int)id); + serial->write(" TAG "); + for(uint8_t i = 0; i < uid.size; ++i) + { + serial->write((int)uid.uidByte[i]); + if(i < uid.size-1) + serial->putChar(':'); + } + serial->putChar('\n'); +} + +void NfcBoard::proxyDetectCb(MfrcProxy* proxy, const Uid uid, void* data) +{ + NfcBoard* instance = reinterpret_cast(data); + + printTag(proxy->getId(), uid, instance->serial); +} + void NfcBoard::detectCb(Mfrc522* reader, void* data) { - Serial* serial = reinterpret_cast(data); + NfcBoard* instance = reinterpret_cast(data); - static Mfrc522* oldReader = nullptr; - static Mfrc522::Uid oldUid = {0}; - - Mfrc522::Uid uid; - if(reader->getUid(&uid) == 0 && (uid != oldUid || reader != oldReader)) + Uid uid; + if(reader->getUid(&uid) == 0) { - serial->write("TAG: "); - for(uint8_t i = 0; i < uid.size; ++i) + uint8_t i; + for(i = 0; i < instance->readers.count(); ++i) { - serial->write((int)uid.uidByte[i]); - if(i < uid.size-1) - serial->putChar(':'); + if(&instance->readers[i].device.mfrc522 == reader) + break; } - serial->putChar('\n'); - oldUid = uid; - oldReader = reader; + printTag(i+0x80, uid, instance->serial); + reader->startTimeout(&timeoutCb, data); + } + else + { + reader->detectAsync(detectCb, data); } - reader->detectAsync(detectCb, serial); +} + +void NfcBoard::timeoutCb(uint8_t ret, Mfrc522* reader, uint8_t* response, uint8_t responseLen, void* userData) +{ + reader->detectAsync(&detectCb, userData); } diff --git a/nfcbord.h b/nfcbord.h index 6a010ca..ed204ea 100644 --- a/nfcbord.h +++ b/nfcbord.h @@ -1,4 +1,5 @@ #pragma once +#include "placementnew.h" #include "serial.h" #include "shiftreg.h" #include "inputshiftreg.h" @@ -6,25 +7,78 @@ #include "softspim.h" #include "staticvector.h" #include "defines.h" +#include "mfrcproxy.h" class NfcBoard { -public: - ShiftReg csReg; - InputShiftReg irqReg; +private: + + static constexpr int TYPE_MFRC522 = 0; + static constexpr int TYPE_PROXY = 1; + + union PortDevice + { + Mfrc522 mfrc522; + MfrcProxy proxy; + PortDevice(const Mfrc522& mfrc522In) + { + new (&mfrc522) Mfrc522(mfrc522In); + } + PortDevice(const MfrcProxy& proxyIn) + { + new (&proxy) MfrcProxy(proxyIn); + } + }; + + struct NfcPort + { + PortDevice device; + uint8_t type; + NfcPort(const Mfrc522& mfrc522): device(mfrc522) + { + type = TYPE_MFRC522; + } + NfcPort(const MfrcProxy& proxy): device(proxy) + { + type = TYPE_PROXY; + } + ~NfcPort() + { + if(type == TYPE_MFRC522) + device.mfrc522.~Mfrc522(); + else + device.proxy.~MfrcProxy(); + } + }; + + Serial* serial; SpiMaster spim; - SVector readers; + ShiftReg csReg; + bool enabled_ = false; + + static void printTag(const uint8_t id, const Uid& uid, Serial* serial); + +public: + InputShiftReg irqReg; SVector irqPins; - + SVector readers; + SVector watchDogBits; + static void detectCb(Mfrc522* reader, void* data); + static void timeoutCb(uint8_t ret, Mfrc522* reader, uint8_t* response, uint8_t responseLen, void* userData); + static void proxyDetectCb(MfrcProxy* proxy, const Uid uid, void* data); - NfcBoard(); + NfcBoard(Serial* serialIn); void probe(); - void printNfcDevices(Serial* serial); + void setEnabled(bool enabled); - int dispatch(char* inBuffer, Serial* serial); + void poll(Serial* serial = nullptr); + + void printNfcDevices(); + + int dispatch(char* inBuffer); uint8_t csToIrq(uint8_t cs); }; diff --git a/placementnew.cpp b/placementnew.cpp new file mode 100644 index 0000000..bdadaf8 --- /dev/null +++ b/placementnew.cpp @@ -0,0 +1,11 @@ +#include "placementnew.h" + +void* operator new(uint16_t, void* const buf) +{ + return buf; +} + +void* operator new[](uint16_t, void* const buf) +{ + return buf; +} diff --git a/placementnew.h b/placementnew.h new file mode 100644 index 0000000..6a5a332 --- /dev/null +++ b/placementnew.h @@ -0,0 +1,5 @@ +#pragma once +#include "stdint.h" + +void* operator new(uint16_t, void* const buf); +void* operator new[](uint16_t, void* const buf); diff --git a/shiftreg.h b/shiftreg.h index 2e31b99..9a38af5 100644 --- a/shiftreg.h +++ b/shiftreg.h @@ -53,8 +53,8 @@ public: for(unsigned char i = 0; i < BITS; ++i) { - *_port |= (1 << _pinSerClk); in[i/8] & (1<<(i%8)) ? (*_port &= ~(1 << _pinSer)) : (*_port |= (1 << _pinSer)); + *_port |= (1 << _pinSerClk); *_port &= ~(1 << _pinSerClk); } *_port &= ~(1<<_pinRClk); diff --git a/uid.h b/uid.h new file mode 100644 index 0000000..21589c3 --- /dev/null +++ b/uid.h @@ -0,0 +1,24 @@ +#pragma once + +class Uid +{ +public: + uint8_t size; // Number of bytes in the UID. 4, 7 or 10. + uint8_t uidByte[10]; + uint8_t sak; // The SAK (Select acknowledge) byte returned from the PICC after successful selection. + bool operator==(Uid& in) + { + if(size != in.size) + return false; + for(uint8_t i = 0; i < size; ++i) + { + if(uidByte[i] != in.uidByte[i]) + return false; + } + return true; + } + bool operator!=(Uid& in) + { + return !operator==(in); + } +}; diff --git a/watchdog.h b/watchdog.h new file mode 100644 index 0000000..ac5b0e3 --- /dev/null +++ b/watchdog.h @@ -0,0 +1,18 @@ +#pragma once +#include + +#define wdt_set(value) \ + __asm__ __volatile__ ( \ + "in __tmp_reg__,__SREG__" "\n\t" \ + "cli" "\n\t" \ + "wdr" "\n\t" \ + "sts %0,%1" "\n\t" \ + "out __SREG__,__tmp_reg__" "\n\t" \ + "sts %0,%2" \ + : \ + : "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \ + "r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \ + "r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \ + _BV(WDIE) | (value & 0x07)) ) \ + : "r0" \ + ) From dca442167458a68797a33c25398eaf7ced22a6dd Mon Sep 17 00:00:00 2001 From: uvos Date: Fri, 25 Mar 2022 13:41:02 +0100 Subject: [PATCH 10/10] add free memory command add read and write nfc commands fix function sending --- item.h | 2 +- main.cpp | 15 +++++++ mfrc522.cpp | 2 +- mfrc522.h | 6 ++- mfrcproxy.h | 3 +- nfcbord.cpp | 110 ++++++++++++++++++++++++++++++++++++++---------- train.cpp | 4 +- train.h | 2 +- traindispatch.h | 2 +- 9 files changed, 115 insertions(+), 31 deletions(-) diff --git a/item.h b/item.h index d08f73e..49406b3 100644 --- a/item.h +++ b/item.h @@ -18,7 +18,7 @@ private: static constexpr unsigned char _pinLowA = PD4; static constexpr unsigned char _pinHighB = PD2; static constexpr unsigned char _pinLowB = PD3; - static constexpr uint8_t SEND_COUNT = 1; + static constexpr uint8_t SEND_COUNT = 2; uint8_t _address; diff --git a/main.cpp b/main.cpp index cd86948..a23323d 100644 --- a/main.cpp +++ b/main.cpp @@ -127,6 +127,13 @@ void restore_state() } } +int freeRAM() +{ + extern int __heap_start, *__brkval; + int v; + return (int) &v - (__brkval == 0 ? (int) &__heap_start: (int) __brkval); +} + inline static void printHelp(Serial* serial) { serial->write_p(PSTR("Available Commands: \n\ @@ -157,6 +164,7 @@ inline static void printHelp(Serial* serial) power on : power on the rail\n\ power auto : power off the rail when no trains are moveing\n\ dump : prints epprom contence\n\ + free : show amount of free ram\n\ erase : Erase epprom.\n")); } @@ -299,6 +307,13 @@ void serialDispatch(Serial* serial) printHelp(serial); ret = 0; } + else if(strcmp(token, "free") == 0) + { + serial->write_p(PSTR("Free Ram: ")); + serial->write(freeRAM()); + serial->write_p(PSTR(" Bytes.\n")); + ret = 0; + } else { serial->putChar('\"'); diff --git a/mfrc522.cpp b/mfrc522.cpp index fb80011..86d12ba 100644 --- a/mfrc522.cpp +++ b/mfrc522.cpp @@ -79,7 +79,7 @@ void Mfrc522::reset() write(TReloadRegL, POLL_TIMER & 0x0F); write(ModWidthReg, 0x26); - write(RFCfgReg, 0b111 << 4); //set gain to 48dB + write(RFCfgReg, 0b01110100); //set gain to 48dB write(TxAutoReg, 0x40); // Default 0x00. Force a 100 % ASK modulation independent of the ModGsPReg register setting updateBit(RxModeReg, 3, true); diff --git a/mfrc522.h b/mfrc522.h index 61eb457..1b5b0d0 100644 --- a/mfrc522.h +++ b/mfrc522.h @@ -192,9 +192,11 @@ public: uint8_t wakeupTag(uint8_t* bufferATQA, uint8_t *bufferLen); uint8_t selectTag(Uid *uid); - + uint8_t getUid(Uid *uid); - + + uint8_t getCs(){return _csPin;} + void reset(); void irq(); diff --git a/mfrcproxy.h b/mfrcproxy.h index 1cfd1b5..2e66f2d 100644 --- a/mfrcproxy.h +++ b/mfrcproxy.h @@ -25,11 +25,12 @@ private: uint8_t _csPin; - uint8_t read(uint8_t addr); public: MfrcProxy(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin, void (detectCb)(MfrcProxy* proxy, Uid uid, void* data), void* userData = nullptr); + uint8_t read(uint8_t addr); void irq(); static bool probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); uint8_t getId(); + uint8_t getCs(){return _csPin;} }; diff --git a/nfcbord.cpp b/nfcbord.cpp index 8b08d6b..5173abd 100644 --- a/nfcbord.cpp +++ b/nfcbord.cpp @@ -111,13 +111,13 @@ uint8_t NfcBoard::csToIrq(uint8_t cs) switch(cs) { case 0: - return 3; + return 4; case 1: return 2; case 2: return 1; case 3: - return 7; + return 0; case 4: return 7; case 5: @@ -160,9 +160,11 @@ void NfcBoard::printNfcDevices() serial->write_p(PSTR("NFC DEVICES:\n")); for(uint8_t i = 0; i < readers.count(); ++i) { - snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("NFC NUMBER: %u IRQ: %x TYPE: %d\n"), - readers[i].type == TYPE_MFRC522 ? i+0x80 : readers[i].device.proxy.getId(), - irqPins[i], readers[i].type); + uint8_t id = readers[i].type == TYPE_MFRC522 ? i+0x80 : readers[i].device.proxy.getId(); + uint8_t cs = readers[i].type == TYPE_MFRC522 ? + readers[i].device.mfrc522.getCs() : readers[i].device.proxy.getCs(); + snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("NFC NUMBER: %u CS: %x IRQ: %x TYPE: %d\n"), + id, cs, irqPins[i], readers[i].type); serial->write(buffer, SNPRINTF_BUFFER_SIZE); } } @@ -189,8 +191,6 @@ int NfcBoard::dispatch(char* inBuffer) } else if(strcmp(inBuffer, "irqs") == 0 ) { - PCMSK1 &= ~(1 << PCINT11); - PCICR &= ~(1 << PCIE1); serial->write_p(PSTR("Irq pin detection test\n")); while(!serial->dataIsWaiting()) { @@ -206,8 +206,6 @@ int NfcBoard::dispatch(char* inBuffer) } } serial->write_p(PSTR("Finished\n")); - PCMSK1 |= 1 << PCINT11; - PCICR |= 1 << PCIE1; return 0; } else if(strcmp(inBuffer, "select") == 0 ) @@ -317,9 +315,66 @@ int NfcBoard::dispatch(char* inBuffer) } else if(strcmp(inBuffer, "read") == 0 ) { - char* token = strtok(NULL, " "); int16_t addr = -1; int16_t csPin = -1; + + char* token = strtok(NULL, " "); + if(token) + csPin = strtol(token, nullptr, 16); + if(csPin < 0 || csPin > 7) + { + serial->write_p(PSTR("A valid cs pin must be specified\n")); + return -1; + } + token = strtok(NULL, " "); + if(token) + addr = strtol(token, nullptr, 16); + if(addr < 0 || addr > 0xFF) + { + serial->write_p(PSTR("A address must be specified\n")); + return -1; + } + + uint8_t result = 0; + for(uint8_t i = 0; i < readers.count(); ++i) + { + if(readers[i].type == TYPE_MFRC522) + { + if(readers[i].device.mfrc522.getCs() == csPin) + { + result = readers[i].device.mfrc522.read(addr); + serial->write_p(PSTR("read sucessfull\n")); + } + } + else + { + if(readers[i].device.proxy.getCs() == csPin) + { + result = readers[i].device.proxy.read(addr); + serial->write_p(PSTR("read sucessfull\n")); + } + } + } + + snprintf_P(buffer, SNPRINTF_BUFFER_SIZE, PSTR("Got: 0x%02x in return\n"), result); + serial->write(buffer, SNPRINTF_BUFFER_SIZE); + return 0; + } + else if(strcmp(inBuffer, "write") == 0 ) + { + int16_t addr = -1; + int16_t csPin = -1; + int16_t data = -1; + + char* token = strtok(NULL, " "); + if(token) + csPin = strtol(token, nullptr, 16); + if(csPin < 0 || csPin > 7) + { + serial->write_p(PSTR("A valid cs pin must be specified\n")); + return -1; + } + token = strtok(NULL, " "); if(token) addr = strtol(token, nullptr, 16); if(addr < 0 || addr > 0xFF) @@ -329,21 +384,32 @@ int NfcBoard::dispatch(char* inBuffer) } token = strtok(NULL, " "); if(token) - csPin = strtol(token, nullptr, 16); - if(csPin < 0 || csPin > 7) + data = strtol(token, nullptr, 16); + if(data < 0 || data > 0xFF) { - serial->write_p(PSTR("A valid cs pin must be specified\n")); + serial->write_p(PSTR("Data must be specified\n")); return -1; } - csReg.setBit(csPin, false); - _delay_us(5); - spim.readWrite(addr); - _delay_us(5); - uint8_t result = spim.readWrite(); - csReg.setBit(csPin, true); - serial->write_p(PSTR("Got: ")); - serial->write((int)result); - serial->write_p(PSTR(" in return\n")); + + for(uint8_t i = 0; i < readers.count(); ++i) + { + if(readers[i].type == TYPE_MFRC522) + { + if(readers[i].device.mfrc522.getCs() == csPin) + { + readers[i].device.mfrc522.write(addr, data); + serial->write_p(PSTR("Write sucessfull\n")); + } + } + else + { + if(readers[i].device.proxy.getCs() == csPin) + { + serial->write_p(PSTR("Mfrc522 proxies are not writable\n")); + return -1; + } + } + } return 0; } return -3; diff --git a/train.cpp b/train.cpp index 4633772..3f910e3 100644 --- a/train.cpp +++ b/train.cpp @@ -144,7 +144,7 @@ void Train::sendData(bool single) if(_functionmask & (1 << functionToResend)) { _delay_ms(2); - sendRaw(packetAddSpeed() | packetAddFunction(functionToResend) | packetAddFunction(0), single); + sendRaw(packetAddSpeed() | packetAddFunction(functionToResend) | packetAddFunction(0), false); } _function &= ~0xF0; _function |= functionToResend << 4; @@ -174,7 +174,7 @@ uint8_t Train::getFunctionMask() return _functionmask; } -void Train::sendFunction(const uint8_t function, bool enable) +void Train::setFunction(const uint8_t function, bool enable) { if(function > 3) return; diff --git a/train.h b/train.h index 07a7303..579992d 100644 --- a/train.h +++ b/train.h @@ -34,7 +34,7 @@ public: void setFunctionMask(uint8_t functionmask) {_functionmask = functionmask;} uint8_t getFunctions(); uint8_t getFunctionMask(); - void sendFunction(const uint8_t function, bool enable = true); + void setFunction(const uint8_t function, bool enable = true); uint8_t getQuirks(); void setQuirks(uint8_t quirks); diff --git a/traindispatch.h b/traindispatch.h index 0c4dea4..3c25fa3 100644 --- a/traindispatch.h +++ b/traindispatch.h @@ -103,7 +103,7 @@ int trainDispatch(char* inBuffer, Serial* serial) { uint8_t functionId = atoi(token); bool on = (strcmp(boolToken, "on") == 0); - trains[id].sendFunction(functionId, on ); + trains[id].setFunction(functionId, on ); serial->write_p(PSTR("Set Train function ")); serial->write(functionId); serial->write(on ? " on\n" : " off\n");