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
Some fixes
[matches/MCTX3420.git]
/
server
/
sensors
/
pressure.c
diff --git
a/server/sensors/pressure.c
b/server/sensors/pressure.c
index
699dda3
..
d93ceed
100644
(file)
--- a/
server/sensors/pressure.c
+++ b/
server/sensors/pressure.c
@@
-61,12
+61,13
@@
double Pressure_Callibrate(int id, int adc)
double Vout = ADC_TO_MVOLTS(adc);
return ((Vout - 0.1*Vs)/(0.8*Vs))*(Pmax - Pmin) + Pmin;
*/
double Vout = ADC_TO_MVOLTS(adc);
return ((Vout - 0.1*Vs)/(0.8*Vs))*(Pmax - Pmin) + Pmin;
*/
-
- return Data_Calibrate((double)adc, high_raw, high_cal, sizeof(high_raw)/sizeof(double));
+ return adc;
+
//
return Data_Calibrate((double)adc, high_raw, high_cal, sizeof(high_raw)/sizeof(double));
}
case PRES_LOW0:
// Not calibrated!
}
case PRES_LOW0:
// Not calibrated!
- return (200.0 * (adc / ADC_RAW_MAX));
+ //return (200.0 * ((double)adc / ADC_RAW_MAX));
+ return adc;
default:
Fatal("Unknown Pressure id %d", id);
return -1; // Should never happen
default:
Fatal("Unknown Pressure id %d", id);
return -1; // Should never happen
UCC
git Repository :: git.ucc.asn.au