X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6cd2eef44ba915ffca378435429b3585e7d83797..4db6f3bbb9b589f62bdaa8d30be0dc6cef3dac3f:/client/cmddata.c?ds=inline diff --git a/client/cmddata.c b/client/cmddata.c index de85b280..2444fb32 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -444,99 +444,6 @@ int Cmdaskbiphdemod(const char *Cmd) return ASKbiphaseDemod(Cmd, true); } -//could be split to a gProxII file -//by marshmellow -//attempts to demodulate and identify a G_Prox_II verex/chubb card -//WARNING: if it fails during some points it will destroy the DemodBuffer data -// but will leave the GraphBuffer intact. -//if successful it will push askraw data back to demod buffer ready for emulation -int CmdG_Prox_II_Demod(const char *Cmd) -{ - if (!ASKbiphaseDemod(Cmd, false)){ - if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try"); - return 0; - } - size_t size = DemodBufferLen; - //call lfdemod.c demod for gProxII - int ans = gProxII_Demod(DemodBuffer, &size); - if (ans < 0){ - if (g_debugMode) PrintAndLog("Error gProxII_Demod"); - return 0; - } - //got a good demod of 96 bits - uint8_t ByteStream[8] = {0x00}; - uint8_t xorKey=0; - size_t startIdx = ans + 6; //start after 6 bit preamble - - uint8_t bits_no_spacer[90]; - //so as to not mess with raw DemodBuffer copy to a new sample array - memcpy(bits_no_spacer, DemodBuffer + startIdx, 90); - // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72)) - size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run - if (bitLen != 72) { - if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx); - return 0; - } - // get key and then get all 8 bytes of payload decoded - xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8); - for (size_t idx = 0; idx < 8; idx++) { - ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey; - if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]); - } - //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data - // - uint8_t fmtLen = ByteStream[0]>>2; - uint32_t FC = 0; - uint32_t Card = 0; - //get raw 96 bits to print - uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32); - uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); - uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32); - - if (fmtLen==36){ - FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1); - Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5); - PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card); - } else if(fmtLen==26){ - FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7); - Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7); - PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card); - } else { - PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen); - PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); - } - PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3); - setDemodBuf(DemodBuffer+ans, 96, 0); - return 1; -} - -//could be moved to a viking file -//by marshmellow -//see ASKDemod for what args are accepted -int CmdVikingDemod(const char *Cmd) -{ - if (!ASKDemod(Cmd, false, false, 1)) { - if (g_debugMode) PrintAndLog("ASKDemod failed"); - return 0; - } - size_t size = DemodBufferLen; - //call lfdemod.c demod for Viking - int ans = VikingDemod_AM(DemodBuffer, &size); - if (ans < 0) { - if (g_debugMode) PrintAndLog("Error Viking_Demod %d", ans); - return 0; - } - //got a good demod - uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32); - uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); - uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32); - uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8); - PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, (unsigned int) checksum); - PrintAndLog("Raw: %08X%08X", raw1,raw2); - setDemodBuf(DemodBuffer+ans, 64, 0); - return 1; -} - //by marshmellow - see ASKDemod int Cmdaskrawdemod(const char *Cmd) { @@ -943,325 +850,6 @@ int CmdFSKdemodParadox(const char *Cmd) return 1; } -//by marshmellow -//IO-Prox demod - FSK RF/64 with preamble of 000000001 -//print ioprox ID and some format details -int CmdFSKdemodIO(const char *Cmd) -{ - int idx=0; - //something in graphbuffer? - if (GraphTraceLen < 65) { - if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer"); - return 0; - } - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; - size_t BitLen = getFromGraphBuf(BitStream); - if (BitLen==0) return 0; - - //get binary from fsk wave - idx = IOdemodFSK(BitStream,BitLen); - if (idx<0){ - if (g_debugMode){ - if (idx==-1){ - PrintAndLog("DEBUG: Just Noise Detected"); - } else if (idx == -2) { - PrintAndLog("DEBUG: not enough samples"); - } else if (idx == -3) { - PrintAndLog("DEBUG: error during fskdemod"); - } else if (idx == -4) { - PrintAndLog("DEBUG: Preamble not found"); - } else if (idx == -5) { - PrintAndLog("DEBUG: Separator bits not found"); - } else { - PrintAndLog("DEBUG: Error demoding fsk %d", idx); - } - } - return 0; - } - if (idx==0){ - if (g_debugMode){ - PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen); - if (BitLen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16)); - } - return 0; - } - //Index map - //0 10 20 30 40 50 60 - //| | | | | | | - //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23 - //----------------------------------------------------------------------------- - //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11 - // - //XSF(version)facility:codeone+codetwo (raw) - //Handle the data - if (idx+64>BitLen) { - if (g_debugMode) PrintAndLog("not enough bits found - bitlen: %d",BitLen); - return 0; - } - PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx], BitStream[idx+1], BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]); - PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9], BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]); - PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]); - PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]); - PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]); - PrintAndLog("%d%d%d%d%d%d%d%d %d code2",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]); - PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]); - - uint32_t code = bytebits_to_byte(BitStream+idx,32); - uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32); - uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4 - uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ; - uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9 - uint8_t crc = bytebits_to_byte(BitStream+idx+54,8); - uint16_t calccrc = 0; - - for (uint8_t i=1; i<6; ++i){ - calccrc += bytebits_to_byte(BitStream+idx+9*i,8); - } - calccrc &= 0xff; - calccrc = 0xff - calccrc; - - char *crcStr = (crc == calccrc) ? "crc ok": "!crc"; - - PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr); - setDemodBuf(BitStream,64,idx); - if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64); - printDemodBuff(); - } - return 1; -} - -//by marshmellow -//Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001 (always a 128 bit data stream) -//print full Farpointe Data/Pyramid Prox ID and some bit format details if found -int CmdFSKdemodPyramid(const char *Cmd) -{ - //raw fsk demod no manchester decoding no start bit finding just get binary from wave - uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; - size_t size = getFromGraphBuf(BitStream); - if (size==0) return 0; - - //get binary from fsk wave - int idx = PyramiddemodFSK(BitStream, &size); - if (idx < 0){ - if (g_debugMode){ - if (idx == -5) - PrintAndLog("DEBUG: Error - not enough samples"); - else if (idx == -1) - PrintAndLog("DEBUG: Error - only noise found"); - else if (idx == -2) - PrintAndLog("DEBUG: Error - problem during FSK demod"); - else if (idx == -3) - PrintAndLog("DEBUG: Error - Size not correct: %d", size); - else if (idx == -4) - PrintAndLog("DEBUG: Error - Pyramid preamble not found"); - else - PrintAndLog("DEBUG: Error - idx: %d",idx); - } - return 0; - } - // Index map - // 0 10 20 30 40 50 60 - // | | | | | | | - // 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 - // ----------------------------------------------------------------------------- - // 0000000 0 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 - // premable xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o - - // 64 70 80 90 100 110 120 - // | | | | | | | - // 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 - // ----------------------------------------------------------------------------- - // 0000000 1 0000000 1 0000000 1 0110111 0 0011000 1 0000001 0 0001100 1 1001010 0 - // xxxxxxx o xxxxxxx o xxxxxxx o xswffff o ffffccc o ccccccc o ccccccw o ppppppp o - // |---115---||---------71---------| - // s = format start bit, o = odd parity of last 7 bits - // f = facility code, c = card number - // w = wiegand parity, x = extra space for other formats - // p = unknown checksum - // (26 bit format shown) - - //get bytes for checksum calc - uint8_t checksum = bytebits_to_byte(BitStream + idx + 120, 8); - uint8_t csBuff[14] = {0x00}; - for (uint8_t i = 0; i < 13; i++){ - csBuff[i] = bytebits_to_byte(BitStream + idx + 16 + (i*8), 8); - } - //check checksum calc - //checksum calc thanks to ICEMAN!! - uint32_t checkCS = CRC8Maxim(csBuff,13); - - //get raw ID before removing parities - uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32); - uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32); - uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32); - uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32); - setDemodBuf(BitStream,128,idx); - - size = removeParity(BitStream, idx+8, 8, 1, 120); - if (size != 105){ - if (g_debugMode) - PrintAndLog("DEBUG: Error at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3); - return 0; - } - - // ok valid card found! - - // Index map - // 0 10 20 30 40 50 60 70 - // | | | | | | | | - // 01234567890123456789012345678901234567890123456789012345678901234567890 - // ----------------------------------------------------------------------- - // 00000000000000000000000000000000000000000000000000000000000000000000000 - // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - - // 71 80 90 100 - // | | | | - // 1 2 34567890 1234567890123456 7 8901234 - // --------------------------------------- - // 1 1 01110011 0000000001000110 0 1001010 - // s w ffffffff cccccccccccccccc w ppppppp - // |--115-| |------71------| - // s = format start bit, o = odd parity of last 7 bits - // f = facility code, c = card number - // w = wiegand parity, x = extra space for other formats - // p = unknown checksum - // (26 bit format shown) - - //find start bit to get fmtLen - int j; - for (j=0; j32){ - //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32); - //code2 = bytebits_to_byte(BitStream+(size-32),32); - PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); - } else{ - //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen); - PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); - } - } - if (checksum == checkCS) - PrintAndLog("Checksum %02x passed", checksum); - else - PrintAndLog("Checksum %02x failed - should have been %02x", checksum, checkCS); - - if (g_debugMode){ - PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128); - printDemodBuff(); - } - return 1; -} - -// FDX-B ISO11784/85 demod (aka animal tag) BIPHASE, inverted, rf/32, with preamble of 00000000001 (128bits) -// 8 databits + 1 parity (1) -// CIITT 16 chksum -// NATIONAL CODE, ICAR database -// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf -// FLAG (animal/non-animal) -/* -38 IDbits -10 country code -1 extra app bit -14 reserved bits -1 animal bit -16 ccitt CRC chksum over 64bit ID CODE. -24 appli bits. - --- sample: 985121004515220 [ 37FF65B88EF94 ] -*/ -int CmdFDXBdemodBI(const char *Cmd){ - - int invert = 1; - int clk = 32; - int errCnt = 0; - int maxErr = 0; - uint8_t BitStream[MAX_DEMOD_BUF_LEN]; - size_t size = getFromGraphBuf(BitStream); - - errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); - if ( errCnt < 0 || errCnt > maxErr ) { - if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); - return 0; - } - - errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1); - if (errCnt < 0 || errCnt > maxErr ) { - if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); - return 0; - } - - int preambleIndex = FDXBdemodBI(BitStream, &size); - if (preambleIndex < 0){ - if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex); - return 0; - } - if (size != 128) { - if (g_debugMode) PrintAndLog("Error incorrect data length found"); - return 0; - } - - setDemodBuf(BitStream, 128, preambleIndex); - - // remove marker bits (1's every 9th digit after preamble) (pType = 2) - size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117); - if ( size != 104 ) { - if (g_debugMode) PrintAndLog("Error removeParity:: %d", size); - return 0; - } - if (g_debugMode) { - char *bin = sprint_bin_break(BitStream,size,16); - PrintAndLog("DEBUG BinStream:\n%s",bin); - } - PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:"); - if (g_debugMode) PrintAndLog("Start marker %d; Size %d", preambleIndex, size); - - //got a good demod - uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32); - uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10); - uint8_t dataBlockBit = BitStream[48]; - uint32_t reservedCode = bytebits_to_byteLSBF(BitStream+49,14); - uint8_t animalBit = BitStream[63]; - uint32_t crc16 = bytebits_to_byteLSBF(BitStream+64,16); - uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24); - - uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream,32)<<32) | bytebits_to_byte(BitStream+32,32); - uint8_t raw[8]; - num_to_bytes(rawid, 8, raw); - - if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8)); - - uint16_t calcCrc = crc16_ccitt_kermit(raw, 8); - PrintAndLog("Animal ID: %04u-%012" PRIu64, countryCode, NationalCode); - PrintAndLog("National Code: %012" PRIu64, NationalCode); - PrintAndLog("CountryCode: %04u", countryCode); - PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False"); - PrintAndLog("reserved Code: %u", reservedCode); - PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False"); - PrintAndLog("CRC: 0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed"); - PrintAndLog("Extended: 0x%X\n", extended); - - return 1; -} - - //by marshmellow //attempt to psk1 demod graph buffer int PSKDemod(const char *Cmd, bool verbose) @@ -1310,59 +898,6 @@ int PSKDemod(const char *Cmd, bool verbose) return 1; } -// Indala 26 bit decode -// by marshmellow -// optional arguments - same as CmdpskNRZrawDemod (clock & invert) -int CmdIndalaDecode(const char *Cmd) -{ - int ans; - if (strlen(Cmd)>0){ - ans = PSKDemod(Cmd, 0); - } else{ //default to RF/32 - ans = PSKDemod("32", 0); - } - - if (!ans){ - if (g_debugMode) - PrintAndLog("Error1: %d",ans); - return 0; - } - uint8_t invert=0; - size_t size = DemodBufferLen; - int startIdx = indala26decode(DemodBuffer, &size, &invert); - if (startIdx < 0 || size > 224) { - if (g_debugMode) - PrintAndLog("Error2: %d",ans); - return -1; - } - setDemodBuf(DemodBuffer, size, (size_t)startIdx); - if (invert) - if (g_debugMode) - PrintAndLog("Had to invert bits"); - - PrintAndLog("BitLen: %d",DemodBufferLen); - //convert UID to HEX - uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7; - uid1=bytebits_to_byte(DemodBuffer,32); - uid2=bytebits_to_byte(DemodBuffer+32,32); - if (DemodBufferLen==64) { - PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2); - } else { - uid3=bytebits_to_byte(DemodBuffer+64,32); - uid4=bytebits_to_byte(DemodBuffer+96,32); - uid5=bytebits_to_byte(DemodBuffer+128,32); - uid6=bytebits_to_byte(DemodBuffer+160,32); - uid7=bytebits_to_byte(DemodBuffer+192,32); - PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", - sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7); - } - if (g_debugMode){ - PrintAndLog("DEBUG: printing demodbuffer:"); - printDemodBuff(); - } - return 1; -} - int CmdPSKNexWatch(const char *Cmd) { if (!PSKDemod("", false)) return 0; @@ -2083,8 +1618,6 @@ static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"}, - {"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"}, - {"askvikingdemod", CmdVikingDemod, 1, "Demodulate a Viking tag from GraphBuffer"}, {"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"}, {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"}, {"bin2hex", Cmdbin2hex, 1, "bin2hex -- Converts binary to hexadecimal"}, @@ -2092,10 +1625,7 @@ static command_t CommandTable[] = {"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"}, {"dec", CmdDec, 1, "Decimate samples"}, {"detectclock", CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"}, - {"fdxbdemod", CmdFDXBdemodBI , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"}, //{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"}, - {"fskiodemod", CmdFSKdemodIO, 1, "Demodulate an IO Prox FSK tag from GraphBuffer"}, - {"fskpyramiddemod", CmdFSKdemodPyramid, 1, "Demodulate a Pyramid FSK tag from GraphBuffer"}, {"fskparadoxdemod", CmdFSKdemodParadox, 1, "Demodulate a Paradox FSK tag from GraphBuffer"}, {"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"}, {"grid", CmdGrid, 1, " -- overlay grid on graph window, use zero value to turn off either"}, @@ -2111,7 +1641,6 @@ static command_t CommandTable[] = {"norm", CmdNorm, 1, "Normalize max/min to +/-128"}, {"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"}, {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] [l] -- print the data in the DemodBuffer - 'x' for hex output"}, - {"pskindalademod", CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"}, {"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"}, {"rawdemod", CmdRawDemod, 1, "[modulation] ... -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"}, {"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},