X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;fp=server%2Fsensor.c;h=cfab514604d3047d202fa50d3d1b859e38a802b0;hb=71c13fe3c04db7f93a69cbc6a6c7c3dc2393bf3f;hp=cc942e347a054b88b5fa1b50bacdd75a74c1ed7f;hpb=df1a9751a2d23cc9d43bf49c069ac9effc2a752f;p=matches%2FMCTX3420.git diff --git a/server/sensor.c b/server/sensor.c index cc942e3..cfab514 100644 --- a/server/sensor.c +++ b/server/sensor.c @@ -212,25 +212,25 @@ bool Sensor_Read(Sensor * s, DataPoint * d) //TODO: Strain gauges should have their own critical section, rest of sensors probably don't need to be in a critical section case STRAIN0: success &= GPIO_Set(GPIO0_30, true); - success &= ADC_Read(ADC0); + success &= ADC_Read(ADC0, &value); success &= GPIO_Set(GPIO0_30, false); if (!success) Fatal("Error reading strain gauge 0"); break; case STRAIN1: success &= GPIO_Set(GPIO1_28, true); - success &= ADC_Read(ADC0); + success &= ADC_Read(ADC0, &value); success &= GPIO_Set(GPIO1_28, false); if (!success) Fatal("Error reading strain gauge 1"); break; case STRAIN2: success &= GPIO_Set(GPIO0_31, true); - success &= ADC_Read(ADC0); + success &= ADC_Read(ADC0, &value); success &= GPIO_Set(GPIO0_31, false); case STRAIN3: success &= GPIO_Set(GPIO1_16, true); - success &= ADC_Read(ADC0); + success &= ADC_Read(ADC0, &value); success &= GPIO_Set(GPIO1_16, false); if (!success) Fatal("Error reading strain gauge 2");