Merge pull request #84 from marshmellow42/master

[proxmark3-svn] / client / cmddata.h

diff --git a/client/cmddata.h b/client/cmddata.h
index ffd6b983a041be2b58eb33a1d5ebbc1ef62b8c02..f6b4b950a53933f44bf97973d4552146b878488c 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -14,11 +14,16 @@
 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);
 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);

-void printDemodBuff();
+void printDemodBuff(void);
+void printBitStream(uint8_t BitStream[], uint32_t bitLen);
+void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);

 int CmdAmp(const char *Cmd);
 int Cmdaskdemod(const char *Cmd);
 int CmdAmp(const char *Cmd);
 int Cmdaskdemod(const char *Cmd);

+int CmdAskEM410xDemod(const char *Cmd);
+int CmdG_Prox_II_Demod(const char *Cmd);

 int Cmdaskrawdemod(const char *Cmd);
 int Cmdaskmandemod(const char *Cmd);
 int Cmdaskrawdemod(const char *Cmd);
 int Cmdaskmandemod(const char *Cmd);

+int AutoCorrelate(int window, bool SaveGrph, bool verbose);

 int CmdAutoCorr(const char *Cmd);
 int CmdBiphaseDecodeRaw(const char *Cmd);
 int CmdBitsamples(const char *Cmd);
 int CmdAutoCorr(const char *Cmd);
 int CmdBiphaseDecodeRaw(const char *Cmd);
 int CmdBitsamples(const char *Cmd);


@@ -30,11 +35,13 @@ int CmdFSKdemodAWID(const char *Cmd);
 int CmdFSKdemod(const char *Cmd);
 int CmdFSKdemodHID(const char *Cmd);
 int CmdFSKdemodIO(const char *Cmd);
 int CmdFSKdemod(const char *Cmd);
 int CmdFSKdemodHID(const char *Cmd);
 int CmdFSKdemodIO(const char *Cmd);

+int CmdFSKdemodParadox(const char *Cmd);

 int CmdFSKdemodPyramid(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdFSKdemodPyramid(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);

-int CmdDetectNRZpskClockRate(const char *Cmd);
-int CmdpskNRZrawDemod(const char *Cmd);
+int CmdPSK1rawDemod(const char *Cmd);
+int CmdPSK2rawDemod(const char *Cmd);

 int CmdGrid(const char *Cmd);
 int CmdGrid(const char *Cmd);

+int CmdGetBitStream(const char *Cmd);

 int CmdHexsamples(const char *Cmd);
 int CmdHide(const char *Cmd);
 int CmdHpf(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
 int CmdHide(const char *Cmd);
 int CmdHpf(const char *Cmd);


@@ -45,7 +52,9 @@ int Cmdmandecoderaw(const char *Cmd);
 int CmdManchesterDemod(const char *Cmd);
 int CmdManchesterMod(const char *Cmd);
 int CmdNorm(const char *Cmd);
 int CmdManchesterDemod(const char *Cmd);
 int CmdManchesterMod(const char *Cmd);
 int CmdNorm(const char *Cmd);

+int CmdNRZrawDemod(const char *Cmd);

 int CmdPlot(const char *Cmd);
 int CmdPlot(const char *Cmd);

+int CmdRawDemod(const char *Cmd);

 int CmdSamples(const char *Cmd);
 int CmdTuneSamples(const char *Cmd);
 int CmdSave(const char *Cmd);
 int CmdSamples(const char *Cmd);
 int CmdTuneSamples(const char *Cmd);
 int CmdSave(const char *Cmd);


@@ -54,9 +63,21 @@ int CmdThreshold(const char *Cmd);
 int CmdDirectionalThreshold(const char *Cmd);
 int CmdZerocrossings(const char *Cmd);
 int CmdIndalaDecode(const char *Cmd);
 int CmdDirectionalThreshold(const char *Cmd);
 int CmdZerocrossings(const char *Cmd);
 int CmdIndalaDecode(const char *Cmd);

+int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo);
+int ASKbiphaseDemod(const char *Cmd, bool verbose);
+int ASKmanDemod(const char *Cmd, bool verbose, bool emSearch);
+int ASKrawDemod(const char *Cmd, bool verbose);
+int FSKrawDemod(const char *Cmd, bool verbose);
+int PSKDemod(const char *Cmd, bool verbose);
+int NRZrawDemod(const char *Cmd, bool verbose);
+void printEM410x(uint32_t hi, uint64_t id);
+int getSamples(const char *Cmd, bool silent);
+

 
 #define MAX_DEMOD_BUF_LEN (1024*128)
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 extern int DemodBufferLen;
 
 
 #define MAX_DEMOD_BUF_LEN (1024*128)
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 extern int DemodBufferLen;
 

+#define BIGBUF_SIZE 40000
+

 #endif
 #endif