X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/02306bac2dc44bd1de5422f9db127b231cde304f..46a33c182dc645ff785ef8fcb880c57ac0a02783:/client/cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 28cd01ba..03f4186f 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -15,17 +15,20 @@
 #include "ui.h"
 #include "proxmark3.h"
 #include "cmdparser.h"
-#include "cmddata.h"
 #include "cmdhw.h"
 #include "cmdmain.h"
+#include "cmddata.h"
+#include "data.h"
 
 /* low-level hardware control */
 
 static int CmdHelp(const char *Cmd);
 
-static void lookupChipID(uint32_t iChipID)
+static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
 {
 	char asBuff[100];
+	uint32_t mem_avail = 0;
+	
 	switch(iChipID)
 	{
 		case 0x270B0A40:
@@ -103,37 +106,43 @@ static void lookupChipID(uint32_t iChipID)
 	switch((iChipID&0xF00)>>8)
 	{
 		case 0:
-			sprintf(asBuff,"None");
+			mem_avail = 0;
 			break;
 		case 1:
-			sprintf(asBuff,"8K bytes");
+			mem_avail = 8;
 			break;
 		case 2:
-			sprintf(asBuff,"16K bytes");
+			mem_avail = 16;
 			break;
 		case 3:
-			sprintf(asBuff,"32K bytes");
+			mem_avail = 32;
 			break;
 		case 5:
-			sprintf(asBuff,"64K bytes");
+			mem_avail = 64;
 			break;
 		case 7:
-			sprintf(asBuff,"128K bytes");
+			mem_avail = 128;
 			break;
 		case 9:
-			sprintf(asBuff,"256K bytes");
+			mem_avail = 256;
 			break;
 		case 10:
-			sprintf(asBuff,"512K bytes");
+			mem_avail = 512;
 			break;
 		case 12:
-			sprintf(asBuff,"1024K bytes");
+			mem_avail = 1024;
 			break;
 		case 14:
-			sprintf(asBuff,"2048K bytes");
+			mem_avail = 2048;
 			break;
 	}
-	PrintAndLog("Nonvolatile Program Memory Size: %s",asBuff);
+	PrintAndLog("Nonvolatile Program Memory Size: %dK bytes. Used: %d bytes (%2.0f\%). Free: %d bytes (%2.0f\%).", 
+				mem_avail, 
+				mem_used, 
+				mem_avail == 0 ? 0 : (float)mem_used/(mem_avail*1024)*100,
+				mem_avail*1024 - mem_used,
+				mem_avail == 0 ? 0 : (float)(mem_avail*1024-mem_used)/(mem_avail*1024)*100
+				);
 	switch((iChipID&0xF000)>>12)
 	{
 		case 0:
@@ -391,60 +400,87 @@ int CmdSetMux(const char *Cmd)
 
 int CmdTune(const char *Cmd)
 {
-  UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING};
-  SendCommand(&c);
-  
-  char cmdp = param_getchar(Cmd, 0);
-  if (cmdp == 'h' || cmdp == 'H') {
-	PrintAndLog("Usage:  hw tune <p>");
-	PrintAndLog("");
-	PrintAndLog("     sample: hw tune");
-	PrintAndLog("             hw tune p");
-	return 0;
-  }
-  
-  if ( cmdp ==  'p' || cmdp == 'P'){
-	ShowGraphWindow();
-	CmdTuneSamples("");
-  }
-  return 0;
+    return CmdTuneSamples(Cmd);
 }
 
 int CmdVersion(const char *Cmd)
 {
-  UsbCommand c = {CMD_VERSION};
-  UsbCommand resp;
-  SendCommand(&c);
-  if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-      lookupChipID(resp.arg[0]);
-  }
-  return 0;
+
+	clearCommandBuffer();
+	UsbCommand c = {CMD_VERSION};
+	static UsbCommand resp = {0, {0, 0, 0}};
+
+	if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
+		SendCommand(&c);
+		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+			PrintAndLog("Prox/RFID mark3 RFID instrument");
+			PrintAndLog((char*)resp.d.asBytes);
+			lookupChipID(resp.arg[0], resp.arg[1]);
+		}
+	} else {
+		PrintAndLog("[[[ Cached information ]]]\n");
+		PrintAndLog("Prox/RFID mark3 RFID instrument");
+		PrintAndLog((char*)resp.d.asBytes);
+		lookupChipID(resp.arg[0], resp.arg[1]);
+		PrintAndLog("");
+	}
+	return 0;
+}
+
+int CmdStatus(const char *Cmd)
+{
+	uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
+	sample_buf = speed_test_buffer;
+
+	clearCommandBuffer();
+	UsbCommand c = {CMD_STATUS};
+	SendCommand(&c);
+	if (!WaitForResponseTimeout(CMD_ACK,&c,1900)) {
+		PrintAndLog("Status command failed. USB Speed Test timed out");
+	}
+	return 0;
+}
+
+
+int CmdPing(const char *Cmd)
+{
+	clearCommandBuffer();
+	UsbCommand resp;
+	UsbCommand c = {CMD_PING};
+	SendCommand(&c);
+	if (WaitForResponseTimeout(CMD_ACK,&resp,1000))
+		PrintAndLog("Ping successfull");
+	else
+		PrintAndLog("Ping failed");	
+	return 0;
 }
 
 static command_t CommandTable[] = 
 {
-  {"help",          CmdHelp,        1, "This help"},
-  {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
-  {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
-  {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
-  {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
-  {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
-  {"reset",         CmdReset,       0, "Reset the Proxmark3"},
-  {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
-  {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
-  {"tune",          CmdTune,        0, "Measure antenna tuning"},
-  {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
-  {NULL, NULL, 0, NULL}
+	{"help",          CmdHelp,        1, "This help"},
+	{"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+	{"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
+	{"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
+	{"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
+	{"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
+	{"reset",         CmdReset,       0, "Reset the Proxmark3"},
+	{"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
+	{"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
+	{"tune",          CmdTune,        0, "Measure antenna tuning"},
+	{"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
+	{"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
+	{"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
+	{NULL, NULL, 0, NULL}
 };
 
 int CmdHW(const char *Cmd)
 {
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+	CmdsParse(CommandTable, Cmd);
+	return 0;
 }
 
 int CmdHelp(const char *Cmd)
 {
-  CmdsHelp(CommandTable);
-  return 0;
+	CmdsHelp(CommandTable);
+	return 0;
 }