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

Update Client debug level

Browse source
This commit is contained in:
mwalker33 2020-04-10 18:20:02 +10:00
commit 9fc232390b
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/proxmark3.c
View file

@ -587,7 +587,8 @@ int main(int argc, char *argv[]) {
settings_load (); settings_load ();
// quick patch for debug level // quick patch for debug level
g_debugMode = session.logging_level; g_debugMode = session.client_debug_level;
PrintAndLogEx(ERR,"Emojo test [%d] :smile:",session.emoji_mode);
// settings_save (); // settings_save ();
// End Settings // End Settings

19
client/settings.c
View file

@ -62,7 +62,7 @@ int settings_load (void) {
// Set all defaults // Set all defaults
// mySettings.os_windows_usecolor = false; // mySettings.os_windows_usecolor = false;
// mySettings.os_windows_useansicolor = false; // mySettings.os_windows_useansicolor = false;
session.logging_level = 0; session.client_debug_level = OFF;
session.window_plot_xpos = 10; session.window_plot_xpos = 10;
session.window_plot_ypos = 30; session.window_plot_ypos = 30;
session.window_plot_hsize = 400; session.window_plot_hsize = 400;
@ -125,10 +125,10 @@ void settings_save_callback (json_t *root) {
// JsonSaveBoolean (root,"os.windows.useAnsiColor",mySettings.os_windows_useansicolor); // JsonSaveBoolean (root,"os.windows.useAnsiColor",mySettings.os_windows_useansicolor);
// Log level, convert to text // Log level, convert to text
// JsonSaveInt (root,"window.logging.level",mySettings.logging_level); // JsonSaveInt (root,"window.logging.level",mySettings.logging_level);
switch (session.logging_level) { switch (session.client_debug_level) {
case 0: JsonSaveStr (root,"logging.level","off"); break; case OFF: JsonSaveStr (root,"client.debug.level","off"); break;
case 1: JsonSaveStr (root,"logging.level","on"); break; case SIMPLE: JsonSaveStr (root,"client.debug.level","on"); break;
case 2: JsonSaveStr (root,"logging.level","full"); break; case FULL: JsonSaveStr (root,"client.debug.level","full"); break;
default: default:
JsonSaveStr (root,"logging.level","NORMAL"); JsonSaveStr (root,"logging.level","NORMAL");
} }
@ -172,11 +172,10 @@ void settings_load_callback (json_t *root) {
mySettings.os_windows_useansicolor = b1; mySettings.os_windows_useansicolor = b1;
*/ */
// Logging Level // Logging Level
// typedef enum logLevel {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG, INPLACE, HINT} logLevel_t; if (json_unpack_ex(root,&up_error, 0, "{s:s}","client.debug.level",&s1) == 0) {
if (json_unpack_ex(root,&up_error, 0, "{s:s}","logging.level",&s1) == 0) { if (strncmp (s1,"off",3) == 0) session.client_debug_level = OFF;
if (strncmp (s1,"off",3) == 0) session.logging_level = 0; if (strncmp (s1,"simple",6) == 0) session.client_debug_level = SIMPLE;
if (strncmp (s1,"on",2) == 0) session.logging_level = 1; if (strncmp (s1,"full",4) == 0) session.client_debug_level = FULL;
if (strncmp (s1,"full",4) == 0) session.logging_level = 2;
} }
// window plot // window plot

3
client/ui.h
View file

@ -19,6 +19,7 @@
typedef enum logLevel {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG, INPLACE, HINT} logLevel_t; typedef enum logLevel {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG, INPLACE, HINT} logLevel_t;
typedef enum emojiMode {ALIAS, EMOJI, ALTTEXT, ERASE} emojiMode_t; typedef enum emojiMode {ALIAS, EMOJI, ALTTEXT, ERASE} emojiMode_t;
typedef enum clientdebugLevel {OFF,SIMPLE,FULL} clientdebugLevel_t;
typedef struct { typedef struct {
bool settings_loaded; bool settings_loaded;
@ -33,7 +34,7 @@ typedef struct {
int window_plot_ypos; int window_plot_ypos;
int window_plot_hsize; int window_plot_hsize;
int window_plot_wsize; int window_plot_wsize;
logLevel_t logging_level; clientdebugLevel_t client_debug_level;
} session_arg_t; } session_arg_t;
extern session_arg_t session; extern session_arg_t session;