diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f1167f..517218d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,18 +17,7 @@ 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 - placementnew.cpp - mfrcproxy.cpp) +set(SRC_FILES main.cpp serial.cpp train.cpp item.cpp turnout.cpp signal.cpp softspim.cpp nfcbord.cpp mfrc522.cpp) # Compiler suite specification set(CMAKE_C_COMPILER /usr/bin/avr-gcc) diff --git a/defines.h b/defines.h deleted file mode 100644 index 60717ca..0000000 --- a/defines.h +++ /dev/null @@ -1,10 +0,0 @@ -#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/inputshiftreg.h b/inputshiftreg.h index 660001f..925b818 100644 --- a/inputshiftreg.h +++ b/inputshiftreg.h @@ -22,12 +22,6 @@ 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) { @@ -40,11 +34,13 @@ 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; @@ -52,13 +48,14 @@ 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) { @@ -72,7 +69,6 @@ public: data[i/8] &= ~(1<<(i%8)); *_port &= ~(1 << _pinClk); } - *_port |= (1<<_pinParallelLoad); } return data; } diff --git a/item.cpp b/item.cpp index 93877a9..4aada35 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, bool single) +void Item::sendRawAddr(const uint8_t address, const uint16_t data) { for(uint8_t j = 0; j < SEND_COUNT; j++) { @@ -83,13 +83,11 @@ void Item::sendRawAddr(const uint8_t address, const uint16_t data, bool single) { sendBit(data & (1 << i)); } - if(single || SEND_COUNT == 1) - return; _delay_ms(1); } } -void Item::sendRaw(const uint16_t data, bool single) +void Item::sendRaw(const uint16_t data) { - sendRawAddr(_address, data, single); + sendRawAddr(_address, data); } diff --git a/item.h b/item.h index 49406b3..a62bcd6 100644 --- a/item.h +++ b/item.h @@ -40,8 +40,8 @@ public: Item(const uint8_t address); - void sendRaw(const uint16_t data, bool single = false); - static void sendRawAddr(const uint8_t address, const uint16_t data, bool single = false); + void sendRaw(const uint16_t data); + static void sendRawAddr(const uint8_t address, const uint16_t data); void setAddress(const uint8_t address); uint8_t getAddress(); diff --git a/main.cpp b/main.cpp index a23323d..bd6eb26 100644 --- a/main.cpp +++ b/main.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "serial.h" #include "writepin.h" #include "train.h" @@ -23,6 +22,7 @@ char buffer[SNPRINTF_BUFFER_SIZE]; SVector trains; SVector turnouts; SVector signals; +NfcBoard nfcBoard; bool autoff = true; bool powerIsOn = true; @@ -127,13 +127,6 @@ 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\ @@ -152,19 +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 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\ + signal [nn] set [status] : Set signal direction\n\ + signal [nn] delete : Delete signal\n\ stop : stop all trains\n\ power off : power off the rail\n\ 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")); } @@ -266,7 +253,7 @@ void serialDispatch(Serial* serial) { token = strtok(NULL, " "); if(token != NULL) - ret = nfcBoard.dispatch(token); + ret = nfcBoard.dispatch(token, serial); } else if(strncmp(token, "erase", 4) == 0) { @@ -307,13 +294,6 @@ 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('\"'); @@ -367,35 +347,26 @@ int main() sei(); - Serial* serial = Serial::getInstance(); + Serial serial; - serial->write_p(PSTR("TrainController v0.5 starting\n")); - - uint8_t repeatCount = 0; + serial.write_p(PSTR("TrainController v0.5 starting\n")); while(true) { if(resendEvent && (trains.count() || turnouts.count() || signals.count())) { + timer0InterruptEnable(false); if(itemToResend < trains.count()) - trains[itemToResend].sendData(true); + trains[itemToResend].sendData(); else if(itemToResend < trains.count() + turnouts.count()) - turnouts[itemToResend-trains.count()].sendData(true); + turnouts[itemToResend-trains.count()].sendData(); else if(itemToResend < trains.count() + turnouts.count()+signals.count()) - signals[itemToResend-trains.count()-turnouts.count()].sendData(true); + signals[itemToResend-trains.count()-turnouts.count()].sendData(); + itemToResend++; + if(trains.count()+turnouts.count()+signals.count() <= itemToResend) + itemToResend = 0; resendEvent = false; - if(repeatCount == 0) - { - TCNT0 = 190; - repeatCount = 1; - } - else - { - itemToResend++; - if(trains.count()+turnouts.count()+signals.count() <= itemToResend) - itemToResend = 0; - repeatCount = 0; - } + timer0InterruptEnable(true); } if(autoff) @@ -410,9 +381,7 @@ int main() Train::setOutput(Train::OFF); } } - - serialDispatch(serial); - nfcBoard.poll(serial); + serialDispatch(&serial); } return 0; } diff --git a/mfrc522.cpp b/mfrc522.cpp index 86d12ba..ee64c2b 100644 --- a/mfrc522.cpp +++ b/mfrc522.cpp @@ -1,7 +1,6 @@ #include "mfrc522.h" -Serial *Mfrc522::serial = nullptr; -uint8_t Mfrc522::reponseBuffer[Mfrc522::reponseBufferLen]; + uint8_t Mfrc522::read(uint8_t addr) { @@ -59,34 +58,25 @@ 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): - _csReg(csReg), _spi(spi), _csPin(csPin) -{ - reset(); -} - -void Mfrc522::reset() +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) { write(CommandReg, SOFTRESET); _delay_ms(100); - mode = MODE_IDLE; - irqDetect = false; - write(TModeReg, 0x80); - write(TPrescalerReg, PRESCALLER); - write(TReloadRegH, POLL_TIMER >> 8); - write(TReloadRegL, POLL_TIMER & 0x0F); + write(TPrescalerReg, 0xA9); + write(TReloadRegH, 0x03); + write(TReloadRegL, 0xE8); write(ModWidthReg, 0x26); - write(RFCfgReg, 0b01110100); //set gain to 48dB + 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(ComIrqReg, 0b01111111); - write(ComIEnReg, 0); // invert irq pin (high is active) - write(DivIEnReg, 1 << 7); // enable MfinActIrq as push-pull + //write(DivIEnReg, 0b10010000); // enable MfinActIrq as push-pull + //write(ComIEnReg, 0b00100000); // enable Rx irq setRf(true); } @@ -108,17 +98,32 @@ 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; } -void Mfrc522::setupTransceive(uint8_t *sendData, uint8_t sendLen, uint8_t validBits, uint8_t rxAlign) +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) { + 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, TRANSCEIVE); // Execute the command + write(CommandReg, command); // Execute the command if(serial) { @@ -135,82 +140,14 @@ void Mfrc522::setupTransceive(uint8_t *sendData, uint8_t sendLen, uint8_t validB 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; - _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(irq & 1) - { - mode = MODE_IDLE; - _transceiveCb(TIMEOUT, this, nullptr, 0, _transceiveUserData); - return; - } - - 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; - } - - 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); + if (command == TRANSCEIVE) + updateBit(BitFramingReg, 7, true); uint16_t i = 2000; uint8_t irq = read(ComIrqReg); - while(!(irq & 0x30)) // RxIRq and IdleIRq + while(irq & waitIrq) { irq = read(ComIrqReg); if(irq & 0x01 || --i == 0) @@ -263,6 +200,13 @@ uint8_t Mfrc522::transceive(uint8_t *sendData, uint8_t sendLen, 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) { @@ -290,13 +234,14 @@ 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 *responseBufferPtr; + uint8_t *responseBuffer; 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 @@ -332,17 +277,17 @@ uint8_t Mfrc522::selectTag(Uid *uid) switch(cascadeLevel) { case 0: - reponseBuffer[0] = PICC_CMD_SEL_CL1; + buffer[0] = PICC_CMD_SEL_CL1; uidIndex = 0; break; case 1: - reponseBuffer[0] = PICC_CMD_SEL_CL2; + buffer[0] = PICC_CMD_SEL_CL2; uidIndex = 3; break; case 2: - reponseBuffer[0] = PICC_CMD_SEL_CL3; + buffer[0] = PICC_CMD_SEL_CL3; uidIndex = 6; break; @@ -364,7 +309,7 @@ uint8_t Mfrc522::selectTag(Uid *uid) if (bytesToCopy > maxBytes) bytesToCopy = maxBytes; for (count = 0; count < bytesToCopy; count++) - reponseBuffer[index++] = uid->uidByte[uidIndex + count]; + buffer[index++] = uid->uidByte[uidIndex + count]; } // Repeat anti collision loop until we can transmit all UID bits + BCC and receive a SAK - max 32 iterations. @@ -374,11 +319,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. { - reponseBuffer[1] = 0x70; // NVB - Number of Valid Bits: Seven whole bytes + buffer[1] = 0x70; // NVB - Number of Valid Bits: Seven whole bytes // Calculate BCC - Block Check Character - reponseBuffer[6] = reponseBuffer[2] ^ reponseBuffer[3] ^ reponseBuffer[4] ^ reponseBuffer[5]; + buffer[6] = buffer[2] ^ buffer[3] ^ buffer[4] ^ buffer[5]; // Calculate CRC_A - result = calculateCrc(reponseBuffer, 7, reinterpret_cast(&reponseBuffer[7])); + result = calculateCrc(buffer, 7, reinterpret_cast(&buffer[7])); if (result != 0) { if(serial) @@ -388,7 +333,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) - responseBufferPtr = &reponseBuffer[6]; + responseBuffer = &buffer[6]; responseLength = 3; } else // This is an ANTICOLLISION. @@ -396,20 +341,31 @@ 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 - reponseBuffer[1] = (index << 4) + txLastBits; // NVB - Number of Valid Bits + buffer[1] = (index << 4) + txLastBits; // NVB - Number of Valid Bits bufferUsed = index + (txLastBits ? 1 : 0); // Store response in the unused part of buffer - responseBufferPtr = &reponseBuffer[index]; - responseLength = sizeof(reponseBuffer) - index; + responseBuffer = &buffer[index]; + responseLength = sizeof(buffer) - index; } // Set bit adjustments 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); + result = transceive(buffer, bufferUsed, responseBuffer, &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] @@ -425,6 +381,8 @@ 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. @@ -432,7 +390,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. - reponseBuffer[index] |= (1 << checkBit); + buffer[index] |= (1 << checkBit); } else if (result != 0) { @@ -452,11 +410,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 = (reponseBuffer[2] == PICC_CMD_CT) ? 3 : 2; // source index in buffer[] - bytesToCopy = (reponseBuffer[2] == PICC_CMD_CT) ? 3 : 4; + index = (buffer[2] == PICC_CMD_CT) ? 3 : 2; // source index in buffer[] + bytesToCopy = (buffer[2] == PICC_CMD_CT) ? 3 : 4; for (count = 0; count < bytesToCopy; count++) { - uid->uidByte[uidIndex + count] = reponseBuffer[index++]; + uid->uidByte[uidIndex + count] = buffer[index++]; } // Check response SAK (Select Acknowledge) @@ -473,19 +431,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(responseBufferPtr, 1, reinterpret_cast(&reponseBuffer[2])); + result = calculateCrc(responseBuffer, 1, reinterpret_cast(&buffer[2])); if (result != 0) return result; - if ((reponseBuffer[2] != responseBufferPtr[1]) || (reponseBuffer[3] != responseBufferPtr[2])) + if ((buffer[2] != responseBuffer[1]) || (buffer[3] != responseBuffer[2])) return CRC; - if (responseBufferPtr[0] & 0x04) // Cascade bit set - UID not complete yes + if (responseBuffer[0] & 0x04) // Cascade bit set - UID not complete yes { cascadeLevel++; } else { uidComplete = true; - uid->sak = responseBufferPtr[0]; + uid->sak = responseBuffer[0]; } } // End of while ( ! uidComplete) @@ -495,65 +453,9 @@ 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+1]; - } - - 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(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) @@ -567,8 +469,9 @@ void Mfrc522::setRf(bool on) bool Mfrc522::cardPresent() { - uint8_t bufferLen = sizeof(reponseBuffer); - uint8_t ret = wakeupTag(reponseBuffer, &bufferLen); + uint8_t bufferATQA[2]; + uint8_t bufferLen = sizeof(bufferATQA); + uint8_t ret = wakeupTag(bufferATQA, &bufferLen); return ret == 0 || ret == COLLISION; } @@ -577,79 +480,30 @@ 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; } -bool Mfrc522::testFifo(Serial* serial) +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 - serial->write_p(PSTR("Fifo buffer contains: ")); + if(serial) + 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); + read(FIFODataReg, buffer2, len); bool ret = true; for(uint8_t i = 0; i < len; ++i) { - if(buffer[i] != reponseBuffer[i]) + if(buffer[i] != buffer2[i]) ret = false; - serial->write((int)reponseBuffer[i]); + serial->write((int)buffer2[i]); serial->putChar(' '); } 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; - write(ComIrqReg, 0b01111111); -} - -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 1b5b0d0..216b689 100644 --- a/mfrc522.h +++ b/mfrc522.h @@ -3,19 +3,10 @@ #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 @@ -23,8 +14,7 @@ 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 BUSY = 6; // System is busy - static constexpr uint8_t ERR = 7; // General error + static constexpr uint8_t ERR = 6; // General error // Command words static constexpr uint8_t IDLE = 0x00; // NO action; Cancel the current command @@ -142,10 +132,13 @@ 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 - // Modes - static constexpr uint8_t MODE_IDLE = 0; - static constexpr uint8_t MODE_TRANSCEIVE = 1; - static constexpr uint8_t MODE_TIMEOUT = 2; + typedef struct + { + 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; + private: ShiftReg* _csReg; @@ -153,78 +146,44 @@ 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); - static Serial* serial; + + void (*_tagEnterdCb)(Mfrc522*, void*); + void* _userData; + +public: - Mfrc522(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); + inline static Serial* serial = nullptr; + + Mfrc522(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin, + void (*tagEnterdCb)(Mfrc522*, void*) = nullptr, void* userData = nullptr); 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); - - uint8_t getCs(){return _csPin;} - - void reset(); - void irq(); void setRf(bool on); - bool detectAsync(void (*tagEnterdCb)(Mfrc522*, void*) = nullptr, void* userData = nullptr); - - void stopAsync(); - bool cardPresent(); - bool testFifo(Serial* serial); - - bool startTimeout(void (transceiveCb)(uint8_t, Mfrc522*, uint8_t*, uint8_t, void*), void* userData) - { - _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; - } + bool testFifo(); static bool probe(SpiMaster* spi, ShiftReg* csReg, uint8_t csPin); }; diff --git a/mfrcproxy.cpp b/mfrcproxy.cpp deleted file mode 100644 index f1fb502..0000000 --- a/mfrcproxy.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#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 deleted file mode 100644 index 2e66f2d..0000000 --- a/mfrcproxy.h +++ /dev/null @@ -1,36 +0,0 @@ -#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; - - -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 5173abd..fd86b05 100644 --- a/nfcbord.cpp +++ b/nfcbord.cpp @@ -4,461 +4,121 @@ #include #include #include -#include #include #include "writepin.h" -#include "watchdog.h" - -NfcBoard nfcBoard(Serial::getInstance()); extern char buffer[SNPRINTF_BUFFER_SIZE]; -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), +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); 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 = irqReg.read(); - for(uint8_t i = 0; i < NFC_PORTS; ++i) - { - if(*data & (1 << i)) - { - for(uint8_t j = 0; j < readers.count(); ++j) - { - if(irqPins[j] == i) - { - if(readers[j].type == TYPE_MFRC522) - { - readers[j].device.mfrc522.irq(); - watchDogBits[j] = 1; - } - else - { - readers[j].device.proxy.irq(); - } - } - } - } - } - } -} - -void NfcBoard::setEnabled(bool enabled) -{ - 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) -{ - switch(cs) - { - case 0: - return 4; - case 1: - return 2; - case 2: - return 1; - case 3: - return 0; - case 4: - return 7; - case 5: - return 6; - case 6: - return 5; - case 7: - return 3; - default: - return 8; - } } void NfcBoard::probe() { readers.clear(); irqPins.clear(); - watchDogBits.clear(); for(uint8_t i = 0; i < NFC_PORTS; ++i) { if(Mfrc522::probe(&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); + irqPins.push_back(i); } } + for(uint8_t i = 0; i < irqPins.count(); ++i) + { + readers.push_back(Mfrc522(&spim, &csReg, irqPins[i])); + } } -void NfcBoard::printNfcDevices() +void NfcBoard::printNfcDevices(Serial* serial) { serial->write_p(PSTR("NFC DEVICES:\n")); for(uint8_t i = 0; i < readers.count(); ++i) { - 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); + snprintf(buffer, SNPRINTF_BUFFER_SIZE, "NFC NUMBER: %u IRQ: %x\n", i, irqPins[i]); serial->write(buffer, SNPRINTF_BUFFER_SIZE); } } -int NfcBoard::dispatch(char* inBuffer) -{ - Mfrc522* mainReader = nullptr; - for(uint8_t i = 0; i < readers.count(); ++i) +int NfcBoard::dispatch(char* inBuffer, Serial* serial) +{ + else if(strcmp(inBuffer, "detect") == 0 ) { - if(readers[i].type == TYPE_MFRC522) - { - mainReader = &readers[i].device.mfrc522; - } - } - 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 ) - { - serial->write_p(PSTR("Irq pin detection test\n")); + serial->write_p(PSTR("Runing tag detection test\n")); + bool oldPresent = false; while(!serial->dataIsWaiting()) { - uint8_t* data = irqReg.read(); - for(uint8_t i = 0; i < NFC_PORTS; ++i) + bool present = readers[0].cardPresent(); + if(present && !oldPresent) { - if(*data & (1 << i)) - { - serial->write("IRQ: "); - serial->write((int)i); - serial->putChar('\n'); - } - } - } - serial->write_p(PSTR("Finished\n")); - return 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 = mainReader->cardPresent(); - if(present) - { - Uid uid; - uint8_t res = mainReader->selectTag(&uid); - if(res != 0) - continue; + 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]); - if(i < uid.size-1) - serial->putChar(':'); + serial->putChar(':'); } serial->putChar('\n'); + break; + } + else if(!present && oldPresent) + { + serial->write_p(PSTR("Tag lost\n")); + oldPresent = present; } _delay_ms(100); } - setEnabled(enabled); serial->write_p(PSTR("Finished\n")); return 0; } - else if(strcmp(inBuffer, "detect") == 0 ) + else if(strcmp(inBuffer, "tste") == 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 = mainReader->cardPresent(); - if(present) - { - Uid uid; - uint8_t res = mainReader->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'); - } - } - setEnabled(enabled); + serial->write_p(PSTR("Runing fifo test\n")); + Mfrc522::serial = serial; + readers[0].testFifo(); + Mfrc522::serial = nullptr; serial->write_p(PSTR("Finished\n")); return 0; } - else if(strcmp(inBuffer, "enable") == 0 ) + else if(strcmp(inBuffer, "status") == 0 ) { - if(enabled_) - { - serial->write_p(PSTR("Nfc tag listening allready enabled\n")); - return -1; - } - setEnabled(true); - serial->write_p(PSTR("Nfc tag listening enabled\n")); + printNfcDevices(serial); return 0; } - else if(strcmp(inBuffer, "disable") == 0 ) + else if(strcmp(inBuffer, "wake") == 0 ) { - 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, "list") == 0 ) - { - printNfcDevices(); + uint8_t bufferATQA[2]; + 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", + res, bufferATQA[0], bufferATQA[1], len); + serial->write(buffer, SNPRINTF_BUFFER_SIZE); return 0; } else if(strcmp(inBuffer, "probe") == 0 ) { - bool enabled = enabled_; - setEnabled(false); probe(); - printNfcDevices(); - setEnabled(enabled); - return 0; - } - else if(strcmp(inBuffer, "read") == 0 ) - { - 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) - { - serial->write_p(PSTR("A address must be specified\n")); - return -1; - } - token = strtok(NULL, " "); - if(token) - data = strtol(token, nullptr, 16); - if(data < 0 || data > 0xFF) - { - serial->write_p(PSTR("Data must be specified\n")); - return -1; - } - - 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; - } - } - } + printNfcDevices(serial); 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) -{ - NfcBoard* instance = reinterpret_cast(data); - - Uid uid; - if(reader->getUid(&uid) == 0) - { - uint8_t i; - for(i = 0; i < instance->readers.count(); ++i) - { - if(&instance->readers[i].device.mfrc522 == reader) - break; - } - printTag(i+0x80, uid, instance->serial); - reader->startTimeout(&timeoutCb, data); - } - else - { - reader->detectAsync(detectCb, data); - } -} - -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 ed204ea..eb18558 100644 --- a/nfcbord.h +++ b/nfcbord.h @@ -1,5 +1,4 @@ #pragma once -#include "placementnew.h" #include "serial.h" #include "shiftreg.h" #include "inputshiftreg.h" @@ -7,80 +6,21 @@ #include "softspim.h" #include "staticvector.h" #include "defines.h" -#include "mfrcproxy.h" class NfcBoard { -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; - ShiftReg csReg; - bool enabled_ = false; - - static void printTag(const uint8_t id, const Uid& uid, Serial* serial); - public: + ShiftReg csReg; InputShiftReg irqReg; + SpiMaster spim; + SVector readers; 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(Serial* serialIn); + NfcBoard(); void probe(); - void setEnabled(bool enabled); + void printNfcDevices(Serial* serial); - void poll(Serial* serial = nullptr); - - void printNfcDevices(); - - int dispatch(char* inBuffer); - - uint8_t csToIrq(uint8_t cs); + int dispatch(char* inBuffer, Serial* serial); }; - -extern NfcBoard nfcBoard; diff --git a/placementnew.cpp b/placementnew.cpp deleted file mode 100644 index bdadaf8..0000000 --- a/placementnew.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#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 deleted file mode 100644 index 6a5a332..0000000 --- a/placementnew.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include "stdint.h" - -void* operator new(uint16_t, void* const buf); -void* operator new[](uint16_t, void* const buf); diff --git a/serial.h b/serial.h index 4f913c7..80f9522 100644 --- a/serial.h +++ b/serial.h @@ -2,8 +2,7 @@ #define SERIAL_H #define BAUD 38400 -#define SERIAL_RX_BUFFER_SIZE 384 -#define SERIAL_TX_BUFFER_SIZE 128 +#define SERIAL_BUFFER_SIZE 384 #include #include @@ -12,25 +11,15 @@ #include #include -#include "ringbuffer.h" - const bool serialFlowControl = false; class Serial { private: char _terminator = '\n'; - Serial(); public: - - volatile RingBuffer rxBuffer; - volatile RingBuffer txBuffer; - - bool stopped = false; - volatile bool transmitting = false; - - static Serial* getInstance(); + Serial(); void putChar(const char c); void write(const char* in, const unsigned int length); void write(const char in[]); diff --git a/shiftreg.h b/shiftreg.h index 9a38af5..2e31b99 100644 --- a/shiftreg.h +++ b/shiftreg.h @@ -53,8 +53,8 @@ public: for(unsigned char i = 0; i < BITS; ++i) { - in[i/8] & (1<<(i%8)) ? (*_port &= ~(1 << _pinSer)) : (*_port |= (1 << _pinSer)); *_port |= (1 << _pinSerClk); + in[i/8] & (1<<(i%8)) ? (*_port &= ~(1 << _pinSer)) : (*_port |= (1 << _pinSer)); *_port &= ~(1 << _pinSerClk); } *_port &= ~(1<<_pinRClk); diff --git a/signal.cpp b/signal.cpp index a980c37..7387ff6 100644 --- a/signal.cpp +++ b/signal.cpp @@ -40,9 +40,9 @@ uint16_t Signal::getPacket() return data; } -void Signal::sendData(bool single) +void Signal::sendData() { - sendRaw(getPacket(), single); + sendRaw(getPacket()); } uint8_t Signal::getType() diff --git a/signal.h b/signal.h index 628b05a..58bebb9 100644 --- a/signal.h +++ b/signal.h @@ -27,6 +27,6 @@ public: uint8_t getState(); uint8_t getSubaddress(); uint16_t getPacket(); - void sendData(bool single = false); + void sendData(); uint8_t getType(); }; diff --git a/softspim.cpp b/softspim.cpp index 783e9d0..a81fa4a 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 || CLOCK_PHASE == 2) + if constexpr (CLOCK_PHASE == 0) _delay_us(DELAY_TIME_US); writePin(_port, _pinClock, !CLOCK_POLARITY); - if constexpr (CLOCK_PHASE == 1 || CLOCK_PHASE == 2) + if constexpr (CLOCK_PHASE == 1) _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 || CLOCK_PHASE == 2) + if constexpr (CLOCK_PHASE == 0) _delay_us(DELAY_TIME_US); writePin(_port, _pinClock, CLOCK_POLARITY); - if constexpr (CLOCK_PHASE == 1 || CLOCK_PHASE == 2) + if constexpr (CLOCK_PHASE == 1) _delay_us(DELAY_TIME_US); } return recByte; diff --git a/softspim.h b/softspim.h index 5fc732e..a0fbf28 100644 --- a/softspim.h +++ b/softspim.h @@ -6,8 +6,8 @@ class SpiMaster { private: - static constexpr uint8_t CLOCK_POLARITY = 0; - static constexpr uint8_t CLOCK_PHASE = 2; + static constexpr uint8_t CLOCK_POLARITY = 1; + static constexpr uint8_t CLOCK_PHASE = 1; 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 = 0; + static constexpr uint8_t DELAY_TIME_US = 10; public: diff --git a/train.cpp b/train.cpp index 3f910e3..7630a37 100644 --- a/train.cpp +++ b/train.cpp @@ -132,9 +132,9 @@ uint16_t Train::assembleSpeedPacket() return packet; } -void Train::sendData(bool single) +void Train::sendData() { - sendRaw(assembleSpeedPacket(), single); + sendRaw(assembleSpeedPacket()); if(_functionmask) { uint8_t functionToResend = (_function & 0xF0) >> 4; @@ -144,7 +144,7 @@ void Train::sendData(bool single) if(_functionmask & (1 << functionToResend)) { _delay_ms(2); - sendRaw(packetAddSpeed() | packetAddFunction(functionToResend) | packetAddFunction(0), false); + sendRaw(packetAddSpeed() | packetAddFunction(functionToResend) | packetAddFunction(0)); } _function &= ~0xF0; _function |= functionToResend << 4; @@ -174,7 +174,7 @@ uint8_t Train::getFunctionMask() return _functionmask; } -void Train::setFunction(const uint8_t function, bool enable) +void Train::sendFunction(const uint8_t function, bool enable) { if(function > 3) return; diff --git a/train.h b/train.h index 579992d..f5c35e6 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(bool single = false); + void sendData(); void reverse(); void stop(); @@ -34,7 +34,7 @@ public: void setFunctionMask(uint8_t functionmask) {_functionmask = functionmask;} uint8_t getFunctions(); uint8_t getFunctionMask(); - void setFunction(const uint8_t function, bool enable = true); + void sendFunction(const uint8_t function, bool enable = true); uint8_t getQuirks(); void setQuirks(uint8_t quirks); diff --git a/traindispatch.h b/traindispatch.h index 3c25fa3..0c4dea4 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].setFunction(functionId, on ); + trains[id].sendFunction(functionId, on ); serial->write_p(PSTR("Set Train function ")); serial->write(functionId); serial->write(on ? " on\n" : " off\n"); diff --git a/turnout.cpp b/turnout.cpp index d8a87aa..f21d005 100644 --- a/turnout.cpp +++ b/turnout.cpp @@ -33,7 +33,7 @@ uint16_t Turnout::getPacket() return data; } -void Turnout::sendData(bool single) +void Turnout::sendData() { - sendRaw(getPacket(), single); + sendRaw(getPacket()); } diff --git a/turnout.h b/turnout.h index a39d45a..662079f 100644 --- a/turnout.h +++ b/turnout.h @@ -18,5 +18,5 @@ public: uint8_t getDirection(); uint8_t getSubaddress(); uint16_t getPacket(); - void sendData(bool single = false); + void sendData(); }; diff --git a/uid.h b/uid.h deleted file mode 100644 index 21589c3..0000000 --- a/uid.h +++ /dev/null @@ -1,24 +0,0 @@ -#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 deleted file mode 100644 index ac5b0e3..0000000 --- a/watchdog.h +++ /dev/null @@ -1,18 +0,0 @@ -#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" \ - )