github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

textual - hw status on device side

Browse source
This commit is contained in:
iceman1001 2021-05-11 16:11:33 +02:00
commit a6712295c7
6 changed files with 80 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

22
armsrc/BigBuf.c
View file

@ -169,9 +169,25 @@ void BigBuf_print_status(void) {
Dbprintf(" tracing ................ %d", tracing); Dbprintf(" tracing ................ %d", tracing);
Dbprintf(" traceLen ............... %d", trace_len); Dbprintf(" traceLen ............... %d", trace_len);
Dbprintf(" dma8 memory.............%d", dma_8.buf - BigBuf_get_addr()); if (DBGLEVEL >= DBG_DEBUG) {
Dbprintf(" dma16 memory............%d", (uint8_t *)dma_16.buf - BigBuf_get_addr()); DbpString(_CYAN_("Sending buffers"));
Dbprintf(" toSend memory...........%d", toSend.buf - BigBuf_get_addr());
uint16_t d8 = 0;
if (dma_8.buf)
d8 = dma_8.buf - BigBuf_get_addr();
uint16_t d16 = 0;
if (dma_16.buf)
d16 = (uint8_t *)dma_16.buf - BigBuf_get_addr();
uint16_t ts = 0;
if (toSend.buf)
ts = toSend.buf - BigBuf_get_addr();
Dbprintf(" dma8 memory............. %u", d8);
Dbprintf(" dma16 memory............ %u", d16);
Dbprintf(" toSend memory........... %u", ts);
}
} }
// return the maximum trace length (i.e. the unallocated size of BigBuf) // return the maximum trace length (i.e. the unallocated size of BigBuf)

29
armsrc/appmain.c
View file

@ -337,22 +337,22 @@ static void print_debug_level(void) {
char dbglvlstr[20] = {0}; char dbglvlstr[20] = {0};
switch (DBGLEVEL) { switch (DBGLEVEL) {
case DBG_NONE: case DBG_NONE:
sprintf(dbglvlstr, "NONE"); sprintf(dbglvlstr, "none");
break; break;
case DBG_ERROR: case DBG_ERROR:
sprintf(dbglvlstr, "ERROR"); sprintf(dbglvlstr, "error");
break; break;
case DBG_INFO: case DBG_INFO:
sprintf(dbglvlstr, "INFO"); sprintf(dbglvlstr, "info");
break; break;
case DBG_DEBUG: case DBG_DEBUG:
sprintf(dbglvlstr, "DEBUG"); sprintf(dbglvlstr, "debug");
break; break;
case DBG_EXTENDED: case DBG_EXTENDED:
sprintf(dbglvlstr, "EXTENDED"); sprintf(dbglvlstr, "extended");
break; break;
} }
Dbprintf(" DBGLEVEL................%d ( " _YELLOW_("%s")" )", DBGLEVEL, dbglvlstr); Dbprintf(" Debug log level......... %d ( " _YELLOW_("%s")" )", DBGLEVEL, dbglvlstr);
} }
// measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time. // measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
@ -376,9 +376,9 @@ static void printConnSpeed(void) {
} }
LED_B_OFF(); LED_B_OFF();
Dbprintf(" Time elapsed............%dms", delta_time); Dbprintf(" Time elapsed................... %dms", delta_time);
Dbprintf(" Bytes transferred.......%d", bytes_transferred); Dbprintf(" Bytes transferred.............. %d", bytes_transferred);
Dbprintf(" Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / delta_time); Dbprintf(" Transfer Speed PM3 -> Client... " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / delta_time);
} }
/** /**
@ -429,7 +429,7 @@ static void SendStatus(void) {
#ifdef WITH_FLASH #ifdef WITH_FLASH
Flashmem_print_info(); Flashmem_print_info();
#endif #endif
DbpString("");
reply_ng(CMD_STATUS, PM3_SUCCESS, NULL, 0); reply_ng(CMD_STATUS, PM3_SUCCESS, NULL, 0);
} }
@ -1573,11 +1573,6 @@ static void PacketReceived(PacketCommandNG *packet) {
MifareGen3Freez(); MifareGen3Freez();
break; break;
} }
// mifare sniffer
// case CMD_HF_MIFARE_SNIFF: {
// SniffMifare(packet->oldarg[0]);
// break;
// }
case CMD_HF_MIFARE_PERSONALIZE_UID: { case CMD_HF_MIFARE_PERSONALIZE_UID: {
struct p { struct p {
uint8_t keytype; uint8_t keytype;
@ -2294,7 +2289,7 @@ static void PacketReceived(PacketCommandNG *packet) {
// arg1 = length bytes to transfer // arg1 = length bytes to transfer
// arg2 = RFU // arg2 = RFU
if (!FlashInit()) { if (FlashInit() == false) {
break; break;
} }
@ -2302,7 +2297,7 @@ static void PacketReceived(PacketCommandNG *packet) {
size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE); size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
Flash_CheckBusy(BUSY_TIMEOUT); Flash_CheckBusy(BUSY_TIMEOUT);
bool isok = Flash_ReadDataCont(startidx + i, mem, len); bool isok = Flash_ReadDataCont(startidx + i, mem, len);
if (!isok) if (isok == false)
Dbprintf("reading flash memory failed :: | bytes between %d - %d", i, len); Dbprintf("reading flash memory failed :: | bytes between %d - %d", i, len);
isok = reply_old(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len); isok = reply_old(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len);

30
armsrc/iso14443a.c
View file

@ -136,29 +136,29 @@ static hf14a_config hf14aconfig = { 0, 0, 0, 0, 0 } ;
void printHf14aConfig(void) { void printHf14aConfig(void) {
DbpString(_CYAN_("HF 14a config")); DbpString(_CYAN_("HF 14a config"));
Dbprintf(" [a] Anticol override.... %s%s%s", Dbprintf(" [a] Anticol override.... %s%s%s",
(hf14aconfig.forceanticol == 0) ? _GREEN_("std") " : follow standard " : "", (hf14aconfig.forceanticol == 0) ? _GREEN_("std") " ( follow standard )" : "",
(hf14aconfig.forceanticol == 1) ? _RED_("force") " : always do anticol" : "", (hf14aconfig.forceanticol == 1) ? _RED_("force") " ( always do anticol )" : "",
(hf14aconfig.forceanticol == 2) ? _RED_("skip") " : always skip anticol" : "" (hf14aconfig.forceanticol == 2) ? _RED_("skip") " ( always skip anticol )" : ""
); );
Dbprintf(" [b] BCC override........ %s%s%s", Dbprintf(" [b] BCC override........ %s%s%s",
(hf14aconfig.forcebcc == 0) ? _GREEN_("std") " : follow standard" : "", (hf14aconfig.forcebcc == 0) ? _GREEN_("std") " ( follow standard )" : "",
(hf14aconfig.forcebcc == 1) ? _RED_("fix") " : fix bad BCC" : "", (hf14aconfig.forcebcc == 1) ? _RED_("fix") " ( fix bad BCC )" : "",
(hf14aconfig.forcebcc == 2) ? _RED_("ignore") " : ignore bad BCC, always use card BCC" : "" (hf14aconfig.forcebcc == 2) ? _RED_("ignore") " ( ignore bad BCC, always use card BCC )" : ""
); );
Dbprintf(" [2] CL2 override........ %s%s%s", Dbprintf(" [2] CL2 override........ %s%s%s",
(hf14aconfig.forcecl2 == 0) ? _GREEN_("std") " : follow standard" : "", (hf14aconfig.forcecl2 == 0) ? _GREEN_("std") " ( follow standard )" : "",
(hf14aconfig.forcecl2 == 1) ? _RED_("force") " : always do CL2" : "", (hf14aconfig.forcecl2 == 1) ? _RED_("force") " ( always do CL2 )" : "",
(hf14aconfig.forcecl2 == 2) ? _RED_("skip") " : always skip CL2" : "" (hf14aconfig.forcecl2 == 2) ? _RED_("skip") " ( always skip CL2 )" : ""
); );
Dbprintf(" [3] CL3 override........ %s%s%s", Dbprintf(" [3] CL3 override........ %s%s%s",
(hf14aconfig.forcecl3 == 0) ? _GREEN_("std") " : follow standard" : "", (hf14aconfig.forcecl3 == 0) ? _GREEN_("std") " ( follow standard )" : "",
(hf14aconfig.forcecl3 == 1) ? _RED_("force") " : always do CL3" : "", (hf14aconfig.forcecl3 == 1) ? _RED_("force") " ( always do CL3 )" : "",
(hf14aconfig.forcecl3 == 2) ? _RED_("skip") " : always skip CL3" : "" (hf14aconfig.forcecl3 == 2) ? _RED_("skip") " ( always skip CL3 )" : ""
); );
Dbprintf(" [r] RATS override....... %s%s%s", Dbprintf(" [r] RATS override....... %s%s%s",
(hf14aconfig.forcerats == 0) ? _GREEN_("std") " : follow standard " : "", (hf14aconfig.forcerats == 0) ? _GREEN_("std") " ( follow standard )" : "",
(hf14aconfig.forcerats == 1) ? _RED_("force") " : always do RATS" : "", (hf14aconfig.forcerats == 1) ? _RED_("force") " ( always do RATS )" : "",
(hf14aconfig.forcerats == 2) ? _RED_("skip") " : always skip RATS" : "" (hf14aconfig.forcerats == 2) ? _RED_("skip") " () always skip RATS )" : ""
); );
} }

2
armsrc/lfsampling.c
View file

@ -42,7 +42,7 @@ void printLFConfig(void) {
Dbprintf(" [q] divisor............. %d ( "_GREEN_("%d.%02d kHz")" )", d, 12000 / (d + 1), ((1200000 + (d + 1) / 2) / (d + 1)) - ((12000 / (d + 1)) * 100)); Dbprintf(" [q] divisor............. %d ( "_GREEN_("%d.%02d kHz")" )", d, 12000 / (d + 1), ((1200000 + (d + 1) / 2) / (d + 1)) - ((12000 / (d + 1)) * 100));
Dbprintf(" [b] bits per sample..... %d", config.bits_per_sample); Dbprintf(" [b] bits per sample..... %d", config.bits_per_sample);
Dbprintf(" [d] decimation.......... %d", config.decimation); Dbprintf(" [d] decimation.......... %d", config.decimation);
Dbprintf(" [a] averaging...........%s", (config.averaging) ? "Yes" : "No"); Dbprintf(" [a] averaging........... %s", (config.averaging) ? "yes" : "no");
Dbprintf(" [t] trigger threshold... %d", config.trigger_threshold); Dbprintf(" [t] trigger threshold... %d", config.trigger_threshold);
Dbprintf(" [s] samples to skip..... %d ", config.samples_to_skip); Dbprintf(" [s] samples to skip..... %d ", config.samples_to_skip);