mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-20 15:26:13 +08:00
not verbose
This commit is contained in:
parent
52aa2c77bc
commit
3e7f687e48
|
@ -333,7 +333,7 @@ static int CmdAWIDDemod(const char *Cmd) {
|
|||
|
||||
// this read is the "normal" read, which download lf signal and tries to demod here.
|
||||
static int CmdAWIDRead(const char *Cmd) {
|
||||
lf_read(true, 12000);
|
||||
lf_read(false, 12000);
|
||||
return CmdAWIDDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -258,7 +258,7 @@ static int CmdFdxDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdFdxRead(const char *Cmd) {
|
||||
lf_read(true, 10000);
|
||||
lf_read(false, 10000);
|
||||
return CmdFdxDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ static int CmdGallagherDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdGallagherRead(const char *Cmd) {
|
||||
lf_read(true, 4096 * 2 + 20);
|
||||
lf_read(false, 4096 * 2 + 20);
|
||||
return CmdGallagherDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ static int CmdGuardDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdGuardRead(const char *Cmd) {
|
||||
lf_read(true, 10000);
|
||||
lf_read(false, 10000);
|
||||
return CmdGuardDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -255,7 +255,7 @@ static int CmdHIDDemod(const char *Cmd) {
|
|||
|
||||
// this read is the "normal" read, which download lf signal and tries to demod here.
|
||||
static int CmdHIDRead(const char *Cmd) {
|
||||
lf_read(true, 12000);
|
||||
lf_read(false, 12000);
|
||||
return CmdHIDDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -115,7 +115,7 @@ static void encodeHeden2L(uint8_t *dest, uint32_t cardnumber) {
|
|||
dest[i/8] = bytebits_to_byte(template + i, 8);
|
||||
}
|
||||
|
||||
PrintAndLogEx(INFO, "Heden2L Cardnumber %u ; RawID %s", cardnumber, sprint_hex(dest, 8));
|
||||
PrintAndLogEx(INFO, "Heden-2L card number %u", cardnumber);
|
||||
}
|
||||
|
||||
static void decodeHeden2L(uint8_t *bits) {
|
||||
|
@ -483,7 +483,7 @@ static int CmdIndalaDemodAlt(const char *Cmd) {
|
|||
|
||||
// this read is the "normal" read, which download lf signal and tries to demod here.
|
||||
static int CmdIndalaRead(const char *Cmd) {
|
||||
lf_read(true, 30000);
|
||||
lf_read(false, 30000);
|
||||
return CmdIndalaDemod(Cmd);
|
||||
}
|
||||
|
||||
|
@ -601,8 +601,10 @@ static int CmdIndalaClone(const char *Cmd) {
|
|||
max = 8;
|
||||
} else {
|
||||
// 64 BIT UID
|
||||
if (got_cn)
|
||||
if (got_cn) {
|
||||
encodeHeden2L(data, cardnumber);
|
||||
datalen = 8;
|
||||
}
|
||||
|
||||
// config for Indala 64 format (RF/32;PSK1 with RF/2;Maxblock=2)
|
||||
PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with RawID %s", sprint_hex(data, datalen));
|
||||
|
|
|
@ -184,7 +184,7 @@ static int CmdIOProxDemod(const char *Cmd) {
|
|||
|
||||
// this read is the "normal" read, which download lf signal and tries to demod here.
|
||||
static int CmdIOProxRead(const char *Cmd) {
|
||||
lf_read(true, 12000);
|
||||
lf_read(false, 12000);
|
||||
return CmdIOProxDemod(Cmd);
|
||||
}
|
||||
static int CmdIOProxSim(const char *Cmd) {
|
||||
|
|
|
@ -115,7 +115,7 @@ static int CmdKeriDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdKeriRead(const char *Cmd) {
|
||||
lf_read(true, 10000);
|
||||
lf_read(false, 10000);
|
||||
return CmdKeriDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -124,8 +124,8 @@ static int CmdMotorolaRead(const char *Cmd) {
|
|||
// Motorola Flexpass seem to work at 74 kHz
|
||||
// and take about 4400 samples to befor modulating
|
||||
sample_config sc = {
|
||||
.decimation = 0,
|
||||
.bits_per_sample = 0,
|
||||
.decimation = -1,
|
||||
.bits_per_sample = -1,
|
||||
.averaging = false,
|
||||
.divisor = LF_FREQ2DIV(74),
|
||||
.trigger_threshold = -1,
|
||||
|
@ -135,7 +135,7 @@ static int CmdMotorolaRead(const char *Cmd) {
|
|||
lf_config(&sc);
|
||||
|
||||
// 64 * 32 * 2 * n-ish
|
||||
lf_read(true, 5000);
|
||||
lf_read(false, 5000);
|
||||
|
||||
// reset back to 125 kHz
|
||||
sc.divisor = LF_DIVISOR_125;
|
||||
|
|
|
@ -299,7 +299,7 @@ lf t55xx wr b 4 d 4c0003ff
|
|||
*/
|
||||
|
||||
static int CmdLFNedapRead(const char *Cmd) {
|
||||
lf_read(true, 16000);
|
||||
lf_read(false, 16000);
|
||||
return CmdLFNedapDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -133,7 +133,7 @@ static int CmdNoralsyDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdNoralsyRead(const char *Cmd) {
|
||||
lf_read(true, 8000);
|
||||
lf_read(false, 8000);
|
||||
return CmdNoralsyDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -181,7 +181,7 @@ static int CmdPacDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdPacRead(const char *Cmd) {
|
||||
lf_read(true, 4096 * 2 + 20);
|
||||
lf_read(false, 4096 * 2 + 20);
|
||||
return CmdPacDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ static int CmdParadoxDemod(const char *Cmd) {
|
|||
//by marshmellow
|
||||
//see ASKDemod for what args are accepted
|
||||
static int CmdParadoxRead(const char *Cmd) {
|
||||
lf_read(true, 10000);
|
||||
lf_read(false, 10000);
|
||||
return CmdParadoxDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ static int CmdPrescoDemod(const char *Cmd) {
|
|||
//see ASKDemod for what args are accepted
|
||||
static int CmdPrescoRead(const char *Cmd) {
|
||||
// Presco Number: 123456789 --> Sitecode 30 | usercode 8665
|
||||
lf_read(true, 12000);
|
||||
lf_read(false, 12000);
|
||||
return CmdPrescoDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -209,7 +209,7 @@ static int CmdPyramidDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdPyramidRead(const char *Cmd) {
|
||||
lf_read(true, 15000);
|
||||
lf_read(false, 15000);
|
||||
return CmdPyramidDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ static int CmdSecurakeyDemod(const char *Cmd) {
|
|||
}
|
||||
|
||||
static int CmdSecurakeyRead(const char *Cmd) {
|
||||
lf_read(true, 8000);
|
||||
lf_read(false, 8000);
|
||||
return CmdSecurakeyDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ static int CmdVikingDemod(const char *Cmd) {
|
|||
//by marshmellow
|
||||
//see ASKDemod for what args are accepted
|
||||
static int CmdVikingRead(const char *Cmd) {
|
||||
lf_read(true, 10000);
|
||||
lf_read(false, 10000);
|
||||
return CmdVikingDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ static int CmdVisa2kDemod(const char *Cmd) {
|
|||
|
||||
// 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
|
||||
static int CmdVisa2kRead(const char *Cmd) {
|
||||
lf_read(true, 20000);
|
||||
lf_read(false, 20000);
|
||||
return CmdVisa2kDemod(Cmd);
|
||||
}
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ static int CmdAuto(const char *Cmd) {
|
|||
PrintAndLogEx(INFO, "Trying 'lf read' and save a trace for you...");
|
||||
|
||||
CmdPlot("");
|
||||
lf_read(true, 40000);
|
||||
lf_read(false, 40000);
|
||||
char *fname = calloc(100, sizeof(uint8_t));
|
||||
AppendDate(fname, 100, "f lf_unknown_%Y-%m-%d_%H:%M");
|
||||
CmdSave(fname);
|
||||
|
|
Loading…
Reference in a new issue