X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fpin_test.c;h=2ef06120f8313feff4331c6051e3393aea4b9026;hb=e2c333035c595ef6e48ff66d46a811ca17f97a26;hp=90ae6261be2d49ddaf902de88f9cf6f568203595;hpb=6982a9002923c2297cd2e2e1ec10ccb331b01eb5;p=matches%2FMCTX3420.git

diff --git a/server/pin_test.c b/server/pin_test.c
index 90ae626..2ef0612 100644
--- a/server/pin_test.c
+++ b/server/pin_test.c
@@ -36,9 +36,8 @@ bool Pin_Configure(const char *type, int pin_export, int num)
 
 	if (strcmp(type, "gpo") == 0 || strcmp(type, "gpi") == 0)
 	{
-		if (pin_export < 0)
-			GPIO_Unexport(num);
-		else
+		//Don't allow unexport of gpio
+		if (pin_export > 0)
 			ret = GPIO_Export(num);
 	}
 	else if (strcmp(type, "pwm") == 0)
@@ -50,9 +49,8 @@ bool Pin_Configure(const char *type, int pin_export, int num)
 	}
 	else if (strcmp(type, "adc") == 0)
 	{
-		if (pin_export < 0)
-			ADC_Unexport(num);
-		else
+		//Don't allow unexport of adc
+		if (pin_export > 0)
 			ret = ADC_Export(num);
 	}
 	return ret;
@@ -120,7 +118,7 @@ void Pin_Handler(FCGIContext *context, char * params)
 
 	if (strcmp(type, "gpo") == 0)
 	{
-		if (num <= 0 || num > GPIO_NUM_PINS)
+		if (num <= 0 || num > GPIO_MAX_NUMBER)
 		{
 			FCGI_RejectJSON(context, "Invalid GPIO pin");
 			return;
@@ -139,7 +137,7 @@ void Pin_Handler(FCGIContext *context, char * params)
 	}
 	else if (strcmp(type, "gpi") == 0)
 	{
-		if (num < 0 || num >= GPIO_NUM_PINS)
+		if (num < 0 || num > GPIO_MAX_NUMBER)
 		{
 			FCGI_RejectJSON(context, "Invalid GPIO pin");
 			return;
@@ -172,7 +170,7 @@ void Pin_Handler(FCGIContext *context, char * params)
 		else
 		{
 			FCGI_PrintRaw("Content-type: text/plain\r\n\r\n");
-			FCGI_PrintRaw("ADC%d reads %d\n", num, raw_adc);
+			FCGI_PrintRaw("%d\n", raw_adc);
 		}
 	}
 	else if (strcmp(type, "pwm") == 0)