make style

This commit is contained in:
Philippe Teuwen 2019-03-10 00:00:59 +01:00
commit 0373696662
483 changed files with 56514 additions and 52451 deletions

View file

@ -16,7 +16,8 @@ int s_Buff[MAX_GRAPH_TRACE_LEN];
/* write a manchester bit to the graph
TODO, verfy that this doesn't overflow buffer (iceman)
*/
void AppendGraph(bool redraw, int clock, int bit) {
void AppendGraph(bool redraw, int clock, int bit)
{
int i;
//set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
for (i = 0; i < (int)(clock / 2); ++i)
@ -30,7 +31,8 @@ void AppendGraph(bool redraw, int clock, int bit) {
}
// clear out our graph window
int ClearGraph(bool redraw) {
int ClearGraph(bool redraw)
{
int gtl = GraphTraceLen;
memset(GraphBuffer, 0x00, GraphTraceLen);
GraphTraceLen = 0;
@ -39,7 +41,8 @@ int ClearGraph(bool redraw) {
return gtl;
}
// option '1' to save GraphBuffer any other to restore
void save_restoreGB(uint8_t saveOpt) {
void save_restoreGB(uint8_t saveOpt)
{
static int SavedGB[MAX_GRAPH_TRACE_LEN];
static int SavedGBlen = 0;
static bool GB_Saved = false;
@ -50,7 +53,7 @@ void save_restoreGB(uint8_t saveOpt) {
SavedGBlen = GraphTraceLen;
GB_Saved = true;
SavedGridOffsetAdj = GridOffset;
} else if (GB_Saved){ //restore
} else if (GB_Saved) { //restore
memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
GraphTraceLen = SavedGBlen;
GridOffset = SavedGridOffsetAdj;
@ -59,12 +62,13 @@ void save_restoreGB(uint8_t saveOpt) {
return;
}
void setGraphBuf(uint8_t *buf, size_t size) {
if ( buf == NULL ) return;
void setGraphBuf(uint8_t *buf, size_t size)
{
if (buf == NULL) return;
ClearGraph(false);
if ( size > MAX_GRAPH_TRACE_LEN )
if (size > MAX_GRAPH_TRACE_LEN)
size = MAX_GRAPH_TRACE_LEN;
for (uint32_t i = 0; i < size; ++i)
@ -75,10 +79,11 @@ void setGraphBuf(uint8_t *buf, size_t size) {
return;
}
size_t getFromGraphBuf(uint8_t *buf) {
if (buf == NULL ) return 0;
size_t getFromGraphBuf(uint8_t *buf)
{
if (buf == NULL) return 0;
uint32_t i;
for (i=0; i < GraphTraceLen; ++i){
for (i = 0; i < GraphTraceLen; ++i) {
//trim
if (GraphBuffer[i] > 127) GraphBuffer[i] = 127;
if (GraphBuffer[i] < -127) GraphBuffer[i] = -127;
@ -88,8 +93,9 @@ size_t getFromGraphBuf(uint8_t *buf) {
}
// A simple test to see if there is any data inside Graphbuffer.
bool HasGraphData(){
if ( GraphTraceLen <= 0) {
bool HasGraphData()
{
if (GraphTraceLen <= 0) {
PrintAndLogEx(NORMAL, "No data available, try reading something first");
return false;
}
@ -97,7 +103,8 @@ bool HasGraphData(){
}
// Get or auto-detect ask clock rate
int GetAskClock(const char *str, bool printAns) {
int GetAskClock(const char *str, bool printAns)
{
if (getSignalProperties()->isnoise)
return false;
@ -120,7 +127,7 @@ int GetAskClock(const char *str, bool printAns) {
idx = DetectASKClock(bits, size, &clock, 20);
}
if ( clock > 0 ) {
if (clock > 0) {
setClockGrid(clock, idx);
}
// Only print this message if we're not looping something
@ -130,28 +137,30 @@ int GetAskClock(const char *str, bool printAns) {
return clock;
}
uint8_t GetPskCarrier(const char *str, bool printAns) {
uint8_t GetPskCarrier(const char *str, bool printAns)
{
if (getSignalProperties()->isnoise)
return false;
uint8_t carrier = 0;
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
size_t size = getFromGraphBuf(bits);
if ( size == 0 ) {
if (size == 0) {
PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
return 0;
}
uint16_t fc = countFC(bits, size, false);
carrier = fc & 0xFF;
if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
if (( fc >> 8) == 10 && carrier == 8) return 0;
if ((fc >> 8) == 10 && carrier == 8) return 0;
// Only print this message if we're not looping something
if (printAns)
PrintAndLogEx(SUCCESS, "Auto-detected PSK carrier rate: %d", carrier);
return carrier;
}
int GetPskClock(const char* str, bool printAns) {
int GetPskClock(const char *str, bool printAns)
{
if (getSignalProperties()->isnoise)
return -1;
@ -163,7 +172,7 @@ int GetPskClock(const char* str, bool printAns) {
// Auto-detect clock
uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
size_t size = getFromGraphBuf(grph);
if ( size == 0 ) {
if (size == 0) {
PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
return -1;
}
@ -177,7 +186,8 @@ int GetPskClock(const char* str, bool printAns) {
return clock;
}
int GetNrzClock(const char* str, bool printAns) {
int GetNrzClock(const char *str, bool printAns)
{
if (getSignalProperties()->isnoise)
return -1;
@ -189,7 +199,7 @@ int GetNrzClock(const char* str, bool printAns) {
// Auto-detect clock
uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
size_t size = getFromGraphBuf(grph);
if ( size == 0 ) {
if (size == 0) {
PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
return -1;
}
@ -203,7 +213,8 @@ int GetNrzClock(const char* str, bool printAns) {
}
//by marshmellow
//attempt to detect the field clock and bit clock for FSK
int GetFskClock(const char* str, bool printAns) {
int GetFskClock(const char *str, bool printAns)
{
int clock = param_get32ex(str, 0, 0, 10);
if (clock != 0)
@ -212,10 +223,10 @@ int GetFskClock(const char* str, bool printAns) {
uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
int firstClockEdge = 0;
if ( !fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
if (!fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
return 0;
if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
if ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5)) {
if (printAns)
PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
setClockGrid(rf1, firstClockEdge);
@ -226,7 +237,8 @@ int GetFskClock(const char* str, bool printAns) {
PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
return 0;
}
bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge)
{
if (getSignalProperties()->isnoise)
return false;