X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/38b65694d61805baa4f0f0d55949d183462b18a7..7f93ef2c228855f26d3eb88ee1c878fbb6b53a12:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e7b868bd..77bbbbc4 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -144,7 +144,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
 	BOOL at134khz;
 
 	// see if 'h' was specified
-	if(command[strlen(command) - 1] == 'h')
+	if(command[strlen((char *) command) - 1] == 'h')
 		at134khz= TRUE;
 	else
 		at134khz= FALSE;
@@ -241,7 +241,7 @@ static int AvgAdc(int ch)
 void SweepLFrange()
 {
 	BYTE *dest = (BYTE *)BigBuf;
-	BYTE dummy[12];
+	char dummy[12];
 	int i, peak= 0, ptr= 0;
 	double freq;
 
@@ -339,6 +339,7 @@ void SimulateTagLowFrequency(int period)
 	for(;;) {
 		while(!(PIO_PIN_DATA_STATUS & (1<<GPIO_SSC_CLK))) {
 			if(BUTTON_PRESS()) {
+				DbpString("Stopped");
 				return;
 			}
 			WDT_HIT();
@@ -354,6 +355,7 @@ void SimulateTagLowFrequency(int period)
 
 		while(PIO_PIN_DATA_STATUS & (1<<GPIO_SSC_CLK)) {
 			if(BUTTON_PRESS()) {
+				DbpString("Stopped");
 				return;
 			}
 			WDT_HIT();
@@ -487,6 +489,7 @@ static void CmdHIDdemodFSK(void)
 		WDT_HIT();
 		LED_A_ON();
 		if(BUTTON_PRESS()) {
+			DbpString("Stopped");
 			LED_A_OFF();
 			return;
 		}
@@ -936,8 +939,8 @@ void SpinDelay(int ms)
 // listen for external reader 
 void ListenReaderField(int limit)
 {
-	int lf_av, lf_av_new, lf_baseline= -1, lf_count= 0;
-	int hf_av, hf_av_new,  hf_baseline= -1, hf_count= 0;
+	int lf_av, lf_av_new, lf_baseline= 0, lf_count= 0;
+	int hf_av, hf_av_new,  hf_baseline= 0, hf_count= 0;
 
 #define LF_ONLY		1
 #define HF_ONLY		2
@@ -949,7 +952,7 @@ void ListenReaderField(int limit)
 
 	lf_av= ReadAdc(ADC_CHAN_LF);
 
-	if(limit != HF_ONLY && lf_baseline ==  -1) 
+	if(limit != HF_ONLY) 
 		{
 		DbpString("LF 125/134 Baseline:");
 		DbpIntegers(lf_av,0,0);
@@ -959,7 +962,7 @@ void ListenReaderField(int limit)
 	hf_av= ReadAdc(ADC_CHAN_HF);
 
 
-	if (limit != LF_ONLY && hf_baseline == -1) 
+	if (limit != LF_ONLY) 
 		{
 		DbpString("HF 13.56 Baseline:");
 		DbpIntegers(hf_av,0,0);
@@ -970,6 +973,7 @@ void ListenReaderField(int limit)
 		{
 		if(BUTTON_PRESS()) 
 			{
+			DbpString("Stopped");
 			LED_B_OFF();
 			LED_D_OFF();
 			return;