Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/main/java/com/pi4j/drivers/sensor/Sensor.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,21 @@
public interface Sensor extends Closeable {
SensorDescriptor getDescriptor();

/**
* Provided for backwards compatibility while we are switching over to double values
* to better accommodate gps and other high precision sensors.
*/
@Deprecated
default void readMeasurement(float[] values) {
double[] doubleValues = new double[values.length];
readMeasurement(doubleValues);
for (int i = 0; i < values.length; i++) {
values[i] = (float) doubleValues[i];
}
}

/** Reads a single measurement. For information about the values, please refer to getDescriptor() */
void readMeasurement(float[] values);
void readMeasurement(double[] values);

@Override
void close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ private int readRegisterU16(int register) {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
Measurement measurement = readMeasurement();
values[0] = measurement.temperature;
values[1] = measurement.pressure;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public float readHumidity() {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
values[0] = readHumidity();
values[1] = readTemperature();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public SensorDescriptor getDescriptor() {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
values[0] = readPressure();
values[1] = readTemperature();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void startPeriodicMeasurement() {
}


public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
Measurement measurement = readMeasurement();
values[0] = measurement.temperature;
values[1] = measurement.humidity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public float[] readCrgb() {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
while((registerAccess.readRegister(Register.STATUS) & 1) == 0) {
try {
Thread.sleep(10);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public double measureDistance() {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
values[0] = (float) measureDistance();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public SensorDescriptor getDescriptor() {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
registerAccess.readRegister(Register.OUT_X_L_XL, buffer.array(), 0, 6);

values[0] = buffer.getShort(0) * accelerometerRange.ms2/ Short.MAX_VALUE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public SensorDescriptor getDescriptor() {
}

@Override
public void readMeasurement(float[] values) {
public void readMeasurement(double[] values) {
// Request single measurement
setRegisterBits(Register.CTRL_REG3_M, 1, 0, 1);

Expand Down