This commit is contained in:
Philippe Teuwen 2021-04-18 18:31:51 +02:00
commit ed78bca62b
6 changed files with 113 additions and 113 deletions

View file

@ -465,10 +465,10 @@ int ASKDemod_ext(int clk, int invert, int maxErr, size_t maxlen, bool amplify, b
if (askType) {
PrintAndLogEx(SUCCESS, _YELLOW_("ASK/Manchester") " - clock %d - decoded bitstream", clk);
PrintAndLogEx(INFO,"---------------------------------------------");
PrintAndLogEx(INFO, "---------------------------------------------");
} else {
PrintAndLogEx(SUCCESS, _YELLOW_("ASK/Raw") " - clock %d - decoded bitstream", clk);
PrintAndLogEx(INFO,"--------------------------------------");
PrintAndLogEx(INFO, "--------------------------------------");
}
printDemodBuff(0, false, false, false);
@ -504,7 +504,7 @@ static int Cmdaskmandemod(const char *Cmd) {
arg_param_begin,
arg_lit0("a", "amp", "try attempt demod with ask amplification (def no amp)"),
arg_int0("c", "clk", "<dec>", "set clock manually (def autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_lit0("s", "st", "check for sequence terminator"),
arg_int0(NULL, "max", "<dec>", "maximum allowed errors (def 100)"),
arg_int0(NULL, "samples", "<dec>", "maximum samples to read (def 32768) [512 bits at RF/64]"),
@ -719,7 +719,7 @@ static int Cmdaskbiphdemod(const char *Cmd) {
void *argtable[] = {
arg_param_begin,
arg_int0("c", "clk", "<dec>", "set clock manually (def autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_int0("o", "offset", "<dec>", "offset to begin biphase (def 0)"),
arg_int0(NULL, "max", "<dec>", "maximum allowed errors (def 50)"),
arg_param_end
@ -750,7 +750,7 @@ static int Cmdaskrawdemod(const char *Cmd) {
arg_param_begin,
arg_lit0("a", "amp", "try attempt demod with ask amplification (def no amp)"),
arg_int0("c", "clk", "<dec>", "set clock manually (def autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_lit0("s", "st", "check for sequence terminator"),
arg_int0(NULL, "max", "<dec>", "maximum allowed errors (def 100)"),
arg_int0(NULL, "samples", "<dec>", "maximum samples to read (def 32768) [512 bits at RF/64]"),
@ -1218,7 +1218,7 @@ int FSKrawDemod(uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, bo
);
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, _YELLOW_("%s") " decoded bitstream", GetFSKType(fchigh, fclow, invert));
PrintAndLogEx(INFO,"-----------------------");
PrintAndLogEx(INFO, "-----------------------");
printDemodBuff(0, false, invert, false);
}
goto out;
@ -1249,7 +1249,7 @@ static int CmdFSKrawdemod(const char *Cmd) {
void *argtable[] = {
arg_param_begin,
arg_int0("c", "clk", "<dec>", "set clock manually (def: autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_int0(NULL, "hi", "<dec>", "larger field clock length (def: autodetect)"),
arg_int0(NULL, "lo", "<dec>", "small field clock length (def: autodetect)"),
arg_param_end
@ -1379,7 +1379,7 @@ static int CmdNRZrawDemod(const char *Cmd) {
void *argtable[] = {
arg_param_begin,
arg_int0("c", "clk", "<dec>", "set clock manually (def autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_int0(NULL, "max", "<dec>", "maximum allowed errors (def 100)"),
arg_param_end
};
@ -1409,7 +1409,7 @@ int CmdPSK1rawDemod(const char *Cmd) {
void *argtable[] = {
arg_param_begin,
arg_int0("c", "clk", "<dec>", "set clock manually (def autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_int0(NULL, "max", "<dec>", "maximum allowed errors (def 100)"),
arg_param_end
};
@ -1447,7 +1447,7 @@ static int CmdPSK2rawDemod(const char *Cmd) {
void *argtable[] = {
arg_param_begin,
arg_int0("c", "clk", "<dec>", "set clock manually (def autodetect)"),
arg_lit0("i","inv", "invert output"),
arg_lit0("i", "inv", "invert output"),
arg_int0(NULL, "max", "<dec>", "maximum allowed errors (def 100)"),
arg_param_end
};
@ -1515,11 +1515,11 @@ static int CmdRawDemod(const char *Cmd) {
CLIParserFree(ctx);
int foo = (ab + am + ar + fs + nr + p1 + p2);
if ( foo > 1 ) {
if (foo > 1) {
PrintAndLogEx(WARNING, "please, select only one modulation");
return PM3_EINVARG;
}
if ( foo == 0 ) {
if (foo == 0) {
PrintAndLogEx(WARNING, "please, select a modulation");
return PM3_EINVARG;
}

View file

@ -265,7 +265,7 @@ static int generate_config_card(const iclass_config_card_item_t *o, uint8_t *ke
HFiClassCalcDivKey(iclass_last_known_card.csn, iClass_Key_Table[0], iclass_last_known_card.key_d, false);
memset(data, 0x00, tot_bytes);
memcpy(data, (uint8_t*)&iclass_last_known_card, sizeof(picopass_hdr_t));
memcpy(data, (uint8_t *)&iclass_last_known_card, sizeof(picopass_hdr_t));
// Keyrolling configuration cards are special.
if (strstr(o->desc, "Keyroll") != NULL) {