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
Changed capture initilisation
[matches/MCTX3420.git]
/
server
/
sensors
/
dilatometer.c
diff --git
a/server/sensors/dilatometer.c
b/server/sensors/dilatometer.c
index
10b2e61
..
18d5e68
100644
(file)
--- a/
server/sensors/dilatometer.c
+++ b/
server/sensors/dilatometer.c
@@
-165,7
+165,7
@@
void CannyThreshold()
* @param samples - Number of rows to scan (increasing will slow down performance!)
* @returns true on successful read
*/
* @param samples - Number of rows to scan (increasing will slow down performance!)
* @returns true on successful read
*/
-bool Dilatometer_GetE
dge
( double * value, int samples)
+bool Dilatometer_GetE
xpansion
( double * value, int samples)
{
bool result = false;
double average = 0;
{
bool result = false;
double average = 0;
@@
-244,7
+244,7
@@
bool Dilatometer_GetEdge( double * value, int samples)
*/
bool Dilatometer_Read(int id, double * value)
{
*/
bool Dilatometer_Read(int id, double * value)
{
- bool result = Dilatometer_GetE
dge
(value, SAMPLES);
+ bool result = Dilatometer_GetE
xpansion
(value, SAMPLES);
return result;
}
return result;
}
@@
-256,7
+256,7
@@
bool Dilatometer_Init(const char * name, int id)
// Make an initial reading (will allocate memory the first time only).
double val;
lastPosition = 0; // Reset the last position
// Make an initial reading (will allocate memory the first time only).
double val;
lastPosition = 0; // Reset the last position
- bool result = Dilatometer_GetE
dge
(&val, 1);
+ bool result = Dilatometer_GetE
xpansion
(&val, 1);
return result;
}
return result;
}
UCC
git Repository :: git.ucc.asn.au