void AppendGraph(int redraw, int clock, int bit)
{
int i;
- int half = (int)(clock/2);
- int firstbit = bit ^ 1;
-
- for (i = 0; i < half; ++i)
- GraphBuffer[GraphTraceLen++] = firstbit;
-
- for (i = 0; i <= half; ++i)
+
+ for (i = 0; i < (int)(clock / 2); ++i)
+ GraphBuffer[GraphTraceLen++] = bit ^ 1;
+
+ for (i = (int)(clock / 2); i < clock; ++i)
GraphBuffer[GraphTraceLen++] = bit;
if (redraw)
RepaintGraphWindow();
}
-/* clear out our graph window */
+// clear out our graph window
int ClearGraph(int redraw)
{
int gtl = GraphTraceLen;
memset(GraphBuffer, 0x00, GraphTraceLen);
GraphTraceLen = 0;
-
+
if (redraw)
RepaintGraphWindow();
return gtl;
}
-void SetGraphBuf(uint8_t *buff, int size)
+// DETECT CLOCK NOW IN LFDEMOD.C
+
+void setGraphBuf(uint8_t *buff, size_t size)
{
if ( buff == NULL ) return;
size = MAX_GRAPH_TRACE_LEN;
ClearGraph(0);
for (; i < size; ++i){
- GraphBuffer[i] = buff[i];
+ GraphBuffer[i]=buff[i]-128;
}
- GraphTraceLen = size;
+ GraphTraceLen=size;
RepaintGraphWindow();
return;
}
-
-// Copies grahpbuff to buff.
-// while triming values to the range -127 -- 127.
-int GetFromGraphBuf(uint8_t *buff)
+size_t getFromGraphBuf(uint8_t *buff)
{
- if ( buff == NULL ) return -1;
- uint32_t i = 0;
-
- for (; i < GraphTraceLen; ++i){
-
- // trim upper and lower values.
- if (GraphBuffer[i] > 127)
- GraphBuffer[i] = 127;
- else if (GraphBuffer[i] < -127)
- GraphBuffer[i] = -127;
-
- buff[i] = (uint8_t)(GraphBuffer[i] + 128);
+ if (buff == NULL ) return 0;
+ uint32_t i;
+ for (i=0;i<GraphTraceLen;++i){
+ if (GraphBuffer[i]>127) GraphBuffer[i]=127; //trim
+ if (GraphBuffer[i]<-127) GraphBuffer[i]=-127; //trim
+ buff[i]=(uint8_t)(GraphBuffer[i]+128);
}
return i;
}
-/* Get or auto-detect clock rate */
-int GetClock(const char *str, int verbose)
-{
- int clock;
-
- sscanf(str, "%i", &clock);
- if (!strcmp(str, ""))
- clock = 0;
-
- /* Auto-detect clock */
- if (!clock) {
-
- uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0x00};
- int size = GetFromGraphBuf(grph);
- if ( size < 0 ) {
- PrintAndLog("Failed to copy from graphbuffer");
- return -1;
- }
- clock = DetectASKClock(grph, size, 0);
-
- /* Only print this message if we're not looping something */
- if (verbose)
- PrintAndLog("Auto-detected clock rate: %d", clock);
- }
- return clock;
-}
// A simple test to see if there is any data inside Graphbuffer.
bool HasGraphData(){
*high = (int)(*high * .88);
*low = (int)(*low * .88);
}
-}
\ No newline at end of file
+}
+
+// Get or auto-detect ask clock rate
+int GetAskClock(const char str[], bool printAns, bool verbose)
+{
+ int clock;
+ sscanf(str, "%i", &clock);
+ if (!strcmp(str, ""))
+ clock = 0;
+
+ if (clock != 0)
+ return clock;
+ // Auto-detect clock
+ uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+ size_t size = getFromGraphBuf(grph);
+ if (size == 0) {
+ if (verbose)
+ PrintAndLog("Failed to copy from graphbuffer");
+ return -1;
+ }
+ DetectASKClock(grph, size, &clock, 20);
+ // Only print this message if we're not looping something
+ if (printAns){
+ PrintAndLog("Auto-detected clock rate: %d", clock);
+ }
+ return clock;
+}
+
+int GetPskClock(const char str[], bool printAns, bool verbose)
+{
+ int clock;
+ sscanf(str, "%i", &clock);
+ if (!strcmp(str, ""))
+ clock = 0;
+
+ if (clock!=0)
+ return clock;
+ // Auto-detect clock
+ uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+ size_t size = getFromGraphBuf(grph);
+ if ( size == 0 ) {
+ if (verbose)
+ PrintAndLog("Failed to copy from graphbuffer");
+ return -1;
+ }
+ clock = DetectPSKClock(grph,size,0);
+ // Only print this message if we're not looping something
+ if (printAns){
+ PrintAndLog("Auto-detected clock rate: %d", clock);
+ }
+ return clock;
+}
+
+uint8_t GetNrzClock(const char str[], bool printAns, bool verbose)
+{
+ int clock;
+ sscanf(str, "%i", &clock);
+ if (!strcmp(str, ""))
+ clock = 0;
+
+ if (clock!=0)
+ return clock;
+ // Auto-detect clock
+ uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+ size_t size = getFromGraphBuf(grph);
+ if ( size == 0 ) {
+ if (verbose)
+ PrintAndLog("Failed to copy from graphbuffer");
+ return -1;
+ }
+ clock = DetectNRZClock(grph, size, 0);
+ // Only print this message if we're not looping something
+ if (printAns){
+ PrintAndLog("Auto-detected clock rate: %d", clock);
+ }
+ return clock;
+}
+//by marshmellow
+//attempt to detect the field clock and bit clock for FSK
+uint8_t GetFskClock(const char str[], bool printAns, bool verbose)
+{
+ int clock;
+ sscanf(str, "%i", &clock);
+ if (!strcmp(str, ""))
+ clock = 0;
+ if (clock != 0) return (uint8_t)clock;
+
+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ size_t size = getFromGraphBuf(BitStream);
+ if (size==0) return 0;
+ uint8_t dummy = 0;
+ uint16_t ans = countFC(BitStream, size, &dummy);
+ if (ans==0) {
+ if (verbose) PrintAndLog("DEBUG: No data found");
+ return 0;
+ }
+ uint8_t fc1, fc2;
+ fc1 = (ans >> 8) & 0xFF;
+ fc2 = ans & 0xFF;
+
+ uint8_t rf1 = detectFSKClk(BitStream, size, fc1, fc2);
+ if (rf1==0) {
+ if (verbose) PrintAndLog("DEBUG: Clock detect error");
+ return 0;
+ }
+ if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
+ if (printAns) PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+ return rf1;
+ }
+ if (verbose){
+ PrintAndLog("DEBUG: unknown fsk field clock detected");
+ PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+ }
+ return 0;
+}
projects / proxmark3-svn / blobdiff