X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=BBB%20code%2FGetData_real.c;h=c724e6255f4f3a9d45237bd41b56d280f591c66e;hb=9fd77a6c5fdf277d6d5c17e3ced66f65f94a36f4;hp=f52427c0546b6df115eacd055d826a812393d5c6;hpb=5d57467589ecefdf5bb5985005705a1c8460c623;p=matches%2FMCTX3420.git

diff --git a/BBB code/GetData_real.c b/BBB code/GetData_real.c
index f52427c..c724e62 100644
--- a/BBB code/GetData_real.c	
+++ b/BBB code/GetData_real.c	
@@ -1,64 +1,4 @@
-char adc_dir = "/sys/devices/platform/tsc/ain";
-char pin_dir = "/sys/class/gpio/gpio";
-
-/** Open an ADC and return the voltage value from it
-*	@param adc_num - ADC number, ranges from 0 to 7 on the Beaglebone
-	@return the converted voltage value if successful
-*/
-
-//TODO: create a function to lookup the ADC or pin number instead of manually
-//		specifying it here (so we can keep all the numbers in one place)
-
-int OpenAnalog(int adc_num)
-{
-	char adc_path[40];
-	snprintf(adc_path, sizeof(adc_path), "%s%d", adc_dir, adc_num);		//construct ADC path
-	int sensor = open(adc_path, O_RDONLY);
-	char buffer[128];								//I think ADCs are only 12 bits (0-4096)
-	int read = read(sensor, buffer, sizeof(buffer);	//buffer can probably be smaller
-	if (read != -1) {
-		buffer[read] = NULL;
-		int value = atoi(buffer);
-		double convert = (value/4096) * 1000;		//random conversion factor, will be different for each sensor
-		//lseek(sensor, 0, 0);
-		close(sensor);
-		return convert;
-	}
-	else {
-		perror("Failed to get value from sensor");
-		close(sensor);
-		return -1;
-	}
-}
-
-/** Open a digital pin and return the value from it
-*	@param pin_num - pin number, specified by electronics team
-	@return 1 or 0 if reading was successful
-*/
-
-int OpenDigital(int pin_num)
-{
-	char pin_path[40];
-	snprintf(pin_path, sizeof(pin_path), "%s%d%s", pin_dir, pin_num, "/value");	//construct pin path
-	int pin = open(pin_path, O_RDONLY);
-	char ch;
-	lseek(fd, 0, SEEK_SET);
-	int read = read(pin, &ch, sizeof(ch);
-	if (read != -1) {
-		if (ch != '0') {
-			close(pin);
-			return 1;
-		}
-		else {
-			close(pin);
-			return 0;
-		}
-	else {
-		perror("Failed to get value from pin");
-		close(pin);
-		return -1;
-	}
-}
+#include "gpio.h"
 
 /**
  * Read a DataPoint from a Sensor; block until value is read
@@ -78,11 +18,11 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
 	switch (s->id)
 	{
 		case ANALOG_TEST0:
-			d->value = OpenAnalog(0);	//ADC #0 on the Beaglebone
+			d->value = ADCRead(0);	//ADC #0 on the Beaglebone
 			break;
 		case ANALOG_TEST1:
 		{
-			d->value = OpenAnalog(1);
+			d->value = ADCRead(1);
 			break;
 		}
 		case ANALOG_FAIL0:
@@ -90,10 +30,10 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
 			//Gives a value between -5 and 5
 			break;
 		case DIGITAL_TEST0:
-			d->value = openDigital(0);	//replace 0 with correct pin number
+			d->value = pinRead(0);	//replace 0 with correct pin number
 			break;
 		case DIGITAL_TEST1:
-			d->value = openDigital(1);	//replace 1 with correct pin number
+			d->value = pinRead(1);	//replace 1 with correct pin number
 			break;
 		case DIGITAL_FAIL0:
 			if( rand() % 100 > 98)