From 9fc232390b7f80eb68525f47438a84d09803a601 Mon Sep 17 00:00:00 2001
From: mwalker33 <mwal5099@bigpond.net.au>
Date: Fri, 10 Apr 2020 18:20:02 +1000
Subject: [PATCH] Update Client debug level

---
 client/proxmark3.c |  3 ++-
 client/settings.c  | 19 +++++++++----------
 client/ui.h        |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2c20afa17..be7c1eafe 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -587,7 +587,8 @@ int main(int argc, char *argv[]) {
     settings_load ();
 
     // 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 ();
     // End Settings
 
diff --git a/client/settings.c b/client/settings.c
index 64aec90ba..f550604a1 100644
--- a/client/settings.c
+++ b/client/settings.c
@@ -62,7 +62,7 @@ int settings_load (void) {
     // Set all defaults
 //    mySettings.os_windows_usecolor = false;
 //    mySettings.os_windows_useansicolor = false;
-    session.logging_level = 0;
+    session.client_debug_level = OFF;
     session.window_plot_xpos = 10;
     session.window_plot_ypos = 30;
     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);
     // Log level, convert to text
     // JsonSaveInt (root,"window.logging.level",mySettings.logging_level);
-    switch (session.logging_level) {
-        case 0: JsonSaveStr (root,"logging.level","off"); break;
-        case 1: JsonSaveStr (root,"logging.level","on"); break;
-        case 2: JsonSaveStr (root,"logging.level","full"); break;
+    switch (session.client_debug_level) {
+        case OFF: JsonSaveStr (root,"client.debug.level","off"); break;
+        case SIMPLE: JsonSaveStr (root,"client.debug.level","on"); break;
+        case FULL: JsonSaveStr (root,"client.debug.level","full"); break;
         default:
             JsonSaveStr (root,"logging.level","NORMAL");
     }
@@ -172,11 +172,10 @@ void settings_load_callback (json_t *root) {
         mySettings.os_windows_useansicolor = b1;
 */
     // 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}","logging.level",&s1) == 0) {        
-        if (strncmp (s1,"off",3) == 0) session.logging_level = 0;
-        if (strncmp (s1,"on",2) == 0) session.logging_level = 1;
-        if (strncmp (s1,"full",4) == 0) session.logging_level = 2;
+    if (json_unpack_ex(root,&up_error, 0, "{s:s}","client.debug.level",&s1) == 0) {        
+        if (strncmp (s1,"off",3) == 0) session.client_debug_level = OFF;
+        if (strncmp (s1,"simple",6) == 0) session.client_debug_level = SIMPLE;
+        if (strncmp (s1,"full",4) == 0) session.client_debug_level = FULL;
     }
 
     // window plot
diff --git a/client/ui.h b/client/ui.h
index aea04b6ce..343b55c1f 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -19,6 +19,7 @@
 
 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 clientdebugLevel {OFF,SIMPLE,FULL} clientdebugLevel_t;
 
 typedef struct {
     bool settings_loaded;
@@ -33,7 +34,7 @@ typedef struct {
     int window_plot_ypos;
     int window_plot_hsize;
     int window_plot_wsize;
-    logLevel_t logging_level;
+    clientdebugLevel_t client_debug_level;
 } session_arg_t;
 
 extern session_arg_t session;