mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up Wiegand

This commit is contained in:
Theo Arends 2021-01-17 17:50:58 +01:00
parent 840f4c3bc2
commit d402060e56
1 changed files with 135 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tasmota/xsns_82_wiegand.ino
View File

@ -30,10 +30,10 @@
#define XSNS_82 82
#define WIEGAND_BIT_TIMEOUT 25 //time to be wait after last bit detected.
// use only a randomly generate RFID for testing. using #define will save some space in the final code
// Use only a randomly generate RFID for testing. using #define will save some space in the final code
// DEV_WIEGAND_TEST_MODE 1 : testing with random rfid without hardware connected, but GPIOs set correctly
// DEV_WIEGAND_TEST_MODE 2 : testing with hardware corretly connected.
//
#define DEV_WIEGAND_TEST_MODE 0
#ifdef DEV_WIEGAND_TEST_MODE
@ -101,7 +101,7 @@ Wiegand::Wiegand() {
#if (DEV_WIEGAND_TEST_MODE)==1
uint64_t Wiegand::GetRandomRfid(uint8_t tag_size=34) {
//todo add support for 4 and 8 bit keyboard "tags"
// Todo add support for 4 and 8 bit keyboard "tags"
uint64_t result = (uint32_t)HwRandom();
uint8_t parities = 0;
bitCount = tag_size;
@ -127,7 +127,7 @@ uint64_t Wiegand::GetRandomRfid(uint8_t tag_size=34) {
}
parities = CalculateParities(result, tag_size);
result = (result << 1) | (parities & 0x01); //set LSB parity
result = (result << 1) | (parities & 0x01); // Set LSB parity
if (parities & 0x80) { // MSB parity is 1
switch (tag_size) {
case 24:
@ -151,21 +151,21 @@ uint64_t Wiegand::GetRandomRfid(uint8_t tag_size=34) {
}
#endif
void ICACHE_RAM_ATTR Wiegand::handleD1Interrupt() { // receive a 1 bit. (D0=high & D1=low)
rfidBuffer = (rfidBuffer << 1) | 1; // leftshift + 1 bit
bitCount++; //increment the counter
lastFoundTime = millis(); // last time bit found
void ICACHE_RAM_ATTR Wiegand::handleD1Interrupt() { // Receive a 1 bit. (D0=high & D1=low)
rfidBuffer = (rfidBuffer << 1) | 1; // Leftshift + 1 bit
bitCount++; // Increment the counter
lastFoundTime = millis(); // Last time bit found
}
void ICACHE_RAM_ATTR Wiegand::handleD0Interrupt() { // receive a 0 bit. (D0=low & D1=high)
rfidBuffer = rfidBuffer << 1; // leftshift the 0 bit is now at the end of rfidBuffer
bitCount++; //increment the counter
lastFoundTime = millis(); //last time bit found
void ICACHE_RAM_ATTR Wiegand::handleD0Interrupt() { // Receive a 0 bit. (D0=low & D1=high)
rfidBuffer = rfidBuffer << 1; // Leftshift the 0 bit is now at the end of rfidBuffer
bitCount++; // Increment the counter
lastFoundTime = millis(); // Last time bit found
}
void Wiegand::Init() {
isInit = false;
if (PinUsed(GPIO_WIEGAND_D0) && PinUsed(GPIO_WIEGAND_D1)) { //only start, if the Wiegang pins are
if (PinUsed(GPIO_WIEGAND_D0) && PinUsed(GPIO_WIEGAND_D1)) { // Only start, if the Wiegang pins are
#if (DEV_WIEGAND_TEST_MODE)>0
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: Init()"));
#endif
@ -173,9 +173,9 @@ void Wiegand::Init() {
pinMode(Pin(GPIO_WIEGAND_D1), INPUT_PULLUP);
attachInterrupt(Pin(GPIO_WIEGAND_D0), handleD0Interrupt, FALLING);
attachInterrupt(Pin(GPIO_WIEGAND_D1), handleD1Interrupt, FALLING);
isInit = true; // helps to run only if correctly setup
isInit = true; // Helps to run only if correctly setup
#if (DEV_WIEGAND_TEST_MODE)>0
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: Testmode")); // for tests without reader attaiched
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: Testmode")); // For tests without reader attaiched
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: D0:%u"),Pin(GPIO_WIEGAND_D0));
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: D1:%u"),Pin(GPIO_WIEGAND_D1));
#else
@ -191,7 +191,7 @@ void Wiegand::Init() {
uint64_t Wiegand::CheckAndConvertRfid(uint64_t rfidIn, uint16_t bitcount) {
uint8_t evenParityBit = 0;
uint8_t oddParityBit = (uint8_t) (rfidIn & 0x1); // last bit = odd parity
uint8_t oddParityBit = (uint8_t) (rfidIn & 0x1); // Last bit = odd parity
uint8_t calcParity = 0;
switch (bitcount) {
case 24:
@ -217,7 +217,7 @@ uint64_t Wiegand::CheckAndConvertRfid(uint64_t rfidIn, uint16_t bitcount) {
default:
break;
}
calcParity = CalculateParities(rfidIn, bitCount); //ckeck result on http://www.ccdesignworks.com/wiegand_calc.htm with raw tag as input
calcParity = CalculateParities(rfidIn, bitCount); // check result on http://www.ccdesignworks.com/wiegand_calc.htm with raw tag as input
if (calcParity != (evenParityBit | oddParityBit)) { // Paritybit is wrong
rfidIn=0;
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: %llu parity error"), rfidIn);
@ -233,21 +233,21 @@ uint64_t Wiegand::CheckAndConvertRfid(uint64_t rfidIn, uint16_t bitcount) {
uint8_t Wiegand::CalculateParities(uint64_t tagWithoutParities, int tag_size=26) {
// tag_size is the size of the final tag including the 2 parity bits
//so length if the tagWithoutParities should be (tag_size-2) !! That will be not profed and
// So length if the tagWithoutParities should be (tag_size-2) !! That will be not profed and
// lead to wrong results if the input value is larger!
//calculated start parity (even) will be returned as bit 8
// Calculated start parity (even) will be returned as bit 8
// calculated end parity (odd) will be returned as bit 1
uint8_t retValue=0;
tag_size -= 2;
if (tag_size<=0) { return retValue; } //prohibit div zero exception and other wrong inputs
uint8_t parity=1; //check for odd parity on LSB
if (tag_size <= 0) { return retValue; } // Prohibit div zero exception and other wrong inputs
uint8_t parity = 1; // Check for odd parity on LSB
for (uint8_t i = 0; i < (tag_size / 2); i++) {
parity ^= (tagWithoutParities & 1);
tagWithoutParities >>= 1;
}
retValue |= parity;
parity=0; //check for even parity on MSB
parity = 0; // Check for even parity on MSB
while (tagWithoutParities) {
parity ^= (tagWithoutParities & 1);
tagWithoutParities >>= 1;
@ -274,15 +274,15 @@ bool Wiegand::WiegandConversion ()
{
bool bRet = false;
unsigned long nowTick = millis();
//add a maximum wait time for new bits
// Add a maximum wait time for new bits
unsigned long diffTicks = nowTick - lastFoundTime;
if ((diffTicks > WIEGAND_BIT_TIMEOUT) && (diffTicks >= 5000 )) { //max. 5 secs between 2 bits comming in
if ((diffTicks > WIEGAND_BIT_TIMEOUT) && (diffTicks >= 5000 )) { // Max. 5 secs between 2 bits comming in
bitCount = 0;
rfidBuffer = 0;
lastFoundTime = nowTick;
return bRet;
}
if (diffTicks > WIEGAND_BIT_TIMEOUT) { //last bit found is WIEGAND_BIT_TIMEOUT ms ago
if (diffTicks > WIEGAND_BIT_TIMEOUT) { // Last bit found is WIEGAND_BIT_TIMEOUT ms ago
#if (DEV_WIEGAND_TEST_MODE)>0
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: raw tag: %llu "), rfidBuffer);
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: bit count: %u "), bitCount);
@ -310,12 +310,10 @@ bool Wiegand::WiegandConversion ()
// eg if key 1 pressed, data=E1 in binary 11100001 , high nibble=1110 , low nibble = 0001
char highNibble = (rfidBuffer & 0xf0) >>4;
char lowNibble = (rfidBuffer & 0x0f);
if (lowNibble == (~highNibble & 0x0f)) // check if low nibble matches the "NOT" of high nibble.
{
if (lowNibble == (~highNibble & 0x0f)) { // Check if low nibble matches the "NOT" of high nibble.
rfid = (int)translateEnterEscapeKeyPress(lowNibble);
bRet = true;
}
else {
} else {
lastFoundTime = nowTick;
bRet = false;
}
@ -323,16 +321,14 @@ bool Wiegand::WiegandConversion ()
bitCount = 0;
rfidBuffer = 0;
}
}
else {
// time reached but unknown bitCount, clear and start again
} else {
// Time reached but unknown bitCount, clear and start again
lastFoundTime = nowTick;
bitCount = 0;
rfidBuffer = 0;
bRet = false;
}
}
else{
} else {
bRet = false; // watching time not finished
}
#if (DEV_WIEGAND_TEST_MODE)>0
@ -343,7 +339,6 @@ bool Wiegand::WiegandConversion ()
}
void Wiegand::ScanForTag() {
if (!isInit) { return;}
#if (DEV_WIEGAND_TEST_MODE)>0
AddLog_P(LOG_LEVEL_INFO, PSTR("WIE: ScanForTag()."));
@ -410,21 +405,19 @@ bool Xsns82(byte function) {
scanDelay = 1;
break;
case FUNC_EVERY_250_MSECOND: // some tags need more time, don't try shorter period
case FUNC_EVERY_250_MSECOND: // Some tags need more time, don't try shorter period
#if (DEV_WIEGAND_TEST_MODE)==1
if (scanDelay>=4) // give a second because of the log entries to be send.
if (scanDelay >= 4) // Give a second because of the log entries to be send.
#else
if (scanDelay>=2) // only run every (delay * 250 ms) (every 250ms is too fast for some tags)
if (scanDelay >= 2) // Only run every (delay * 250 ms) (every 250ms is too fast for some tags)
#endif
{
oWiegand->ScanForTag();
scanDelay = 1;
}
else {
} else {
scanDelay++;
}
break;
#ifdef USE_WEBSERVER
case FUNC_WEB_SENSOR:
oWiegand->Show();
@ -433,4 +426,5 @@ bool Xsns82(byte function) {
}
return result;
}
#endif // USE_WIEGAND