// Low frequency commands
//-----------------------------------------------------------------------------
+#include "cmdlf.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
-#include "proxmark3.h"
-#include "cmdlf.h"
+#include "comms.h"
#include "lfdemod.h" // for psk2TOpsk1
#include "util.h" // for parsing cli command utils
#include "ui.h" // for show graph controls
#include "graph.h" // for graph data
#include "cmdparser.h" // for getting cli commands included in cmdmain.h
#include "cmdmain.h" // for sending cmds to device
-#include "data.h" // for GetFromBigBuf
#include "cmddata.h" // for `lf search`
#include "cmdlfawid.h" // for awid menu
#include "cmdlfem4x.h" // for em4x menu
#include "cmdlfjablotron.h" //for jablotron menu
#include "cmdlfnoralsy.h"// for noralsy menu
#include "cmdlfsecurakey.h"//for securakey menu
+#include "cmdlfpac.h" // for pac menu
bool g_lf_threshold_set = false;
static int CmdHelp(const char *Cmd);
int usage_lf_cmdread(void)
{
- PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");
+ PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> ");
PrintAndLog("Options: ");
PrintAndLog(" h This help");
- PrintAndLog(" L Low frequency (125 KHz)");
- PrintAndLog(" H High frequency (134 KHz)");
- PrintAndLog(" d <delay> delay OFF period");
- PrintAndLog(" z <zero> time period ZERO");
- PrintAndLog(" o <one> time period ONE");
+ PrintAndLog(" d <delay> delay OFF period between bits (0 for bitbang mode)");
+ PrintAndLog(" z <zero> time period ZERO (antenna off in bitbang mode)");
+ PrintAndLog(" o <one> time period ONE (antenna on in bitbang mode)");
PrintAndLog(" c <cmd> Command bytes");
PrintAndLog(" ************* All periods in microseconds");
+ PrintAndLog(" ************* Use lf config to configure options.");
PrintAndLog("Examples:");
PrintAndLog(" lf cmdread d 80 z 100 o 200 c 11000");
- PrintAndLog(" lf cmdread d 80 z 100 o 100 c 11000 H");
+ PrintAndLog(" lf cmdread d 80 z 100 o 100 c 11000");
return 0;
}
/* send a command before reading */
int CmdLFCommandRead(const char *Cmd)
{
- static char dummy[3] = {0x20,0x00,0x00};
UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};
bool errors = false;
//uint8_t divisor = 95; //125khz
{
case 'h':
return usage_lf_cmdread();
- case 'H':
- //divisor = 88;
- dummy[1]='h';
- cmdp++;
- break;
- case 'L':
- cmdp++;
- break;
case 'c':
- param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
+ param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));
cmdp+=2;
break;
case 'd':
//Validations
if(errors) return usage_lf_cmdread();
- // in case they specified 'H'
- strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);
-
clearCommandBuffer();
SendCommand(&c);
+
+ WaitForResponse(CMD_ACK,NULL);
+ getSamples(0, true);
+
+
return 0;
}
}
bool lf_read(bool silent, uint32_t samples) {
- if (offline) return false;
+ if (IsOffline()) return false;
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent,samples,0}};
clearCommandBuffer();
//And ship it to device
return false;
}
}
- getSamples(resp.arg[0], silent);
+ // resp.arg[0] is bits read not bytes read.
+ getSamples(resp.arg[0]/8, silent);
return true;
}
sscanf(Cmd, "%i", &gap);
- // convert to bitstream if necessary
-
+ // convert to bitstream if necessary
ChkBitstream(Cmd);
//can send only 512 bits at a time (1 byte sent per bit...)
printf("Sending [%d bytes]", GraphTraceLen);
for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
- UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
+ UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
c.d.asBytes[j] = GraphBuffer[i+j];
uint8_t fcHigh=0, fcLow=0, clk=0;
uint8_t invert=0;
bool errors = false;
- char hexData[32] = {0x00}; // store entered hex data
+ char hexData[64] = {0x00}; // store entered hex data
uint8_t data[255] = {0x00};
int dataLen = 0;
uint8_t cmdp = 0;
// cmdp++;
// break;
case 'd':
- dataLen = param_getstr(Cmd, cmdp+1, hexData);
+ dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
if (dataLen==0) {
errors=true;
} else {
uint8_t encoding = 1, separator = 0;
uint8_t clk=0, invert=0;
bool errors = false;
- char hexData[32] = {0x00};
+ char hexData[64] = {0x00};
uint8_t data[255]= {0x00}; // store entered hex data
int dataLen = 0;
uint8_t cmdp = 0;
cmdp++;
break;
case 'd':
- dataLen = param_getstr(Cmd, cmdp+1, hexData);
+ dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
if (dataLen==0) {
errors=true;
} else {
uint8_t carrier=0, clk=0;
uint8_t invert=0;
bool errors = false;
- char hexData[32] = {0x00}; // store entered hex data
+ char hexData[64] = {0x00}; // store entered hex data
uint8_t data[255] = {0x00};
int dataLen = 0;
uint8_t cmdp = 0;
cmdp++;
break;
case 'd':
- dataLen = param_getstr(Cmd, cmdp+1, hexData);
+ dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));
if (dataLen==0) {
errors=true;
} else {
int CheckChipType(char cmdp) {
uint32_t wordData = 0;
+ if (IsOffline() || cmdp == '1') return 0;
+
+ save_restoreGB(GRAPH_SAVE);
+ save_restoreDB(GRAPH_SAVE);
//check for em4x05/em4x69 chips first
- save_restoreGB(1);
- save_restoreDB(1);
- if ((!offline && (cmdp != '1')) && EM4x05Block0Test(&wordData)) {
+ if (EM4x05Block0Test(&wordData)) {
PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");
- save_restoreGB(0);
- save_restoreDB(0);
+ save_restoreGB(GRAPH_RESTORE);
+ save_restoreDB(GRAPH_RESTORE);
return 1;
}
- //TODO check for t55xx chip...
-
- if ((!offline && (cmdp != '1')) && tryDetectP1(true)) {
+ //check for t55xx chip...
+ if (tryDetectP1(true)) {
PrintAndLog("\nValid T55xx Chip Found\nTry lf t55xx ... commands\n");
- save_restoreGB(0);
- save_restoreDB(0);
+ save_restoreGB(GRAPH_RESTORE);
+ save_restoreDB(GRAPH_RESTORE);
return 1;
}
- save_restoreGB(0);
- save_restoreDB(0);
+ save_restoreGB(GRAPH_RESTORE);
+ save_restoreDB(GRAPH_RESTORE);
return 0;
}
return 0;
}
- if (!offline && (cmdp != '1')) {
+ if (!IsOffline() && (cmdp != '1')) {
lf_read(true, 30000);
} else if (GraphTraceLen < minLength) {
PrintAndLog("Data in Graphbuffer was too small.");
// only run if graphbuffer is just noise as it should be for hitag/cotag
if (graphJustNoise(GraphBuffer, testLen)) {
// only run these tests if we are in online mode
- if (!offline && (cmdp != '1')) {
+ if (!IsOffline() && (cmdp != '1')) {
// test for em4x05 in reader talk first mode.
if (EM4x05Block0Test(&wordData)) {
PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nUse lf em 4x05readword/dump commands to read\n");
return 1;
}
- ans=CmdLFHitagReader("26");
+ ans=CmdLFHitagReader("26"); // 26 = RHT2F_UID_ONLY
if (ans==0) {
return 1;
}
return 1;
}
}
+ PrintAndLog("\nNo Data Found! - maybe not an LF tag?\n");
return 0;
}
return CheckChipType(cmdp);
}
+ ans=CmdPacDemod("");
+ if (ans>0) {
+ PrintAndLog("\nValid PAC/Stanley ID Found!");
+ return CheckChipType(cmdp);
+ }
+
PrintAndLog("\nNo Known Tags Found!\n");
if (testRaw=='u' || testRaw=='U') {
- ans=CheckChipType(cmdp);
+ //ans=CheckChipType(cmdp);
//test unknown tag formats (raw mode)0
PrintAndLog("\nChecking for Unknown tags:\n");
ans=AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);
ans=FSKrawDemod("",true);
if (ans>0) {
PrintAndLog("\nUnknown FSK Modulated Tag Found!");
- return CheckChipType(cmdp);;
+ return CheckChipType(cmdp);
}
}
bool st = true;
if (ans>0) {
PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
- return CheckChipType(cmdp);;
+ return CheckChipType(cmdp);
}
ans=CmdPSK1rawDemod("");
if (ans>0) {
PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
PrintAndLog("\nCould also be PSK3 - [currently not supported]");
- PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod'");
- return CheckChipType(cmdp);;
+ PrintAndLog("\nCould also be NRZ - try 'data rawdemod nr'");
+ return CheckChipType(cmdp);
}
ans = CheckChipType(cmdp);
PrintAndLog("\nNo Data Found!\n");
{"jablotron", CmdLFJablotron, 1, "{ Jablotron RFIDs... }"},
{"nexwatch", CmdLFNexWatch, 1, "{ NexWatch RFIDs... }"},
{"noralsy", CmdLFNoralsy, 1, "{ Noralsy RFIDs... }"},
+ {"pac", CmdLFPac, 1, "{ PAC/Stanley RFIDs... }"},
{"paradox", CmdLFParadox, 1, "{ Paradox RFIDs... }"},
{"presco", CmdLFPresco, 1, "{ Presco RFIDs... }"},
{"pcf7931", CmdLFPCF7931, 1, "{ PCF7931 CHIPs... }"},
projects / proxmark3-svn / blobdiff