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
Update dilatometer.h
[matches/MCTX3420.git]
/
server
/
sensors
/
strain.c
diff --git
a/server/sensors/strain.c
b/server/sensors/strain.c
index
77a11a2
..
64233e2
100644
(file)
--- a/
server/sensors/strain.c
+++ b/
server/sensors/strain.c
@@
-7,7
+7,7
@@
#define STRAIN_ADC ADC0
// TODO: Choose this
#define STRAIN_ADC ADC0
// TODO: Choose this
-#define STRAIN_GPIO
1
5
+#define STRAIN_GPIO
4
5
/**
* Convert Strain gauge id number to a GPIO pin on the Mux
/**
* Convert Strain gauge id number to a GPIO pin on the Mux
@@
-25,13
+25,13
@@
static int Strain_To_GPIO(StrainID id)
switch (id)
{
case STRAIN0:
switch (id)
{
case STRAIN0:
- return
GPIO0_30
;
+ return
44
;
case STRAIN1:
case STRAIN1:
- return
GPIO1_28
;
+ return
26
;
case STRAIN2:
case STRAIN2:
- return
GPIO0_31
;
+ return
46
;
case STRAIN3:
case STRAIN3:
- return
GPIO1_16
;
+ return
65
;
default:
Fatal("Unknown StrainID %d", id);
return -1; // Should never happen
default:
Fatal("Unknown StrainID %d", id);
return -1; // Should never happen
@@
-119,6
+119,9
@@
bool Strain_Read(int id, double * value)
if (!GPIO_Set(gpio_num, false))
Fatal("Couldn't set GPIO%d for strain sensor %d to LOW (after reading)", gpio_num, id);
if (!GPIO_Set(gpio_num, false))
Fatal("Couldn't set GPIO%d for strain sensor %d to LOW (after reading)", gpio_num, id);
+
+ usleep(200);
+
pthread_mutex_unlock(&mutex);
return result;
pthread_mutex_unlock(&mutex);
return result;
UCC
git Repository :: git.ucc.asn.au