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

Fix the issue of SKIPQT builds not working

Browse source
This commit is contained in:
jlitewski 2024-04-26 07:23:38 -04:00
commit d820153a61
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/graph.c
View file

@ -32,6 +32,9 @@ int32_t g_OverlayBuffer[MAX_GRAPH_TRACE_LEN];
bool g_useOverlays = false; bool g_useOverlays = false;
size_t g_GraphTraceLen; size_t g_GraphTraceLen;
buffer_savestate_t g_saveState_gb; buffer_savestate_t g_saveState_gb;
marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
marker_t *g_TempMarkers;
uint8_t g_TempMarkerSize = 0;
/* write a manchester bit to the graph /* write a manchester bit to the graph
*/ */

9
client/src/graph.h
View file

@ -33,6 +33,11 @@ typedef struct {
uint32_t clock; //Not used by all buffers uint32_t clock; //Not used by all buffers
} buffer_savestate_t; } buffer_savestate_t;
typedef struct {
uint32_t pos;
char label[30];
} marker_t;
void AppendGraph(bool redraw, uint16_t clock, int bit); void AppendGraph(bool redraw, uint16_t clock, int bit);
size_t ClearGraph(bool redraw); size_t ClearGraph(bool redraw);
bool HasGraphData(void); bool HasGraphData(void);
@ -68,6 +73,10 @@ extern int32_t g_OverlayBuffer[MAX_GRAPH_TRACE_LEN];
extern bool g_useOverlays; extern bool g_useOverlays;
extern size_t g_GraphTraceLen; extern size_t g_GraphTraceLen;
extern marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
extern marker_t *g_TempMarkers;
extern uint8_t g_TempMarkerSize;
extern double g_GridOffset; extern double g_GridOffset;
extern buffer_savestate_t g_saveState_gb; extern buffer_savestate_t g_saveState_gb;

3
client/src/proxgui.cpp
View file

@ -24,9 +24,6 @@
#include "ui.h" // for prints #include "ui.h" // for prints
static ProxGuiQT *gui = NULL; static ProxGuiQT *gui = NULL;
marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
marker_t *g_TempMarkers;
uint8_t g_TempMarkerSize = 0;
static WorkerThread *main_loop_thread = NULL; static WorkerThread *main_loop_thread = NULL;
WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), stayInCommandLoop(stayInCommandLoop) { WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), stayInCommandLoop(stayInCommandLoop) {

8
client/src/proxgui.h
View file

@ -27,11 +27,6 @@ extern "C" {
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
typedef struct {
uint32_t pos;
char label[30];
} marker_t;
void ShowGraphWindow(void); void ShowGraphWindow(void);
void HideGraphWindow(void); void HideGraphWindow(void);
void RepaintGraphWindow(void); void RepaintGraphWindow(void);
@ -53,9 +48,6 @@ extern void remove_temporary_markers(void);
extern double g_CursorScaleFactor; extern double g_CursorScaleFactor;
extern char g_CursorScaleFactorUnit[11]; extern char g_CursorScaleFactorUnit[11];
extern double g_PlotGridX, g_PlotGridY, g_DefaultGridX, g_DefaultGridY; extern double g_PlotGridX, g_PlotGridY, g_DefaultGridX, g_DefaultGridY;
extern marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
extern marker_t *g_TempMarkers;
extern uint8_t g_TempMarkerSize;
extern uint32_t g_GraphStart, g_GraphStart_old, g_GraphStop; extern uint32_t g_GraphStart, g_GraphStart_old, g_GraphStop;
extern int CommandFinished; extern int CommandFinished;
extern int offline; extern int offline;

1
client/src/proxguiqt.h
View file

@ -30,6 +30,7 @@
#include <QtGui> #include <QtGui>
#include "proxgui.h" #include "proxgui.h"
#include "graph.h"
#include "ui/ui_overlays.h" #include "ui/ui_overlays.h"
#include "ui/ui_image.h" #include "ui/ui_image.h"