github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-07 05:31:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add inversion option to mandemod and fix indentation

Browse source
This commit is contained in:
adam@algroup.co.uk 2009-07-03 18:55:37 +00:00
parent cef010bc72
commit ac174b297a
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
winsrc/command.cpp
View file

@ -2065,7 +2065,7 @@ static void Cmdmanchestermod(char *str)
* Typical values can be 64, 32, 128...
*/
static void Cmdmanchesterdemod(char *str) {
int i, j;
int i, j, invert= 0;
int bit;
int clock;
int lastval;
@ -2077,6 +2077,16 @@ static void Cmdmanchesterdemod(char *str) {
int bit2idx = 0;
int warnings = 0;
/* check if we're inverting output */
if(*str == 'i')
{
PrintToScrollback("Inverting output");
invert= 1;
do
++str;
while(*str == ' '); // in case a 2nd argument was given
}
/* Holds the decoded bitstream: each clock period contains 2 bits */
/* later simplified to 1 bit after manchester decoding. */
/* Add 10 bits to allow for noisy / uncertain traces without aborting */
@ -2147,7 +2157,7 @@ static void Cmdmanchesterdemod(char *str) {
if (!hithigh || !hitlow)
bit ^= 1;
BitStream[bit2idx++] = bit;
BitStream[bit2idx++] = bit ^ invert;
}
}
@ -2155,7 +2165,7 @@ static void Cmdmanchesterdemod(char *str) {
else
{
/* Then detect duration between 2 successive transitions */
/* Then detect duration between 2 successive transitions */
for (bitidx = 1; i < GraphTraceLen; i++)
{
if (GraphBuffer[i-1] != GraphBuffer[i])
@ -2190,18 +2200,18 @@ static void Cmdmanchesterdemod(char *str) {
PrintToScrollback("Error: too many detection errors, aborting.");
return;
}
}
}
}
}
// At this stage, we now have a bitstream of "01" ("1") or "10" ("0"), parse it into final decoded bitstream
// Actually, we overwrite BitStream with the new decoded bitstream, we just need to be careful
// to stop output at the final bitidx2 value, not bitidx
for (i = 0; i < bitidx; i += 2) {
if ((BitStream[i] == 0) && (BitStream[i+1] == 1)) {
BitStream[bit2idx++] = 1;
// At this stage, we now have a bitstream of "01" ("1") or "10" ("0"), parse it into final decoded bitstream
// Actually, we overwrite BitStream with the new decoded bitstream, we just need to be careful
// to stop output at the final bitidx2 value, not bitidx
for (i = 0; i < bitidx; i += 2) {
if ((BitStream[i] == 0) && (BitStream[i+1] == 1)) {
BitStream[bit2idx++] = 1 ^ invert;
} else if ((BitStream[i] == 1) && (BitStream[i+1] == 0)) {
BitStream[bit2idx++] = 0;
BitStream[bit2idx++] = 0 ^ invert;
} else {
// We cannot end up in this state, this means we are unsynchronized,
// move up 1 bit:
@ -2215,9 +2225,9 @@ static void Cmdmanchesterdemod(char *str) {
PrintToScrollback("Error: too many decode errors, aborting.");
return;
}
}
}
}
}
PrintToScrollback("Manchester decoded bitstream");
// Now output the bitstream to the scrollback by line of 16 bits
@ -2444,7 +2454,7 @@ static struct {
"losamples", CmdLosamples,0, "[128 - 16000] -- Get raw samples for LF tag",
"losim", CmdLosim,0, " Simulate LF tag",
"ltrim", CmdLtrim,1, "<samples> -- Trim samples from left of trace",
"mandemod", Cmdmanchesterdemod,1, "[clock rate] -- Try a Manchester demodulation on a binary stream",
"mandemod", Cmdmanchesterdemod,1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)",
"manmod", Cmdmanchestermod,1, "[clock rate] -- Manchester modulate a binary stream",
"norm", CmdNorm,1, " Normalize max/min to +/-500",
"plot", CmdPlot,1, " Show graph window",