Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / cmddata.h

diff --git a/client/cmddata.h b/client/cmddata.h
index c7dbf29758211622a6d54610e906ec609dabbc66..48bd0d91c2e8035a21efad7ccbfdbf024e8ccd47 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -14,12 +14,14 @@
 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);
 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);

+void printDemodBuff(void);
+void printBitStream(uint8_t BitStream[], uint32_t bitLen);

 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);
 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);

-void printDemodBuff();

 
 int CmdAmp(const char *Cmd);
 int Cmdaskdemod(const char *Cmd);
 int CmdAskEM410xDemod(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 CmdAutoCorr(const char *Cmd);
 int Cmdaskrawdemod(const char *Cmd);
 int Cmdaskmandemod(const char *Cmd);
 int CmdAutoCorr(const char *Cmd);


@@ -39,6 +41,7 @@ int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(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);