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

pref cmds - now use cliparser. renamed a enum to fit the global scope better

Browse source
This commit is contained in:
iceman1001 2021-01-09 14:00:58 +01:00
commit ee8309e09b
4 changed files with 263 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

563
client/src/preferences.c
View file

@ -4,8 +4,6 @@
// the license. // the license.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Preferences Functions // Preferences Functions
//-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Notes // Notes
// To add a new setting // To add a new setting
@ -25,6 +23,7 @@
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
#include <proxmark3.h> #include <proxmark3.h>
#include "cliparser.h"
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int setCmdHelp(const char *Cmd); static int setCmdHelp(const char *Cmd);
@ -160,17 +159,17 @@ void preferences_save_callback(json_t *root) {
// Emoji // Emoji
switch (session.emoji_mode) { switch (session.emoji_mode) {
case ALIAS: case EMO_ALIAS:
JsonSaveStr(root, "show.emoji", "alias"); JsonSaveStr(root, "show.emoji", "alias");
break; break;
case EMOJI: case EMO_EMOJI:
JsonSaveStr(root, "show.emoji", "emoji"); JsonSaveStr(root, "show.emoji", "emoji");
break; break;
case ALTTEXT: case EMO_ALTTEXT:
JsonSaveStr(root, "show.emoji", "alttext"); JsonSaveStr(root, "show.emoji", "alttext");
break; break;
case ERASE: case EMO_NONE:
JsonSaveStr(root, "show.emoji", "erase"); JsonSaveStr(root, "show.emoji", "none");
break; break;
default: default:
JsonSaveStr(root, "show.emoji", "ALIAS"); JsonSaveStr(root, "show.emoji", "ALIAS");
@ -302,10 +301,10 @@ void preferences_load_callback(json_t *root) {
if (json_unpack_ex(root, &up_error, 0, "{s:s}", "show.emoji", &s1) == 0) { if (json_unpack_ex(root, &up_error, 0, "{s:s}", "show.emoji", &s1) == 0) {
strncpy(tempStr, s1, sizeof(tempStr) - 1); strncpy(tempStr, s1, sizeof(tempStr) - 1);
str_lower(tempStr); str_lower(tempStr);
if (strncmp(tempStr, "alias", 5) == 0) session.emoji_mode = ALIAS; if (strncmp(tempStr, "alias", 5) == 0) session.emoji_mode = EMO_ALIAS;
if (strncmp(tempStr, "emoji", 5) == 0) session.emoji_mode = EMOJI; if (strncmp(tempStr, "emoji", 5) == 0) session.emoji_mode = EMO_EMOJI;
if (strncmp(tempStr, "alttext", 7) == 0) session.emoji_mode = ALTTEXT; if (strncmp(tempStr, "alttext", 7) == 0) session.emoji_mode = EMO_ALTTEXT;
if (strncmp(tempStr, "erase", 5) == 0) session.emoji_mode = ERASE; if (strncmp(tempStr, "none", 4) == 0) session.emoji_mode = EMO_NONE;
} }
if (json_unpack_ex(root, &up_error, 0, "{s:b}", "show.hints", &b1) == 0) if (json_unpack_ex(root, &up_error, 0, "{s:b}", "show.hints", &b1) == 0)
@ -339,45 +338,6 @@ void preferences_load_callback(json_t *root) {
// Help Functions // Help Functions
static int usage_set_emoji(void) {
PrintAndLogEx(NORMAL, "Usage: pref set emoji <alias | emoji | alttext | erase>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " "_GREEN_("help")" - This help");
PrintAndLogEx(NORMAL, " "_GREEN_("alias")" - Show alias for emoji");
PrintAndLogEx(NORMAL, " "_GREEN_("emoji")" - Show amoji");
PrintAndLogEx(NORMAL, " "_GREEN_("alttext")" - Show alt text for emoji");
PrintAndLogEx(NORMAL, " "_GREEN_("erase")" - Dont show emoji or text");
return PM3_SUCCESS;
}
static int usage_set_color(void) {
PrintAndLogEx(NORMAL, "Usage: pref set color <off | ansi>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " "_GREEN_("help")" - This help");
PrintAndLogEx(NORMAL, " "_GREEN_("off")" - Dont use colors");
PrintAndLogEx(NORMAL, " "_GREEN_("ansi")" - Use ANSI colors");
return PM3_SUCCESS;
}
static int usage_set_debug(void) {
PrintAndLogEx(NORMAL, "Usage: pref set clientdebug <off | simple | full>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " "_GREEN_("help")" - This help");
PrintAndLogEx(NORMAL, " "_GREEN_("off")" - no debug messages");
PrintAndLogEx(NORMAL, " "_GREEN_("simple")" - simple debug messages");
PrintAndLogEx(NORMAL, " "_GREEN_("full")" - full debug messages");
return PM3_SUCCESS;
}
static int usage_set_bar_mode(void) {
PrintAndLogEx(NORMAL, "Usage: pref set barmode <bar | mixed | value>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " "_GREEN_("help")" - This help");
PrintAndLogEx(NORMAL, " "_GREEN_("bar")" - measured values as bar only");
PrintAndLogEx(NORMAL, " "_GREEN_("mixed")" - measured values as numbers and bar");
PrintAndLogEx(NORMAL, " "_GREEN_("value")" - measured values");
return PM3_SUCCESS;
}
/* /*
static int usage_set_devicedebug(void) { static int usage_set_devicedebug(void) {
@ -393,23 +353,8 @@ static int usage_set_devicedebug(void) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
*/ */
static int usage_set_hints(void) {
PrintAndLogEx(NORMAL, "Usage: pref set hints <off | on>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " "_GREEN_("help")" - This help");
PrintAndLogEx(NORMAL, " "_GREEN_("off")" - Dont display hints");
PrintAndLogEx(NORMAL, " "_GREEN_("on")" - Display hints");
return PM3_SUCCESS;
}
static int usage_set_plotsliders(void) {
PrintAndLogEx(NORMAL, "Usage: pref set plotsliders <on | off>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " "_GREEN_("help")" - This help");
PrintAndLogEx(NORMAL, " "_GREEN_("on")" - show plot slider controls");
PrintAndLogEx(NORMAL, " "_GREEN_("off")" - hide plot slider controls");
return PM3_SUCCESS;
}
/* /*
static int usage_set_savePaths(void) { static int usage_set_savePaths(void) {
@ -431,30 +376,29 @@ typedef enum prefShowOpt {prefShowNone, prefShowOLD, prefShowNEW} prefShowOpt_t;
static const char *prefShowMsg(prefShowOpt_t Opt) { static const char *prefShowMsg(prefShowOpt_t Opt) {
switch (Opt) { switch (Opt) {
case prefShowOLD: case prefShowOLD:
return _YELLOW_("[old]"); return "( " _YELLOW_("old") " )";
case prefShowNEW: case prefShowNEW:
return _GREEN_("[new]"); return "( " _GREEN_("new") " )";
case prefShowNone: case prefShowNone:
return ""; return "";
} }
return ""; return "";
} }
static void showEmojiState(prefShowOpt_t opt) { static void showEmojiState(prefShowOpt_t opt) {
switch (session.emoji_mode) { switch (session.emoji_mode) {
case ALIAS: case EMO_ALIAS:
PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("alias"), prefShowMsg(opt)); PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("alias"), prefShowMsg(opt));
break; break;
case EMOJI: case EMO_EMOJI:
PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("emoji"), prefShowMsg(opt)); PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("emoji"), prefShowMsg(opt));
break; break;
case ALTTEXT: case EMO_ALTTEXT:
PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("alttext"), prefShowMsg(opt)); PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("alttext"), prefShowMsg(opt));
break; break;
case ERASE: case EMO_NONE:
PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("erase"), prefShowMsg(opt)); PrintAndLogEx(INFO, " %s emoji.................. "_GREEN_("none"), prefShowMsg(opt));
break; break;
default: default:
PrintAndLogEx(INFO, " %s emoji.................. "_RED_("unknown"), prefShowMsg(opt)); PrintAndLogEx(INFO, " %s emoji.................. "_RED_("unknown"), prefShowMsg(opt));
@ -574,153 +518,149 @@ static void showBarModeState(prefShowOpt_t opt) {
} }
} }
static int setCmdEmoji(const char *Cmd) { static int setCmdEmoji(const char *Cmd) {
uint8_t cmdp = 0; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "pref set emoji ",
bool validValue = false; "Set presistent preference of using emojis in the client",
char strOpt[50]; "pref set emoji --alias"
emojiMode_t newValue = session.emoji_mode; );
if (param_getchar(Cmd, cmdp) == 0x00) void *argtable[] = {
return usage_set_emoji(); arg_param_begin,
arg_lit0(NULL, "alias", "show alias for emoji"),
arg_lit0(NULL, "emoji", "show emoji"),
arg_lit0(NULL, "alttext", "show alt text for emoji"),
arg_lit0(NULL, "none", "don't show emoji or text"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool show_a = arg_get_lit(ctx, 1);
bool show_e = arg_get_lit(ctx, 2);
bool show_alt = arg_get_lit(ctx, 3);
bool show_none = arg_get_lit(ctx, 4);
CLIParserFree(ctx);
if ( (show_a + show_e + show_alt + show_none) > 1) {
PrintAndLogEx(FAILED, "Can only set one option");
return PM3_EINVARG;
}
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) { emojiMode_t new_value = session.emoji_mode;
if (param_getstr(Cmd, cmdp++, strOpt, sizeof(strOpt)) != 0) { if (show_a) {
str_lower(strOpt); // convert to lowercase new_value = EMO_ALIAS;
}
if (show_e) {
new_value = EMO_EMOJI;
}
if (show_alt) {
new_value = EMO_ALTTEXT;
}
if (show_none) {
new_value = EMO_NONE;
}
if (strncmp(strOpt, "help", 4) == 0) if (session.emoji_mode != new_value) {// changed
return usage_set_emoji(); showEmojiState(prefShowOLD);
if (strncmp(strOpt, "alias", 5) == 0) { session.emoji_mode = new_value;
validValue = true; showEmojiState(prefShowNEW);
newValue = ALIAS; preferences_save();
} } else {
if (strncmp(strOpt, "emoji", 5) == 0) { showEmojiState(prefShowNone);
validValue = true;
newValue = EMOJI;
}
if (strncmp(strOpt, "alttext", 7) == 0) {
validValue = true;
newValue = ALTTEXT;
}
if (strncmp(strOpt, "erase", 5) == 0) {
validValue = true;
newValue = ERASE;
}
if (validValue) {
if (session.emoji_mode != newValue) {// changed
showEmojiState(prefShowOLD);
session.emoji_mode = newValue;
showEmojiState(prefShowNEW);
preferences_save();
} else {
PrintAndLogEx(INFO, "nothing changed");
showEmojiState(prefShowNone);
}
} else {
PrintAndLogEx(ERR, "invalid option");
return usage_set_emoji();
}
}
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int setCmdColor(const char *Cmd) { static int setCmdColor(const char *Cmd) {
uint8_t cmdp = 0; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "pref set color ",
bool validValue = false; "Set presistent preference of using colors in the client",
char strOpt[50]; "pref set color --ansi"
bool newValue = session.supports_colors; );
if (param_getchar(Cmd, cmdp) == 0x00) void *argtable[] = {
return usage_set_color(); arg_param_begin,
arg_lit0(NULL, "ansi", "use ANSI colors"),
arg_lit0(NULL, "off", "don't use colors"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool use_c = arg_get_lit(ctx, 1);
bool use_n = arg_get_lit(ctx, 2);
CLIParserFree(ctx);
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) { if ( (use_c + use_n) > 1) {
PrintAndLogEx(FAILED, "Can only set one option");
return PM3_EINVARG;
}
if (param_getstr(Cmd, cmdp++, strOpt, sizeof(strOpt)) != 0) { bool new_value = session.supports_colors;
str_lower(strOpt); // convert to lowercase if (use_c) {
new_value = true;
}
if (strncmp(strOpt, "help", 4) == 0) if (use_n) {
return usage_set_color(); new_value = false;
if (strncmp(strOpt, "off", 3) == 0) { }
validValue = true;
newValue = false;
}
if (strncmp(strOpt, "ansi", 4) == 0) {
validValue = true;
newValue = true;
}
if (validValue) { if (session.supports_colors != new_value) {
if (session.supports_colors != newValue) {// changed showColorState(prefShowOLD);
showColorState(prefShowOLD); session.supports_colors = new_value;
session.supports_colors = newValue; showColorState(prefShowNEW);
showColorState(prefShowNEW); preferences_save();
preferences_save(); } else {
} else { showColorState(prefShowNone);
PrintAndLogEx(INFO, "nothing changed");
showColorState(prefShowNone);
}
} else {
PrintAndLogEx(ERR, "invalid option");
return usage_set_color();
}
}
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int setCmdDebug(const char *Cmd) { static int setCmdDebug(const char *Cmd) {
uint8_t cmdp = 0; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "pref set clientdebug ",
bool validValue = false; "Set presistent preference of using clientside debug level",
char strOpt[50]; "pref set clientdebug --simple"
clientdebugLevel_t newValue = session.client_debug_level; );
if (param_getchar(Cmd, cmdp) == 0x00) void *argtable[] = {
return usage_set_debug(); arg_param_begin,
arg_lit0(NULL, "off", "no debug messages"),
arg_lit0(NULL, "simple", "simple debug messages"),
arg_lit0(NULL, "full", "full debug messages"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool use_off = arg_get_lit(ctx, 1);
bool use_simple = arg_get_lit(ctx, 2);
bool use_full = arg_get_lit(ctx, 3);
CLIParserFree(ctx);
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) { if ( (use_off + use_simple + use_full) > 1) {
PrintAndLogEx(FAILED, "Can only set one option");
return PM3_EINVARG;
}
if (param_getstr(Cmd, cmdp++, strOpt, sizeof(strOpt)) != 0) { clientdebugLevel_t new_value = session.client_debug_level;
str_lower(strOpt); // convert to lowercase
if (strncmp(strOpt, "help", 4) == 0) if (use_off) {
return usage_set_debug(); new_value = cdbOFF;
if (strncmp(strOpt, "off", 3) == 0) { }
validValue = true; if (use_simple) {
newValue = cdbOFF; new_value = cdbSIMPLE;
} }
if (strncmp(strOpt, "simple", 6) == 0) { if (use_full) {
validValue = true; new_value = cdbFULL;
newValue = cdbSIMPLE; }
}
if (strncmp(strOpt, "full", 4) == 0) {
validValue = true;
newValue = cdbFULL;
}
if (validValue) { if (session.client_debug_level != new_value) {
if (session.client_debug_level != newValue) {// changed showClientDebugState(prefShowOLD);
showClientDebugState(prefShowOLD); session.client_debug_level = new_value;
session.client_debug_level = newValue; g_debugMode = new_value;
g_debugMode = newValue; showClientDebugState(prefShowNEW);
showClientDebugState(prefShowNEW); preferences_save();
preferences_save(); } else {
} else { showClientDebugState(prefShowNone);
PrintAndLogEx(INFO, "nothing changed");
showClientDebugState(prefShowNone);
}
} else {
PrintAndLogEx(ERR, "invalid option");
return usage_set_debug();
}
}
} }
return PM3_SUCCESS; return PM3_SUCCESS;
@ -793,93 +733,86 @@ static int setCmdDeviceDebug (const char *Cmd)
} }
*/ */
static int setCmdHint(const char *Cmd) { static int setCmdHint(const char *Cmd) {
uint8_t cmdp = 0; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "pref set hints ",
bool validValue = false; "Set presistent preference of showing hint messages in the client",
char strOpt[50]; "pref set hints --on"
bool newValue = session.show_hints; );
if (param_getchar(Cmd, cmdp) == 0x00) void *argtable[] = {
return usage_set_hints(); arg_param_begin,
arg_lit0(NULL, "off", "hide hints"),
arg_lit0(NULL, "on", "show hints"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool use_off = arg_get_lit(ctx, 1);
bool use_on = arg_get_lit(ctx, 2);
CLIParserFree(ctx);
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) { if ( (use_off + use_on) > 1) {
PrintAndLogEx(FAILED, "Can only set one option");
return PM3_EINVARG;
}
bool new_value = session.show_hints;
if (use_off) {
new_value = false;
}
if (use_on) {
new_value = true;
}
if (param_getstr(Cmd, cmdp++, strOpt, sizeof(strOpt)) != 0) { if (session.show_hints != new_value) {
str_lower(strOpt); // convert to lowercase showHintsState(prefShowOLD);
session.show_hints = new_value;
if (strncmp(strOpt, "help", 4) == 0) showHintsState(prefShowNEW);
return usage_set_hints(); preferences_save();
if (strncmp(strOpt, "off", 3) == 0) { } else {
validValue = true; showHintsState(prefShowNone);
newValue = false;
}
if (strncmp(strOpt, "on", 2) == 0) {
validValue = true;
newValue = true;
}
if (validValue) {
if (session.show_hints != newValue) {// changed
showHintsState(prefShowOLD);
session.show_hints = newValue;
showHintsState(prefShowNEW);
preferences_save();
} else {
PrintAndLogEx(INFO, "nothing changed");
showHintsState(prefShowNone);
}
} else {
PrintAndLogEx(ERR, "invalid option");
return usage_set_hints();
}
}
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int setCmdPlotSliders(const char *Cmd) { static int setCmdPlotSliders(const char *Cmd) {
uint8_t cmdp = 0; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "pref set plotsliders ",
bool validValue = false; "Set presistent preference of showing the plotslider control in the client",
char strOpt[50]; "pref set plotsliders --on"
bool newValue = session.overlay_sliders; );
if (param_getchar(Cmd, cmdp) == 0x00) void *argtable[] = {
return usage_set_plotsliders(); arg_param_begin,
arg_lit0(NULL, "off", "hide plot slider controls"),
arg_lit0(NULL, "on", "show plot slider controls"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool use_off = arg_get_lit(ctx, 1);
bool use_on = arg_get_lit(ctx, 2);
CLIParserFree(ctx);
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) { if ( (use_off + use_on) > 1) {
PrintAndLogEx(FAILED, "Can only set one option");
if (param_getstr(Cmd, cmdp++, strOpt, sizeof(strOpt)) != 0) { return PM3_EINVARG;
str_lower(strOpt); // convert to lowercase }
if (strncmp(strOpt, "help", 4) == 0) bool new_value = session.overlay_sliders;
return usage_set_plotsliders(); if (use_off) {
if (strncmp(strOpt, "off", 3) == 0) { new_value = false;
validValue = true; }
newValue = false; if (use_on) {
} new_value = true;
if (strncmp(strOpt, "on", 2) == 0) {
validValue = true;
newValue = true;
}
if (validValue) {
if (session.overlay_sliders != newValue) {// changed
showPlotSliderState(prefShowOLD);
session.overlay_sliders = newValue;
showPlotSliderState(prefShowNEW);
preferences_save();
} else {
PrintAndLogEx(INFO, "nothing changed");
showPlotSliderState(prefShowNone);
}
} else {
PrintAndLogEx(ERR, "invalid option");
return usage_set_plotsliders();
}
}
} }
if (session.overlay_sliders != new_value) {
showPlotSliderState(prefShowOLD);
session.overlay_sliders = new_value;
showPlotSliderState(prefShowNEW);
preferences_save();
} else {
showPlotSliderState(prefShowNone);
}
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -975,53 +908,49 @@ static int getCmdHelp(const char *Cmd) {
*/ */
static int setCmdBarMode(const char *Cmd) { static int setCmdBarMode(const char *Cmd) {
uint8_t cmdp = 0; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "pref set barmode",
bool validValue = false; "Set presistent preference of HF/LF tune command styled output in the client",
char strOpt[50]; "pref set barmode --mix"
barMode_t newValue = session.bar_mode; );
if (param_getchar(Cmd, cmdp) == 0x00) void *argtable[] = {
return usage_set_bar_mode(); arg_param_begin,
arg_lit0(NULL, "bar", "measured values as bar only"),
arg_lit0(NULL, "mix", "measured values as numbers and bar"),
arg_lit0(NULL, "val", "measured values only"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool show_bar = arg_get_lit(ctx, 1);
bool show_mix = arg_get_lit(ctx, 2);
bool show_val = arg_get_lit(ctx, 3);
CLIParserFree(ctx);
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) { if ( (show_bar + show_mix + show_val) > 1) {
PrintAndLogEx(FAILED, "Can only set one option");
if (param_getstr(Cmd, cmdp++, strOpt, sizeof(strOpt)) != 0) { return PM3_EINVARG;
str_lower(strOpt); // convert to lowercase
if (strncmp(strOpt, "help", 4) == 0)
return usage_set_bar_mode();
if (strncmp(strOpt, "bar", 3) == 0) {
validValue = true;
newValue = STYLE_BAR;
}
if (strncmp(strOpt, "mixed", 5) == 0) {
validValue = true;
newValue = STYLE_MIXED;
}
if (strncmp(strOpt, "value", 5) == 0) {
validValue = true;
newValue = STYLE_VALUE;
}
if (validValue) {
if (session.bar_mode != newValue) {// changed
showBarModeState(prefShowOLD);
session.bar_mode = newValue;
showBarModeState(prefShowNEW);
preferences_save();
} else {
PrintAndLogEx(INFO, "nothing changed");
showBarModeState(prefShowNone);
}
} else {
PrintAndLogEx(ERR, "invalid option");
return usage_set_bar_mode();
}
}
} }
barMode_t new_value = session.bar_mode;
if (show_bar) {
new_value = STYLE_BAR;
}
if (show_mix) {
new_value = STYLE_MIXED;
}
if (show_val) {
new_value = STYLE_VALUE;
}
if (session.bar_mode != new_value) {
showBarModeState(prefShowOLD);
session.bar_mode = new_value;
showBarModeState(prefShowNEW);
preferences_save();
} else {
showBarModeState(prefShowNone);
}
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -1056,7 +985,7 @@ static int getCmdBarMode(const char *Cmd) {
} }
static command_t getCommandTable[] = { static command_t CommandTableGet[] = {
// {"help", getCmdHelp, AlwaysAvailable, "This help"}, // {"help", getCmdHelp, AlwaysAvailable, "This help"},
{"barmode", getCmdBarMode, AlwaysAvailable, "Get bar mode preference"}, {"barmode", getCmdBarMode, AlwaysAvailable, "Get bar mode preference"},
{"clientdebug", getCmdDebug, AlwaysAvailable, "Get client debug level preference"}, {"clientdebug", getCmdDebug, AlwaysAvailable, "Get client debug level preference"},
@ -1069,7 +998,7 @@ static command_t getCommandTable[] = {
{NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL}
}; };
static command_t setCommandTable[] = { static command_t CommandTableSet[] = {
{"help", setCmdHelp, AlwaysAvailable, "This help"}, {"help", setCmdHelp, AlwaysAvailable, "This help"},
{"barmode", setCmdBarMode, AlwaysAvailable, "Set bar mode"}, {"barmode", setCmdBarMode, AlwaysAvailable, "Set bar mode"},
{"clientdebug", setCmdDebug, AlwaysAvailable, "Set client debug level"}, {"clientdebug", setCmdDebug, AlwaysAvailable, "Set client debug level"},
@ -1084,18 +1013,18 @@ static command_t setCommandTable[] = {
static int setCmdHelp(const char *Cmd) { static int setCmdHelp(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
CmdsHelp(setCommandTable); CmdsHelp(CommandTableSet);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int CmdPrefGet(const char *Cmd) { static int CmdPrefGet(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
return CmdsParse(getCommandTable, Cmd); return CmdsParse(CommandTableGet, Cmd);
} }
static int CmdPrefSet(const char *Cmd) { static int CmdPrefSet(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
return CmdsParse(setCommandTable, Cmd); return CmdsParse(CommandTableSet, Cmd);
} }
static int CmdPrefShow(const char *Cmd) { static int CmdPrefShow(const char *Cmd) {

10
client/src/proxmark3.c
View file

@ -711,7 +711,7 @@ void pm3_init(void) {
session.help_dump_mode = false; session.help_dump_mode = false;
session.incognito = false; session.incognito = false;
session.supports_colors = false; session.supports_colors = false;
session.emoji_mode = ALTTEXT; session.emoji_mode = EMO_ALTTEXT;
session.stdinOnTTY = false; session.stdinOnTTY = false;
session.stdoutOnTTY = false; session.stdoutOnTTY = false;
@ -769,14 +769,14 @@ int main(int argc, char *argv[]) {
session.stdinOnTTY = isatty(STDIN_FILENO); session.stdinOnTTY = isatty(STDIN_FILENO);
session.stdoutOnTTY = isatty(STDOUT_FILENO); session.stdoutOnTTY = isatty(STDOUT_FILENO);
session.supports_colors = false; session.supports_colors = false;
session.emoji_mode = ALTTEXT; session.emoji_mode = EMO_ALTTEXT;
if (session.stdinOnTTY && session.stdoutOnTTY) { if (session.stdinOnTTY && session.stdoutOnTTY) {
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
session.supports_colors = true; session.supports_colors = true;
session.emoji_mode = EMOJI; session.emoji_mode = EMO_EMOJI;
#elif defined(_WIN32) #elif defined(_WIN32)
session.supports_colors = DetectWindowsAnsiSupport(); session.supports_colors = DetectWindowsAnsiSupport();
session.emoji_mode = ALTTEXT; session.emoji_mode = EMO_ALTTEXT;
#endif #endif
} }
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
@ -976,7 +976,7 @@ int main(int argc, char *argv[]) {
// even if prefs, we disable colors if stdin or stdout is not a TTY // even if prefs, we disable colors if stdin or stdout is not a TTY
if ((! session.stdinOnTTY) || (! session.stdoutOnTTY)) { if ((! session.stdinOnTTY) || (! session.stdoutOnTTY)) {
session.supports_colors = false; session.supports_colors = false;
session.emoji_mode = ALTTEXT; session.emoji_mode = EMO_ALTTEXT;
} }
// Let's take a baudrate ok for real UART, USB-CDC & BT don't use that info anyway // Let's take a baudrate ok for real UART, USB-CDC & BT don't use that info anyway

22
client/src/ui.c
View file

@ -202,14 +202,14 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
}; };
switch (level) { switch (level) {
case ERR: case ERR:
if (session.emoji_mode == EMOJI) if (session.emoji_mode == EMO_EMOJI)
strncpy(prefix, "[" _RED_("!!") "] :rotating_light: ", sizeof(prefix) - 1); strncpy(prefix, "[" _RED_("!!") "] :rotating_light: ", sizeof(prefix) - 1);
else else
strncpy(prefix, "[" _RED_("!!") "] ", sizeof(prefix) - 1); strncpy(prefix, "[" _RED_("!!") "] ", sizeof(prefix) - 1);
stream = stderr; stream = stderr;
break; break;
case FAILED: case FAILED:
if (session.emoji_mode == EMOJI) if (session.emoji_mode == EMO_EMOJI)
strncpy(prefix, "[" _RED_("-") "] :no_entry: ", sizeof(prefix) - 1); strncpy(prefix, "[" _RED_("-") "] :no_entry: ", sizeof(prefix) - 1);
else else
strncpy(prefix, "[" _RED_("-") "] ", sizeof(prefix) - 1); strncpy(prefix, "[" _RED_("-") "] ", sizeof(prefix) - 1);
@ -224,7 +224,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
strncpy(prefix, "[" _GREEN_("+") "] ", sizeof(prefix) - 1); strncpy(prefix, "[" _GREEN_("+") "] ", sizeof(prefix) - 1);
break; break;
case WARNING: case WARNING:
if (session.emoji_mode == EMOJI) if (session.emoji_mode == EMO_EMOJI)
strncpy(prefix, "[" _CYAN_("!") "] :warning: ", sizeof(prefix) - 1); strncpy(prefix, "[" _CYAN_("!") "] :warning: ", sizeof(prefix) - 1);
else else
strncpy(prefix, "[" _CYAN_("!") "] ", sizeof(prefix) - 1); strncpy(prefix, "[" _CYAN_("!") "] ", sizeof(prefix) - 1);
@ -233,7 +233,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
strncpy(prefix, "[" _YELLOW_("=") "] ", sizeof(prefix) - 1); strncpy(prefix, "[" _YELLOW_("=") "] ", sizeof(prefix) - 1);
break; break;
case INPLACE: case INPLACE:
if (session.emoji_mode == EMOJI) { if (session.emoji_mode == EMO_EMOJI) {
strncpy(prefix, spinner_emoji[PrintAndLogEx_spinidx], sizeof(prefix) - 1); strncpy(prefix, spinner_emoji[PrintAndLogEx_spinidx], sizeof(prefix) - 1);
PrintAndLogEx_spinidx++; PrintAndLogEx_spinidx++;
if (PrintAndLogEx_spinidx >= ARRAYLEN(spinner_emoji)) if (PrintAndLogEx_spinidx >= ARRAYLEN(spinner_emoji))
@ -388,7 +388,7 @@ static void fPrintAndLog(FILE *stream, const char *fmt, ...) {
#endif #endif
if ((g_printAndLog & PRINTANDLOG_LOG) && logging && logfile) { if ((g_printAndLog & PRINTANDLOG_LOG) && logging && logfile) {
memcpy_filter_emoji(buffer3, buffer2, sizeof(buffer2), ALTTEXT); memcpy_filter_emoji(buffer3, buffer2, sizeof(buffer2), EMO_ALTTEXT);
if (filter_ansi) { // already done if (filter_ansi) { // already done
fprintf(logfile, "%s", buffer3); fprintf(logfile, "%s", buffer3);
} else { } else {
@ -466,12 +466,12 @@ static bool emojify_token(const char *token, uint8_t token_length, const char **
while (EmojiTable[i].alias && EmojiTable[i].emoji) { while (EmojiTable[i].alias && EmojiTable[i].emoji) {
if ((strlen(EmojiTable[i].alias) == token_length) && (0 == memcmp(EmojiTable[i].alias, token, token_length))) { if ((strlen(EmojiTable[i].alias) == token_length) && (0 == memcmp(EmojiTable[i].alias, token, token_length))) {
switch (mode) { switch (mode) {
case EMOJI: { case EMO_EMOJI: {
*emojified_token = EmojiTable[i].emoji; *emojified_token = EmojiTable[i].emoji;
*emojified_token_length = strlen(EmojiTable[i].emoji); *emojified_token_length = strlen(EmojiTable[i].emoji);
break; break;
} }
case ALTTEXT: { case EMO_ALTTEXT: {
int j = 0; int j = 0;
*emojified_token_length = 0; *emojified_token_length = 0;
while (EmojiAltTable[j].alias && EmojiAltTable[i].alttext) { while (EmojiAltTable[j].alias && EmojiAltTable[i].alttext) {
@ -484,11 +484,11 @@ static bool emojify_token(const char *token, uint8_t token_length, const char **
} }
break; break;
} }
case ERASE: { case EMO_NONE: {
*emojified_token_length = 0; *emojified_token_length = 0;
break; break;
} }
case ALIAS: { // should never happen case EMO_ALIAS: { // should never happen
return false; return false;
} }
} }
@ -508,7 +508,7 @@ static bool token_charset(uint8_t c) {
} }
void memcpy_filter_emoji(void *dest, const void *src, size_t n, emojiMode_t mode) { void memcpy_filter_emoji(void *dest, const void *src, size_t n, emojiMode_t mode) {
if (mode == ALIAS) { if (mode == EMO_ALIAS) {
memcpy(dest, src, n); memcpy(dest, src, n);
} else { } else {
// tokenize emoji // tokenize emoji
@ -658,7 +658,7 @@ void print_progress(size_t count, uint64_t max, barMode_t style) {
"\xe2\x96\x88", "\xe2\x96\x88",
}; };
uint8_t mode = (session.emoji_mode == EMOJI); uint8_t mode = (session.emoji_mode == EMO_EMOJI);
const char *block[] = {"#", "\xe2\x96\x88"}; const char *block[] = {"#", "\xe2\x96\x88"};
// use a 3-byte space in emoji mode to ease computations // use a 3-byte space in emoji mode to ease computations

2
client/src/ui.h
View file

@ -24,7 +24,7 @@ extern "C" {
typedef enum {STYLE_BAR, STYLE_MIXED, STYLE_VALUE} barMode_t; typedef enum {STYLE_BAR, STYLE_MIXED, STYLE_VALUE} barMode_t;
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 {EMO_ALIAS, EMO_EMOJI, EMO_ALTTEXT, EMO_NONE} emojiMode_t;
typedef enum clientdebugLevel {cdbOFF, cdbSIMPLE, cdbFULL} clientdebugLevel_t; typedef enum clientdebugLevel {cdbOFF, cdbSIMPLE, cdbFULL} clientdebugLevel_t;
// typedef enum devicedebugLevel {ddbOFF, ddbERROR, ddbINFO, ddbDEBUG, ddbEXTENDED} devicedebugLevel_t; // typedef enum devicedebugLevel {ddbOFF, ddbERROR, ddbINFO, ddbDEBUG, ddbEXTENDED} devicedebugLevel_t;
//typedef enum savePaths {spDefault, spDump, spTrace, spItemCount} savePaths_t; // last item spItemCount used to auto map to number of files //typedef enum savePaths {spDefault, spDump, spTrace, spItemCount} savePaths_t; // last item spItemCount used to auto map to number of files