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

fix: adapting for g_debug access..

Browse source
This commit is contained in:
iceman1001 2018-02-21 14:52:31 +01:00
commit dc22ba144c
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/graph.h
View file

@ -33,7 +33,9 @@ void save_restoreGB(uint8_t saveOpt);
bool HasGraphData(); bool HasGraphData();
// Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample) // Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample)
#ifndef MAX_GRAPH_TRACE_LEN
#define MAX_GRAPH_TRACE_LEN (40000 * 8 ) #define MAX_GRAPH_TRACE_LEN (40000 * 8 )
#endif
#define GRAPH_SAVE 1 #define GRAPH_SAVE 1
#define GRAPH_RESTORE 0 #define GRAPH_RESTORE 0

5
client/proxgui.h
View file

@ -21,8 +21,9 @@ void RepaintGraphWindow(void);
void MainGraphics(void); void MainGraphics(void);
void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present); void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present);
void ExitGraphics(void); void ExitGraphics(void);
#ifndef MAX_GRAPH_TRACE_LEN
#define MAX_GRAPH_TRACE_LEN (40000 * 8) #define MAX_GRAPH_TRACE_LEN (40000 * 8)
#endif
extern int GraphBuffer[MAX_GRAPH_TRACE_LEN]; extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
extern int GraphTraceLen; extern int GraphTraceLen;
extern int s_Buff[MAX_GRAPH_TRACE_LEN]; extern int s_Buff[MAX_GRAPH_TRACE_LEN];
@ -45,7 +46,7 @@ extern void save_restoreGB(uint8_t saveOpt);
#define MAX_DEMOD_BUF_LEN (1024*128) #define MAX_DEMOD_BUF_LEN (1024*128)
extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
extern size_t DemodBufferLen; 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;

7
client/ui.c
View file

@ -24,10 +24,10 @@ static char *logfilename = "proxmark3.log";
void PrintAndLogEx(logLevel_t level, char *fmt, ...) { void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
char buffer[MAX_PRINT_BUFFER] = {0}; char buffer[MAX_PRINT_BUFFER] = {0};
int size; int size = 0;
static char *prefix[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "}; static char *prefix[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
if (g_debugMode == 0 && level == logLevel.DEBUG) { if (g_debugMode == 0 && level == DEBUG) {
// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0' // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
} }
else { else {
@ -183,8 +183,7 @@ void iceSimple_Filter(int *data, const size_t len, uint8_t k){
} }
} }
float complex cexpf (float complex Z) float complex cexpf (float complex Z) {
{
float complex Res; float complex Res;
double rho = exp (__real__ Z); double rho = exp (__real__ Z);
__real__ Res = rho * cosf(__imag__ Z); __real__ Res = rho * cosf(__imag__ Z);

1
client/ui.h
View file

@ -24,6 +24,7 @@
#include "util.h" #include "util.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "proxgui.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846264338327 #define M_PI 3.14159265358979323846264338327