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

some more adjustments

Browse source
This commit is contained in:
iceman1001 2017-07-27 23:00:49 +02:00
commit 86237b629f
4 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/cmddata.c
View file

@ -7,15 +7,15 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Data and Graph commands // Data and Graph commands
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "cmddata.h"
#include <stdio.h> // also included in util.h #include <stdio.h> // also included in util.h
#include <string.h> // also included in util.h #include <string.h> // also included in util.h
#include <inttypes.h>
#include <limits.h> // for CmdNorm INT_MIN && INT_MAX #include <limits.h> // for CmdNorm INT_MIN && INT_MAX
#include "data.h" // also included in util.h #include "data.h" // also included in util.h
#include "cmddata.h"
#include "util.h" #include "util.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "proxmark3.h"
#include "ui.h" // for show graph controls #include "ui.h" // for show graph controls
#include "graph.h" // for graph data #include "graph.h" // for graph data
#include "cmdparser.h"// already included in cmdmain.h #include "cmdparser.h"// already included in cmdmain.h
@ -28,6 +28,9 @@
uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
uint8_t g_debugMode = 0; uint8_t g_debugMode = 0;
size_t DemodBufferLen = 0; size_t DemodBufferLen = 0;
int g_DemodStartIdx=0;
int g_DemodClock=0;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
int usage_data_printdemodbuf(void){ int usage_data_printdemodbuf(void){

3
client/ui.h
View file

@ -22,11 +22,8 @@
#include <math.h> #include <math.h>
#include <complex.h> #include <complex.h>
#include "loclass/cipherutils.h"
#include "util.h" #include "util.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "cmddata.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846264338327 #define M_PI 3.14159265358979323846264338327

18
client/util.c
View file

@ -9,10 +9,25 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "util.h" #include "util.h"
#include <stdint.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
#include "data.h"
#ifdef _WIN32
#include <windows.h>
#endif
#define MAX_BIN_BREAK_LENGTH (3072+384+1) #define MAX_BIN_BREAK_LENGTH (3072+384+1)
#ifndef _WIN32 #ifndef _WIN32
#include <sys/ttydefaults.h> #include <termios.h>
#include <sys/ioctl.h>
#include <unistd.h>
int ukbhit(void) { int ukbhit(void) {
int cnt = 0; int cnt = 0;
@ -39,6 +54,7 @@ int ukbhit(void) {
#else #else
#include <conio.h>
int ukbhit(void) { int ukbhit(void) {
return kbhit(); return kbhit();
} }

23
client/util.h
View file

@ -10,28 +10,9 @@
#ifndef __UTIL_H_ #ifndef __UTIL_H_
#define __UTIL_H_ #define __UTIL_H_
#include <stdio.h>
#include <stdint.h> //included in data.h #include <stdint.h> //included in data.h
#include <stdlib.h> #include <stddef.h>
#include <string.h> #include <inttypes.h>
#include <ctype.h>
#include <math.h> // math.pow
#include <time.h> // time, gmtime
#include <inttypes.h> // PRIx64 defines
#include "proxmark3.h" // time_t
#include "data.h" // for FILE_PATH_SIZE
#include <time.h>
// Handle platform specific includes
#ifndef _WIN32
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <unistd.h>
#else
#include <conio.h>
#include <windows.h>
#endif
#ifdef ANDROID #ifdef ANDROID
#include <endian.h> #include <endian.h>