git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #43 from jtanx/master
[matches/MCTX3420.git]
/
server
/
sensor.c
diff --git
a/server/sensor.c
b/server/sensor.c
index
98896e8
..
8e4773f
100644
(file)
--- a/
server/sensor.c
+++ b/
server/sensor.c
@@
-45,13
+45,13
@@
void Sensor_Init()
Data_Init(&(g_sensors[i].data_file));
}
Data_Init(&(g_sensors[i].data_file));
}
- // Get the ADCs
- ADC_Export();
+ // Get the
required
ADCs
+ ADC_Export(
0
);
// GPIO1_28 used as a pulse for sampling
// GPIO1_28 used as a pulse for sampling
- GPIO_Export(GPIO1_28);
+
//
GPIO_Export(GPIO1_28);
// GPIO0_30 toggled during sampling
// GPIO0_30 toggled during sampling
- GPIO_Export(GPIO0_30);
+
//
GPIO_Export(GPIO0_30);
}
/**
}
/**
@@
-175,16
+175,19
@@
bool Sensor_Read(Sensor * s, DataPoint * d)
// Read value based on Sensor Id
switch (s->id)
{
// Read value based on Sensor Id
switch (s->id)
{
- case
ANALOG_REALTEST
:
+ case
2
:
{
static bool set = false;
{
static bool set = false;
-
- GPIO_Set(GPIO0_30, true);
- d->value = 0;//(double)ADC_Read(ADC0); //ADC #0 on the Beaglebone
+ int raw_adc = 0;
+ //GPIO_Set(GPIO0_30, true);
+ ADC_Read(ADC0, &raw_adc);
+ d->value = (double)raw_adc; //ADC #0 on the Beaglebone
//Log(LOGDEBUG, "Got value %f from ADC0", d->value);
//Log(LOGDEBUG, "Got value %f from ADC0", d->value);
- GPIO_Set(GPIO0_30, false);
+
//
GPIO_Set(GPIO0_30, false);
set = !set;
set = !set;
- GPIO_Set(GPIO1_28, set);
+ //GPIO_Set(GPIO1_28, set);
+
+ usleep(100000);
break;
}
break;
}
@@
-249,6
+252,11
@@
bool Sensor_Read(Sensor * s, DataPoint * d)
s->newest_data.time_stamp = d->time_stamp;
s->newest_data.value = d->value;
}
s->newest_data.time_stamp = d->time_stamp;
s->newest_data.value = d->value;
}
+
+#ifdef _BBB
+ //Not all cases have usleep, easiest here.
+ usleep(1000000);
+#endif
return result;
}
return result;
}
UCC
git Repository :: git.ucc.asn.au