#include "cmdparser.h"
#include "cmddata.h"
#include "cmdlf.h"
+#include "cmdmain.h"
#include "cmdlfem4x.h"
#include "lfdemod.h"
+
char *global_em410xId;
static int CmdHelp(const char *Cmd);
int CmdEMdemodASK(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- int findone = (cmdp == '1') ? 1 : 0;
+ int findone = (cmdp == '1') ? 1 : 0;
UsbCommand c={CMD_EM410X_DEMOD};
c.arg[0]=findone;
SendCommand(&c);
uint32_t hi=0;
uint64_t lo=0;
- if(!AskEm410xDemod("", &hi, &lo)) return 0;
+ if(!AskEm410xDemod("", &hi, &lo, false)) return 0;
PrintAndLog("EM410x pattern found: ");
printEM410x(hi, lo);
if (hi){
return 0;
}
char id[12] = {0x00};
- sprintf(id, "%010llx",lo);
+ sprintf(id, "%010"PRIx64,lo);
global_em410xId = id;
return 1;
uint8_t uid[5] = {0x00};
if (cmdp == 'h' || cmdp == 'H') {
- PrintAndLog("Usage: lf em4x 410xsim <UID>");
+ PrintAndLog("Usage: lf em4x em410xsim <UID> <clock>");
PrintAndLog("");
- PrintAndLog(" sample: lf em4x 410xsim 0F0368568B");
+ PrintAndLog(" sample: lf em4x em410xsim 0F0368568B");
return 0;
}
+ /* clock is 64 in EM410x tags */
+ uint8_t clock = 64;
if (param_gethex(Cmd, 0, uid, 10)) {
PrintAndLog("UID must include 10 HEX symbols");
return 0;
}
-
- PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
+ param_getdec(Cmd,1, &clock);
+
+ PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
PrintAndLog("Press pm3-button to about simulation");
- /* clock is 64 in EM410x tags */
- int clock = 64;
/* clear our graph */
ClearGraph(0);
}
// Check Clock
- if (card == 1)
- {
- // Default: 64
- if (clock == 0)
- clock = 64;
-
- // Allowed clock rates: 16, 32 and 64
- if ((clock != 16) && (clock != 32) && (clock != 64)) {
- PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32 and 64.\n", clock);
- return 0;
- }
- }
- else if (clock != 0)
- {
- PrintAndLog("Error! Clock rate is only supported on T55x7 tags.\n");
+ // Default: 64
+ if (clock == 0)
+ clock = 64;
+
+ // Allowed clock rates: 16, 32, 40 and 64
+ if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
+ PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);
return 0;
}
// provide for backwards-compatibility for older firmware, and to avoid
// having to add another argument to CMD_EM410X_WRITE_TAG, we just store
// the clock rate in bits 8-15 of the card value
- card = (card & 0xFF) | (((uint64_t)clock << 8) & 0xFF00);
- }
- else if (card == 0)
+ card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+ } else if (card == 0) {
PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
- else {
+ card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+ } else {
PrintAndLog("Error! Bad card type selected.\n");
return 0;
}
{
if (rows*cols>size) return false;
uint8_t colP=0;
- //assume last row is a parity row and do not test
+ //assume last col is a parity and do not test
for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
colP ^= BitStream[(rowNum*cols)+colNum];
code = code<<8 | bytebits_to_byte(BitStream+27,8);
if (verbose || g_debugMode){
for (uint8_t i = 0; i<5; i++){
- if (i == 4) PrintAndLog("");
+ if (i == 4) PrintAndLog(""); //parity byte spacer
PrintAndLog("%d%d%d%d%d%d%d%d %d -> 0x%02x",
BitStream[i*9],
BitStream[i*9+1],
else
PrintAndLog("Parity Failed");
}
- //PrintAndLog("Code: %08x",code);
return code;
}
-/* Read the transmitted data of an EM4x50 tag
+/* Read the transmitted data of an EM4x50 tag from the graphbuffer
* Format:
*
* XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
* is stored in the blocks defined in the control word First and Last
* Word Read values. UID is stored in block 32.
*/
+ //completed by Marshmellow
int EM4x50Read(const char *Cmd, bool verbose)
{
- uint8_t fndClk[]={0,8,16,32,40,50,64};
+ uint8_t fndClk[] = {8,16,32,40,50,64,128};
int clk = 0;
int invert = 0;
- sscanf(Cmd, "%i %i", &clk, &invert);
int tol = 0;
int i, j, startblock, skip, block, start, end, low, high, minClk;
- bool complete= false;
+ bool complete = false;
int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
- save_restoreGB(1);
uint32_t Code[6];
char tmp[6];
-
char tmp2[20];
- high= low= 0;
+ int phaseoff;
+ high = low = 0;
memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64);
-
+
+ // get user entry if any
+ sscanf(Cmd, "%i %i", &clk, &invert);
+
+ // save GraphBuffer - to restore it later
+ save_restoreGB(1);
+
// first get high and low values
- for (i = 0; i < GraphTraceLen; i++)
- {
+ for (i = 0; i < GraphTraceLen; i++) {
if (GraphBuffer[i] > high)
high = GraphBuffer[i];
else if (GraphBuffer[i] < low)
low = GraphBuffer[i];
}
- // populate a buffer with pulse lengths
- i= 0;
- j= 0;
- minClk= 255;
- while (i < GraphTraceLen)
- {
+ i = 0;
+ j = 0;
+ minClk = 255;
+ // get to first full low to prime loop and skip incomplete first pulse
+ while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
+ ++i;
+ while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+ ++i;
+ skip = i;
+
+ // populate tmpbuff buffer with pulse lengths
+ while (i < GraphTraceLen) {
// measure from low to low
- while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
+ while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
++i;
start= i;
- while ((GraphBuffer[i] < high) && (i<GraphTraceLen))
+ while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
++i;
- while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
+ while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
++i;
if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
break;
}
tmpbuff[j++]= i - start;
- if (i-start < minClk) minClk = i-start;
+ if (i-start < minClk && i < GraphTraceLen) {
+ minClk = i - start;
+ }
}
// set clock
- if (!clk){
+ if (!clk) {
for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
tol = fndClk[clkCnt]/8;
- if (fndClk[clkCnt]-tol >= minClk) {
+ if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) {
clk=fndClk[clkCnt];
break;
}
}
+ if (!clk) return 0;
} else tol = clk/8;
// look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
- start= -1;
- skip= 0;
- for (i= 0; i < j - 4 ; ++i)
- {
+ start = -1;
+ for (i= 0; i < j - 4 ; ++i) {
skip += tmpbuff[i];
- if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)
- if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol)
- if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol)
- if (tmpbuff[i+3] >= clk-tol)
+ if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol) //3 clocks
+ if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol) //2 clocks
+ if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
+ if (tmpbuff[i+3] >= clk-tol) //1.5 to 2 clocks - depends on bit following
{
start= i + 4;
break;
}
}
- startblock= i + 4;
+ startblock = i + 4;
// skip over the remainder of LW
- skip += tmpbuff[i+1] + tmpbuff[i+2] + clk + clk/8;
-
- int phaseoff = tmpbuff[i+3]-clk;
-
+ skip += tmpbuff[i+1] + tmpbuff[i+2] + clk;
+ if (tmpbuff[i+3]>clk)
+ phaseoff = tmpbuff[i+3]-clk;
+ else
+ phaseoff = 0;
// now do it again to find the end
end = skip;
- for (i += 3; i < j - 4 ; ++i)
- {
+ for (i += 3; i < j - 4 ; ++i) {
end += tmpbuff[i];
- if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3 + tol)
- if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2 + tol)
- if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3 + tol)
- if (tmpbuff[i+3] >= clk-tol)
+ if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol) //3 clocks
+ if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol) //2 clocks
+ if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
+ if (tmpbuff[i+3] >= clk-tol) //1.5 to 2 clocks - depends on bit following
{
complete= true;
break;
// report back
if (verbose || g_debugMode) {
if (start >= 0) {
- PrintAndLog("\nNote: should print 45 bits then 0177 (end of block)");
- PrintAndLog(" for each block");
- PrintAndLog(" Also, sometimes the demod gets out of sync and ");
- PrintAndLog(" inverts the output - when this happens the 0177");
- PrintAndLog(" will be 3 extra 1's at the end");
- PrintAndLog(" 'data askedge' command may fix that");
+ PrintAndLog("\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
} else {
- PrintAndLog("No data found!");
+ PrintAndLog("No data found!, clock tried:%d",clk);
PrintAndLog("Try again with more samples.");
+ PrintAndLog(" or after a 'data askedge' command to clean up the read");
return 0;
}
- if (!complete)
- {
- PrintAndLog("*** Warning!");
- PrintAndLog("Partial data - no end found!");
- PrintAndLog("Try again with more samples.");
- }
} else if (start < 0) return 0;
- start=skip;
+ start = skip;
snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
// get rid of leading crap
- snprintf(tmp, sizeof(tmp),"%i",skip);
+ snprintf(tmp, sizeof(tmp), "%i", skip);
CmdLtrim(tmp);
bool pTest;
- bool AllPTest=true;
+ bool AllPTest = true;
// now work through remaining buffer printing out data blocks
block = 0;
i = startblock;
- while (block < 6)
- {
+ while (block < 6) {
if (verbose || g_debugMode) PrintAndLog("\nBlock %i:", block);
skip = phaseoff;
// look for LW before start of next block
- for ( ; i < j - 4 ; ++i)
- {
+ for ( ; i < j - 4 ; ++i) {
skip += tmpbuff[i];
if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)
if (tmpbuff[i+1] >= clk-tol)
break;
}
+ if (i >= j-4) break; //next LW not found
skip += clk;
- phaseoff = tmpbuff[i+1]-clk;
+ if (tmpbuff[i+1]>clk)
+ phaseoff = tmpbuff[i+1]-clk;
+ else
+ phaseoff = 0;
i += 2;
- if (ASKmanDemod(tmp2, false, false)<1) return 0;
+ if (ASKDemod(tmp2, false, false, 1) < 1) {
+ save_restoreGB(0);
+ return 0;
+ }
//set DemodBufferLen to just one block
DemodBufferLen = skip/clk;
//test parities
pTest &= EM_EndParityTest(DemodBuffer,DemodBufferLen,5,9,0);
AllPTest &= pTest;
//get output
- Code[block]=OutputEM4x50_Block(DemodBuffer,DemodBufferLen,verbose, pTest);
- if (g_debugMode) PrintAndLog("\nskipping %d samples, bits:%d",start, skip/clk);
+ Code[block] = OutputEM4x50_Block(DemodBuffer,DemodBufferLen,verbose, pTest);
+ if (g_debugMode) PrintAndLog("\nskipping %d samples, bits:%d", skip, skip/clk);
//skip to start of next block
snprintf(tmp,sizeof(tmp),"%i",skip);
CmdLtrim(tmp);
block++;
- if (i>=end) break; //in case chip doesn't output 6 blocks
+ if (i >= end) break; //in case chip doesn't output 6 blocks
}
//print full code:
if (verbose || g_debugMode || AllPTest){
- PrintAndLog("Found data at sample: %i - using clock: %i",skip,clk);
- //PrintAndLog("\nSummary:");
- end=block;
- for (block=0; block<end; block++){
+ if (!complete) {
+ PrintAndLog("*** Warning!");
+ PrintAndLog("Partial data - no end found!");
+ PrintAndLog("Try again with more samples.");
+ }
+ PrintAndLog("Found data at sample: %i - using clock: %i", start, clk);
+ end = block;
+ for (block=0; block < end; block++){
PrintAndLog("Block %d: %08x",block,Code[block]);
}
- if (AllPTest)
+ if (AllPTest) {
PrintAndLog("Parities Passed");
- else
+ } else {
PrintAndLog("Parities Failed");
+ PrintAndLog("Try cleaning the read samples with 'data askedge'");
+ }
}
//restore GraphBuffer
return EM4x50Read(Cmd, true);
}
-int CmdReadWord(const char *Cmd)
+int usage_lf_em_read(void) {
+ PrintAndLog("Read EM4x05/EM4x69. Tag must be on antenna. ");
+ PrintAndLog("");
+ PrintAndLog("Usage: lf em readword [h] <address> <pwd>");
+ PrintAndLog("Options:");
+ PrintAndLog(" h - this help");
+ PrintAndLog(" address - memory address to read. (0-15)");
+ PrintAndLog(" pwd - password (hex) (optional)");
+ PrintAndLog("samples:");
+ PrintAndLog(" lf em readword 1");
+ PrintAndLog(" lf em readword 1 11223344");
+ return 0;
+}
+
+//search for given preamble in given BitStream and return success=1 or fail=0 and startIndex
+uint8_t EMpreambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t size, size_t *startIdx)
{
- int Word = -1; //default to invalid word
- UsbCommand c;
-
- sscanf(Cmd, "%d", &Word);
-
- if ( (Word > 15) | (Word < 0) ) {
- PrintAndLog("Word must be between 0 and 15");
+ // Sanity check. If preamble length is bigger than bitstream length.
+ if ( size <= pLen ) return 0;
+ // em only sends preamble once, so look for it once in the first x bits
+ uint8_t foundCnt = 0;
+ for (int idx = 0; idx < size - pLen; idx++){
+ if (memcmp(BitStream+idx, preamble, pLen) == 0){
+ //first index found
+ foundCnt++;
+ if (foundCnt == 1) {
+ *startIdx = idx;
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+int demodEM4x05resp(uint8_t bitsNeeded) {
+ int ans = 0;
+ bool demodFound = false;
+ DemodBufferLen = 0x00;
+ // skip first two 0 bits as they might have been missed in the demod
+ uint8_t preamble[6] = {0,0,1,0,1,0};
+
+ // test for FSK wave (easiest to 99% ID)
+ if (GetFskClock("", FALSE, FALSE)) {
+ //valid fsk clocks found
+ ans = FSKrawDemod("0 0", false);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: FSK Demod failed");
+ //return -1;
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ //return -1;
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+
+ ans = GetPskClock("", FALSE, FALSE);
+ if (ans>0) {
+ PrintAndLog("PSK response possibly found, run `data rawd p1` to attempt to demod");
+ }
+
+ if (!demodFound) {
+ DemodBufferLen = 0x00;
+ //try biphase
+ ans = ASKbiphaseDemod("0 0 1", FALSE);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed");
+ //return -1;
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ //return -1;
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+
+ if (!demodFound) {
+ DemodBufferLen = 0x00;
+ // try manchester - NOTE: ST only applies to T55x7 tags.
+ ans = ASKDemod_ext("0,0,1", false, false, 1, false);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
+ //return -1;
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ //return -1;
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+
+ if (demodFound && bitsNeeded < DemodBufferLen) {
+ setDemodBuf(DemodBuffer + ans + sizeof(preamble), bitsNeeded, 0);
+ CmdPrintDemodBuff("x");
return 1;
}
+ return -1;
+}
+
+int CmdReadWord(const char *Cmd) {
+ int addr, pwd;
+ bool usePwd = false;
+ uint8_t ctmp = param_getchar(Cmd, 0);
+ if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_read();
+
+ addr = param_get8ex(Cmd, 0, -1, 10);
+ pwd = param_get32ex(Cmd, 1, -1, 16);
- PrintAndLog("Reading word %d", Word);
+ if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+ PrintAndLog("Address must be between 0 and 15");
+ return 1;
+ }
+ if ( pwd == -1 )
+ PrintAndLog("Reading address %d", addr);
+ else {
+ usePwd = true;
+ PrintAndLog("Reading address %d | password %08X", addr, pwd);
+ }
- c.cmd = CMD_EM4X_READ_WORD;
- c.d.asBytes[0] = 0x0; //Normal mode
- c.arg[0] = 0;
- c.arg[1] = Word;
- c.arg[2] = 0;
+ UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
+ clearCommandBuffer();
SendCommand(&c);
- return 0;
+ UsbCommand resp;
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
+ PrintAndLog("Command timed out");
+ return -1;
+ }
+
+ uint8_t got[6000];
+ GetFromBigBuf(got, sizeof(got), 0);
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+ PrintAndLog("command execution time out");
+ return -1;
+ }
+ setGraphBuf(got, sizeof(got));
+ int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
+ if (graphJustNoise(GraphBuffer, testLen)) {
+ PrintAndLog("no tag not found");
+ return -1;
+ }
+
+ //need 32 bits for read word
+ demodEM4x05resp(32);
+
+ return 1;
}
-int CmdReadWordPWD(const char *Cmd)
-{
- int Word = -1; //default to invalid word
- int Password = 0xFFFFFFFF; //default to blank password
- UsbCommand c;
+int usage_lf_em_write(void) {
+ PrintAndLog("Write EM4x05/EM4x69. Tag must be on antenna. ");
+ PrintAndLog("");
+ PrintAndLog("Usage: lf em writeword [h] <address> <data> <pwd>");
+ PrintAndLog("Options:");
+ PrintAndLog(" h - this help");
+ PrintAndLog(" address - memory address to write to. (0-15)");
+ PrintAndLog(" data - data to write (hex)");
+ PrintAndLog(" pwd - password (hex) (optional)");
+ PrintAndLog("samples:");
+ PrintAndLog(" lf em writeword 1");
+ PrintAndLog(" lf em writeword 1 deadc0de 11223344");
+ return 0;
+}
+int CmdWriteWord(const char *Cmd) {
+ uint8_t ctmp = param_getchar(Cmd, 0);
+ if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();
- sscanf(Cmd, "%d %x", &Word, &Password);
+ bool usePwd = false;
+
+ int addr = 16; // default to invalid address
+ int data = 0xFFFFFFFF; // default to blank data
+ int pwd = 0xFFFFFFFF; // default to blank password
- if ( (Word > 15) | (Word < 0) ) {
- PrintAndLog("Word must be between 0 and 15");
+ addr = param_get8ex(Cmd, 0, -1, 10);
+ data = param_get32ex(Cmd, 1, -1, 16);
+ pwd = param_get32ex(Cmd, 2, -1, 16);
+
+
+ if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+ PrintAndLog("Address must be between 0 and 15");
return 1;
}
+ if ( pwd == -1 )
+ PrintAndLog("Writing address %d data %08X", addr, data);
+ else {
+ usePwd = true;
+ PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);
+ }
- PrintAndLog("Reading word %d with password %08X", Word, Password);
+ uint16_t flag = (addr << 8 ) | usePwd;
- c.cmd = CMD_EM4X_READ_WORD;
- c.d.asBytes[0] = 0x1; //Password mode
- c.arg[0] = 0;
- c.arg[1] = Word;
- c.arg[2] = Password;
+ UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
+ clearCommandBuffer();
SendCommand(&c);
+ UsbCommand resp;
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+ PrintAndLog("Error occurred, device did not respond during write operation.");
+ return -1;
+ }
+ //get response if there is one
+ uint8_t got[6000]; // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
+ GetFromBigBuf(got, sizeof(got), 0);
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {
+ PrintAndLog("command execution time out");
+ return 0;
+ }
+ setGraphBuf(got, sizeof(got));
+ //todo: check response for 00001010 then write data for write confirmation!
return 0;
}
+/*
int CmdWriteWord(const char *Cmd)
{
int Word = 16; //default to invalid block
SendCommand(&c);
return 0;
}
-
+*/
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
{"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},
- {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
- {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
+ {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"},
+ {"em410xsim", CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},
{"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
{"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
- {"em410xwrite", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
- {"em4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
- {"readword", CmdReadWord, 1, "<Word> -- Read EM4xxx word data"},
- {"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},
- {"writeword", CmdWriteWord, 1, "<Data> <Word> -- Write EM4xxx word data"},
- {"writewordPWD", CmdWriteWordPWD, 1, "<Data> <Word> <Password> -- Write EM4xxx word data in password mode"},
+ {"em410xwrite", CmdEM410xWrite, 0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
+ {"em4x50read", CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graph buffer"},
+ {"readword", CmdReadWord, 1, "<Word> (pwd) -- Read EM4x05/EM4x69 word data"},
+
//{"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},
+ {"writeword", CmdWriteWord, 1, "<Word> <data> (pwd) -- Write EM4x05/EM4x69 word data"},
+
//{"writewordPWD", CmdWriteWordPWD, 1, "<Data> <Word> <Password> -- Write EM4xxx word data in password mode"},
{NULL, NULL, 0, NULL}
};
projects / proxmark3-svn / blobdiff