X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensors%2Fpressure.c;h=d93ceedd9f89a416454b8766c0b0e69a38702cea;hb=1788aa399989e919221f0bf4c8b6114bef4a49a9;hp=699dda3fe54a55a3b899d3ab1c023c068a47a6bd;hpb=f54777b1c07919d18292491b2d2ccdbbc54a588d;p=matches%2FMCTX3420.git diff --git a/server/sensors/pressure.c b/server/sensors/pressure.c index 699dda3..d93ceed 100644 --- 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; */ - - 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! - 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