projects
/
proxmark3-svn
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c6ccc2
)
fix dump output
author
marshmellow42
<marshmellowrf@gmail.com>
Mon, 20 Feb 2017 02:31:46 +0000
(21:31 -0500)
committer
marshmellow42
<marshmellowrf@gmail.com>
Mon, 20 Feb 2017 02:31:46 +0000
(21:31 -0500)
client/cmdlfem4x.c
patch
|
blob
|
blame
|
history
diff --git
a/client/cmdlfem4x.c
b/client/cmdlfem4x.c
index 397b21e7280a398f6acaa27bddeed5f977e6e1f5..8e535b9a7a4f5d87d9f96f13c729a43e02382c36 100644
(file)
--- a/
client/cmdlfem4x.c
+++ b/
client/cmdlfem4x.c
@@
-567,7
+567,7
@@
int demodEM4x05resp(uint32_t *word, bool readCmd) {
int ans = 0;
// test for FSK wave (easiest to 99% ID)
int ans = 0;
// test for FSK wave (easiest to 99% ID)
- if (GetFskClock("",
FALSE, FALSE
)) {
+ if (GetFskClock("",
false, false
)) {
//valid fsk clocks found
ans = FSKrawDemod("0 0", false);
if (!ans) {
//valid fsk clocks found
ans = FSKrawDemod("0 0", false);
if (!ans) {
@@
-579,10
+579,10
@@
int demodEM4x05resp(uint32_t *word, bool readCmd) {
}
}
// PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
}
}
// PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
- ans = GetPskClock("",
FALSE, FALSE
);
+ ans = GetPskClock("",
false, false
);
if (ans>0) {
//try psk1
if (ans>0) {
//try psk1
- ans = PSKDemod("0 0 6",
FALSE
);
+ ans = PSKDemod("0 0 6",
false
);
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK1 Demod failed, ans: %d", ans);
} else {
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK1 Demod failed, ans: %d", ans);
} else {
@@
-596,7
+596,7
@@
int demodEM4x05resp(uint32_t *word, bool readCmd) {
}
}
//try psk1 inverted
}
}
//try psk1 inverted
- ans = PSKDemod("0 1 6",
FALSE
);
+ ans = PSKDemod("0 1 6",
false
);
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK1 Demod failed, ans: %d", ans);
} else {
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK1 Demod failed, ans: %d", ans);
} else {
@@
-626,7
+626,7
@@
int demodEM4x05resp(uint32_t *word, bool readCmd) {
}
//try biphase
}
//try biphase
- ans = ASKbiphaseDemod("0 0 1",
FALSE
);
+ ans = ASKbiphaseDemod("0 0 1",
false
);
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
} else {
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
} else {
@@
-636,7
+636,7
@@
int demodEM4x05resp(uint32_t *word, bool readCmd) {
}
//try diphase (differential biphase or inverted)
}
//try diphase (differential biphase or inverted)
- ans = ASKbiphaseDemod("0 1 1",
FALSE
);
+ ans = ASKbiphaseDemod("0 1 1",
false
);
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
} else {
if (!ans) {
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
} else {
@@
-731,9
+731,9
@@
int CmdEM4x05dump(const char *Cmd) {
for (; addr < 16; addr++) {
if (addr == 2) {
if (usePwd) {
for (; addr < 16; addr++) {
if (addr == 2) {
if (usePwd) {
- PrintAndLog("PWD Address %02u | %08X",addr,pwd);
+ PrintAndLog("
PWD Address %02u | %08X",addr,pwd);
} else {
} else {
- PrintAndLog("PWD Address 02 | cannot read");
+ PrintAndLog("
PWD Address 02 | cannot read");
}
} else {
success &= EM4x05ReadWord(addr, pwd, usePwd);
}
} else {
success &= EM4x05ReadWord(addr, pwd, usePwd);
Impressum
,
Datenschutz