github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

add helper fct manchesterEncodeUint32

Browse source
This commit is contained in:
Philippe Teuwen 2019-09-15 02:09:40 +02:00
commit 960d8c4db3
3 changed files with 20 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

64
armsrc/lfops.c
View file

@ -917,8 +917,10 @@ void CmdHIDsimTAGEx(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT, boo
bit 0 = fc8 bit 0 = fc8
*/ */
// special start of frame marker containing invalid Manchester bit sequences
uint8_t bits[8+8*2+84*2] = { 0, 0, 0, 1, 1, 1, 0, 1 }; uint8_t bits[8+8*2+84*2] = { 0, 0, 0, 1, 1, 1, 0, 1 };
uint8_t bitlen = 0; uint8_t bitlen = 0;
uint16_t n = 8;
if (longFMT) { if (longFMT) {
// Ensure no more than 84 bits supplied // Ensure no more than 84 bits supplied
@ -927,71 +929,19 @@ void CmdHIDsimTAGEx(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT, boo
return; return;
} }
bitlen = 8+8*2+84*2; bitlen = 8+8*2+84*2;
// special start of frame marker containing invalid Manchester bit sequences
uint16_t n = 8;
hi2 |= 0x9E00000; // 9E: long format identifier hi2 |= 0x9E00000; // 9E: long format identifier
// manchester encode "9E" and bits 83 to 64 manchesterEncodeUint32(hi2, 16+12, bits, &n);
for (int i = 27; i >= 0; i--) { manchesterEncodeUint32(hi, 32, bits, &n);
if ((hi2 >> i) & 1) { manchesterEncodeUint32(lo, 32, bits, &n);
bits[n++] = 1;
bits[n++] = 0;
} else {
bits[n++] = 0;
bits[n++] = 1;
}
}
// manchester encode bits 63 to 32
for (int i = 31; i >= 0; i--) {
if ((hi >> i) & 1) {
bits[n++] = 1;
bits[n++] = 0;
} else {
bits[n++] = 0;
bits[n++] = 1;
}
}
// manchester encode bits 31 to 0
for (int i = 31; i >= 0; i--) {
if ((lo >> i) & 1) {
bits[n++] = 1;
bits[n++] = 0;
} else {
bits[n++] = 0;
bits[n++] = 1;
}
}
} else { } else {
if (hi > 0xFFF) { if (hi > 0xFFF) {
DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags"); DbpString("[!] tags can only have 44 bits. - USE lf simfsk for larger tags");
return; return;
} }
bitlen = 8+44*2; bitlen = 8+44*2;
// special start of frame marker containing invalid Manchester bit sequences manchesterEncodeUint32(hi, 12, bits, &n);
uint16_t n = 8; manchesterEncodeUint32(lo, 32, bits, &n);
// manchester encode bits 43 to 32
for (int i = 11; i >= 0; i--) {
if ((hi >> i) & 1) {
bits[n++] = 1;
bits[n++] = 0;
} else {
bits[n++] = 0;
bits[n++] = 1;
}
}
// manchester encode bits 31 to 0
for (int i = 31; i >= 0; i--) {
if ((lo >> i) & 1) {
bits[n++] = 1;
bits[n++] = 0;
} else {
bits[n++] = 0;
bits[n++] = 1;
}
}
} }
CmdFSKsimTAGEx(10, 8, 0, 50, bitlen, bits, ledcontrol, numcycles); CmdFSKsimTAGEx(10, 8, 0, 50, bitlen, bits, ledcontrol, numcycles);
} }

12
common/lfdemod.c
View file

@ -419,6 +419,18 @@ uint32_t manchesterEncode2Bytes(uint16_t datain) {
return output; return output;
} }
void manchesterEncodeUint32(uint32_t data_in, uint8_t bitlen_in, uint8_t *bits_out, uint16_t *index) {
for (int i = bitlen_in - 1; i >= 0; i--) {
if ((data_in >> i) & 1) {
bits_out[(*index)++] = 1;
bits_out[(*index)++] = 0;
} else {
bits_out[(*index)++] = 0;
bits_out[(*index)++] = 1;
}
}
}
//by marshmellow //by marshmellow
//encode binary data into binary manchester //encode binary data into binary manchester
//NOTE: bitstream must have triple the size of "size" available in memory to do the swap //NOTE: bitstream must have triple the size of "size" available in memory to do the swap

1
common/lfdemod.h
View file

@ -61,6 +61,7 @@ size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uin
//void getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo); //void getHiLo(uint8_t *bits, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo); void getHiLo(int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
uint32_t manchesterEncode2Bytes(uint16_t datain); uint32_t manchesterEncode2Bytes(uint16_t datain);
void manchesterEncodeUint32(uint32_t data_in, uint8_t bitlen_in, uint8_t *bits_out, uint16_t *index);
int ManchesterEncode(uint8_t *bits, size_t size); int ManchesterEncode(uint8_t *bits, size_t size);
uint16_t manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos); uint16_t manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos);
int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx); int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx);