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

hint now uses session struct, in preperation for a preference file.

Browse source
This commit is contained in:
iceman1001 2020-03-16 18:42:34 +01:00
commit 82077b2f1c
4 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/cmdmain.c
View file

@ -196,30 +196,25 @@ static int CmdHints(const char *Cmd) {
char ctmp = tolower(param_getchar(Cmd, 0)); char ctmp = tolower(param_getchar(Cmd, 0));
if (ctmp == 'h') return usage_hints(); if (ctmp == 'h') return usage_hints();
if (strlen(Cmd) < 1) {
PrintAndLogEx(INFO, "Hints are %s", (g_showhints) ? "ON" : "OFF");
return PM3_SUCCESS;
}
if (strlen(Cmd) > 1){ if (strlen(Cmd) > 1){
str_lower((char *)Cmd); str_lower((char *)Cmd);
if (str_startswith(Cmd, "of")) { if (str_startswith(Cmd, "of")) {
g_showhints = false; session.show_hints = false;
} else { } else {
g_showhints = true; session.show_hints = true;
} }
} else { } else if (strlen(Cmd) == 1) {
if (param_getchar(Cmd, 0) != 0x00) { if (param_getchar(Cmd, 0) != 0x00) {
ms = param_get32ex(Cmd, 0, 0, 10); ms = param_get32ex(Cmd, 0, 0, 10);
if (ms == 0) { if (ms == 0) {
g_showhints = false; session.show_hints = false;
} else { } else {
g_showhints = true; session.show_hints = true;
} }
} }
} }
PrintAndLogEx(INFO, "Hints are %s", (g_showhints) ? "ON" : "OFF"); PrintAndLogEx(INFO, "Hints are %s", (session.show_hints) ? "ON" : "OFF");
return PM3_SUCCESS; return PM3_SUCCESS;
} }

1
client/proxgui.h
View file

@ -55,7 +55,6 @@ extern size_t DemodBufferLen;
extern size_t g_DemodStartIdx; extern size_t g_DemodStartIdx;
extern bool showDemod; extern bool showDemod;
extern uint8_t g_debugMode; extern uint8_t g_debugMode;
extern uint8_t g_showhints;
#ifndef FILE_PATH_SIZE #ifndef FILE_PATH_SIZE
#define FILE_PATH_SIZE 1000 #define FILE_PATH_SIZE 1000

2
client/ui.c
View file

@ -131,7 +131,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
return; return;
// skip HINT messages if client has hints turned off i.e. 'HINT 0' // skip HINT messages if client has hints turned off i.e. 'HINT 0'
if (g_showhints == 0 && level == HINT) if (session.show_hints == false && level == HINT)
return; return;
char prefix[40] = {0}; char prefix[40] = {0};

1
client/ui.h
View file

@ -27,6 +27,7 @@ typedef struct {
emojiMode_t emoji_mode; emojiMode_t emoji_mode;
bool pm3_present; bool pm3_present;
bool help_dump_mode; bool help_dump_mode;
bool show_hints;
} session_arg_t; } session_arg_t;
extern session_arg_t session; extern session_arg_t session;