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

more settings emoji, hints.

Browse source
This commit is contained in:
iceman1001 2020-04-06 10:54:58 +02:00
commit b6e85c865d
2 changed files with 41 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

66
client/settings.c
View file

@ -44,8 +44,7 @@
#include "emv/emvjson.h" #include "emv/emvjson.h"
// Load all settings into memory (struct) // Load all settings into memory (struct)
int settings_load (void) int settings_load (void) {
{
// loadFileJson wants these, so pass in place holder values, though not used // loadFileJson wants these, so pass in place holder values, though not used
// in settings load; // in settings load;
uint8_t dummyData = 0x00; uint8_t dummyData = 0x00;
@ -68,25 +67,27 @@ int settings_load (void)
int window_ypos; int window_ypos;
int window_hsize; int window_hsize;
int window_wsize; int window_wsize;
bool use_emojis
bool use_hints
*/ */
printf (" Settings Version : [%s]\n",mySettings.version); printf (" Settings Version : [%s]\n", mySettings.version);
printf (" os_windows_usecolor (bool) : [%d]\n",mySettings.os_windows_usecolor); printf (" os_windows_usecolor (bool) : [%d]\n", mySettings.os_windows_usecolor);
printf (" os_windows_useAnsicolor (bool) : [%d]\n",mySettings.os_windows_useansicolor); printf (" os_windows_useAnsicolor (bool) : [%d]\n", mySettings.os_windows_useansicolor);
printf (" window_xpos (int) : [%d]\n",mySettings.window_xpos); printf (" window_xpos (int) : [%d]\n", mySettings.window_xpos);
printf (" window_ypos (int) : [%d]\n",mySettings.window_ypos); printf (" window_ypos (int) : [%d]\n", mySettings.window_ypos);
printf (" window_hsize (int) : [%d]\n",mySettings.window_hsize); printf (" window_hsize (int) : [%d]\n", mySettings.window_hsize);
printf (" window_wsize (int) : [%d]\n",mySettings.window_wsize); printf (" window_wsize (int) : [%d]\n", mySettings.window_wsize);
printf (" use emoji (bool) : [%d]\n", mySettings.use_emojis);
printf (" use hints (bool) : [%d]\n", mySettings.use_hints);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
// Save all settings from memory (struct) to file // Save all settings from memory (struct) to file
int settings_save (void) int settings_save(void) {
{
// Note sure if backup has value ? // Note sure if backup has value ?
char backupFilename[500]; char backupFilename[500];
snprintf (backupFilename,sizeof(backupFilename),"%s.bak",settingsFilename); snprintf(backupFilename, sizeof(backupFilename),"%s.bak",settingsFilename);
if (fileExists (backupFilename)) { if (fileExists (backupFilename)) {
if (remove (backupFilename) != 0) { if (remove (backupFilename) != 0) {
@ -105,17 +106,13 @@ int settings_save (void)
uint8_t dummyData = 0x00; uint8_t dummyData = 0x00;
size_t dummyDL = 0x00; size_t dummyDL = 0x00;
// int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, size_t datalen);
if (saveFileJSON(settingsFilename, jsfSettings, &dummyData, dummyDL) == PM3_SUCCESS) if (saveFileJSON(settingsFilename, jsfSettings, &dummyData, dummyDL) == PM3_SUCCESS)
PrintAndLogEx (NORMAL, "settings have been saved to \"%s\"",settingsFilename); PrintAndLogEx (NORMAL, "settings have been saved to \"%s\"",settingsFilename);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
void settings_save_callback (json_t *root) void settings_save_callback(json_t *root) {
{
// extern settings_t mySettings;
printf ("==> Save Settings\n"); printf ("==> Save Settings\n");
//JsonSaveStr(root, "FileType", "settings"); //JsonSaveStr(root, "FileType", "settings");
@ -131,23 +128,24 @@ void settings_save_callback (json_t *root)
*/ */
JsonSaveStr (root,"FileType","settings"); JsonSaveStr (root,"FileType","settings");
JsonSaveStr (root,"version","1.0 Nov 2019");//mySettings.version); JsonSaveStr (root,"version","1.0 Nov 2019");//mySettings.version);
JsonSaveBoolean (root,"os.windows.useColor",mySettings.os_windows_usecolor); JsonSaveBoolean (root,"os.windows.useColor", mySettings.os_windows_usecolor);
JsonSaveBoolean (root,"os.windows.useAnsiColor",mySettings.os_windows_useansicolor); JsonSaveBoolean (root,"os.windows.useAnsiColor", mySettings.os_windows_useansicolor);
JsonSaveInt (root,"window.xpos",mySettings.window_xpos); JsonSaveInt (root,"window.xpos", mySettings.window_xpos);
JsonSaveInt (root,"window.ypos",mySettings.window_ypos); JsonSaveInt (root,"window.ypos", mySettings.window_ypos);
JsonSaveInt (root,"window.hsize",mySettings.window_hsize); JsonSaveInt (root,"window.hsize", mySettings.window_hsize);
JsonSaveInt (root,"window.wsize",mySettings.window_wsize); JsonSaveInt (root,"window.wsize", mySettings.window_wsize);
JsonSaveBoolean (root,"client.useEmojis", mySettings.use_emojis);
JsonSaveBoolean (root,"client.useHints", mySettings.use_hints);
} }
void settings_load_callback (json_t *root) void settings_load_callback(json_t *root) {
{
// extern settings_t mySettings;
json_error_t up_error = {0}; json_error_t up_error = {0};
int b1; int b1;
int i1; int i1;
const char *s1; const char *s1;
if (json_unpack_ex(root, &up_error , 0, "{s:s}","version",&s1) == 0) if (json_unpack_ex(root, &up_error , 0, "{s:s}","version", &s1) == 0)
strncpy (mySettings.version,s1,sizeof (mySettings.version) - 1); strncpy (mySettings.version,s1,sizeof (mySettings.version) - 1);
else else
strncpy (mySettings.version,"unknown",sizeof (mySettings.version) - 1); strncpy (mySettings.version,"unknown",sizeof (mySettings.version) - 1);
@ -181,4 +179,16 @@ void settings_load_callback (json_t *root)
else // default else // default
mySettings.window_wsize = 0; mySettings.window_wsize = 0;
// Use EMOJIS
if (json_unpack_ex(root,&up_error, 0, "{s:b}","client.useEmojis",&b1) == 0)
mySettings.use_emojis = b1;
else // default
mySettings.use_emojis = false;
// Use Hints
if (json_unpack_ex(root,&up_error, 0, "{s:b}","client.useHints",&b1) == 0)
mySettings.use_hints = b1;
else // default
mySettings.use_hints = false;
} }

2
client/settings.h
View file

@ -24,6 +24,8 @@ typedef struct {
int window_ypos; int window_ypos;
int window_hsize; int window_hsize;
int window_wsize; int window_wsize;
bool use_emojis;
bool use_hints;
} settings_t; } settings_t;
// Settings struct so as to be available to other modules by including settings.h // Settings struct so as to be available to other modules by including settings.h